diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c588954a6a1..a602732ce4eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9418,6 +9418,15 @@ githubId = 10353047; name = "Tobias Happ"; }; + gesperon = { + email = "gesperon@mac.com"; + github = "gesperon"; + githubId = 117491118; + name = "Gabor Esperon"; + keys = [ + { fingerprint = "8102 3AF7 84FC 4DA7 B9D7 ECFF A0AF 4AD2 D44C C6FE"; } + ]; + }; getchoo = { name = "Seth Flynn"; email = "getchoo@tuta.io"; diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index d21734bb26ba..8a694b8b9fa0 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.49"; - hash = "sha256-norWEwxgAFlylLH+NphYdmpb0vkVcmkidi0SN8Kr6R0="; + version = "2.0.50"; + hash = "sha256-wYDJPzqWPUTdVnba35BioFgV6jeBiZlagQ5L8gzwVF0="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f31503697c74..ed57aebd2d27 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3023,8 +3023,8 @@ let mktplcRef = { publisher = "mesonbuild"; name = "mesonbuild"; - version = "1.27.0"; - hash = "sha256-dEDDw8fDBkRYE09mrOzQNzAhWZEczTTahBZT4nhrClw="; + version = "1.28.0"; + hash = "sha256-mvW0u0Tpc1JqoFJYyRirdcLDCHfm72XvTs8sFvvw490="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog"; diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 66c633728fad..a6753400d877 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -3,51 +3,59 @@ stdenv, buildNpmPackage, fetchFromGitHub, - nodejs_20, + nodejs_latest, versionCheckHook, node-gyp, python3, udev, - cctools, + xcbuild, }: let buildNpmPackage' = buildNpmPackage.override { - nodejs = nodejs_20; + nodejs = nodejs_latest; }; node-gyp' = node-gyp.override { - nodejs = nodejs_20; + nodejs = nodejs_latest; }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "22.4.13"; + version = "23.2.0"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-nke7EQscVPu1A/d4DKi7pSb6/MQgeFtG+zhMZT+bhWk="; + hash = "sha256-T4eOiFpU17vAwAM02gwJq93ZtJQUC7bv0CCFpj4NKEA="; }; - npmDepsHash = "sha256-GQXbXkOt8nkOB2OeEcKsp1yJd5lXS+KKout/5ffLgD0="; + npmDepsHash = "sha256-kRkc3o8xmROlH17GI3yoGvMwEweHrLeGpvW3rH0wOSU="; makeCacheWritable = true; nativeBuildInputs = [ node-gyp' python3 - versionCheckHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools + xcbuild ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ]; - doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + # Disabled on Darwin due to: + # + # https://github.com/NixOS/nix/issues/5748 + # + # No matter whether $TMP and $HOME point to real writable directories, the + # Darwin sandbox tries to use /var/empty and fails. + doInstallCheck = !stdenv.hostPlatform.isDarwin; versionCheckProgram = "${placeholder "out"}/bin/balena"; meta = { diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index dc1e4dd47166..214ddb20db56 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.1.3", + version ? "2.2.0", }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4="; + "2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } .${version}; diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix index 3b1d1dafc558..0c1cb3782c61 100644 --- a/pkgs/by-name/ca/carapace/package.nix +++ b/pkgs/by-name/ca/carapace/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-QTY2GH2aKTMowNXVVNUDJdHAFVhCPFBh2p+Mgon88EI="; + hash = "sha256-q7G7odkRwh4/w8H09exXYSC7n4CUeoG2iKb/k2D/gek="; }; - vendorHash = "sha256-Lswmq4j4nz7k+CRpyZhAubEZD59lNKpT/w3mQ4JlMys="; + vendorHash = "sha256-eADiOSLqouH9saTgbbQY18wc3DxCBvqdVKI32I7sTWQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 5d48da62ccdd..313206e935c5 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.49", + "version": "2.0.50", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.49", + "version": "2.0.50", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index f0f96967ec09..9c28edf7b085 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.49"; + version = "2.0.50"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-ht6s8NOPgwS3Vnwd+2ECO8KAWbXZOL8ZNnOFMNxmAdI="; + hash = "sha256-mZQkqeL/F/9u5esy1j1pUjcyzeaShREx+vMuvZ5Zrz8="; }; - npmDepsHash = "sha256-KqLOvyZ9YYdUIeyzdlElOIq2bjieTbklCbVIoYSE63g="; + npmDepsHash = "sha256-/5Qh99vAcTiFz6FrzJgm26RserqxVjLYqOOx5q5hkgc="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 095c388cd20e..a59f8aa4b92b 100644 --- a/pkgs/by-name/co/copybara/package.nix +++ b/pkgs/by-name/co/copybara/package.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "copybara"; - version = "20251027"; + version = "20251117"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-IHW6y6WXJFjX9RYD+IwVAMwAbEo36fLqonIKR+FaqpQ="; + hash = "sha256-QbmBrkkqLtB/5ZS9o+Z4KKbogFv5lccEGgLZsuVuPrg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix b/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix index 7bd4356cfa04..d04c80281cae 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-ext-applet-minimon"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "minimon-applet"; tag = "v${finalAttrs.version}"; - hash = "sha256-TK+H9HUgJZxVwcxhot+Jsbs7ZnBBtu5p5xXEahzs298="; + hash = "sha256-tUAp6GN5oJYhALjTpEELMOEBpfao5D9B0hl2ecNtwMg="; }; - cargoHash = "sha256-vNmySJ/bmSPpEHgIGTqs5Lf4GrhRfD6JdqVv+renUy8="; + cargoHash = "sha256-qgqlEufv9vLLIOcDLiX76xRcXal1Q0S5726ua+8R8Ek="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index ed6d28d92875..94edf5185f91 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-StvkMo9HZzAx3T+dnRQBUZJOC3EOj+ItqO13vW+F/SU="; + hash = "sha256-PHYzaynxzKYYNTB/pJVuSZoiN3/zwixjqoxXzbxToVc="; }; - cargoHash = "sha256-roLuOVkBSDZ+2bHEcA53CcdtE82EO4/anCvlVHeTC0s="; + cargoHash = "sha256-NTsiAW9SLN6vuNtbdrXqtvutnI/2DLCgMjYxG6tTtFM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix index 542526820a23..faaac64563a6 100644 --- a/pkgs/by-name/de/dexed/package.nix +++ b/pkgs/by-name/de/dexed/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dexed"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "asb2m10"; repo = "dexed"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-mXr1KGzA+DF2dEgAJE4lpnefPqO8pqfnKa43vyjSJgU="; + hash = "sha256-SPIcaFwx4uGx4Bc1EH1FTnAZ2BAno2h3iO0yhB3G71U="; }; postPatch = '' diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index d9b31f7d4fb6..7c690004cc4d 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -29,13 +29,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; tag = finalAttrs.version; - hash = "sha256-DUXIQIZa0Ppr4EtvDKN5T3XZoc8rBILn+mVnjFGxlxA="; + hash = "sha256-hYJ82EXR1kP8hzUj+CCXnGuohVzyA1O9TBpWjRccj9Y="; }; postPatch = diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix index 8204f924245a..450cf2b27a68 100644 --- a/pkgs/by-name/ga/gallia/package.nix +++ b/pkgs/by-name/ga/gallia/package.nix @@ -18,6 +18,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-CZsVd9ob4FHC9KeepK7OHWatVTJUiJEjqtaylhD+yS0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.11,<0.9.0" "uv_build" + ''; + pythonRelaxDeps = [ "pydantic" ]; build-system = with python3.pkgs; [ uv-build ]; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index 6fc816fc8577..7930da09c71e 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.25.4"; + version = "0.25.6"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-DRTSI6fCakVjAzGGlisvTkDiIQKXlv3XQ3SfB2UjiC8="; + hash = "sha256-NE/m5fp+iJDlz3AtkjIAlO4CB7CVLeWzXYY5xCYX+cI="; }; - vendorHash = "sha256-287u3zjlEOuc45stq7k1v5IINRUASw83sw6Dmqv9aUs="; + vendorHash = "sha256-TZz7aAKMld7KFbW+vcysgSO+Tp9+Qb5enYBJCpiPWDA="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 45132b79ec46..3f7780ef1564 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-BL+qIQgqqVuOQzCVjS9lnExijM0XDj5v3+RPkbspw9Q="; + hash = "sha256-TKuI7UC9ofUzRZFqdjY2LEiagjdE2IC471iXkhUCAyw="; }; dontUnpack = true; diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix new file mode 100644 index 000000000000..83672151904c --- /dev/null +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -0,0 +1,42 @@ +{ + buildGoModule, + fetchFromGitea, + lib, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "git-pages-cli"; + version = "1.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "git-pages"; + repo = "git-pages-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Uwp7/l4AsVwKPWKkPjPJqPqR7f+N4ksgq44HctLBiGo="; + }; + + vendorHash = "sha256-5vjUhN3lCr41q91lOD7v0F9c6a8GJj7wBGnnzgFBhJU="; + + ldflags = [ + "-X" + "main.versionOverride=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-line application for uploading a site to a git-pages server"; + homepage = "https://codeberg.org/git-pages/git-pages-cli"; + changelog = "https://codeberg.org/git-pages/git-pages-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd0; + mainProgram = "git-pages-cli"; + maintainers = with lib.maintainers; [ dramforever ]; + }; +}) diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix index 2843a22a57c0..d6f0ee5e71d4 100644 --- a/pkgs/by-name/gr/grass/package.nix +++ b/pkgs/by-name/gr/grass/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.4.1"; + version = "8.4.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-q1jOimQi+24I1ZBf6Z0cvAyXcBFBpT5aWSNeG6n6y0k="; + hash = "sha256-DEbJZlnq9o+5BYQBXL6wJIVJ9c7HOBLQDMrsiMcaPgk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index b33a3cefa371..f7f59661d9af 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -28,21 +28,20 @@ let rootSrc = stdenv.mkDerivation { pname = "iEDA-src"; - version = "2025-09-10"; + version = "2025-11-08"; src = fetchgit { url = "https://gitee.com/oscc-project/iEDA"; - rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486"; - sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0="; + rev = "038eb6454cb7e83c6b65b933e8a21b3e4b4776e0"; + sha256 = "sha256-wUqpiCU5ap6oda2ReHtUBwI0XMEUcuXY7qWNQ2UlL9A="; }; patches = [ - # This patch is to fix the build error caused by the missing of the header file, - # and remove some libs or path that they hard-coded in the source code. + # This patch is to fix the build system to properly find and link against rust libraries. # Due to the way they organized the source code, it's hard to upstream this patch. # So we have to maintain this patch locally. (fetchpatch { - url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch"; - hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg="; + url = "https://github.com/Emin017/iEDA/commit/e5f3ce024965df5e1d400b6a1d7f8b5b307a4bf3.patch"; + hash = "sha256-YJnY+r9A887WT0a/H/Zf++r1PpD7t567NpkesDmIsD0="; }) # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux (fetchpatch { @@ -66,7 +65,7 @@ let in stdenv.mkDerivation { pname = "iEDA"; - version = "0.1.0-unstable-2025-09-10"; + version = "0.1.0-unstable-2025-11-08"; src = rootSrc; diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix index 64008abcbef7..aad374abca4c 100644 --- a/pkgs/by-name/le/legitify/package.nix +++ b/pkgs/by-name/le/legitify/package.nix @@ -1,10 +1,10 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, }: -buildGoModule rec { +buildGo124Module rec { pname = "legitify"; version = "1.0.11"; @@ -30,7 +30,7 @@ buildGoModule rec { meta = { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; homepage = "https://github.com/Legit-Labs/legitify"; - changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}"; + changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "legitify"; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 3245cc408eef..4ac2e7aef289 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.3.0"; + version = "10.3.2"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-0LmbQ+BuzfPn2xBdcKqcBkxbR1nJrSwIkomaupmiJJk="; + hash = "sha256-LeSBso/Y6I8lIy3TLvGeZLPjxsL1eHr/YSKXglHK08s="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 803de1971544..efeffa65bf80 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.72.0"; + version = "3.72.1"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-ZKMw2P9UeBVdQ0jKDdkAQ84GyviJ+YW9afCY/geKWnQ="; + hash = "sha256-c6eCfQz/Tc8pg1vVjgidkPj7I85sJ5AcyX7Gf/MTXZI="; }; strictDeps = true; diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index a2e58165d8b2..886f18c22817 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-eEjbWSkQcieHLNAPgWTZ1ZJEvoPkHzIaA0dHuqLzzyA="; + hash = "sha256-Ys/CoyaIKVVRtQfmjc4XOABdrktZ1lIPNqw0V8jlY5I="; }; - cargoHash = "sha256-sPAcSr+W4W4I3lHa6Km62Grp2ZdOCMHLZdN2KNrC0qw="; + cargoHash = "sha256-ipNhqxcc+Kfr6XtF3QtFh896YK5v1u4kXapiMUjC9n8="; doCheck = true; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 9382d97f966d..322a04c13816 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "142.0.3595.80"; + version = "142.0.3595.94"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-yHOy/9t08GbY4ufsYPMr87NVqsk/CHGc7bu0N/KAOW0="; + hash = "sha256-P+mPXg0gVWqlJqBS2F/Tuf42BikntPO0R693wPASKQc="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index d7c8fd8226cb..2cbf5e467743 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.86"; + version = "11.87"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-YFw8TC38Nmdy37Bzo6p43+Ykt9fmvtAcJmZubsFqJHE="; + hash = "sha256-m6CG0Ar6w2fF4h3CjVsdjWWHxau2Cl3iqxh4JLH+91k="; stripRoot = false; }; diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index b69111f77292..b953b0a4da66 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.70.1"; + version = "3.71.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-9RMBMvl1NBhajbMCw1aJZTMclbul5dZDpxhHWCPWi+s="; + hash = "sha256-Yooaq7Jr8uu0yDGoVYhxJittJmMqhUDFSczWbFIyrN0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/opencode/bundle.ts b/pkgs/by-name/op/opencode/bundle.ts new file mode 100644 index 000000000000..768e3e204e21 --- /dev/null +++ b/pkgs/by-name/op/opencode/bundle.ts @@ -0,0 +1,38 @@ +#!/usr/bin/env bun + +import solidPlugin from "./node_modules/@opentui/solid/scripts/solid-plugin" +import fs from "fs" + +const version = process.env.OPENCODE_VERSION! +const channel = process.env.OPENCODE_CHANNEL! + +const result = await Bun.build({ + target: "bun", + outdir: "./dist", + entrypoints: [ + "./src/index.ts", + "./src/cli/cmd/tui/worker.ts" + ], + plugins: [solidPlugin], + naming: { + entry: "[dir]/[name].js" + }, + define: { + OPENCODE_VERSION: JSON.stringify(version), + OPENCODE_CHANNEL: JSON.stringify(channel), + }, + external: [ + "@opentui/core-*", + ], +}) + +if (!result.success) { + console.error("Bundle failed:", result.logs) + process.exit(1) +} + +// Move worker file to worker.ts at the dist root so the code can find it +if (fs.existsSync("./dist/cli/cmd/tui/worker.js")) { + fs.renameSync("./dist/cli/cmd/tui/worker.js", "./dist/worker.ts") + fs.rmdirSync("./dist/cli/cmd/tui", { recursive: true }) +} diff --git a/pkgs/by-name/op/opencode/hashes.json b/pkgs/by-name/op/opencode/hashes.json deleted file mode 100644 index 24ab419ee9bc..000000000000 --- a/pkgs/by-name/op/opencode/hashes.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "node_modules": { - "aarch64-linux": "sha256-uqOotHS6p5mLBmh3f7lka9boXBz7trTKuGahGfOSTD4=", - "x86_64-linux": "sha256-qlVlP5ayYTuf/uZIW7lk8wKYxArB0jOHmw94yK9v9Bg=", - "aarch64-darwin": "sha256-dDKVLmE33P9epJFmsUluDjtyVL5jT87atpv8qbEFy7o=", - "x86_64-darwin": "sha256-eBsU9hSf1tRfp8ErZtmM731YVtVRZ8ovQ5nYmokaPD0=" - } -} diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 3f28f7940ca0..6fd34ea50097 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -11,20 +11,19 @@ testers, writableTmpDirAsHomeHook, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +let pname = "opencode"; - version = "1.0.78"; + version = "1.0.105"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; - tag = "v${finalAttrs.version}"; - hash = "sha256-o+rNkij9niggHkA+TtexTbrXLK0I9Ol1Cp9NC/wEuAk="; + tag = "v${version}"; + hash = "sha256-mwiEOsJ2prQYzN0gd0+iEfelNt1qv+K7slbF2Rk9eng="; }; node_modules = stdenvNoCC.mkDerivation { - pname = "opencode-node_modules"; - inherit (finalAttrs) version src; + pname = "${pname}-node_modules"; + inherit version src; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" @@ -43,24 +42,32 @@ stdenvNoCC.mkDerivation (finalAttrs: { export BUN_INSTALL_CACHE_DIR=$(mktemp -d) - # NOTE: Without `--linker=hoisted` the necessary platform specific packages are not created, i.e. `@parcel/watcher--` and `@opentui/core--` bun install \ + --cpu="*" \ --filter=./packages/opencode \ --force \ --frozen-lockfile \ --ignore-scripts \ - --linker=hoisted \ --no-progress \ + --os="*" \ --production + bun run ./nix/scripts/canonicalize-node-modules.ts + bun run ./nix/scripts/normalize-bun-binaries.ts + runHook postBuild ''; installPhase = '' runHook preInstall - mkdir -p $out/node_modules - cp -R ./node_modules $out + mkdir -p $out + while IFS= read -r dir; do + rel="''${dir#./}" + dest="$out/$rel" + mkdir -p "$(dirname "$dest")" + cp -R "$dir" "$dest" + done < <(find . -type d -name node_modules -prune | sort) runHook postInstall ''; @@ -68,10 +75,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = (lib.importJSON ./hashes.json).node_modules.${stdenvNoCC.hostPlatform.system}; + outputHash = "sha256-3N7iWxc5vt81EhyTDWYHMVTZ1KbLz1y4wzSYJt5fQCE="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + inherit + pname + version + src + node_modules + ; nativeBuildInputs = [ bun @@ -80,30 +95,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; patches = [ - # NOTE: Skip npm pack commands in build.ts since packages are already in node_modules - ./skip-npm-pack.patch + # NOTE: Relax Bun version check to be a warning instead of an error + ./relax-bun-version-check.patch ]; - postPatch = '' - # don't require a specifc bun version - substituteInPlace packages/script/src/index.ts \ - --replace-fail "if (process.versions.bun !== expectedBunVersion)" "if (false)" - ''; - configurePhase = '' runHook preConfigure - cd packages/opencode - cp -R ${finalAttrs.node_modules}/. . - - chmod -R u+w ./node_modules - # Make symlinks absolute to avoid issues with bun build - rm ./node_modules/@opencode-ai/script - ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script - rm -f ./node_modules/@opencode-ai/sdk - ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk - rm -f ./node_modules/@opencode-ai/plugin - ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin + cp -R ${node_modules}/. . runHook postConfigure ''; @@ -112,10 +111,30 @@ stdenvNoCC.mkDerivation (finalAttrs: { env.OPENCODE_VERSION = finalAttrs.version; env.OPENCODE_CHANNEL = "stable"; + preBuild = '' + chmod -R u+w ./packages/opencode/node_modules + pushd ./packages/opencode/node_modules/@parcel/ + for pkg in ../../../../node_modules/.bun/@parcel+watcher-*; do + linkName=$(basename "$pkg" | sed 's/@.*+\(.*\)@.*/\1/') + ln -sf "$pkg/node_modules/@parcel/$linkName" "$linkName" + done + popd + + pushd ./packages/opencode/node_modules/@opentui/ + for pkg in ../../../../node_modules/.bun/@opentui+core-*; do + linkName=$(basename "$pkg" | sed 's/@.*+\(.*\)@.*/\1/') + ln -sf "$pkg/node_modules/@opentui/$linkName" "$linkName" + done + popd + ''; + buildPhase = '' runHook preBuild - bun run ./script/build.ts --single + + cd ./packages/opencode + cp ${./bundle.ts} ./bundle.ts + bun run ./bundle.ts runHook postBuild ''; @@ -125,19 +144,53 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode + mkdir -p $out/lib/opencode + # Copy the bundled dist directory + cp -r dist $out/lib/opencode/ - runHook postInstall - ''; + # Fix WASM paths in worker.ts - use absolute paths to the installed location + # Main wasm is tree-sitter-.wasm, language wasms are tree-sitter--.wasm + main_wasm=$(find "$out/lib/opencode/dist" -maxdepth 1 -name 'tree-sitter-[a-z0-9]*.wasm' -print -quit) - postInstall = '' - wrapProgram $out/bin/opencode \ + substituteInPlace $out/lib/opencode/dist/worker.ts \ + --replace-fail 'module2.exports = "../../../tree-sitter-' 'module2.exports = "'"$out"'/lib/opencode/dist/tree-sitter-' \ + --replace-fail 'new URL("tree-sitter.wasm", import.meta.url).href' "\"$main_wasm\"" + + # Copy only the native modules we need (marked as external in bundle.ts) + mkdir -p $out/lib/opencode/node_modules/.bun + mkdir -p $out/lib/opencode/node_modules/@opentui + + # Copy @opentui/core platform-specific packages + for pkg in ../../node_modules/.bun/@opentui+core-*; do + if [ -d "$pkg" ]; then + cp -r "$pkg" $out/lib/opencode/node_modules/.bun/$(basename "$pkg") + fi + done + + mkdir -p $out/bin + makeWrapper ${lib.getExe bun} $out/bin/opencode \ + --add-flags "run" \ + --add-flags "$out/lib/opencode/dist/index.js" \ --prefix PATH : ${ lib.makeBinPath [ fzf ripgrep ] - } + } \ + --argv0 opencode + + runHook postInstall + ''; + + postInstall = '' + # Add symlinks for platform-specific native modules + for pkg in $out/lib/opencode/node_modules/.bun/@opentui+core-*; do + if [ -d "$pkg" ]; then + pkgName=$(basename "$pkg" | sed 's/@opentui+\(core-[^@]*\)@.*/\1/') + ln -sf ../.bun/$(basename "$pkg")/node_modules/@opentui/$pkgName \ + $out/lib/opencode/node_modules/@opentui/$pkgName + fi + done ''; passthru = { @@ -163,11 +216,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/sst/opencode"; license = lib.licenses.mit; - platforms = lib.platforms.unix; - mainProgram = "opencode"; - badPlatforms = [ - # Problems with bun >= 1.3.2, see https://github.com/oven-sh/bun/issues/24645 - lib.systems.inspect.patterns.isDarwin + platforms = [ + "aarch64-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" ]; + mainProgram = "opencode"; }; }) diff --git a/pkgs/by-name/op/opencode/relax-bun-version-check.patch b/pkgs/by-name/op/opencode/relax-bun-version-check.patch new file mode 100644 index 000000000000..5d14f166a15c --- /dev/null +++ b/pkgs/by-name/op/opencode/relax-bun-version-check.patch @@ -0,0 +1,28 @@ +From 0e07ea8225f5667e39c6aa59eea726266f0afab0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 13 Nov 2025 10:16:31 +0100 +Subject: [PATCH] Change Bun version check from error to warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + packages/script/src/index.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts +index 141d2b75..de06d0dc 100644 +--- a/packages/script/src/index.ts ++++ b/packages/script/src/index.ts +@@ -10,7 +10,7 @@ if (!expectedBunVersion) { + } + + if (process.versions.bun !== expectedBunVersion) { +- throw new Error(`This script requires bun@${expectedBunVersion}, but you are using bun@${process.versions.bun}`) ++ console.warn(`Warning: This script expects bun@${expectedBunVersion}, but you are using bun@${process.versions.bun}`) + } + + const CHANNEL = process.env["OPENCODE_CHANNEL"] ?? (await $`git branch --show-current`.text().then((x) => x.trim())) +-- +2.51.0 diff --git a/pkgs/by-name/op/opencode/skip-npm-pack.patch b/pkgs/by-name/op/opencode/skip-npm-pack.patch deleted file mode 100644 index 7b912be349ae..000000000000 --- a/pkgs/by-name/op/opencode/skip-npm-pack.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts -index 502baed..f854e99 100755 ---- i/packages/opencode/script/build.ts -+++ w/packages/opencode/script/build.ts -@@ -77,14 +77,19 @@ const allTargets: { - ] - - const targets = singleFlag -- ? allTargets.filter((item) => item.os === process.platform && item.arch === process.arch) -+ ? allTargets.filter((item) => -+ item.os === process.platform && -+ item.arch === process.arch && -+ item.avx2 !== false && -+ item.abi === undefined -+ ).slice(0, 1) - : allTargets - - await $`rm -rf dist` - - const binaries: Record = {} --await $`bun install --os="*" --cpu="*" @opentui/core@${pkg.dependencies["@opentui/core"]}` --await $`bun install --os="*" --cpu="*" @parcel/watcher@${pkg.dependencies["@parcel/watcher"]}` -+// Skip bun install - packages already installed in node_modules by Nix -+// Skip bun install - packages already installed in node_modules by Nix - for (const item of targets) { - const name = [ - pkg.name, diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 6e949aee72a6..b4714b7d2bb2 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-DCMAKE_MODULE_PATH:PATH=${placeholder "out"}/lib/cmake" "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-DOpenCV_DIR=${lib.getLib opencv}/lib/cmake/opencv4/" - "-DCMAKE_PREFIX_PATH=${lib.getLib protobuf}" + "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" "-DPython_EXECUTABLE=${python.interpreter}" (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) @@ -142,8 +142,7 @@ stdenv.mkDerivation rec { # system libs (cmakeBool "ENABLE_SYSTEM_FLATBUFFERS" true) (cmakeBool "ENABLE_SYSTEM_OPENCL" true) - (cmakeBool "ENABLE_SYSTEM_PROTOBUF" true) - (cmakeBool "Protobuf_USE_STATIC_LIBS" false) + (cmakeBool "ENABLE_SYSTEM_PROTOBUF" false) (cmakeBool "ENABLE_SYSTEM_PUGIXML" true) (cmakeBool "ENABLE_SYSTEM_SNAPPY" true) (cmakeBool "ENABLE_SYSTEM_TBB" true) @@ -164,7 +163,6 @@ stdenv.mkDerivation rec { libxml2 ocl-icd opencv - protobuf pugixml snappy onetbb diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix index eebb7b1284d3..18700fab4801 100644 --- a/pkgs/by-name/pu/pur/package.nix +++ b/pkgs/by-name/pu/pur/package.nix @@ -28,12 +28,13 @@ python3.pkgs.buildPythonApplication rec { # Tests are failing after the last mass update "test_missing_requirements_file" "test_no_arguments_and_no_requirements_file" + "test_interactive_choice_default" ]; meta = { description = "Python library for update and track the requirements"; homepage = "https://github.com/alanhamlett/pip-update-requirements"; - changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${src.tag}/HISTORY.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pur"; diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index a91cd2092f96..b5f32fa78182 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -2,41 +2,29 @@ lib, fetchFromGitea, fetchNpmDeps, - buildGo125Module, + buildGoModule, nodejs, npmHooks, python3, }: -let - file-compose = buildGo125Module { - pname = "file-compose"; - version = "unstable-2023-10-21"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "readeck"; - repo = "file-compose"; - rev = "afa938655d412556a0db74b202f9bcc1c40d8579"; - hash = "sha256-rMANRqUQRQ8ahlxuH1sWjlGpNvbReBOXIkmBim/wU2o="; - }; - - vendorHash = "sha256-Qwixx3Evbf+53OFeS3Zr7QCkRMfgqc9hUA4eqEBaY0c="; - }; -in - -buildGo125Module rec { +buildGoModule rec { pname = "readeck"; - version = "0.20.1"; + version = "0.21.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "readeck"; repo = "readeck"; tag = version; - hash = "sha256-7ZLEAMma0eLrcCbwbeK8EPDY1+ZOJy3i4Rz+obDsuko="; + hash = "sha256-qbH95jsOrB/AEw4uy0DXfRCqLL+VSj9322PeP5mUgdk="; }; + postPatch = '' + substituteInPlace go.mod \ + --replace-fail 'go 1.25.4' 'go 1.25.3' + ''; + nativeBuildInputs = [ nodejs npmHooks.npmConfigHook @@ -48,10 +36,7 @@ buildGo125Module rec { NODE_PATH = "$npmDeps"; preBuild = '' - make web-build - python3 locales/messages.py compile - ${file-compose}/bin/file-compose -format json docs/api/api.yaml docs/assets/api.json - go run ./tools/docs docs/src docs/assets + make generate ''; subPackages = [ "." ]; @@ -69,6 +54,8 @@ buildGo125Module rec { ldflags = [ "-X" "codeberg.org/readeck/readeck/configs.version=${version}" + "-X" + "codeberg.org/readeck/readeck/configs.buildTimeStr=1970-01-01T08:00:00Z" ]; overrideModAttrs = oldAttrs: { @@ -80,10 +67,10 @@ buildGo125Module rec { npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-/imn3IoRh6aoQFNH0yMmgYNktfkN647H4KfpcVVC728="; + hash = "sha256-yhheyR9drXFgIdUIjfNe1rZWlNR1ShZooIZ12eIwlHM="; }; - vendorHash = "sha256-8SdDuMsFKpEhJ3qnH/9nly54A/PJCCh5xIyKNLDs740="; + vendorHash = "sha256-Lf4chATpS+vwuWsrO3weVS/GvwWTvnT2FRu04wZLHZ8="; meta = { description = "Web application that lets you save the readable content of web pages you want to keep forever"; @@ -91,6 +78,9 @@ buildGo125Module rec { homepage = "https://readeck.org/"; changelog = "https://codeberg.org/readeck/readeck/releases/tag/${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ julienmalka ]; + maintainers = with lib.maintainers; [ + julienmalka + linsui + ]; }; } diff --git a/pkgs/by-name/sb/sbom-tool/deps.json b/pkgs/by-name/sb/sbom-tool/deps.json index e99bb46fb1bc..780917fa27ee 100644 --- a/pkgs/by-name/sb/sbom-tool/deps.json +++ b/pkgs/by-name/sb/sbom-tool/deps.json @@ -26,23 +26,23 @@ }, { "pname": "Microsoft.ComponentDetection.Common", - "version": "5.2.27", - "hash": "sha256-GJ6Aluv8yM2un91SFjEQLP1hqdsCfV/ef+GNw7XJVRM=" + "version": "6.0.0", + "hash": "sha256-F01KCIqxFa4049bzvKGh59kpdk5UykSFFKaHEPQGVY4=" }, { "pname": "Microsoft.ComponentDetection.Contracts", - "version": "5.2.27", - "hash": "sha256-9VcdMKAzvw63QuDpF/UJV64pDBc/1OHORQIfiaD73Bg=" + "version": "6.0.0", + "hash": "sha256-yRmgJVLDDMGlq550sqve7f+0/iwwHCT/GMb0/6837Y4=" }, { "pname": "Microsoft.ComponentDetection.Detectors", - "version": "5.2.27", - "hash": "sha256-fUDPlEBAQz6wEh0f5t5bGI6vY8N5Bds920nZzcedbRQ=" + "version": "6.0.0", + "hash": "sha256-JeXHB0XY003CpFDmgRzdgGRTcqFABywvEoxXHvlo8b0=" }, { "pname": "Microsoft.ComponentDetection.Orchestrator", - "version": "5.2.27", - "hash": "sha256-2I0UQ/Wajd1p09OWudm7XuPb8Qq6ZTBSLHCIepk0nw0=" + "version": "6.0.0", + "hash": "sha256-+rSRgh0V5WEtZ/SqRGvPI9J4k1hPGczBwJfxx5mmWg0=" }, { "pname": "Microsoft.CSharp", @@ -1091,8 +1091,8 @@ }, { "pname": "System.Threading.Channels", - "version": "9.0.8", - "hash": "sha256-2gKEpEc10gRfKvPSbxb//Oa5JRm5whWcXu1SqpNnoC0=" + "version": "9.0.10", + "hash": "sha256-1SSATu8rInAryjFE98mInmAfrPQ48KixeqqAjn4xp64=" }, { "pname": "System.Threading.Tasks", diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix index f30b5e1ff01d..5c38f4a70967 100644 --- a/pkgs/by-name/sb/sbom-tool/package.nix +++ b/pkgs/by-name/sb/sbom-tool/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "sbom-tool"; - version = "4.1.3"; + version = "4.1.4"; src = fetchFromGitHub { owner = "microsoft"; repo = "sbom-tool"; tag = "v${version}"; - hash = "sha256-zv83bbdkVB2Pejyp0S7WaReO7HIjvOk4/2cyMFqNERM="; + hash = "sha256-3MeiTGywX9ummmmJRRy7JrOiP06lwY7B5wlWwN39w7c="; }; projectFile = "src/Microsoft.Sbom.Tool/Microsoft.Sbom.Tool.csproj"; diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index a56a365b84e3..09789e544cf8 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.42.0"; + version = "3.45.0"; outputs = [ "out" @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-mp1FGJpwCYU53nK9sHjy17vIeR0ewst5eF0OA4Pfcl4="; + hash = "sha256-ubEhCUhat8Bkv54RzRmd9QuK90WpA1/b50CrYzxATUs="; }; - cargoHash = "sha256-15w2b9kRhDYXjUfKSULXFWzeD60Qmz4ATKEtaDwiDOo="; + cargoHash = "sha256-ajaXFrqkgQ9MR11LL1waGmUQrm+h2UeIjOJoZB4+pUE="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index ff4cd4e2c344..27db353ba566 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -19,16 +19,16 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.13.9"; + version = "0.13.10"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-xKb8XY+k5SbblIQx5tvuNxSjcfdyAAIzgZi4Q9176Qo="; + hash = "sha256-IZNVTcRWOXX7KXHvqaio9tctCcc0AKNc003qzEXMyEM="; }; - cargoHash = "sha256-peVEGnUqxQLyqdOhkVK5FZiRjqkrYZgvXy9OTXFbk4g="; + cargoHash = "sha256-gDUaPr5SlOZbuXAuCE+zUWVw7fGS+G9WHgc3M3/wWf0="; strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index 36c6a1eb5573..c88fdf725982 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-uzfjgOnAAOSsMv7sjoKWVKg+HykevSQE1BCwIofbK+g="; + hash = "sha256-pK4XFrwNxaFgLFNTK8uPVSF4GBAkH8KkSFi3yWgMjF0="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/wa/wails/package.nix b/pkgs/by-name/wa/wails/package.nix index 1a0e02472408..1a8a14099d19 100644 --- a/pkgs/by-name/wa/wails/package.nix +++ b/pkgs/by-name/wa/wails/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "wails"; - version = "2.10.2"; + version = "2.11.0"; - src = - fetchFromGitHub { - owner = "wailsapp"; - repo = "wails"; - tag = "v${version}"; - hash = "sha256-b0ns2cXlUT5tPbVEOzQGftxoUqGEDuzj+2KDxNnfs4c="; - } - + "/v2"; + src = fetchFromGitHub { + owner = "wailsapp"; + repo = "wails"; + tag = "v${version}"; + hash = "sha256-H1Nml2vhCx4IB/CT+kDro5joAw8ewpxoQjDgvqamAr8="; + }; - vendorHash = "sha256-u1NoAHxBSzw44W3l5MzMxMUjgrfM9EDkKwR4GAPQBVE="; + sourceRoot = "${src.name}/v2"; + + vendorHash = "sha256-RgRrKok06HDg6j5tbOmtX9mOl/t6eXuCwQ2OhOXbHUU="; proxyVendor = true; diff --git a/pkgs/by-name/wo/woeusb-ng/package.nix b/pkgs/by-name/wo/woeusb-ng/package.nix index 05b8442b856e..d36b80885674 100644 --- a/pkgs/by-name/wo/woeusb-ng/package.nix +++ b/pkgs/by-name/wo/woeusb-ng/package.nix @@ -23,14 +23,20 @@ buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py WoeUSB/*.py miscellaneous/* \ - --replace "/usr/local/" "$out/" \ - --replace "/usr/" "$out/" + substituteInPlace setup.py WoeUSB/utils.py \ + --replace-fail "/usr/local/" "$out/" \ + --replace-fail "/usr/" "$out/" + substituteInPlace miscellaneous/WoeUSB-ng.desktop \ + --replace-fail "/usr/" "$out/" \ ''; nativeBuildInputs = [ wrapGAppsHook3 ]; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; propagatedBuildInputs = [ p7zip @@ -48,11 +54,12 @@ buildPythonApplication rec { # Unable to access the X Display, is $DISPLAY set properly? doCheck = false; - meta = with lib; { + meta = { description = "Tool to create a Windows USB stick installer from a real Windows DVD or image"; homepage = "https://github.com/WoeUSB/WoeUSB-ng"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ stunkymonkey ]; - platforms = platforms.linux; + mainProgram = "woeusb"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ stunkymonkey ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/wo/woeusb/package.nix b/pkgs/by-name/wo/woeusb/package.nix index 8382ad157ec9..34fd54407223 100644 --- a/pkgs/by-name/wo/woeusb/package.nix +++ b/pkgs/by-name/wo/woeusb/package.nix @@ -17,16 +17,17 @@ util-linux, wimlib, wget, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.2.4"; pname = "woeusb"; src = fetchFromGitHub { owner = "WoeUSB"; repo = "WoeUSB"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HB1E7rP/U58dyL3j6YnhF5AOGAcHqmA/ZZ5JNBDibco="; }; @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { # Emulate version smudge filter (see .gitattributes, .gitconfig). for file in sbin/woeusb share/man/man1/woeusb.1; do substituteInPlace "$file" \ - --replace '@@WOEUSB_VERSION@@' '${version}' + --replace-fail '@@WOEUSB_VERSION@@' '${finalAttrs.version}' done ''; @@ -72,20 +73,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; doInstallCheck = true; - postInstallCheck = '' - # woeusb --version checks for missing runtime dependencies. - out_version="$("$out/bin/woeusb" --version)" - [ "$out_version" = '${version}' ] - ''; - - meta = with lib; { + meta = { description = "Create bootable USB disks from Windows ISO images"; homepage = "https://github.com/WoeUSB/WoeUSB"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bjornfor ]; + platforms = lib.platforms.linux; mainProgram = "woeusb"; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index e0ec1c022c5f..c69c1306d0a9 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "xdg-terminal-exec"; rev = "v${finalAttrs.version}"; - hash = "sha256-vFADl/SRxlHxq75TgQxpHX8b9U1SptFHCFoOL9xzZpw="; + hash = "sha256-GMCUu8SpegIxWl5x32InheRJJEF6nmWbi++fkzON0AA="; }; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 531fecde5f45..2f65d0a1343b 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-PYJzPBnMv9vPK62tvLGf7CmMUBNQDlrixn847jbTmsE="; + x86_64-linux = "sha256-/29j6s/b1PjwuG9ttR/2RfoETDb4tTjlMgi+JKhYfko="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "19.0.1"; + version = "19.2"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index d4326ad4b1b0..347bfa33d3b7 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -24,17 +24,18 @@ cinnamon-desktop, yelp-tools, xapp, + xapp-symbolic-icons, }: stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xviewer"; rev = version; - hash = "sha256-WvA8T6r9DtlpOZLMEOILO6/0Am3bhCLM8FnwXvALjS8="; + hash = "sha256-g7ifQ+2FeZzpWfKgtFrWj0YDOB0++s6KGffHhvqGNQE="; }; nativeBuildInputs = [ @@ -77,6 +78,12 @@ stdenv.mkDerivation rec { --replace-fail "g_irepository_require" "gi_repository_require" ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ xapp-symbolic-icons ]}" + ) + ''; + meta = with lib; { description = "Generic image viewer from Linux Mint"; mainProgram = "xviewer"; diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index bf8f15047da0..f6952d58601e 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -1,73 +1,73 @@ { - "version": "3.38.1", - "engineVersion": "b5990e5ccc5e325fd24f0746e7d6689bbebc7c65", + "version": "3.38.3", + "engineVersion": "13e658725ddaa270601426d1485636157e38c34c", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-k1MChPczIgDXBpvtROmgBr6i7Rj6c0gb+MRQ71yMtWo=", - "x86_64-linux": "sha256-k1MChPczIgDXBpvtROmgBr6i7Rj6c0gb+MRQ71yMtWo=" + "aarch64-linux": "sha256-yOImlcy5p6fsPhta9yiY6BY7Ue5Hq7nqb1SNdac9dQ8=", + "x86_64-linux": "sha256-yOImlcy5p6fsPhta9yiY6BY7Ue5Hq7nqb1SNdac9dQ8=" }, "x86_64-linux": { - "aarch64-linux": "sha256-zC3qCWFEzOpy2Qm3rvc9O5ceBfJe5sszj7yYqN5kQxg=", - "x86_64-linux": "sha256-zC3qCWFEzOpy2Qm3rvc9O5ceBfJe5sszj7yYqN5kQxg=" + "aarch64-linux": "sha256-bgzkc+BO4USd/DoINb+1bjyrxSxeFoNTPo5b9jLcvZg=", + "x86_64-linux": "sha256-bgzkc+BO4USd/DoINb+1bjyrxSxeFoNTPo5b9jLcvZg=" } }, - "dartVersion": "3.10.0", + "dartVersion": "3.10.1", "dartHash": { - "x86_64-linux": "sha256-dumMqhDExawOSG1rtn20JjYGznkZ0wnWPRYDCaU4YyI=", - "aarch64-linux": "sha256-sRm3I5WWPQzAY3weL2X3ODy56ma7iNl8CQ3O9t+WWwc=", - "x86_64-darwin": "sha256-JGagsvbSvdoooUnMJfIB2Kq3nMK2ccdtiyv2H7Ud9Ek=", - "aarch64-darwin": "sha256-UxOEe9g1tAURWX29qPvngPRwyvPD6xO/0HsIAT9NUsc=" + "x86_64-linux": "sha256-fZoodwPKw0gh72leKOTib2D2zKEGv3i7oTksvWLIhws=", + "aarch64-linux": "sha256-K0vRWsoO03VVTX8Qx3W8qag7yifrMcSgbzR/WQdMUAs=", + "x86_64-darwin": "sha256-N1Qe1qrQbNr9EBu0wq++WrTUwT3Oy+9YkKWcUEYH7Es=", + "aarch64-darwin": "sha256-GqDucUnS1G/OsawUA1CDv5ofurOcoLNo/OYiajrN0Ns=" }, - "flutterHash": "sha256-dhMbWCyzAFiLSLwjjKHE4nYCPTBwzAGmSiQm9Tedrnw=", + "flutterHash": "sha256-Dz1CIYOqLJ/29KUadvhhQGWkpMg9pBe4jE2FxabSZIc=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-zJrTSNU6tTrWHKO9lAdugbqVI+ag8m5PPTj+EoqlkBw=", - "aarch64-linux": "sha256-uBflNTsWTJ6CfFJcSenNrMYed1so/cJ0e4ZsE4h4RnA=", - "x86_64-darwin": "sha256-zJrTSNU6tTrWHKO9lAdugbqVI+ag8m5PPTj+EoqlkBw=", - "x86_64-linux": "sha256-uBflNTsWTJ6CfFJcSenNrMYed1so/cJ0e4ZsE4h4RnA=" + "aarch64-darwin": "sha256-1qumwznyOLmh+efREN4btWBsMp70FdGwd2uCusLhDHM=", + "aarch64-linux": "sha256-1XBit+BhAobMlyUZWwbV2Y48bjVcIbYqYFUgB7VrcJo=", + "x86_64-darwin": "sha256-1qumwznyOLmh+efREN4btWBsMp70FdGwd2uCusLhDHM=", + "x86_64-linux": "sha256-1XBit+BhAobMlyUZWwbV2Y48bjVcIbYqYFUgB7VrcJo=" }, "fuchsia": { - "aarch64-darwin": "sha256-PrRPCCiCwhXAd5cziKaTzEdbeVA+z3pbMYesxyGQSLo=", - "aarch64-linux": "sha256-PrRPCCiCwhXAd5cziKaTzEdbeVA+z3pbMYesxyGQSLo=", - "x86_64-darwin": "sha256-PrRPCCiCwhXAd5cziKaTzEdbeVA+z3pbMYesxyGQSLo=", - "x86_64-linux": "sha256-PrRPCCiCwhXAd5cziKaTzEdbeVA+z3pbMYesxyGQSLo=" + "aarch64-darwin": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", + "aarch64-linux": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", + "x86_64-darwin": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=", + "x86_64-linux": "sha256-eT2qWRw9b3cNmt6HgWiasSZbUYDMya1Di8M5pw7pVpo=" }, "ios": { - "aarch64-darwin": "sha256-g5CstaAdXB+/x/LmRtiUocHE0YIkYxC6huUp7QsQh24=", - "aarch64-linux": "sha256-g5CstaAdXB+/x/LmRtiUocHE0YIkYxC6huUp7QsQh24=", - "x86_64-darwin": "sha256-g5CstaAdXB+/x/LmRtiUocHE0YIkYxC6huUp7QsQh24=", - "x86_64-linux": "sha256-g5CstaAdXB+/x/LmRtiUocHE0YIkYxC6huUp7QsQh24=" + "aarch64-darwin": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", + "aarch64-linux": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", + "x86_64-darwin": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=", + "x86_64-linux": "sha256-y39M7b17JnTGsxIRhikgb9qCwevG0J19c9Lp5eRQRJM=" }, "linux": { - "aarch64-darwin": "sha256-nv7njA18tqECH8yxDNLHUL9ilX52yP/OQaXiGFoRnaA=", - "aarch64-linux": "sha256-nv7njA18tqECH8yxDNLHUL9ilX52yP/OQaXiGFoRnaA=", - "x86_64-darwin": "sha256-wl5xlePB+NSvxrplay90M241tDx0iMNV6Numh8CLU1g=", - "x86_64-linux": "sha256-wl5xlePB+NSvxrplay90M241tDx0iMNV6Numh8CLU1g=" + "aarch64-darwin": "sha256-Y9v+xgILwWDGjCx56JYrlwh7YlIDAdSDXRjrIqbFCYM=", + "aarch64-linux": "sha256-Y9v+xgILwWDGjCx56JYrlwh7YlIDAdSDXRjrIqbFCYM=", + "x86_64-darwin": "sha256-O7aX2zSR2qXLnZ8FV7K9BNbSQ9Xj346f4hJVn6WOcJ8=", + "x86_64-linux": "sha256-O7aX2zSR2qXLnZ8FV7K9BNbSQ9Xj346f4hJVn6WOcJ8=" }, "macos": { - "aarch64-darwin": "sha256-i+M/VWJ0mRbKFVElRwmKDBy5ShNLrV1DwY9WYSyOfV0=", - "aarch64-linux": "sha256-i+M/VWJ0mRbKFVElRwmKDBy5ShNLrV1DwY9WYSyOfV0=", - "x86_64-darwin": "sha256-i+M/VWJ0mRbKFVElRwmKDBy5ShNLrV1DwY9WYSyOfV0=", - "x86_64-linux": "sha256-i+M/VWJ0mRbKFVElRwmKDBy5ShNLrV1DwY9WYSyOfV0=" + "aarch64-darwin": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", + "aarch64-linux": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", + "x86_64-darwin": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=", + "x86_64-linux": "sha256-lPNfXxMOsbvHv2E/dUYvHDhT0V4E+WVCHXMTQ/EOy9Y=" }, "universal": { - "aarch64-darwin": "sha256-DNTjePDjMRrKNfd/KgkrSIPTVrsT+FBQMhu1Kwga/w4=", - "aarch64-linux": "sha256-i0cFdVr2Ioq3tX+DrIOpsG0CSbzI2Dk3n4ZYFSJoTlI=", - "x86_64-darwin": "sha256-bwQ3/AdLITsif8xFGv18M7PNe7tx/f9Kmqlfc12K09A=", - "x86_64-linux": "sha256-Alkgkrpk4hYUGJAceG9C7BEyy/U184JUIcXo7Gnv4+4=" + "aarch64-darwin": "sha256-KfFCJuJTvXOdQYYx5XgbxRuq712Lea3AqHO8jpoLGac=", + "aarch64-linux": "sha256-hrQ5qX/9Ieg5dO0PXdB3xwpCIrABhAjw6GXnbWMFuXQ=", + "x86_64-darwin": "sha256-Tr5HKxsHs3AenyAWXsMYGPL4c5XARmvAXLoWBE+eZX4=", + "x86_64-linux": "sha256-clltEas0V8MmbU1VeRLKE5g/jDaHgqk+qiYq35Yhlow=" }, "web": { - "aarch64-darwin": "sha256-MJlP4ZW37fwfmpR1TZVS9hXP/yrcjKorELHAS/CWu+Q=", - "aarch64-linux": "sha256-MJlP4ZW37fwfmpR1TZVS9hXP/yrcjKorELHAS/CWu+Q=", - "x86_64-darwin": "sha256-MJlP4ZW37fwfmpR1TZVS9hXP/yrcjKorELHAS/CWu+Q=", - "x86_64-linux": "sha256-MJlP4ZW37fwfmpR1TZVS9hXP/yrcjKorELHAS/CWu+Q=" + "aarch64-darwin": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", + "aarch64-linux": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", + "x86_64-darwin": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=", + "x86_64-linux": "sha256-QQZ4OMiqdB+8uCDQrL4Y6crlUX4XNVy73WeXE7EWDes=" }, "windows": { - "x86_64-darwin": "sha256-CmWnfdsLUoEzAJEBRF4kqi/MDhhvEh4er+bmFwxRAw4=", - "x86_64-linux": "sha256-CmWnfdsLUoEzAJEBRF4kqi/MDhhvEh4er+bmFwxRAw4=" + "x86_64-darwin": "sha256-g4zesG+9KO7LiYVSpkA2Wc/+cGR3MGHTJ0cIHwL8DaY=", + "x86_64-linux": "sha256-g4zesG+9KO7LiYVSpkA2Wc/+cGR3MGHTJ0cIHwL8DaY=" } }, "pubspecLock": { diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 257e6d8080a6..739dfbad4f04 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; tag = "v${finalAttrs.version}"; - hash = "sha256-6jEPO8pM5EDVFgeq8hSpJ0pWn2/Iph4Xcs2hs41kxAI="; + hash = "sha256-lHpoYGrL7HHOLcYdMKsAPhh7g0hLVsgkRxk1fsmvAzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 40cc38c2e852..80af6d45131d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -86,7 +86,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.50.1"; + version = "2.50.2"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-M+kS7m4820uYA3FfUGhq+Fpgr0fxz3KmrMai2xuz2f4="; + hash = "sha256-Gath8tROYs1ENnOUPS1TQbhNCEBfZ6fDe3p3rTVQ+IA="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -118,6 +118,12 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) + + # Remove the CustomToJSObject flag to avoid a link error due to an undefined toJS() symbol + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/730bffd856d2a1e56dd3bd2a0702282f19c5242a.patch"; + hash = "sha256-QRgYzr1Flk9BOV74/H7/38sRwc44BFFBhnX+xODgYX4="; + }) ]; nativeBuildInputs = [ @@ -265,11 +271,19 @@ clangStdenv.mkDerivation (finalAttrs: { mainProgram = "WebKitWebDriver"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; - pkgConfigModules = [ - "javascriptcoregtk-${abiVersion}" - "webkit2gtk-${abiVersion}" - "webkit2gtk-web-extension-${abiVersion}" - ]; + pkgConfigModules = + if lib.versionAtLeast abiVersion "6.0" then + [ + "javascriptcoregtk-${abiVersion}" + "webkitgtk-${abiVersion}" + "webkitgtk-web-process-extension-${abiVersion}" + ] + else + [ + "javascriptcoregtk-${abiVersion}" + "webkit2gtk-${abiVersion}" + "webkit2gtk-web-extension-${abiVersion}" + ]; platforms = platforms.linux ++ platforms.darwin; teams = [ teams.gnome ]; broken = clangStdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/aioice/default.nix b/pkgs/development/python-modules/aioice/default.nix new file mode 100644 index 000000000000..da27c4b35d3d --- /dev/null +++ b/pkgs/development/python-modules/aioice/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + setuptools, + dnspython, + ifaddr, + fetchFromGitHub, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "aioice"; + version = "0.10.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aiortc"; + repo = "aioice"; + tag = version; + hash = "sha256-KFYPzGPm+d1QrFAW9OhTDxroV/MnFusmfy5qcYCfDiM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + dnspython + ifaddr + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # Network tests failing + "tests/test_ice.py" + "tests/test_mdns.py" + "tests/test_turn.py" + "tests/test_ice_trickle.py" + ]; + doCheck = true; + pythonImportsCheck = [ + "aioice" + ]; + + meta = { + description = "Asyncio-based Interactive Connectivity Establishment (RFC 5245)"; + homepage = "https://github.com/aiortc/aioice"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ gesperon ]; + }; +} diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 1565f4814b6b..58ce082301dc 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -3,7 +3,6 @@ aiomisc-pytest, buildPythonPackage, fetchFromGitHub, - pythonOlder, pytestCheckHook, pamqp, yarl, @@ -12,25 +11,21 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.8.1"; + version = "6.9.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "mosquito"; repo = "aiormq"; tag = version; - hash = "sha256-3+PoDB5Owy8BWBUisX0i1mV8rqs5K9pBFQwup8vKxlg="; + hash = "sha256-ApwL3okhpc3Dtq4bfWCCnoikyRx+4zPI9XtJ+qPKQdg="; }; - nativeBuildInputs = [ - poetry-core - ]; - pythonRelaxDeps = [ "pamqp" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ pamqp yarl ]; diff --git a/pkgs/development/python-modules/aiortc/default.nix b/pkgs/development/python-modules/aiortc/default.nix new file mode 100644 index 000000000000..c1111963e9f0 --- /dev/null +++ b/pkgs/development/python-modules/aiortc/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + setuptools, + aioice, + av, + cffi, + cryptography, + google-crc32c, + pyee, + pylibsrtp, + pyopenssl, + libopus, + libvpx, + ifaddr, + dnspython, + fetchFromGitHub, + pytestCheckHook, + numpy, +}: + +buildPythonPackage rec { + pname = "aiortc"; + version = "1.14.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aiortc"; + repo = "aiortc"; + tag = version; + hash = "sha256-ZgxSaiKkJrA5XvUT1zq8kwqB8mOvn46vLWXHyJSsHbM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aioice + av + cffi + cryptography + google-crc32c + pyee + pylibsrtp + pyopenssl + libopus + libvpx + ifaddr + dnspython + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + disabledTestPaths = [ + "tests/test_ortc.py" # hangs on: aiortc.rtcicetransport:rtcicetransport.py:365 RTCIceTransport(controlled) - new -> checking + "tests/test_rtcicetransport.py" # hangs on: aiortc.rtcicetransport:rtcicetransport.py:365 RTCIceTransport(controlled) - new -> checking + "tests/test_rtcpeerconnection.py" # fails + "tests/test_contrib_signaling.py" # fails on darwin + ]; + doCheck = true; + pythonImportsCheck = [ + "aiortc" + ]; + + meta = { + description = "WebRTC and ORTC implementation for Python using asyncio"; + homepage = "https://github.com/aiortc/aiortc"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ gesperon ]; + }; +} diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 8aad4cf469d3..5e5247c3fa91 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -80,7 +80,7 @@ }: let - version = "1.4.28"; + version = "1.4.29"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -130,7 +130,7 @@ let owner = "bentoml"; repo = "BentoML"; tag = "v${version}"; - hash = "sha256-9hxAsTy3e9BDWhJCB5N2RaEFIO0Lc6FK2XKgJC78VUg="; + hash = "sha256-humzefKjnFpbWp9QVcUGPD0+3l2bOyFA35reZLtwFt4="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix index ff03a97b7c4e..70a99ec60f7e 100644 --- a/pkgs/development/python-modules/cemm/default.nix +++ b/pkgs/development/python-modules/cemm/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.5.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-cemm"; @@ -34,6 +31,12 @@ buildPythonPackage rec { url = "https://github.com/klaasnicolaas/python-cemm/commit/1e373dac078f18563264e6733baf6a93962cac4b.patch"; hash = "sha256-DVNn4BZwi8yNpKFmzt7YSYhzzB4vaAyrd/My8TtYzj0="; }) + # https://github.com/klaasnicolaas/python-cemm/pull/568 + (fetchpatch { + name = "replace-async_timeout.patch"; + url = "https://github.com/klaasnicolaas/python-cemm/commit/a818e7ccf196cd5cd4c3e6bf503fb932993281ca.patch"; + hash = "sha256-MwPxK+TRZVvf0sS6HS3+CRRY7dDr1qwCCJ+arQ26gWU="; + }) ]; postPatch = '' @@ -62,8 +65,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with CEMM devices"; homepage = "https://github.com/klaasnicolaas/python-cemm"; - changelog = "https://github.com/klaasnicolaas/python-cemm/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/klaasnicolaas/python-cemm/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/django-probes/default.nix b/pkgs/development/python-modules/django-probes/default.nix index e8952bb887d6..a3bcec1ab7ed 100644 --- a/pkgs/development/python-modules/django-probes/default.nix +++ b/pkgs/development/python-modules/django-probes/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "django-probes"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "painless-software"; repo = "django-probes"; rev = version; - hash = "sha256-n3GI7fNxZkR0ZrI843q0EjkSfSK4LpUox09FFpigJY8="; + hash = "sha256-opto5AAUPhEsWbYh7nItUw7qNoUfOFFZ7tw5agWGBSg="; }; build-system = [ diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 1d9287f13da9..3c7f666e64cb 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "entry-points-txt"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "jwodder"; repo = "entry-points-txt"; tag = "v${version}"; - hash = "sha256-hIUXxBJ0XSB4FrNZJdofJ1gTTncILNq9Xh+iAV1CD0s="; + hash = "sha256-8oGK7aIDgXkCLh/d38hWzfF367KhmggG2s820D2r/EA="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix index 396046068540..d307a5723c67 100644 --- a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "langgraph-runtime-inmem"; - version = "0.14.1"; + version = "0.18.0"; pyproject = true; # Not available in any repository src = fetchPypi { pname = "langgraph_runtime_inmem"; inherit version; - hash = "sha256-OIgTFwx0f8W/oRpF12jtaENWcripe1Tr/6Mx0k+nnLw="; + hash = "sha256-BXdcHy3N1XXrhx/m/rGu0hqEbFbG56C9+QakV+AMF74="; }; build-system = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 872ce7fda7bc..4686169c3865 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.7.4"; + version = "2.7.5"; pyproject = true; src = fetchFromGitHub { owner = "meshtastic"; repo = "python"; tag = version; - hash = "sha256-fIr80k++BwA3UFgeS9Fgq6fpOOIcK4jj7bjfjqkc6ug="; + hash = "sha256-Vc8m5qc2vKQ4ZwP/TQWJhottBANqEaSUNFCbCNPmQnI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix index 954c2702b18b..551a2d82db52 100644 --- a/pkgs/development/python-modules/polyfactory/default.nix +++ b/pkgs/development/python-modules/polyfactory/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "polyfactory"; - version = "2.22.4"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "polyfactory"; tag = "v${version}"; - hash = "sha256-yX71aWRubQ4kjYmhNIKLHG+F+oLh6OHN71xfJcmRaT4="; + hash = "sha256-ljHJQY4GpkRpa0+VerS/KwSCXNAlPLj0urNd0F7xx+4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pylibsrtp/default.nix b/pkgs/development/python-modules/pylibsrtp/default.nix new file mode 100644 index 000000000000..ae22699c2b1e --- /dev/null +++ b/pkgs/development/python-modules/pylibsrtp/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cffi, + srtp, + openssl, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pylibsrtp"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aiortc"; + repo = "pylibsrtp"; + tag = version; + hash = "sha256-Q8EyGAJKkq14sqSEMWLB8arKvj/wuALK/XwOZ27F1nQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + cffi + srtp + openssl + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + doCheck = true; + pythonImportsCheck = [ + "pylibsrtp" + ]; + + meta = { + description = "Python bindings for libsrtp"; + homepage = "https://github.com/aiortc/pylibsrtp"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ gesperon ]; + }; +} diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 637fdab9c909..03ce0abeba29 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -25,7 +25,7 @@ let pname = "pynitrokey"; - version = "0.11.1"; + version = "0.11.2"; mainProgram = "nitropy"; in @@ -35,7 +35,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-TUc8ZDQ0MHyEtrsudqGxTXmwNIio4UcNcjwsOtaK0Ww="; + hash = "sha256-x0OWFSp6PrW4wTWNP8mLJpbrrYZ66XKOBi8l1vCsko4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/pysmartapp/default.nix b/pkgs/development/python-modules/pysmartapp/default.nix index 3214c7965e38..1159766d4cf4 100644 --- a/pkgs/development/python-modules/pysmartapp/default.nix +++ b/pkgs/development/python-modules/pysmartapp/default.nix @@ -5,24 +5,24 @@ httpsig, pytest-asyncio, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pysmartapp"; version = "0.3.5"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pysmartapp"; - rev = version; + tag = version; hash = "sha256-RiRGOO5l5hcHllyDDGLtQHr51JOTZhAa/wK8BfMqmAY="; }; - propagatedBuildInputs = [ httpsig ]; + build-system = [ setuptools ]; + + dependencies = [ httpsig ]; nativeCheckInputs = [ pytest-asyncio @@ -31,11 +31,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysmartapp" ]; + disabledTestPaths = [ + # These tests are outdated + "tests/test_smartapp.py" + ]; + meta = with lib; { description = "Python implementation to work with SmartApp lifecycle events"; homepage = "https://github.com/andrewsayre/pysmartapp"; - changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index fb674db40302..b5322330d8e3 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -16,7 +16,6 @@ pytest-socket, pytest-xdist, pytestCheckHook, - pythonOlder, rich, voluptuous, }: @@ -26,8 +25,6 @@ buildPythonPackage rec { version = "0.10.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "python-kasa"; repo = "python-kasa"; @@ -70,6 +67,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Skip the examples tests "tests/test_readme_examples.py" + # Failing on hydra + "tests/test_cli.py" ]; pythonImportsCheck = [ "kasa" ]; @@ -77,7 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; homepage = "https://python-kasa.readthedocs.io/"; - changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/python-kasa/python-kasa/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; mainProgram = "kasa"; diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix index 1e344f595347..9ab86a0f91f3 100644 --- a/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/pkgs/development/python-modules/python-zaqarclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-zaqarclient"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-zaqarclient"; tag = version; - hash = "sha256-JzZc2g1L7Z26EcAIj5TIkle4WPut9YH6+wDUo4nYjyw="; + hash = "sha256-RjR1qriPp0zLzT+51y2KV/q+/zAF7/HRExuC81enF7A="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index ab79f4367282..a3177cf243d1 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.13.3"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = "scrapy"; tag = version; - hash = "sha256-M+Lko0O0xsEPHLghvIGHxIv22XBXaZsujJ2+bjBzGZ4="; + hash = "sha256-ZWiJmve1EhtwP9xo39N4f24g0KQMTPKJ43sDSfzi6r8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix index 219e7dbfb29e..e55831c7112a 100644 --- a/pkgs/development/python-modules/symbolic/default.nix +++ b/pkgs/development/python-modules/symbolic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "symbolic"; - version = "12.16.3"; + version = "12.17.0"; pyproject = true; src = fetchFromGitHub { @@ -23,12 +23,12 @@ buildPythonPackage rec { tag = version; # the `py` directory is not included in the tarball, so we fetch the source via git instead forceFetchGit = true; - hash = "sha256-Qs457hAMwuCvLFZ9XMjJYv6SZ/Btietq6brJghr3XEs="; + hash = "sha256-+V7Hel+03ktmf0IHcllBDyD46yQEyrcfKV9iuIHF7a4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-6nlmKrIukuOzKCEOVcHBemVUyTjxcSsiXjq5OGF2WjQ="; + hash = "sha256-eLW+vCdhd4A7SU84Z9BO+sbFryMDSOUSewpqNw9d9Yc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch b/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch index e7a4bcd45761..fdcd53e8beee 100644 --- a/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch +++ b/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch @@ -1,19 +1,10 @@ -From 10b7e8330bdba319a4162cceb8e5dd4280215b04 Mon Sep 17 00:00:00 2001 -From: SomeoneSerge -Date: Wed, 31 Jul 2024 12:06:15 +0000 -Subject: [PATCH 2/2] setup.py: nix-support (respect cmakeFlags) - ---- - setup.py | 10 ++++++++++ - 1 file changed, 10 insertions(+) - diff --git a/setup.py b/setup.py -index 01e006f9..14762146 100644 +index e9b36e2a2..bc9e2f1e3 100644 --- a/setup.py +++ b/setup.py -@@ -15,6 +15,15 @@ from setuptools import Extension, find_packages, setup - from setuptools.command.build_ext import build_ext - from torch.utils.cpp_extension import CUDA_HOME +@@ -20,6 +20,15 @@ from setuptools.command.build_ext import build_ext + from setuptools_scm import get_version + from torch.utils.cpp_extension import CUDA_HOME, ROCM_HOME +import os +import json @@ -27,14 +18,11 @@ index 01e006f9..14762146 100644 def load_module_from_path(module_name, path): spec = importlib.util.spec_from_file_location(module_name, path) -@@ -159,6 +168,7 @@ class cmake_build_ext(build_ext): - '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={}'.format(outdir), - '-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY={}'.format(self.build_temp), - '-DVLLM_TARGET_DEVICE={}'.format(VLLM_TARGET_DEVICE), +@@ -151,6 +160,7 @@ class cmake_build_ext(build_ext): + cmake_args = [ + "-DCMAKE_BUILD_TYPE={}".format(cfg), + "-DVLLM_TARGET_DEVICE={}".format(VLLM_TARGET_DEVICE), + *NIX_ATTRS["cmakeFlags"], ] verbose = envs.VERBOSE --- -2.45.1 - diff --git a/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch b/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch index 59267a8f0548..b7ca770d45d6 100644 --- a/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch +++ b/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch @@ -1,12 +1,13 @@ diff --git a/vllm/model_executor/models/registry.py b/vllm/model_executor/models/registry.py -index 81623def..2a6e2c92 100644 +index a2de597c8..4c2410209 100644 --- a/vllm/model_executor/models/registry.py +++ b/vllm/model_executor/models/registry.py -@@ -521,6 +521,7 @@ def _run_in_subprocess(fn: Callable[[], _T]) -> _T: +@@ -1121,7 +1121,7 @@ def _run_in_subprocess(fn: Callable[[], _T]) -> _T: + # cannot use `sys.executable __file__` here because the script # contains relative imports - returned = subprocess.run(_SUBPROCESS_COMMAND, - input=input_bytes, -+ env={'PYTHONPATH': ':'.join(sys.path)}, - capture_output=True) + returned = subprocess.run( +- _SUBPROCESS_COMMAND, input=input_bytes, capture_output=True ++ _SUBPROCESS_COMMAND, input=input_bytes, capture_output=True, env={'PYTHONPATH': ':'.join(sys.path)}, + ) # check if the subprocess is successful diff --git a/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch index 4314aff33fb9..de5c9e8f0660 100644 --- a/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch +++ b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch @@ -1,8 +1,8 @@ diff --git a/requirements/cpu.txt b/requirements/cpu.txt -index 2db6d87ee..37f816170 100644 +index d11787df4..71575d707 100644 --- a/requirements/cpu.txt +++ b/requirements/cpu.txt -@@ -21,9 +21,6 @@ torchvision; platform_machine != "ppc64le" and platform_machine != "s390x" +@@ -20,9 +20,6 @@ torchvision; platform_machine != "ppc64le" and platform_machine != "s390x" torchvision==0.23.0; platform_machine == "ppc64le" datasets # for benchmark scripts diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index b8b2e7f59d3b..fb030ed2665b 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -34,6 +34,7 @@ uvicorn, pydantic, aioprometheus, + anthropic, nvidia-ml-py, openai, pyzmq, @@ -53,6 +54,7 @@ compressed-tensors, mistral-common, msgspec, + model-hosting-container-standards, numactl, tokenizers, oneDNN, @@ -98,10 +100,11 @@ let # see CMakeLists.txt, grepping for CUTLASS_REVISION # https://github.com/vllm-project/vllm/blob/v${version}/CMakeLists.txt cutlass = fetchFromGitHub { + name = "cutlass-source"; owner = "NVIDIA"; repo = "cutlass"; - tag = "v4.0.0"; - hash = "sha256-HJY+Go1viPkSVZPEs/NyMtYJzas4mMLiIZF3kNX+WgA="; + tag = "v4.2.1"; + hash = "sha256-iP560D5Vwuj6wX1otJhwbvqe/X4mYVeKTpK533Wr5gY="; }; # FlashMLA's Blackwell (SM100) kernels were developed against CUTLASS v3.9.0 @@ -126,10 +129,11 @@ let # grep for GIT_TAG in the following file # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/flashmla.cmake src = fetchFromGitHub { + name = "FlashMLA-source"; owner = "vllm-project"; repo = "FlashMLA"; - rev = "5f65b85703c7ed75fda01e06495077caad207c3f"; - hash = "sha256-DO9EFNSoAgyfRRc095v1UjT+Zdzk4cFY0+n28FVEwI0="; + rev = "46d64a8ebef03fa50b4ae74937276a5c940e3f95"; + hash = "sha256-jtMzWB5hKz8mJGsdK6q4YpQbGp9IrQxbwmB3a64DIl0="; }; dontConfigure = true; @@ -145,6 +149,16 @@ let ''; }; + # grep for GIT_TAG in the following file + # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/qutlass.cmake + qutlass = fetchFromGitHub { + name = "qutlass-source"; + owner = "IST-DASLab"; + repo = "qutlass"; + rev = "830d2c4537c7396e14a02a46fbddd18b5d107c65"; + hash = "sha256-aG4qd0vlwP+8gudfvHwhtXCFmBOJKQQTvcwahpEqC84="; + }; + vllm-flash-attn' = lib.defaultTo (stdenv.mkDerivation { pname = "vllm-flash-attn"; # https://github.com/vllm-project/flash-attention/blob/${src.rev}/vllm_flash_attn/__init__.py @@ -153,10 +167,11 @@ let # grep for GIT_TAG in the following file # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/vllm_flash_attn.cmake src = fetchFromGitHub { + name = "flash-attention-source"; owner = "vllm-project"; repo = "flash-attention"; - rev = "ee4d25bd84e0cbc7e0b9b9685085fd5db2dcb62a"; - hash = "sha256-2r0Habd/kBpvM4/aQFIYyj+uQAa3M9gjk3DcBZHFNfA="; + rev = "58e0626a692f09241182582659e3bf8f16472659"; + hash = "sha256-ewdZd7LuBKBV0y3AaGRWISJzjg6cu59D2OtgqoDjrbM="; }; patches = [ @@ -284,7 +299,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.11.0"; + version = "0.11.2"; pyproject = true; stdenv = torch.stdenv; @@ -293,38 +308,31 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${version}"; - hash = "sha256-47TPvvPQvVbh6Gm2yvi+xhWZ8tSma91rp9hp/SBrEY8="; + hash = "sha256-DoSlkFmR3KKEtfSfdRB++0CZeeXgxmM3zZjONlxbe8U="; }; patches = [ ./0002-setup.py-nix-support-respect-cmakeFlags.patch ./0003-propagate-pythonpath.patch ./0005-drop-intel-reqs.patch - # TODO: Remove the below patches when included in vLLM release - (fetchpatch { - url = "https://github.com/vllm-project/vllm/commit/9705fba7b727a3b9c275b012258608531e2223d1.patch"; - hash = "sha256-DxRGLiwkegMlMjqFmFc0igpaVv06/Y2WjL+ISoIOET4="; - }) - # patch above is previous commit needed to apply patch below - # oneDNN / CPU fix from https://github.com/vllm-project/vllm/pull/26401 - (fetchpatch { - url = "https://github.com/vllm-project/vllm/commit/d7be1f2a480bdc62a6a1ec0126a401e3d42985fe.patch"; - hash = "sha256-Zi1k5wiOPjsbWHFKpcLq9Ns43wIP37Mbvesi5K80zaQ="; - }) ]; postPatch = '' # Remove vendored pynvml entirely rm vllm/third_party/pynvml.py substituteInPlace tests/utils.py \ - --replace-fail "from vllm.third_party.pynvml import" "from pynvml import" - substituteInPlace vllm/utils/__init__.py \ - --replace-fail "import vllm.third_party.pynvml" "import pynvml" + --replace-fail \ + "from vllm.third_party.pynvml import" \ + "from pynvml import" + substituteInPlace vllm/utils/import_utils.py \ + --replace-fail \ + "import vllm.third_party.pynvml as pynvml" \ + "import pynvml" # pythonRelaxDeps does not cover build-system substituteInPlace pyproject.toml \ --replace-fail "torch ==" "torch >=" \ - --replace-fail "setuptools>=77.0.3,<80.0.0" "setuptools" + --replace-fail "setuptools>=77.0.3,<81.0.0" "setuptools" # Ignore the python version check because it hard-codes minor versions and # lags behind `ray`'s python interpreter support @@ -393,6 +401,7 @@ buildPythonPackage rec { dependencies = [ aioprometheus + anthropic blake3 cachetools cbor2 @@ -424,6 +433,7 @@ buildPythonPackage rec { partial-json-parser compressed-tensors mistral-common + model-hosting-container-standards torch torchaudio torchvision @@ -460,6 +470,7 @@ buildPythonPackage rec { (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}") (lib.cmakeFeature "FLASH_MLA_SRC_DIR" "${lib.getDev flashmla}") (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn'}") + (lib.cmakeFeature "QUTLASS_SRC_DIR" "${lib.getDev qutlass}") (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}") (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.flags.cmakeCudaArchitecturesString}") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin { diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index d497921be410..1cce2d92b9ae 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; src = fetchFromGitHub { owner = "robinostlund"; repo = "volkswagencarnet"; tag = "v${version}"; - hash = "sha256-NpfkhFGxd3VjLjQ8pPpamYgwc5zqWt5CojONe4L1s4s="; + hash = "sha256-OMbPLY6TUMCuvhwj1tGSNwruUpB7n5Tyjp7AhsD1948="; }; postPatch = '' @@ -47,6 +47,7 @@ buildPythonPackage rec { ]; meta = { + changelog = "https://github.com/robinostlund/volkswagencarnet/releases/tag/${src.tag}"; description = "Python library for volkswagen carnet"; homepage = "https://github.com/robinostlund/volkswagencarnet"; license = lib.licenses.gpl3Only; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 6719de2e3468..b3850d086880 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -23,26 +23,11 @@ patch = ./bridge-stp-helper.patch; }; - # Reverts the buggy commit causing https://bugzilla.kernel.org/show_bug.cgi?id=217802 - dell_xps_regression = { - name = "dell_xps_regression"; - patch = fetchpatch { - name = "Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; - url = "https://raw.githubusercontent.com/openSUSE/kernel-source/1b02b1528a26f4e9b577e215c114d8c5e773ee10/patches.suse/Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; - sha256 = "sha256-RHJdQ4p0msTOVPR+/dYiKuwwEoG9IpIBqT4dc5cJjf8="; - }; - }; - request_key_helper = { name = "request-key-helper"; patch = ./request-key-helper.patch; }; - request_key_helper_updated = { - name = "request-key-helper-updated"; - patch = ./request-key-helper-updated.patch; - }; - hardened = let mkPatch = @@ -65,13 +50,6 @@ in lib.mapAttrs mkPatch patches; - # Adapted for Linux 5.4 from: - # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45 - rtl8761b_support = { - name = "rtl8761b-support"; - patch = ./rtl8761b-support.patch; - }; - export-rt-sched-migrate = { name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; diff --git a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch deleted file mode 100644 index aabb9e801be4..000000000000 --- a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/security/keys/request_key.c b/security/keys/request_key.c -index 88172c163953..4da74a1eebb2 100644 ---- a/security/keys/request_key.c -+++ b/security/keys/request_key.c -@@ -161,7 +161,7 @@ static int call_sbin_request_key(struct key_construction *cons, - - /* set up the argument list */ - i = 0; -- argv[i++] = "/sbin/request-key"; -+ argv[i++] = "/run/current-system/sw/bin/request-key"; - argv[i++] = (char *) op; - argv[i++] = key_str; - argv[i++] = uid_str; diff --git a/pkgs/os-specific/linux/kernel/rtl8761b-support.patch b/pkgs/os-specific/linux/kernel/rtl8761b-support.patch deleted file mode 100644 index b6d80d5bc8d3..000000000000 --- a/pkgs/os-specific/linux/kernel/rtl8761b-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c -index 67f4bc21e7c5..3a9afc905f24 100644 ---- a/drivers/bluetooth/btrtl.c -+++ b/drivers/bluetooth/btrtl.c -@@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { - .cfg_name = "rtl_bt/rtl8821c_config" }, - - /* 8761A */ -- { IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0, -+ { IC_INFO(RTL_ROM_LMP_8761A, 0xa), - .config_needed = false, - .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761a_fw.bin", - .cfg_name = "rtl_bt/rtl8761a_config" }, - -+ /* 8761B */ -+ { IC_INFO(RTL_ROM_LMP_8761A, 0xb), -+ .config_needed = false, -+ .has_rom_version = true, -+ .fw_name = "rtl_bt/rtl8761b_fw.bin", -+ .cfg_name = "rtl_bt/rtl8761b_config" }, -+ - /* 8822C with USB interface */ - { IC_INFO(RTL_ROM_LMP_8822B, 0xc), - .config_needed = false, -@@ -251,6 +258,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, - { RTL_ROM_LMP_8723B, 9 }, /* 8723D */ - { RTL_ROM_LMP_8821A, 10 }, /* 8821C */ - { RTL_ROM_LMP_8822B, 13 }, /* 8822C */ -+ { RTL_ROM_LMP_8761A, 14 }, /* 8761B */ - }; - - min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3; diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index d3971cddc9bc..a0ce02cf33dd 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-3wykS2TYjr9hoQSPc1F3m5aDiLW1tzvQfjfjnr4N2Y0="; + hash = "sha256-DhvbPIL/2l0GJIKdHnAGf+ldPslnVeT30FjIYsyeCoA="; }; dependencies = [ volkswagencarnet ]; @@ -30,6 +30,7 @@ buildHomeAssistantComponent rec { doCheck = false; meta = { + changelog = "https://github.com/robinostlund/homeassistant-volkswagencarnet/releases/tag/${src.tag}"; description = "Volkswagen Connect component for Home Assistant"; homepage = "https://github.com/robinostlund/homeassistant-volkswagencarnet"; license = lib.licenses.gpl3Only; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix index 0fbb5c2ca14b..78371f779e90 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "material-you-utilities"; - version = "2.0.23"; + version = "2.0.24"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "material-you-utilities"; tag = version; - hash = "sha256-mB/XNaFddCg8PzubrA2NGVFHRjaH3q3XSmTD4qihRGQ="; + hash = "sha256-BRlw3/ZzRlQj+/sIAU6vwki9E5FVpQycP/iJeZxoMFo="; }; - npmDepsHash = "sha256-ZnbKOQowMWi/aUS6RJr+amrChi/pqC9cXIjsgIqthBE="; + npmDepsHash = "sha256-zeCIjuZGTmaO4kVp75ZVPhw7mNVZbHMjuLZFiqtJ+fE="; postPatch = '' # Remove git dependency from rspack config diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index d34a4590823a..f792ad9b561d 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -67,6 +67,7 @@ assert lib.assertMsg ( removeReferencesTo, xz, yq, + zstd, nixosTests, rustPlatform, # Only used for versions before 2.92. @@ -185,7 +186,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals pastaFod [ passt ] ++ lib.optionals parseToYAML [ yq ] ++ lib.optionals usesCapnp [ capnproto ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linuxMinimal ] + ++ lib.optionals (lib.versionAtLeast version "2.94") [ zstd ]; buildInputs = [ boost diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 7f4fd1a3ee8d..3d402d6fd06e 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -213,18 +213,18 @@ lib.makeExtensible ( }; }; - git = self.makeLixScope { - attrName = "git"; + lix_2_94 = self.makeLixScope { + attrName = "lix_2_94"; lix-args = rec { - version = "2.94.0-pre-20251018_${builtins.substring 0 12 src.rev}"; + version = "2.94.0"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "6e2edbff930dbf5b17a23e23f0b563e1db201f5b"; - hash = "sha256-t2f3YDiRTi6GTHc940lwozaxY7RFE1CW7EeNtVYG+FE="; + rev = version; + hash = "sha256-X6X3NhgLnpkgWUbLs0nLjusNx/el3L1EkVm6OHqY2z8="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -235,7 +235,29 @@ lib.makeExtensible ( }; }; - latest = self.lix_2_93; + git = self.makeLixScope { + attrName = "git"; + + lix-args = rec { + version = "2.95.0-pre-20251121_${builtins.substring 0 12 src.rev}"; + + src = fetchFromGitea { + domain = "git.lix.systems"; + owner = "lix-project"; + repo = "lix"; + rev = "b707403a308030739dfeacc5b0aaaeef8ba3f633"; + hash = "sha256-kas7FT2J86DVJlPH5dNNHM56OgdQQyfCE/dX/EOKDp8="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + name = "lix-${version}"; + inherit src; + hash = "sha256-APm8m6SVEAO17BBCka13u85/87Bj+LePP7Y3zHA3Mpg="; + }; + }; + }; + + latest = self.lix_2_94; stable = self.lix_2_93; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfa5c60f439f..aa73b0623125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14091,8 +14091,10 @@ with pkgs; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs + nix-prefetch-darcs nix-prefetch-git nix-prefetch-hg + nix-prefetch-pijul nix-prefetch-svn nix-prefetch-scripts ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f601251a2e3a..2e47ec76190a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -348,6 +348,8 @@ self: super: with self; { aiohwenergy = callPackage ../development/python-modules/aiohwenergy { }; + aioice = callPackage ../development/python-modules/aioice { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; aioimmich = callPackage ../development/python-modules/aioimmich { }; @@ -458,6 +460,8 @@ self: super: with self; { aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiortc = callPackage ../development/python-modules/aiortc { }; + aiortm = callPackage ../development/python-modules/aiortm { }; aiortsp = callPackage ../development/python-modules/aiortsp { }; @@ -13592,6 +13596,8 @@ self: super: with self; { pylibrespot-java = callPackage ../development/python-modules/pylibrespot-java { }; + pylibsrtp = callPackage ../development/python-modules/pylibsrtp { }; + pylink-square = callPackage ../development/python-modules/pylink-square { }; pylint = callPackage ../development/python-modules/pylint { };