diff --git a/doc/packages/index.md b/doc/packages/index.md index 35e2656ab670..623fbe357d54 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -32,5 +32,6 @@ urxvt.section.md vcpkg.section.md weechat.section.md xorg.section.md +uv.section.md build-support.md ``` diff --git a/doc/packages/uv.section.md b/doc/packages/uv.section.md new file mode 100644 index 000000000000..c26ef784d5b2 --- /dev/null +++ b/doc/packages/uv.section.md @@ -0,0 +1,22 @@ +# uv {#sec-uv} + +`uv` is an extremely fast Python package installer and resolver, written in Rust. +It manages project dependencies and environments, with support for lockfiles, workspaces, and more. + +Due to `uv` being unaware that it is running on a NixOS system, by default, it will fetch dynamically-linked Python executables that will fail to run, as NixOS cannot run executables intended for generic Linux environments out of the box. +To learn more on this, please visit +https://nix.dev/guides/faq.html#how-to-run-non-nix-executables + +There are two ways to mitigate this: + +1. Provide `uv` with a statically-linked Python executable (ideally from `nixpkgs`) via the [`UV_PYTHON` environment variable](https://docs.astral.sh/uv/reference/environment/#uv_python). Alternatively, the `--python` flag can also be used, but this is easy to forget. It is also helpful to forbid `uv` from downloading any Python binaries via the [`UV_PYTHON_DOWNLOADS` environment variable](https://docs.astral.sh/uv/reference/environment/#uv_python_downloads) by setting it to `never`. +These variables can be set in `shell.nix` and `.env` files, which can be redistributed with the project to ensure other NixOS machines can execute the project. + +2. Add `programs.nix-ld.enable = true` to your NixOS config. While functional, the previous option is to be preferred, as this is the "works on my machine" option, because redistributing Python projects that use `uv` to another NixOS machine that does not have `nix-ld` enabled will cause the same errors to occur. + +Additionally, there is the issue of modules from PyPI vendoring dynamically-linked libraries, such as `numpy`, which will also fail to work. +This topic is not local to `uv`, but is deserving of documentation nonetheless. +Setting `LD_LIBRARY_PATH` should be the solution of choice here. Either: + +1. Use `lib.makeLibraryPath` to set `LD_LIBRARY_PATH` from a `shell.nix`, e.g. `LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.openssl pkgs.zlib pkgs.curl ]` +2. (If you have already enabled `nix-ld`) set `LD_LIBRARY_PATH` to `NIX_LD_LIBRARY_PATH`. Be aware this is not a silver bullet solution, as this simply provides a list of commonly used libraries, as is shown in `nixos/modules/programs/nix-ld.nix`. diff --git a/doc/redirects.json b/doc/redirects.json index 80392ea35d39..0442248c3e3e 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -4594,6 +4594,9 @@ "sec-interop.cylonedx-fod": [ "index.html#sec-interop.cylonedx-fod" ], + "sec-uv": [ + "index.html#sec-uv" + ], "module-system-module-argument-_prefix": [ "index.html#module-system-module-argument-_prefix" ], diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aa36030484ce..950479a825bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -893,6 +893,12 @@ githubId = 4717906; name = "Jakub Skokan"; }; + aiyion = { + email = "git@aiyionpri.me"; + github = "AiyionPrime"; + githubId = 6937725; + name = "Jan-Niklas Burfeind"; + }; ajaxbits = { email = "contact@ajaxbits.com"; github = "ajaxbits"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 671e1e586cee..fbc2a0a100dd 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -74,6 +74,8 @@ - [postfix-tlspol](https://github.com/Zuplu/postfix-tlspol), MTA-STS and DANE resolver and TLS policy server for Postfix. Available as [services.postfix-tlspol](#opt-services.postfix-tlspol.enable). +- [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable). + - [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable). - [IfState](https://ifstate.net), manage host interface settings in a declarative manner. Available as [networking.ifstate](options.html#opt-networking.ifstate.enable) and [boot.initrd.network.ifstate](options.html#opt-boot.initrd.network.ifstate.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 30f542ac1cc9..3bfe8ccb982c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -81,6 +81,7 @@ ./hardware/keyboard/teck.nix ./hardware/keyboard/uhk.nix ./hardware/keyboard/zsa.nix + ./hardware/kryoflux.nix ./hardware/ksm.nix ./hardware/ledger.nix ./hardware/libftdi.nix @@ -536,6 +537,7 @@ ./services/databases/postgresql.nix ./services/databases/postgrest.nix ./services/databases/redis.nix + ./services/databases/rethinkdb.nix ./services/databases/surrealdb.nix ./services/databases/tigerbeetle.nix ./services/databases/victorialogs.nix @@ -1133,6 +1135,7 @@ ./services/networking/dnsproxy.nix ./services/networking/doh-proxy-rust.nix ./services/networking/doh-server.nix + ./services/networking/dsnet.nix ./services/networking/easytier.nix ./services/networking/ejabberd.nix ./services/networking/envoy.nix @@ -1446,6 +1449,7 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix + ./services/security/crowdsec.nix ./services/security/e-imzo.nix ./services/security/endlessh-go.nix ./services/security/endlessh.nix diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 53c54c15c5d0..463757fa8440 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -10,9 +10,6 @@ let cfg = config.services.postgrey; - natural = with types; addCheck int (x: x >= 0); - natural' = with types; addCheck int (x: x > 0); - socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? path || x ? port); @@ -127,17 +124,17 @@ in description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host"; }; delay = mkOption { - type = natural; + type = ints.unsigned; default = 300; description = "Greylist for N seconds"; }; maxAge = mkOption { - type = natural; + type = ints.unsigned; default = 35; description = "Delete entries from whitelist if they haven't been seen for N days"; }; retryWindow = mkOption { - type = either str natural; + type = either str ints.unsigned; default = 2; example = "12h"; description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours"; @@ -148,12 +145,12 @@ in description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR"; }; IPv4CIDR = mkOption { - type = natural; + type = ints.unsigned; default = 24; description = "Strip N bits from IPv4 addresses if lookupBySubnet is true"; }; IPv6CIDR = mkOption { - type = natural; + type = ints.unsigned; default = 64; description = "Strip N bits from IPv6 addresses if lookupBySubnet is true"; }; @@ -163,7 +160,7 @@ in description = "Store data using one-way hash functions (SHA1)"; }; autoWhitelist = mkOption { - type = nullOr natural'; + type = nullOr ints.positive; default = 5; description = "Whitelist clients after successful delivery of N messages"; }; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 9da570bbb5e2..5c0388aee32a 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -107,7 +107,7 @@ in }; mining.threads = lib.mkOption { - type = lib.types.addCheck lib.types.int (x: x >= 0); + type = lib.types.ints.unsigned; default = 0; description = '' Number of threads used for mining. @@ -174,7 +174,7 @@ in }; limits.threads = lib.mkOption { - type = lib.types.addCheck lib.types.int (x: x >= 0); + type = lib.types.ints.unsigned; default = 0; description = '' Maximum number of threads used for a parallel job. @@ -183,7 +183,7 @@ in }; limits.syncSize = lib.mkOption { - type = lib.types.addCheck lib.types.int (x: x >= 0); + type = lib.types.ints.unsigned; default = 0; description = '' Maximum number of blocks to sync at once. diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix index 8a039aa75abf..7ed0cf51e561 100644 --- a/nixos/modules/services/networking/tayga.nix +++ b/nixos/modules/services/networking/tayga.nix @@ -42,7 +42,7 @@ let }; prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + type = types.ints.between 0 (if v == 4 then 32 else 128); description = '' Subnet mask of the interface, specified as the number of bits in the prefix ("${if v == 4 then "24" else "64"}"). diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 709431026739..a26b2af96cd7 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -72,7 +72,7 @@ let }; prefixLength = mkOption { - type = with types; nullOr (addCheck int (n: n >= 0 && n <= 128)); + type = with types; nullOr (ints.between 0 128); default = null; description = '' The prefix length of the subnet. @@ -227,7 +227,7 @@ in debugLevel = mkOption { default = 0; - type = types.addCheck types.int (l: l >= 0 && l <= 5); + type = types.ints.between 0 5; description = '' The amount of debugging information to add to the log. 0 means little logging while 5 is the most logging. {command}`man tincd` for diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix index 9c498fc16e37..7c1c2752006b 100644 --- a/nixos/modules/services/security/crowdsec.nix +++ b/nixos/modules/services/security/crowdsec.nix @@ -170,6 +170,11 @@ in }; }; }; + description = '' + The set of parser specifications. + + See for details. + ''; default = { }; }; postOverflows = lib.mkOption { @@ -198,6 +203,11 @@ in }; }; }; + description = '' + The set of Postoverflows specifications. + + See for details. + ''; default = { }; }; contexts = lib.mkOption { @@ -306,6 +316,9 @@ in }; patterns = lib.mkOption { type = lib.types.listOf lib.types.package; + description = '' + A list of files containing custom grok patterns. + ''; default = [ ]; example = lib.literalExpression '' [ (pkgs.writeTextDir "custom_service_logs" (builtins.readFile ./custom_service_logs)) ] @@ -313,6 +326,9 @@ in }; }; }; + description = '' + The configuration for a crowdsec security engine. + ''; default = { }; }; @@ -473,6 +489,9 @@ in }; }; }; + description = '' + Set of various configuration attributes + ''; }; }; config = diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 09b6cec4e7ea..4b7e788bc33b 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -82,7 +82,7 @@ let }; prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + type = types.ints.between 0 (if v == 4 then 32 else 128); description = '' Subnet mask of the interface, specified as the number of bits in the prefix (`${if v == 4 then "24" else "64"}`). @@ -99,7 +99,7 @@ let }; prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + type = types.ints.between 0 (if v == 4 then 32 else 128); description = '' Subnet mask of the network, specified as the number of bits in the prefix (`${if v == 4 then "24" else "64"}`). diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix index 69b64b3705b5..3c1ce017cd7c 100644 --- a/pkgs/applications/emulators/libretro/cores/gpsp.nix +++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gpsp"; - version = "0-unstable-2025-08-21"; + version = "0-unstable-2025-09-07"; src = fetchFromGitHub { owner = "libretro"; repo = "gpsp"; - rev = "143b0abb02a6ff501757674c9fdf47e0fcd7cbd3"; - hash = "sha256-XdcoM0hzVvuZZn7kXh1X8HSUGGEm/0Uqh7du7nx4sIE="; + rev = "f7a6a4314697ea5e4821a15aa7110795679f6ade"; + hash = "sha256-g63KIeQUvCg9LbixeXF2JRgUEFlzBMctXV8IFqvR0sg="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 3b9a030f7637..a7cdf4b54b39 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-08-26"; + version = "0-unstable-2025-09-10"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "250d22b0cba0f145c7b958821fa7d1f839f4a37b"; - hash = "sha256-jonFTHNuO7w2gypPyjx6DML8vNBIa+9Ur9Fa48WBNq4="; + rev = "1e2be6664685efd7805ca19031f279fcaec25e15"; + hash = "sha256-PhWlrp+ILgBh6GUI+hkWO513dTQqDJIx+n0YZEaNlyw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 87f74bd6075c..4524d3fab92a 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -62,6 +62,10 @@ stdenv.mkDerivation rec { ninja pandoc pkg-config + ] + ++ lib.optionals waylandSupport [ + wayland-protocols + wayland-scanner ]; buildInputs = [ cairo @@ -76,7 +80,6 @@ stdenv.mkDerivation rec { ++ lib.optionals waylandSupport [ wayland wayland-protocols - wayland-scanner ] ++ lib.optionals x11Support [ libxcb diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 01bcfdebd40c..074ccaf08af3 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "kubernetes-helm"; - version = "3.18.6"; + version = "3.19.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aUnPLjSt1law6O2M4IQnHB3QiMDYVQ6h//zJbE2vap8="; + sha256 = "sha256-ssOebBeIFVd6N0CDWfAU3HN0j4Rw7twncokzorHWJig="; }; - vendorHash = "sha256-Gn2h7a4bu9nWPEiqW9uN8SnKSZ7NRfchfRoFfpp49+M="; + vendorHash = "sha256-G3PLT2jE+Oitct5F+o/hr8GDAKWcvp23dcpezuBge6k="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 0d3ac0c57306..eb94b51aa3a9 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -90,9 +90,9 @@ rec { nomad_1_10 = generic { buildGoModule = buildGo124Module; - version = "1.10.4"; - hash = "sha256-lQtKSU0wcrU+HEUc6N/svpf5uAaWK68G5kY/tI2Sy8Q="; - vendorHash = "sha256-tclD02oinoypx80TLni+DUpB5mYKRBqsmScp2VsUDc0="; + version = "1.10.5"; + hash = "sha256-NFH++oYWb6vQN6cOPByscI/ZBWDNy4YbcLiBMO3/jVU="; + vendorHash = "sha256-QcTw9kKwoHIvXZoxfDohFG+sBs8OLvYPeygygDClsn8="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/science/math/nota/default.nix b/pkgs/applications/science/math/nota/default.nix deleted file mode 100644 index 10a6ec30cb33..000000000000 --- a/pkgs/applications/science/math/nota/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - mkDerivation, - haskellPackages, - fetchurl, - lib, -}: - -mkDerivation rec { - pname = "nota"; - version = "1.0"; - - # Can't use fetchFromGitLab since codes.kary.us doesn't support https - src = fetchurl { - url = "http://codes.kary.us/nota/nota/-/archive/V${version}/nota-V${version}.tar.bz2"; - sha256 = "0bbs6bm9p852hvqadmqs428ir7m65h2prwyma238iirv42pk04v8"; - }; - - postUnpack = '' - export sourceRoot=$sourceRoot/source - ''; - - isLibrary = false; - isExecutable = true; - - libraryHaskellDepends = with haskellPackages; [ - base - bytestring - array - split - scientific - parsec - ansi-terminal - regex-compat - containers - terminal-size - numbers - text - time - ]; - - description = "Most beautiful command line calculator"; - homepage = "https://kary.us/nota"; - license = lib.licenses.mpl20; - maintainers = [ ]; - mainProgram = "nota"; -} diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 135f44e30add..86383f95aca2 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-SY7pf6bHvX6tezTYpOu/pqda3IsIqaR5g7JZS+eEEZw="; + hash = "sha256-sYhmXVc1pU0nzG57AIuaLqUOWz9MfFlpJZQ9B5Ki5ik="; }; doCheck = false; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index c2bcfa6ca23c..1bc2f5bd79f8 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-m+2D1Vrh6Qi7iDOCuio76p7d4eAkjuCSZXxJD9spPrw="; + hash = "sha256-NTdz7NtjvVQolSiqyCdR0P4dD0+ZQBKMEXTzwHPZgxU="; }; - cargoHash = "sha256-W94oaBgws5FUF2Xax+O7faiQgfhcyTeGoCu+VJD0Wd0="; + cargoHash = "sha256-iLExF4lwXQ1BVBxEK+iD5HDkbjk38AbLaIirS04C4iw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix index 1b31c6d7d0e3..5e6dcde3b0f6 100644 --- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix +++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bash-pinyin-completion-rs"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "bash-pinyin-completion-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-tcgpPFB/BHVbGFYHfs8y0yOVK/KJmjNJ95I41TX+pu4="; + hash = "sha256-TBTVUDtlBCvfmWcwcSr9xLXE1cBLHeptklwR3hD+49Y="; }; strictDeps = true; diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/by-name/ba/bashate/package.nix similarity index 78% rename from pkgs/development/tools/bashate/default.nix rename to pkgs/by-name/ba/bashate/package.nix index 975e34e30d63..e405b8f66799 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/by-name/ba/bashate/package.nix @@ -2,6 +2,7 @@ lib, fetchPypi, python3Packages, + versionCheckHook, }: python3Packages.buildPythonApplication rec { @@ -9,8 +10,6 @@ python3Packages.buildPythonApplication rec { version = "2.1.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.5"; - src = fetchPypi { inherit pname version; hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; @@ -21,7 +20,6 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ babel pbr - setuptools ]; nativeCheckInputs = with python3Packages; [ @@ -39,12 +37,12 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "bashate" ]; - meta = with lib; { + meta = { description = "Style enforcement for bash programs"; mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - teams = [ teams.openstack ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; + teams = [ lib.teams.openstack ]; }; } diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index df6574840d76..dedff8b05ab8 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-bubC2cGlZDam0IGGwB/GSiVt9LFfKmy0uZwwPhAPrl0="; + hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc="; }; - cargoHash = "sha256-LJYAVism63OVzAEJS8WeaL+XTpxOTCy22U5MUPu8rA4="; + cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch b/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch new file mode 100644 index 000000000000..4a3bdb81f246 --- /dev/null +++ b/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch @@ -0,0 +1,14 @@ +diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake +index 949b80e..6ffcaa6 100644 +--- a/cfitsio.pc.cmake ++++ b/cfitsio.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir="@CMAKE_INSTALL_FULL_LIBDIR@" ++includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@" + + Name: cfitsio + Description: FITS File Subroutine Library diff --git a/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch b/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch deleted file mode 100644 index 0ea3b55ef708..000000000000 --- a/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN cfitsio/configure cfitsio-rpath-universal/configure ---- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 -+++ cfitsio-rpath-universal/configure 2021-10-27 12:02:25.000000000 +0200 -@@ -4829,16 +4829,7 @@ - SHLIB_SUFFIX=".dylib" - CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}" - CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}" -- case $host in -- *darwin[56789]*) -- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- *) -- # Build 'Universal' binaries (i386 & x86_64 architectures) and -- # use rpath token on Darwin 10.x or newer: -- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}" -- ;; -- esac -+ SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" - - lhea_shlib_cflags="-fPIC -fno-common" - ;; diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix index 679d01068bfa..f32e8ca6cfc5 100644 --- a/pkgs/by-name/cf/cfitsio/package.nix +++ b/pkgs/by-name/cf/cfitsio/package.nix @@ -1,7 +1,9 @@ { stdenv, lib, - fetchurl, + fetchFromGitHub, + gitUpdater, + cmake, bzip2, curl, zlib, @@ -9,15 +11,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.4.1"; + version = "4.6.2"; - src = fetchurl { - url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZqHcPyGAD57qvZ6sV3uR/N2aq7pnj7ujuFJzGRENHSU="; + src = fetchFromGitHub { + owner = "HEASARC"; + repo = finalAttrs.pname; + tag = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-WLsX23hNhaITjCvMEV7NUEvyDfQiObSJt1qFC12z7wY="; }; + outputs = [ + "bin" + "dev" + "out" + "doc" + ]; + patches = [ - ./darwin-rpath-universal.patch + ./cfitsio-pc-cmake.patch + ]; + + nativeBuildInputs = [ + cmake ]; buildInputs = [ @@ -26,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - configureFlags = [ - "--with-bzip2=${bzip2.out}" - "--enable-reentrant" + cmakeFlags = [ + "-DUSE_PTHREADS=ON" + "-DTESTS=ON" + "-DUTILS=ON" + "-DUSE_BZIP2=ON" ]; env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD { @@ -36,16 +53,31 @@ stdenv.mkDerivation (finalAttrs: { # not showing us gethostbyname() NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1"; }; - hardeningDisable = [ "format" ]; - # Shared-only build - buildFlags = [ "shared" ]; + doCheck = true; + doInstallCheck = true; - postPatch = '' - sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + # On testing cfitsio: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/README + installCheckPhase = '' + ./TestProg > testprog.lis + diff -s testprog.lis ../testprog.out + cmp testprog.fit ../testprog.std ''; + # Fixup installation + # Remove installed test tools and benchmark + postInstall = '' + install -Dm644 -t "$out/share/doc/${finalAttrs.pname}" ../docs/*.pdf + rm "$out/bin/cookbook" + rmdir "$out/bin" + rm "$bin/bin/smem" "$bin/bin/speed" + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "${finalAttrs.pname}-"; }; + }; + meta = { homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix index a12927fec4d7..c010e06996b5 100644 --- a/pkgs/by-name/co/converseen/package.nix +++ b/pkgs/by-name/co/converseen/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "converseen"; - version = "0.15.0.2"; + version = "0.15.0.3"; src = fetchFromGitHub { owner = "Faster3ck"; repo = "Converseen"; tag = "v${finalAttrs.version}"; - hash = "sha256-zBTADXacQ9hIc6+3QpPseYSGsCnslNJY+ZCa5BJZUjg="; + hash = "sha256-ZC7D+0tonAIkbDaoqw+RarIVuNcDQe410JrfC2kG+B8="; }; strictDeps = true; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index f09c874490e4..e4518335bf3c 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGo125Module (finalAttrs: { pname = "crush"; - version = "0.7.7"; + version = "0.7.10"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-rQtQUt/XOZpHxS2l4qhwrQ5cW0Q+JQW1D6GvPxkSMuk="; + hash = "sha256-z7x//aTJCcAa3RkB8QOtdeU9dBcOKkJD3ftFiCt/WQo="; }; - vendorHash = "sha256-k7yfCyfeW2TW5DpVmxfNLXV08FxhpW4SQNAcDyrYKPc="; + vendorHash = "sha256-AZOX2aRYkuLx0DRCS5dqsRCPwpHngqDc+97luRr0m0g="; # rename TestMain to prevent it from running, as it panics in the sandbox. postPatch = '' diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix index e7eac8e0a91c..fa915b6be73f 100644 --- a/pkgs/by-name/di/discount/package.nix +++ b/pkgs/by-name/di/discount/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.0.0d"; + version = "3.0.1"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = "discount"; rev = "v${version}"; - sha256 = "sha256-fFSlW9qnH3NL9civ793LrScOJSuRe9i377BgpNzOXa0="; + hash = "sha256-Bb6vcEICzxaQmBIm9xQy5dKV485iwcxgkA3PAHaR2cw="; }; patches = [ ./fix-configure-path.patch ]; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 388357a8954c..5b5d3cf370f4 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.110"; + "version" = "1.11.111"; "hashes" = { - "desktopSrcHash" = "sha256-iWdNiihpU29nek+EQjHmRi7dXadPYYoIt6bhufauKf8="; - "desktopYarnHash" = "sha256-l/hclDXT1JeToQPnWFDXU8JSN+oEm5hPYm4OQ7QJONk="; + "desktopSrcHash" = "sha256-QRnMHlq/gBoptJ/0iBdKUXbnR/oLVeA+ybF/0YFVBlo="; + "desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg="; }; } diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index b00e4dbc3dac..5597133194ba 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation ( mkdir -p "$out/share/element" ln -s '${element-web}' "$out/share/element/webapp" cp -r '.' "$out/share/element/electron" - cp -r './res/img' "$out/share/element" chmod -R "a+w" "$out/share/element/electron/node_modules" rm -rf "$out/share/element/electron/node_modules" cp -r './node_modules' "$out/share/element/electron" diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index e10c1bf0187b..193bd755d170 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.110"; + "version" = "1.11.111"; "hashes" = { - "webSrcHash" = "sha256-9NOotUTcB2S6SSH620Em0YOwy6mxrWhChqdOZj0Leu0="; - "webYarnHash" = "sha256-TimQp6qcgszOuxRUOsN0Ey+pVVUGbEC6aRJ5gYXZ3dg="; + "webSrcHash" = "sha256-dNkt8fybwTM0/27L+6o3QuhQJiwTDAN2ez+hUG/0VwE="; + "webYarnHash" = "sha256-2QKZu/HObwW1ugUUuSAn2zV3OESgLa6PNizL6hhCBjg="; }; } diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index fbdd94504e77..6396949cca30 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-4t/t/dUpQRO1AJ8jnmjxnJ/wLyYi/wv6Yg+9LwPavzw="; + hash = "sha256-7YQj2QYWn4GHSYBX8MlqPjdFZMpP1ZdzEHInMJaesKc="; }; - cargoHash = "sha256-/tDvG5ogJOxnBA7oe5pVDik5JvqmMhFGHF9TURaSukc="; + cargoHash = "sha256-QS6iQP5PBHKcQEsr97FawUCkMCswAYg7Ua2ZeIvL7CM="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index b3940c53a01e..773bbd8634e6 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ffsubsync"; - version = "0.4.29"; + version = "0.4.30"; pyproject = true; src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; tag = version; - hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4="; + hash = "sha256-Px4WaeFn6SS6VUsm0bAKmdVtqQzXX12PRKO1n6UNxdM="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix index 79b9adae63df..01a7a83687bd 100644 --- a/pkgs/by-name/fv/fvm/package.nix +++ b/pkgs/by-name/fv/fvm/package.nix @@ -2,23 +2,43 @@ lib, buildDartApplication, fetchFromGitHub, - nix-update-script, + runCommand, + yq-go, + _experimental-update-script-combinators, + gitUpdater, }: -buildDartApplication rec { - pname = "fvm"; - version = "3.2.1"; +let + version = "4.0.0-beta.1"; src = fetchFromGitHub { owner = "leoafarias"; repo = "fvm"; tag = version; - hash = "sha256-i7sJRBrS5qyW8uGlx+zg+wDxsxgmolTMcikHyOzv3Bs="; + hash = "sha256-O2VU0cXgrm+Xf85e5l31kfnUOCUI9ZuVQCVRUppqCE4="; }; +in +buildDartApplication { + pname = "fvm"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; - passthru.updateScript = nix-update-script { }; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + inherit src; + nativeBuildInputs = [ yq-go ]; + } + '' + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { }) + (_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json) + ]; + }; meta = { description = "Simple CLI to manage Flutter SDK versions"; diff --git a/pkgs/by-name/fv/fvm/pubspec.lock.json b/pkgs/by-name/fv/fvm/pubspec.lock.json index 41fcb0fb44d3..efd2f97250e9 100644 --- a/pkgs/by-name/fv/fvm/pubspec.lock.json +++ b/pkgs/by-name/fv/fvm/pubspec.lock.json @@ -4,27 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", "url": "https://pub.dev" }, "source": "hosted", - "version": "73.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "80.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.8.0" + "version": "7.3.0" + }, + "ansi": { + "dependency": "transitive", + "description": { + "name": "ansi", + "sha256": "070af96189f9da6f996cee46049682bdcd1d191b483e13f9d2a2600729d8b2a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "ansi_escapes": { + "dependency": "transitive", + "description": { + "name": "ansi_escapes", + "sha256": "e2a111254904ff663b8d4be744073f7e327157c895a0ad57ad8de7938297bc8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" }, "ansicolor": { "dependency": "transitive", @@ -50,91 +64,91 @@ "dependency": "direct main", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.13.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", "version": "2.4.2" }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.12" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.2" + "version": "8.0.0" }, "build_verify": { "dependency": "direct dev", @@ -170,31 +184,31 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", "description": { "name": "charcode", - "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -230,81 +244,81 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.4.2" }, "clock": { "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "transitive", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.2" + "version": "1.11.1" }, "crypto": { "dependency": "direct dev", "description": { "name": "crypto", - "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.6" }, "dart_code_metrics_presets": { "dependency": "direct dev", "description": { "name": "dart_code_metrics_presets", - "sha256": "f67df47fe3297617e0cf5d632aa257e17517ad9fdd605e152bdc80dd526f0c5b", + "sha256": "75bd627851fd3693bd19d846896fb7d04c0045bbb50911478c52ac1ec29c1359", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.0" + "version": "2.21.0" }, "dart_console": { "dependency": "direct main", @@ -320,31 +334,31 @@ "dependency": "direct main", "description": { "name": "dart_mappable", - "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "sha256": "2255b2c00e328a65fef5a8df2dabfc0dc9c2e518c33a50051a4519b1c7a28c48", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.2" + "version": "4.5.0" }, "dart_mappable_builder": { "dependency": "direct dev", "description": { "name": "dart_mappable_builder", - "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e", + "sha256": "adea8c55aac73c8254aa14a8272b788eb0f72799dd8e4810a9b664ec9b4e353c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.5.0" }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "3.0.1" }, "date_format": { "dependency": "direct main", @@ -360,11 +374,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.7" }, "ffi": { "dependency": "transitive", @@ -380,21 +394,21 @@ "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "frontend_server_client": { "dependency": "transitive", @@ -410,21 +424,21 @@ "dependency": "direct main", "description": { "name": "git", - "sha256": "daea03e7471607e7ed942bccd4814cfc7e4fa8ca5d3dd6ad4fb170e44423d1a0", + "sha256": "de678c6f0d5e2761c2c3643d31b1010883cc4d3e352949ef7c15f98f27d676ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.1" }, "glob": { "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", @@ -450,31 +464,41 @@ "dependency": "direct dev", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "4.1.2" + }, + "husky": { + "dependency": "direct dev", + "description": { + "name": "husky", + "sha256": "ce4a92b311c03e67ff66b6e354c8d5b8ee7c663ccaedb954e93798658b439bb2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.7" }, "interact": { "dependency": "direct main", @@ -500,11 +524,11 @@ "dependency": "direct main", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", @@ -536,6 +560,16 @@ "source": "hosted", "version": "0.0.3" }, + "lint_staged": { + "dependency": "direct dev", + "description": { + "name": "lint_staged", + "sha256": "969cb1829d5f5ca761dd9029762ab11e73bf83bc270a2ea03297c60eed261e3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, "lints": { "dependency": "direct dev", "description": { @@ -550,21 +584,11 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" - }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" + "version": "1.3.0" }, "mason_logger": { "dependency": "direct main", @@ -580,31 +604,41 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "meta": { "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "2.0.0" + }, + "mocktail": { + "dependency": "direct dev", + "description": { + "name": "mocktail", + "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" }, "native_stack_traces": { "dependency": "transitive", @@ -620,11 +654,11 @@ "dependency": "transitive", "description": { "name": "node_interop", - "sha256": "3af2420c728173806f4378cf89c53ba9f27f7f67792b898561bff9d390deb98e", + "sha256": "4848ac408c0cdd0f70136b755df816a8e4c96c244e5377a3fb3b8f8950666150", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "node_preamble": { "dependency": "transitive", @@ -640,41 +674,41 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "pool": { "dependency": "transitive", @@ -690,21 +724,21 @@ "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "pub_semver": { "dependency": "direct main", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "pub_updater": { "dependency": "direct main", @@ -716,35 +750,15 @@ "source": "hosted", "version": "0.4.0" }, - "pubspec": { + "pubspec_parse": { "dependency": "direct main", - "description": { - "name": "pubspec", - "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "pubspec_parse": { - "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" - }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" + "version": "1.5.0" }, "retry": { "dependency": "transitive", @@ -790,31 +804,31 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.0.0" }, "source_gen": { "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "2.0.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -830,121 +844,121 @@ "dependency": "transitive", "description": { "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.12" + "version": "0.10.13" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "stack_trace": { "dependency": "direct main", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "term_glyph": { "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test": { "dependency": "direct dev", "description": { "name": "test", - "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.8" + "version": "1.25.15" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.5" + "version": "0.6.8" }, "test_process": { "dependency": "transitive", "description": { "name": "test_process", - "sha256": "217f19b538926e4922bdb2a01410100ec4e3beb4cc48eae5ae6b20037b07bbd6", + "sha256": "ea79c090deffc87d8276a5d28bb498d080a9873be6b1074d9dcfb82eb87e138e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "timing": { "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "tint": { "dependency": "direct main", @@ -970,51 +984,51 @@ "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, - "uri": { + "verbose": { "dependency": "transitive", "description": { - "name": "uri", - "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", + "name": "verbose", + "sha256": "8e63580e35d58a15e4fca702fe91766430b1d28738c160c466e5cb10c373002a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "0.1.1" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "15.0.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -1030,11 +1044,11 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -1047,14 +1061,14 @@ "version": "1.2.1" }, "win32": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "win32", - "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.4" + "version": "5.10.1" }, "xml": { "dependency": "transitive", @@ -1070,14 +1084,34 @@ "dependency": "direct main", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "yaml_writer": { + "dependency": "direct main", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" } }, "sdks": { - "dart": ">=3.5.0-259.0.dev <4.0.0" + "dart": ">=3.6.0 <4.0.0" } } diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index b0e2d3910e5a..b7426c7d43ba 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.30.5"; + version = "1.30.6"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y="; + hash = "sha256-UCioROzdfYYtTzKegEUNsF1ecKxbwW4k1cPygjpiXjo="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 353f672f1dec..c08531ad2dc3 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "gittuf"; repo = "gittuf"; rev = "v${version}"; - hash = "sha256-atC9YsffhXvWAQzrIVwOCpcP73HhGa5x19mXm4+yLuU="; + hash = "sha256-/PKbo8LPvU6ZTav9n82mrj2h6z6AyJ225mCH7EfazVU="; }; - vendorHash = "sha256-SqXwxt6TWPyuwx7gDnEUk5487z3mlYtQ+Cho+lUcN+M="; + vendorHash = "sha256-unj9PpRkfNHWQzeCmcjppMFGAlHNcP0/j9EiGvpRzRc="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 6fd2daa147b2..37948bc4807a 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -5,7 +5,6 @@ gettext, coreutils, gnused, - gnome, adwaita-icon-theme, gnugrep, parted, @@ -17,7 +16,7 @@ gpart, hdparm, procps, - util-linux, + util-linuxMinimal, polkit, wrapGAppsHook3, replaceVars, @@ -26,13 +25,13 @@ xhost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gparted"; version = "1.7.0"; src = fetchurl { - url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz"; - sha256 = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI="; + url = "mirror://sourceforge/gparted/gparted-${finalAttrs.version}.tar.gz"; + hash = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI="; }; # Tries to run `pkexec --version` to get version. @@ -77,7 +76,7 @@ stdenv.mkDerivation rec { lib.makeBinPath [ gpart hdparm - util-linux + util-linuxMinimal procps coreutils gnused @@ -108,4 +107,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gparted"; }; -} +}) diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix index df319aa7a094..0aa204ca091e 100644 --- a/pkgs/by-name/ju/juce/package.nix +++ b/pkgs/by-name/ju/juce/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "8.0.8"; + version = "8.0.9"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; tag = finalAttrs.version; - hash = "sha256-kp3rMaHWBbEh4UaRMxcLo/DiSJV942OY+LYxh6W7dFc="; + hash = "sha256-RUrKQFRLX68L3ROCUFaODSaRMH6zPpAKbc4/e5yDcZ4="; }; patches = [ diff --git a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix index 855dca72baab..6545ac693b3d 100644 --- a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix +++ b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix @@ -10,7 +10,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "katawa-shoujo-re-engineered"; - version = "2.0.2-1"; + version = "2.0.3"; src = fetchFromGitea { # GitHub mirror at fleetingheart/ksre @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "fhs"; repo = "katawa-shoujo-re-engineered"; rev = "v${finalAttrs.version}"; - hash = "sha256-skCcNFUmAQMZWRCXsABJR6elDlbVZFRParq7nOzZL4M="; + hash = "sha256-M2TWc5dl7lkwM/oisM6xtJwb3Dw9i6qUadBHGdEO2bs="; }; desktopItems = [ diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 933c08625314..e6327b1a04fb 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,37 +2,41 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kor"; version = "0.6.4"; src = fetchFromGitHub { owner = "yonahd"; repo = "kor"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hGiak28gwxwYOogYyZjTgQ+aGSumxzeZiQKlbVvvrIU="; }; vendorHash = "sha256-a7B0cJi71mqGDPbXaWYKZ2AeuuQyNDxwWNgahTN5AW8="; - preCheck = '' - HOME=$(mktemp -d) - export HOME - ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; ldflags = [ "-s" "-w" + "-X github.com/yonahd/kor/pkg/utils.Version=${finalAttrs.version}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + meta = { description = "Golang Tool to discover unused Kubernetes Resources"; homepage = "https://github.com/yonahd/kor"; - changelog = "https://github.com/yonahd/kor/releases/tag/v${version}"; + changelog = "https://github.com/yonahd/kor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ivankovnatsky ]; mainProgram = "kor"; }; -} +}) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index af715ae58f64..5ce43325ace3 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-EoRUoZz2L+k9M5J5OQUFUOkjUc1Qqy8ERZkdtG3ur+k="; + hash = "sha256-ZKLdCyg0wypJA16QHLWENiE20hUzr53BPHuwjSIhSOc="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-PNi1oA9iBBQZRQXIHcWMAmLlgzlzt0nxh8hkPsFEx28="; + hash = "sha256-swPk+KMOnvKcYznA6aHoQff6TRZ8npqfWmI/4Jr9fkw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/librasterlite2/package.nix b/pkgs/by-name/li/librasterlite2/package.nix index 997e5bde8232..290a22aabc55 100644 --- a/pkgs/by-name/li/librasterlite2/package.nix +++ b/pkgs/by-name/li/librasterlite2/package.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { mpl11 ]; platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 862a8eaa0e60..92cab5748015 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-vm1Tv3av9x5KZcUwL/yvnE7MeHhdFEutOpbgyWJRR0g="; + hash = "sha256-DfHQKz+DuBnISsX4s0I4+3dvSsCDVGHYp5kcSaUrfjM="; }; strictDeps = true; diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index cafedfcd1176..ac4326906653 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.53.2"; + version = "1.53.3"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-7dEYtL+ouvSbQ7B2gcgpwcPSFLIQ4ZYvHXgpFkNilms="; + hash = "sha256-JO0RVrixjJWCQTVHIU/rcf78QyIb1rYGXP8+mnTpmvg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 62d9814ecd10..96e2f68dadb5 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -22,13 +22,13 @@ assert ( stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; rev = "v${version}"; - hash = "sha256-Qd7mpNE23Z+LuiUwhUzfVzVZEQ+sdnkxMm+W7Hlrss4="; + hash = "sha256-MWqvFxFGnFrGppiSy97oUWz7p1sD6GkTrMEZTFgSExg="; }; patches = [ diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index 5f810f18bb1c..aac95f821933 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "santoshxshrestha"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-o9WQiwftaNl7TeR+5CqkT3BmDnm2laiD8NFPPyurYYQ="; + hash = "sha256-zwlbWxvdtZJuz7gFdgmny6s1FsoxoBXkP4s7vF77oEo="; }; - cargoHash = "sha256-qOQR/JHjfU4e60FrwwJB/5uWIficiSlKKNEVra6xLF0="; + cargoHash = "sha256-9XD8HbgnXhGsg1iZ/zYlk5080AhKqb8JxKKx5bxFE8M="; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix index dcd5dfcd5266..4ad342ffb995 100644 --- a/pkgs/by-name/mo/moq/package.nix +++ b/pkgs/by-name/mo/moq/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "moq"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw="; + sha256 = "sha256-veAfQ9dFt6s6xQace0nkcbAirl98UekJx+0qPHnQVGg="; }; vendorHash = "sha256-Mwx2Z2oVFepNr911zERuoM79NlpXu13pVpXPJox86BA="; diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index c0de27805b6d..431a0677bc31 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-6PSwfvmGdcxQvmnbloTBWEiz5vbN/RxK4Afq1PgUX94="; + hash = "sha256-Aqxh6dVZI59FGFtuyC5KcuaEr2OZL/A4UHSpnthR0Uk="; }; - cargoHash = "sha256-ecGhzcaqvTDAvbeWkr/3uXu5GD3NqlgHAiywzHfmsaA="; + cargoHash = "sha256-L4hQ1NAzddiPv6DxY8mcMQ6GlRdhIr+LeY9TtFbx3Mw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/no/nota/package.nix b/pkgs/by-name/no/nota/package.nix new file mode 100644 index 000000000000..e5abe147a067 --- /dev/null +++ b/pkgs/by-name/no/nota/package.nix @@ -0,0 +1,44 @@ +{ + haskellPackages, + fetchFromGitHub, + lib, +}: + +haskellPackages.mkDerivation rec { + pname = "nota"; + version = "1.0-unstable-2023-03-01"; + + src = fetchFromGitHub { + owner = "pouyakary"; + repo = "Nota"; + rev = "3548b864e5aa30ffbf1704a79dbb3bd3aab813be"; + hash = "sha256-96T9uxUEV22/vn6aoInG1UPXbzlDHswOSkywkdwsMeY="; + }; + + sourceRoot = "${src.name}/source"; + + isLibrary = false; + isExecutable = true; + + libraryHaskellDepends = with haskellPackages; [ + base + bytestring + array + split + scientific + parsec + ansi-terminal + regex-compat + containers + terminal-size + numbers + text + time + ]; + + description = "Command line calculator"; + homepage = "https://pouyakary.org/nota/"; + license = lib.licenses.mpl20; + maintainers = [ ]; + mainProgram = "nota"; +} diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 1b4ca17f9667..1c57ce5a4e69 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-VJCKZYBuw6fenTqRDxvLVNMXlPuDEq43WB7TI2RNWvc="; + hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo="; }; vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY="; diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 04df1fc24747..f5ccc3485ba9 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "25.03.1"; + version = "25.09.0"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; tag = "v${version}"; - hash = "sha256-nDW3jwZ0RE9i+5+8eRKb7P7KQxiGd22dn/s7bzx/CjQ="; + hash = "sha256-DNaf3vWb6tlzViMEI02+3st/0AiMVAomSaiGplcjkIc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index b100c3f78eb8..b80c6d1a9bc8 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ramalama"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "containers"; repo = "ramalama"; tag = "v${version}"; - hash = "sha256-BFJoM9MEprCdCANQntb4IIuWhtUXvCnK/mE7vOdf2PM="; + hash = "sha256-v9/cE6GFOUT5urHQwif7skP5vnRCdu435QGAAypWX0w="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index d9d63cc41635..a4c214de36df 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-08-29"; + version = "0-unstable-2025-09-11"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "b8085d27aca35b3c60ef50bf0683018d6a6b51b3"; - hash = "sha256-kBToxtvuWFZ3ZSLj2Mxb+7zDabpZJX9JC0msKkIy/fE="; + rev = "7c1ebc01489a5b96d4abb0ad9c1180701eb4456c"; + hash = "sha256-nOIt4PyO6DALz7gw5Hh1w1ZDyEAsQAVp4O/eFOLYZ0A="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; @@ -31,6 +31,7 @@ python.pkgs.toPythonModule ( "flask-babel" "httpx-socks" "lxml" + "typer-slim" ]; preBuild = diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index 7e85e0a67fc6..9bb9999e0216 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage (finalAttrs: { pname = "shogihome"; - version = "1.24.3"; + version = "1.25.0"; src = fetchFromGitHub { owner = "sunfish-shogi"; repo = "shogihome"; tag = "v${finalAttrs.version}"; - hash = "sha256-q0d+SKCLtT/gv9mrx0o8qIdWYVwNM2x8/LfRsG4J4rw="; + hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8="; }; - npmDepsHash = "sha256-mCECqh2iRVD4lsCWYdf15VMuaH8dqpDfWWs/6q4H6Lo="; + npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index b1fd41338b38..0efbe10caeda 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -47,6 +47,8 @@ buildGoModule rec { "-X 'github.com/FriendsOfShopware/shopware-cli/cmd.version=${version}'" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Command line tool for Shopware 6"; mainProgram = "shopware-cli"; diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json index 2bc9068de752..d82e2904706e 100644 --- a/pkgs/by-name/so/sourcegit/deps.json +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -1,18 +1,18 @@ [ { "pname": "Avalonia", - "version": "11.2.8", - "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo=" + "version": "11.3.5", + "hash": "sha256-gW1t+B32H9aVC+ogE5X+4bwjsmbdOcyH83T8Br7IDuY=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.22045.20230930", - "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" }, { "pname": "Avalonia.AvaloniaEdit", - "version": "11.2.0", - "hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo=" + "version": "11.3.0", + "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4=" }, { "pname": "Avalonia.BuildServices", @@ -21,43 +21,43 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.8", - "hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals=" + "version": "11.3.5", + "hash": "sha256-umZ6rfL9Qw1/jWpAiMyPu8f6i8ah4u3iR6uJVS6IUfw=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.8", - "hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok=" + "version": "11.3.5", + "hash": "sha256-JgMIQ2aFgLkLcL/auPUwQTlmPlurree5HXfLYGGP3o8=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.8", - "hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o=" + "version": "11.3.5", + "hash": "sha256-SJyN+znfG/GUYkw3yNFMxd0Y7Hc9QvckRHPRc/QpkvM=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.8", - "hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M=" + "version": "11.3.5", + "hash": "sha256-7GORVuABhwQymfvSclY6ZGtRN6yXaKs1FKuXuR3ZXmo=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.8", - "hash": "sha256-NEi00PZS1sMHl94FuPIdd7PvHPk/kryszT5NHBJdiyg=" + "version": "11.3.5", + "hash": "sha256-bBqFtDwB9C6cNlrrr2gnqv1YpNVAlEXjmLiv86CrU/o=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.8", - "hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg=" + "version": "11.3.5", + "hash": "sha256-Kq5rZkiQWayrMRD90ex24zxESHTxof0PX8IvA+RutAc=" }, { "pname": "Avalonia.Native", - "version": "11.2.8", - "hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA=" + "version": "11.3.5", + "hash": "sha256-EIpaS2XtO/1Dx0XVSf9XapKMUHmVSXwK/rwgeioPCDo=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.8", - "hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc=" + "version": "11.3.5", + "hash": "sha256-1bAKPdK+ftcdfdiUkwasmpjf3ai07T81PkRjKWFyNf8=" }, { "pname": "Avalonia.Skia", @@ -66,43 +66,43 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.8", - "hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4=" + "version": "11.3.5", + "hash": "sha256-DW2ectX/V583KqirUetmFioMNsuUa0ai2k5WKObFMO4=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.8", - "hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s=" + "version": "11.3.5", + "hash": "sha256-BXf+iZxBEO2pFeAiN0bJNOndFJE+L573qZFiLqRRWG8=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.8", - "hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo=" + "version": "11.3.5", + "hash": "sha256-hkEJC/2usaYDDdIeVKuWfORd+tlg39+xf/2Eiflvb8I=" }, { "pname": "Avalonia.Win32", - "version": "11.2.8", - "hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg=" + "version": "11.3.5", + "hash": "sha256-SNAx4QaNyrhE0BLWhHFtdsB35a5T9qfIQhdMC1YUrzA=" }, { "pname": "Avalonia.X11", - "version": "11.2.8", - "hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA=" + "version": "11.3.5", + "hash": "sha256-v85I2pFMOixIANKCngr2/HyTflYxiSihe08q6Z4513Q=" }, { "pname": "AvaloniaEdit.TextMate", - "version": "11.2.0", - "hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI=" + "version": "11.3.0", + "hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s=" }, { "pname": "Azure.AI.OpenAI", - "version": "2.2.0-beta.4", - "hash": "sha256-aEvGCQxOBZifg5nDSDILvQhLkmcbH/iIqtUMwfclDRA=" + "version": "2.3.0-beta.2", + "hash": "sha256-kAl8ylr8ghuXsGNFrzVS5e12xOrsmT9VieSVgmKJCyY=" }, { "pname": "Azure.Core", - "version": "1.44.1", - "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + "version": "1.47.3", + "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4=" }, { "pname": "BitMiracle.LibTiff.NET", @@ -119,25 +119,30 @@ "version": "7.3.0.3", "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.1", + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.3", - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "version": "8.3.1.1", + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3", - "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "version": "8.3.1.1", + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" }, { "pname": "LiveChartsCore", @@ -161,23 +166,28 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "6.0.0", - "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" }, { "pname": "Onigwrap", - "version": "1.0.6", - "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" + "version": "1.0.8", + "hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY=" }, { "pname": "OpenAI", - "version": "2.2.0-beta.4", - "hash": "sha256-kkNb9Jp7djvE2060+HIGoqnkFpOzQ5l/PK5oH4FO3e4=" + "version": "2.3.0", + "hash": "sha256-nIpYfGvE8FaEnE2y+98CAoLoz3+MWo+2eyb3Rgh7qgY=" }, { "pname": "Pfim", @@ -216,23 +226,13 @@ }, { "pname": "System.ClientModel", - "version": "1.1.0", - "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + "version": "1.5.1", + "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow=" }, { "pname": "System.ClientModel", - "version": "1.2.1", - "hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c=" - }, - { - "pname": "System.ClientModel", - "version": "1.4.0-beta.1", - "hash": "sha256-FcIblwx2HJU2zJI5tjvMqwWVe5eJcACZt12fRPNppak=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" + "version": "1.6.1", + "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0=" }, { "pname": "System.IO.Pipelines", @@ -241,62 +241,27 @@ }, { "pname": "System.Memory.Data", - "version": "6.0.0", - "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" - }, - { - "pname": "System.Memory.Data", - "version": "6.0.1", - "hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk=" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.0", - "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.10", - "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + "version": "8.0.1", + "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, { "pname": "System.Text.Json", "version": "8.0.5", "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, { "pname": "TextMateSharp", - "version": "1.0.66", - "hash": "sha256-2oYPcRboJhXp4UAwyGy814zFaKX4YiyfR5571gUvKl8=" + "version": "1.0.70", + "hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM=" }, { "pname": "TextMateSharp.Grammars", - "version": "1.0.66", - "hash": "sha256-ep1PCf/FuD34Q2BvmCYBfyGGXu4ov05N+kFRUSagJdk=" + "version": "1.0.70", + "hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE=" }, { "pname": "Tmds.DBus.Protocol", - "version": "0.20.0", - "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" } ] diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index da8fa54dcf10..b357dbd4dedf 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -21,13 +21,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.29"; + version = "2025.34"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70="; + hash = "sha256-O7HzbrcQGgP3mRSfqLxoHPswVW99S9chb7ZWBeEelsY="; }; patches = [ ./fix-darwin-git-path.patch ]; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 1498fe059281..7407358db680 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, buildGoModule, coreutils, pcsclite, @@ -26,6 +27,16 @@ buildGoModule rec { hash = "sha256-ZIpsSNdQVkelo5b3H03N8qToHU7z+lalAE7Ur6m2YwY="; }; + patches = [ + # fix broken test TestHandler_RevokeCert + # https://github.com/smallstep/certificates/pull/2370 + # TODO: remove at next release + (fetchpatch2 { + url = "https://github.com/smallstep/certificates/commit/b7e59c97f3b8a95a24153aeb85959118953f2bb4.patch?full_index=1"; + hash = "sha256-GKGKUj4hpS4jo6sMvUhnD3BeE+f5vnxY5tK0a2pwpNM="; + }) + ]; + vendorHash = "sha256-gGPrrl5J8UrjUpof2DaSs1fAQsMSsyAMlC67h5V75+k="; ldflags = [ diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index e3533687a464..c3891e1badff 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.86.4"; + version = "1.86.5"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE="; + hash = "sha256-fEQsusnp/XtKyXQD+M3nAP7zpsnr/TD5rt1b366LtKw="; }; vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA="; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 7ce7f2367aa0..c38f2ba1816a 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -1,10 +1,12 @@ { + stdenv, lib, rustPlatform, fetchCrate, pkg-config, openssl, withLsp ? true, + installShellFiles, }: rustPlatform.buildRustPackage rec { @@ -20,6 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-tvijtB5fwOzQnnK/ClIvTbjCcMeqZpXcRdWWKZPIulM="; nativeBuildInputs = [ + installShellFiles pkg-config ]; @@ -29,6 +32,21 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withLsp "lsp"; + postInstall = + lib.optionalString + ( + stdenv.buildPlatform.canExecute stdenv.hostPlatform + && + # Creation of the completions fails on Darwin platforms. + !stdenv.hostPlatform.isDarwin + ) + '' + installShellCompletion --cmd taplo \ + --bash <($out/bin/taplo completions bash) \ + --fish <($out/bin/taplo completions fish) \ + --zsh <($out/bin/taplo completions zsh) + ''; + meta = with lib; { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; diff --git a/pkgs/by-name/tb/tbb_2021/package.nix b/pkgs/by-name/tb/tbb_2021/package.nix index d20f88c6681a..6b6b57cda145 100644 --- a/pkgs/by-name/tb/tbb_2021/package.nix +++ b/pkgs/by-name/tb/tbb_2021/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch"; hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4="; }) + # Fix 32-bit PowerPC build + (fetchpatch { + url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch"; + hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg="; + }) ]; patchFlags = [ diff --git a/pkgs/by-name/tb/tbb_2022/package.nix b/pkgs/by-name/tb/tbb_2022/package.nix index 66b8c9d4a0f0..af24d66d1fde 100644 --- a/pkgs/by-name/tb/tbb_2022/package.nix +++ b/pkgs/by-name/tb/tbb_2022/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch"; hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4="; }) + # Fix 32-bit PowerPC build + (fetchpatch { + url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch"; + hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg="; + }) ]; # Fix build with modern gcc diff --git a/pkgs/by-name/te/tennix/package.nix b/pkgs/by-name/te/tennix/package.nix index 11bdb0bc78c0..5bb9e9e4dad7 100644 --- a/pkgs/by-name/te/tennix/package.nix +++ b/pkgs/by-name/te/tennix/package.nix @@ -3,33 +3,36 @@ stdenv, fetchgit, which, - SDL, - SDL_mixer, - SDL_image, - SDL_ttf, - SDL_net, + SDL2, + SDL2_gfx, + SDL2_mixer, + SDL2_image, + SDL2_ttf, + SDL2_net, python3, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tennix"; - version = "1.3.1"; + version = "1.3.4"; src = fetchgit { url = "git://repo.or.cz/tennix.git"; - tag = "tennix-${version}"; - hash = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; + tag = "tennix-${finalAttrs.version}"; + hash = "sha256-siGfnpZPMYMTgYzaPVhNXEuA/OSWmEl891cLhvgGr7o="; }; nativeBuildInputs = [ which ]; buildInputs = [ python3 - SDL - SDL_mixer - SDL_image - SDL_ttf - SDL_net + SDL2 + SDL2_gfx + SDL2_mixer + SDL2_image + SDL2_ttf + SDL2_net ]; configurePhase = '' @@ -40,12 +43,14 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "tennix-"; }; + + meta = { homepage = "https://icculus.org/tennix/"; description = "Classic Championship Tour 2011"; mainProgram = "tennix"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/tw/twitch-cli/package.nix b/pkgs/by-name/tw/twitch-cli/package.nix index 225f33809928..6619393d7451 100644 --- a/pkgs/by-name/tw/twitch-cli/package.nix +++ b/pkgs/by-name/tw/twitch-cli/package.nix @@ -1,6 +1,8 @@ { + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, lib, testers, twitch-cli, @@ -33,6 +35,18 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/twitch-cli completion bash > twitch-cli.bash + $out/bin/twitch-cli completion fish > twitch-cli.fish + $out/bin/twitch-cli completion zsh > _twitch-cli + installShellCompletion --cmd twitch-cli \ + --bash twitch-cli.bash \ + --fish twitch-cli.fish \ + --zsh _twitch-cli + ''; + __darwinAllowLocalNetworking = true; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 356a72cb6a52..660b295030eb 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,17 +10,17 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-08-30"; + version = "0-unstable-2025-09-11"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "0a3c816da9be581f3b567df9f05b73533f5c9384"; - hash = "sha256-OAOQgHAojYadrv6bn2kXGHYisB928zW0c1g2Hx3jK50="; + rev = "4c9b8f6b7856de7e5598350424f243e6d17d73a6"; + hash = "sha256-8qxq9JR+w7Dy1Mm2Y1wKDuYzRwvo5ORNZ7vdJla51EI="; fetchSubmodules = false; }; - vendorHash = "sha256-w+v74GjOKyhBLj557m2yjgtCqcBOi+IKJ6kkI68AjKk="; + vendorHash = "sha256-k1fKa93zxMnORDPWnZrMahNHG0sCa3JOJl+d4T8PyIM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ur/uradvd/package.nix b/pkgs/by-name/ur/uradvd/package.nix new file mode 100644 index 000000000000..a1f22521d654 --- /dev/null +++ b/pkgs/by-name/ur/uradvd/package.nix @@ -0,0 +1,34 @@ +{ + stdenv, + lib, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "uradvd"; + version = "0-unstable-2025-08-16"; + + src = fetchFromGitHub { + owner = "freifunk-gluon"; + repo = "uradvd"; + rev = "b37524dfb0292c425fd61f5bffb3101fb1979264"; + hash = "sha256-PyOAt9dTFdHHF7OlHi9BBTjCN2Hmk8BsHkD2rV94ZDM="; + }; + + installPhase = '' + runHook preInstall + + install -D --mode=0755 uradvd -t "$out/bin" + + runHook postInstall + ''; + + meta = { + description = "Tiny IPv6 Router Advertisement Daemon"; + homepage = "https://github.com/freifunk-gluon/uradvd"; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aiyion ]; + mainProgram = "uradvd"; + }; +} diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 0bfb67a0bdc9..9eacfafb9571 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -69,6 +69,17 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Extremely fast Python package installer and resolver, written in Rust"; + longDescription = '' + `uv` manages project dependencies and environments, with support for lockfiles, workspaces, and more. + + Due to `uv`'s (over)eager fetching of dynamically-linked Python executables, + as well as vendoring of dynamically-linked libraries within Python modules distributed via PyPI, + NixOS users can run into issues when managing Python projects. + See the Nixpkgs Reference Manual entry for `uv` for information on how to mitigate these issues: + https://nixos.org/manual/nixpkgs/unstable/#sec-uv. + + For building Python projects with `uv` and Nix outside of nixpkgs, check out `uv2nix` at https://github.com/pyproject-nix/uv2nix. + ''; homepage = "https://github.com/astral-sh/uv"; changelog = "https://github.com/astral-sh/uv/blob/${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 0b858e9153b1..98ca4e8e7ce5 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.38.2"; + version = "0.39.2"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${version}"; - hash = "sha256-Ec6gPwg5I5QplILFXlwl6AmwlaBytkRiQ9+FoRKdhTY="; + hash = "sha256-7dguSGEDnshjBw6ImtteE39oLbbvsMdX9hz+wmOCcYU="; leaveDotGit = true; }; diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix new file mode 100644 index 000000000000..a0756b46a437 --- /dev/null +++ b/pkgs/by-name/x1/x11basic/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitea, + autoreconfHook, + fig2dev, + readline, + libX11, + bluez, + SDL2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "x11basic"; + version = "1.28-65"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "kollo"; + repo = "X11Basic"; + tag = finalAttrs.version; + hash = "sha256-07sRUFKJ4CYMtQhRu18PElvNQN2DyKkRJUt7oIhenkA="; + }; + + sourceRoot = "${finalAttrs.src.name}/src"; + + postPatch = '' + chmod -R u+w examples/compiler + substituteInPlace configure.in \ + --replace-fail "main(foo)" "int main(int foo)" + ''; + + nativeBuildInputs = [ + autoreconfHook + fig2dev + ]; + + buildInputs = [ + readline + libX11 + SDL2 + bluez + ]; + + configureFlags = [ + "--with-bluetooth" + "--with-usb" + "--with-readline" + "--with-sdl" + "--with-x" + "--enable-cryptography" + ]; + + preInstall = '' + touch x11basic.{eps,svg} + mkdir -p $out/{bin,lib} + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + cp -r ../examples $out/share/. + ''; + + meta = { + homepage = "https://x11-basic.codeberg.page"; + description = "Basic interpreter and compiler with graphics capabilities"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ edwtjo ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix index 6ad455131f89..84da28703c4f 100644 --- a/pkgs/by-name/xm/xmake/package.nix +++ b/pkgs/by-name/xm/xmake/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmake"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "xmake-io"; repo = "xmake"; tag = "v${finalAttrs.version}"; - hash = "sha256-PlSNeC5h2C+cQMHqN1dD6prfZIenZXEHa1nWD2SgMIU="; + hash = "sha256-GZ296Bn+jtJKPaqVLpyDgiYwrej8CDHIudkqNJ3KUfA="; fetchSubmodules = true; }; diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 22e0b24f416d..aaaeb88e4020 100644 --- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deviceinfo"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/deviceinfo"; rev = finalAttrs.version; - hash = "sha256-Tc/jbiEoekudfy9Si6Jy51wYue6cqlMigpDHJtFl64I="; + hash = "sha256-eZQyTRhMRobufPk5AcTY8G718T+/e3teFtqV5kGspxw="; }; outputs = [ diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 9de681effad2..d6ac23218dc6 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,23 +1,23 @@ let - version = "3.8.2"; + version = "3.9.2"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - hash = "sha256-30f5sONEzlXcf8NrNPPK0vUYclULhIfj3H+Q9tlRuJE="; + hash = "sha256-TGel6P9oew5ao8DAMS5kCxLl1eknjZG7Jc7A32YofXk="; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - hash = "sha256-PO/YQEIKNSl302T9Lq+4pfOoUVrkJjFZ9bEETWujUpE="; + hash = "sha256-AdBnLbgmZvcvlFLfOO4VFqcs2bwpgYvT6t34LkBVYVI="; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - hash = "sha256-YFfbTNkJ437F99zzSsCmW8NPtBMwtMNxjEPbGlDokG8="; + hash = "sha256-1i918/G/tEoi+9XPCltHx1hRbOyl3Me87IiJbiWD57o="; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - hash = "sha256-KUW6qxHPdHIyjlVzcTmTuvkXlX+taRwUYcq9WglugxE="; + hash = "sha256-7CLoEnFYLe+B0+EOKlVa5dPYHGlRRlo9Fs/EeTjp+So="; }; } diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 58914f664511..25a95f420879 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -439,7 +439,10 @@ let } .${name}; in - "${tools}/bin/${tools.targetPrefix}${name}"; + getToolExe tools name; + + # targetPrefix aware lib.getExe' + getToolExe = drv: name: lib.getExe' drv "${drv.targetPrefix or ""}${name}"; # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 @@ -533,8 +536,15 @@ stdenv.mkDerivation ( export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + export LLC="${getToolExe buildTargetLlvmPackages.llvm "llc"}" + export OPT="${getToolExe buildTargetLlvmPackages.llvm "opt"}" + '' + # LLVMAS should be a "specific LLVM compatible assembler" which needs to understand + # assembly produced by LLVM. The easiest way to be sure is to use clang from the same + # version as llc and opt. Note that the naming chosen by GHC is misleading, clang can + # be used as an assembler, llvm-as converts IR into machine code. + + lib.optionalString (useLLVM && lib.versionAtLeast version "9.10") '' + export LLVMAS="${getToolExe buildTargetLlvmPackages.clang "clang"}" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm @@ -544,11 +554,12 @@ stdenv.mkDerivation ( # the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible. # It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use # for llc and opt which would require using a custom darwin stdenv for targetCC. + # 2025-09-06: The existence of LLVMAS suggests that matching $CC is fine (correct?) here. export CLANG="${ if targetCC.isClang then toolPath "clang" targetCC else - "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + getToolExe buildTargetLlvmPackages.clang "clang" }" '' # Haddock and sphinx need a working locale @@ -835,17 +846,19 @@ stdenv.mkDerivation ( '' + lib.optionalString useLLVM '' ghc-settings-edit "$settingsFile" \ - "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ - "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + "LLVM llc command" "${getToolExe llvmPackages.llvm "llc"}" \ + "LLVM opt command" "${getToolExe llvmPackages.llvm "opt"}" + '' + # See comment for LLVMAS in preConfigure + + lib.optionalString (useLLVM && lib.versionAtLeast version "9.10") '' + ghc-settings-edit "$settingsFile" \ + "LLVM llvm-as command" "${getToolExe llvmPackages.clang "clang"}" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' ghc-settings-edit "$settingsFile" \ "LLVM clang command" "${ # See comment for CLANG in preConfigure - if installCC.isClang then - toolPath "clang" installCC - else - "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + if installCC.isClang then toolPath "clang" installCC else getToolExe llvmPackages.clang "clang" }" '' + lib.optionalString stdenv.targetPlatform.isWindows '' diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index e29727554105..776e636ec187 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -225,7 +225,10 @@ let } .${name}; in - "${tools}/bin/${tools.targetPrefix}${name}"; + getToolExe tools name; + + # targetPrefix aware lib.getExe' + getToolExe = drv: name: lib.getExe' drv "${drv.targetPrefix or ""}${name}"; # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 @@ -405,8 +408,8 @@ stdenv.mkDerivation ( export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}" '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + export LLC="${getToolExe buildTargetLlvmPackages.llvm "llc"}" + export OPT="${getToolExe buildTargetLlvmPackages.llvm "opt"}" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm @@ -420,7 +423,7 @@ stdenv.mkDerivation ( if targetCC.isClang then toolPath "clang" targetCC else - "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + getToolExe buildTargetLlvmPackages.clang "clang" }" '' + '' @@ -627,17 +630,14 @@ stdenv.mkDerivation ( '' + lib.optionalString useLLVM '' ghc-settings-edit "$settingsFile" \ - "LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \ - "LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt" + "LLVM llc command" "${getToolExe llvmPackages.llvm "llc"}" \ + "LLVM opt command" "${getToolExe llvmPackages.llvm "opt"}" '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' ghc-settings-edit "$settingsFile" \ "LLVM clang command" "${ # See comment for CLANG in preConfigure - if installCC.isClang then - toolPath "clang" installCC - else - "${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang" + if installCC.isClang then toolPath "clang" installCC else getToolExe llvmPackages.clang "clang" }" '' + '' diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix deleted file mode 100644 index e90eb300ffdc..000000000000 --- a/pkgs/development/compilers/x11basic/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - automake, - autoconf, - readline, - libX11, - bluez, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "X11basic"; - version = "1.27"; - - src = fetchFromGitHub { - owner = "kollokollo"; - repo = pname; - rev = version; - sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2"; - }; - - nativeBuildInputs = [ - autoconf - automake - ]; - buildInputs = [ - readline - libX11 - SDL2 - bluez - ]; - - preConfigure = "cd src;autoconf"; - - configureFlags = [ - "--with-bluetooth" - "--with-usb" - "--with-readline" - "--with-sdl" - "--with-x" - "--enable-cryptography" - ]; - - preInstall = '' - touch x11basic.{eps,svg} - mkdir -p $out/{bin,lib} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - cp -r ../examples $out/share/. - ''; - - meta = with lib; { - homepage = "https://x11-basic.sourceforge.net/"; - description = "Basic interpreter and compiler with graphics capabilities"; - license = licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index d53c092ed022..320b331fc25d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -734,6 +734,13 @@ package-set { inherit pkgs lib callPackage; } self */ forceLlvmCodegenBackend = overrideCabal (drv: { configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; - buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ]; + buildTools = + drv.buildTools or [ ] + ++ [ self.ghc.llvmPackages.llvm ] + # GHC >= 9.10 needs LLVM specific assembler, i.e. clang + # On Darwin clang is always required + ++ lib.optionals (lib.versionAtLeast self.ghc.version "9.10" || stdenv.hostPlatform.isDarwin) [ + self.ghc.llvmPackages.clang + ]; }); } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 0df9ec093ef7..20b9a0803d3e 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -68,10 +68,14 @@ let ) ); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; - # CLang is needed on Darwin for -fllvm to work: + # Clang is needed on Darwin for -fllvm to work. + # GHC >= 9.10 needs an LLVM specific assembler which we use clang for. # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ( - [ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang + [ ghc.llvmPackages.llvm ] + ++ lib.optionals (lib.versionAtLeast ghc.version "9.10" || stdenv.targetPlatform.isDarwin) [ + ghc.llvmPackages.clang + ] ); in diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 052feaf8761a..f9a1622a2a95 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - texinfo6, + texinfo, libXext, xorgproto, libX11, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ - texinfo6 + texinfo libXext xorgproto libX11 diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 764096e323ca..4bd029ffed57 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.13.0"; + version = "0.13.1"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = "malcontent"; rev = version; - hash = "sha256-DVoTJrpXk5AoRMz+TxEP3NIAA/OOGRzZurLyGp0UBUo="; + hash = "sha256-ekRi4yXu8u8t1AjyS3bD6tdqqnqtKyI6yZs+28LnfRY="; }; patches = [ diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 9d766fc961f3..0ac04ef25c95 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -121,9 +121,9 @@ let in { ogre_14 = common { - version = "14.4.0"; - hash = "sha256-hRHjgJgnSc8saOoLoyBCQKrLpbUVpUxuS/zsZEoulKA="; - # https://github.com/OGRECave/ogre/blob/v14.4.0/Components/Overlay/CMakeLists.txt + version = "14.4.1"; + hash = "sha256-G7Pf4vYoZhTmsG2AJhIR+xxtj0SHbN0dCkhtieBWm8Q="; + # https://github.com/OGRECave/ogre/blob/v14.4.1/Components/Overlay/CMakeLists.txt imguiVersion = "1.91.9b"; imguiHash = "sha256-dkukDP0HD8CHC2ds0kmqy7KiGIh4148hMCyA1QF3IMo="; }; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 34823f6338f9..296967728fd0 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; tag = version; - hash = "sha256-/ZzswdGGA4IGc7djTuSIzLtBLA9oRhJBQHMBUlPci7o="; + hash = "sha256-pFbX92UxhNcbHjU1Leoyr225Q6lCHT3hfv/mLSm7y2c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 54b86e5fb2d7..91b27e1e55e7 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2025.9.0"; + version = "2025.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioecowitt"; tag = version; - hash = "sha256-i8F7vEtuorBHY7/bm+RqnUmb9CR4iopjlyPJPQ5GoMg="; + hash = "sha256-NLVxQ7xQJiI0G9MXuVK+dWSYbA9AS7NAEEOBSCCQI88="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 403b6d93c82f..ceef494e840b 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -8,6 +8,7 @@ babel, buildPythonPackage, certifi, + cryptography, fetchFromGitHub, gitUpdater, hatchling, @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.21.0"; + version = "3.22.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-2DRKJiIZXMK2PgAQFfa0GBgVITiOrNQTM8/fnCHiiw8="; + hash = "sha256-4LZ4+bt9n0q8WMaMEaAAIFnEuDUSd+Aq+YW49Xbcp5c="; }; build-system = [ hatchling ]; @@ -64,6 +65,7 @@ buildPythonPackage rec { redis = [ redis ]; proxy = [ aiohttp-socks ]; i18n = [ babel ]; + signature = [ cryptography ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 2c2f991b6a9d..da7a004b3d29 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "Harmony-Libs"; repo = "aioharmony"; tag = "v${version}"; - hash = "sha256-QFl+OqduNGxs/+QNXpNZqtys0OTCWGmKTNa1Xht4Fuw="; + hash = "sha256-H5zVY7LvTP8/CQtUGtXCXxOfG8GFQgdp7BY8jl9X+Gc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix index ae838fb47045..ca5c377a3163 100644 --- a/pkgs/development/python-modules/aiontfy/default.nix +++ b/pkgs/development/python-modules/aiontfy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "aiontfy"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "aiontfy"; tag = "v${version}"; - hash = "sha256-kJ6hf7CaE0uTZ7w3ggErDbXm8tYzSxstQ0qjKHlVytI="; + hash = "sha256-mWpMMhAMb5q7gcbfqDHi4CFgQOgRAvmpFDW57qMkGkk="; }; build-system = [ diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 3a56e0e0e143..bf6a2f864b5f 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.44"; + version = "1.5.45"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; tag = version; - hash = "sha256-cEhZo/HfCp6Cpx2zEX7THQQJH264NJvoCRrM+ci3RrE="; + hash = "sha256-/0VHhKcYcXYXosInjsgBf6eR7kcfLiLSyxFuaIqTbiQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4b2f31610076..9f3715c9ef47 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.27"; + version = "1.40.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-0PC11/PsEACqI/Tt2pYEZ2eHpVaxdGsqduHoMkNtbGw="; + hash = "sha256-DZHXS8e88DDjFVdoaJmbrSri9/OyEc5KGA3YfSFN5Zg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 232389d55040..82b60c474bad 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.27"; + version = "1.40.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-AicOiBPMx/xNBvc2ZT5aHXbo7i3VYPhex22srJfqQB8="; + hash = "sha256-aGbQa+t4oekxPIKX20xor6UXRYalEVgaH899JLgv5Uc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 63244068e674..dca42e401eed 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.22"; + version = "3.23.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; tag = version; - hash = "sha256-N7GxaXQj7mrTOsNGek4ZZlVF9GH/rm5CFKpYFMLJw8k="; + hash = "sha256-WOFtDFCN3OfhEjfhEgwtJN/tQVRGvd2RMQzcKtf0atU="; fetchLFS = true; }; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 6031ee190f68..09f0c930c4f9 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, poetry-core, charset-normalizer, - tomli, untokenize, mock, pytestCheckHook, @@ -14,10 +13,7 @@ buildPythonPackage rec { pname = "docformatter"; version = "1.7.7"; - - disabled = pythonOlder "3.7"; - - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; @@ -29,17 +25,14 @@ buildPythonPackage rec { patches = [ ./test-path.patch ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'charset_normalizer = "^2.0.0"' 'charset_normalizer = ">=2.0.0"' substituteInPlace tests/conftest.py \ --subst-var-by docformatter $out/bin/docformatter ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer - tomli untokenize ]; @@ -49,10 +42,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream - "test_do_format_code.py" - "test_docformatter.py" - # some different issue + # AssertionError: assert 'utf_16' == 'latin-1' + # fixed by https://github.com/PyCQA/docformatter/pull/323 "test_detect_encoding_with_undetectable_encoding" ]; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index e8ec4ac3dbf6..1eb06f0f6066 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -19,7 +19,6 @@ pytest-mock, pytest-random-order, pytestCheckHook, - pythonOlder, sanic, sanic-testing, setuptools, @@ -33,28 +32,16 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.23.0"; + version = "6.24.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "elastic"; repo = "apm-agent-python"; tag = "v${version}"; - hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c="; + hash = "sha256-mHDUcIII1gERlGMJvXPe3Hb38wNAylfMQpeLjA1Xbuk="; }; - patches = [ - (fetchpatch { - name = "fix-tests-with-latest-starlette-and-sanic.patch"; - url = "https://github.com/elastic/apm-agent-python/commit/80d167f54b6bf1db8b6e7ee52e2ac6803bc64f54.patch"; - hash = "sha256-VtA7+SyEZiL3aqpikyYJQ4tmdmsUpIdkSx6RtC1AzqY="; - }) - ]; - - pythonRelaxDeps = [ "wrapt" ]; - build-system = [ setuptools ]; dependencies = [ @@ -94,6 +81,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Exclude tornado tests "tests/contrib/asyncio/tornado/tornado_tests.py" + # Exclude client tests + "tests/instrumentation/asyncio_tests/aiohttp_client_tests.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests on Darwin @@ -105,8 +94,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python agent for the Elastic APM"; homepage = "https://github.com/elastic/apm-agent-python"; - changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; + changelog = "https://github.com/elastic/apm-agent-python/releases/tag/${src.tag}"; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "elasticapm-run"; }; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 23b99708a471..c27da986a748 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.28"; + version = "0.2.30"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-dx1MqsZRDjz0U8RU2idW5GiJBQaSyXPxnEDPk0XkLCI="; + hash = "sha256-JCcQl7awYUnRWWVoKgirgn494HM9uXqT69f3XauTG5E="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 00e7776fb290..0b2b5e24aa5c 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -19,27 +19,27 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.9.2"; + version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; tag = version; - hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA="; + hash = "sha256-+EhxoO5X/ANGh008WE0sJeBsu8SRnuds3hXGxNWpKnk="; }; build-system = [ setuptools ]; dependencies = [ - async-timeout chacha20poly1305-reuseable cryptography h11 orjson zeroconf + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; optional-dependencies.QRCode = [ @@ -54,30 +54,13 @@ buildPythonPackage rec { ] ++ optional-dependencies.QRCode; - disabledTestPaths = [ - # Disable tests requiring network access - "tests/test_accessory_driver.py" - "tests/test_hap_handler.py" - "tests/test_hap_protocol.py" - ]; - - disabledTests = [ - "test_persist_and_load" - "test_we_can_connect" - "test_idle_connection_cleanup" - "test_we_can_start_stop" - "test_push_event" - "test_bridge_run_stop" - "test_migration_to_include_client_properties" - ]; - pythonImportsCheck = [ "pyhap" ]; - meta = with lib; { + meta = { description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; - changelog = "https://github.com/ikalchev/HAP-python/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ oro ]; + changelog = "https://github.com/ikalchev/HAP-python/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ oro ]; }; } diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 49f9bcc6d20e..a37f378939b7 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, aiohttp, aioresponses, - poetry-core, + hatchling, pydantic, pytest-asyncio, pytest-httpx, @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "4.1.9"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +25,12 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "intellifire4py"; tag = "v${version}"; - hash = "sha256-dMhm2gntLV7ev6UIfHFMATytZo5blTlALuh9sBirkqI="; + hash = "sha256-kCZkIR8SmrLTm86M87juV7oQ+O01AA4pzkBMnKCnbNA="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aenum pydantic @@ -48,10 +48,11 @@ buildPythonPackage rec { meta = with lib; { description = "Module to read Intellifire fireplace status data"; - mainProgram = "intellifire4py"; homepage = "https://github.com/jeeftor/intellifire4py"; - changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "intellifire4py"; + }; } diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 78dfbf23f35a..886e2df0f011 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs="; + hash = "sha256-GMloD+eqjYdMCqFM03NhdKjN9bMHqIdZYORA1OtWd/0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index 38e63021e9ae..ba67be106286 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-EjokpP+46z/OwgmtQO4OnL+w4mUFR0M+2MmycojAc7E="; + hash = "sha256-+7Lx//NNjYe0UWWOmLTxajKrfjG9OReVpPgOoO2fczk="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 33ca2ef2c0d4..4552da953556 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1001,8 +1001,8 @@ rec { "sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.40.0" - "sha256-TLCQDRpGN61tRE49LnH3wdi5rl/LV64WO6tDN30+74E="; + buildMypyBoto3Package "payment-cryptography" "1.40.28" + "sha256-kVtSgmoVmZ2QJ1qSBlXLrFxob3ZbO3qvoJoM/1zlSYk="; mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.40.0" diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 3f4d14d6294c..87db48b04087 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.14.1"; + version = "1.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; tag = "v${version}"; - hash = "sha256-w+31rv/0EgAT8gv/Oqlbq/djbHIgK3YF792sxBDXHEQ="; + hash = "sha256-BdxmzxnuccAb8BiE48KSYLXJzAaz7eSYMJA2bgSbWj4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index ee3cc7a354e8..5d81f264a971 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.28.0"; + version = "4.29.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; tag = version; - hash = "sha256-T6OzlL+IzQr38sjE8DhVO3NN3apgHzJQjGx3No8kRNA="; + hash = "sha256-djiuIHTcPiKIfMxFevCa4c3V8ydGpSqH4mo0qH+Cpw8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 696b3e20142a..ceef62732855 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2024.2.3"; + version = "2024.2.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = "pylitterbot"; tag = "v${version}"; - hash = "sha256-r0Nd9xDj6l913ofu7jeBbCud01yw/lgiHO1L6XN9B+Y="; + hash = "sha256-/GN2b4rlE6j60O5ZxH8I58qwcZewAYJu0EHwQ7mrdBY="; }; pythonRelaxDeps = [ "deepdiff" ]; diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 64184d126a94..241556be6829 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -5,19 +5,20 @@ setuptools, requests, pycryptodome, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.1.8"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-hawPxP8WqpHUikmbcSFIjSeSTNyWu1zYtgT/TCPbOro="; + hash = "sha256-cfLKFvhzLN9dM0cMogCL93LVfRd8jDFo9x+nnEWInSc="; }; build-system = [ setuptools ]; @@ -27,12 +28,15 @@ buildPythonPackage rec { pycryptodome ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "pymitsubishi" ]; meta = { - description = "A Python library for controlling and monitoring Mitsubishi MAC-577IF-2E air conditioners"; + description = "Library for controlling and monitoring Mitsubishi MAC-577IF-2E air conditioners"; homepage = "https://github.com/pymitsubishi/pymitsubishi"; changelog = "https://github.com/pymitsubishi/pymitsubishi/releases/tag/${src.tag}"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 187d08594334..06ec6c673405 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -89,7 +89,6 @@ buildPythonPackage { ]; maintainers = with maintainers; [ frogamic - raitobezarius ]; inherit mainProgram; }; diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 4a2456811c4c..c9f20c0fbc6a 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.50"; + version = "1.0.51"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-ApZoltkqbbBVqbVouLNJj80FlQhAJIf2qCiGLgwrZbk="; + hash = "sha256-v/7OQ/jBDpu27mCeSO1iY5EH3Aa7urDQge8dKbQZd0I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index d69b1ffd1db5..1eb62818730c 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.69.0"; + version = "0.70.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-5hXFfWGRWPY0fbokw/+61PGlGC6UlQV9FbLuXfWX0KI="; + hash = "sha256-8W+RxehW68x3RULvKh+DkL/YH1usdmM8kOLEO579csE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix index d0f511b91bae..b136a788e5d0 100644 --- a/pkgs/development/python-modules/pyworxcloud/default.nix +++ b/pkgs/development/python-modules/pyworxcloud/default.nix @@ -1,5 +1,6 @@ { lib, + awsiotsdk, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -10,19 +11,20 @@ buildPythonPackage rec { pname = "pyworxcloud"; - version = "4.1.46"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "MTrab"; repo = "pyworxcloud"; tag = "v${version}"; - hash = "sha256-JRmAARfmGRWdUj4J2CqUaRd+S9itZgCxqbRl78Iub+o="; + hash = "sha256-eyMMtLgJuBIuPCyenYrHaRQIrb2tzPaIzM2UCAPPqDg="; }; build-system = [ poetry-core ]; dependencies = [ + awsiotsdk paho-mqtt requests urllib3 diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index 7649d7c7020e..14f17f42dfa0 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + auth0-python, buildPythonPackage, fetchFromGitHub, requests, @@ -9,20 +10,21 @@ buildPythonPackage rec { pname = "sharkiq"; - version = "1.2.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "JeffResc"; repo = "sharkiq"; tag = "v${version}"; - hash = "sha256-bojLyL16DOFgbU8rglzBRxcgsHwaTQQAsJQZCaXo5pw="; + hash = "sha256-XPqrEE/GwIn4sqbhETRPhBBPkH8Je+LKoDV+qDb3Ry8="; }; build-system = [ setuptools ]; dependencies = [ aiohttp + auth0-python requests ]; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 4c25a8091069..4a3e57accea5 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "7.3.0.post1"; + version = "7.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; tag = "v${version}"; - hash = "sha256-79q1uQML7WMHsaKQ7+4JA6LpeysJRA4fFxYVqQFntag="; + hash = "sha256-yrJmcwCVjPnkP8931xdb5fsOteBd+d/xEkg1/xahio8="; }; build-system = [ diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 1f0ac2e22982..0038bffbf2e6 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -111,6 +111,7 @@ python3Packages.buildPythonApplication rec { "out" "doc" "man" + "lib" ]; inherit src; @@ -226,7 +227,7 @@ python3Packages.buildPythonApplication rec { # And finally build patchShebangs ./ninja - export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/lib/python${python3.pythonVersion}/site-packages + export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python3.sitePackages} # Necessary for yarn to not complain about 'corepack' jq 'del(.packageManager)' package.json > package.json.tmp && mv package.json.tmp package.json YARN_BINARY="${lib.getExe noInstallYarn}" PIP_USER=1 \ @@ -251,7 +252,7 @@ python3Packages.buildPythonApplication rec { in '' runHook preCheck - export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/lib/python${python3.pythonVersion}/site-packages + export PYTHONPATH=$PYTHONPATH:$PWD/out/pyenv/${python3.sitePackages} HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib \ pytest -p no:cacheprovider pylib/tests -k ${disabledTestsString} HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib:$PWD/pylib:$PWD/out/qt \ @@ -262,10 +263,13 @@ python3Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - mkdir -p $out - uv pip install out/wheels/*.whl --prefix $out + mkdir -p $lib $out + uv pip install out/wheels/*.whl --prefix $lib # remove non-anki bins from dependencies - find $out/bin -type f ! -name "anki*" -delete + find $lib/bin -type f ! -name "anki*" -delete + # and put bin into $out so people can access it. Leave $lib separate to avoid collisions, see + # https://github.com/NixOS/nixpkgs/issues/438598 + mv $lib/bin $out/bin install -D -t $out/share/applications qt/launcher/lin/anki.desktop install -D -t $doc/share/doc/anki README* LICENSE* @@ -280,6 +284,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=( "''${qtWrapperArgs[@]}" --prefix PATH ':' "${lame}/bin:${mpv-unwrapped}/bin" + --prefix PYTHONPATH ':' "$lib/${python3.sitePackages}" ) ''; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7a56afa1c9a1..db8d684b874c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,18 +5,18 @@ "lts": false }, "6.1": { - "version": "6.1.151", - "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq", + "version": "6.1.152", + "hash": "sha256:1ndpnlmpsp2137aqis8bpa2cvdl28jg66pi0p2c6d26cm7i3n5qs", "lts": true }, "5.15": { - "version": "5.15.192", - "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb", + "version": "5.15.193", + "hash": "sha256:168ymh51hm0l6pd9g2kc33ji28gznc25rwzj7rvhnw82z79640n7", "lts": true }, "5.10": { - "version": "5.10.243", - "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m", + "version": "5.10.244", + "hash": "sha256:1h3dqaran5zrfgs0vybwq576yka8s9jirahiy3bb7hpm1763f2i1", "lts": true }, "5.4": { @@ -25,18 +25,18 @@ "lts": true }, "6.6": { - "version": "6.6.105", - "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z", + "version": "6.6.106", + "hash": "sha256:18584vys8qmbqj4hndiyhwbsn6z3832djm1mx07vgl6wv3i80c8c", "lts": true }, "6.12": { - "version": "6.12.46", - "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif", + "version": "6.12.47", + "hash": "sha256:099fj9qd8knafbl400drm8aqn5h7y6g39gc7d4i4hc3lf44f8bz8", "lts": true }, "6.16": { - "version": "6.16.6", - "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8", + "version": "6.16.7", + "hash": "sha256:108sk9r6ac0sc7h6ydvlyv7kib6z3af4v2f46kdinys2z6hxmqsv", "lts": false } } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9866c0d36c85..17841e6a60f3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "570.181"; - sha256_64bit = "sha256-8G0lzj8YAupQetpLXcRrPCyLOFA9tvaPPvAWurjj3Pk="; - sha256_aarch64 = "sha256-1pUDdSm45uIhg0HEhfhak9XT/IE/XUVbdtrcpabZ3KU="; - openSha256 = "sha256-U/uqAhf83W/mns/7b2cU26B7JRMoBfQ3V6HiYEI5J48="; - settingsSha256 = "sha256-iBx/X3c+1NSNmG+11xvGyvxYSMbVprijpzySFeQVBzs="; - persistencedSha256 = "sha256-RoAcutBf5dTKdAfkxDPtMsktFVQt5uPIPtkAkboQwcQ="; + version = "580.82.09"; + sha256_64bit = "sha256-Puz4MtouFeDgmsNMKdLHoDgDGC+QRXh6NVysvltWlbc="; + sha256_aarch64 = "sha256-6tHiAci9iDTKqKrDIjObeFdtrlEwjxOHJpHfX4GMEGQ="; + openSha256 = "sha256-YB+mQD+oEDIIDa+e8KX1/qOlQvZMNKFrI5z3CoVKUjs="; + settingsSha256 = "sha256-um53cr2Xo90VhZM1bM2CH4q9b/1W2YOqUcvXPV6uw2s="; + persistencedSha256 = "sha256-lbYSa97aZ+k0CISoSxOMLyyMX//Zg2Raym6BC4COipU="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 32481a4c757e..3819f40b85ff 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=c330b5820eefa8e703dbce7278c2a62d9c69166a"; hash = "sha256-5ti5OzgnZUFznjU8YH8Cfktrj4YBzsbbrEbNvec+ppQ="; }) + (fetchpatch { + name = "ensure-full-key-match"; + url = "https://git.w1.fi/cgit/hostap/patch/?id=1ce37105da371c8b9cf3f349f78f5aac77d40836"; + hash = "sha256-leCk0oexNBZyVK5Q5gR4ZcgWxa0/xt/aU+DssTa0UwE="; + }) ]; # TODO: Patch epoll so that the dbus actually responds diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix index 4b880705dbc9..1225ca4708ac 100644 --- a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix +++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.0.15"; + version = "0.0.15.1"; in buildHomeAssistantComponent { owner = "8none1"; @@ -19,7 +19,7 @@ buildHomeAssistantComponent { owner = "8none1"; repo = "lednetwf_ble"; tag = "v${version}"; - hash = "sha256-Ir3a6mr9OmBiiHRJktrv6HirHcVzKhc730aq6lynTmg="; + hash = "sha256-LSVvwJZFtBC+iwxfZ3R8msPvrvimPw2Tjzqw6Dx7ZsM="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 8157e57eaf13..67d80f81a247 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-qxYdE70APMO+ydv+lQzJY3gRYr/y5p0zJSgPt/k1cys="; + hash = "sha256-V8fT/w7a/uUN4yKJ+jB6UUQDP6dif80MvlqV9n4KENc="; }; dependencies = [ diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-sentry-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-sentry-datasource/default.nix index 309413cb645f..82f2062153be 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-sentry-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-sentry-datasource/default.nix @@ -3,12 +3,7 @@ grafanaPlugin { pname = "grafana-sentry-datasource"; version = "2.2.1"; - zipHash = { - x86_64-linux = "sha256-6pjBUqUHXLLgFzfal/OKsMBVlVXxuRglOj3XRnnduRY="; - aarch64-linux = "sha256-0kjxBnv34lRB5qeVOyik7qvlEsz7CYur9EyIDTe+AKM="; - x86_64-darwin = "sha256-yHgF+XmJXnJjfPwabs1dsrnWvssTmYpeZUXUl+gQxfM="; - aarch64-darwin = "sha256-ysLXSKG7q/u70NynYqKKRlYIl5rkYy0AMoza3sQSPNM="; - }; + zipHash = "sha256-VJ1RpVWT3d+BrZ9zUoAaNshrE3zBgEkimqUl+innBhg="; meta = { description = "Integrate Sentry data into Grafana"; license = lib.licenses.asl20; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index a559c0c0f4bd..9a0672c101bb 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-eval-jobs"; tag = "v${version}"; - hash = "sha256-urOFgqXzs+cgd1CKFuN245vOeVx7rIldlS9Q5WcemCw="; + hash = "sha256-VrHPtHxVIboqgnw+tlCQepgtBOhBvU5hxbMHsPo8LAc="; }; buildInputs = [ diff --git a/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch index f4f6e33e7207..ceef5300079d 100644 --- a/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch +++ b/pkgs/tools/virtualization/mkosi/0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch @@ -7,15 +7,24 @@ Rather than calling ukify and mkosi with sys.executable, which doesn't use the P Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- - mkosi/__init__.py | 11 +++++------ + mkosi/__init__.py | 17 +++++++---------- mkosi/bootloader.py | 5 +---- mkosi/run.py | 8 ++++---- - 3 files changed, 10 insertions(+), 14 deletions(-) + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py -index 65cac772bf1fc9feabec5740ed89a958ba406125..12b29061c819d50559132aa6c3b6f24a12945bb9 100644 +index 65cac772bf1fc9feabec5740ed89a958ba406125..c0debc09a76f36ae878bd172294eee6637b95bcb 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py +@@ -570,7 +570,7 @@ def finalize_host_scripts( + if context.config.find_binary(binary): + scripts[binary] = (binary, "--root", "/buildroot") + if ukify := context.config.find_binary("ukify"): +- scripts["ukify"] = (python_binary(context.config), ukify) ++ scripts["ukify"] = (ukify,) + return finalize_scripts(context.config, scripts | dict(helpers)) + + @@ -702,7 +702,7 @@ def script_maybe_chroot_sandbox( helpers = { @@ -51,7 +60,23 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..12b29061c819d50559132aa6c3b6f24a die("Could not find ukify") json_out = False -@@ -1887,7 +1886,7 @@ def want_uki(context: Context) -> bool: +@@ -1759,7 +1758,6 @@ def build_uki( + # TODO: bump version to 258 once it is released + if ( + systemd_tool_version( +- python_binary(context.config), + ukify, + sandbox=context.sandbox, + ) +@@ -1819,7 +1817,6 @@ def build_uki( + # new .ucode section support? + if ( + systemd_tool_version( +- python_binary(context.config), + ukify, + sandbox=context.sandbox, + ) +@@ -1887,7 +1884,7 @@ def want_uki(context: Context) -> bool: or ( context.config.unified_kernel_images == ConfigFeature.auto and systemd_stub_binary(context).exists() @@ -60,15 +85,18 @@ index 65cac772bf1fc9feabec5740ed89a958ba406125..12b29061c819d50559132aa6c3b6f24a ) ) -@@ -2769,7 +2768,7 @@ def check_ukify( +@@ -2769,9 +2766,9 @@ def check_ukify( reason: str, hint: Optional[str] = None, ) -> None: - ukify = check_tool(config, "ukify", "/usr/lib/systemd/ukify", reason=reason, hint=hint) + ukify = check_tool(config, "ukify", "@UKIFY@", reason=reason, hint=hint) - v = systemd_tool_version(python_binary(config), ukify, sandbox=config.sandbox) +- v = systemd_tool_version(python_binary(config), ukify, sandbox=config.sandbox) ++ v = systemd_tool_version(ukify, sandbox=config.sandbox) if v < version: + die( + f"Found '{ukify}' with version {v} but version {version} or newer is required to {reason}.", diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py index 6f112b854f72a8863dc5e7348f0154851d3dda96..8fdf2c5df7950c032bfcd36d89f7824e86ec9173 100644 --- a/mkosi/bootloader.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c84617297a4..9b2e57a5485e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1612,10 +1612,6 @@ with pkgs; httpServer = true; }; - bashate = python3Packages.callPackage ../development/tools/bashate { - python3Packages = python311Packages; - }; - inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector @@ -5986,7 +5982,8 @@ with pkgs; jpm = callPackage ../development/interpreters/janet/jpm.nix { }; davmail = callPackage ../applications/networking/davmail { - zulu = zulu11; + jre = jdk11.override { enableJavaFX = true; }; + zulu = zulu11.override { enableJavaFX = true; }; }; lambda-lisp-blc = lambda-lisp; @@ -13428,10 +13425,6 @@ with pkgs; wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; - x11basic = callPackage ../development/compilers/x11basic { - autoconf = buildPackages.autoconf269; - }; - x2goclient = callPackage ../applications/networking/remote/x2goclient { }; x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { }; @@ -14390,8 +14383,6 @@ with pkgs; liblapack = lapack-reference; - nota = haskellPackages.callPackage ../applications/science/math/nota { }; - notus-scanner = with python3Packages; toPythonApplication notus-scanner; openblas = callPackage ../development/libraries/science/math/openblas { @@ -15044,7 +15035,7 @@ with pkgs; ); nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nixComponents = nixVersions.nixComponents_2_30; + nixComponents = nixVersions.nixComponents_2_31; }; nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;