diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js index c57a9bb60a56..2d7bafb6c5ae 100644 --- a/ci/github-script/labels.js +++ b/ci/github-script/labels.js @@ -26,7 +26,10 @@ module.exports = async ({ github, context, core, dry }) => { // be detected, no maintainers pinged. // We can just check the temporary merge commit, and if it's empty the PR can safely be // closed - there are no further changes. - if (pull_request.merge_commit_sha) { + // We only do this for PRs, which are non-empty to start with. This avoids closing PRs + // which have been created with an empty commit for notification purposes, for example + // the yearly election notification for voters. + if (pull_request.merge_commit_sha && pull_request.changed_files > 0) { const commit = ( await github.rest.repos.getCommit({ ...context.repo, diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index fc6cc0fb4d35..f0d240098c41 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -1,6 +1,6 @@ # pkgs.dockerTools {#sec-pkgs-dockerTools} -`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions). +`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md). Docker itself is not used to perform any of the operations done by these functions. ## buildImage {#ssec-pkgs-dockerTools-buildImage} @@ -130,7 +130,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has `config` (Attribute Set or Null; _optional_) : Used to specify the configuration of the containers that will be started off the generated image. - Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions). + Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md#image-json-field-descriptions). _Default value:_ `null`. @@ -138,7 +138,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has : Used to specify the image architecture. This is useful for multi-architecture builds that don't need cross compiling. - If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties), which should still be compatible with Docker. + If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/v1.1.1/config.md#properties), which should still be compatible with Docker. According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`. _Default value:_ the same value from `pkgs.go.GOARCH`. diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index e4e8ddbb2c17..49407c6e9b8e 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -421,6 +421,11 @@ Check that two paths have the same contents. : A message that is printed last if the file system object contents at the two paths don't match exactly. +`checkMetadata` (boolean) + +: Whether to fail on metadata differences, such as permissions or ownership. + Defaults to `true`. + :::{.example #ex-testEqualContents-toyexample} # Check that two paths have the same contents diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md index 427a03a73986..afaa5b21bcf1 100644 --- a/doc/hooks/cmake.section.md +++ b/doc/hooks/cmake.section.md @@ -30,6 +30,14 @@ This setting has no tangible effect when running the build in a sandboxed deriva The default value is `build`. +#### `cmakeBuildType` {#cmake-build-type} + +Build type of cmake output. + +Internally populates the `CMAKE_BUILD_TYPE` cmake flag. + +The default value is `Release`. + #### `dontUseCmakeConfigure` {#dont-use-cmake-configure} When set to true, don't use the predefined `cmakeConfigurePhase`. diff --git a/doc/redirects.json b/doc/redirects.json index 6a3d3e5138c8..b4cec3d403eb 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -237,9 +237,6 @@ "sec-meta-identifiers-cpe": [ "index.html#sec-meta-identifiers-cpe" ], - "sec-meta-identifiers-purl": [ - "index.html#sec-meta-identifiers-purl" - ], "sec-modify-via-packageOverrides": [ "index.html#sec-modify-via-packageOverrides" ], @@ -664,15 +661,6 @@ "var-meta-identifiers-possibleCPEs": [ "index.html#var-meta-identifiers-possibleCPEs" ], - "var-meta-identifiers-purl": [ - "index.html#var-meta-identifiers-purl" - ], - "var-meta-identifiers-purlParts": [ - "index.html#var-meta-identifiers-purlParts" - ], - "var-meta-identifiers-purls": [ - "index.html#var-meta-identifiers-purls" - ], "var-meta-teams": [ "index.html#var-meta-teams" ], @@ -2381,6 +2369,9 @@ "cmake-build-dir": [ "index.html#cmake-build-dir" ], + "cmake-build-type": [ + "index.html#cmake-build-type" + ], "dont-use-cmake-configure": [ "index.html#dont-use-cmake-configure" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c8192ba68b66..d64c9d963c0d 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -240,8 +240,6 @@ -- Metadata identifier purl (Package URL, https://github.com/package-url/purl-spec) has been added for fetchgit, fetchpypi and fetchFromGithub fetchers and mkDerivation has been adjusted to reuse these informations. Package URL's enables a reliable identification and locatization of software packages. Maintainers of derivations using the adopted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. Maintainers using fetchurl for `drv.src` are urged to adopt their `drv.meta.identifiers.purlParts` for proper identification. - - Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`. - Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`. diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 55727bb84b8b..947009869ff1 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -319,22 +319,3 @@ A readonly attribute that concatenates all CPE parts in one string. #### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs} A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess. - -### Package URL {#sec-meta-identifiers-purl} - -[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages. Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management. Package URL's default to the mkDerivation.src, as the original consumed software package is the single point of truth. - -#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts} - -This attribute contains an attribute set of all parts of the PURL for this package. - -* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided -* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md) - -#### `meta.identifiers.purl` {#var-meta-identifiers-purl} - -An extendable attribute which is built based on purlParts. It is the main identifier, consumers should consider using the PURL's list interface to be prepared for edge cases. - -#### `meta.identifiers.purls` {#var-meta-identifiers-purls} - -An extendable attribute list which defaults to a single element equal to the main PURL. It provides an interface for additional identifiers of mkDerivation.src and / or vendored dependencies inside mkDerivation.src, which maintainers can conciously decide to use on top. Identifiers different to the default src identifier are not recommended by default as they might cause maintenance overhead or may diverge (e.g. differences between source distribution pkg:github and binary distribution like pkg:pypi). diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 313e48524cd6..c35b954e2c7f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14068,6 +14068,12 @@ githubId = 629430; keys = [ { fingerprint = "2843 750C B1AB E256 94BE 40E2 D843 D30B 42CA 0E2D"; } ]; }; + KunyaKud = { + name = "KunyaKud"; + email = "KunyaKud@proton.me"; + github = "KunyaKud"; + githubId = 238898928; + }; kupac = { github = "Kupac"; githubId = 8224569; diff --git a/nixos/modules/services/home-automation/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix index 1b4e932c7b0f..cedca3e7330d 100644 --- a/nixos/modules/services/home-automation/wyoming/openwakeword.nix +++ b/nixos/modules/services/home-automation/wyoming/openwakeword.nix @@ -15,6 +15,7 @@ let mkEnableOption mkIf mkPackageOption + mkRemovedOptionModule types ; @@ -28,8 +29,17 @@ let in { + imports = [ + (mkRemovedOptionModule [ + "services" + "wymoing" + "openwakeword" + "preLoadModels" + ] "Passing a list of models to preload was removed in wyoming-openwakeword 2.0") + ]; + options.services.wyoming.openwakeword = with types; { - enable = mkEnableOption "Wyoming openWakeWord server"; + enable = mkEnableOption "Wyoming protocol server for openWakeWord wake word detection system"; package = mkPackageOption pkgs "wyoming-openwakeword" { }; @@ -50,24 +60,6 @@ in ''; }; - preloadModels = mkOption { - type = listOf str; - default = [ - "ok_nabu" - ]; - example = [ - # wyoming_openwakeword/models/*.tflite - "alexa" - "hey_jarvis" - "hey_mycroft" - "hey_rhasspy" - "ok_nabu" - ]; - description = '' - List of wake word models to preload after startup. - ''; - }; - threshold = mkOption { type = numbers.between 0.0 1.0; default = 0.5; @@ -91,6 +83,16 @@ in apply = toString; }; + refractorySeconds = mkOption { + type = either int float; + default = 2; + example = 1.5; + description = '' + Duration in seconds before a wake word can be detected again. + ''; + apply = toString; + }; + extraArgs = mkOption { type = listOf str; default = [ ]; @@ -125,11 +127,9 @@ in cfg.threshold "--trigger-level" cfg.triggerLevel + "--refractory-seconds" + cfg.refractorySeconds ] - ++ (concatMap (model: [ - "--preload-model" - model - ]) cfg.preloadModels) ++ (concatMap (dir: [ "--custom-model-dir" (toString dir) diff --git a/nixos/modules/services/networking/nats.nix b/nixos/modules/services/networking/nats.nix index 57765c9d2449..4508fdc1f339 100644 --- a/nixos/modules/services/networking/nats.nix +++ b/nixos/modules/services/networking/nats.nix @@ -138,7 +138,15 @@ in Type = "simple"; ExecStart = "${pkgs.nats-server}/bin/nats-server -c ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID"; + + KillMode = "mixed"; + KillSignal = "SIGUSR2"; + SuccessExitStatus = [ + 0 + "SIGUSR2" + ]; + + TimeoutStopSec = "150"; # must exceed lame_duck_duration, which defaults to 2min Restart = "on-failure"; User = cfg.user; diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 0bd9d2a2f474..92eb774eab01 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -85,13 +85,12 @@ let restartService = optionalAttrs cfg.restartAfterSleep { openvpn-restart = { wantedBy = [ "sleep.target" ]; - path = [ pkgs.procps ]; script = let unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers); in "systemctl try-restart ${lib.escapeShellArgs unitNames}"; - description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep"; + description = "Restart system OpenVPN connections when returning from sleep"; }; }; diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix index 2a83788adfd8..dc2e5178dc58 100644 --- a/nixos/modules/services/scheduling/scx.nix +++ b/nixos/modules/services/scheduling/scx.nix @@ -101,14 +101,15 @@ in serviceConfig = { Type = "simple"; - ExecStart = utils.escapeSystemdExecArgs ( - [ - (lib.getExe' cfg.package cfg.scheduler) - ] - ++ cfg.extraArgs - ); + ExecStart = '' + ${pkgs.runtimeShell} -c 'exec ${cfg.package}/bin/''${SCX_SCHEDULER_OVERRIDE:-$SCX_SCHEDULER} ''${SCX_FLAGS_OVERRIDE:-$SCX_FLAGS}' + ''; Restart = "on-failure"; }; + environment = { + SCX_SCHEDULER = cfg.scheduler; + SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs; + }; wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index dd01dbd7c66c..194be5e89d75 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -322,15 +322,16 @@ in "vector" "vchord" ]; - sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" '' - ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions} - - ALTER SCHEMA public OWNER TO ${cfg.database.user}; - ${lib.optionalString cfg.database.enableVectors "ALTER SCHEMA vectors OWNER TO ${cfg.database.user};"} - GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; - - ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions} - ''; + sqlFile = + pkgs.writeText "immich-pgvectors-setup.sql" '' + ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions} + ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions} + ALTER SCHEMA public OWNER TO ${cfg.database.user}; + '' + + lib.optionalString cfg.database.enableVectors '' + ALTER SCHEMA vectors OWNER TO ${cfg.database.user}; + GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user}; + ''; in [ '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 66a599383a95..7ef0a3a4a368 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -717,6 +717,7 @@ in homepage-dashboard = runTest ./homepage-dashboard.nix; homer = handleTest ./homer { }; honk = runTest ./honk.nix; + hoogle = runTest ./hoogle.nix; hostname = handleTest ./hostname.nix { }; hound = runTest ./hound.nix; hub = runTest ./git/hub.nix; diff --git a/nixos/tests/hoogle.nix b/nixos/tests/hoogle.nix new file mode 100644 index 000000000000..738680938e48 --- /dev/null +++ b/nixos/tests/hoogle.nix @@ -0,0 +1,31 @@ +{ lib, ... }: +{ + name = "hoogle"; + meta.maintainers = with lib.maintainers; [ h7x4 ]; + + nodes.machine = + { pkgs, ... }: + { + services.hoogle = { + enable = true; + packages = + hp: with hp; [ + arrows + lens + ]; + }; + }; + + testScript = + { nodes, ... }: + let + cfg = nodes.machine.services.hoogle; + in + '' + machine.wait_for_unit("hoogle.service") + machine.wait_for_open_port(${toString cfg.port}) + + machine.succeed("curl http://${cfg.host}:${toString cfg.port} | grep 'Hoogle'") + machine.succeed("curl 'http://${cfg.host}:${toString cfg.port}?hoogle=>>>' | grep Arrow") + ''; +} diff --git a/nixos/tests/prometheus/default.nix b/nixos/tests/prometheus/default.nix index 53cfc80e8f64..2a9e81ca7c37 100644 --- a/nixos/tests/prometheus/default.nix +++ b/nixos/tests/prometheus/default.nix @@ -8,4 +8,5 @@ prometheus-pair = runTest ./prometheus-pair.nix; pushgateway = runTest ./pushgateway.nix; remote-write = runTest ./remote-write.nix; + ui = runTest ./ui.nix; } diff --git a/nixos/tests/prometheus/ui.nix b/nixos/tests/prometheus/ui.nix new file mode 100644 index 000000000000..fb5ddcd58f55 --- /dev/null +++ b/nixos/tests/prometheus/ui.nix @@ -0,0 +1,86 @@ +{ lib, pkgs, ... }: + +{ + name = "prometheus-ui"; + + nodes = { + browser = + { config, pkgs, ... }: + { + environment.systemPackages = + let + prometheusSeleniumScript = + pkgs.writers.writePython3Bin "prometheus-selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } + '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("http://prometheus:9090/") + + wait = WebDriverWait(driver, 60) + + assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-header")) > 0 # noqa: E501 + assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-main")) > 0 # noqa: E501 + + driver.close() + ''; + in + with pkgs; + [ + curl + firefox-unwrapped + geckodriver + prometheusSeleniumScript + ]; + }; + + prometheus = + { config, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ]; + + services.prometheus = { + enable = true; + globalConfig.scrape_interval = "2s"; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ + "prometheus1:${toString config.services.prometheus.port}" + "prometheus2:${toString config.services.prometheus.port}" + ]; + } + ]; + } + ]; + }; + }; + }; + + testScript = '' + prometheus.wait_for_unit("prometheus") + prometheus.wait_for_open_port(9090) + prometheus.wait_until_succeeds("curl -sSf http://localhost:9090/-/healthy") + + browser.systemctl("start network-online.target") + browser.wait_for_unit("network-online.target") + + browser.succeed("curl -kLs http://prometheus:9090/query | grep 'Prometheus Time Series Collection and Processing Server'") + + # Ensure the application is actually rendered by the Javascript + browser.succeed("PYTHONUNBUFFERED=1 prometheus-selenium-script") + ''; +} diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 3ceaba967fa6..7e563820b581 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -27,6 +27,8 @@ import ./make-test-python.nix ( meta = { maintainers = [ ]; timeout = 600; + # https://hydra.nixos.org/build/309924543/nixlog/1 + broken = true; }; nodes = diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 2e886cb44a12..f259950ecb67 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -112,6 +112,21 @@ stdenv.mkDerivation (finalAttrs: { -e 's,-Wno-unused-private-field,,g' sed -i CMakeLists.txt \ -e 's,libprotobuf.a,protobuf,g' + + # CMake 3.0.0 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + substituteInPlace 3rdparty/{qsqlite,qtsingleapplication,qtiocompressor,qxt}/CMakeLists.txt \ + cmake/{ParseArguments.cmake,Translations.cmake} \ + tests/CMakeLists.txt gst/moodbar/CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 3.0.0)" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace 3rdparty/libmygpo-qt5/CMakeLists.txt --replace-fail \ + "cmake_minimum_required( VERSION 3.0.0 FATAL_ERROR )" \ + "cmake_minimum_required(VERSION 3.10)" + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_policy(SET CMP0053 OLD)" \ + "" ''; preConfigure = '' diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 97337f435042..6d934130acd1 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -87,8 +87,8 @@ stdenv.mkDerivation (finalAttrs: { publicKeys = fetchFromGitHub { owner = "bitcoinknots"; repo = "guix.sigs"; - rev = "7ee29a9ffbd1c26ba065ba06055242a01c3e63ff"; - sha256 = "sha256-ZW1I7Y35Pi4WZhgCCYSI5gPhcvbfnpBObhOUTqZGVvM="; + rev = "251a8f2141e5f8439175fdd7b6cd6819d743cc01"; + sha256 = "sha256-pZOK/lD1m9x8mz1IB39kLA/27fBnLvEL3qrwTRjL9Ec="; }; checksums = fetchurl { @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { signatures = fetchurl { url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-jy4gxuczCSsJQkkH3axMljuf7k2VdmLp4PkgRoQnoSY="; + hash = "sha256-fSjYdscQ4viuXutP43prWjrNT7cMaJ9J8SsUykNjJtw"; }; verifyBuilderKeys = diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 333465e93c29..9a473c284415 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -116,7 +116,7 @@ in }) ] else - previousAttrs.patches or null; + previousAttrs.patches or [ ]; preBuild = if applyOrgRoamMissingPatch then previousAttrs.preBuild or "" @@ -129,7 +129,7 @@ in popd '' else - previousAttrs.preBuild or null; + previousAttrs.preBuild or ""; } ); diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix index 0d44878b480c..91a20bd3647e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -18,7 +18,7 @@ rec { if predicate finalAttrs previousAttrs then previousAttrs.packageRequires or [ ] ++ packageRequires else - previousAttrs.packageRequires or null; + previousAttrs.packageRequires or [ ]; } ); @@ -89,7 +89,7 @@ rec { if predicate finalAttrs previousAttrs then previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ] else - previousAttrs.nativeBuildInputs or null; + previousAttrs.nativeBuildInputs or [ ]; } ); } diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 246786989209..038cc7024b6e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -830,7 +830,7 @@ let rm --recursive --verbose etc/elisp/screenshot '' else - previousAttrs.preBuild or null; + previousAttrs.preBuild or ""; } ); @@ -897,7 +897,7 @@ let rm --verbose --force test-bpr.el '' else - previousAttrs; + previousAttrs.preBuild or ""; } ); @@ -991,7 +991,7 @@ let }) ] else - previousAttrs.patches or null; + previousAttrs.patches or [ ]; } ) ); @@ -1055,7 +1055,7 @@ let '' + previousAttrs.preBuild or "" else - previousAttrs.preBuild or null; + previousAttrs.preBuild or ""; } ); @@ -1221,7 +1221,7 @@ let rm --verbose packages/javascript/test-suppport.el '' else - previousAttrs.preBuild or null; + previousAttrs.preBuild or ""; } ); @@ -1392,7 +1392,7 @@ let }) ] else - previousAttrs.patches or null; + previousAttrs.patches or [ ]; } ); @@ -1543,7 +1543,7 @@ let }) ] else - previousAttrs.patches or null; + previousAttrs.patches or [ ]; } ); @@ -1561,7 +1561,7 @@ let '' + previousAttrs.preBuild or "" else - previousAttrs.preBuild or null; + previousAttrs.preBuild or ""; } ); diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index daf7f0cfd8f5..492b9c5f6a5b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-10-12"; + version = "0.0.27-unstable-2025-10-18"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940"; - hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY="; + rev = "cc7a41262e4dc38003b7578c3553a75c0ec4b8d2"; + hash = "sha256-L6fOo3OPfMtClmyGW1Bn7YDJtuTKO6F66D1oYsii5so="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix new file mode 100644 index 000000000000..45a1fd7bf1a2 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -0,0 +1,70 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + perl, + openssl, + vimUtils, + nix-update-script, +}: +let + version = "0-unstable-2025-10-18"; + src = fetchFromGitHub { + owner = "dmtrKovalenko"; + repo = "fff.nvim"; + rev = "ee8bd6e839ff3e70660e794d79d4ce26a33a8e1e"; + hash = "sha256-Wj6YLTUqLzOngiSDkM3ci85WwdQgjoonwHbvXyvN9cE="; + }; + fff-nvim-lib = rustPlatform.buildRustPackage { + pname = "fff-nvim-lib"; + inherit version src; + + cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE="; + + nativeBuildInputs = [ + pkg-config + perl + ]; + + buildInputs = [ + openssl + ]; + + env = { + RUSTC_BOOTSTRAP = 1; # We need rust unstable features + + OPENSSL_NO_VENDOR = true; + }; + }; +in +vimUtils.buildVimPlugin { + pname = "fff.nvim"; + inherit version src; + + postPatch = '' + substituteInPlace lua/fff/download.lua \ + --replace-fail \ + "return plugin_dir .. '/../target'" \ + "return '${fff-nvim-lib}/lib'" + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + attrPath = "vimPlugins.fff-nvim.fff-nvim-lib"; + }; + + # needed for the update script + inherit fff-nvim-lib; + }; + + meta = { + description = "Fast Fuzzy File Finder for Neovim"; + homepage = "https://github.com/dmtrKovalenko/fff.nvim"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + GaetanLepage + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix index 744005cb66d3..70523c30c6d4 100644 --- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix @@ -7,19 +7,19 @@ let supported = { x86_64-linux = { - hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0="; + hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg="; arch = "linux-x64"; }; x86_64-darwin = { - hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk="; + hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8="; arch = "darwin-x64"; }; aarch64-linux = { - hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c="; + hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk="; + hash = "sha256-6NhhAhE+r3m5tY1eR8ibKeMivmCqPooAt2rkWjWkv2w="; arch = "darwin-arm64"; }; }; @@ -33,7 +33,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { publisher = "docker"; name = "docker"; - version = "0.17.0"; + version = "0.18.0"; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index bcf31ed0bbfc..00f10447ca60 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-Jqi9NTrKSweDpZ+YtXeiH77XPRgsKVJXlA4Fds7m8T0="; + hash = "sha256-WhCUOHS2y1NNTEs3Oo6lHz1YcQmj/9zcLFNi7dIO2Hs="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-8inRXcCkKbEm3D6+o5pEyUkkjj+58CgIGufHG5Qsl5Y="; + hash = "sha256-M3ZC9lq0hVoBaxzaOuzeKRy7iAPsPgi+2IHU0KaujmI="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-sTwJVM6XxbT2JAJWqAhMA/GJvP1GOnMfIezj+MMaiJ8="; + hash = "sha256-ElqAiZGulYiSVay74UC04C0lKSHo1AwhtE05To8ir84="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-eJ/hKySxQDEh1hr36BAk0D7K6t4f9qj54T2Fc1Eq1t0="; + hash = "sha256-x7sZdxjouRBuCz5po+54HJ5Cdc9oEk5REplfQmNdvB4="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.17.1"; + version = "0.18.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 57f7e03d9012..167c821bc06f 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso="; - x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI="; - aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI="; - aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI="; - armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4="; + x86_64-linux = "sha256-MqZQ8aER3wA1StlXH1fRImg3Z3dnfdWvIWLq2SEGeok="; + x86_64-darwin = "sha256-mA8Qpif6drxQDIK8dqp+45P7GHe+2AYS7utsBVeOjAc="; + aarch64-linux = "sha256-RXnlJmT+LfLYByS0IKurGCfTBSDw52b3YIQD26L+lL0="; + aarch64-darwin = "sha256-p9EFEk1enIHr0LtKr+W7e9OW5n8AdeQEaWNLWe8+Lao="; + armv7l-linux = "sha256-X6VhFrlV4S08bPgARVmIAcizYqz2V4sQrwIGzkeDLuE="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.105.0"; + version = "1.105.1"; # This is used for VS Code - Remote SSH test - rev = "03c265b1adee71ac88f833e065f7bb956b60550a"; + rev = "7d842fb85a0275a4a8e4d7e040d2625abbf7f084"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-0tGqGDMmLURqdQwqFWCO10d/RkVha8iC0Uv/JFp9nNQ="; + hash = "sha256-lMNmzwFh8Wn1xXCTpTnQZozzIRaO5aMJ2wP42u2zWIs="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 894c6711a23e..1960fc844bcd 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -21,13 +21,13 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "box64"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "ptitSeb"; repo = "box64"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Z8r7aonVj7VSifgLKx/L7VRdGNnQtTvS4mjI+2+uPxY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-PVzv1790UhWbqLmw/93+mU3Gw8lQek7NBls4LXks4wQ="; }; # Setting cpu doesn't seem to work (or maybe isn't enough / gets overwritten by the wrapper's arch flag?), errors about unsupported instructions for target diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index cdb25e403ac5..ae63e12c2afe 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-10-03"; + version = "0-unstable-2025-10-10"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "e0e6cef46582a436e8b08a339f4751411dc5bd63"; - hash = "sha256-fIlTIF1042oWIHxqD7h7MdUfb6QDfIP0jqVlBNOTBmY="; + rev = "57155d8037463346307123daabeaa27298e0f956"; + hash = "sha256-eQaeAdQ7OWRzPVSbNOPUmMKIvkztZYGm2tzBavJO4Gs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 1d52812f13a1..24f19eda10f4 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-09-28"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "150a8e02ec53bfd5fc571587dab902c075f9e291"; - hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M="; + rev = "fe0bdab8a04eedb912634d89ad8137de75529cff"; + hash = "sha256-kF69s5rGp4XWtoaDWTu66VoUFjba0BFNBdKuA0OKkms="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index f08e15ac8948..3d530034d18c 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-10-03"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "af5f67c15d52b16d35e95671a5b74502288c4397"; - hash = "sha256-eMkyNwGdgyYDmwqYy3xzzSTYqUcoKpQkDYFP8bQdz58="; + rev = "5d628f8167947bc8a2a7608d52e4ff8b71b9ef34"; + hash = "sha256-QKUAVJsJL1Ff8KNz6lpMU/IZNb1I09++AqqccIBdAPw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 70c202e6b30a..87f426946fc9 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-09-18"; + version = "0-unstable-2025-10-10"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "0092232a0aaef0ded0ead1c2003ccf7a85ccdfc0"; - hash = "sha256-baiTlYArNSBz79Cm16Sg3VZEp909zMkF/ExqhrPYN80="; + rev = "b75225203ffea8b65124bb31acb598e91e7f22d9"; + hash = "sha256-q2gq4eBa1I89PROkxTt7XGIjI2H1eWFDi6lMH+emlmg="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index ab9d5f5c667f..ee411c1283e6 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-10-06"; + version = "0-unstable-2025-10-17"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "252a94c0c40047b52d9ecced567846a9dd5b2020"; - hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI="; + rev = "a2fa5673736922540978c73f4610b82e71de3cf8"; + hash = "sha256-CGxfucym0HyrIUZoDFJU5lfq4t5yfnOaJqqggDoQWp8="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 9d8380bc2644..e9f83de8e6fa 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-09-22"; + version = "0-unstable-2025-10-01"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "a3d84f977b721cda752299739fec525addce1ef9"; - hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk="; + rev = "2180be50f804952f94ce848fab8d3f8b6d76d027"; + hash = "sha256-Fikcp2Bik4PNOFfu9FoEWJid/OoLYPJ6cZG4aA9jgEo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index a7ff3c629923..f25cc0a69017 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.5.6"; + version = "6.5.7"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - hash = "sha256-7BDg4OqkFzE1WTee3nbHRhR2bYOLOUcLZkdIY6ppDas="; + hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 16602868fda4..d262481af354 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -45,7 +45,9 @@ let x86_64-darwin = "mac"; }; - arch = mozillaPlatforms.${stdenv.hostPlatform.system}; + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem; isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index d3b9aec99a8a..7e2698aee6da 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -47,23 +47,7 @@ let extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch) - ] - ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 { - # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003 - name = "rustc-1.89.patch"; - url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs"; - extraPrefix = ""; - hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4="; - }) - ++ lib.optionals (lib.versionOlder version "139") [ - # clang-19 fixes for char_traits build issue - # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac - # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4 - # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950 - ./0001-Removed-lookup-against-basic_string-uint8_t.patch - ./0001-Implemented-char_traits-for-SEXP-octet_t.patch ]; - extraPassthru = { icu73 = icu73'; icu77 = icu77'; @@ -101,8 +85,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "143.0.1"; - sha512 = "5f4fd5e4f5bc9fee9852d51b8e675f7c9c605660332c24aa0c90e5437301b468153c1788720bc80a53cfc1c3bf95a4bdb622a0533b8f11fb9853b290485c47c6"; + version = "144.0.1"; + sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; @@ -115,8 +99,8 @@ rec { thunderbird-140 = common { applicationName = "Thunderbird ESR"; - version = "140.3.0esr"; - sha512 = "82a9c4aa250b01e0e4d53890b0337972e46504636831c1b6307b841c4c5aeec86482b2da3c1666c46e870a75f6cb54db9f759664688b382ad66efa647145d900"; + version = "140.4.0esr"; + sha512 = "23a7c99f51a346f9df6e0da257040a78da0b9afd70966a0fd5c0f5a4dcd4806520f8d510a382cf5d76a099aa889219a5eec185b774a6a9b65c4ccdcb75662554"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-140"; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index d6ff00df10c1..4531ae3d7f36 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { "out" "dev" ]; - version = "15.70.4"; + version = "15.70.6"; src = let @@ -39,11 +39,11 @@ mkDerivation rec { { x86_64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_amd64.deb"; - hash = "sha256-VF/afz1PUnoPhc/Bi2P3eTAz6l0aecWEnl0Tcehv4RA="; + hash = "sha256-39hJPR9rS5EAaNc0jaBndwYAkSE7r2dz0H1vQDfUhK8="; }; aarch64-linux = fetchurl { url = "${base_url}/teamviewer_${version}_arm64.deb"; - hash = "sha256-XronqLbPnXrCUF8v6oVjUO2xv4OM8MyJLffbv8/FEcg="; + hash = "sha256-mXJObC8KFjRkw6IbSOpL1MxL58Bk4QovA8zDalPi56g="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 87053189f64e..3977ac1249f2 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -21,13 +21,13 @@ let # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "76235099ed556e52003de63522fdd74e61d53a36"; + partsSha = "4f7d39b22a6c307e6cca62c7f78eae96696e8b2c"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y="; + hash = "sha256-mAzY5CVZJF5hAvWVlDiYRxoB+9mGDG9OI/8n9aY5aFE="; }; # Header-only library @@ -41,13 +41,13 @@ in stdenv.mkDerivation { pname = "fritzing"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-app"; - rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25"; - hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0="; + rev = "b9add9eaa7c426963de20c8514a69d3f15e83bdf"; + hash = "sha256-OnIX+2eXT0JAs6VgSAIr1t+2DhpoUDgKVGPFjjZrKas="; }; patches = [ @@ -99,11 +99,14 @@ stdenv.mkDerivation { ''; env = { - NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" - "-I${svgpp}/include" - "-I${clipper}/include/polyclipping" - ]; + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( + [ + "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" + "-I${svgpp}/include" + "-I${clipper}/include/polyclipping" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${qt5compat}/lib" ] + ); NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; }; diff --git a/pkgs/applications/version-management/monotone/botan2.nix b/pkgs/applications/version-management/monotone/botan2.nix new file mode 100644 index 000000000000..616dffa0adbe --- /dev/null +++ b/pkgs/applications/version-management/monotone/botan2.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchurl, + pkgsStatic, + python3, + docutils, + bzip2, + zlib, + darwin, + static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* + enableForMonotone ? false, # Is it being imported for Monotone use? +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "botan"; + version = "2.19.5"; + + __structuredAttrs = true; + enableParallelBuilding = true; + strictDeps = true; + + outputs = [ + "bin" + "out" + "dev" + "doc" + "man" + ]; + + src = fetchurl { + url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; + }; + + nativeBuildInputs = [ + python3 + docutils + ]; + + buildInputs = [ + bzip2 + zlib + ]; + + buildTargets = [ + "cli" + ] + ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ] + ++ lib.optionals static [ "static" ] + ++ lib.optionals (!static) [ "shared" ]; + + botanConfigureFlags = [ + "--prefix=${placeholder "out"}" + "--bindir=${placeholder "bin"}/bin" + "--docdir=${placeholder "doc"}/share/doc" + "--mandir=${placeholder "man"}/share/man" + "--no-install-python-module" + "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}" + "--with-bzip2" + "--with-zlib" + "--with-rst2man" + "--cpu=${stdenv.hostPlatform.parsed.cpu.name}" + ] + ++ lib.optionals stdenv.cc.isClang [ + "--cc=clang" + ] + ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ + "--os=mingw" + ]; + + configurePhase = '' + runHook preConfigure + python configure.py ''${botanConfigureFlags[@]} + runHook postConfigure + ''; + + preInstall = '' + if [ -d src/scripts ]; then + patchShebangs src/scripts + fi + ''; + + postInstall = '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + ''; + + doCheck = true; + + meta = with lib; { + description = "Cryptographic algorithms library"; + homepage = "https://botan.randombit.net"; + mainProgram = "botan"; + maintainers = with maintainers; [ + raskin + ]; + platforms = platforms.unix; + license = licenses.bsd2; + knownVulnerabilities = lib.optional ( + !enableForMonotone + ) "Botan2 is EOL and its full interface surface contains unpatched vulnerabilities"; + }; +}) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index b72173aef2fd..0d2b3537dfaa 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, boost, zlib, - botan2, libidn, lua, pcre, @@ -19,11 +18,14 @@ autoreconfHook, texinfo, fetchpatch, + callPackage, }: let version = "1.1-unstable-2021-05-01"; perlVersion = lib.getVersion perl; + + botan = callPackage ./botan2.nix { enableForMonotone = true; }; in assert perlVersion != ""; @@ -79,7 +81,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib - botan2 + botan libidn lua pcre diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index b578050bf8c9..e484f6b0bde2 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -89,7 +89,6 @@ in nasm, nspr, nss_esr, - nss_3_115, nss_latest, onnxruntime, pango, @@ -572,14 +571,7 @@ buildStdenv.mkDerivation { xorg.pixman xorg.xorgproto zlib - ( - if (lib.versionAtLeast version "144") then - nss_latest - else if (lib.versionAtLeast version "143") then - nss_3_115 - else - nss_esr - ) + (if (lib.versionAtLeast version "144") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 909dc1321b76..9cd3aa0a7c18 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1241,7 +1241,8 @@ rec { result ); - # This function streams a docker image that behaves like a nix-shell for a derivation + # This function streams a docker image that behaves like a nix-shell for a derivation. + # # Docs: doc/build-helpers/images/dockertools.section.md # Tests: nixos/tests/docker-tools-nix-shell.nix streamNixShellImage = @@ -1251,6 +1252,9 @@ rec { tag ? null, uid ? 1000, gid ? 1000, + # Default to `/build` instead of a non-existent `/homeless-shelter` for backwards compatibility. + # + # https://github.com/NixOS/nix/issues/6379 homeDirectory ? "/build", shell ? bashInteractive + "/bin/bash", command ? null, @@ -1357,10 +1361,14 @@ rec { binSh usrBinEnv (fakeNss.override { - # Allows programs to look up the build user's home directory + # Allows programs to look up the build user's home directory. + # # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416 - # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir. - # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379 + # + # This slightly differs, however, since we use the passed-in `homeDirectory` instead of `sandboxBuildDir`. + # We're doing this because it is arguably a bug in Nix that `sandboxBuildDir` is used here. + # + # https://github.com/NixOS/nix/issues/6379 extraPasswdLines = [ "nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell" ]; @@ -1373,12 +1381,11 @@ rec { fakeRootCommands = '' # Effectively a single-user installation of Nix, giving the user full # control over the Nix store. Needed for building the derivation this - # shell is for, but also in case one wants to use Nix inside the - # image + # shell is for, but also in case one wants to use Nix inside the image. mkdir -p ./nix/{store,var/nix} ./etc/nix chown -R ${toString uid}:${toString gid} ./nix ./etc/nix - # Gives the user control over the build directory + # Gives the user control over the build directory. mkdir -p .${sandboxBuildDir} chown -R ${toString uid}:${toString gid} .${sandboxBuildDir} ''; @@ -1403,7 +1410,8 @@ rec { config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars; }; - # Wrapper around streamNixShellImage to build an image from the result + # Wrapper around `streamNixShellImage` to build an image from the result. + # # Docs: doc/build-helpers/images/dockertools.section.md # Tests: nixos/tests/docker-tools-nix-shell.nix buildNixShellImage = diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 8e0c31334263..45c7599b1c74 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -190,18 +190,7 @@ lib.makeOverridable ( "FETCHGIT_HTTP_PROXIES" ]; - inherit preferLocalBuild allowedRequisites; - - meta = meta // { - identifiers = { - purlParts = { - type = "generic"; - # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md - spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}"; - }; - } - // meta.identifiers or { }; - }; + inherit preferLocalBuild meta allowedRequisites; passthru = { gitRepoUrl = url; diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index a1235cd6e836..dfe210f32c41 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -47,28 +47,11 @@ lib.makeOverridable ( meta // { homepage = meta.homepage or baseUrl; - identifiers = { - purlParts = - if githubBase == "github.com" then - { - type = "github"; - # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md - spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}"; - } - else - { - type = "generic"; - # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md - spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}"; - }; - } - // meta.identifiers or { }; } // lib.optionalAttrs (position != null) { # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation position = "${position.file}:${toString position.line}"; }; - passthruAttrs = removeAttrs args [ "owner" "repo" @@ -172,12 +155,12 @@ lib.makeOverridable ( // passthruAttrs // { inherit name; - meta = newMeta; }; in fetcher fetcherArgs // { + meta = newMeta; inherit owner repo tag; rev = revWithTag; } diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix index 2d4f7e5a6391..d291c57429c1 100644 --- a/pkgs/build-support/fetchpypi/default.nix +++ b/pkgs/build-support/fetchpypi/default.nix @@ -51,8 +51,6 @@ makeOverridable ( format ? "setuptools", sha256 ? "", hash ? "", - pname, - version, ... }@attrs: let @@ -62,20 +60,8 @@ makeOverridable ( "hash" ] ); - meta = { - identifiers.purlParts = { - type = "pypi"; - # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md - spec = "${pname}@${version}"; - }; - }; in fetchurl { - inherit - url - sha256 - hash - meta - ; + inherit url sha256 hash; } ) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index c35e03cada76..ac31c22ab4a2 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -57,6 +57,7 @@ actual, expected, postFailureMessage ? null, + checkMetadata ? true, }: runCommand "equal-contents-${lib.strings.toLower assertion}" { @@ -66,12 +67,13 @@ expected postFailureMessage ; + excludeMetadata = if checkMetadata then "no" else "yes"; nativeBuildInputs = [ diffoscopeMinimal ]; } '' echo "Checking:" printf '%s\n' "$assertion" - if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata=no -- "$actual" "$expected" + if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata="$excludeMetadata" -- "$actual" "$expected" then echo echo 'Contents must be equal, but were not!' diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index b3e7dc491ceb..35bbf591fd53 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,28 +29,28 @@ }, "beta": { "linux": { - "version": "8.11.14-19.BETA", + "version": "8.11.14-20.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz", - "hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz", + "hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz", - "hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz", + "hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc=" } } }, "darwin": { - "version": "8.11.14-19.BETA", + "version": "8.11.14-20.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip", - "hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip", + "hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip", - "hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM=" + "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip", + "hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM=" } } } diff --git a/pkgs/by-name/ae/aeron/package.nix b/pkgs/by-name/ae/aeron/package.nix index e24a4db1c012..c8234842d170 100644 --- a/pkgs/by-name/ae/aeron/package.nix +++ b/pkgs/by-name/ae/aeron/package.nix @@ -8,49 +8,483 @@ let pname = "aeron"; - version = "1.44.1"; + version = "1.49.0"; groupId = "io.aeron"; - aeronAll_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-all"; - hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; - }; - - aeronSamples_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-samples"; - hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg=="; - }; - - aeronAll_1_42_1 = fetchMavenArtifact { + aeronAll_1_49_0 = fetchMavenArtifact { inherit groupId; artifactId = "aeron-all"; - version = "1.42.1"; - hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + version = "1.49.0"; + hash = "sha256-n3qoLs+iYzrb95skr29DrpQPHsWBZL6IygnayNJ1s6Q="; }; - aeronSamples_1_42_1 = fetchMavenArtifact { + aeronSamples_1_49_0 = fetchMavenArtifact { inherit groupId; - version = "1.42.1"; + version = "1.49.0"; artifactId = "aeron-samples"; - hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; + hash = "sha256-ePhAUBebeZP5exfBOGpUTTntAeZIdsolPuyhpbv0GVo="; }; - aeronAll_1_43_0 = fetchMavenArtifact { + aeronAll_1_48_6 = fetchMavenArtifact { inherit groupId; artifactId = "aeron-all"; - version = "1.43.0"; - hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q=="; + version = "1.48.6"; + hash = "sha256-IWURDka8Qudit1nN/aHi4DHOAxpj++/1iSAbI5QNaBg="; }; - aeronSamples_1_43_0 = fetchMavenArtifact { + aeronSamples_1_48_6 = fetchMavenArtifact { inherit groupId; - version = "1.43.0"; + version = "1.48.6"; artifactId = "aeron-samples"; - hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg=="; + hash = "sha256-L5DFzZSfBRSGZOxDkfX1CTYyRNawd8tJLQaLZzYQTew="; + }; + + aeronAll_1_48_5 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.5"; + hash = "sha256-yPLTh8bYBRwG0y5Tc+Z9TSSoYZSe55RQOb22LbBL804="; + }; + + aeronSamples_1_48_5 = fetchMavenArtifact { + inherit groupId; + version = "1.48.5"; + artifactId = "aeron-samples"; + hash = "sha256-poxiGXdA2SWJQ1oFe8kh2q5T5GOytrxcAhkNv5k64Qo="; + }; + + aeronAll_1_48_4 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.4"; + hash = "sha256-6a8rgdNPkbYqo8N/7tSS4LxDF1j0s4JvDlYNSUSgrog="; + }; + + aeronSamples_1_48_4 = fetchMavenArtifact { + inherit groupId; + version = "1.48.4"; + artifactId = "aeron-samples"; + hash = "sha256-nB5YqF+jd2C8f++1pH36aZNtuscfP5ZMKx/6W3iiz4I="; + }; + + aeronAll_1_48_3 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.3"; + hash = "sha256-VEyowi5J7mJWQ+Xj8dO7iL2cHLkeEzcJZkk5yyuDeuU="; + }; + + aeronSamples_1_48_3 = fetchMavenArtifact { + inherit groupId; + version = "1.48.3"; + artifactId = "aeron-samples"; + hash = "sha256-/E7fF8Np8D3/DYHYLeRjLPkP3AQJ5kTYvZRsQmyUBzk="; + }; + + aeronAll_1_48_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.2"; + hash = "sha256-PQFlitiG43NO8zx/JfXiu7R5x/cYU/o5/x9U4/CioEw="; + }; + + aeronSamples_1_48_2 = fetchMavenArtifact { + inherit groupId; + version = "1.48.2"; + artifactId = "aeron-samples"; + hash = "sha256-nQ4kv/nQV0zkDgCL716AtRzEK/FDenHZMFNOhgVkd3s="; + }; + + aeronAll_1_48_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.1"; + hash = "sha256-ZRf4YZLxF1O6GhWpCFS/PJqIHyti3dHCXPoxuuiJEz0="; + }; + + aeronSamples_1_48_1 = fetchMavenArtifact { + inherit groupId; + version = "1.48.1"; + artifactId = "aeron-samples"; + hash = "sha256-wtCOtwtp6hQUm7SfCV5yP4bwxufs8kRgA4V9/LRoAls="; + }; + + aeronAll_1_48_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.48.0"; + hash = "sha256-eUc9tdR6iOGivovzX00VxLuHvEcXMFKxs2oJqug+ayA="; + }; + + aeronSamples_1_48_0 = fetchMavenArtifact { + inherit groupId; + version = "1.48.0"; + artifactId = "aeron-samples"; + hash = "sha256-31WO354XNsR2sZNPoh9kCNfSTz/ZM44IoRnmsx1iwMU="; + }; + + aeronAll_1_47_7 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.7"; + hash = "sha256-8j2nKjAjZ3tpGbCPtQ3opGL4y3vVR2kC5Wh8xQvVG8Q="; + }; + + aeronSamples_1_47_7 = fetchMavenArtifact { + inherit groupId; + version = "1.47.7"; + artifactId = "aeron-samples"; + hash = "sha256-zKan26LpNFOAst78qN0S9tmG59oKKowVphCYKfMu1lg="; + }; + + aeronAll_1_47_5 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.5"; + hash = "sha256-Hi7I/N+L4l05rNjfqPf4fUEFOAzt8FWx5T9UDAdVOLI="; + }; + + aeronSamples_1_47_5 = fetchMavenArtifact { + inherit groupId; + version = "1.47.5"; + artifactId = "aeron-samples"; + hash = "sha256-VFFfZKosTfMx1/C8qgSZNpYGP9oqN2y+rcbyTNH7vYE="; + }; + + aeronAll_1_47_4 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.4"; + hash = "sha256-PHc3vcRYI1rIJanrNyz7wCFE9znzPZMprPGO+oO8Tgc="; + }; + + aeronSamples_1_47_4 = fetchMavenArtifact { + inherit groupId; + version = "1.47.4"; + artifactId = "aeron-samples"; + hash = "sha256-z/FubK2sIDm8KtlaNwrO1nTlZrw+PC9tjGoiWbe7wBE="; + }; + + aeronAll_1_47_3 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.3"; + hash = "sha256-K5pVvHY0jltueoEjTv8tr9z/EtTwkhLjgE9Qw+mtN50="; + }; + + aeronSamples_1_47_3 = fetchMavenArtifact { + inherit groupId; + version = "1.47.3"; + artifactId = "aeron-samples"; + hash = "sha256-6HU7ykfDXlrQCdB5hYjZsQV+s0yFybXKqN8QHkEqSrw="; + }; + + aeronAll_1_47_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.2"; + hash = "sha256-qQAp3YcuIoxIJKgxoZ1ahNGRjS+b+Vr6PicN3S4xYUw="; + }; + + aeronSamples_1_47_2 = fetchMavenArtifact { + inherit groupId; + version = "1.47.2"; + artifactId = "aeron-samples"; + hash = "sha256-GVmAxQQZrfixMqylDh/TNXJk4cF0Z1Tg/iTaeohRrdw="; + }; + + aeronAll_1_47_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.1"; + hash = "sha256-QoKJxdkrZ8P7JwCFUGZ1lukG/Q4MgwksAp1R5RdVea0="; + }; + + aeronSamples_1_47_1 = fetchMavenArtifact { + inherit groupId; + version = "1.47.1"; + artifactId = "aeron-samples"; + hash = "sha256-FPkDrp0vyStm62Kf+F160KTXhNu5CdaQaB48uJkNC78="; + }; + + aeronAll_1_47_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.47.0"; + hash = "sha256-CfWsJBpk637o+CKkvpAMS+muEY/8tCh4SkEML8kYY1k="; + }; + + aeronSamples_1_47_0 = fetchMavenArtifact { + inherit groupId; + version = "1.47.0"; + artifactId = "aeron-samples"; + hash = "sha256-QVlBif/EmzFTB3XPLWXRdZME46Ipky+O300AH+kd9+M="; + }; + + aeronAll_1_46_9 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.9"; + hash = "sha256-HlIZfQHb3lKE773cE3bWZfAmkUkHD9qhUqHwlPLSvrw="; + }; + + aeronSamples_1_46_9 = fetchMavenArtifact { + inherit groupId; + version = "1.46.9"; + artifactId = "aeron-samples"; + hash = "sha256-o1PcXx8/z+rDHzTP/zSK2LjLM1TRmqSxW/KtCNBzsuc="; + }; + + aeronAll_1_46_8 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.8"; + hash = "sha256-+Y6kz+rvnzw4Q/K00Y1us3XQAkHpUSoe1nAS9yS6U4I="; + }; + + aeronSamples_1_46_8 = fetchMavenArtifact { + inherit groupId; + version = "1.46.8"; + artifactId = "aeron-samples"; + hash = "sha256-7kT+Ueg9RxrjKmLSfuUMpqbhUkGwGq0P3fpw2J1ruyg="; + }; + + aeronAll_1_46_7 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.7"; + hash = "sha256-3tLtPFtzmR4xxDmnViopTl1VZvlVw6noEImiimtbnVU="; + }; + + aeronSamples_1_46_7 = fetchMavenArtifact { + inherit groupId; + version = "1.46.7"; + artifactId = "aeron-samples"; + hash = "sha256-XaG8r2a2xXRUqdgK491KOSlptSu7dM3vzEHAh91aBqI="; + }; + + aeronAll_1_46_6 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.6"; + hash = "sha256-PMcXyzpjBkBC4qnb76D+22qPdgs7mhagZDWvGt9CXwk="; + }; + + aeronSamples_1_46_6 = fetchMavenArtifact { + inherit groupId; + version = "1.46.6"; + artifactId = "aeron-samples"; + hash = "sha256-JBf5531tiRY8w1lSPfic2TnepNln6CJ3PC9S56Fi68Q="; + }; + + aeronAll_1_46_5 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.5"; + hash = "sha256-ozFVbbNqqYb+giORCtTkNBcn06F0Lfu12Eyd5r/E370="; + }; + + aeronSamples_1_46_5 = fetchMavenArtifact { + inherit groupId; + version = "1.46.5"; + artifactId = "aeron-samples"; + hash = "sha256-0U/Ye9VcCeCtpBdBE7JUaEHe4wsE+yoa+ndLPVJiuBs="; + }; + + aeronAll_1_46_4 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.4"; + hash = "sha256-9TMGUZ9NUYMXihSFElifeqpJc0Sz7ks9NOcvjUSofaM="; + }; + + aeronSamples_1_46_4 = fetchMavenArtifact { + inherit groupId; + version = "1.46.4"; + artifactId = "aeron-samples"; + hash = "sha256-qo+HRhsdK/LLpAcZz4M4gxlngnokYIaJc1F/KMX8sDQ="; + }; + + aeronAll_1_46_3 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.3"; + hash = "sha256-lToJIeTM84rAA/oiNqRNdYs5Ropfuw9WJ08Nb0m87MQ="; + }; + + aeronSamples_1_46_3 = fetchMavenArtifact { + inherit groupId; + version = "1.46.3"; + artifactId = "aeron-samples"; + hash = "sha256-MRNGUCOW3w7gctNLsle39Zus89RBS1ukc34o4pzHOnU="; + }; + + aeronAll_1_46_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.2"; + hash = "sha256-2iwmx1X1gbjUabRyCR6Ek6iuDKhtvgEonwBdbF0h3MY="; + }; + + aeronSamples_1_46_2 = fetchMavenArtifact { + inherit groupId; + version = "1.46.2"; + artifactId = "aeron-samples"; + hash = "sha256-jv8tWpuuRnCQSlGGtd9ger562IF/5x0wSEtrlM1s1Ks="; + }; + + aeronAll_1_46_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.1"; + hash = "sha256-KH2mt64ewpdwLOM7q95l0j3ftLOCu3uICcaVUXe/vyY="; + }; + + aeronSamples_1_46_1 = fetchMavenArtifact { + inherit groupId; + version = "1.46.1"; + artifactId = "aeron-samples"; + hash = "sha256-IF9dRX/EUUF8An/baMxb9iEXq/wZlvvgdzKIk2c8+aA="; + }; + + aeronAll_1_46_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.46.0"; + hash = "sha256-ngFeYSDJxxqxawtGrALZrsjRO9WlPdnhdO9NuZKhPr8="; + }; + + aeronSamples_1_46_0 = fetchMavenArtifact { + inherit groupId; + version = "1.46.0"; + artifactId = "aeron-samples"; + hash = "sha256-arnWZD5znkrnn4usKG2R3gdUXljYKvoibFQ0b466iks="; + }; + + aeronAll_1_45_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.45.2"; + hash = "sha256-m1FJwC+1ZZlCPTU9KksLq7ozP3X1v7/kZaCb/vFwveQ="; + }; + + aeronSamples_1_45_2 = fetchMavenArtifact { + inherit groupId; + version = "1.45.2"; + artifactId = "aeron-samples"; + hash = "sha256-RB51I7WjV19pT7FCUH9FVrcbt64vjPIjMjRxgLIzEjw="; + }; + + aeronAll_1_45_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.45.1"; + hash = "sha256-cD50jk95OAcdPKJuc45t1O6WVRgM2j1gMZ5IudbL4U8="; + }; + + aeronSamples_1_45_1 = fetchMavenArtifact { + inherit groupId; + version = "1.45.1"; + artifactId = "aeron-samples"; + hash = "sha256-QSC5Yp35eJjUHByShdQWDP14jW1Y3pL3osLDGLsxsqg="; + }; + + aeronAll_1_45_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.45.0"; + hash = "sha256-gImfORn61k1fVyqPfr5Uk2Hu5yPfnShCXIUB3qSuFnI="; + }; + + aeronSamples_1_45_0 = fetchMavenArtifact { + inherit groupId; + version = "1.45.0"; + artifactId = "aeron-samples"; + hash = "sha256-7o37/YzQHTBguTlpoIXFa8JNFtyG7zKKnVdijIqAeDY="; + }; + + aeronAll_1_44_7 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.7"; + hash = "sha256-ZbM17fXbCZQWYjE1QG6MO506sMqth9ukD1an3RbxypA="; + }; + + aeronSamples_1_44_7 = fetchMavenArtifact { + inherit groupId; + version = "1.44.7"; + artifactId = "aeron-samples"; + hash = "sha256-vBtx5bN4JtOhvQwoHAof1Y7uLPiadQCNscw5eiaYDec="; + }; + + aeronAll_1_44_6 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.6"; + hash = "sha256-FJSPOvjXgcuqQQn8VuXz87sj4qfN7Ayt0CHg6CE2uHA="; + }; + + aeronSamples_1_44_6 = fetchMavenArtifact { + inherit groupId; + version = "1.44.6"; + artifactId = "aeron-samples"; + hash = "sha256-9NKudRW06/Q7xg/tDaVixBy1J0Pv3Y6FGOq0oG/IXO0="; + }; + + aeronAll_1_44_5 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.5"; + hash = "sha256-s9Jo2sU4obp6OrfLZjJvRlXYpyg3gsVnYH5xNQSjQSQ="; + }; + + aeronSamples_1_44_5 = fetchMavenArtifact { + inherit groupId; + version = "1.44.5"; + artifactId = "aeron-samples"; + hash = "sha256-hvRBaMoEM2KTHDXLruRnrUMi7VQH8QdDr79y1pLk/PA="; + }; + + aeronAll_1_44_4 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.4"; + hash = "sha256-CfoB7zJ4ZWZXOvy7fZoCg5zCiHI+6CTxLd7UgWslC5I="; + }; + + aeronSamples_1_44_4 = fetchMavenArtifact { + inherit groupId; + version = "1.44.4"; + artifactId = "aeron-samples"; + hash = "sha256-ZGkYlQCV60R1Ua3ecqBkCD3CN2r+/opx1oI1lKsqC7w="; + }; + + aeronAll_1_44_3 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.3"; + hash = "sha256-uqjLQUE6IEvGMwZqUOocL0NfK+dPIaQAJTAILIK6Kao="; + }; + + aeronSamples_1_44_3 = fetchMavenArtifact { + inherit groupId; + version = "1.44.3"; + artifactId = "aeron-samples"; + hash = "sha256-EfkhMx4iQIDqk3jnVf1oEvb21sN9GyLwJJjok619YW0="; + }; + + aeronAll_1_44_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.2"; + hash = "sha256-C3xr8OeVVpnmE70j+5meawWg+56/FhIBqQm9BTwbOj4="; + }; + + aeronSamples_1_44_2 = fetchMavenArtifact { + inherit groupId; + version = "1.44.2"; + artifactId = "aeron-samples"; + hash = "sha256-laY1xdgaBwwCVdAUrJtrFW2rduguRdcpTaglcWa0jB0="; }; aeronAll_1_44_1 = fetchMavenArtifact { @@ -67,8 +501,176 @@ let hash = "sha256-ZSuTed45BRzr4JJuGeXghUgEifv/FpnCzTNJWa+nwjo="; }; - aeronAll = aeronAll_1_44_1; - aeronSamples = aeronSamples_1_44_1; + aeronAll_1_44_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.44.0"; + hash = "sha256-j7WXJaIQZPKOTLmZg+nGxLUowYAuZYj062pmxS0ycnk="; + }; + + aeronSamples_1_44_0 = fetchMavenArtifact { + inherit groupId; + version = "1.44.0"; + artifactId = "aeron-samples"; + hash = "sha256-DXsYKnFvQT2BRGZyLXIfLBxglZMFRKBG3VDXD0UITLU="; + }; + + aeronAll_1_43_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.43.0"; + hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q=="; + }; + + aeronSamples_1_43_0 = fetchMavenArtifact { + inherit groupId; + version = "1.43.0"; + artifactId = "aeron-samples"; + hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg=="; + }; + + aeronAll_1_42_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.42.1"; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + }; + + aeronSamples_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-samples"; + hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; + }; + + aeronAll_1_42_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.42.0"; + hash = "sha256-rcUKHUh2rsBvO8kn2x+wYFRuM9XV21hINwFG7ej6uyw="; + }; + + aeronSamples_1_42_0 = fetchMavenArtifact { + inherit groupId; + version = "1.42.0"; + artifactId = "aeron-samples"; + hash = "sha256-dmLEuEcgUuoEBEM0zW+c+0o6oOpIk+5FCzZgP5j1jXk="; + }; + + aeronAll_1_41_6 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.6"; + hash = "sha256-YUfQ98lGEeGjl1LB12tP9fON+KycMUJFI7ntqsYa3O8="; + }; + + aeronSamples_1_41_6 = fetchMavenArtifact { + inherit groupId; + version = "1.41.6"; + artifactId = "aeron-samples"; + hash = "sha256-vaO2meykLq5aK6Y0DINcVCq920Qns8GCFu18CavCvis="; + }; + + aeronAll_1_41_5 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.5"; + hash = "sha256-+yYOBwRsWgAtmDplB9dltU76wTX650KharSkMjWlG6M="; + }; + + aeronSamples_1_41_5 = fetchMavenArtifact { + inherit groupId; + version = "1.41.5"; + artifactId = "aeron-samples"; + hash = "sha256-1RHFDMtaAJHKNdz32Aeo6YplvoMDJerQRi10NUyp/OI="; + }; + + aeronAll_1_41_4 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.4"; + hash = "sha256-Z06nAaCO1LU6ChNm4YnipuUNgusY7iY6WhV8AeBPRoE="; + }; + + aeronSamples_1_41_4 = fetchMavenArtifact { + inherit groupId; + version = "1.41.4"; + artifactId = "aeron-samples"; + hash = "sha256-9gyKDu7R/Q8HtkCR5D1ohZnVa1jIOv5Z0lgOcRIumCw="; + }; + + aeronAll_1_41_3 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.3"; + hash = "sha256-aQ+oZ6oqi853fZfwRcGpgRsuEAfP7AJsu5C0pfwxlzU="; + }; + + aeronSamples_1_41_3 = fetchMavenArtifact { + inherit groupId; + version = "1.41.3"; + artifactId = "aeron-samples"; + hash = "sha256-FTiz5IrPoE1zWNjAym4ynjvny0p8uP7QzizK1jCJKgM="; + }; + + aeronAll_1_41_2 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.2"; + hash = "sha256-0XSoKbFnhEwOlx0+9cJj/Qf6XAUjtskun9BwIq/WxW8="; + }; + + aeronSamples_1_41_2 = fetchMavenArtifact { + inherit groupId; + version = "1.41.2"; + artifactId = "aeron-samples"; + hash = "sha256-7ht2Jklvx3cfk2PopRjUVDQ0Uo+5M5262SI91ItS9Ow="; + }; + + aeronAll_1_41_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.1"; + hash = "sha256-/JufYICrSefm9nGlVcfQHcUkYMnzrZcNDjB8fAfSKGE="; + }; + + aeronSamples_1_41_1 = fetchMavenArtifact { + inherit groupId; + version = "1.41.1"; + artifactId = "aeron-samples"; + hash = "sha256-6/o1t6/ehYYhMqU6pYQ0uScZhsZTuowr0uwJ3TbmtHk="; + }; + + aeronAll_1_41_0 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + version = "1.41.0"; + hash = "sha256-g2dFf+htF72ByJCcjKuHtLuehLtjjjpqjvWq1rTkmYg="; + }; + + aeronSamples_1_41_0 = fetchMavenArtifact { + inherit groupId; + version = "1.41.0"; + artifactId = "aeron-samples"; + hash = "sha256-nUX9JM0p06m0XyH4ugPXQ0+Fc9ydmhJlaND+VUCZ788="; + }; + + aeronAll_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-all"; + hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; + }; + + aeronSamples_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-samples"; + hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg=="; + }; + + aeronAll = aeronAll_1_49_0; + aeronSamples = aeronSamples_1_49_0; in stdenv.mkDerivation { diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 2073de8fc4b6..4693f5c78aab 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -81,13 +81,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.10.0"; + version = "4.8.11.0"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-w1uBhp47XRinZpSuKeFaASOIOyjRDkDA81uqW4pK3F4="; + hash = "sha256-JZ6cGqLybHgy6xIklH3A//XNXiXlsM4NixGmk0KoubU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 24488ad5690e..515a4190aab6 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-09-09"; + version = "0-unstable-2025-10-17"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "0f5d7883cc4c49b8e9c51d5512ba145b5289eb05"; - hash = "sha256-8zzUp1am6nu/6EnQkPTDkd/TLb2SBgSSyNpUyv44Zr8="; + rev = "53b0c689faaa4bb7edcb9dae799602c417634351"; + hash = "sha256-awGCaVl0m1IqADeQW53wFSEAeUYR6677oc0Z2ZfZ898="; }; dontConfigure = true; diff --git a/pkgs/by-name/ap/applesauce/package.nix b/pkgs/by-name/ap/applesauce/package.nix index 0351a00a2919..ea721fe91a14 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.19"; + version = "0.5.20"; src = fetchFromGitHub { owner = "Dr-Emann"; repo = "applesauce"; tag = "applesauce-cli-v${finalAttrs.version}"; - hash = "sha256-OJZOB7h3qFkaCaPi+EJxIFX8q/Q38vtI0CmDK4PMD1g="; + hash = "sha256-KiivMFp772x/rFHh9PpDBjCxxC/6n6+KyAaZTmhnZV0="; }; - cargoHash = "sha256-gQQpvS2LtlDBXjTqQvSUCXv5UCiQm1kiS/yPcG5KGxY="; + cargoHash = "sha256-WyDHp34NQi3/OotM4+4/d4ySOSYg+PDDmnLUn5R9yaU="; meta = { description = "Transparent compression for Apple File System Compression (AFSC)"; diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix index 1ae19d83a0c5..359b95048205 100644 --- a/pkgs/by-name/ap/apprun-cli/package.nix +++ b/pkgs/by-name/ap/apprun-cli/package.nix @@ -7,23 +7,30 @@ buildGoModule rec { pname = "apprun-cli"; - version = "0.3.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "fujiwara"; repo = "apprun-cli"; tag = "v${version}"; - hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc="; + hash = "sha256-3M+kRXTQ0yaxQc9E5T9UThqEda2S1F77SJzX7burZlU="; }; - vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ="; + vendorHash = "sha256-i3ZthsZVxAYQDX6ZA1bU81F4BbYSsWdu1sOAiY7FK7Y="; ldflags = [ "-s" "-w" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + # Until a stable version is released, v0 tags are incorrectly recognized as the latest, + # so specify minor releases + "^v0.([0-9.]+)$" + ]; + }; meta = { description = "CLI for sakura AppRun"; diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix index 5a3201507f1e..eff97be1b660 100644 --- a/pkgs/by-name/ba/balsa/package.nix +++ b/pkgs/by-name/ba/balsa/package.nix @@ -19,7 +19,7 @@ ninja, pkg-config, sqlite, - # webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { libsecret openssl sqlite - # webkitgtk_4_0 + webkitgtk_4_1 ]; mesonFlags = [ @@ -78,8 +78,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - # webkitgtk_4_0 was removed - broken = true; description = "E-mail client for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/balsa"; changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog"; diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index e1f8bd59e419..9128100012ce 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ="; + hash = "sha256-JWpdAO+OCqoWa6KVR8sxvHHy1SdR4BmRO0oU0ZAOWl0="; }; - cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc="; + cargoHash = "sha256-wb86yWWnRHs1vG8+oyhs6bUD4x7AdWvIvPPNBcLs4Hs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix index f1d635ddd900..46de5d468ba6 100644 --- a/pkgs/by-name/ba/bato/package.nix +++ b/pkgs/by-name/ba/bato/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "bato"; - version = "0.1.7"; + version = "0.2.1"; src = fetchFromGitHub { owner = "doums"; repo = "bato"; rev = "v${version}"; - hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA="; + hash = "sha256-pq+i4NGl7yv+vmMoYVT9JRvOsuV7nBqXpsebgMcNEY0="; }; - cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE="; + cargoHash = "sha256-ZVzIoq+s2Xw996NoQMIGHUqo2uXJMu9lXfY5Us9NMPg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix index 70d2a9bc4bb3..938bb3b458ee 100644 --- a/pkgs/by-name/bi/bitbox/package.nix +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -21,14 +21,14 @@ let in stdenv.mkDerivation rec { pname = "bitbox"; - version = "4.48.1"; + version = "4.48.6"; src = fetchFromGitHub { owner = "BitBoxSwiss"; repo = "bitbox-wallet-app"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-zpkjYnGsmPKjxUpp2H1qSzqthOO1mTmki3bPqo35sBo="; + hash = "sha256-qNcwBaJywWMo/Bb1QkOM9FQ76Sf2DqULUr+W583ufAk="; }; postPatch = '' diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 6b260b63966b..6a7a27cb3958 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "regexident"; repo = "cargo-modules"; tag = "v${version}"; - hash = "sha256-ZotG9eYVwNb123dQ6D4bsVCb7vS/jc/I67JPrQnJ59U="; + hash = "sha256-FghGqRV9KaRPZ7l3t/AB7f1XufOsNdiGFUk8GUwAxtY="; }; - cargoHash = "sha256-CNOzNaA/bOvuBsON42m0cPEvAcqpCp1oNNOetuDEN04="; + cargoHash = "sha256-Lt5zqhBpHlPYoPgIVmVYu35SnuguqPw5Qg0oTL5cgCs="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 60b6929118ca..a9c669125dd5 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-Ty+W5uiFkr8MBhWUweHsFQnIZ8R+oJoCcvQabHFdu7U="; + hash = "sha256-MZA9PkDftUyHqcC5i9QLvMTq+q1m7MVEkMPyD4EiWtk="; }; - vendorHash = "sha256-YjkO3QTQZlCfbKm/uYNVwnyQ/1Tde77YB2m7CqKsRtM="; + vendorHash = "sha256-tPhWKjaoUHQq6MdhktSZpfF7651YKeWd9ecg8V3E6aQ="; subPackages = [ "cmd/cdncheck/" ]; diff --git a/pkgs/by-name/ce/celestegame/celeste/default.nix b/pkgs/by-name/ce/celestegame/celeste.nix similarity index 94% rename from pkgs/by-name/ce/celestegame/celeste/default.nix rename to pkgs/by-name/ce/celestegame/celeste.nix index e56467ec5e04..7158be54b3a6 100644 --- a/pkgs/by-name/ce/celestegame/celeste/default.nix +++ b/pkgs/by-name/ce/celestegame/celeste.nix @@ -8,10 +8,11 @@ unzip, yq, dotnet-runtime_8, + everest, executableName ? "Celeste", desktopItems ? null, - everest ? null, + withEverest ? false, overrideSrc ? null, writableDir ? null, launchFlags ? "", @@ -36,12 +37,12 @@ let phome = "$out/lib/Celeste"; launchFlags' = - if launchFlags != "" && everest == null then + if launchFlags != "" && !withEverest then lib.warn "launchFlags is useless without Everest." "" else launchFlags; launchEnv' = - if launchEnv != "" && everest == null then + if launchEnv != "" && !withEverest then lib.warn "launchEnv is useless without Everest." "" else '' @@ -91,7 +92,7 @@ stdenvNoCC.mkDerivation { mkdir -p ${phome} unzip -q $src -d ${phome} '' - + lib.optionalString (everest != null) '' + + lib.optionalString withEverest '' cp -r ${everest}/* $out chmod -R +w ${phome} # Files copied from other derivations are not writable by default @@ -137,7 +138,7 @@ stdenvNoCC.mkDerivation { # https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201 # It is hardcoded that it launches Celeste instead of Celeste-unwrapped. # Therefore, we need to prevent it from restarting. - lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux" + lib.optionalString withEverest "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux" } --chdir ${phome} icon=$out/share/icons/hicolor/512x512/apps/Celeste.png @@ -149,7 +150,7 @@ stdenvNoCC.mkDerivation { dontStrip = true; dontPatchShebangs = true; postFixup = - lib.optionalString (everest != null) '' + lib.optionalString withEverest '' rm -r ${phome}/Mods # Currently it is empty. ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome} '' diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix index dd9afc490cff..0339ed298f2b 100644 --- a/pkgs/by-name/ce/celestegame/package.nix +++ b/pkgs/by-name/ce/celestegame/package.nix @@ -7,10 +7,11 @@ writeShellScript, autoPatchelfHook, runtimeShell, + # Override this to everest-bin if you want to use steam-run. + everest, + withEverest ? false, overrideSrc ? null, - # A package. Omit to build without Everest. - everest ? null, # If build with Everest, must set writableDir to the path of a writable dir # so that the mods can be installed there. # It must be an absolute path. @@ -29,8 +30,8 @@ # For those who would like to use steam-run or alike to launch Celeste # (useful when using the `olympus` package with its `celesteWrapper` argument overridden), -# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest, -# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest` +# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, +# and if you want Everest, override `everest` to `everest-bin` # (steam-run cannot launch the latter for some currently unclear reason). # For those who would like to launch Celeste without the need of any additional wrapper like steam-run, # install `celestegame` with the `writableDir` argument overridden. @@ -41,7 +42,7 @@ let executableName = "Celeste"; writableDir' = - if writableDir == null && everest != null then + if writableDir == null && withEverest then lib.warn "writableDir is not set, so mods will not work." "/tmp" else writableDir; @@ -49,10 +50,11 @@ let everestLogFilename = "everest-log.txt"; - celeste = callPackage ./celeste { + celeste = callPackage ./celeste.nix { inherit executableName everest + withEverest overrideSrc launchFlags launchEnv @@ -77,7 +79,7 @@ let in buildFHSEnv { inherit pname executableName; - version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}"); + version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}"); multiPkgs = pkgs: @@ -175,7 +177,7 @@ buildFHSEnv { exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste" chmod +x "${writableDir'}/Celeste" '' - + lib.optionalString (everest != null) '' + + lib.optionalString withEverest '' mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs} touch "${writableDir'}/${everestLogFilename}" @@ -203,10 +205,6 @@ buildFHSEnv { ); passthru.celeste-unwrapped = celeste; - passthru.everest = callPackage ./everest { }; - passthru.everest-bin = callPackage ./everest-bin { }; - - passthru.updateScript = ./update.sh; meta = { inherit (celeste.meta) diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index ef365b0fe97a..b13edb43edf6 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-IM8KcR5fNxLlzIvrrc5SD9ZK/+rtGnMudd8JrbTZ/1U="; - aarch64-linux = "sha256-bi+ihd+EFQ9GFL4l7aHeI/YhCIfFC90x48Y6EKaq2S8="; - x86_64-darwin = "sha256-62eNxxXYT0jjxl/5l+hz54Iq0S+BkoH8/z49e9BbDc0="; - aarch64-darwin = "sha256-5j2qvw6yN2MjHXfz1i1Q+xr1gmgKrzSAhFUFJEqu3ek="; + x86_64-linux = "sha256-moj3gSrnkBcsZ9GrvsJBvwW0tB1Yyg7iRXd9SsXaRYY="; + aarch64-linux = "sha256-v4YJKoTS/KRec3mqZdDTtAuPb6HI1G4c/rQoLan59KE="; + x86_64-darwin = "sha256-93zuCvQE2sQDFwK3nmRELa5EGosAcY4D0E5yqREVXOY="; + aarch64-darwin = "sha256-5FvpzSbql92QrTr24yxcCi1t9uDTfgqamEZq7VWx618="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 8111ba57d56a..51d3144c37b4 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-o898VjjPKevr1VRlRhJUNWsrHEGEn7jkdzWBj+DpbCs="; + hash = "sha256-5AyatNXgHuia656OuSDozQzQv80bNHncgLN1X23bfM4="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-Qp5zezXjVdOp8OylLgUZRLc0HQlgII6nOZodnOrok6U="; + cargoHash = "sha256-PQ1NxwNBaI48gQ4GGoricA/j7vpsnaLlL6st5P+CTHk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix index 84db874f792b..9260aa7c73a9 100644 --- a/pkgs/by-name/co/conkeyscan/package.nix +++ b/pkgs/by-name/co/conkeyscan/package.nix @@ -2,6 +2,7 @@ lib, python3, fetchFromGitHub, + fetchpatch, }: let @@ -34,6 +35,15 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI="; }; + patches = [ + # https://github.com/CompassSecurity/conkeyscan/pull/3 + (fetchpatch { + name = "replace-random-user-agent-with-fake-useragent.patch"; + url = "https://github.com/nagapraneethk/conkeyscan/commit/f6cf61cc42fcc07930a06891b6c4a2653bfbf47f.patch"; + hash = "sha256-zfHU/KsgzQvn/kNsWZy1hGZaBHw/he1zDTUHHV/BHFc="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}" @@ -47,7 +57,7 @@ python.pkgs.buildPythonApplication rec { clize loguru pysocks - random-user-agent + fake-useragent readchar requests-ratelimiter ]; diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 80deaa80aad9..18b9242f45c9 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg="; + hash = "sha256-uw1xwE7hIE00OADV9kOXR1/gKSzvleW1/5PwfhH4fvE="; }; - cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY="; + cargoHash = "sha256-Yxln5eKNXONGd4Hy9Ru9t92iqK9zcTSpzu2j75bc3fk="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix index c920b271c568..c297cebaf644 100644 --- a/pkgs/by-name/cr/crates-lsp/package.nix +++ b/pkgs/by-name/cr/crates-lsp/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "crates-lsp"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "MathiasPius"; repo = "crates-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-s42nWQC2tD7vhQNPdTQNRokwXqeBhELidVYTlos+No0="; + hash = "sha256-HzoOsizeV2LOXXc8BKA7u5mwBJbWNaBZvPepAaVeTCQ="; }; - cargoHash = "sha256-XqUWcbaOZXRWzIvL9Kbo6Unl0rmeGxHO4+674uHukAs="; + cargoHash = "sha256-tQBNCTqvVNYqT5ArQE7ji0MeDWxi7Bcd9AxPP3sHvX4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index d8d714846df9..6d1c1df42727 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-RHw+FYj1oYM5Yf8YcU8tOsxG+3qu0ti/AYzcGxYAp/8="; + hash = "sha256-4Mvt8l6kDT7GR4ufIelQd9rTt5ljdpMVWwRGZV5jIc8="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix index d5d581facd37..b8a2c484a56e 100644 --- a/pkgs/by-name/de/deezer-enhanced/package.nix +++ b/pkgs/by-name/de/deezer-enhanced/package.nix @@ -28,11 +28,11 @@ stdenvNoCC.mkDerivation rec { pname = "deezer-enhanced"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb"; - hash = "sha256-zHgrLzPByAPww0aSEDETsddX71O/GU80AZH729YjQQ0="; + hash = "sha256-/FEp9J+5YrwPIu6/zPqUYjYRSU1iHdoIRs7WJLQIu+8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 420e9e7e6808..40d3e14f1e59 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.20.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw="; + hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc="; + hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ="; }; }; electron = electron_37; @@ -37,19 +37,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.20.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-tzRk4IwMm3qDzQtGKezkiRbnNSF7EabMYMHXMrrDW8w="; + hash = "sha256-IEYfdA1rGg452pZVWW/XuIsNffyhAlI9qyGwcnksgAs="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-423I4ZXekDyqIY39hEUo7/hLthb3gjnvQHnVknZQFnI="; + hash = "sha256-fEzp+nrfLakmtUsPef0HG6tZGn5/q+271YwVyBkFKJw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index 1074990e120d..7dbf104870d6 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_check"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE="; + hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; }; buildAndTestSubdir = "crates/emmylua_check"; - cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas="; + cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 4c5c5fc7fe44..71fe171f0465 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE="; + hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; }; buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas="; + cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index b2147ac05b47..0284918c0497 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Other cutest Discord client mod"; homepage = "https://github.com/Equicord/Equicord"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.NotAShelf ]; diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 22db71d9922e..5f4bbe34f18e 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -83,7 +83,6 @@ buildGo125Module rec { ldflags = [ "-X github.com/evcc-io/evcc/util.Version=${version}" - "-X github.com/evcc-io/evcc/util.Commit=${src.tag}" "-s" "-w" ]; diff --git a/pkgs/by-name/ce/celestegame/everest-bin/default.nix b/pkgs/by-name/ev/everest-bin/package.nix similarity index 92% rename from pkgs/by-name/ce/celestegame/everest-bin/default.nix rename to pkgs/by-name/ev/everest-bin/package.nix index 19909557f3f2..80387bdfd538 100644 --- a/pkgs/by-name/ce/celestegame/everest-bin/default.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation { autoPatchelf ${phome}/MiniInstaller-linux ''; meta = { - description = "Celeste mod loader"; + description = "Celeste mod loader (don't install; use celestegame instead)"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; diff --git a/pkgs/by-name/ce/celestegame/everest/deps.json b/pkgs/by-name/ev/everest/deps.json similarity index 98% rename from pkgs/by-name/ce/celestegame/everest/deps.json rename to pkgs/by-name/ev/everest/deps.json index b969cfd4b5a4..9fc14832db35 100644 --- a/pkgs/by-name/ce/celestegame/everest/deps.json +++ b/pkgs/by-name/ev/everest/deps.json @@ -51,8 +51,8 @@ }, { "pname": "Microsoft.AspNetCore.App.Ref", - "version": "8.0.19", - "hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw=" + "version": "8.0.20", + "hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4=" }, { "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", @@ -81,8 +81,8 @@ }, { "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.19", - "hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4=" + "version": "8.0.20", + "hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE=" }, { "pname": "Microsoft.Build.Tasks.Git", @@ -166,8 +166,8 @@ }, { "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.19", - "hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak=" + "version": "8.0.20", + "hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU=" }, { "pname": "Microsoft.NETCore.App.Ref", @@ -196,8 +196,8 @@ }, { "pname": "Microsoft.NETCore.App.Ref", - "version": "8.0.19", - "hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc=" + "version": "8.0.20", + "hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM=" }, { "pname": "Microsoft.NETCore.App.Runtime.linux-x64", @@ -226,8 +226,8 @@ }, { "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.19", - "hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM=" + "version": "8.0.20", + "hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no=" }, { "pname": "Microsoft.NETCore.DotNetAppHost", diff --git a/pkgs/by-name/ce/celestegame/everest/default.nix b/pkgs/by-name/ev/everest/package.nix similarity index 80% rename from pkgs/by-name/ce/celestegame/everest/default.nix rename to pkgs/by-name/ev/everest/package.nix index 5ef0ee79b589..f32b1ad20f42 100644 --- a/pkgs/by-name/ce/celestegame/everest/default.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -6,7 +6,6 @@ dotnetCorePackages, autoPatchelfHook, mono, - git, icu, }: @@ -23,14 +22,12 @@ buildDotnetModule { repo = "Everest"; rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040"; fetchSubmodules = true; - leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git - hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E="; + # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink + # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. + hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY="; }; - nativeBuildInputs = [ - git - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ icu # For autoPatchelf @@ -39,7 +36,7 @@ buildDotnetModule { postPatch = '' # MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application. - sed -i 's|||' Celeste.Mod.mm/Celeste.Mod.mm.csproj @@ -48,14 +45,6 @@ buildDotnetModule { ''; dotnet-sdk = dotnetCorePackages.sdk_9_0; - - preConfigure = '' - # Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link. - cd external/MonoMod - git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git - cd ../.. - ''; - nugetDeps = ./deps.json; # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814 @@ -93,8 +82,10 @@ buildDotnetModule { dontPatchShebangs = true; dontAutoPatchelf = true; + passthru.updateScript = ./update.sh; + meta = { - description = "Celeste mod loader"; + description = "Celeste mod loader (don't install; use celestegame instead)"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; diff --git a/pkgs/by-name/ce/celestegame/update.sh b/pkgs/by-name/ev/everest/update.sh similarity index 70% rename from pkgs/by-name/ce/celestegame/update.sh rename to pkgs/by-name/ev/everest/update.sh index 2a1aefdc7675..569f64ffc08b 100755 --- a/pkgs/by-name/ce/celestegame/update.sh +++ b/pkgs/by-name/ev/everest/update.sh @@ -18,6 +18,7 @@ commit=$(echo "$latest" | jq -r .commit) version=$(echo "$latest" | jq -r .version) url=$(echo "$latest" | jq -r .mainDownload) -update-source-version celestegame.passthru.everest $version --rev=$commit -"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)" -update-source-version celestegame.passthru.everest-bin $version "" $url +update-source-version everest $version --rev=$commit +echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json" +"$(nix-build --attr everest.fetch-deps --no-out-link)" +update-source-version everest-bin $version "" $url diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 765f6860e3b7..19649c847950 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.111"; + version = "2.15.121"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs="; + hash = "sha256-Lf+kWLmCMbP0FIPxmtroakv1RayqTqMrFhYpVBoHqiA="; }; - vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk="; + vendorHash = "sha256-GygNBB7ydaq11vU2wY9i/ZHmmLomMDKr4cJSdpcEoxk="; ldflags = [ "-s" diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 39d4e677d915..22594fac7452 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -42,11 +42,14 @@ buildGoModule (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; - checkFlags = [ - # https://github.com/dundee/gdu/issues/371 - "-skip=TestStoredAnalyzer" - "-skip=TestAnalyzePathWithIgnoring" - ]; + checkFlags = + let + skippedTests = [ + "TestStoredAnalyzer" # https://github.com/dundee/gdu/issues/371 + "TestAnalyzePathWithIgnoring" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; doInstallCheck = true; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 52620e15ded7..1a2a7f5880a0 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.208.0"; + version = "2.209.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-AZc9STEbM9QOa8vD3VzUkPINeP95B031yLxS8rQ1zvw="; + hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI="; # 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; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-ayuPQ7uKN9XZe2svr+CBGS/r4RjCOiCvS342AQSe82s="; + npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index f3aab87e1997..a9fdea778ae3 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -24,8 +24,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct25a"; - version = "20251001_a"; + srcVersion = "oct25c"; + version = "20251001_c"; pname = "gildas"; src = fetchurl { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A="; + hash = "sha256-uMDIsjvq7hiEw2VVosDBjJgUrS6/KUQ/KSOUNlTcJck="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index e5884ee9b448..ec428011fdc7 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-9Gt4dS1Wu3w/iS0vtYO3XHyknKQEveob9slwNA/HAks="; + hash = "sha256-LFzu7EeH6veambFHou7leJgrJU4L/iYyl5H6IaM3afs="; }; - vendorHash = "sha256-VCUNaWi14Pc39ncWzZZsdsZSd+IxYFhbm1cfTZ40dMw="; + vendorHash = "sha256-hr4t3VseLxV3xFWFtpTTiG+2XK7kFxxYrfzCwCU/zx8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index 48980b3fc182..c19b47f20abb 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -5,7 +5,7 @@ git, pkg-config, openssl, - erlang_27, + erlang, nodejs, bun, deno, @@ -15,20 +15,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gleam"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qjl+I09tnBbGc771SVJVb6fzAZ2tVOnBNhGfrIUh824="; + hash = "sha256-06ap5z1vtv2Rsd98LcLRpvxff1NfkuHNdI844DZuEhQ="; }; - cargoHash = "sha256-Ya0glVECB3cb9kgguuH4nY0ClK5NPH1mKAX9INDLzx4="; + cargoHash = "sha256-TzHjXW9sSbOJv7PrUaQzZ0jOPocVci1DjcmLzv7aaBY="; nativeBuildInputs = [ pkg-config - erlang_27 + erlang ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 9debe2a11bab..7511cfb7626f 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -6,17 +6,18 @@ git, installShellFiles, openssl, + net-tools, }: buildGoModule (finalAttrs: { pname = "grype"; - version = "0.101.0"; + version = "0.101.1"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-20nl2mfU5PeEtUwyOUrKZ58nHyVvxZol4M37IPabx3A="; + hash = "sha256-EbRkK8qTEP1UICqHs4V4xteh/bUh3WxlRihPtUcJw6M="; # 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; @@ -31,13 +32,14 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-VbJKdd04S1aXXnflEZTtpIh4eJFe17WXZXqWDDo9YiI="; + vendorHash = "sha256-Zqtd10KrmAH5yOvKnCl8w8neLsQPylr4lFAU5OTm7Kk="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ git openssl + net-tools ]; subPackages = [ "cmd/grype" ]; diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix index 2f3662f41baa..ff75eaa3a185 100644 --- a/pkgs/by-name/ha/hath-rust/package.nix +++ b/pkgs/by-name/ha/hath-rust/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hath-rust"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "james58899"; repo = "hath-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-4dbloi88oR84JnD1nepLTJNSgxgB337F3nxr7i4nZV8="; + hash = "sha256-81nt+epuZGWxmIEdTAsQJUxLOZjfMFl9SJNJILo9o+8="; }; - cargoHash = "sha256-P975lZ6LgL+dT52td8uA8QVnuJd6QKWkpBCfoLpLW9E="; + cargoHash = "sha256-7529DN55X6XbAxqXhTYSBL0c+/2fOKc4oyFnvMmEDeU="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index cd9fa500ef1b..9c018c365756 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-10-12"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "e121f3773fa596ecaba5b22e518936a632d72a90"; - hash = "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q="; + rev = "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e"; + hash = "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index 3abc5107eef3..6415b3051d75 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "hydrus"; - version = "631"; + version = "643"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${version}"; - hash = "sha256-YZnlQIiq0dUGEnQgVCTvNS+kuSpXlaAN5UvZAQ3xeZM="; + hash = "sha256-8pxokenzKYXdvyNnNBQTphBi8FBAv85rnHSnEQrseLY="; }; nativeBuildInputs = [ @@ -165,6 +165,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ dandellion evanjs + KunyaKud ]; }; } diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index 3ef3cbd5f879..9dd02abede27 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "33.3.1"; + version = "33.3.3"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index a8d4c8cdd651..79050813b83e 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0p8f9z9ribn9zvbr0klg9q37w7z4v6r6gwz9kqc3cml6q0x4lv2n"; - IosevkaAile = "1f18pnbp8vnsjzax43gijc95z1nx54l0vc2lqiqm9xvddhpam7ww"; - IosevkaCurly = "01gzyqlg6n0fzi5kvwrz1slcr8pkdlg6yd61i059kzmw9sw8g7m5"; - IosevkaCurlySlab = "0vxc3mb7ncvm4x7flrvlfkw1lw2pcv50344ias97j96gzaafr0mr"; - IosevkaEtoile = "1qalf37fm3lxbg3y8ias92vyz19rhf20rjyn7zq9prmrx412sglv"; - IosevkaSlab = "1kggrmkga333jknycbr27bziwaa6maw83wrkh60w7a78mp32a2fc"; - IosevkaSS01 = "0yaly4pkilrrd7knqvv43976rnjvp2s2wd4c8zczc4fhmjw2b7j6"; - IosevkaSS02 = "0h1hdynqfqmw6v49qnvspqw6y2ihqysrkcivjc9fvx4w876clr86"; - IosevkaSS03 = "1mvn6ix5944kxmr1byx200ydzm9ny9qafv14nmssfqx7rhn71r29"; - IosevkaSS04 = "0x0sfbd4g6rb5vndddxvqvjjhr43dnbywybb8n67sh40x22jcf5b"; - IosevkaSS05 = "0fsscv5z9dn7934547cgq5082v25n94kcx8zdk5n99n7mnbc7gfy"; - IosevkaSS06 = "1yyhvnxqbdmry6knd8jakz0jqhnphfip2a4rgb5l07vq1nrcb566"; - IosevkaSS07 = "1w50ma10fzw4gy6im009i20dgvxlj3m4iasmj074k5mxfmazjcyv"; - IosevkaSS08 = "1mh7h8dlk02rijlxbml5zpha2hvkhvir7j8hk6fd0pihzj3ybn0i"; - IosevkaSS09 = "08mxsa67gpdzygj9vr0m6a6pz397ffbg77rfik5c46gqknd2y7mf"; - IosevkaSS10 = "1k6xks2q7szmz3zsy9dd6bn7j6g60hf1whvp3c6j65m5rhi87z6v"; - IosevkaSS11 = "1r8fk9m32kakclxxxingy6k1dwgvfizr0c68miqp2g6189mkz1lw"; - IosevkaSS12 = "0amgwwq0yik9xhh7d12fmn7inimqzpmsmcjwnw1dsghrvf0mwdsa"; - IosevkaSS13 = "1agaihxccj0k5wg7bd1lm5ix0mwdhj387i2wypc76q6az116a4ln"; - IosevkaSS14 = "106fw5d3kqc389cnvcv00zfcfbzvavfym8mjhqrn0h23fpfy5na2"; - IosevkaSS15 = "15rjgg8bi2ichisg5ri9hqr5rikfcvwdx2smw93vazn3shzzkn45"; - IosevkaSS16 = "0ipdh5avia6gj1pb78ihhfydg9dn334kv0pir9h136f0bwxibjp0"; - IosevkaSS17 = "08grkzyd4ssjzkkyljzc2mlnhrchxbw7y9425sgz8cq026f5cvd5"; - IosevkaSS18 = "1052s4ijqhvb4h81nvx6m9sdlk3d51n7zqr0cr78ydl13g1qvdh9"; - SGr-Iosevka = "0p7nd7x4zq4bfhdrvjhn0j5y6w217w8nlai9nc0flrwjh4qf14ih"; - SGr-IosevkaCurly = "1qjv7zrr7113v2qq0fnkrxcslv2wy0x5nv8mjal5b710q9gppxfr"; - SGr-IosevkaCurlySlab = "0bavl9z4j9n7hxch8acw89j8f070vwir1f15af1xb76q09ihi5r2"; - SGr-IosevkaFixed = "0kgyn4da6a58fa6k9aqm1ndzlzjpbwip13pyb60jasrqf7wqm66z"; - SGr-IosevkaFixedCurly = "1mzszgwp3xbkjvhqlsmwrr6mhv3czmsiz4vgxr615sfhyl24cjb7"; - SGr-IosevkaFixedCurlySlab = "1dzww7084clp8ivsd74r638rh41zw6b5la0fif4xz01kvsz67wc6"; - SGr-IosevkaFixedSlab = "11cc5gm7a69693b9j0lckbvwn0pnfhklrdvqa719m43d39wqhgas"; - SGr-IosevkaFixedSS01 = "0bh62hlxc05wd33mf0ql3f8dxc6xriv4jzr8qcz6a64qiy12j6c0"; - SGr-IosevkaFixedSS02 = "1z3yy7zv1iml3d2dj418aias4wgh4sk07gk6fsk068mxg2mlcpys"; - SGr-IosevkaFixedSS03 = "1fdp7897m039r6qj40jq17gn602cfx5l9jkgfh29ghk7l6kh0za5"; - SGr-IosevkaFixedSS04 = "0gamh519mrw4qvzs28r4gpsyfqwibbvwckfcsmm4i7g9idnwmmwn"; - SGr-IosevkaFixedSS05 = "09bp6nxcc54s2g0s4icd1zlcjar87hqdyp2chys5agk69l1j9p2a"; - SGr-IosevkaFixedSS06 = "160di7qxp8blyzjnakdqvkxy2dpiy7fxc5518hnk0jswg2d90ydp"; - SGr-IosevkaFixedSS07 = "004hk72g086xhkb0rrpmk5kxf032j24is2r2lbp9hizrmw9x3dl0"; - SGr-IosevkaFixedSS08 = "0i7k3bissz76idgwf5cpbk3s0ynhlgza07v3lwyvyxhgvyj9hp56"; - SGr-IosevkaFixedSS09 = "1lih2kq9gnigchidibpdd2ym12hjpjlb42fbfzdc1s9fs7700d8i"; - SGr-IosevkaFixedSS10 = "04paymx35g3dii4cgnsljdxi8778vn60jkqjx28bx5lvd9hkzc9k"; - SGr-IosevkaFixedSS11 = "023mkvqvajpm59q5807snwyc9mqqvsmrzxa33mrgr0v2qs6zxsnm"; - SGr-IosevkaFixedSS12 = "01d55hi9y5y1szd39ij7hiswkyzazb9k97wsh09sdx0442d1aydc"; - SGr-IosevkaFixedSS13 = "1dxyj0pqxs4795ksmaw56dndj8s6s9isv6kmj8520cl6wmrgm5k7"; - SGr-IosevkaFixedSS14 = "0hl6lmndcf13jm16n0hxn3w0qf4abddrmhq7im9l2zsplm241dz0"; - SGr-IosevkaFixedSS15 = "1sz33rnxx288hasd0g3y2cid6v8vck8yrwallhpbs81sraj50nn9"; - SGr-IosevkaFixedSS16 = "0fx6fwzmcx48ndfly0a7kks2ml6v0hfkvqm5qijwaxysz5cbzk4z"; - SGr-IosevkaFixedSS17 = "03vyl438fx8zqdslhxsy2q86rkgl0dccvvy2hk7jniaswnxj5p69"; - SGr-IosevkaFixedSS18 = "02z2m7qn9qkrkk9c9nk14d56j4kl8advpkgajmxn5nzlp35a4pc8"; - SGr-IosevkaSlab = "1m06ylahl5ql2918cn44nr541lfaipyry4ihm059xx0skmm2qk6p"; - SGr-IosevkaSS01 = "1z3ba34q3m8p6yp1qvsrh1hqvk263gg2dd0vz39nz6slm2h6qb9r"; - SGr-IosevkaSS02 = "1wxflbh1b03q4dqqf0snr7w39vmnm26bpnpmx99ms7lj5p3390c1"; - SGr-IosevkaSS03 = "128lj2kbc0kskq8ylr8713bh49rd3ms63vpgbgp82dnhfza5ql76"; - SGr-IosevkaSS04 = "1gr8y0p1sqg87v2g6wk6ysbj88m3jmqbx2bczl1piwbl32mccci0"; - SGr-IosevkaSS05 = "1g36pzz30jd1zihrwvkpm77cql34xk2bv4xangf19imnibp753dl"; - SGr-IosevkaSS06 = "1aacbijz06rgphbxlv68ds3i8qkw32y9sa4a4fg2fni0naq0c05w"; - SGr-IosevkaSS07 = "0kyg9cp95rw7c4wlpssf0y71c9nbg9nm5y3bzjh48mn5hgpzp762"; - SGr-IosevkaSS08 = "0k6siq14r5gka50x99cily3v39slj9by2cxlsjd8nnvax3ar59ys"; - SGr-IosevkaSS09 = "1gsxbi28jw21915aqn6qfydxh8f0xkxgnh6fmwk8qxb73bqwh9nf"; - SGr-IosevkaSS10 = "0jm5mr0mf30qkfwqff7lgzfa25scafgfkg7w697qb6qz3bvka09n"; - SGr-IosevkaSS11 = "0n7xmxgg4sg7japz8ajxdprqwx6shrh0y2vmp205aqw5lm6lc4g3"; - SGr-IosevkaSS12 = "0mwcxg2ls8d8463ykc4byvk938ygaca0wc65gllr5jkccwfk5lxs"; - SGr-IosevkaSS13 = "12gjkrvy1850dxmbhibgp49rdxj7bb8b8vliydxk4a0k48zn6bqc"; - SGr-IosevkaSS14 = "090i5rhhqcc65k6b9sgbj2w5vs9jrd6qnmm99lp18akpsspm2w3r"; - SGr-IosevkaSS15 = "1c96pckim333bmfqpj0v9jcklsi8az81m6jhzvy3b153p2di29r9"; - SGr-IosevkaSS16 = "0xvv55zmjyly00ykaycndac3lyn2w7y2gvr908kql17lpnw3x0ya"; - SGr-IosevkaSS17 = "1kilxf5f51fzxwpy4xjrb5jcrmdb70h3z04j9f1cpaccc8h654wk"; - SGr-IosevkaSS18 = "0vyqa0b935js0i0fhaj071yjlgkxkdr2pybn8z2g4pv3ixyk6msh"; - SGr-IosevkaTerm = "0pxa3zcnhfl1gpynx5mn3h21r6cr45lmax09vk8x6z23adxcgkrd"; - SGr-IosevkaTermCurly = "1nv1xqsf9zf2j9xrrqlcjzy764mnfhmjp4xwsq391fl8vy7pwdbl"; - SGr-IosevkaTermCurlySlab = "0nblg2ql79wi7vnn3akz7pm26mwjvqg3wgh6kwqbr1rvs4n7krwp"; - SGr-IosevkaTermSlab = "12cav088hsml2x81ihpbnr0pcwargkh1kn7ijacqv3mgirdhfp52"; - SGr-IosevkaTermSS01 = "056bs4r7ry7k2h7iwrldfkrani79bxkb2y38ibn15hdvmbw5k7xg"; - SGr-IosevkaTermSS02 = "1f2ywnqz97i6pjg4na5344k4p4d0mvc9s30ylc6a2nwq64wl48wf"; - SGr-IosevkaTermSS03 = "08l939ar4z1yw1pwsdfjkfymi476ms7738yvkgz7ycf5nifpp1w1"; - SGr-IosevkaTermSS04 = "0jgkbdv9kjg7028f3lk4h4ph6i5icv80dmhkxi7r430khfdgq0h9"; - SGr-IosevkaTermSS05 = "0n6zf2s8can1sknc5gnr2fhs86dnswrhjx6fk2n06grkf97srmzx"; - SGr-IosevkaTermSS06 = "0krq3kp3ydxv2y5yi15gy517w8kwarxw3lkw0vwjlf5qplpl4s7b"; - SGr-IosevkaTermSS07 = "1pm5ckgyr18mj13ih548n1awipbsaiqcvzgjgyg8jhydpvv25f1d"; - SGr-IosevkaTermSS08 = "1qq19fz9ybk6wwj80vb2pcpaklr0nk3a9brc5iqzli4v42bvqqar"; - SGr-IosevkaTermSS09 = "13ki9125qz5fszcg4mdmkcgz2w9p6w06n6d6aa96m4cvxf9b38g7"; - SGr-IosevkaTermSS10 = "161cxv8my2g0yg5amawy0mp8hsdf3zwcvf4pb2w9wdm19k7pdgsy"; - SGr-IosevkaTermSS11 = "0c2rrcnbp4wh2xwqzrvj2fxzz7ph2hz0j89p72a46lp939wjqllm"; - SGr-IosevkaTermSS12 = "1wyih90ilpvms0w6s1hyqwvclhli1gwxbhc61qgnvkz4lf57j1aw"; - SGr-IosevkaTermSS13 = "1jk7z6cbfkm4ljslvxysq1w95xv9573lgcb1lznzkd41p3vss9hy"; - SGr-IosevkaTermSS14 = "1nv18klmp3npl70q5ffc1p59hqa2d60w677jqjvjl51q8cksms8y"; - SGr-IosevkaTermSS15 = "1gjydq5zvcbjp55kgc19shjy5v8427m7kdv5wxf808kdm0cyl9cf"; - SGr-IosevkaTermSS16 = "1v4cyci25bdpid1cag84yif38mkqz1d6bssdvw62y9p9xb4x1g4b"; - SGr-IosevkaTermSS17 = "0nr9hrjgy3dhlacbdr8j5gxh6qbiy9l1m1c25dl9dqym7h9i2a2z"; - SGr-IosevkaTermSS18 = "1k66xsw3c5izc334v24wf8xvpbxh3dikawghrgfqbkdd7ilp6y7a"; + Iosevka = "1ml8abhvb6jishi3a2q3ysd5zj0153697wypzjkj5hzxwmx6r7nv"; + IosevkaAile = "13m46frkmczcn94dx27gamf4jwnqlngqrk5bxmfxzn56pzyavpyh"; + IosevkaCurly = "0i97zbfidqvzgxi6pr7qc50y5g740d4hgbg2fyjdiiyacp1a4bpq"; + IosevkaCurlySlab = "1rp3z7083adc9l5cxwygc4ln58z6iy79hxbbf1lqmfi9p6vjgq97"; + IosevkaEtoile = "1cc3kwq4skd5gg420l1599hzaxhs3fh33jwsrh4fclrqbhhsgdb9"; + IosevkaSlab = "1q0bgz7a3jn59sjdaql13ij9sa3qbxcjnhnfvc9fb3v6vaxlhqmi"; + IosevkaSS01 = "0fsbiisllg673359xfxn1izhcnhkdsfp2h6n7y58la692i967vjm"; + IosevkaSS02 = "1wc1hcsmf6yl99rjk3ncmn7dbnylids68l21i21dfj4k13x6mvyi"; + IosevkaSS03 = "125m32asdvdfks08dangmv86phkf0if4in6050klf45a7q9818ad"; + IosevkaSS04 = "0m10d5l88dnsaxcb959g6g17kzrxh91hk083ip5mxq1wjrx1bcfq"; + IosevkaSS05 = "0q34293px1gj9jgh810mhgidcf7lj2vdvdn48ljq9hg4ni7yvzn8"; + IosevkaSS06 = "067pz09b9iminj2960qdqipaxgaawxnbxzndi1gw33kpl5lgrjak"; + IosevkaSS07 = "1f078l8vxcyb6lbf1ywf3s4s0bdrni4my6n70m77vi7vgawvfwz0"; + IosevkaSS08 = "0mk0il1c4h06xvgxgaqh2z79m7k286smjs4swl09skqjab3nmssx"; + IosevkaSS09 = "1pcwbi6ajy4i0likmdfgs9c4nwa852fsz9cmcjw12dmf0zirv7cn"; + IosevkaSS10 = "1lv58ypcz1d4azz9m9xnbw2n6l5fs67kyx5zrh5mqd51qcigr1bx"; + IosevkaSS11 = "1w37535g96js8iy5r3s6xaz0mjjivv06rdazaxdx0j4frh743lng"; + IosevkaSS12 = "1p9lwdbngpsm4a7viz04137ckbpimknznibln39sscykc6j93lqx"; + IosevkaSS13 = "0p1ffg507xcclwp117ikjzbkixlh95a21l7mmpd9cnckdvj1xz45"; + IosevkaSS14 = "1dcikdxbbr82amzhwn310qkzx95h4dprxw5rwlgn8wcvx9pk96sc"; + IosevkaSS15 = "0lsgkc1qz4f1rqhasvadjl90qwyf2hxz2d0svwmig7q91jaii4nz"; + IosevkaSS16 = "1a6k40i1p1l94fwr4mi2m82rspjc9l93vxilgla1kpqm40bsspng"; + IosevkaSS17 = "0v9zvi8d0ll0kdryjjglf6m1a53hjnsj73bcdaxyprni5f88qpvy"; + IosevkaSS18 = "0g8b6drc98l08zdp4by7c4zr6c5rkaxsplbm1csyhcrpaxc43r71"; + SGr-Iosevka = "0g5lklzmyhpych8hkx4ssa3iir7dscc8q1jbzpfsla36r5sf91jl"; + SGr-IosevkaCurly = "1h3vgshs6l92l8r87kji7ln6ncq36iwrf439vzzramb34izy8ixr"; + SGr-IosevkaCurlySlab = "0rsl1f9bc1hhy3wzbq5ls6vkc0y0qaw5yb67i7rda5xv50m8bqxi"; + SGr-IosevkaFixed = "0s6d7kprgrkmdwklzhv0hz85y9w5lgrwc5mams21akmnchjqrgzf"; + SGr-IosevkaFixedCurly = "0q5n1axnpl5p51lg4zrarsjn5aglb5s0axn9qp7ddh5gxv2n0knq"; + SGr-IosevkaFixedCurlySlab = "04pn89y4jpgdllk0xziigjf2p8836a6zmwvzkix2kqsmbvpjj4kn"; + SGr-IosevkaFixedSlab = "1zm06h0z43j31qzd6ndgamr3r5b9av5qcp39sr16fxr8hhnjrqhn"; + SGr-IosevkaFixedSS01 = "0jkv4f529y934il9qzdaav8acqqgnrgf4anf6zcgx52zrzgrkg0x"; + SGr-IosevkaFixedSS02 = "1zkibhlsfyhxbi84dwc6w90n2p8w6zwkszk1z5a3db6lyz824z88"; + SGr-IosevkaFixedSS03 = "15r5q0bg2109z52nwygr85vx3svg6q3j26q0y0syxnrxq4iksdg7"; + SGr-IosevkaFixedSS04 = "0bhgd1mmsdlcwp3nz7wf992g75zwkp625xc7fbqwsrpd81111566"; + SGr-IosevkaFixedSS05 = "1nmhs4ya6bm2j4bq5jz3m5r7gbwd4i16m3zsblvif1lb6flb89dj"; + SGr-IosevkaFixedSS06 = "0a1wxqlm8fchbg68vzwac7p8nvx8hiy565qcqjjs73m33bpp00zj"; + SGr-IosevkaFixedSS07 = "0s1jh060hkbb7idqzgvc3f6czfhdkiw8ylmyjfa3vh851lpnxym2"; + SGr-IosevkaFixedSS08 = "0ncdhg8cha9imy6bb72p39bvadzmdrncr2p0di80yfiimdbcfbp4"; + SGr-IosevkaFixedSS09 = "1wl0bf1phhjzw988r7v3fprb4ljwikpkn7yvs8hskmgi3fkvji9q"; + SGr-IosevkaFixedSS10 = "08cr4zkfjrnj3105kj70dswaf8zjdhzbjwyav0x054s32j4yrs54"; + SGr-IosevkaFixedSS11 = "0vgx6zycbqcnrar537ym7ra949q0f8zvrmb1d823rfavy0zkpv9q"; + SGr-IosevkaFixedSS12 = "0jw73v1bci7w2z5354cfwqgxd3r56fa03i7mr19y6y8pi9i5l9yn"; + SGr-IosevkaFixedSS13 = "1dy29fhjncsxgsqfyz091qssps4a6xbr27157bawvjn4nlm12cab"; + SGr-IosevkaFixedSS14 = "047ql1fqsv98mp7ihg1r71y90qjk0sgkygjs79b20smzvzapcs7g"; + SGr-IosevkaFixedSS15 = "14njl7x94yicb7nzjsv0j8h8f4ikawn01899pccr617mf3xxyap4"; + SGr-IosevkaFixedSS16 = "14p00n6gw7fwqxdwrz2lxrjkicw1mk1qk8z5mazr45s5pq9sz7wf"; + SGr-IosevkaFixedSS17 = "0gca50g55csx86wksa1ch1ay2chzj4p11dmhsf4pf4jyq3ziihw8"; + SGr-IosevkaFixedSS18 = "18q8sjnz9dfv7whjjm4a6cqm8ffwz46bkwna8giqsplhyca1c9sd"; + SGr-IosevkaSlab = "176pr90h53hf1cbgwaqbdd11pd5d3p14d5lll057dlmws63lhk71"; + SGr-IosevkaSS01 = "05fwnmziyas7l53sywi6g39pdi6jpnalw35gjl3dvyp93jk5f9sn"; + SGr-IosevkaSS02 = "00cyqsng2izf1cjkmz1pf2h1h17ph69f0nz38n9jlynsffp2rkv8"; + SGr-IosevkaSS03 = "0xg4kss5kvl7ihzvdq9gcv869x8nr8ds8hw5lrvqx2010pfvzksc"; + SGr-IosevkaSS04 = "0mpzyj404081in6ymgajcyy2ips6d12k9ng00cw92v7shjpz6cqh"; + SGr-IosevkaSS05 = "1kzw92nb7wxrjfhp0cf29xny86ga6libsfy2pzdc7hs499f0fsss"; + SGr-IosevkaSS06 = "12qw1grnwq8lgdgz25vx0pcdyd5zgwln99w8cafrl6y3ckrasnrx"; + SGr-IosevkaSS07 = "0fjdnf0lr0kfbfddc1ar4wj2if9xsyqlp4cl2gmczy5b3zkmmhrn"; + SGr-IosevkaSS08 = "1v7crn5i2v12dh8b34hbm418zxyc8xhh3bnbfgif3v36885rxd8g"; + SGr-IosevkaSS09 = "0jipz18pgncwfb75c1bb6bh5ar33q8kk579l6zyvqm39w2ik98f6"; + SGr-IosevkaSS10 = "0c1w2kgy4gk3a3979x47d5hjg19bbam3s4hzd0wyal1wn9m98xl6"; + SGr-IosevkaSS11 = "1sqagzb28xbkpn30s24ydf2da8n2dvsqzfvkbc3p1469jihzfviq"; + SGr-IosevkaSS12 = "1n1d85drb3m0f8cnrcqxh1la7y75z3a2k9af8q6z48843ddx4qmg"; + SGr-IosevkaSS13 = "1ynr47avzywrpf5zdjwmpybs6kf71pmjbrvlssx60z6b4hc0w42i"; + SGr-IosevkaSS14 = "0r87wlvrd7xgcsibymmdkwd0pqbf5wn2c7mcssqwi3zwxpi12s83"; + SGr-IosevkaSS15 = "03av6w7x4w00hxyhmz1qp00aj5b47qkma666y3c7ylsfql2b5ybh"; + SGr-IosevkaSS16 = "01m5sz7lid4v68v8vagyj6zd61hs969lc4igf48a4jz0ip9367sl"; + SGr-IosevkaSS17 = "0rl4g8iv8hz25ns52zb2n2ymcf2l26dhza1glp79l9swk3xgvpx2"; + SGr-IosevkaSS18 = "0zyjl2x8i8d5m4ymm6sa5nm3916nwykh718k02aii2gl2p33faqs"; + SGr-IosevkaTerm = "0rkvwizyr3bhkm518kq57n7n3rygvbgjahi9r5nm6jhyvjjf85d6"; + SGr-IosevkaTermCurly = "041xhkw4b379zkwbcbmsg7d0w434dy48ppmgpy5gxaa4fzxvfihl"; + SGr-IosevkaTermCurlySlab = "0kc62bllcrzmlj2ynzk3n1z3znhlsbsy0pwnfjx80zbirnj19dwh"; + SGr-IosevkaTermSlab = "00l8hzhsrqrsp8izh4mzg2gvzzpd54psn15v3fgc1bs1c84wgxw5"; + SGr-IosevkaTermSS01 = "0mifbc9vm8yassfp5r5bv8a7jxq14dpnbby09dbfdg3273yx1dv9"; + SGr-IosevkaTermSS02 = "0ami4zdg0cpgszp8c5xary6crfhx3vx3bdcbvnsmzr5zbaf189fi"; + SGr-IosevkaTermSS03 = "1yfd99sb3y469qzszrgfdd3m6m6rg49kv5l2swf4yijr1zmb5wfa"; + SGr-IosevkaTermSS04 = "14ccwjilzrrzikhaj5rnarvw9y78m4d8w7817akg4wg2gh5jsxvr"; + SGr-IosevkaTermSS05 = "1byaypapwq1zai701sq8qyxp9sb4b62jjin9vgzqcchdy32gnr38"; + SGr-IosevkaTermSS06 = "0qcwpw10qn34awv0w43xg3l81w3cn949hcsci8802layrwq7lfas"; + SGr-IosevkaTermSS07 = "0nyrg2fqc6828mq72lhkjn8hdv5s5r5931y38wdriy81yl5lqm9j"; + SGr-IosevkaTermSS08 = "02mjjz04pqyvaiwm5wsr7h3r2la3wfsi8nnq1njgbaglp25hx6f1"; + SGr-IosevkaTermSS09 = "07w12z244iaic5cpqkxl20ya03pnirjh9n5yy30r6wx79d1p7q57"; + SGr-IosevkaTermSS10 = "19w59qs3p5ww7bg5a0k9f6065311ngj583mx9xb8aawc2v9hrhjr"; + SGr-IosevkaTermSS11 = "10l4sk924w94pah96xipwhqi6x43j62k75ng4lsy0rw3lbs9lyvk"; + SGr-IosevkaTermSS12 = "018m8wwxip1l5argplcim513zvwrihdl7xbz5i8hsmjjvia225v6"; + SGr-IosevkaTermSS13 = "1b7nca31yj0vc2j4h804wlllpzjjphnh1bfgv6zcgvd4qmpk4qna"; + SGr-IosevkaTermSS14 = "1pqrsvnnqb86300hkil4x093r9ybrkpdxvhcp56ph4pshijypb08"; + SGr-IosevkaTermSS15 = "0inrfcrajmlqxzm87l4l4myrz4bw4wz7y79ibwcjqa0f395jlms3"; + SGr-IosevkaTermSS16 = "13w9j3sp1lg9wrsj9n5bf3cm38rkkjifk5kqbrkpg9p98k4lfsx5"; + SGr-IosevkaTermSS17 = "0gcf73bs21phvrjg083l61s37glqvwzckm03gndbqyw7a64k9fdc"; + SGr-IosevkaTermSS18 = "1aa8hy10wa4zgyrzsnmx4rkbrjjqv56nd4prijdn50qbc5qfw18a"; } diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 75055f7d62fc..e38527c20d8f 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "jj-pre-push"; - version = "0.2.2"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${version}"; - hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4="; + hash = "sha256-nWkMXXlzJeXz0kHBuN4g8YWW6JmwrfE/y9oFfEOqeQk="; }; build-system = [ diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 5ad75de67faf..b2a0941a79fe 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -134,9 +134,5 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; mainProgram = "jq"; - identifiers.purlParts = { - type = "github"; - spec = "jqlang/jq@jq-${finalAttrs.version}"; - }; }; }) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 0983e5015dc1..c9ee2bbe0b7b 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.4.0"; + version = "26.4.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-mWgTkvop5oRA3DzxxI3Q8kgftLZZteGeJ3Zxgh5SIww="; + hash = "sha256-TUTTBsxRuk907OLFxFyABuOGMaO7EjqnzD0eEQVfl98="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix index 2a664e684694..4e44c1e698d5 100644 --- a/pkgs/by-name/ki/kics/package.nix +++ b/pkgs/by-name/ki/kics/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "2.1.13"; + version = "2.1.14"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; tag = "v${version}"; - hash = "sha256-7ulu5PVCD6VoIj7RVpBGzsb9uWctOkVfYVb8qB5YMB0="; + hash = "sha256-VcVF0vqlMNpVR/KmeZV75j16NxWg5iuhEy54NeNK4pY="; }; - vendorHash = "sha256-kKK3kSWjork6KZdPzKySsiHR0bOLKlzltP/u6ZQioqM="; + vendorHash = "sha256-tcJ1df9hetzDSxoTP3lvY8ixh6VWsliGJqzXHshmc9A="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch b/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch new file mode 100644 index 000000000000..8c8550a1ce2b --- /dev/null +++ b/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch @@ -0,0 +1,31 @@ +commit 4277cc75bc147d0af6ffddc7db96f48492977968 +Author: bakersdozen123 +Date: Sat Oct 11 09:56:48 2025 -0700 + + ssh: fix custom ssh heap buffer overflow + + The `ssh_custom_free()` function calls `strlen()` on the `publickey` + field, which stores binary data, not a null-terminated string. This + causes a heap buffer overflow when the public key data is not + null-terminated or contains embedded null bytes. + + The `publickey` field stores binary data, as required by the underlying + `libssh2_userauth_publickey()` function, which accepts a public key + parameter of the type `const unsigned char*`. + + Use the stored `publickey_len` instead of `strlen()` to determine the + correct buffer size. + +diff --git a/src/libgit2/transports/credential.c b/src/libgit2/transports/credential.c +index b47bd63a1..7d0eacecf 100644 +--- a/src/libgit2/transports/credential.c ++++ b/src/libgit2/transports/credential.c +@@ -161,7 +161,7 @@ static void ssh_custom_free(struct git_credential *cred) + + if (c->publickey) { + /* Zero the memory which previously held the publickey */ +- size_t key_len = strlen(c->publickey); ++ size_t key_len = c->publickey_len; + git__memzero(c->publickey, key_len); + git__free(c->publickey); + } diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix index a46c13c4bcca..a244a72cfa3d 100644 --- a/pkgs/by-name/li/libgit2/package.nix +++ b/pkgs/by-name/li/libgit2/package.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw="; }; + patches = [ + # https://github.com/libgit2/libgit2/pull/7146 + ./fix-ssh-custom-heap-buffer-overflow.patch + ]; + cmakeFlags = [ "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=llhttp" diff --git a/pkgs/by-name/li/libui/darwin_versions.patch b/pkgs/by-name/li/libui/darwin_versions.patch new file mode 100644 index 000000000000..29f646402919 --- /dev/null +++ b/pkgs/by-name/li/libui/darwin_versions.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -163,7 +163,7 @@ + objc_args: ['-Dlibui_EXPORTS'], + link_args: libui_libui_link_args, + soversion: libui_soversion, +- darwin_versions: []) # TODO ++ darwin_versions: '0.0.0') # TODO + install_headers('ui.h') + + # TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too diff --git a/pkgs/by-name/li/libui/libui.pc b/pkgs/by-name/li/libui/libui.pc deleted file mode 100644 index 42ee86fb550f..000000000000 --- a/pkgs/by-name/li/libui/libui.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@out@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include - -Name: libui -Description: Simple and portable (but not inflexible) GUI library -Version: @version@ - -Libs: -L${libdir} -lui -Cflags: -I${includedir} diff --git a/pkgs/by-name/li/libui/package.nix b/pkgs/by-name/li/libui/package.nix index 5f5430a72fca..d7304ee37133 100644 --- a/pkgs/by-name/li/libui/package.nix +++ b/pkgs/by-name/li/libui/package.nix @@ -2,69 +2,48 @@ lib, stdenv, fetchFromGitHub, - cmake, + meson, + ninja, pkg-config, gtk3, }: -let - backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libui"; - version = "4.1a"; + version = "4.1a-unstable-2021-01-02"; + src = fetchFromGitHub { owner = "andlabs"; repo = "libui"; - rev = "alpha4.1"; - sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm"; + rev = "fea45b2d5b75839be0af9acc842a147c5cba9295"; + hash = "sha256-BGbL15hBHY4aZE2ANAEd677vzZMQzMCICBafRtoQIvA="; }; nativeBuildInputs = [ - cmake + meson + ninja pkg-config ]; propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3; + patches = [ + ./darwin_versions.patch + ./pkg-config.patch + ]; + postPatch = '' + substituteInPlace meson.build \ + --subst-var-by version "${finalAttrs.version}" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace darwin/text.m unix/text.c \ --replace-fail "strcasecmp" "g_strcasecmp" ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt - ''; - - installPhase = '' - mkdir -p $out/{include,lib} - mkdir -p $out/lib/pkgconfig - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - mv ./out/libui.so.0 $out/lib/ - ln -s $out/lib/libui.so.0 $out/lib/libui.so - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mv ./out/libui.A.dylib $out/lib/ - ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib - '' - + '' - cp $src/ui.h $out/include - cp $src/ui_${backend}.h $out/include - - cp ${./libui.pc} $out/lib/pkgconfig/libui.pc - substituteInPlace $out/lib/pkgconfig/libui.pc \ - --subst-var-by out $out \ - --subst-var-by version "${version}" - ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/andlabs/libui"; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libui/pkg-config.patch b/pkgs/by-name/li/libui/pkg-config.patch new file mode 100644 index 000000000000..45569a388608 --- /dev/null +++ b/pkgs/by-name/li/libui/pkg-config.patch @@ -0,0 +1,15 @@ +--- a/meson.build ++++ b/meson.build +@@ -167,6 +167,12 @@ + install_headers('ui.h') + + # TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too ++pkg = import('pkgconfig') ++pkg.generate(libui_libui, ++ description: 'Simple and portable (but not inflexible) GUI library', ++ filebase: 'libui', ++ name: 'libui', ++ version: '@version@') + + libui_binary_deps = [] + if libui_mode == 'static' diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix index aa01bb695842..b78ae4d23e72 100644 --- a/pkgs/by-name/li/liquibase/package.nix +++ b/pkgs/by-name/li/liquibase/package.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "liquibase"; - version = "4.33.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz"; - hash = "sha256-aJrPzcl7rQ1MFQ0e+rnIUeJRs5jLPWMm916Kr+QO1Xg="; + hash = "sha256-OuEczc1MCA5CHl/QQ729Yk1W/PybKU1dnYmMuLB05Ek="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 580eb7693df2..bc98bbf076a2 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.18.2"; + version = "0.18.5"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lqw6U14fhkz4ZgSH0OBICvuj2ZJWo7p0dwhpn7szu2A="; + hash = "sha256-Ut9MSHl2eE4krf5yLpXdAxPARFuHP+cG8HlY7DqmETw="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-Dx6nmB8kmCKNzXVTROI+NIxvvCboACSOLUU1BCLnTUw="; + cargoHash = "sha256-I730Fq9F46aLGeEwMmbeOXIkFWNvskmBl+NuPDfx/ss="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 28e84b0bc758..5e17fda1e8fb 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.7.3"; + version = "0.7.6"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-rRrBrSQ0/bOrRkcH5/SBIHVY9u/Ddm4GmxTJUTZM77o="; + hash = "sha256-Ue/o2T9tLE7y4CCwOxEWd44LPwtI1szkyf5v9a9zdZ0="; }; - vendorHash = "sha256-FDwVtI+RQuwNQE8pty+vJXW13ZSG4P9GZkm967LJct8="; + vendorHash = "sha256-unoLSUasCUbFbml6q1lBCE0YBFENFkrpxXpXoZSo49s="; ldflags = [ "-s" diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index 28bcc83c412d..f8b11cd05f9e 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; tag = "v${version}"; - hash = "sha256-yOiN4KES+zCHp/n0pN73Yv6ibEtUGy1pqiH/3WECqkA="; + hash = "sha256-RdOtgNSkFIVl8Uve2iaJ7G0X1IHJ/Yo4h8hWP3pTV8g="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix index 381951185f1f..d2b5528b1c03 100644 --- a/pkgs/by-name/mk/mkbrr/package.nix +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "mkbrr"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "mkbrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-9BII74aH480UWjrPgoBn+ioXV3TRhtVmxyO+T+fljK4="; + hash = "sha256-LVSavGep3/mfDoDkj4uJ8WUTkhdeq+VEi2w7qr44DQg="; }; - vendorHash = "sha256-MEDzZd67iXPY/MioMd1FcTLY+8CdJN7+oC7qus63yJ8="; + vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 5aee7560a85a..7536d3243a24 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.61"; + version = "11.62"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-xjFAsnocqar53mBnbi34Q7tRr0OyJoK2S9e1t7O7r9U="; + hash = "sha256-qOzGOm5fzeV818Dv09A0+jieKRgvH3XbEGFmfsbtg3g="; stripRoot = false; }; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index d4cd1ba5bd23..382c583f0475 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.114.4"; + version = "1.115.3"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-GIY8Gokbp03LJT0kBx3KR8U/4bi10WrXAzO2zuctlFY="; + hash = "sha256-9UDPckn+0xtwZcLaHCzhC4yKdDqjat0F4nHuxVdIRMA="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-Kw3t+B0+zoxhpCr5INvWrJwSBqHwFzlTCcZknFNbOg0="; + hash = "sha256-mJJIdLtJ3E4eMub4szJA+40ZL4WkLNupwqvq3JnFxtk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/node-red/package-lock.json b/pkgs/by-name/no/node-red/package-lock.json index 8e3fb688bb4d..496820c51276 100644 --- a/pkgs/by-name/no/node-red/package-lock.json +++ b/pkgs/by-name/no/node-red/package-lock.json @@ -1,12 +1,12 @@ { "name": "node-red", - "version": "4.1.0", + "version": "4.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-red", - "version": "4.1.0", + "version": "4.1.1", "license": "Apache-2.0", "dependencies": { "acorn": "8.15.0", @@ -48,7 +48,7 @@ "mqtt": "5.11.0", "multer": "2.0.2", "mustache": "4.2.0", - "node-red-admin": "^4.1.1", + "node-red-admin": "^4.1.2", "node-watch": "0.7.4", "nopt": "5.0.0", "oauth2orize": "1.12.0", @@ -150,14 +150,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz", - "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -197,13 +197,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -213,9 +213,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz", - "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -237,18 +237,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz", - "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", + "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.0", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/types": "^7.28.0", + "@babel/types": "^7.28.4", "debug": "^4.3.1" }, "engines": { @@ -256,9 +256,9 @@ } }, "node_modules/@babel/traverse/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -281,9 +281,9 @@ "license": "MIT" }, "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "dev": true, "license": "MIT", "dependencies": { @@ -346,20 +346,20 @@ "license": "Apache-2.0" }, "node_modules/@emnapi/core": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz", - "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz", + "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==", "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.0.4", + "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz", - "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz", + "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==", "license": "MIT", "optional": true, "dependencies": { @@ -367,9 +367,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz", - "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", + "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==", "license": "MIT", "optional": true, "dependencies": { @@ -401,9 +401,9 @@ } }, "node_modules/@iconify/utils/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -438,9 +438,9 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz", - "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==", + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", "dev": true, "license": "MIT", "dependencies": { @@ -459,16 +459,16 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz", - "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.29", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz", - "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==", + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "dev": true, "license": "MIT", "dependencies": { @@ -490,9 +490,9 @@ } }, "node_modules/@mermaid-js/parser": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.2.tgz", - "integrity": "sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.3.tgz", + "integrity": "sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==", "dev": true, "license": "MIT", "dependencies": { @@ -910,9 +910,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz", - "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", + "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", "license": "MIT", "optional": true, "dependencies": { @@ -959,9 +959,9 @@ } }, "node_modules/@types/d3-array": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", - "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", + "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==", "dev": true, "license": "MIT" }, @@ -1242,12 +1242,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", - "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "version": "24.8.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz", + "integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==", "license": "MIT", "dependencies": { - "undici-types": "~7.8.0" + "undici-types": "~7.14.0" } }, "node_modules/@types/readable-stream": { @@ -1361,9 +1361,9 @@ } }, "node_modules/agent-base/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1753,9 +1753,9 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz", - "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", + "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", @@ -1831,9 +1831,9 @@ } }, "node_modules/bl": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.1.tgz", - "integrity": "sha512-yYc8UIHrd1ZTLgNBIE7JjMzUPZH+dec3q7nWkrSHEbtvkQ3h6WKC63W9K5jthcL5EXFyMuWYq+2pq5WMSIgFHw==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.4.tgz", + "integrity": "sha512-ZV/9asSuknOExbM/zPPA8z00lc1ihPKWaStHkkQrxHNeYx+yY+TmF+v80dpv2G0mv3HVXBu7ryoAsxbFFhf4eg==", "license": "MIT", "dependencies": { "@types/readable-stream": "^4.0.0", @@ -2874,9 +2874,9 @@ } }, "node_modules/cytoscape": { - "version": "3.33.0", - "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.0.tgz", - "integrity": "sha512-2d2EwwhaxLWC8ahkH1PpQwCyu6EY3xDRdcEJXrLTb4fOUtVc+YWQalHU67rFS1a6ngj1fgv9dQLtJxP/KAFZEw==", + "version": "3.33.1", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz", + "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==", "dev": true, "license": "MIT", "engines": { @@ -3431,9 +3431,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", + "version": "1.11.18", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz", + "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==", "dev": true, "license": "MIT" }, @@ -3819,9 +3819,9 @@ } }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4154,9 +4154,9 @@ } }, "node_modules/fast-uri": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", - "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "funding": [ { "type": "github", @@ -5638,9 +5638,9 @@ } }, "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -5827,14 +5827,10 @@ "license": "MIT" }, "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", + "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", "license": "MIT", - "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" - }, "engines": { "node": ">= 12" } @@ -6161,9 +6157,9 @@ } }, "node_modules/istanbul-lib-source-maps/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -6254,12 +6250,6 @@ "xmlcreate": "^2.0.4" } }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "license": "MIT" - }, "node_modules/jsdoc": { "version": "3.6.11", "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz", @@ -6336,9 +6326,9 @@ } }, "node_modules/jsdoc-api/node_modules/jsdoc": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", - "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.5.tgz", + "integrity": "sha512-P4C6MWP9yIlMiK8nwoZvxN84vb6MsnXcHuy7XzVOvQoCizWX5JFCBsWIIWKXBltpoRZXddUOVQmCTOZt9yDj9g==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -6413,15 +6403,14 @@ "dev": true }, "node_modules/jsdoc-parse": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.4.tgz", - "integrity": "sha512-MQA+lCe3ioZd0uGbyB3nDCDZcKgKC7m/Ivt0LgKZdUoOlMJxUWJQ3WI6GeyHp9ouznKaCjlp7CU9sw5k46yZTw==", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.5.tgz", + "integrity": "sha512-8JaSNjPLr2IuEY4Das1KM6Z4oLHZYUnjRrr27hKSa78Cj0i5Lur3DzNnCkz+DfrKBDoljGMoWOiBVQbtUZJBPw==", "dev": true, "license": "MIT", "dependencies": { "array-back": "^6.2.2", "find-replace": "^5.0.1", - "lodash.omit": "^4.5.0", "sort-array": "^5.0.0" }, "engines": { @@ -6663,9 +6652,9 @@ } }, "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", + "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", "license": "MIT", "dependencies": { "universalify": "^2.0.0" @@ -6682,9 +6671,9 @@ "license": "MIT" }, "node_modules/katex": { - "version": "0.16.22", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz", - "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==", + "version": "0.16.25", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.25.tgz", + "integrity": "sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==", "dev": true, "funding": [ "https://opencollective.com/katex", @@ -6931,15 +6920,15 @@ } }, "node_modules/local-pkg": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.1.tgz", - "integrity": "sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz", + "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==", "dev": true, "license": "MIT", "dependencies": { "mlly": "^1.7.4", - "pkg-types": "^2.0.1", - "quansync": "^0.2.8" + "pkg-types": "^2.3.0", + "quansync": "^0.2.11" }, "engines": { "node": ">=14" @@ -7034,14 +7023,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.omit": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==", - "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", @@ -7251,9 +7232,9 @@ } }, "node_modules/memorystore/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -7342,9 +7323,9 @@ } }, "node_modules/mermaid/node_modules/marked": { - "version": "16.1.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-16.1.1.tgz", - "integrity": "sha512-ij/2lXfCRT71L6u0M29tJPhP0bM5shLL3u5BePhFwPELj2blMJ6GDtD7PfJhRLhJ/c2UwrK17ySVcDzy2YHjHQ==", + "version": "16.4.1", + "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.1.tgz", + "integrity": "sha512-ntROs7RaN3EvWfy3EZi14H4YxmT6A5YvywfhO+0pm+cH/dnSQRmdAmoFIc3B9aiwTehyk7pESH4ofyBY+V5hZg==", "dev": true, "license": "MIT", "bin": { @@ -7474,9 +7455,9 @@ } }, "node_modules/minizlib": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", - "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", + "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -7506,16 +7487,16 @@ "license": "MIT" }, "node_modules/mlly": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz", - "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz", + "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.14.0", - "pathe": "^2.0.1", - "pkg-types": "^1.3.0", - "ufo": "^1.5.4" + "acorn": "^8.15.0", + "pathe": "^2.0.3", + "pkg-types": "^1.3.1", + "ufo": "^1.6.1" } }, "node_modules/mlly/node_modules/confbox": { @@ -7766,9 +7747,9 @@ } }, "node_modules/mqtt-packet/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -7789,9 +7770,9 @@ "license": "MIT" }, "node_modules/mqtt/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -8017,13 +7998,13 @@ } }, "node_modules/node-red-admin": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.1.1.tgz", - "integrity": "sha512-49VOt0z1YwLwUtauxyoSY5hR3gzXWisdAa1b0JqIwXb2ZJnQh5k/cM4oSVg7yPKi07HcmntwmLVWfZGJdjIR8A==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.1.2.tgz", + "integrity": "sha512-Yqe3dREfZZmc/BqT3Ntg0DEXivbP3HBNYCbjDkUaakkIIrapNR8TK1vj3RgkSW6FMtpfcVXBcLGI4cA0I1zbOw==", "license": "Apache-2.0", "dependencies": { "ansi-colors": "^4.1.3", - "axios": "1.11.0", + "axios": "1.12.2", "bcryptjs": "3.0.2", "cli-table": "^0.3.11", "enquirer": "^2.3.6", @@ -8071,9 +8052,9 @@ } }, "node_modules/node-red-node-test-helper/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -8200,9 +8181,9 @@ } }, "node_modules/nodemon/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -8309,9 +8290,9 @@ } }, "node_modules/normalize-url": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz", - "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.0.tgz", + "integrity": "sha512-X06Mfd/5aKsRHc0O0J5CUedwnPmnDtLF2+nq+KN9KSDlJHkPuh0JUviWjEWMe0SW/9TDdSLVPuk7L5gGTIA1/w==", "license": "MIT", "engines": { "node": ">=14.16" @@ -8343,9 +8324,9 @@ } }, "node_modules/number-allocator/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -8915,9 +8896,9 @@ } }, "node_modules/package-manager-detector": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.3.0.tgz", - "integrity": "sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.5.0.tgz", + "integrity": "sha512-uBj69dVlYe/+wxj8JOpr97XfsxH/eumMt6HqjNTmJDf/6NO9s+0uxeOneIz3AsPt2m6y9PqzDzd3ATcU17MNfw==", "dev": true, "license": "MIT" }, @@ -9293,9 +9274,9 @@ } }, "node_modules/pkg-types": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz", - "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz", + "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==", "dev": true, "license": "MIT", "dependencies": { @@ -9385,9 +9366,9 @@ "license": "MIT" }, "node_modules/proxy/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -9471,9 +9452,9 @@ } }, "node_modules/quansync": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz", - "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==", + "version": "0.2.11", + "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz", + "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==", "dev": true, "funding": [ { @@ -10471,12 +10452,12 @@ } }, "node_modules/socks": { - "version": "2.8.6", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.6.tgz", - "integrity": "sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==", + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", + "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", "license": "MIT", "dependencies": { - "ip-address": "^9.0.5", + "ip-address": "^10.0.1", "smart-buffer": "^4.2.0" }, "engines": { @@ -10607,9 +10588,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.21", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", - "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", + "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", "dev": true, "license": "CC0-1.0" }, @@ -10626,6 +10607,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/statuses": { @@ -10826,9 +10808,9 @@ } }, "node_modules/superagent/node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -11373,9 +11355,9 @@ } }, "node_modules/undici-types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", - "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz", + "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", "license": "MIT" }, "node_modules/universalify": { diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix index 741322f96a1d..ccad687797ed 100644 --- a/pkgs/by-name/no/node-red/package.nix +++ b/pkgs/by-name/no/node-red/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "node-red"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "node-red"; repo = "node-red"; tag = version; - hash = "sha256-MBuWVrN5KNUSNRMZTrDwkQjf3E7BPpnYZL0LKSd6dvU="; + hash = "sha256-guyWY5Bk9mP5WBjPAKGq/Hp4BYF1rDYDG0m1rOLnpio="; }; - npmDepsHash = "sha256-FV+41HMggMMadRQG/jVnTkp4ycAthp+a4QPrTRhuris="; + npmDepsHash = "sha256-GMbUAdAHrDJZIrUzXtDxW8kP0KZK2GTxsHWxoZTaqAQ="; postPatch = let diff --git a/pkgs/by-name/nu/nuked-md/package.nix b/pkgs/by-name/nu/nuked-md/package.nix index 41db685d2755..71af5135a9bd 100644 --- a/pkgs/by-name/nu/nuked-md/package.nix +++ b/pkgs/by-name/nu/nuked-md/package.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { # FOUND. postPatch = '' substituteInPlace CMakeLists.txt \ - --replace 'SDL2 REQUIRED' 'SDL2' + --replace 'SDL2 REQUIRED' 'SDL2' \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + # CMake 3.0 is deprecated and is no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 ''; strictDeps = true; diff --git a/pkgs/by-name/od/odhcp6c/package.nix b/pkgs/by-name/od/odhcp6c/package.nix index 96326237c4e6..c156d412dbbd 100644 --- a/pkgs/by-name/od/odhcp6c/package.nix +++ b/pkgs/by-name/od/odhcp6c/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { pname = "odhcp6c"; - version = "0-unstable-2025-10-03"; + version = "0-unstable-2025-10-17"; src = fetchgit { url = "https://git.openwrt.org/project/odhcp6c.git"; - rev = "96d9e0b6e81330c61c954c6bc73a2302276fcda1"; - hash = "sha256-EhkzSKf1t4MrGCN5oC1h0QJiY9w8VhMsa/jor4lEvD4="; + rev = "d7afeea2b9650c64fcf915cbb3369577247b96ed"; + hash = "sha256-6L/yY8u5JBw1oywj2pg+0rW2397KBNAejrg5VKpYxLw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index f9652fc9f53c..4f303a9d42d0 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -22,12 +22,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.15.4"; + version = "0.15.8"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-Td5kLiBO21nGSb0c7jmp08giOVbfPniNvQrOTclq664="; + hash = "sha256-6brfh6yTFGnhUo9kZ5VAcC1whhMPJYYwVIT7j6g+wkw="; }; tui = buildGoModule { @@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHash = { - x86_64-linux = "sha256-4O3zDd+beiNrIjHx+GXVo9zXW3YBNDVAqiONqq/Ury8="; - aarch64-linux = "sha256-4JoHpUL8AkT96VlG1vb9gA3SfqPaP3A26Vh6WgzJ6zA="; - x86_64-darwin = "sha256-6QSahMpCJz0dOTlj1V8ZBECilY7dXhbEDjLVSjGh/LE="; - aarch64-darwin = "sha256-HHW0rr656zrBcdT/owEcLv8ZRF3VUshW4gbfU84bTVI="; + x86_64-linux = "sha256-EfH8fBgP0zsKVu26BxFq1NCwWLG6vlOhDD/WQ7152hA="; + aarch64-linux = "sha256-Bwwe9PTYwEJvTLhB2+6yzC4pB2/1J/JGI8S1TSrdOuM="; + x86_64-darwin = "sha256-TBSBpuPE+V7oanEMW6F8PvCZSLqIokibsyO1NtbLQnM="; + aarch64-darwin = "sha256-+wUulok3OdJ0YewuyOkv5zbiC+3QzhokfT3aCdL5akk="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix index ab9b532d06ac..bbe5d46f37c8 100644 --- a/pkgs/by-name/op/opensmt/package.nix +++ b/pkgs/by-name/op/opensmt/package.nix @@ -10,46 +10,49 @@ enableReadline ? false, readline, gtest, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensmt"; - version = "2.7.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; - rev = "v${version}"; - sha256 = "sha256-zhNNnwc41B4sNq50kPub29EYhqV+FoDKRD/CLHnVyZw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xKpYABMn2bsXRg2PMjiMhsx6+FbAsxitLRnmqa1kmu0="; }; + strictDeps = true; + nativeBuildInputs = [ cmake bison flex ]; + buildInputs = [ libedit gmpxx + gtest ] ++ lib.optional enableReadline readline; preConfigure = '' - substituteInPlace test/CMakeLists.txt \ - --replace 'FetchContent_Populate' '#FetchContent_Populate' + substituteInPlace test/CMakeLists.txt --replace-fail \ + 'FetchContent_MakeAvailable' '#FetchContent_MakeAvailable' ''; - cmakeFlags = [ - "-Dgoogletest_SOURCE_DIR=${gtest.src}" - "-Dgoogletest_BINARY_DIR=./gtest-build" - ]; - meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + passthru.updateScript = nix-update-script { }; + + meta = { + broken = with stdenv.hostPlatform; (isLinux && isAarch64); description = "Satisfiability modulo theory (SMT) solver"; mainProgram = "opensmt"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = if enableReadline then licenses.gpl2Plus else licenses.mit; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = if enableReadline then lib.licenses.gpl2Plus else lib.licenses.mit; homepage = "https://github.com/usi-verification-and-security/opensmt"; }; -} +}) diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index b2fb21c6f830..4de37605c62c 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -95,6 +95,11 @@ let }) ]; + postPatch = '' + substituteInPlace Modules/ThirdParty/KWSys/src/KWSys/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)' + ''; + # fix the CMake config files for ITK which contains double slashes postInstall = (oldArgs.postInstall or "") + '' sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 6604103f89e9..3c85c4259532 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "peazip"; - version = "10.6.1"; + version = "10.7.0"; src = fetchFromGitHub { owner = "peazip"; repo = "peazip"; rev = finalAttrs.version; - hash = "sha256-y+q4S3XHkN2dvHMaRxPQwK9l9LaA5rGvrzzZ+x76qUQ="; + hash = "sha256-JVSr4ztDHjJF+vzhaMSSAWt6PEtxNzfCRBQBlfLA4xs="; }; sourceRoot = "${finalAttrs.src.name}/peazip-sources"; diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index 48732279f298..aa7e045c64fd 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -55,12 +55,21 @@ stdenv.mkDerivation rec { url = "https://github.com/performous/performous/commit/eb9b97f46b7d064c32ed0f086d89a70427ce1d14.patch"; hash = "sha256-98pcO/sFQJ+G67ErwlO/aAITNDPuRgPziQiF1cAlc0g="; }) + # Fix build with CMake 4 + (fetchpatch { + url = "https://github.com/performous/compact_enc_det/commit/28f46c18c60b851773b0ff61f3ce416fb09adcf3.patch?full_index=1"; + stripLen = 1; + extraPrefix = "ced-src/"; + hash = "sha256-23VD/4X4BOtcX5k+koSlRMowlbo2jAXbp3XKTXP7VrM="; + }) ]; - postPatch = '' + prePatch = '' mkdir ced-src cp -R ${cedSrc}/* ced-src + ''; + postPatch = '' substituteInPlace data/CMakeLists.txt \ --replace "/usr" "$out" ''; diff --git a/pkgs/by-name/pf/pffft/package.nix b/pkgs/by-name/pf/pffft/package.nix index 6631385b9bf2..1679c076425d 100644 --- a/pkgs/by-name/pf/pffft/package.nix +++ b/pkgs/by-name/pf/pffft/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "pffft"; - version = "0-unstable-2022-04-10"; + version = "0-unstable-2025-06-09"; src = fetchFromGitHub { owner = "marton78"; repo = "pffft"; - rev = "08f5ed2618ac06d7dcc83d209d7253dc215274d5"; - sha256 = "sha256-9LfLQ17IRsbEwGQJZzhW2Av4en1KuJVicLrS2AyjUZY="; + rev = "9ae907aae7a39c08cea398778b9496ba7484423a"; + sha256 = "sha256-+efWiBrJzC188tDSPHMARRDArzx/4E8GYPMfDHAND8k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix index 424762e6fb1b..6e0e7ecd963c 100644 --- a/pkgs/by-name/pg/pgroll/package.nix +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -4,16 +4,17 @@ lib, libpg_query, xxHash, + testers, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "pgroll"; version = "0.14.3"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OqBgFeXpvoImoPMKHBCvsPQGhHSBZuNNMLh2/3DPPYo="; }; @@ -21,16 +22,29 @@ buildGoModule rec { vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw="; - excludedPackages = [ "dev" ]; + excludedPackages = [ + "dev" + "tools" + ]; buildInputs = [ libpg_query xxHash ]; + ldflags = [ + "-s" + "-w" + "-X github.com/xataio/pgroll/cmd.Version=${finalAttrs.version}" + ]; + # Tests require a running docker daemon doCheck = false; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { description = "PostgreSQL zero-downtime migrations made easy"; license = lib.licenses.asl20; @@ -38,4 +52,4 @@ buildGoModule rec { homepage = "https://github.com/xataio/pgroll"; maintainers = with lib.maintainers; [ ilyakooo0 ]; }; -} +}) diff --git a/pkgs/by-name/ph/phart/package.nix b/pkgs/by-name/ph/phart/package.nix new file mode 100644 index 000000000000..a2ff7cd98cef --- /dev/null +++ b/pkgs/by-name/ph/phart/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.phart diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 96310ff421b7..6be056dd7b52 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2025.07.25.0"; + version = "2025.10.17.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; tag = finalAttrs.version; - hash = "sha256-9XWlWwq+xvqPgKIc7IGoMVTxajjYsrPo/ra/0JIE168="; + hash = "sha256-A/ajGQ75z/EdWFFJK0kLjcSFfa9z15TZCNZZpwq9k2E="; }; - vendorHash = "sha256-91Yz78nh4r+Gr7gKSwelTdO436ehENVTPUWcnDaU7zg="; + vendorHash = "sha256-qLcwAmnkh3nxrvdDa/OI3RQOi/4qhxURhcXM1r5iE88="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index cac51b5f2f80..05a05d9ab39a 100644 --- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -18,6 +18,10 @@ python3Packages.buildPythonApplication rec { build-system = [ python3Packages.poetry-core ]; + pythonRelaxDeps = [ + "typer" + ]; + dependencies = with python3Packages; [ setuptools # for pkg_resources tomlkit diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix index 9ecc15b994e5..a1d18bc8a476 100644 --- a/pkgs/by-name/pl/planarity/package.nix +++ b/pkgs/by-name/pl/planarity/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "planarity"; - version = "4.0.0.0"; + version = "4.0.1.0"; src = fetchFromGitHub { owner = "graph-algorithms"; repo = "edge-addition-planarity-suite"; rev = "Version_${version}"; - sha256 = "sha256-A7huHvMgUyvw2zM9qA7Ax/1Ai5VZ6A1PZIo3eiCpu44="; + sha256 = "sha256-uSCQSn3LRi3eQynh71fs1xhVIrPcOqVyGzdHAK9xj7E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/popt/package.nix b/pkgs/by-name/po/popt/package.nix index c40e17228f54..eb9e4f3685ed 100644 --- a/pkgs/by-name/po/popt/package.nix +++ b/pkgs/by-name/po/popt/package.nix @@ -49,9 +49,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qyliss ]; license = licenses.mit; platforms = platforms.unix; - identifiers.purlParts = { - type = "github"; - spec = "rpm-software-management/popt@popt-${version}-release"; - }; }; } diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 8af5940becd8..d4967897caaf 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { pname = "prometheus"; - version = "3.6.0"; + version = "3.7.1"; outputs = [ "out" @@ -45,14 +45,14 @@ buildGoModule (finalAttrs: { owner = "prometheus"; repo = "prometheus"; tag = "v${finalAttrs.version}"; - hash = "sha256-GowtA1iTx6lpRW+RBLYFc8s5H8ECPEmcbdVJvGHl5Cw="; + hash = "sha256-m5dQoEn/989gmG5Q4A/oCY6JKvOLzpAU8kaPQOsajlA="; }; - vendorHash = "sha256-xGMBd/MhwjCbrQrP5d5aSd99F8GN6wB3jaHpOh0M7OA="; + vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE="; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz"; - hash = "sha256-lw097NTDJUWm2RY0RUg/5djNdbj+W9hRdIaF2cQz4Bo="; + hash = "sha256-88PNQfVM9le+2mqMBq9tyyZ+1J+yloWWIE4VJHSCS1g="; }; excludedPackages = [ diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index 574e3a5db27b..b612e525a7e8 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.9.42"; + version = "1.9.44"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-+9fRsE7+5iyCQSVaP+HF9SNvGm4e2F8CcwsMZEiBAXU="; + hash = "sha256-4TDJ4Ysebp4u+VvsYRfHLLm+J6G4/+l/ynh+TI4BRWI="; }; meta = { diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index 8b47d46fa573..07f493703910 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -1,12 +1,10 @@ { lib, - python3, + python3Packages, fetchFromGitHub, go-md2man, - # TODO: switch to llama-cpp-vulkan when moltenvk is upgraded to 1.3.0: - # https://github.com/NixOS/nixpkgs/pull/434130 - llama-cpp, + llama-cpp-vulkan, podman, withPodman ? true, @@ -14,32 +12,38 @@ ramalama, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ramalama"; - version = "0.12.3"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "containers"; repo = "ramalama"; tag = "v${version}"; - hash = "sha256-PnuAPQ9RF7IRnmHtUrwDRXIKEzZBDEU2mWfG5FyfY0c="; + hash = "sha256-S4TZN+vExZ/5KJOgkhwlX0p+xPDI6tjmS2WDWgXzDOI="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools wheel ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ argcomplete pyyaml + jsonschema + jinja2 ]; nativeBuildInputs = [ go-md2man ]; + postPatch = '' + substituteInPlace ramalama/config.py --replace-fail "{sys.prefix}" "$out" + ''; + preBuild = '' make docs ''; @@ -49,11 +53,11 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : ${ lib.makeBinPath ( [ - llama-cpp + llama-cpp-vulkan podman ] ++ ( - with python3.pkgs; + with python3Packages; [ huggingface-hub ] @@ -68,13 +72,13 @@ python3.pkgs.buildPythonApplication rec { ]; nativeCheckInputs = [ - python3.pkgs.pytestCheckHook + python3Packages.pytestCheckHook + podman ]; - # Enable when https://github.com/containers/ramalama/pull/1891 is released - disabledTests = [ - "test_ollama_model_pull" - ]; + preCheck = '' + export PATH="$out/bin:$PATH" + ''; passthru = { tests = { diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix index 842f956d5e76..da05c8034151 100644 --- a/pkgs/by-name/ra/rapidyaml/package.nix +++ b/pkgs/by-name/ra/rapidyaml/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "biojppm"; repo = "rapidyaml"; fetchSubmodules = true; tag = "v${version}"; - hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE="; + hash = "sha256-r19PBS35mvAK2RoZGXaw6UU9EuEXVoUK6BV6cJnPyUs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix index 800990798430..69851711c9fc 100644 --- a/pkgs/by-name/rb/rbspy/package.nix +++ b/pkgs/by-name/rb/rbspy/package.nix @@ -8,23 +8,18 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rbspy"; - version = "0.34.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; - tag = "v${version}"; - hash = "sha256-yVcVuMCyvk9RbkbKomqjkLY+p5tUzW2zcAKZ8XfsjM0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6pQoCPwrIKaEUYgaHNgFLz+bY4p+ImlhZ2l2vehA4Ic="; }; - cargoHash = "sha256-WiIHFwB6BE9VYuC2dCHNnrEFjVsesp0c5i4bH01cXis="; - - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config - ''; + cargoHash = "sha256-6Q1ebXEknP3qEiU5qMXhHykRwahMZEVXGJGE4EToohA="; doCheck = true; @@ -32,11 +27,11 @@ rustPlatform.buildRustPackage rec { # from nixpkgs during tests. preCheck = '' substituteInPlace src/core/process.rs \ - --replace /usr/bin/which '${which}/bin/which' + --replace-fail "/usr/bin/which" "${lib.getExe which}" substituteInPlace src/sampler/mod.rs \ - --replace /usr/bin/which '${which}/bin/which' + --replace-fail "/usr/bin/which" "${lib.getExe which}" substituteInPlace src/core/ruby_spy.rs \ - --replace /usr/bin/ruby '${ruby}/bin/ruby' + --replace-fail "/usr/bin/ruby" "${lib.getExe ruby}" ''; checkFlags = [ @@ -60,9 +55,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://rbspy.github.io/"; description = "Sampling CPU Profiler for Ruby"; mainProgram = "rbspy"; - changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}"; + changelog = "https://github.com/rbspy/rbspy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 5bb9c95fb875..d6f1b65ee125 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.87"; + version = "0.9.88"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-icTltmxgquOpWByo+7ZTIvD2WVuf+X6vF1ghmgs1pH0="; + hash = "sha256-z9bRRXQkXsqZRW1EPj0c8A9ZHWytYYtP6o40K86+Fio="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 1f147e49da4d..dbdc2eca0ece 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-NMT1/Oy0EmAtGqHMK3FL/MZczKz//hXkpKWhQ4S3tLw="; + hash = "sha256-lLZuzjx/DKr00GWPTkSncGT2j9M/xUU84Alxqia8IvQ="; }; - cargoHash = "sha256-M7p20eeaxijlGjYBAAwmK4y/58eo7NysoK+Gvs86SNo="; + cargoHash = "sha256-2z0RcttfwbhehS8k4vu5d1Np0pRWSCIeQk8paH7hJuY="; env = { PROTOC = lib.getExe protobuf; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 88f21c5a448e..2350c2d3f4c2 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2025-10-12"; + version = "0.2.0-nightly-2025-10-18"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-QJ1Mz1CR/2NIKiNA7DfjYrurHAtQxvZephJQCLxbmwc="; + hash = "sha256-rFgaquwcQK2U+1qSlxI+VT5OJPftbj4pcMJih71Gl2A="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-zFmGusWYN0PJ+3Q89JMixehWYigYqmWZCG+lgyLkUhE="; + cargoHash = "sha256-6Q3KBrrfL50AkFkDuxXWKqPtc2ClI3j1WpE/x9ASOJk="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index 779316390b76..ea815b7bf2e9 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -36,17 +36,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustdesk"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-ZUk/6r7HjlWAU7sUxbBxp9ZtxXUJftjcDy/V3LcMNPA="; + hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ="; }; - cargoHash = "sha256-b0jsW0208zKFMyoqKti8TuTNZL7hQ8PX7Gwm0faW4po="; + cargoHash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw="; patches = [ ./make-build-reproducible.patch diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix index 51ae36a7c9e8..1ff605248c1f 100644 --- a/pkgs/by-name/sb/sbomnix/package.nix +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -29,14 +29,14 @@ in python.pkgs.buildPythonApplication rec { pname = "sbomnix"; - version = "1.7.3"; + version = "1.7.4"; pyproject = true; src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; tag = "v${version}"; - hash = "sha256-eN0dn2TNVEPSfIiJM0NA+HT1l4DnFq1mrSOOUF0h9xY="; + hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4="; # Remove documentation as it contains references to nix store postFetch = '' diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix index 81109ab74801..38e2c25dc41c 100644 --- a/pkgs/by-name/sc/scdl/package.nix +++ b/pkgs/by-name/sc/scdl/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchPypi, + ffmpeg-headless, }: python3Packages.buildPythonApplication rec { @@ -27,6 +28,15 @@ python3Packages.buildPythonApplication rec { filelock ]; + # Ensure ffmpeg is available in $PATH: + makeWrapperArgs = + let + packagesToBinPath = [ ffmpeg-headless ]; + in + [ + ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' + ]; + # No tests in repository doCheck = false; diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix index f5541bf01a8f..354cfb85b646 100644 --- a/pkgs/by-name/sh/shark/package.nix +++ b/pkgs/by-name/sh/shark/package.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: { # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187. postPatch = '' sed -i '/CXX_STANDARD/d' src/CMakeLists.txt + + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required( VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)' ''; # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_shark.cmake?ref_type=heads diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index ce2bda3d148f..f1d4cc30f42e 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.8.2"; + version = "4.8.3"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-wVc3iddqXTpsBZqEY+WWR1Taig4crhlQqw7jypm3ZMc="; + hash = "sha256-On/uyGPK9TbhTAJ1qNi36g4y7AOkR0YYs7rgWGcmzUs="; }; passthru.updateScript = nix-update-script { }; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - cargoHash = "sha256-HRew3ldsgUbCh4eW1MSvoxLZobSJRjj7Eg0+XRbjFes="; + cargoHash = "sha256-mnUlZlvGs1i5kGvChfsvN4AFpVBPXO+EJ2HyAsW0f9Y="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index a43e0ed50178..cb20579d8b93 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -4,30 +4,35 @@ fetchFromGitHub, pkg-config, sqlite, + unixODBC, zstd, fetchurl, }: let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js"; - hash = "sha256-D19uY7rZtzJPVsZWYpvTOoY2hXmgfg+Mlaf+ALYHTgg="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js"; + hash = "sha256-OtfH8igG4/XVMWV1155dCl8kGhruowISVUm7ZZF0VwU="; }; tablerCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css"; - hash = "sha256-aO+4ZoyNPZHCexbbprDYU9LCxshqszQA0SINFYfos3M="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css"; + hash = "sha256-fvdQvRBUamldCxJ2etgEi9jz7F3n2u+xBn+dDao9HJo="; + }; + tomSelectCss = fetchurl { + url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css"; + hash = "sha256-vW5UjM/Ka9/jIY8I5s5KcudaTRWh/cCGE1ZUsrJvlI0="; }; tablerVendorsCss = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css"; - hash = "sha256-MyRhKcnB54KIswGkkyYXzEjx3YPVTKG7zVBf4wE20QY="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css"; + hash = "sha256-/VPz9GtiH1Es1KGLY706UIayEEgG93B6aIBa3WzwKYc="; }; tablerJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js"; - hash = "sha256-QoGNzPGpYrbyDynQUZxmnFFT8MEk/nkUCLyp71avhqw="; + url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js"; + hash = "sha256-tgx2Fg6XYkV027jPEKvmrummSTtgCW/fwV3R3SvZnrk="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg"; - hash = "sha256-CD5BvpwW4Db6C7bxjaWUrA3kz17BDJKVU4bTwOPP1kE="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg"; + hash = "sha256-pCPkhrx0GnPg5/EthJ7pLdMxb7wbYMJ0R7WchDcffpg="; }; tomselect = fetchurl { url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js"; @@ -35,55 +40,59 @@ let }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "sqlpage"; - version = "0.34.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; - tag = "v${version}"; - hash = "sha256-cqMXdAXc46DbbONz1A6uf2Oo2Cu4sig6ntuLqYlihR4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sIbEyW1/EuZuspU9pBOe6y9Ktwvz9ZNEsQ4CU/yU278="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css */' \ - "$(cat ${tablerCss})" - substituteInPlace sqlpage/sqlpage.css \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css */' \ - "$(cat ${tablerVendorsCss})" + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css */' \ + "$(cat ${tablerCss})" \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css */' \ + "$(cat ${tablerVendorsCss})" \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css */' \ + "$(cat ${tomSelectCss})" substituteInPlace sqlpage/sqlpage.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js */' \ "$(cat ${tablerJs})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" substituteInPlace sqlpage/tomselect.js \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \ "$(cat ${tomselect})" ''; - cargoHash = "sha256-NUbCSYUTXN8glw94Lr/+Jj54PukRXFlzTxq0d7znjwA="; + cargoHash = "sha256-uWdEzuEKxN50OM40i/BedgfoWf3oijks8tM5bs7qUao="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite + unixODBC zstd ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; + __darwinAllowLocalNetworking = true; + meta = { description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly"; homepage = "https://github.com/lovasoa/SQLpage"; - changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/lovasoa/SQLpage/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "sqlpage"; }; -} +}) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 9324735a798a..54391a206bc9 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.24"; + version = "3.16.26"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-LL91oKfSC1TV+bFwFFqnrDnbDnn+FukaFEQ8Ma4BJjo="; + hash = "sha256-KQx4CWPfKBJwuBONYSE7AIKa7UBXBvtNVcrOmkPrjkY="; }; outputs = [ diff --git a/pkgs/by-name/st/stunnel/package.nix b/pkgs/by-name/st/stunnel/package.nix index 2a5c7722534e..cc8fafd940c8 100644 --- a/pkgs/by-name/st/stunnel/package.nix +++ b/pkgs/by-name/st/stunnel/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "stunnel"; - version = "5.75"; + version = "5.76"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz"; - hash = "sha256-DB7w7YUkCXTcy5T+dPuS1jg0dMfA0Q6HltH3gaO6VoM="; + hash = "sha256-zaN+tND7HhKXGO0nrXe1c16Jk5TOBAuyvii7uTf9eeE="; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/by-name/sy/synadm/package.nix b/pkgs/by-name/sy/synadm/package.nix index 9abb85fb09bd..6cfcd2bcc48d 100644 --- a/pkgs/by-name/sy/synadm/package.nix +++ b/pkgs/by-name/sy/synadm/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "synadm"; - version = "0.48"; + version = "0.49.2"; pyproject = true; src = fetchFromGitea { @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { owner = "synadm"; repo = "synadm"; tag = "v${version}"; - hash = "sha256-6t4CXXt22/yR0gIxSsM/r+zJQeoKz5q/Ifg8PLNojLI="; + hash = "sha256-Nh4pzOXBXwbhq49Hq8vmPi6AS6N/tRqDBjIVKH3Gh6s="; }; build-system = [ python3Packages.setuptools ]; @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { tabulate pyyaml requests + requests-unixsocket ]; checkPhase = '' diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix index 45dc9d696097..0c164ffb3d5b 100644 --- a/pkgs/by-name/tf/tflint/package.nix +++ b/pkgs/by-name/tf/tflint/package.nix @@ -1,7 +1,8 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, + versionCheckHook, runCommand, makeWrapper, tflint, @@ -9,21 +10,18 @@ symlinkJoin, }: -let +buildGo125Module (finalAttrs: { pname = "tflint"; - version = "0.58.1"; -in -buildGoModule { - inherit pname version; + version = "0.59.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = "tflint"; - tag = "v${version}"; - hash = "sha256-1SuNcqU8JtMypoltbNBZHZZi78jvbbAD+nmj2v8NU5g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg="; }; - vendorHash = "sha256-8sHiCEtVs+rUnmJ9NPYJJcr4sDlFaEWklE3JaoXEu9w="; + vendorHash = "sha256-KVKxtH/Hgxe7We3K8ArovsRDPz6a2wEfQ8Zx3ScCo74="; doCheck = false; @@ -34,6 +32,12 @@ buildGoModule { "-w" ]; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + passthru.withPlugins = plugins: let @@ -43,10 +47,10 @@ buildGoModule { paths = [ actualPlugins ]; }; in - runCommand "tflint-with-plugins-${version}" + runCommand "tflint-with-plugins-${finalAttrs.version}" { nativeBuildInputs = [ makeWrapper ]; - inherit version; + inherit (finalAttrs) version; } '' makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ @@ -57,8 +61,8 @@ buildGoModule { description = "Terraform linter focused on possible errors, best practices, and so on"; mainProgram = "tflint"; homepage = "https://github.com/terraform-linters/tflint"; - changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ momeemt ]; }; -} +}) diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix index 69a1795a5b7e..efb72643499f 100644 --- a/pkgs/by-name/tr/traccar/package.nix +++ b/pkgs/by-name/tr/traccar/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "traccar"; - version = "6.9.1"; + version = "6.10.0"; nativeBuildInputs = [ pkgs.makeWrapper ]; src = fetchzip { stripRoot = false; url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip"; - hash = "sha256-PR0crdEGYr4lVp5JSFSLGsR+uZKWulfp6LA57y9K88E="; + hash = "sha256-esXmcN3j7rZ6Sx9n772LC39hN25tHKq7RIn+j/PyISw="; }; installPhase = '' diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix index 3fe5c63dc1e8..4946cf4ee9a3 100644 --- a/pkgs/by-name/ve/vermin/package.nix +++ b/pkgs/by-name/ve/vermin/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "vermin"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "netromdk"; repo = "vermin"; rev = "v${version}"; - hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ="; + hash = "sha256-9rEJSj/dsP6fMXTfbIhTMwfZnmfq9wdAE4mHdAxag7Y="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index 8827834ec375..8862db31ead7 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.19.2"; + version = "3.19.2-unstable-2025-10-12"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; - tag = "v${finalAttrs.version}"; + rev = "1ebe3fd4ecef69c2bacb7f2ec915666f99195ce1"; fetchSubmodules = true; - hash = "sha256-40k0wSqRdwlUqrbb9mDK0dqsSEqCfbNLt+cUKeky+do="; + hash = "sha256-vbud2IjmkIIkuZ7ocrQ199CEsKy1nMnidGe/d0UN9jU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 9bee77d5cea2..58306a79ec34 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-FVQ3eAXj/KUa/myHm0+7L62c8cGEa9kmmlGnLPGqSwU="; + hash = "sha256-NXQY9ICU6YVVTnXb19pFqOx4VyTfxzk1RA03RqpEOeA="; }; installPhase = '' diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index ee5956c32df1..046aa48bedcb 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "waybar-lyric"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "Nadim147c"; repo = "waybar-lyric"; tag = "v${finalAttrs.version}"; - hash = "sha256-1n00yxeDlxn/BzDF4cc+JkJZMmEtZftqey3Hwg6aAKI="; + hash = "sha256-2iuMlcKDnhRc3PZNMjhkHElEyVdx8+p+ONHn8lC4dQ0="; }; - vendorHash = "sha256-DBtSC+ePl6dvHqB10FyeojnYoT3mmsWAnbs/lZLibl8="; + vendorHash = "sha256-JpAlpTHPxPWHBCeegnUVYsM9LjUCuvfFd0JjQpCccaM="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index 921e6abc113e..2814bcec78e4 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -9,6 +9,7 @@ dav1d, installShellFiles, scdoc, + rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -34,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libGL libxkbcommon dav1d + rust-jemalloc-sys ]; buildFeatures = [ diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix index c1db4c30ad9f..2e626d246c86 100644 --- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix +++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix @@ -1,26 +1,30 @@ { lib, - python312Packages, + python3Packages, fetchFromGitHub, + fetchpatch, }: -let - # tensorflow-bin unsupported on Python 3.13 - python3Packages = python312Packages; -in - python3Packages.buildPythonApplication rec { pname = "wyoming-openwakeword"; - version = "1.10.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-openwakeword"; rev = "refs/tags/v${version}"; - hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU="; + hash = "sha256-edSZ5W6oSPYLKuxjQerWRkAO/C+WeTiCosNnbS2sbh0="; }; + patches = [ + (fetchpatch { + # Expose entrypoint as wyoming-openwakeword script + url = "https://github.com/rhasspy/wyoming-openwakeword/commit/a8c8419bc65fab07a554aa0925f898a7f3b65d79.patch"; + hash = "sha256-GSViQA01RwkFYEH7CPdU1P0EQ2ml6Vp1OukQ/0VOm+Y="; + }) + ]; + build-system = with python3Packages; [ setuptools ]; @@ -29,12 +33,8 @@ python3Packages.buildPythonApplication rec { "wyoming" ]; - pythonRemoveDeps = [ - "tflite-runtime-nightly" - ]; - dependencies = with python3Packages; [ - tensorflow-bin + pyopen-wakeword wyoming ]; diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index 50650eba17f9..fe0f2a08303e 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-10-06"; + version = "0-unstable-2025-10-18"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "703531d541fb9391afed4fbb951db198c9193c28"; - hash = "sha256-xLZBEnSxDhGWGscvE4Ht4wSAnSxY+0wBLAA2MVVobHg="; + rev = "a1a33b9939e8bc95555bbecafeac97413b73ddea"; + hash = "sha256-2+YOYxmumSHV8gHvKlOGUahcA/p/8drqXqkgy7udVpk="; }; dontConfigure = true; diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 1bb54c54e980..f554c4f56b7b 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "72"; + version = "72.2"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-u9vtxkFxh7JK6Zb/IuS4qldf8ysDYospqOEuPObGyps="; + hash = "sha256-tDoo4PxfK/JB4Q10QQECYKf34nL2YkoHcUhp3aKbtYI="; }; buildInputs = [ diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix index fb0eee22c3cf..f553c0326ce3 100644 --- a/pkgs/by-name/ze/zeno/package.nix +++ b/pkgs/by-name/ze/zeno/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "zeno"; - version = "2.0.15"; + version = "2.0.17"; src = fetchFromGitHub { owner = "internetarchive"; repo = "Zeno"; tag = "v${finalAttrs.version}"; - hash = "sha256-NLvpPM5AQx4svAFrZ+be+Xr0bErOg3Q8y2YxdpX9lYs="; + hash = "sha256-RPWvn4FEK1Fpkvvud/1CaSFFvTV1zxjzvXbBjqWRCIQ="; }; - vendorHash = "sha256-sUd4rRq5KEbdj5Z6igmDeN1E2q9NXgyed0F4hW8De6E="; + vendorHash = "sha256-Zi7wmT72f8KJHkysGg8rWTUk8iMjlYDGeZUFvKmtQtk="; env.CGO_ENABLED = true; ldFlags = [ diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 583506b325df..1433a9e18a11 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -23,9 +23,9 @@ mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.20.5"; + version = "4.20.6"; - sha256 = "sha256-Q8gzXRR2ZO98rbHhxnf472d8rGOLqEv7WP6LDONRgS0="; + sha256 = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix index 14fcec5ac5ea..b69880f20822 100644 --- a/pkgs/development/embedded/tytools/default.nix +++ b/pkgs/development/embedded/tytools/default.nix @@ -2,37 +2,55 @@ lib, stdenv, fetchFromGitHub, - cmake, - pkg-config, - wrapQtAppsHook, - qtbase, + installShellFiles, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tytools"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "Koromix"; - repo = "tytools"; - rev = "v${version}"; - sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA="; + repo = "rygel"; + tag = "tytools/${finalAttrs.version}"; + hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA="; }; nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook + installShellFiles + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase ]; - meta = with lib; { + buildPhase = '' + runHook preBuild + + ./bootstrap.sh + ./felix -pFast tycmd tycommander tyuploader + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + installBin bin/Fast/tycmd bin/Fast/tycommander bin/Fast/tyuploader + install -D --mode 0644 src/tytools/tycommander/tycommander_linux.desktop $out/share/applications/tycommander.desktop + install -D --mode 0644 src/tytools/tyuploader/tyuploader_linux.desktop $out/share/applications/tyuploader.desktop + install -D --mode 0644 src/tytools/assets/images/tycommander.png $out/share/icons/hicolor/512x512/apps/tycommander.png + install -D --mode 0644 src/tytools/assets/images/tyuploader.png $out/share/icons/hicolor/512x512/apps/tyuploader.png + + runHook postInstall + ''; + + meta = { description = "Collection of tools to manage Teensy boards"; homepage = "https://koromix.dev/tytools"; - license = licenses.unlicense; - platforms = platforms.unix; - maintainers = with maintainers; [ ahuzik ]; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ahuzik ]; }; -} +}) diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index fb5d8bcb7dae..7d2e3517f979 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -9,6 +9,7 @@ haskellPackages, writeText, runCommand, + nixosTests, }: # This argument is a function which selects a list of Haskell packages from any @@ -137,6 +138,8 @@ buildPackages.stdenv.mkDerivation (finalAttrs: { ''; }; + passthru.tests.nixos = nixosTests.hoogle; + meta = { description = "Local Hoogle database"; platforms = ghc.meta.platforms; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index a88e41c95873..3caa55292a91 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -97,4 +97,9 @@ in }) ]; }; + + fmt_12 = generic { + version = "12.0.0"; + hash = "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g="; + }; } diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 7530d998e51e..5eba0b261380 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -30,6 +30,14 @@ stdenv.mkDerivation { }) ]; + # CMake 2.8.6 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_minimum_required(VERSION 2.8.6)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ pkg-config which @@ -41,9 +49,9 @@ stdenv.mkDerivation { qtbase ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" - ) "-std=c++11"; + env.NIX_CFLAGS_COMPILE = + (lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11") + + (lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-dynamic-exception-spec"); dontWrapQtApps = true; diff --git a/pkgs/development/libraries/nss/3_115.nix b/pkgs/development/libraries/nss/3_115.nix deleted file mode 100644 index 7436aee6c513..000000000000 --- a/pkgs/development/libraries/nss/3_115.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./generic.nix { - version = "3.115.1"; - hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14="; - filename = "3_115.nix"; - versionRegex = "NSS_(3)_(115)(?:_(\\d+))?_RTM"; -} diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 4edb927e2213..2ac2bb4ff56a 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -17,6 +17,19 @@ stdenv.mkDerivation rec { sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs"; }; + # CMake 2.8.8 is deprecated and no longer supported by CMake > 4 + # https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" + substituteInPlace CMakeLists.txt --replace-fail \ + "cmake_policy(SET CMP0020 OLD)" \ + "" + ''; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register"; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index 2716099bf24e..489716c2dcc9 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + runCommand, cmake, pkg-config, qttools, @@ -16,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qodeassist-plugin"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Palm1r"; repo = "QodeAssist"; tag = "v${finalAttrs.version}"; - hash = "sha256-XzxuElQQxR2dK7KD0QHUAb7qyizUBhPvGDv3OvnAQjc="; + hash = "sha256-QDs9li8WH27aITe48cxRWaqd0mFCmZcBeb34LadeGmk="; }; dontWrapQtApps = true; @@ -50,6 +51,15 @@ stdenv.mkDerivation (finalAttrs: { installPhase = "mkdir -p $out; cp -R lib $out/"; + passthru.tests = { + test-version = runCommand "${finalAttrs.pname}-test" { } '' + QT_QPA_PLATFORM="offscreen" ${ + lib.getExe (qtcreator.withPackages [ finalAttrs.finalPackage ]) + } --version > $out + cat $out | grep 'qodeassist ${finalAttrs.version}' + ''; + }; + meta = { description = "AI-powered coding assistant plugin for Qt Creator"; longDescription = '' @@ -62,6 +72,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Palm1r/QodeAssist"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.zatm8 ]; - platforms = lib.platforms.linux; + platforms = qtcreator.meta.platforms; }; }) diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index de2b2fec0067..67466c7e685f 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -5,23 +5,20 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, typing-extensions, }: buildPythonPackage rec { pname = "aiostream"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "vxgmichel"; repo = "aiostream"; tag = "v${version}"; - hash = "sha256-oOx1LG3UyMJRm/HvmrHT00jTp3+XzmvS2XRH4BJNyPE="; + hash = "sha256-AxisfmFZMEFJ/zfYCTfelvUGIoz56w6dKoZAMDKOZzk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index f51a899af510..38b2ed9b105c 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "6.0.2"; + version = "6.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; tag = version; - hash = "sha256-DtTrfwT8Xvw5byWzTGpO/o2PI7/4Zt++xgKVnNMwA1k="; + hash = "sha256-6wBeAbBiuAZW9kHq/bKC0FMJxkLxM6RZN7RLwbF1ig4="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/asyncpraw/default.nix b/pkgs/development/python-modules/asyncpraw/default.nix index 0126f99cc91e..299b4a384752 100644 --- a/pkgs/development/python-modules/asyncpraw/default.nix +++ b/pkgs/development/python-modules/asyncpraw/default.nix @@ -2,57 +2,52 @@ lib, aiofiles, aiohttp, - aiosqlite, asyncprawcore, buildPythonPackage, + coverage, + defusedxml, fetchFromGitHub, - flit-core, - mock, + hatchling, pytestCheckHook, - pytest-asyncio_0, + pytest-asyncio, pytest-vcr, - pythonOlder, - requests-toolbelt, update-checker, vcrpy, }: buildPythonPackage rec { pname = "asyncpraw"; - version = "7.8.1"; + version = "7.8.1-unstable-2025-10-08"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "praw-dev"; repo = "asyncpraw"; - tag = "v${version}"; - hash = "sha256-glWAQoUjMFbjU3C4+MGuRGSGJS9mun15+6udMPCf9nU="; + rev = "9221cbef5d94fce9ecc92376cbab084f0082502d"; + hash = "sha256-/7x7XYw1JDVaoc2+wKWW3iUkyfI6MVtBNP9G1AEUp4Y="; }; - pythonRelaxDeps = [ "aiosqlite" ]; + pythonRelaxDeps = [ + "coverage" + "defusedxml" + ]; - # 'aiosqlite' is also checked when building the wheel - pypaBuildFlags = [ "--skip-dependency-check" ]; - - build-system = [ flit-core ]; + build-system = [ hatchling ]; dependencies = [ aiofiles aiohttp - aiosqlite asyncprawcore - mock + coverage + defusedxml update-checker ]; nativeCheckInputs = [ pytestCheckHook - pytest-asyncio_0 + pytest-asyncio pytest-vcr vcrpy - requests-toolbelt ]; disabledTestPaths = [ @@ -70,7 +65,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous Python Reddit API Wrapper"; homepage = "https://asyncpraw.readthedocs.io/"; - changelog = "https://github.com/praw-dev/asyncpraw/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/praw-dev/asyncpraw/blob/${src.rev}/CHANGES.rst"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.amadejkastelic ]; }; diff --git a/pkgs/development/python-modules/asyncprawcore/default.nix b/pkgs/development/python-modules/asyncprawcore/default.nix index bc8c34f86a01..b6a34a6a2b9a 100644 --- a/pkgs/development/python-modules/asyncprawcore/default.nix +++ b/pkgs/development/python-modules/asyncprawcore/default.nix @@ -4,43 +4,35 @@ buildPythonPackage, fetchFromGitHub, flit-core, - mock, pytestCheckHook, - pytest-asyncio_0, + pytest-asyncio, pytest-vcr, - requests, - requests-toolbelt, - testfixtures, vcrpy, yarl, }: buildPythonPackage rec { pname = "asyncprawcore"; - version = "2.4.0"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "praw-dev"; repo = "asyncprawcore"; tag = "v${version}"; - hash = "sha256-FDQdtnNjsbiEp9BUYdQFMC/hkyJDhCh2WHhQWSQwrFY="; + hash = "sha256-0FOMY/0LXGcHwDe4t+NMAovMhX83/mMv8sWvIf5gxok="; }; build-system = [ flit-core ]; dependencies = [ - requests aiohttp yarl ]; nativeCheckInputs = [ - testfixtures - mock - requests-toolbelt pytestCheckHook - pytest-asyncio_0 + pytest-asyncio pytest-vcr vcrpy ]; @@ -51,6 +43,11 @@ buildPythonPackage rec { "tests/integration/test_sessions.py" ]; + disabledTests = [ + # Test requires network access + "test_initialize" + ]; + pythonImportsCheck = [ "asyncprawcore" ]; meta = { diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index bf759e8f1f58..ef4839a39ec3 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchFromGitHub, lib, - pythonOlder, poetry-core, grpclib, python-dateutil, @@ -10,9 +9,10 @@ jinja2, isort, python, + cachelib, pydantic, - pytest7CheckHook, - pytest-asyncio_0_21, + pytestCheckHook, + pytest-asyncio, pytest-mock, typing-extensions, tomlkit, @@ -21,16 +21,14 @@ buildPythonPackage rec { pname = "betterproto"; - version = "2.0.0b6"; + version = "2.0.0b7"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "danielgtaylor"; repo = "python-betterproto"; tag = "v.${version}"; - hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; + hash = "sha256-T7QSPH8MFa1hxJOhXc3ZMM62/FxHWjCJJ59IpeM41rI="; }; postPatch = '' @@ -53,11 +51,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + cachelib grpcio-tools pydantic - pytest-asyncio_0_21 + pytest-asyncio pytest-mock - pytest7CheckHook + pytestCheckHook tomlkit ] ++ lib.flatten (builtins.attrValues optional-dependencies); @@ -73,13 +72,11 @@ buildPythonPackage rec { ${python.interpreter} -m tests.generate ''; - disabledTestPaths = [ - # https://github.com/danielgtaylor/python-betterproto/issues/530 - "tests/inputs/oneof/test_oneof.py" - ]; - disabledTests = [ - "test_pydantic_no_value" + # incompatible with pytest 8: + # TypeError: exceptions must be derived from Warning, not + "test_message_with_deprecated_field_not_set" + "test_service_with_deprecated_method" # Test is flaky "test_binary_compatibility" ]; diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index d52a0eac53e5..90d6b92443e7 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "binsync"; - version = "5.7.10"; + version = "5.7.11"; pyproject = true; src = fetchFromGitHub { owner = "binsync"; repo = "binsync"; tag = "v${version}"; - hash = "sha256-QDOfbo2yjfjLsLILMhl/ckKwXDusXfE8+YmFpW5djN0="; + hash = "sha256-Rn5ytC7j8HI64NQhvV4QjjBWDeYNkINJGUWDmZ7nQ3w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 72c6e4513478..71cc81c5c3bb 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, flit-core, numpy, @@ -11,24 +10,18 @@ buildPythonPackage rec { pname = "castepxbin"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; tag = "v${version}"; - hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; + hash = "sha256-M+OoKr9ODIp47gt64hf47A1PblyZpBzulKI7nEm8hdo="; }; build-system = [ flit-core ]; - pythonRelaxDeps = [ - "numpy" - ]; - dependencies = [ numpy scipy @@ -36,10 +29,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { + changelog = "https://github.com/zhubonan/castepxbin/releases/tag/${src.tag}"; description = "Collection of readers for CASTEP binary outputs"; homepage = "https://github.com/zhubonan/castepxbin"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix index 17d7cb13353a..14a43b3fa688 100644 --- a/pkgs/development/python-modules/fastmcp/default.nix +++ b/pkgs/development/python-modules/fastmcp/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "fastmcp"; - version = "2.12.4"; + version = "2.12.5"; pyproject = true; src = fetchFromGitHub { owner = "jlowin"; repo = "fastmcp"; tag = "v${version}"; - hash = "sha256-d8DOdyoyYDxZOpiUSxsYXnGrgFYN9CjdmAeHmJiDBP0="; + hash = "sha256-F8NCp1Ku1EeI/YjbHuHcDYytTgqOFyLp+sZGBqayv6s="; }; build-system = [ diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix index 420c4b7a5f5f..f4093c11ac3a 100644 --- a/pkgs/development/python-modules/habiticalib/default.nix +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "habiticalib"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "habiticalib"; tag = "v${version}"; - hash = "sha256-9IMC4MkL5hRCDjeuSuLBcn986LmO/zz32NV0RGTEf1M="; + hash = "sha256-Z3VJ0AaB4HeCOffV5B2WFIvGJXoCn1isNPMnERoUrp0="; }; build-system = [ diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 22acb6f48d67..f1ba73092291 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510181"; + version = "0.1.202510191"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-C9wTZ5cBs7vzAnesEVj8blHoKd7pzYIbMeNGbO6q9lM="; + hash = "sha256-sMKlZGaEkzoOhpAOsKBqSUDRe6j7iL2sBivABSCAEA8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/jobspy/default.nix b/pkgs/development/python-modules/jobspy/default.nix index 55b2623a9935..1f7bb1e47613 100644 --- a/pkgs/development/python-modules/jobspy/default.nix +++ b/pkgs/development/python-modules/jobspy/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "numpy" "markdownify" + "regex" ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 2494b0efb675..99dd4133d88b 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "jupyterhub"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; src = fetchFromGitHub { owner = "jupyterhub"; repo = "jupyterhub"; - rev = "refs/tags/${version}"; - hash = "sha256-OCrEmNwWhOMJE/uTDUyEZzJlWqyzNp6CnvDsOg5hZkU="; + tag = version; + hash = "sha256-8hClknn0GfXbfXEzoYnb6qCXby7MU6BUDVoAG80UgNA="; }; npmDeps = fetchNpmDeps { diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix index fb6083a90802..fffc10aa8252 100644 --- a/pkgs/development/python-modules/keymap-drawer/default.nix +++ b/pkgs/development/python-modules/keymap-drawer/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, + callPackages, fetchFromGitHub, pythonOlder, + keymap-drawer, nix-update-script, pcpp, platformdirs, @@ -59,6 +61,12 @@ buildPythonPackage { versionCheckProgram = "${placeholder "out"}/bin/keymap"; versionCheckProgramArg = "--version"; + passthru.tests = callPackages ./tests { + # Explicitly pass the correctly scoped package. + # The top-level package will still resolve to itself, because the way + # `toPythonApplication` interacts with scopes is weird. + inherit keymap-drawer; + }; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/keymap-drawer/tests/default.nix b/pkgs/development/python-modules/keymap-drawer/tests/default.nix new file mode 100644 index 000000000000..7c94185c41f5 --- /dev/null +++ b/pkgs/development/python-modules/keymap-drawer/tests/default.nix @@ -0,0 +1,89 @@ +{ + lib, + fetchFromGitHub, + runCommand, + stdenv, + testers, + + keymap-drawer, + yamllint, +}: +let + runKeymapDrawer = + name: + runCommand "keymap-drawer-${name}" { + nativeBuildInputs = [ keymap-drawer ]; + }; + + MattSturgeon-example = fetchFromGitHub { + owner = "MattSturgeon"; + repo = "glove80-config"; + rev = "d55267dd26593037256b35a5d6ebba0f75541da5"; + hash = "sha256-MV6cNpgHBuaGvpu2aR1aBNMpwPnDqOSbGf+2ykxocP4="; + nonConeMode = true; + sparseCheckout = [ + "config" + "img" + ]; + }; + + # MattSturgeon's example requires MDI icons + mdi = fetchFromGitHub { + owner = "Templarian"; + repo = "MaterialDesign-SVG"; + tag = "v7.4.47"; + hash = "sha256-NoSSRT1ID38MT70IZ+7h/gMVCNsjNs3A2RX6ePGwuQ0="; + }; +in +{ + dump-config = runKeymapDrawer "dump-config" '' + keymap dump-config --output "$out" + + if [ ! -s "$out" ]; then + >&2 echo 'Expected `dump-config` to have content.' + exit 1 + fi + + ${lib.getExe yamllint} --strict --config-data relaxed "$out" + ''; + + parse-zmk = testers.testEqualContents { + assertion = "keymap parse --zmk-keymap produces expected YAML"; + expected = "${MattSturgeon-example}/img/glove80.yaml"; + actual = runKeymapDrawer "parse" '' + keymap \ + --config ${MattSturgeon-example}/config/keymap_drawer.yaml \ + parse --zmk-keymap ${MattSturgeon-example}/config/glove80.keymap \ + --output "$out" + ''; + checkMetadata = stdenv.buildPlatform.isLinux; + }; + + draw = testers.testEqualContents { + assertion = "keymap draw produces expected SVG"; + expected = "${MattSturgeon-example}/img/glove80.svg"; + actual = runKeymapDrawer "draw" '' + ${lib.optionalString stdenv.buildPlatform.isLinux '' + export XDG_CACHE_HOME="$PWD/cache" + glyphs="$XDG_CACHE_HOME/keymap-drawer/glyphs" + ''} + ${lib.optionalString stdenv.buildPlatform.isDarwin '' + export HOME="$PWD/home" + glyphs="$HOME/Library/Caches/keymap-drawer/glyphs" + ''} + mkdir -p "$glyphs" + + # Unpack MDI icons into the cache + for file in ${mdi}/svg/* + do + ln -s "$file" "$glyphs/mdi:$(basename "$file")" + done + + keymap \ + --config ${MattSturgeon-example}/config/keymap_drawer.yaml \ + draw ${MattSturgeon-example}/img/glove80.yaml \ + --output "$out" + ''; + checkMetadata = stdenv.buildPlatform.isLinux; + }; +} diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index e93c4487160b..803c8fdffd1b 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2025.10.9.185845"; + version = "2025.10.17.202411"; pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-hy10dfrsttIaIlZRgOgNXwTWtBnV3vOGOmspkDphR4k="; + hash = "sha256-nD56FfraKuT4H/Mqw6o2lP3xP4kHAGof369UJdJeT6w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index c315fe05b90b..fc29d6ce7d01 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8sWO70le3qmhNiU4xEEM3IOrrc20+WT2Y2UBSPBEFkk="; + hash = "sha256-O4kMd07Tmiy+q/klMCoeSp23EkZNoKKeuUHMhzn+118="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index 47f7dfe3e1f7..761d5575af85 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -5,36 +5,34 @@ flit-core, mdformat, mdit-py-plugins, - pythonOlder, }: buildPythonPackage rec { pname = "mdformat-footnote"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "executablebooks"; repo = "mdformat-footnote"; tag = "v${version}"; - hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; + hash = "sha256-QiekcxKfJGWog8rfSL6VIDHdo7rpw8ftl/dDJpVpdUg="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ mdformat mdit-py-plugins ]; pythonImportsCheck = [ "mdformat_footnote" ]; - meta = with lib; { + meta = { description = "Footnote format addition for mdformat"; homepage = "https://github.com/executablebooks/mdformat-footnote"; - license = licenses.mit; - maintainers = with maintainers; [ aldoborrero ]; + changelog = "https://github.com/executablebooks/mdformat-footnote/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aldoborrero ]; }; } diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index 3f82b1eb1c5d..3981a44965c4 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "mdutils"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "didix21"; repo = "mdutils"; tag = "v${version}"; - hash = "sha256-UBq6xSGG49zaRVWe2RmsCDkpa3vZFqKRJZQEVUegTSM="; + hash = "sha256-qUCiiFzbOccS7wy0LqgyZH04KlwG/FzE3a+R3z7tPF8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index ce050e44956a..af6359e62365 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pdm-backend, httpx, zstandard, @@ -10,16 +9,14 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2025.10.10"; + version = "2025.10.14"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "frostming"; repo = "pbs-installer"; tag = version; - hash = "sha256-YqZPCzmmvcsP4tnYZS+nFZ9p+lnLtz/ivGhp2+4X3vU="; + hash = "sha256-Af3H8DWnDhAyiOIOHV7WYXO9fUkQW3eWkkFiZMkgJFw="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/phart/default.nix b/pkgs/development/python-modules/phart/default.nix new file mode 100644 index 000000000000..44b60a3f7680 --- /dev/null +++ b/pkgs/development/python-modules/phart/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + networkx, + pytestCheckHook, + pytest-cov-stub, + pydot, +}: + +buildPythonPackage rec { + pname = "phart"; + version = "1.1.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JpHjEVKpOPSNUdUjZxWBHt6AFCpci1nSRWhDXxG6nyw="; + }; + + pyproject = true; + + build-system = [ + hatchling + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + postPatch = '' + # pythonRelaxDeps = true; didn't work + substituteInPlace pyproject.toml \ + --replace-fail 'hatchling==1.26.3' 'hatchling' + + # This line makes the cli tool not work, removing it fixes it + substituteInPlace src/phart/cli.py \ + --replace-fail "renderer.options.use_ascii = args.ascii" "" + ''; + + dependencies = [ + networkx + ]; + + disabledTestPaths = [ + # Many of the tests are stale + "tests/test_cli.py" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pydot + ]; + + pythonImportsCheck = [ + "phart" + ]; + + meta = { + description = "Python Hierarchical ASCII Representation Tool"; + homepage = "https://github.com/scottvr/phart"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +} diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 0f86be974e55..7bc8741fa8c5 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -2,29 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "precis-i18n"; - version = "1.1.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.1.2"; + pyproject = true; src = fetchFromGitHub { owner = "byllyfish"; repo = "precis_i18n"; tag = "v${version}"; - hash = "sha256-rtg3u8lnnmQFPsNC52LNVoEVu6CeHzAWvOjWBlzLKC4="; + hash = "sha256-ZMj9KqiPVrpmq4/FweLMDxWQVQEtykimNhMTS9Mh5QY="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "precis_i18n" ]; meta = with lib; { description = "Internationalized usernames and passwords"; homepage = "https://github.com/byllyfish/precis_i18n"; - changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/byllyfish/precis_i18n/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 264b6ecef85d..b65bf79ac52e 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -34,13 +34,13 @@ let pname = "psycopg"; - version = "3.2.10"; + version = "3.2.11"; src = fetchFromGitHub { owner = "psycopg"; repo = "psycopg"; tag = version; - hash = "sha256-ZvqhvjDhrZ7uKi9fE/UYRaJblmfXXH6pYoUZ5u7cOu0="; + hash = "sha256-x7ca/A6K0nbcKs2iv5f2rPct5GLd2E7lymT5QZC2B/g="; }; patches = [ diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index ad1678c41c1d..f742fa99ab3c 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,13 +9,12 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.102"; + version = "0.2.103"; pyproject = true; src = fetchPypi { - pname = "pyExploitDb"; - inherit version; - hash = "sha256-vkqKouvVu+qDcFGODvZuPzhcRVEQRsCa6lqRLekZThw="; + inherit pname version; + hash = "sha256-UAR3S0Tpo1C6a8YcNjoncPWEklwCsSC+T8E5s5rgaw8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix new file mode 100644 index 000000000000..79114e2b493a --- /dev/null +++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix @@ -0,0 +1,56 @@ +{ + lib, + autoPatchelfHook, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyopen-wakeword"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "pyopen-wakeword"; + tag = "v${version}"; + hash = "sha256-LJ0pHP4nsTx3GPuWUwOwNuXR9tUKABqSHnLSvMlfm1Y="; + }; + + postPatch = '' + python ./script/copy_lib + ''; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyopen_wakeword" + ]; + + meta = { + description = "Alternative Python library for openWakeWord"; + homepage = "https://github.com/rhasspy/pyopen-wakeword"; + changelog = "https://github.com/rhasspy/pyopen-wakeword/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + # vendors prebuilt libtensorflowlite_c.{so,dll,dylib} + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/development/python-modules/random-user-agent/default.nix b/pkgs/development/python-modules/random-user-agent/default.nix deleted file mode 100644 index ea7ce11de50b..000000000000 --- a/pkgs/development/python-modules/random-user-agent/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - pythonOlder, -}: - -buildPythonPackage { - pname = "random-user-agent"; - version = "1.0.1-unstable-2018-12-26"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Luqman-Ud-Din"; - repo = "random_user_agent"; - rev = "9547a1d93558c5838f734357c695fee92be905f7"; - hash = "sha256-BkMx7N8O9I4rD8lvpoyXTZbZDsoozIpYUQh+zkLQ7Uc="; - }; - - build-system = [ setuptools ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "random_user_agent" ]; - - meta = with lib; { - description = "Module to get list of user agents based on filters"; - homepage = "https://github.com/Luqman-Ud-Din/random_user_agent"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index 5eaebbeb793b..5bbdedf73e80 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.56"; + version = "0.1.57"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-spuwor7g7lmsTxx77sxyfpFMPAq3P8SlNqWzPCN/QLc="; + hash = "sha256-We51f2pHqC4bR7ofKVVRqNZ++S3x3NAz9Zz8l9S/5wY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index f34684b9ca4e..6da9d8eb5a74 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.16.0"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; tag = "v${version}"; - hash = "sha256-BXvy/6LaCQ+fyL6ubWZqIXn/IueE3IEhP07n2oT4cZQ="; + hash = "sha256-eR75CDYWBdPzCJ6lFANpxH6IdfZHBJf95RdnWLBfyX0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index 9e65def1d162..f7f99b05e8bc 100644 --- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -1,6 +1,5 @@ { lib, - pythonOlder, flit-core, fetchPypi, buildPythonPackage, @@ -10,15 +9,13 @@ buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.3.2"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk="; + hash = "sha256-zvnrMrLGwlHeNuIoWkCq8glIJ+rhifXngE10jMw9W4E="; }; nativeBuildInputs = [ flit-core ]; @@ -35,10 +32,10 @@ buildPythonPackage rec { passthru.skipBulkUpdate = true; - meta = with lib; { + meta = { description = "Library for serializing and deserializing Sigstore messages"; - homepage = "https://pypi.org/project/sigstore-protobuf-specs/"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + homepage = "https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix index 2704600d0900..02c957dd2f54 100644 --- a/pkgs/development/python-modules/ssh-python/default.nix +++ b/pkgs/development/python-modules/ssh-python/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "ssh-python"; - version = "1.1.1"; - format = "setuptools"; + version = "1.2.0.post1"; + pyproject = true; src = fetchFromGitHub { owner = "ParallelSSH"; repo = "ssh-python"; tag = version; - hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM="; + hash = "sha256-ix6UzyC/mFDVOvfJujwppijmsTrwNtuDAkmikrKKc2o="; }; build-system = [ setuptools ]; - nativeBuildInputs = [ - cython - ]; + + nativeBuildInputs = [ cython ]; + buildInputs = [ openssl zlib diff --git a/pkgs/development/python-modules/strpdatetime/default.nix b/pkgs/development/python-modules/strpdatetime/default.nix index 4980f4e1cb61..39322938e73f 100644 --- a/pkgs/development/python-modules/strpdatetime/default.nix +++ b/pkgs/development/python-modules/strpdatetime/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "strpdatetime"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "strpdatetime"; tag = "v${version}"; - hash = "sha256-a+KUM9gQAcNg3ju+YyQXafDlADYCV6B+Wy7EBtcO3S4="; + hash = "sha256-p/iLq+x+dRW2QPva/VEA9emtxb0k3hnL91l1itTsYSc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index f596899bdf75..cf0eb5e1d005 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; src = fetchFromGitHub { owner = "orsinium-labs"; repo = "svg.py"; tag = version; - hash = "sha256-ILnPviXUHJrdeT6VTUYAZog3zY0tVA+13ddf8yVRYqE="; + hash = "sha256-m/ZiEMwoopQiiHeOT27pM9sx4BCVWSK0VV792YGjDlE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/uhashring/default.nix b/pkgs/development/python-modules/uhashring/default.nix new file mode 100644 index 000000000000..513dd2ddab72 --- /dev/null +++ b/pkgs/development/python-modules/uhashring/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + pytestCheckHook, + fetchFromGitHub, + hatchling, + python-memcached, +}: +buildPythonPackage rec { + pname = "uhashring"; + version = "2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ultrabug"; + repo = "uhashring"; + tag = version; + hash = "sha256-6zNPExbcwTUne0lT8V6xp2Gf6J1VgG7Q93qizVOAc+k="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "uhashring" + ]; + + nativeCheckInputs = [ + pytestCheckHook + python-memcached + ]; + + meta = { + description = "Full featured consistent hashing python library compatible with ketama"; + homepage = "https://github.com/ultrabug/uhashring"; + changelog = "https://github.com/ultrabug/uhashring/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ typedrat ]; + }; +} diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 31f8593c3477..54a9c6d68609 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.22.0"; + version = "7.23.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-RpEBXCkPUdqVqamz/eLOlN5y8cvlvT7dmo04fWJYzmc="; + hash = "sha256-UScv0RAIgkFYl3yJZDuSzXXV3iI/3maV42hN4EtfUio="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index e728ce1b5120..09509821cf59 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -18,14 +18,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; tag = "v${version}"; - hash = "sha256-4ZN52atcAbT6z9GzV4tOA3IiDYu+v4i3NHfauMPwMJ0="; + hash = "sha256-yKXlu78E2zE6JqpTtS/Xd4ityA0oxe90RiocHCJIO4E="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 08630cb90c67..41501959d4fa 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.21.3"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = "whirlpool-sixth-sense"; tag = version; - hash = "sha256-ZZrLqHn/O+Z2XtiCIco5PMEprbi9XeJOBXcEdjTDPDc="; + hash = "sha256-Xgz9SqH++pWZb7r1qxOrEEfC7I80qhrqcI0Zlduxlq4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix index e77bdded50d5..74ed3730a9ec 100644 --- a/pkgs/development/python-modules/x-transformers/default.nix +++ b/pkgs/development/python-modules/x-transformers/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "x-transformers"; - version = "2.8.4"; + version = "2.9.2"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "x-transformers"; tag = version; - hash = "sha256-EmZW57xWt62RTOGZ7vYE2YcyUqx1vldsb2874XR9UOo="; + hash = "sha256-JxIcEGR28VxsosKsEFLpttT9JMeGwcJxjZiDXRhTv/o="; }; build-system = [ hatchling ]; @@ -46,9 +46,10 @@ buildPythonPackage rec { meta = { description = "Concise but fully-featured transformer"; longDescription = '' - A simple but complete full-attention transformer with a set of promising experimental features from various papers + A simple but complete full-attention transformer with a set of promising experimental features from various papers. ''; homepage = "https://github.com/lucidrains/x-transformers"; + changelog = "https://github.com/lucidrains/x-transformers/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ByteSudoer ]; }; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index f6a9e25bf042..10ea06c415bd 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -77,13 +77,6 @@ lib.makeOverridable ( attrs.source.remotes or [ "https://rubygems.org" ] ); inherit (attrs.source) sha256; - meta = { - identifiers.purlParts = { - type = "gem"; - # https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/gem-definition.md - spec = "${gemName}@${version}?platform=${platform}"; - }; - }; } else if type == "git" then fetchgit { diff --git a/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch new file mode 100644 index 000000000000..9dcb2aeb7833 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch @@ -0,0 +1,20 @@ +diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt +index 302cd4a78..336a37bf0 100644 +--- a/runtime/Cpp/CMakeLists.txt ++++ b/runtime/Cpp/CMakeLists.txt +@@ -30,15 +30,10 @@ project(LIBANTLR4) + if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR + CMAKE_VERSION VERSION_GREATER "3.0.0") + CMAKE_POLICY(SET CMP0026 NEW) +- CMAKE_POLICY(SET CMP0054 OLD) +- CMAKE_POLICY(SET CMP0045 OLD) +- CMAKE_POLICY(SET CMP0042 OLD) + endif() + + if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR + CMAKE_VERSION VERSION_GREATER "3.3.0") +- CMAKE_POLICY(SET CMP0059 OLD) +- CMAKE_POLICY(SET CMP0054 OLD) + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch new file mode 100644 index 000000000000..6c40a1bf9633 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch @@ -0,0 +1,20 @@ +diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt +index df621b11d..c20b92170 100644 +--- a/runtime/Cpp/CMakeLists.txt ++++ b/runtime/Cpp/CMakeLists.txt +@@ -39,15 +39,10 @@ project(LIBANTLR4) + if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR + CMAKE_VERSION VERSION_GREATER "3.0.0") + CMAKE_POLICY(SET CMP0026 NEW) +- CMAKE_POLICY(SET CMP0054 OLD) +- CMAKE_POLICY(SET CMP0045 OLD) +- CMAKE_POLICY(SET CMP0042 OLD) + endif() + + if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR + CMAKE_VERSION VERSION_GREATER "3.3.0") +- CMAKE_POLICY(SET CMP0059 OLD) +- CMAKE_POLICY(SET CMP0054 OLD) + endif() + + if(APPLE) diff --git a/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch new file mode 100644 index 000000000000..979e224756e6 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch @@ -0,0 +1,20 @@ +diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt +index e549f113f..c84f591c2 100644 +--- a/runtime/Cpp/CMakeLists.txt ++++ b/runtime/Cpp/CMakeLists.txt +@@ -28,15 +28,10 @@ project(LIBANTLR4) + if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR + CMAKE_VERSION VERSION_GREATER "3.0.0") + CMAKE_POLICY(SET CMP0026 NEW) +- CMAKE_POLICY(SET CMP0054 OLD) +- CMAKE_POLICY(SET CMP0045 OLD) +- CMAKE_POLICY(SET CMP0042 OLD) + endif() + + if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR + CMAKE_VERSION VERSION_GREATER "3.3.0") +- CMAKE_POLICY(SET CMP0059 OLD) +- CMAKE_POLICY(SET CMP0054 OLD) + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index c30d235c4f8e..6398c8eed341 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -172,6 +172,9 @@ in # not available in a sandboxed build. (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false) ]; + extraPatches = [ + ./4.11.runtime.cpp.cmake.patch + ]; }).antlr; antlr4_10 = @@ -184,6 +187,9 @@ in (lib.cmakeBool "ANTLR4_INSTALL" true) (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false) ]; + extraPatches = [ + ./4.10.runtime.cpp.cmake.patch + ]; }).antlr; antlr4_9 = @@ -194,9 +200,11 @@ in extraCppBuildInputs = [ utf8cpp ] ++ lib.optional stdenv.hostPlatform.isLinux libuuid; extraCppCmakeFlags = [ (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev utf8cpp}/include/utf8cpp") + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; extraPatches = [ ./utf8cpp.patch + ./4.9.runtime.cpp.cmake.patch ]; }).antlr; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 603c69a4fc9f..cabba61c97cc 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -27,6 +27,7 @@ rustc-demangle, elfutils, perf, + callPackage, }: stdenv.mkDerivation (finalAttrs: { @@ -104,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ''${!outputDev}/lib/cmake/QtCreator/QtCreatorConfig.cmake --replace "$out/" "" ''; + passthru = { + withPackages = callPackage ./with-plugins.nix { }; + }; + meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/development/tools/qtcreator/with-plugins.nix new file mode 100644 index 000000000000..6aa7b5f7d76b --- /dev/null +++ b/pkgs/development/tools/qtcreator/with-plugins.nix @@ -0,0 +1,23 @@ +{ + pkgs, + lib, + qtcreator, + ... +}: +f: +let + plugins_arg = builtins.foldl' ( + acc: val: acc + "-pluginpath ${val.outPath}/lib/qtcreator/plugins/" + ) "" f; + qtcreator_runner = pkgs.writeShellScriptBin "qtcreator" '' + exec ${lib.getExe qtcreator} ${plugins_arg} "$@" + ''; +in +pkgs.symlinkJoin { + inherit (qtcreator) version meta; + name = "qtcreator-with-plugins"; + paths = [ + qtcreator_runner + qtcreator + ]; +} diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 1999edadd99f..62fb430f46ab 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.21": { - "sha1": "11e54c2081420a4d49db3007e66c80a22579ff2a", - "url": "https://piston-data.mojang.com/v1/objects/11e54c2081420a4d49db3007e66c80a22579ff2a/server.jar", - "version": "1.21.9", + "sha1": "95495a7f485eedd84ce928cef5e223b757d2f764", + "url": "https://piston-data.mojang.com/v1/objects/95495a7f485eedd84ce928cef5e223b757d2f764/server.jar", + "version": "1.21.10", "javaVersion": 21 }, "1.20": { diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix index bb739046baca..6be7d3fcdd89 100644 --- a/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -10,4 +10,6 @@ mkKdeDerivation { qtsvg qttools ]; + + meta.mainProgram = "kirigami2gallery"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index 8852075d14fd..c0fd72318bd9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -81,6 +81,13 @@ cp arch/$MACHINE/compile/$CONFIG/netbsd $out ''; + postIncludes = '' + install $BSDSRCDIR/lib/libossaudio/soundcard.h $out/include/soundcard.h + ''; + meta.platforms = lib.platforms.netbsd; - extraPaths = [ "common" ]; + extraPaths = [ + "common" + "lib/libossaudio" + ]; } diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 853dfcb4dec4..7dbf80c20b12 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -4,15 +4,19 @@ "version": "18.26.4" }, "asterisk_20": { - "sha256": "4bbe0aaecc0e7294780269a5dc7ff78a85c58cf26ffc63dd63be5406eef0b687", - "version": "20.15.2" + "sha256": "30945737855f47200b6986d917377989fd284fab50bf4d7646c63bda50bbf7b7", + "version": "20.16.0" }, "asterisk_21": { - "sha256": "9624e807a1138cabed14431a326c9870e53fc132738dbbd61314abc027785d94", - "version": "21.10.2" + "sha256": "9187aea454a54065cfa632023730737aa89ba7efe65e450ce2f6ce787238b48f", + "version": "21.11.0" }, "asterisk_22": { - "sha256": "5061c852fd850b17e6be9d866c8e73298471883fc5e3ccd5a24b3e1364e24218", - "version": "22.5.2" + "sha256": "e5b33b9b6fd6fb2bbbe748bd34f517d9c634afbbd6c53bbbdd3214ec8a6a7749", + "version": "22.6.0" + }, + "asterisk_23": { + "sha256": "30f012e5c7b4a20b149bf33c9150ae7a0f33b1a801655df65fc8a837138cac15", + "version": "23.0.0" } } diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix index 4119266bff5b..650bc4b690cc 100644 --- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "BottlecapDave"; domain = "octopus_energy"; - version = "17.0.0"; + version = "17.0.2"; src = fetchFromGitHub { inherit owner; repo = "HomeAssistant-OctopusEnergy"; tag = "v${version}"; - hash = "sha256-6+uDv3tLm5Lcq0D2rYwEH9ggvAK6y0O+l5IRHafHsyQ="; + hash = "sha256-K6Jb1fu76wx4v0HLsC8FxX+F/+UlCmUBKSFtUlLTPNc="; }; dependencies = [ pydantic ]; diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 1cf93d2e3a0f..5a27ddd671eb 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2025.10.2"; + version = "2025.10.4"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-ZwhzvxjzFqB/ENamT2jBUsm/i6dfcKv2YTnuJMCaQNI="; + hash = "sha256-ai9Dt68TM2qDbWhypct6KdMwsLbrnDocL6GIR7D0guw="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix index f5ed377c6951..a2c1ee9428ee 100644 --- a/pkgs/servers/home-assistant/custom-components/sun2/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "pnbruckner"; domain = "sun2"; - version = "3.4.1"; + version = "3.4.2b0"; src = fetchFromGitHub { inherit owner; repo = "ha-sun2"; tag = version; - hash = "sha256-VzlwmAzebxykE9rIhAiAFkEOvbh2UkgNMGQaysDA9D4="; + hash = "sha256-M+ClqFOeZUw5Rk5vaNnyRBeXU+yTSYTk70TJqcqtehU="; }; meta = rec { diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix index ab8f04fcf308..550928be1124 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "XiaoMi"; domain = "xiaomi_home"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "XiaoMi"; repo = "ha_xiaomi_home"; rev = "v${version}"; - hash = "sha256-X8AP2pFGhkh4f72+pORXBB8yOqgIqJ+SLrQx5gwKxEg="; + hash = "sha256-L5rFnbaggJbwLNo9a6ZpbPF58Ip8QSpHIiCGdjYxVqI="; }; dependencies = [ diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 15dd8337a01c..54f59210b2a6 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -2,13 +2,13 @@ rec { pname = "mobilizon"; - version = "5.1.5"; + version = "5.2.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "kaihuri"; repo = pname; tag = version; - hash = "sha256-nwEmW43GO0Ta7O7mUSJaEtm4hBfXInPqatBRdaWrhBU="; + hash = "sha256-wsiu0f0M0SMjgskMJuA/wUx6IxT7bTzHrOnxX8eFq9g="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 2d0de84a77cf..22dc3be2c832 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -75,12 +75,12 @@ mixRelease rec { }; icalendar = buildMix rec { name = "icalendar"; - version = "unstable-2022-04-10"; + version = "1.1.2"; src = fetchFromGitHub { - owner = "tcitworld"; + owner = "mobilizon-tools"; repo = name; - rev = "1033d922c82a7223db0ec138e2316557b70ff49f"; - hash = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU="; + rev = "b8fc5360b1755f60f2768d40f6aca949ef598a00"; + hash = "sha256-UAdlYTRt1itkR/dmC2/AM89MlJIABJw9N0XfYR6IcVI="; }; beamDeps = with final; [ mix_test_watch diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 8a5ca34f9a1f..4feda08bda9e 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -11,7 +11,7 @@ in buildNpmPackage { inherit (common) pname version src; - npmDepsHash = "sha256-5ilhuFaIvksXsJmNu20m8MV3hYtyPUz4zp8NIvhR5Nw="; + npmDepsHash = "sha256-0eemOn96ciiqdNBZC+cFbcaEvZ5nkV9IndsXOzIgelQ="; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 308f1af399ff..ac91d6fda6dc 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-uFCIM+pZiJ6nvapEKjgHRrIuc5p5uq5q1ToD36e19zk="; + hash = "sha256-BsNjzqGSH5Pn+deL2rM0XMVvpGdRfzuo4vzbG4I5Mtw="; }; build-system = [ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 3a35b750d5f3..1a3e65ea650d 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -34,8 +34,6 @@ let toList isList elem - flatten - filter ; inherit (lib.meta) @@ -301,7 +299,7 @@ let let expectedOutputs = attrs.meta.outputsToInstall or [ ]; actualOutputs = attrs.outputs or [ "out" ]; - missingOutputs = filter (output: !builtins.elem output actualOutputs) expectedOutputs; + missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs; in '' The package ${getNameWithVersion attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs} @@ -477,7 +475,7 @@ let let expectedOutputs = attrs.meta.outputsToInstall or [ ]; actualOutputs = attrs.outputs or [ "out" ]; - missingOutputs = filter (output: !builtins.elem output actualOutputs) expectedOutputs; + missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs; in if config.checkMeta then builtins.length missingOutputs > 0 else false; @@ -712,54 +710,14 @@ let cpe = makeCPE guessedParts; } ) possibleCPEPartsFuns; - - purlParts = attrs.meta.identifiers.purlParts or { }; - purlPartsFormatted = - if purlParts ? type && purlParts ? spec then "pkg:${purlParts.type}/${purlParts.spec}" else null; - - # search for a PURL in the following order: - purl = - # 1) locally set through API - if purlPartsFormatted != null then - purlPartsFormatted - else - # 2) locally overwritten through meta.identifiers.purl - (attrs.src.meta.identifiers.purl or null); - - # search for a PURL in the following order: - purls = - # 1) locally overwritten through meta.identifiers.purls (e.g. extension of list) - attrs.meta.identifiers.purls or ( - # 2) locally set through API - if purlPartsFormatted != null then - [ purlPartsFormatted ] - else - # 3) src.meta.PURL - (attrs.src.meta.identifiers.purls or ( - # 4) srcs.meta.PURL - if !attrs ? srcs then - [ ] - else if isList attrs.srcs then - concatMap (drv: drv.meta.identifiers.purls or [ ]) attrs.srcs - else - attrs.srcs.meta.identifiers.purls or [ ] - ) - ) - ); - v1 = { - inherit - cpeParts - possibleCPEs - purls - ; + inherit cpeParts possibleCPEs; ${if cpe != null then "cpe" else null} = cpe; - ${if purl != null then "purl" else null} = purl; }; in v1 // { - inherit v1 purlParts; + inherit v1; }; # Expose the result of the checks for everyone to see. diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index fe335b852064..5136aed309df 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -3,8 +3,8 @@ callPackage ./generic.nix ( args // { - version = "8.0.35-32"; - hash = "sha256-aNnAlhhzZ6636dzOz4FFDEE4Mb450HGU42cJrM21GdQ="; + version = "8.0.35-34"; + hash = "sha256-DqjDBLSQqlWazWJjdb+n7RwqSe/OMlZI2ca/JNTX2W8="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; @@ -12,9 +12,5 @@ callPackage ./generic.nix ( extraPatches = [ ./abi-check.patch ]; - - extraPostInstall = '' - rm -r "$out"/docs - ''; } ) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix index 82f2ab5ea95d..dbbe364f802c 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -3,8 +3,8 @@ callPackage ./generic.nix ( args // { - version = "8.4.0-2"; - hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs="; + version = "8.4.0-4"; + hash = "sha256-ws+si8bpalL8y7l9W+R4B02GnnGOou50txtS6ktntP4="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index c3cc1f9afc2d..7f4fd1a3ee8d 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -217,14 +217,14 @@ lib.makeExtensible ( attrName = "git"; lix-args = rec { - version = "2.94.0-pre-20251010_${builtins.substring 0 12 src.rev}"; + version = "2.94.0-pre-20251018_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "53d172a3083840846043f7579936e0a3e86737e5"; - hash = "sha256-PPDHXtv6U5oIj8utzIqcH+ZSjMy4vXpv/y8c2I7dZ+g="; + rev = "6e2edbff930dbf5b17a23e23f0b563e1db201f5b"; + hash = "sha256-t2f3YDiRTi6GTHc940lwozaxY7RFE1CW7EeNtVYG+FE="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix index ed5a63ce3ecf..7f3b5780607a 100644 --- a/pkgs/tools/package-management/nix/dependencies.nix +++ b/pkgs/tools/package-management/nix/dependencies.nix @@ -34,5 +34,12 @@ regular@{ # only a stripped down version is built which takes a lot less resources to build requiredSystemFeatures = [ ]; }; + + libgit2 = pkgs.libgit2.overrideAttrs (old: { + # Drop the SSH buffer overflow patch to avoid rebuilding Nix + patches = lib.filter (p: !lib.hasSuffix "fix-ssh-custom-heap-buffer-overflow.patch" (toString p)) ( + old.patches or [ ] + ); + }); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae377e821efc..4d3356e2d6b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6925,7 +6925,7 @@ with pkgs; withTeensyduino = true; }; - tytools = libsForQt5.callPackage ../development/embedded/tytools { }; + tytools = callPackage ../development/embedded/tytools { }; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; inherit (texinfoPackages) @@ -7251,7 +7251,12 @@ with pkgs; fltk = fltk13; fltk-minimal = fltk13-minimal; - inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11; + inherit (callPackages ../development/libraries/fmt { }) + fmt_9 + fmt_10 + fmt_11 + fmt_12 + ; fmt = fmt_11; @@ -8224,7 +8229,6 @@ with pkgs; }; nss_latest = callPackage ../development/libraries/nss/latest.nix { }; - nss_3_115 = callPackage ../development/libraries/nss/3_115.nix { }; nss_esr = callPackage ../development/libraries/nss/esr.nix { }; nss = nss_esr; nssTools = nss.tools; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a812d5dcb0c3..eeeface4a7bc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -723,6 +723,7 @@ mapAliases { radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02 radicale_infcloud = radicale-infcloud; # added 2024-01-07 radio_beam = radio-beam; # added 2023-11-04 + random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rauth = throw "rauth has beed removed, since it is unmaintained upstream"; # added 2024-07-27 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b1806bb642..5309f911b8ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11718,6 +11718,8 @@ self: super: with self; { pgvector = callPackage ../development/python-modules/pgvector { }; + phart = callPackage ../development/python-modules/phart { }; + phe = callPackage ../development/python-modules/phe { }; phik = callPackage ../development/python-modules/phik { }; @@ -13695,6 +13697,8 @@ self: super: with self; { pyomo = callPackage ../development/python-modules/pyomo { }; + pyopen-wakeword = callPackage ../development/python-modules/pyopen-wakeword/default.nix { }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { @@ -15706,8 +15710,6 @@ self: super: with self; { ramlfications = callPackage ../development/python-modules/ramlfications { }; - random-user-agent = callPackage ../development/python-modules/random-user-agent { }; - random2 = callPackage ../development/python-modules/random2 { }; randomfiletree = callPackage ../development/python-modules/randomfiletree { }; @@ -19494,6 +19496,8 @@ self: super: with self; { uharfbuzz = callPackage ../development/python-modules/uharfbuzz { }; + uhashring = callPackage ../development/python-modules/uhashring { }; + uhi = callPackage ../development/python-modules/uhi { }; uiprotect = callPackage ../development/python-modules/uiprotect { };