diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8a9bfc5486d1..f2c2c072bf92 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-5BRsYaOgavJzMECFHW25r2itiESZWBPmHskfTnH/uLs="; - x86_64-darwin = "sha256-bAg+THOBUmrMSGiNs/vxJSbIxq4icx4o1SaFAWOJ3D4="; - aarch64-linux = "sha256-pefdxOq/qhKYY6YSM35T+vqGEl3kZc8VqBA5j1IZkEo="; - aarch64-darwin = "sha256-sEID3N+Pe7iXJmGxp8Bo6u2AgBVwhBqziEDRAMeAV4w="; - armv7l-linux = "sha256-BKUYQs3XqgMWDUFLFEzptPxGK3yP1zmDwN1ElYuALEo="; + x86_64-linux = "sha256-6/ECgQbl7r4KI66BApOijIdJJP4nlDEgRE1JEMJcSDk="; + x86_64-darwin = "sha256-t68Wkwo6p/S0hTf8BiR95nHC4qOLVtBkU0u3dco+jEc="; + aarch64-linux = "sha256-KJ74qd0xOQV9EkoIdWGLCr57ZYJ9U0F2zyW6y9zWSY4="; + aarch64-darwin = "sha256-CPPIYDxDiF07SdRaOe2Cp8fl4YvbVPeaVqobo0PZyrY="; + armv7l-linux = "sha256-ob2Xlgvsk6KFo9stlmuGTPPRyXQpBUACuq5q48haGxs="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.100.13210"; + version = "1.100.23258"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 3f7fb5c9ec44..96815b728efd 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.2.6"; + version = "1.2.7"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-BLBC4L3GropYXANTKXwOYwp1my6p0L0fZ4YN9aF4HaA="; + hash = "sha256-IOTlDLHSFH93tgCaF8ZOboIRkGImcT+oDfbmKKjNDlM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Fd1Rw2LeONIJCrvyNKBpTquUKAMLPcaAcWI7N8Ii6Bs="; + cargoHash = "sha256-6Pu7qFOT9fPjtgjNqZ4mF37xNLuCIl1U3a23vGpRs4k="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/by-name/co/collision/package.nix similarity index 84% rename from pkgs/applications/misc/collision/default.nix rename to pkgs/by-name/co/collision/package.nix index 5211a21a9c45..eb2552c1e097 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/by-name/co/collision/package.nix @@ -21,13 +21,13 @@ crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; rev = "v${version}"; - hash = "sha256-c/74LzDM63w5zW8z2T8o4Efvuzj791/zTSKEDN32uak="; + hash = "sha256-ZXGhMicwlkXUw8I6HUNVxY4vCaVixdV76+wYn34Py6Q="; }; postPatch = '' @@ -39,20 +39,23 @@ crystal.buildCrystalPackage rec { copyShardDeps = true; preBuild = '' - cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug - cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/ + cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug && \ + install -Dm755 bin/gi-crystal ../../bin/gi-crystal && cd ../.. ''; # Crystal compiler has a strange issue with OpenSSL. The project will not compile due to # main_module:(.text+0x6f0): undefined reference to `SSL_library_init' # There is an explanation for this https://danilafe.com/blog/crystal_nix_revisited/ # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. - - nativeBuildInputs = [ - wrapGAppsHook4 - pkg-config - gobject-introspection - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = + [ + wrapGAppsHook4 + pkg-config + gobject-introspection + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; buildInputs = [ libadwaita @@ -82,7 +85,7 @@ crystal.buildCrystalPackage rec { passthru = { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) - (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" ./shard.lock) + (_experimental-update-script-combinators.copyAttrOutputToFile "collision.shardLock" "./shard.lock") { command = [ (writeShellScript "update-lock" "cd $1; ${lib.getExe crystal2nix}") @@ -93,7 +96,7 @@ crystal.buildCrystalPackage rec { { command = [ "rm" - ./shard.lock + "./shard.lock" ]; supportedFeatures = [ "silent" ]; } diff --git a/pkgs/applications/misc/collision/shards.nix b/pkgs/by-name/co/collision/shards.nix similarity index 73% rename from pkgs/applications/misc/collision/shards.nix rename to pkgs/by-name/co/collision/shards.nix index 92de6b8655b2..ed6012d41382 100644 --- a/pkgs/applications/misc/collision/shards.nix +++ b/pkgs/by-name/co/collision/shards.nix @@ -1,8 +1,8 @@ { blake3 = { url = "https://github.com/geopjr/blake3.cr.git"; - rev = "v1.3.0"; - sha256 = "0pc3h7b5gfkmxlw708qaqjfzjvv5ig3iwxxainq6pwfhpff4a5wd"; + rev = "v1.4.0"; + sha256 = "1kp3rqddcsjj15syfnfvsx694nmpjzxmgawnf7y7dxdakk3przlw"; }; gettext = { url = "https://github.com/geopjr/gettext.cr.git"; @@ -11,8 +11,8 @@ }; gi-crystal = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.24.0"; - sha256 = "0x356xn35008l573qhyl1sdddc9cc5i3bsa4c7865kgq9521ifyh"; + rev = "v0.25.0"; + sha256 = "0lgs85khg6yzmw7vnkjxygrga1618440hayjc51jmjcfh2lff1k2"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; @@ -25,9 +25,9 @@ sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; }; libadwaita = { - url = "https://github.com/geopjr/libadwaita.cr.git"; - rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446"; - sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3"; + url = "https://github.com/hugopl/libadwaita.cr.git"; + rev = "v0.1.0"; + sha256 = "13iqij1rwqdlsd9gls3gz4i4frlsda3yasdbbmrzpa8d3qm3p8yq"; }; non-blocking-spawn = { url = "https://github.com/geopjr/non-blocking-spawn.git"; diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix deleted file mode 100644 index 2a2d2172d9f4..000000000000 --- a/pkgs/by-name/cr/create-react-app/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, -}: - -buildNpmPackage rec { - pname = "create-react-app"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = "create-react-app"; - rev = "v${version}"; - hash = "sha256-nUvJRxBZ98ogSkbw8ciFYtZRQNFD6pLThoEjeDMcGm0="; - }; - - npmDepsHash = "sha256-diGu53lJi+Fs7pTAQGCXoDtP7YyKZLIN/2Wo+e1Mzc4="; - - env.PUPPETEER_SKIP_DOWNLOAD = true; - - npmWorkspace = "packages/create-react-app"; - - dontNpmBuild = true; - - meta = { - changelog = "https://github.com/facebook/create-react-app/blob/${src.rev}/CHANGELOG.md"; - description = "Create React apps with no build configuration"; - homepage = "https://github.com/facebook/create-react-app"; - license = lib.licenses.mit; - mainProgram = "create-react-app"; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/de/debsigs/package.nix b/pkgs/by-name/de/debsigs/package.nix index ce9cba98f6d0..ec3bc52be75d 100644 --- a/pkgs/by-name/de/debsigs/package.nix +++ b/pkgs/by-name/de/debsigs/package.nix @@ -1,4 +1,5 @@ { + binutils, lib, perlPackages, fetchFromGitLab, @@ -17,6 +18,11 @@ perlPackages.buildPerlPackage rec { sourceRoot = "${src.name}/perl"; + postPatch = '' + substituteInPlace arf.pm \ + --replace-fail /usr/bin/ar ${binutils.bintools}/bin/ar + ''; + meta = { description = "Manipulate the cryptographic signatures stored inside a .deb file"; mainProgram = "debsigs"; diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index de050c54c7b7..6ac61bc3b2f5 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -5,6 +5,7 @@ ninja, gettext, fetchurl, + fetchpatch, pkg-config, gtk4, glib, @@ -44,6 +45,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2ilT5+K3O/dHPAozl5EE15NieVKV6qCio46hiFN9rxM="; }; + patches = [ + # shell: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1818 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/da4437beb7f1fbc9c2fa3d4629b8c826d484835e.patch"; + hash = "sha256-meufd5gnhLcK0dgIXEMDnid9e1R2M1D3jZ9Yoh6YobM="; + }) + + # action-bar-end: Fix startup crash on Pantheon + # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1819 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/d69866854b315123c8832fae58c6de008da20ea0.patch"; + hash = "sha256-GnZQC4rtBYRr+x9mF8pCFDcDOjEJj+27ECdXBNL42kQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix index 4877de55a658..52942fe78fd3 100644 --- a/pkgs/by-name/f2/f2/package.nix +++ b/pkgs/by-name/f2/f2/package.nix @@ -2,6 +2,8 @@ lib, fetchFromGitHub, buildGoModule, + exiftool, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -23,14 +25,18 @@ buildGoModule (finalAttrs: { "-X=github.com/ayoisaiah/f2/v2/app.VersionString=${finalAttrs.version}" ]; - # has no tests - doCheck = false; + nativeCheckInputs = [ exiftool ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Command-line batch renaming tool"; homepage = "https://github.com/ayoisaiah/f2"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ zendo ]; + maintainers = with lib.maintainers; [ + prince213 + zendo + ]; mainProgram = "f2"; }; }) diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix index 52b9f2059022..8f541fca0e75 100644 --- a/pkgs/by-name/fv/fvwm2/package.nix +++ b/pkgs/by-name/fv/fvwm2/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm"; - rev = version; + tag = version; hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; }; @@ -67,6 +67,10 @@ stdenv.mkDerivation rec { "--disable-htmldoc" ]; + # Fix build on GCC 14 (see https://github.com/fvwmorg/fvwm/pull/100) + # Will never be accepted as an upstream patch as FVWM2 is EOL + env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-pointer-types"; + postFixup = '' wrapPythonPrograms ''; diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index dfd283f577de..4b19966974c1 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,9 +1,9 @@ { "invidious": { - "hash": "sha256-JXcj5mh0WEetTt91cA+/pgqxNwyIRF+bISOBoHHVZf0=", - "version": "2.20250504.0", - "date": "2025.05.04", - "commit": "aa7de1ed" + "hash": "sha256-Mm1Hk7L/aFuVrcS+6ikrW8RQZld31vU5Uwecr0HIseQ=", + "version": "2.20250517.0", + "date": "2025.05.17", + "commit": "f07859e1" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index a0e65f253922..8077203db5c7 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-1CQVj2iFywimK9sBJ60u9xH5qm/stEOA0yAHcUSAdY8="; + hash = "sha256-H6vK0ZJarNK9h3T/304SO8HNiZUGdrAA72wA6XPZbPQ="; }; - npmDepsHash = "sha256-iRK+8wyqHmP6vluDVBs3L4IpnZVvVfEfKDit+9YFU4g="; + npmDepsHash = "sha256-puRm56VO711HC/CXCfUfODfy7ZVwEhucjwIikiHCf5E="; dontNpmBuild = true; diff --git a/pkgs/by-name/se/sequential/package.nix b/pkgs/by-name/se/sequential/package.nix new file mode 100644 index 000000000000..680d7f91d6a0 --- /dev/null +++ b/pkgs/by-name/se/sequential/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sequential"; + version = "2.6.0"; + + buildDate = "2024-09-07.14.59.00"; + + src = fetchurl { + url = "https://github.com/chuchusoft/Sequential/releases/download/v${finalAttrs.version}/Sequential.app.${finalAttrs.buildDate}.tar.xz"; + hash = "sha256-tgpzMAHw266UhKo43GIHFCx/SDq/zIJkWz1TPYTeTzI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/Sequential.app + cp -R Sequential.app $out/Applications + + runHook postInstall + ''; + + meta = { + description = "macOS native comic reader and image viewer"; + homepage = "https://github.com/chuchusoft/Sequential"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Enzime ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index 1d49babd2728..c55b3fbb9032 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-4n/GKnuibVsWxGy10XuRx2oN/Ub94TBqGZEeqfXEvgY="; + hash = "sha256-aXFMsY8bxj+NJizeThlebcv8nNvjqF7q+AN6sQ4/5PQ="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 7a2c36e3845b..0d2a148e2cbd 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-l7E5o7JNqfJZzKpyvsjIVd2i9fwLh4Qn8oJ/S5RlFQ8="; + sha256 = "sha256-ymgSe4LKtbJVwmZJOwer1Geb/VgYltp+tSNHkWtaMlg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 3aaed77d8300..4673cf878abe 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -28,9 +28,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.20.2"; + version = "4.20.3"; - sha256 = "sha256-tuINIJ5r1BXAUJxlmLiYe2z3AFGkXqbITJBskSx5D4s="; + sha256 = "sha256-YOh7tuCja9F2VvzX+QqsKHJfebXWbhLqvcraq6PBOGo="; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index d93d392314fb..8e9f227bb6ee 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -74,6 +74,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export SDL_VIDEODRIVER=dummy + ''; + disabledTests = [ # TypeError: Converting from sequence to b2Vec2, expected int/float arguments index 0 diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index c98c3d7cb119..e2a18f356ce8 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -89,6 +89,10 @@ buildPythonPackage rec { "tests/wrappers/test_record_video.py" ]; + preCheck = '' + export SDL_VIDEODRIVER=dummy + ''; + disabledTests = [ # Fails since jax 0.6.0 # Fixed on master https://github.com/Farama-Foundation/Gymnasium/commit/94019feee1a0f945b9569cddf62780f4e1a224a5 diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 8de6a934e53c..95308ed3bab6 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -23,6 +23,8 @@ # tests blockbuster, + duckdb, + duckdb-engine, httpx, langchain-tests, lark, @@ -38,14 +40,14 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.3.22"; + version = "0.3.24"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; - repo = "langchain"; - tag = "langchain-community==${version}"; - hash = "sha256-fotu3vUCWnAVyjFjsIUjk1If81yQ3/YLj26PksmnvGE="; + repo = "langchain-community"; + tag = "libs/community/v${version}"; + hash = "sha256-4Rcczuz7tCb10HPvO15n48DBKjVBLXNPdRfD4lRKNGk="; }; sourceRoot = "${src.name}/libs/community"; @@ -62,6 +64,10 @@ buildPythonPackage rec { "tenacity" ]; + pythonRemoveDeps = [ + "bs4" + ]; + dependencies = [ aiohttp dataclasses-json @@ -76,10 +82,13 @@ buildPythonPackage rec { sqlalchemy tenacity ]; + pythonImportsCheck = [ "langchain_community" ]; nativeCheckInputs = [ blockbuster + duckdb + duckdb-engine httpx langchain-tests lark @@ -93,29 +102,18 @@ buildPythonPackage rec { toml ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + pytestFlagsArray = [ + "tests/unit_tests" + ]; __darwinAllowLocalNetworking = true; disabledTests = [ - # Test require network access - "test_ovhcloud_embed_documents" - "test_yandex" - "test_table_info" - "test_sql_database_run" - # pydantic.errors.PydanticUserError: `SQLDatabaseToolkit` is not fully defined; you should define `BaseCache`, then call `SQLDatabaseToolkit.model_rebuild()`. - "test_create_sql_agent" - # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`. - "test_proper_inputs" - # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`. - "test_variable_key_naming" - # Tests against magic values in dict - "test_serializable_mapping" + # requires bs4, aka BeautifulSoup + "test_importable_all" ]; disabledTestPaths = [ - # ValueError: Received unsupported arguments {'strict': None} - "tests/unit_tests/chat_models/test_cloudflare_workersai.py" # depends on Pydantic v1 notations, will not load "tests/unit_tests/document_loaders/test_gitbook.py" ]; @@ -123,14 +121,14 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "langchain-community==([0-9.]+)" + "libs/community/v([0-9.]+)" ]; }; meta = { - changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-community==${version}"; description = "Community contributed LangChain integrations"; - homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; + homepage = "https://github.com/langchain-ai/langchain-community"; + changelog = "https://github.com/langchain-ai/langchain-community/releases/tag/libs%2Fcommunity%2fv${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 84d087805874..89d1bdcc2089 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Official CLI for LangGraph API"; - homepage = "https://github.com/langchain-ai/langgraph/libs/cli"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/cli"; changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; mainProgram = "langgraph"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix index 995c7f552494..5e41724eebb7 100644 --- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -95,7 +95,7 @@ buildPythonPackage rec { meta = { description = "Prebuilt agents add-on for Langgraph. Should always be bundled with langgraph"; - homepage = "https://github.com/langchain-ai/langgraph"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/prebuilt"; changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 3df97d3af92d..386fd25c22c8 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -18,10 +18,10 @@ libpng, libX11, portmidi, - SDL2_classic, - SDL2_classic_image, - SDL2_classic_mixer, - SDL2_classic_ttf, + SDL2, + SDL2_image, + SDL2_mixer, + SDL2_ttf, numpy, pygame-gui, @@ -59,6 +59,8 @@ buildPythonPackage rec { ]) buildInputs ); }) + # https://github.com/libsdl-org/sdl2-compat/issues/476 + ./skip-rle-tests.patch ]; postPatch = @@ -98,10 +100,10 @@ buildPythonPackage rec { libjpeg libpng portmidi - SDL2_classic - (SDL2_classic_image.override { enableSTB = false; }) - SDL2_classic_mixer - SDL2_classic_ttf + SDL2 + (SDL2_image.override { enableSTB = false; }) + SDL2_mixer + SDL2_ttf ]; nativeCheckInputs = [ @@ -114,7 +116,7 @@ buildPythonPackage rec { env = { - SDL_CONFIG = lib.getExe' (lib.getDev SDL2_classic) "sdl2-config"; + SDL_CONFIG = lib.getExe' (lib.getDev SDL2) "sdl2-config"; } // lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch new file mode 100644 index 000000000000..d0792e0e0e92 --- /dev/null +++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch @@ -0,0 +1,20 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 4e4b5d4..ffc7ffb 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase): + self.assertTrue(s1.get_flags() & pygame.RLEACCELOK) + self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK) + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") + def test_solarwolf_rle_usage(self): + """Test for error/crash when calling set_colorkey() followed + by convert twice in succession. Code originally taken +@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") + def test_solarwolf_rle_usage_2(self): + """Test for RLE status after setting alpha""" + diff --git a/pkgs/development/python-modules/pygame/0001-Use-SDL_HasSurfaceRLE-when-available.patch b/pkgs/development/python-modules/pygame/0001-Use-SDL_HasSurfaceRLE-when-available.patch new file mode 100644 index 000000000000..d37d5ade5dff --- /dev/null +++ b/pkgs/development/python-modules/pygame/0001-Use-SDL_HasSurfaceRLE-when-available.patch @@ -0,0 +1,54 @@ +From fb4a3d427898ed0a1fcf1e6795584a5a66a9cb3b Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Thu, 15 May 2025 18:24:56 +0200 +Subject: [PATCH 1/2] Use SDL_HasSurfaceRLE when available + +The hack does not work with sdl2-compat due to a different surface +internals. + +Signed-off-by: Marcin Serwin +--- + src_c/surface.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src_c/surface.c b/src_c/surface.c +index 958ce43f..ee9991fb 100644 +--- a/src_c/surface.c ++++ b/src_c/surface.c +@@ -63,6 +63,7 @@ typedef struct pg_bufferinternal_s { + Py_ssize_t mem[6]; /* Enough memory for dim 3 shape and strides */ + } pg_bufferinternal; + ++#if !SDL_VERSION_ATLEAST(2, 0, 14) + /* copy of SDL Blit mapping definitions to enable pointer casting hack + for checking state of the SDL_COPY_RLE_DESIRED flag */ + #define PGS_COPY_RLE_DESIRED 0x00001000 +@@ -97,6 +98,9 @@ typedef struct pg_BlitMap { + Uint32 src_palette_version; + } pg_BlitMap; + /* end PGS_COPY_RLE_DESIRED hack definitions */ ++#else ++#define pg_HasSurfaceRLE SDL_HasSurfaceRLE ++#endif + + int + pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj, +@@ -2212,6 +2216,7 @@ surf_scroll(PyObject *self, PyObject *args, PyObject *keywds) + Py_RETURN_NONE; + } + ++#if !SDL_VERSION_ATLEAST(2, 0, 14) + int + pg_HasSurfaceRLE(SDL_Surface *surface) + { +@@ -2230,6 +2235,7 @@ pg_HasSurfaceRLE(SDL_Surface *surface) + + return SDL_TRUE; + } ++#endif + + static int + _PgSurface_SrcAlpha(SDL_Surface *surf) +-- +2.49.0 + diff --git a/pkgs/development/python-modules/pygame/0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch b/pkgs/development/python-modules/pygame/0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch new file mode 100644 index 000000000000..8e70cd5c6fdc --- /dev/null +++ b/pkgs/development/python-modules/pygame/0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch @@ -0,0 +1,29 @@ +From ca46aa2bea7a67fbac55d7228026623def0aca9d Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Fri, 16 May 2025 17:39:24 +0200 +Subject: [PATCH 2/2] Don't assume that touch devices support get_num_fingers + +Signed-off-by: Marcin Serwin +--- + test/touch_test.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/touch_test.py b/test/touch_test.py +index 259a2c70..e8e58161 100644 +--- a/test/touch_test.py ++++ b/test/touch_test.py +@@ -30,7 +30,10 @@ class TouchTest(unittest.TestCase): + + @unittest.skipIf(not has_touchdevice, "no touch devices found") + def test_num_fingers(self): +- touch.get_num_fingers(touch.get_device(0)) ++ # sdl2-compat reports pens/styli as touch devices but they don't ++ # support get_num_fingers, they can be distinguished by negative id ++ if touch.get_device(0) >= 0: ++ touch.get_num_fingers(touch.get_device(0)) + + def test_num_fingers__invalid(self): + self.assertRaises(TypeError, touch.get_num_fingers, "test") +-- +2.49.0 + diff --git a/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch b/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch new file mode 100644 index 000000000000..f8c0a98402b7 --- /dev/null +++ b/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch @@ -0,0 +1,14 @@ +diff --git a/src_c/surface.c b/src_c/surface.c +index ee9991fb..32c007bd 100644 +--- a/src_c/surface.c ++++ b/src_c/surface.c +@@ -733,7 +733,8 @@ _raise_create_surface_error(void) + { + const char *msg = SDL_GetError(); + +- if (strcmp(msg, "Unknown pixel format") == 0) ++ if (strcmp(msg, "Unknown pixel format") == 0 || ++ strcmp(msg, "Parameter 'format' is invalid") == 0) + return RAISE(PyExc_ValueError, "Invalid mask values"); + return RAISE(pgExc_SDLError, msg); + } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ef53e32126bc..62e4bcba5dd0 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -12,7 +12,7 @@ setuptools, # nativeBuildInputs - SDL2_classic, + SDL2, pkg-config, # buildInputs @@ -21,9 +21,9 @@ libpng, libX11, portmidi, - SDL2_classic_image, - SDL2_classic_mixer, - SDL2_classic_ttf, + SDL2_image, + SDL2_mixer, + SDL2_ttf, }: buildPythonPackage rec { @@ -62,6 +62,14 @@ buildPythonPackage rec { # mixer queue test returns busy queue when it shouldn't ./skip-mixer-test.patch + # https://github.com/libsdl-org/sdl2-compat/issues/476 + ./skip-rle-tests.patch + # https://github.com/libsdl-org/sdl2-compat/issues/489 + ./adapt-to-sdl3-format-message.patch + + # https://github.com/pygame/pygame/pull/4497 + ./0001-Use-SDL_HasSurfaceRLE-when-available.patch + ./0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch ]; postPatch = '' @@ -76,7 +84,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - SDL2_classic + SDL2 pkg-config ]; @@ -86,10 +94,10 @@ buildPythonPackage rec { libpng libX11 portmidi - SDL2_classic - (SDL2_classic_image.override { enableSTB = false; }) - SDL2_classic_mixer - SDL2_classic_ttf + SDL2 + (SDL2_image.override { enableSTB = false; }) + SDL2_mixer + SDL2_ttf ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pygame/skip-rle-tests.patch b/pkgs/development/python-modules/pygame/skip-rle-tests.patch new file mode 100644 index 000000000000..d0792e0e0e92 --- /dev/null +++ b/pkgs/development/python-modules/pygame/skip-rle-tests.patch @@ -0,0 +1,20 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 4e4b5d4..ffc7ffb 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase): + self.assertTrue(s1.get_flags() & pygame.RLEACCELOK) + self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK) + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") + def test_solarwolf_rle_usage(self): + """Test for error/crash when calling set_colorkey() followed + by convert twice in succession. Code originally taken +@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") + def test_solarwolf_rle_usage_2(self): + """Test for RLE status after setting alpha""" + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d31267a5cd39..0234ab78a337 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -465,6 +465,7 @@ mapAliases { containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11 + create-react-app = throw "'create-react-app' has been removed as it was deprecated. Upstream suggests using a framework for React."; # Added 2025-05-17 critcl = tclPackages.critcl; # Added 2024-10-02 crunchy-cli = throw "'crunchy-cli' was sunset, see "; # Added 2025-03-26 cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71665e444a53..6711c909eee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -351,8 +351,6 @@ with pkgs; perlPackages = perl538Packages; }; - collision = callPackage ../applications/misc/collision { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); copilot-language-server-fhs = copilot-language-server.fhs;