diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d7c6649e1125..64f3109dba20 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -285,3 +285,6 @@ b4532efe93882ae2e3fc579929a42a5a56544146 # nixfmt 1.0.0 62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt 5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt + +# systemd: nixfmt +b1c5cd3e794cdf89daa5e4f0086274a416a1cded diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5275410c66ad..9e23d7401e46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11959,6 +11959,12 @@ githubId = 51518420; name = "jitwit"; }; + jjacke13 = { + email = "vaios.k@pm.me"; + github = "jjacke13"; + githubId = 156372486; + name = "Vaios Karastathis"; + }; jjjollyjim = { email = "jamie@kwiius.com"; github = "JJJollyjim"; @@ -16169,6 +16175,13 @@ githubId = 318066; name = "Mirco Bauer"; }; + meenzen = { + name = "Samuel Meenzen"; + email = "samuel@meenzen.net"; + matrix = "@samuel:mnzn.dev"; + github = "meenzen"; + githubId = 22305878; + }; megheaiulian = { email = "iulian.meghea@gmail.com"; github = "megheaiulian"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1cfaeefe71f6..06436b41b626 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -309,6 +309,7 @@ with lib.maintainers; raphaelr jamiemagee anpin + meenzen ]; scope = "Maintainers of the .NET build tools and packages"; shortName = "dotnet"; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 51ca0eda2f00..59d20907f359 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.8.4"; + version = "6.8.6.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-CSugdfkAMy6VFdNdSGR+iCrK/XhwseoiMQ4mfgu4F/E="; + sha256 = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ="; }; dontBuild = true; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 89eee2f6a96b..25c542dd9985 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -902,8 +902,8 @@ let mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.21.0"; - hash = "sha256-rWExJ9XJ8nKki8TP0UNLCmslw+aCm1hR2h2xxhnY9bg="; + version = "1.23.0"; + hash = "sha256-jnn169toS1zaixiOrtWjgOvv3UskM13vfFcvaQEesjU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix index 00b1fbf8a7a6..110d5fa78058 100644 --- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix +++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lldb-dap"; publisher = "llvm-vs-code-extensions"; - version = "0.2.15"; - hash = "sha256-Xr/TUpte9JqdvQ8eoD0l8ztg0tR8qwX/Ju1eVU6Xc0s="; + version = "0.2.16"; + hash = "sha256-q0wBPSQHy/R8z5zb3iMdapzrn7c9y9X6Ow9CXY3lwtc="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index cfac4250e3f1..db3b85fe376a 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-07-23"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "78c184bca1063d5482cbfad924af72dd23ebbff1"; - hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M="; + rev = "c7e327b5b86bfeaf13e89440a319ee5b0c039a3d"; + hash = "sha256-J7rCOl7vHX/2Jy/fPh8yDAf8xQc41wmkMcC9SSRqxF0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix deleted file mode 100644 index f7c86c5920d7..000000000000 --- a/pkgs/applications/graphics/paraview/default.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchurl, - boost, - cmake, - ffmpeg, - libsForQt5, - gdal, - gfortran, - libXt, - makeWrapper, - ninja, - mpi, - python312, - tbb, - libGLU, - libGL, - withDocs ? true, -}: - -let - version = "5.13.2"; - - docFiles = [ - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; - name = "Tutorial.pdf"; - hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g="; - }) - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; - name = "GettingStarted.pdf"; - hash = "sha256-ptPQA8By8Hj0qI5WRtw3ZhklelXeYeJwVaUdfd6msJM="; - }) - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; - name = "CatalystGuide.pdf"; - hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow="; - }) - ]; - -in -stdenv.mkDerivation rec { - pname = "paraview"; - inherit version; - - src = fetchFromGitLab { - domain = "gitlab.kitware.com"; - owner = "paraview"; - repo = "paraview"; - rev = "v${version}"; - hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU="; - fetchSubmodules = true; - }; - - # Find the Qt platform plugin "minimal" - preConfigure = '' - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - cmakeFlags = [ - "-DPARAVIEW_ENABLE_FFMPEG=ON" - "-DPARAVIEW_ENABLE_GDAL=ON" - "-DPARAVIEW_ENABLE_MOTIONFX=ON" - "-DPARAVIEW_ENABLE_VISITBRIDGE=ON" - "-DPARAVIEW_ENABLE_XDMF3=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_USE_MPI=ON" - "-DPARAVIEW_USE_PYTHON=ON" - "-DVTK_SMP_IMPLEMENTATION_TYPE=TBB" - "-DVTKm_ENABLE_MPI=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-GNinja" - ]; - - nativeBuildInputs = [ - cmake - makeWrapper - ninja - gfortran - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libGLU - libGL - libXt - mpi - tbb - boost - ffmpeg - gdal - libsForQt5.qtbase - libsForQt5.qtx11extras - libsForQt5.qttools - libsForQt5.qtxmlpatterns - libsForQt5.qtsvg - ]; - - postInstall = - let - docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; - in - lib.optionalString withDocs '' - mkdir -p ${docDir}; - for docFile in ${lib.concatStringsSep " " docFiles}; do - cp $docFile ${docDir}/$(stripHash $docFile); - done; - ''; - - propagatedBuildInputs = [ - (python312.withPackages ( - ps: with ps; [ - numpy - matplotlib - mpi4py - ] - )) - ]; - - # 23k objects, >4h on a normal build slot - requiredSystemFeatures = [ "big-parallel" ]; - - meta = { - homepage = "https://www.paraview.org"; - description = "3D Data analysis and visualization application"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ guibert ]; - changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 268952e4747d..338b5fc316e8 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -70,17 +70,17 @@ python3.pkgs.buildPythonApplication { aiorpcx attrs bitstring + certifi cryptography dnspython jsonrpclib-pelix matplotlib pbkdf2 protobuf - py-scrypt pysocks qrcode requests - certifi + scrypt # plugins btchip-python ckcc-protocol diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9890a4b2662b..c6d52ba7f19d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,13 +45,13 @@ "vendorHash": "sha256-jZ950/nPFt3+t3CHsNEkYo7POabRCHVvcfu04Iq3cJc=" }, "akamai": { - "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=", + "hash": "sha256-pXBQikG5yjCPj/Nv6+qJBv3+BpRx04CbDQo9Q9nU0o4=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v8.0.0", + "rev": "v8.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q=" + "vendorHash": "sha256-WT4sjem80445Qwlr3i/OuQMujrxEKqhws1GLpvbqKaU=" }, "alicloud": { "hash": "sha256-ITu569Um+3Y7FPCBNALvePAjCCIf/3+Hu0831o7rZCU=", @@ -570,13 +570,13 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-KYCyqNKqW/I4q1JHVK4rD9H8/D60IL7H9cCgz6wLg5Q=", + "hash": "sha256-RZkXUB4Msmsm+1mQij+577d7KUrDpk50oPc2rcFevi4=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.21", + "rev": "v3.10.23", "spdx": "MIT", - "vendorHash": "sha256-C1MT4mA7ubh1mN4+HO0bwMpjVHjDIG6UXZI6gvXHFZE=" + "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U=" }, "hcloud": { "hash": "sha256-O6GaMSL5E9t5v9nsRh7aGIXy/w04sCy7AYG4AvGsbLc=", @@ -1309,11 +1309,11 @@ "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, "sysdig": { - "hash": "sha256-q7HXqmvOiUktGOas9Xjt2hucxqasnPZ2O9uIn1gL1FE=", + "hash": "sha256-KAwuE67gNOrDDLxgbxMtub0tMa45IiIOJ9Sq9mncK4c=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.58.0", + "rev": "v1.59.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50=" }, diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index fda05185adff..0bd762a05632 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ pkg-config, qt5, cmake, + ninja, avahi, boost, libopus, @@ -51,6 +52,7 @@ let nativeBuildInputs = [ cmake + ninja pkg-config python3 qt5.wrapQtAppsHook diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 1c3c32f50cf6..6eeb224c6b88 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.70.1"; + version = "1.70.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; tag = "v${version}"; - hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg="; + hash = "sha256-2ILG+FW+58WnmL5Ts1K32ee0SR15yp9NnEtmEo6r6w8="; }; - vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU="; + vendorHash = "sha256-CHObiSQudxZw5KjimQk8myTsLeQMBZU8SewW4I2dNsw="; subPackages = [ "cmd/api-linter" ]; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 9c3ceaa37a76..5b0b3c0ce928 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.25.7"; + version = "1.25.8"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = version; - hash = "sha256-VrIayD7Gj0j5Rfs6sl2tZTqPFTvQcJHgUnGQ6IGiUmU="; + hash = "sha256-FsaTXGlQ390XgFrV4InF+xFr+Y9JgZefsR/AyHOuSsA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index ec273e15187c..5ad12be555d8 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "azurite"; - version = "3.34.0"; + version = "3.35.0"; src = fetchFromGitHub { owner = "Azure"; repo = "Azurite"; rev = "v${version}"; - hash = "sha256-6NECduq2ewed8bR4rlF5MW8mGcsgu8bqgA/DBt8ywtM="; + hash = "sha256-sVYiHQJ3nR5vM+oPAHzr/MjuNBMY14afqCHpw32WCiQ="; }; - npmDepsHash = "sha256-WRaD99CsIuH3BrO01eVuoEZo40VjuScnVzmlFcKpj8g="; + npmDepsHash = "sha256-UBHjb65Ud7IANsR30DokbI/16+dVjDEtfhqRPAQhGUw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index 40ce46ad9c40..fbb826c89b9e 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "bluemap"; - version = "5.10"; + version = "5.11"; src = fetchurl { url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar"; - hash = "sha256-vz6ReXfgqWYnyFQNBgqaWLZ0sOJqHOmFcAnuwbbOmGA="; + hash = "sha256-DhsnuwVDvIb7eR4Hs2jOTufY2ysd+Awo0b8xg84quGU="; }; dontUnpack = true; diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 349ef5c28691..0c69a0030677 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-vLvPiHwrFLqNV9ReeFAr0YBn8HUt6SazanpwZ1q09oU="; + hash = "sha256-qo48OW02IMAAxMYTYguv5jKvy/GPq1WKgcluSrMIt2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index c1480ed4f380..385ca3818024 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-rmbu3WNwCmgojAWAthIQ9/XiSS04d9DoZwGRGAuRfDw="; + hash = "sha256-qWHpExVt/a20GrP2uVvGbubF+Nr71Ob6abGLcnlpKJc="; }; - cargoHash = "sha256-7xpkxJh5KVJVw6wQZGr2daU1qg0e969EWflf4Z/01oY="; + cargoHash = "sha256-HctMp95J8ovYuvh7m5wxrNt+ZCVCzwPSSm71Ma1cVxI="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index c37f45405743..89a9bbd637d2 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.70" + "@anthropic-ai/claude-code": "^1.0.71" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.70", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.70.tgz", - "integrity": "sha512-gJ/bdT/XQ/hp5EKM0QoOWj/eKmK3wvs1TotTLq1unqahiB6B+EAQeRy/uvxv2Ua9nI8p5Bogw8hXB1uUmAHb+A==", + "version": "1.0.71", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz", + "integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==", "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 3f3ab75669aa..e4dab3449ef5 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.70"; + version = "1.0.71"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-7nqhJNhO+QollwVtVlKDYHOlPDT6Erk6wI/voiAYXY4="; + hash = "sha256-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg="; }; - npmDepsHash = "sha256-nBLaWDwSPOfZx26UU2QQpp/r8HPHAO4EnPkb/gcTPrg="; + npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 7c5043cad4ee..97bebd35bab1 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.0.3"; + version = "1.1.1"; executables = "csharpier"; - nugetHash = "sha256-DJe3zpzFCBjmsNmLMgIC1clLxo/exPZ+xHUmdpKMaMo="; + nugetHash = "sha256-B0ijqWm3eZ31T+C5zRr4TkmfPsOfseaHpGPYZf5Yiw4="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index b8e6f88bca78..4b94c4966937 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "docker-language-server"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker-language-server"; tag = "v${version}"; - hash = "sha256-ht63NilujpbDhBjkzCNpY95AAuwqya37qchgqKLlTw8="; + hash = "sha256-cxLg0fLUC4dj3QUax+vIsJENRXNifbXMoRkldM44i+0="; }; - vendorHash = "sha256-w7CDl27178oe/DpfqSbNbyOsR3D34EpcCMZNQ7i3JE4="; + vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg="; nativeCheckInputs = [ docker diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index f31b2603c289..192d9017452c 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM="; + hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 239cdab1a6b9..cb2ba10c41ae 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.48.3"; + version = "1.48.4"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-5clMrH9r7CltZ2oEfDvyubFroOq/YVRaPkBfRnMyHNc="; + hash = "sha256-reWOFI17YSaCTFriCpJELdDj9K2MintKt9OBy/2aXE4="; }; - npmDepsHash = "sha256-O8w5gyG2PDUSGuAcSQ4ccvkYhb9pQL5NjWXjSoXk6gQ="; + npmDepsHash = "sha256-XPkqJVkShCzft4LEobCUgbsyl5W/vHXRPNPKltFO5hc="; dontNpmBuild = true; diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 1749c5c7d787..a4a325303032 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.187"; + version = "0.0.188"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-vdLt7LtVkgcgoUzzl5jb7ERIyQMpY+iSwJpdQpWxoJw="; + hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU="; }; postPatch = '' diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index fde448661513..754e226bd150 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw="; + hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0="; }; - cargoHash = "sha256-IXzqcIVk7F/MgWofzlwEkXfu7s8e7GdjYhdFbXUTeeo="; + cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 9e5c1b7001a2..67c016f383cc 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -31,8 +31,8 @@ }, { "pname": "KeraLua", - "version": "1.4.4", - "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs=" + "version": "1.4.6", + "hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 211eff07fb64..af25400a3657 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8="; + hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 0841811a9a57..df4279d13344 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.3.4"; + version = "3.4.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-n7R4BiNxEy2uL6yg5h/L+l/EiQFTc5uND4ZVdERll08="; + hash = "sha256-3kTgYlsVumTVH5X6h3YvS0tdex/OGQyn5MzevQ+GuH4="; }; postPatch = diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index b7047664dcc2..68c3d58cd5e5 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.21.0"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-TOrnaYvI4U7+q7ANNThZ3M3XhZS/Y8m48mNAqwjjBsg="; + hash = "sha256-ckK0Tv1aUHJcM1RH20ejBvq49xksUZmqveCcMmpnVGo="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 6ff1e7aef05a..204a7075b6e9 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.185.0"; + version = "2.189.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA="; + hash = "sha256-rHqg7ziUdir6jWL4Xo/n9I2lNCmpBWFI34LQAS5mPsM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw="; + npmDepsHash = "sha256-hRDBNt2JIdjWYJLmW5BkW5wJ8yzcqQRwS2jRJKFrZL0="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gi/gitmux/package.nix b/pkgs/by-name/gi/gitmux/package.nix index 34d9b718e0cd..8c8eb0f9aae0 100644 --- a/pkgs/by-name/gi/gitmux/package.nix +++ b/pkgs/by-name/gi/gitmux/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "gitmux"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "arl"; repo = "gitmux"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Jw2yl95vCQ5JcRGvBeLlGuAagTHUf+IEF7XvzehcMvU="; + sha256 = "sha256-TObnmV/NiMCcyC9zG0OcCuCqUChQZmpqPptQUDtF85A="; }; vendorHash = "sha256-MvvJGB9KPMYeqYclmAAF6qlU7vrJFMPToogbGDRoCpU="; diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 88b5fb146541..4979e3a000e1 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "go-mockery"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; tag = "v${finalAttrs.version}"; - hash = "sha256-x7WniZ4wpnuzUHM2ZC2P7Ns67bIp4V4F9f4xQEJONEk="; + hash = "sha256-/OMUL/C/uUKT5GvEd3ylpS72XfGTnD+J7EuOR1LovB0="; }; proxyVendor = true; - vendorHash = "sha256-cNMknwlU7ENwN67CtyU1YgYIXCJbh4b7Z3oUK7kkEkk="; + vendorHash = "sha256-PAJymNrl83knDXP9ukUbfEdtabE4+k16Ygzwvfu5ZR8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 50f3b15b0b8a..ef1c8738dd2d 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -100,7 +100,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/hhd-dev/hhd/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - appsforartists toast ]; mainProgram = "hhd"; diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix index 79ec2898aefd..eb3c7776c320 100644 --- a/pkgs/by-name/io/iotas/package.nix +++ b/pkgs/by-name/io/iotas/package.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.11.0"; + version = "0.11.2"; pyproject = false; src = fetchFromGitLab { @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = "iotas"; tag = version; - hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw="; + hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ja/jasp-desktop/cmake.patch b/pkgs/by-name/ja/jasp-desktop/cmake.patch index 60cf1814a031..48b297b21548 100644 --- a/pkgs/by-name/ja/jasp-desktop/cmake.patch +++ b/pkgs/by-name/ja/jasp-desktop/cmake.patch @@ -1,5 +1,34 @@ +diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake +index edd96b0..1fbdb3c 100644 +--- a/Tools/CMake/Install.cmake ++++ b/Tools/CMake/Install.cmake +@@ -229,24 +229,10 @@ if(LINUX) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/ + DESTINATION ${JASP_INSTALL_RESOURCEDIR}) + +- install( +- DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools +- DESTINATION ${JASP_INSTALL_MODULEDIR} +- REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE +- REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE) +- + install( + FILES ${MODULES_BINARY_PATH}/modules-settings.json + DESTINATION ${JASP_INSTALL_MODULEDIR} + ) +- # we do not need renv-root in an install +- #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/ +- # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root) +- +-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway +- install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/ +- DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache) +-endif() + + #Flatpak wrapper that sets some environment variables that JASP needs + install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake -index a95ef78..6ee84cd 100644 +index a6673d9..a079021 100644 --- a/Tools/CMake/Libraries.cmake +++ b/Tools/CMake/Libraries.cmake @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) @@ -20,8 +49,32 @@ index a95ef78..6ee84cd 100644 HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED) if(EXISTS ${LIBREADSTAT_LIBRARIES}) +diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake +index ca8e040..875db1f 100644 +--- a/Tools/CMake/Modules.cmake ++++ b/Tools/CMake/Modules.cmake +@@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json + configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in + ${SCRIPT_DIRECTORY}/install-modules.R @ONLY) + +-#create modules install target +-add_custom_target( +- Modules +- USES_TERMINAL +- WORKING_DIRECTORY ${R_HOME_PATH} +- DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager +- DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R +- COMMAND ${CMAKE_COMMAND} -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save +- --file=${SCRIPT_DIRECTORY}/install-modules.R +- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-downloaded.txt +- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-installed.txt +- COMMENT "------ Installing Modules" +-) + + + diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake -index bfdc8dc..af5ac03 100644 +index 4e7c052..abb5b48 100644 --- a/Tools/CMake/Programs.cmake +++ b/Tools/CMake/Programs.cmake @@ -38,8 +38,9 @@ if(NOT WIN32) @@ -37,35 +90,26 @@ index bfdc8dc..af5ac03 100644 message(CHECK_START "Looking for 'gfortran'") find_program( diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake -index 9ae27d4..64fd96a 100644 +index 42e7b88..405b434 100644 --- a/Tools/CMake/R.cmake +++ b/Tools/CMake/R.cmake -@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}") - configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in - ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY) +@@ -867,14 +867,6 @@ else() + configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in + ${SCRIPT_DIRECTORY}/install-renv.R @ONLY) +- -execute_process( - COMMAND_ECHO STDOUT - #ERROR_QUIET OUTPUT_QUIET - WORKING_DIRECTORY ${R_HOME_PATH} -- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R) +- COMMAND +- ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R +-) if(APPLE) # Patch renv -@@ -867,11 +862,6 @@ endif() - configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in - ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY) - --execute_process( -- COMMAND_ECHO STDOUT -- #ERROR_QUIET OUTPUT_QUIET -- WORKING_DIRECTORY ${R_HOME_PATH} -- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R) - - if(APPLE) - # Patch RInside and RCpp -@@ -892,8 +882,8 @@ endif() - +@@ -937,8 +929,8 @@ execute_process( + include(FindRPackagePath) -find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp") diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index c211946d76d9..040b3a258947 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -7,19 +7,18 @@ with rPackages; let - jaspColumnEncoder-src = fetchFromGitHub { - owner = "jasp-stats"; - repo = "jaspColumnEncoder"; - rev = "c54987bb25de8963866ae69ad3a6ae5a9a9f1240"; - hash = "sha256-aWfRG7DXO1MYFvmMLkX/xtHvGeIhFRcRDrVBrhkvYuI="; - }; + buildRPackage' = args: buildRPackage ({ name = "${args.pname}-${args.version}"; } // args); - jaspGraphs = buildRPackage { - name = "jaspGraphs-${jasp-version}"; - version = jasp-version; + jaspGraphs = buildRPackage' { + pname = "jaspGraphs"; + version = "0.19.2-unstable-2025-07-25"; - src = jasp-src; - sourceRoot = "${jasp-src.name}/Engine/jaspGraphs"; + src = fetchFromGitHub { + owner = "jasp-stats"; + repo = "jaspGraphs"; + rev = "e721a631c8357d42c1371a978db7cb5765bc7044"; + hash = "sha256-DOOKHBVTF9bVhAa/LZCH1J7A821H4mGEfy6KAEtDBNk="; + }; propagatedBuildInputs = [ ggplot2 @@ -35,8 +34,15 @@ let ]; }; - jaspBase = buildRPackage { - name = "jaspBase-${jasp-version}"; + jaspColumnEncoder-src = fetchFromGitHub { + owner = "jasp-stats"; + repo = "jaspColumnEncoder"; + rev = "32c53153da95087feb109c0f5f69534ffa3f32b7"; + hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI="; + }; + + jaspBase = buildRPackage' { + pname = "jaspBase"; version = jasp-version; src = jasp-src; @@ -44,9 +50,6 @@ let env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder"; - # necessary for R 4.4.0 - hardeningDisable = [ "format" ]; - postPatch = '' mkdir -p inst/include cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder @@ -79,14 +82,17 @@ let ]; }; - stanova = buildRPackage { - name = "stanova"; + stanova = buildRPackage' { + pname = "stanova"; + version = "0.3-unstable-2021-06-06"; + src = fetchFromGitHub { owner = "bayesstuff"; repo = "stanova"; rev = "988ad8e07cda1674b881570a85502be7795fbd4e"; hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY="; }; + propagatedBuildInputs = [ emmeans lme4 @@ -96,14 +102,17 @@ let ]; }; - bstats = buildRPackage { - name = "bstats"; + bstats = buildRPackage' { + pname = "bstats"; + version = "0.0.0.9004-unstable-2023-09-08"; + src = fetchFromGitHub { owner = "AlexanderLyNL"; repo = "bstats"; rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c"; hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk="; }; + propagatedBuildInputs = [ hypergeo purrr @@ -111,14 +120,17 @@ let ]; }; - flexplot = buildRPackage { - name = "flexplot"; + flexplot = buildRPackage' { + pname = "flexplot"; + version = "0.25.5"; + src = fetchFromGitHub { owner = "dustinfife"; repo = "flexplot"; - rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb"; - hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc="; + rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3"; + hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE="; }; + propagatedBuildInputs = [ cowplot MASS @@ -141,14 +153,17 @@ let }; # conting has been removed from CRAN - conting' = buildRPackage { - name = "conting"; + conting' = buildRPackage' { + pname = "conting"; + version = "1.7.9999"; + src = fetchFromGitHub { owner = "vandenman"; repo = "conting"; rev = "03a4eb9a687e015d602022a01d4e638324c110c8"; hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0="; }; + propagatedBuildInputs = [ mvtnorm gtools @@ -158,14 +173,22 @@ let }; buildJaspModule = - name: deps: - buildRPackage { - name = "${name}-${jasp-version}"; - version = jasp-version; - src = jasp-src; - sourceRoot = "${jasp-src.name}/Modules/${name}"; + { + pname, + version, + hash, + deps, + }: + buildRPackage' { + inherit pname version; + src = fetchFromGitHub { + name = "${pname}-${version}-source"; + owner = "jasp-stats"; + repo = pname; + tag = "v${version}"; + inherit hash; + }; propagatedBuildInputs = deps; - # some packages have a .Rprofile that tries to activate renv # we disable this by removing .Rprofile postPatch = '' @@ -174,477 +197,677 @@ let }; in { - engine = { - inherit jaspBase jaspGraphs; - }; + inherit jaspBase; modules = rec { - jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [ - abtest - BayesFactor - conting' - ggplot2 - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - AcceptanceSampling - ]; - jaspAnova = buildJaspModule "jaspAnova" [ - afex - BayesFactor - boot - car - colorspace - emmeans - effectsize - ggplot2 - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - KernSmooth - matrixStats - multcomp - multcompView - mvShapiroTest - onewaytests - plyr - stringi - stringr - restriktor - ]; - jaspAudit = buildJaspModule "jaspAudit" [ - bstats - extraDistr - ggplot2 - ggrepel - jaspBase - jaspGraphs - jfa - ]; - jaspBain = buildJaspModule "jaspBain" [ - bain - lavaan - ggplot2 - semPlot - stringr - jaspBase - jaspGraphs - jaspSem - ]; - jaspBFF = buildJaspModule "jaspBFF" [ - BFF - jaspBase - jaspGraphs - ]; - jaspBfpack = buildJaspModule "jaspBfpack" [ - BFpack - bain - ggplot2 - stringr - coda - jaspBase - jaspGraphs - ]; - jaspBsts = buildJaspModule "jaspBsts" [ - Boom - bsts - ggplot2 - jaspBase - jaspGraphs - matrixStats - reshape2 - ]; - jaspCircular = buildJaspModule "jaspCircular" [ - jaspBase - jaspGraphs - circular - ggplot2 - ]; - jaspCochrane = buildJaspModule "jaspCochrane" [ - jaspBase - jaspGraphs - jaspDescriptives - jaspMetaAnalysis - ]; - jaspDescriptives = buildJaspModule "jaspDescriptives" [ - ggplot2 - ggrepel - jaspBase - jaspGraphs - jaspTTests - forecast - flexplot - ggrain - ggpp - ggtext - dplyr - ]; - jaspDistributions = buildJaspModule "jaspDistributions" [ - car - fitdistrplus - ggplot2 - goftest - gnorm - jaspBase - jaspGraphs - MASS - sgt - sn - ]; - jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [ - BayesFactor - ggplot2 - jaspBase - jaspGraphs - metaBMA - TOSTER - jaspTTests - ]; - jaspFactor = buildJaspModule "jaspFactor" [ - ggplot2 - jaspBase - jaspGraphs - jaspSem - lavaan - psych - qgraph - reshape2 - semPlot - GPArotation - Rcsdp - semTools - ]; - jaspFrequencies = buildJaspModule "jaspFrequencies" [ - abtest - BayesFactor - bridgesampling - conting' - multibridge - ggplot2 - interp - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - ]; - jaspJags = buildJaspModule "jaspJags" [ - coda - ggplot2 - ggtext - hexbin - jaspBase - jaspGraphs - rjags - runjags - scales - stringr - ]; - jaspLearnBayes = buildJaspModule "jaspLearnBayes" [ - extraDistr - ggplot2 - HDInterval - jaspBase - jaspGraphs - MASS - MCMCpack - MGLM - scales - ggalluvial - ragg - rjags - runjags - ggdist - png - posterior - ]; - jaspLearnStats = buildJaspModule "jaspLearnStats" [ - extraDistr - ggplot2 - jaspBase - jaspGraphs - jaspDistributions - jaspDescriptives - jaspTTests - ggforce - tidyr - igraph - HDInterval - metafor - ]; - jaspMachineLearning = buildJaspModule "jaspMachineLearning" [ - kknn - AUC - cluster - colorspace - DALEX - dbscan - e1071 - fpc - gbm - Gmedian - ggparty - ggdendro - ggnetwork - ggplot2 - ggrepel - ggridges - glmnet - jaspBase - jaspGraphs - MASS - mclust - mvnormalTest - neuralnet - network - partykit - plyr - randomForest - rpart - ROCR - Rtsne - signal - VGAM - ]; - jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [ - dplyr - ggplot2 - jaspBase - jaspGraphs - MASS - metaBMA - metafor - psych - purrr - rstan - stringr - tibble - tidyr - weightr - BayesTools - RoBMA - metamisc - ggmcmc - pema - clubSandwich - CompQuadForm - sp - dfoptim - nleqslv - patchwork - ]; - jaspMixedModels = buildJaspModule "jaspMixedModels" [ - afex - emmeans - ggplot2 - ggpol - jaspBase - jaspGraphs - lme4 - loo - mgcv - rstan - rstanarm - stanova - withr - ]; - jaspNetwork = buildJaspModule "jaspNetwork" [ - bootnet - BDgraph - corpcor - dplyr - foreach - ggplot2 - gtools - HDInterval - huge - IsingSampler - jaspBase - jaspGraphs - mvtnorm - qgraph - reshape2 - snow - stringr - ]; - jaspPower = buildJaspModule "jaspPower" [ - pwr - jaspBase - jaspGraphs - ]; - jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [ - jaspBase - jaspGraphs - bsts - bssm - precrec - reshape2 - Boom - lubridate - prophet - BART - EBMAforecast - imputeTS - scoringRules - scoringutils - ]; - jaspProcess = buildJaspModule "jaspProcess" [ - blavaan - dagitty - ggplot2 - ggraph - jaspBase - jaspGraphs - jaspJags - runjags - ]; - jaspProphet = buildJaspModule "jaspProphet" [ - rstan - ggplot2 - jaspBase - jaspGraphs - prophet - scales - ]; - jaspQualityControl = buildJaspModule "jaspQualityControl" [ - car - cowplot - daewr - desirability - DoE_base - EnvStats - FAdist - fitdistrplus - FrF2 - ggplot2 - ggrepel - goftest - ggpp - irr - jaspBase - jaspDescriptives - jaspGraphs - mle_tools - psych - qcc - rsm - Rspc - tidyr - tibble - vipor - weibullness - ]; - jaspRegression = buildJaspModule "jaspRegression" [ - BAS - boot - bstats - combinat - emmeans - ggplot2 - ggrepel - hmeasure - jaspAnova - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - lmtest - logistf - MASS - matrixStats - mdscore - ppcor - purrr - Rcpp - statmod - VGAM - ]; - jaspReliability = buildJaspModule "jaspReliability" [ - Bayesrel - coda - ggplot2 - ggridges - irr - jaspBase - jaspGraphs - LaplacesDemon - lme4 - MASS - psych - mirt - ]; - jaspRobustTTests = buildJaspModule "jaspRobustTTests" [ - RoBTT - ggplot2 - jaspBase - jaspGraphs - ]; - jaspSem = buildJaspModule "jaspSem" [ - forcats - ggplot2 - lavaan - cSEM - reshape2 - jaspBase - jaspGraphs - semPlot - semTools - stringr - tibble - tidyr - SEMsens - ]; - jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [ - BayesFactor - bstats - jaspBase - jaspFrequencies - jaspGraphs - jaspRegression - jaspTTests - jaspAnova - jaspDescriptives - SuppDists - bayesplay - ]; - jaspSurvival = buildJaspModule "jaspSurvival" [ - survival - ggsurvfit - jaspBase - jaspGraphs - ]; - jaspTTests = buildJaspModule "jaspTTests" [ - BayesFactor - car - ggplot2 - jaspBase - jaspGraphs - logspline - plotrix - plyr - ]; - jaspTestModule = buildJaspModule "jaspTestModule" [ - jaspBase - jaspGraphs - svglite - stringi - ]; - jaspTimeSeries = buildJaspModule "jaspTimeSeries" [ - jaspBase - jaspGraphs - jaspDescriptives - forecast - ]; - jaspVisualModeling = buildJaspModule "jaspVisualModeling" [ - flexplot - jaspBase - jaspGraphs - jaspDescriptives - ]; + jaspAcceptanceSampling = buildJaspModule { + pname = "jaspAcceptanceSampling"; + version = "0.95.0"; + hash = "sha256-MzuijLBrCd/aIACzyEWWbQoyuYl/c7iMplsIpScbqK4="; + deps = [ + abtest + BayesFactor + conting' + ggplot2 + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + AcceptanceSampling + ]; + }; + jaspAnova = buildJaspModule { + pname = "jaspAnova"; + version = "0.95.0"; + hash = "sha256-elunqlNy7krnoL31aeS4B7SkpKCD42S8Z8HsPeFTjEM="; + deps = [ + afex + BayesFactor + boot + car + colorspace + emmeans + effectsize + ggplot2 + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + KernSmooth + matrixStats + multcomp + multcompView + mvShapiroTest + onewaytests + plyr + stringi + stringr + restriktor + ]; + }; + jaspAudit = buildJaspModule { + pname = "jaspAudit"; + version = "0.95.0"; + hash = "sha256-CqrjrNm7DEyzOTg69TzksYczGBSCvhHfdfZ/HaNkhcI="; + deps = [ + bstats + extraDistr + ggplot2 + ggrepel + jaspBase + jaspGraphs + jfa + ]; + }; + jaspBain = buildJaspModule { + pname = "jaspBain"; + version = "0.95.0"; + hash = "sha256-E6j7dH6jbXWhR03QVQjY30/pylrMHU6PNX13gr5KvV4="; + deps = [ + bain + lavaan + ggplot2 + semPlot + stringr + jaspBase + jaspGraphs + jaspSem + ]; + }; + jaspBFF = buildJaspModule { + pname = "jaspBFF"; + version = "0.95.0"; + hash = "sha256-fgAUdzgSNt34WL/U3/0ac1kTB5PYAvmpXeQUuNEUhuE="; + deps = [ + BFF + jaspBase + jaspGraphs + ]; + }; + jaspBfpack = buildJaspModule { + pname = "jaspBfpack"; + version = "0.95.0"; + hash = "sha256-4c7ORf0epHSdv6AB1UVMwiSEwCfVHAg0jzifBdHInoc="; + deps = [ + BFpack + bain + ggplot2 + stringr + coda + jaspBase + jaspGraphs + ]; + }; + jaspBsts = buildJaspModule { + pname = "jaspBsts"; + version = "0.95.0"; + hash = "sha256-pClbOuA255mHJSy7/TpQE+oaYQbxJut9AqZRMqm8Rhg="; + deps = [ + Boom + bsts + ggplot2 + jaspBase + jaspGraphs + matrixStats + reshape2 + ]; + }; + jaspCircular = buildJaspModule { + pname = "jaspCircular"; + version = "0.95.0"; + hash = "sha256-Sx63VGtOZvwHF1jIjnd6aPmN1WtHHf35iQ0dzCWs1eU="; + deps = [ + jaspBase + jaspGraphs + circular + ggplot2 + ]; + }; + jaspCochrane = buildJaspModule { + pname = "jaspCochrane"; + version = "0.95.0"; + hash = "sha256-ZYMe1BJ0+HKKyHVY5riEcGE+6vZsAurWzHmPF5I7nk8="; + deps = [ + jaspBase + jaspGraphs + jaspDescriptives + jaspMetaAnalysis + ]; + }; + jaspDescriptives = buildJaspModule { + pname = "jaspDescriptives"; + version = "0.95.0"; + hash = "sha256-gaGgSSv1D0GB8Rmzg9TYl460TjWHkK0abHDm5DHhOJg="; + deps = [ + ggplot2 + ggrepel + jaspBase + jaspGraphs + jaspTTests + forecast + flexplot + ggrain + ggpp + ggtext + dplyr + tidyplots + ggpubr + forcats + patchwork + ]; + }; + + jaspDistributions = buildJaspModule { + pname = "jaspDistributions"; + version = "0.95.0"; + hash = "sha256-jtPYx2wOAY7ItrkPqyMsKp7sTrL9M1TtTmR0IjxU1nw="; + deps = [ + car + fitdistrplus + ggplot2 + goftest + gnorm + jaspBase + jaspGraphs + MASS + nortest + sgt + sn + ]; + }; + jaspEquivalenceTTests = buildJaspModule { + pname = "jaspEquivalenceTTests"; + version = "0.95.0"; + hash = "sha256-b/I6lb6I8rzOyyRgmsQTBMfHXfJDkrZPdwe5Kh2IVnc="; + deps = [ + BayesFactor + ggplot2 + jaspBase + jaspGraphs + metaBMA + TOSTER + jaspTTests + ]; + }; + jaspEsci = buildJaspModule { + pname = "jaspEsci"; + version = "0.95.0"; + hash = "sha256-0YBC54VdVNuGdkfjWEIJnW3n/Wbch4E6tkauVm45/9c="; + deps = [ + jaspBase + jaspGraphs + esci + glue + vdiffr + legendry + ]; + }; + jaspFactor = buildJaspModule { + pname = "jaspFactor"; + version = "0.95.0"; + hash = "sha256-gK4GdwADrPt2UB/UUx+2Kx5IOlFolYjNArrYpTGK9ic="; + deps = [ + ggplot2 + jaspBase + jaspGraphs + jaspSem + lavaan + psych + qgraph + reshape2 + semPlot + GPArotation + Rcsdp + semTools + ]; + }; + jaspFrequencies = buildJaspModule { + pname = "jaspFrequencies"; + version = "0.95.0"; + hash = "sha256-aK4t+q6NRHGiszJa6rWx1bQddxzwynM9TOckxofdgsw"; + deps = [ + abtest + BayesFactor + bridgesampling + conting' + multibridge + ggplot2 + interp + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + ]; + }; + jaspJags = buildJaspModule { + pname = "jaspJags"; + version = "0.95.0"; + hash = "sha256-DxLy3NgqvLIROBut30ne3hCUd67rCRutgM7zGvwkKNU="; + deps = [ + coda + ggplot2 + ggtext + hexbin + jaspBase + jaspGraphs + rjags + runjags + scales + stringr + ]; + }; + jaspLearnBayes = buildJaspModule { + pname = "jaspLearnBayes"; + version = "0.95.0"; + hash = "sha256-mka93YglICKxPXNO85Kv/gzSRAMuTkWcnAlwIExDpi0="; + deps = [ + extraDistr + ggplot2 + HDInterval + jaspBase + jaspGraphs + MASS + MCMCpack + MGLM + scales + ggalluvial + ragg + rjags + runjags + ggdist + png + posterior + ]; + }; + jaspLearnStats = buildJaspModule { + pname = "jaspLearnStats"; + version = "0.95.0"; + hash = "sha256-AcdSmAGr1ITZV/OXNpyOz0wwBlho76lvEGgt5FUHnsg="; + deps = [ + extraDistr + ggplot2 + jaspBase + jaspGraphs + jaspDistributions + jaspDescriptives + jaspTTests + ggforce + tidyr + igraph + HDInterval + metafor + ]; + }; + jaspMachineLearning = buildJaspModule { + pname = "jaspMachineLearning"; + version = "0.95.0"; + hash = "sha256-oCsXrcEAteFGfFHU65FV3jm1majA1q1w+TYCwAsvf70="; + deps = [ + kknn + AUC + cluster + colorspace + DALEX + dbscan + e1071 + fpc + gbm + Gmedian + ggparty + ggdendro + ggnetwork + ggplot2 + ggrepel + ggridges + glmnet + jaspBase + jaspGraphs + MASS + mclust + mvnormalTest + neuralnet + network + partykit + plyr + randomForest + rpart + ROCR + Rtsne + signal + VGAM + ]; + }; + jaspMetaAnalysis = buildJaspModule { + pname = "jaspMetaAnalysis"; + version = "0.95.0"; + hash = "sha256-5zmLCx6HuM/oBxfaAgo4y7/CYJJkiJEP9RvAsc1h/5w="; + deps = [ + dplyr + ggplot2 + jaspBase + jaspGraphs + jaspSem + MASS + metaBMA + metafor + metaSEM + psych + purrr + rstan + stringr + tibble + tidyr + weightr + BayesTools + RoBMA + metamisc + ggmcmc + pema + clubSandwich + CompQuadForm + sp + dfoptim + nleqslv + patchwork + ]; + }; + jaspMixedModels = buildJaspModule { + pname = "jaspMixedModels"; + version = "0.95.0"; + hash = "sha256-EbB7rwlfRiGPI+QIi8/SygxJgsU5nOpZ2ZEg+mETX5Y="; + deps = [ + afex + emmeans + ggplot2 + ggpol + jaspBase + jaspGraphs + lme4 + loo + mgcv + rstan + rstanarm + stanova + withr + ]; + }; + jaspNetwork = buildJaspModule { + pname = "jaspNetwork"; + version = "0.95.0"; + hash = "sha256-1RDkKRgNV6cToM2pVdHwIDE41UpFV0snIU54BEesVJw="; + deps = [ + bootnet + easybgm + corpcor + dplyr + foreach + ggplot2 + gtools + HDInterval + huge + IsingSampler + jaspBase + jaspGraphs + mvtnorm + qgraph + reshape2 + snow + stringr + ]; + }; + jaspPower = buildJaspModule { + pname = "jaspPower"; + version = "0.95.0"; + hash = "sha256-sLLJ6yqKbFlXrHPlm2G7NuHp+/kBl+kPRvi6vAy32Ds="; + deps = [ + pwr + jaspBase + jaspGraphs + ]; + }; + jaspPredictiveAnalytics = buildJaspModule { + pname = "jaspPredictiveAnalytics"; + version = "0.95.0"; + hash = "sha256-850PruQnCGab0g3Vdlh1LSqWYLFJUCbGNt3gWjEWP34="; + deps = [ + jaspBase + jaspGraphs + bsts + bssm + precrec + reshape2 + Boom + lubridate + prophet + BART + EBMAforecast + imputeTS + scoringRules + scoringutils + ]; + }; + jaspProcess = buildJaspModule { + pname = "jaspProcess"; + version = "0.95.0"; + hash = "sha256-LUlk9Iy538Zenzy+W1oJiCr7dcrBQVrl4gzflwnJVyc="; + deps = [ + blavaan + dagitty + ggplot2 + ggraph + jaspBase + jaspGraphs + jaspJags + runjags + ]; + }; + jaspProphet = buildJaspModule { + pname = "jaspProphet"; + version = "0.95.0"; + hash = "sha256-lCgqH3CfZxRImq5VndZepiy/JaXJHHh1Haj+7XhZUSE="; + deps = [ + rstan + ggplot2 + jaspBase + jaspGraphs + prophet + scales + ]; + }; + jaspQualityControl = buildJaspModule { + pname = "jaspQualityControl"; + version = "0.95.0"; + hash = "sha256-6SvLe++9ipvHfX0Hi1xeBeoQeq+PdG9YTE5sewhqUHA="; + deps = [ + car + cowplot + daewr + desirability + DoE_base + EnvStats + FAdist + fitdistrplus + FrF2 + ggplot2 + ggrepel + goftest + ggpp + irr + jaspBase + jaspDescriptives + jaspGraphs + mle_tools + psych + qcc + rsm + Rspc + tidyr + tibble + vipor + weibullness + ]; + }; + jaspRegression = buildJaspModule { + pname = "jaspRegression"; + version = "0.95.0"; + hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0="; + deps = [ + BAS + boot + bstats + combinat + emmeans + ggplot2 + ggrepel + hmeasure + jaspAnova + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + lmtest + logistf + MASS + matrixStats + mdscore + ppcor + purrr + Rcpp + statmod + VGAM + ]; + }; + jaspReliability = buildJaspModule { + pname = "jaspReliability"; + version = "0.95.0"; + hash = "sha256-wxx1ECm7QKDvLLKQZbEVYTHfyn3ieks69HSP/cg5dDQ="; + deps = [ + Bayesrel + coda + ggplot2 + ggridges + irr + jaspBase + jaspGraphs + LaplacesDemon + lme4 + MASS + psych + mirt + ]; + }; + jaspRobustTTests = buildJaspModule { + pname = "jaspRobustTTests"; + version = "0.95.0"; + hash = "sha256-nw+7eZycdJ+DHlLaTSBWdHocnaZk95PBqYj8sVFlPSg="; + deps = [ + RoBTT + ggplot2 + jaspBase + jaspGraphs + ]; + }; + jaspSem = buildJaspModule { + pname = "jaspSem"; + version = "0.95.0"; + hash = "sha256-+cgP6KqSK4tXQ+Dg6OTEoXfzEJFNdnwAat6tyWyzSkU="; + deps = [ + forcats + ggplot2 + lavaan + cSEM + reshape2 + jaspBase + jaspGraphs + semPlot + semTools + stringr + tibble + tidyr + SEMsens + ]; + }; + jaspSummaryStatistics = buildJaspModule { + pname = "jaspSummaryStatistics"; + version = "0.95.0"; + hash = "sha256-VuBDJtkDifDeatY3eX5RBd5ix6fB0QnJ1ZoM7am9SOA="; + deps = [ + BayesFactor + bstats + jaspBase + jaspFrequencies + jaspGraphs + jaspRegression + jaspTTests + jaspAnova + jaspDescriptives + SuppDists + bayesplay + ]; + }; + jaspSurvival = buildJaspModule { + pname = "jaspSurvival"; + version = "0.95.0"; + hash = "sha256-IVN3Tcd+OgD4pancwyNomQMOfOvUnKIWG/nxKdjNxcw="; + deps = [ + survival + ggsurvfit + flexsurv + jaspBase + jaspGraphs + ]; + }; + jaspTTests = buildJaspModule { + pname = "jaspTTests"; + version = "0.95.0"; + hash = "sha256-CLrfa5X/q2Ruc+y3ruHnT/NhYQ4ESvxtJCH2JM/hf4o="; + deps = [ + BayesFactor + car + ggplot2 + jaspBase + jaspGraphs + logspline + plotrix + plyr + ]; + }; + jaspTestModule = buildJaspModule { + pname = "jaspTestModule"; + version = "0.95.0"; + hash = "sha256-r+VzUxfvWYl/Fppq/TxCw1jI8F3dohsvb6qwlQHlFDA="; + deps = [ + jaspBase + jaspGraphs + svglite + stringi + ]; + }; + jaspTimeSeries = buildJaspModule { + pname = "jaspTimeSeries"; + version = "0.95.0"; + hash = "sha256-hQh9p6mX3NlkToh4uQRbPtwpNLlVwsILxH+9D2caZXk="; + deps = [ + jaspBase + jaspGraphs + jaspDescriptives + forecast + ]; + }; + jaspVisualModeling = buildJaspModule { + pname = "jaspVisualModeling"; + version = "0.95.0"; + hash = "sha256-MX3NvfVoFPp2NLWYIYIoCdWKHxpcRhfyMCWj3VdIBC0="; + deps = [ + flexplot + jaspBase + jaspGraphs + jaspDescriptives + ]; + }; }; } diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 8304009e20ee..9ab3be87e49d 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -14,6 +14,7 @@ boost, freexl, libarchive, + librdata, qt6, R, readstat, @@ -21,14 +22,14 @@ }: let - version = "0.19.3"; + version = "0.95.0"; src = fetchFromGitHub { owner = "jasp-stats"; repo = "jasp-desktop"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo="; + hash = "sha256-RR7rJJb0qKqZs7K3zP6GxlDXpmSNnGQ3WDExUgm9pKQ="; }; moduleSet = import ./modules.nix { @@ -37,7 +38,7 @@ let jasp-version = version; }; - inherit (moduleSet) engine modules; + inherit (moduleSet) jaspBase modules; # Merges ${R}/lib/R with all used R packages (even propagated ones) customREnv = buildEnv { @@ -45,12 +46,12 @@ let paths = [ "${R}/lib/R" rPackages.RInside - engine.jaspBase # Should already be propagated from modules, but include it again, just in case + jaspBase # Should already be propagated from modules, but include it again, just in case ] ++ lib.attrValues modules; }; - modulesDir = linkFarm "jasp-${version}-modules" ( + moduleLibs = linkFarm "jasp-${version}-module-libs" ( lib.mapAttrsToList (name: drv: { name = name; path = "${drv}/library"; @@ -89,6 +90,7 @@ stdenv.mkDerivation { customREnv freexl libarchive + librdata readstat qt6.qtbase @@ -102,20 +104,17 @@ stdenv.mkDerivation { env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib"; postInstall = '' - # Remove unused cache locations - rm -r $out/lib64 $out/Modules - # Remove flatpak proxy script rm $out/bin/org.jaspstats.JASP substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \ --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP" # symlink modules from the store - ln -s ${modulesDir} $out/Modules + ln -s ${moduleLibs} $out/Modules/module_libs ''; passthru = { - inherit modules engine; + inherit jaspBase modules; env = customREnv; }; diff --git a/pkgs/by-name/li/librdata/gettext-fix.patch b/pkgs/by-name/li/librdata/gettext-fix.patch new file mode 100644 index 000000000000..9f048d9b7e83 --- /dev/null +++ b/pkgs/by-name/li/librdata/gettext-fix.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 19bd5be..d12a927 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,6 @@ AC_ARG_ENABLE([sanitizers], AS_HELP_STRING([--enable-sanitizers], [Enable addres + [SANITIZERS="-fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp"], [SANITIZERS=""]) + AC_SUBST([SANITIZERS]) + +-AM_ICONV + + AC_CANONICAL_HOST + AS_CASE([$host], diff --git a/pkgs/by-name/li/librdata/package.nix b/pkgs/by-name/li/librdata/package.nix new file mode 100644 index 000000000000..fc077f2fb698 --- /dev/null +++ b/pkgs/by-name/li/librdata/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation { + pname = "librdata"; + version = "0-unstable-2023-10-03"; + + src = fetchFromGitHub { + owner = "WizardMac"; + repo = "librdata"; + rev = "33bd276ecb0bbcd8997ccc71a544149b3da0d940"; + hash = "sha256-njTlKK++v7IbaRWJw8hWpE4tXh8MjPRijacqor7Rwes="; + }; + + patches = [ ./gettext-fix.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + description = "Read and write R data frames from C"; + homepage = "https://github.com/WizardMac/librdata"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch new file mode 100644 index 000000000000..1ed9b4a97b7a --- /dev/null +++ b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch @@ -0,0 +1,48 @@ +From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Fri, 4 Jul 2025 15:51:14 +1000 +Subject: [PATCH] lkl: fix hijack and zpoline parallel builds + +This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests +build barrier") tracked via https://github.com/lkl/linux/issues/558. +The hijack and zpoline libraries also share object files, so need a +barrier to avoid parallel build failures. + +Signed-off-by: David Disseldorp +--- + tools/lkl/Makefile | 7 ++++--- + tools/lkl/Targets | 2 ++ + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile +index 9ca22b7605e3ad..dfe7f6aef5fe02 100644 +--- a/tools/lkl/Makefile ++++ b/tools/lkl/Makefile +@@ -176,10 +176,11 @@ headers_install: $(TARGETS) + include/lkl_config.h $(DESTDIR)$(INCDIR) ; \ + cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR) + +-libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a +- $(call QUIET_INSTALL, libraries) \ ++libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a ++ # filter out special .WAIT targets from install ++ $(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \ + install -d $(DESTDIR)$(LIBDIR) ; \ +- install -m 644 $^ $(DESTDIR)$(LIBDIR) ++ install -m 644 $^ $(DESTDIR)$(LIBDIR)) + + programs_install: $(call expand-targets,$(progs-y),$(EXESUF)) + $(call QUIET_INSTALL, programs) \ +diff --git a/tools/lkl/Targets b/tools/lkl/Targets +index 3d30bd8be3c840..089a832ee23627 100644 +--- a/tools/lkl/Targets ++++ b/tools/lkl/Targets +@@ -2,6 +2,8 @@ libs-y += lib/liblkl + + ifneq ($(LKL_HOST_CONFIG_BSD),y) + libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack ++# hijack and zpoline targets share object files, breaking parallel builds ++libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT + libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline + endif + LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs diff --git a/pkgs/by-name/lk/lkl/package.nix b/pkgs/by-name/lk/lkl/package.nix index 5c545428ef5e..2585c2d3a62a 100644 --- a/pkgs/by-name/lk/lkl/package.nix +++ b/pkgs/by-name/lk/lkl/package.nix @@ -43,6 +43,14 @@ stdenv.mkDerivation { libarchive ]; + patches = [ + # Fix corruption in hijack and zpoline libraries when building in parallel, + # because both hijack and zpoline share object files, which may result in + # missing symbols. + # https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8 + ./fix-hijack-and-zpoline-parallel-builds.patch + ]; + postPatch = '' # Fix a /usr/bin/env reference in here that breaks sandboxed builds patchShebangs arch/lkl/scripts diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 26985e209485..a6b9f8450d9f 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc="; + hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A="; }; strictDeps = true; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index 931dcc94576a..da8a7908cf37 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ly"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "AnErrupTion"; repo = "ly"; tag = "v${finalAttrs.version}"; - hash = "sha256-q/MFI02YdAkPdkbi8FtsM46MNalraz2MJf4Oav3fCZA="; + hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/by-name/me/meerk40t-camera/package.nix similarity index 67% rename from pkgs/applications/misc/meerk40t/camera.nix rename to pkgs/by-name/me/meerk40t-camera/package.nix index 6e33c8077c66..befee442bf31 100644 --- a/pkgs/applications/misc/meerk40t/camera.nix +++ b/pkgs/by-name/me/meerk40t-camera/package.nix @@ -1,13 +1,10 @@ { lib, - python3, + python3Packages, fetchPypi, }: -let - inherit (python3.pkgs) buildPythonPackage; -in -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "meerk40t-camera"; version = "0.1.9"; format = "setuptools"; @@ -21,7 +18,7 @@ buildPythonPackage rec { sed -i '/meerk40t/d' setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ opencv4 ]; @@ -31,10 +28,10 @@ buildPythonPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "MeerK40t camera plugin"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/meerk40t/meerk40t-camera"; - maintainers = with maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/by-name/me/meerk40t/package.nix similarity index 90% rename from pkgs/applications/misc/meerk40t/default.nix rename to pkgs/by-name/me/meerk40t/package.nix index a7c9c9aa4b9f..810655eb1d47 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/by-name/me/meerk40t/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "meerk40t"; - repo = pname; + repo = "MeerK40t"; tag = version; hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs="; }; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; # https://github.com/meerk40t/meerk40t/blob/main/setup.py - propagatedBuildInputs = + dependencies = with python3Packages; [ meerk40t-camera @@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec { export HOME=$TMPDIR ''; - meta = with lib; { - changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}"; + meta = { + changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}"; description = "MeerK40t LaserCutter Software"; mainProgram = "meerk40t"; homepage = "https://github.com/meerk40t/meerk40t"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 8d43945a4dda..c63398ee6cbe 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.63.0"; + version = "3.63.3"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-29jEfzS/hJQKX6P3VL/Wy+0/3DFmOKFj4RTTGkVhXXM="; + hash = "sha256-Z9KVHD0LEz/6Mu6+pSlWZ8ie2p/qJ9DuFkG3xqxN0G4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index accbb1f514c7..db8e0cba01d8 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -45,8 +45,12 @@ stdenv.mkDerivation rec { expat ]; - # Needed with GCC 12 - env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=uninitialized" + # Needed with GCC 14 + "-Wno-error=maybe-uninitialized" + ]; postInstall = '' mkdir -p $out/share/osrm-backend diff --git a/pkgs/by-name/pa/paraview/package.nix b/pkgs/by-name/pa/paraview/package.nix new file mode 100644 index 000000000000..1c45ad96b1a3 --- /dev/null +++ b/pkgs/by-name/pa/paraview/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + ninja, + qt6Packages, + protobuf, + vtk-full, + testers, +}: +let + paraviewFilesUrl = "https://www.paraview.org/files"; + doc = fetchurl { + url = "${paraviewFilesUrl}/v6.0/ParaViewGettingStarted-6.0.0.pdf"; + name = "GettingStarted.pdf"; + hash = "sha256-2ghvb0UXa0Z/YGWzCchB1NKowRdlC/ZQCI3y0tZUdbo="; + }; + examples = fetchurl { + # see https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/v6.0.0/versions.cmake?ref_type=tags#L21 + url = "${paraviewFilesUrl}/data/ParaViewTutorialData-20220629.tar.gz"; + hash = "sha256-OCLvWlwhBL9R981zXWZueMyXVeiqbxsmUYcwIu1doQ4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "paraview"; + version = "6.0.0"; + + src = fetchurl { + url = "${paraviewFilesUrl}/v${lib.versions.majorMinor finalAttrs.version}/ParaView-v${finalAttrs.version}.tar.xz"; + hash = "sha256-DuB65jd+Xpd2auv4WOuXWGaKUt8EHzGefJdQN6Y78Yk="; + }; + + # When building paraview with external vtk, we can not infer resource_dir + # from the path of vtk's libraries. Thus hardcoding the resource_dir. + # See https://gitlab.kitware.com/paraview/paraview/-/issues/23043. + postPatch = '' + substituteInPlace Remoting/Core/vtkPVFileInformation.cxx \ + --replace-fail "return resource_dir;" "return \"$out/share/paraview\";" + ''; + + nativeBuildInputs = [ + cmake + ninja + qt6Packages.wrapQtAppsHook + vtk-full.vtkPackages.python3Packages.pythonRecompileBytecodeHook + ]; + + # propagation required by paraview-config.cmake + propagatedBuildInputs = [ + qt6Packages.qttools + qt6Packages.qt5compat + protobuf + vtk-full + ]; + + cmakeFlags = [ + (lib.cmakeBool "PARAVIEW_VERSIONED_INSTALL" false) + (lib.cmakeBool "PARAVIEW_BUILD_WITH_EXTERNAL" true) + (lib.cmakeBool "PARAVIEW_USE_EXTERNAL_VTK" true) + (lib.cmakeBool "PARAVIEW_USE_QT" true) + (lib.cmakeBool "PARAVIEW_USE_MPI" true) + (lib.cmakeBool "PARAVIEW_USE_PYTHON" true) + (lib.cmakeBool "PARAVIEW_ENABLE_WEB" true) + (lib.cmakeBool "PARAVIEW_ENABLE_CATALYST" true) + (lib.cmakeBool "PARAVIEW_ENABLE_VISITBRIDGE" true) + (lib.cmakeBool "PARAVIEW_ENABLE_ADIOS2" true) + (lib.cmakeBool "PARAVIEW_ENABLE_FFMPEG" true) + (lib.cmakeBool "PARAVIEW_ENABLE_FIDES" true) + (lib.cmakeBool "PARAVIEW_ENABLE_ALEMBIC" true) + (lib.cmakeBool "PARAVIEW_ENABLE_LAS" true) + (lib.cmakeBool "PARAVIEW_ENABLE_GDAL" true) + (lib.cmakeBool "PARAVIEW_ENABLE_PDAL" true) + (lib.cmakeBool "PARAVIEW_ENABLE_OPENTURNS" true) + (lib.cmakeBool "PARAVIEW_ENABLE_MOTIONFX" true) + (lib.cmakeBool "PARAVIEW_ENABLE_OCCT" true) + (lib.cmakeBool "PARAVIEW_ENABLE_XDMF3" true) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/paraview/doc") + ]; + + postInstall = '' + install -Dm644 ${doc} $out/share/paraview/doc/${doc.name} + mkdir -p $out/share/paraview/examples + tar --strip-components=1 -xzf ${examples} -C $out/share/paraview/examples + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 ../Qt/Components/Resources/Icons/pvIcon.svg $out/share/icons/hicolor/scalable/apps/paraview.svg + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s ../Applications/paraview.app/Contents/MacOS/paraview $out/bin/paraview + ''; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "ParaView" ]; + + package = finalAttrs.finalPackage; + + nativeBuildInputs = [ + qt6Packages.wrapQtAppsHook + ]; + }; + }; + + meta = { + description = "3D Data analysis and visualization application"; + homepage = "https://www.paraview.org"; + changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version)}-release-notes"; + mainProgram = "paraview"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + guibert + qbisi + ]; + }; +}) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 9c54b6b68acd..a19db2e1c133 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.2.7"; + version = "12.3.0"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8="; + hash = "sha256-t1BABpCkWqnjIE25HNzh/oWE5uYRUtm824t3dPtWq8w="; }; - vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY="; + vendorHash = "sha256-nXVaLzbUDqrmWW+uvuHkUBBC0Spp8UxX40ifTbUq8MA="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 689822e6500c..3e115a19e3ab 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-Epix3gqQGc8MXMcoQ1YxrEXafuPZUOTKdute5eoJ2nI="; + hash = "sha256-Kjzutah8CIHN3NZcxGB1FXlCNn5dnTQxJITUptaXNrs="; }; installPhase = '' diff --git a/pkgs/by-name/pl/platform-folders/package.nix b/pkgs/by-name/pl/platform-folders/package.nix index 5fa41c391595..7c5efe394074 100644 --- a/pkgs/by-name/pl/platform-folders/package.nix +++ b/pkgs/by-name/pl/platform-folders/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "platform-folders"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sago007"; repo = "PlatformFolders"; rev = version; - hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA="; + hash = "sha256-8dKW9nmxiqt47Z9RBNuHjFRyOhwmi+9mR7prUOxXIRE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 01c22a518f07..840989b77280 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.78.0"; + version = "0.78.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y="; + hash = "sha256-R6Z201767c61S/KAMtArzIuPjQbXMVym8KLZKMVdr+M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index a119d4ee6fcc..5e2615bb1309 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.6"; + version = "1.36.7"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI="; + hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 8fdc51f28bcf..86d4e9278f86 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.5.6"; + version = "4.6.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xoBGYdcef1xBlPlUOPudhX0t59OBbNavcg5CeRJiQIY="; + hash = "sha256-+nweRMHwQbt/Nn/i0P3s7kziP7Z8RnEszqcVzjTthes="; }; - cargoHash = "sha256-o/wbBp2gIl+Dyxnee7mChVzv5qmrVAcG95i9YMxd5AI="; + cargoHash = "sha256-u86v7DeWCdeODP+mHL0mYvas1lpCEWuI15ua1LUzDak="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index c82bac90aa1a..97c5f1233196 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-VgthpzZNFBIV4SwikmHJkRsuEP0j16hVt+CxOBuOy6s="; + hash = "sha256-nk4orzkmgKQ6UfRpA9suh7FxiPh4P+F4NagY22if5Iw="; }; - cargoHash = "sha256-HO4DXuCs/Jtz7kzp3jn/X/75Zdh9gS0ZO3eS9GFCbXA="; + cargoHash = "sha256-LvdFKguUMplNbJLh6CTy6enfg1PGqjawku/tBjwf30o="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 552c3d2e0abf..19adc8192e57 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no="; + hash = "sha256-s7HoPuye31zATAtekWAqJz8gc/vy+vWoM68QwpjdH3o="; }; - cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk="; + cargoHash = "sha256-jkwi533Vem62vxq47EXIy/2mTHMB61DGmUyQfm3/BCE="; env = { PROTOC = lib.getExe protobuf; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 65a8b8b72d03..65e12de00778 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-07-29"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "fc421183a024cb3abb4c3343ed7a1954f53e4511"; - hash = "sha256-V4sjCCie5LKXQTrso8ysFDCQJ60BUx/+OHuB9ntFLUs="; + rev = "d57b86769653ae2651533dbc2a1ffe25b119b801"; + hash = "sha256-+bcjZVwsuHnKtKkM+4vd5fY6xLidpOKXMxMQuBLwbKo="; }; dontConfigure = true; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index cb9d21b9766c..3a3304f5f956 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; tag = "v${version}"; - hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA="; + hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I="; }; - cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY="; + cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index d15226c28f31..24dfc89e8da8 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.4.2"; + version = "0.4.5"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-JOrBQvrnA/qSmI+jJjGjcxEWFDCfiUmtJaZPI3N0rMk="; + hash = "sha256-gGHAkNFEkcbWqel3kr6fUiUDHwZJdf9FLHfQjD9RPUc="; }; - cargoHash = "sha256-zGP8m05g6zEQ/dx9ChLhUCM2x9q3bltPW+9ku05rzCE="; + cargoHash = "sha256-qbn/s5wMRt0Qj/H4SVP8fCcb5cMAXETzuPm68NdgkBE="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index e659f665026f..a1d7d2c748d0 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "secretspec"; - version = "0.2.0"; + version = "0.3.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-6a3BerjcLn86XCakyYlMm4FUUQTc7iq/hCvZEbHnp4g="; + hash = "sha256-CYIAbp6O2e8WQcaffJ6fNY0hyKduu9mfH4xkC6ZEEWU="; }; - cargoHash = "sha256-4sKja7dED1RuiRYA2BNqvvYlJhPFiM8IzAgQVeSa9Oc="; + cargoHash = "sha256-cKV4rrIBKPPNfBeHdZ6K8+2yU5gznPGSlFcHfKVCnNM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix index f16eda87dca0..96f481984d75 100644 --- a/pkgs/by-name/sh/sherlock-launcher/package.nix +++ b/pkgs/by-name/sh/sherlock-launcher/package.nix @@ -13,6 +13,7 @@ gdk-pixbuf, librsvg, nix-update-script, + wrapGAppsHook4, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config glib + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 2381bb3967e2..a1e81a57f949 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0="; + hash = "sha256-KgJ22Q0+tAfO6fHLYBM5mxqYJjjfmIb7hY+FcQM4j3c="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg="; + cargoHash = "sha256-H9hCYPpsefLu35RIr3qURmrwnAOIevsd2E5LkK6Ay+4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/snpeff/package.nix b/pkgs/by-name/sn/snpeff/package.nix index c5706f22fd11..554c517fd2f1 100644 --- a/pkgs/by-name/sn/snpeff/package.nix +++ b/pkgs/by-name/sn/snpeff/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar" makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar" + # camelCase is the default + ln -s $out/bin/snpeff $out/bin/snpEff + ln -s $out/bin/snpsift $out/bin/snpSift ''; meta = with lib; { diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 48c92f4e6ed9..bb072cb504c3 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.37"; + version = "1.0.38"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-S7aihKoeP1zJpMd+mdb6D9QEtFBghyVU+K0nSzGd2ew="; + hash = "sha256-40yhEOgIfb2PalrNYn10QMW5oHsxJZwHRoal8//GDnk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 45fbb404ec6b..75dd0646e308 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "task-keeper"; - version = "0.29.3"; + version = "0.30.1"; src = fetchFromGitHub { owner = "linux-china"; repo = "task-keeper"; tag = "v${version}"; - hash = "sha256-89KR1u4aTd32tGPiW4qUUk9eC7d9pGSBuZ8C8QVgMQ4="; + hash = "sha256-/ZmwCvoYdX733c5QkUE0KuUdHeibJkXD5wNHR7Cr7aU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-eLdGLKem/Sh9cQ7TRbKymUIldpctBKk1JBjWiSwLloo="; + cargoHash = "sha256-Z56p2jeHvNAT4Pwl8kt1l9RopYCKk5Tt/XWZ7AqIFYw="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index a9b3ba9fb0d1..99ed16059053 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -2,22 +2,35 @@ lib, rustPlatform, fetchFromGitHub, + makeWrapper, testers, television, nix-update-script, + extraPackages ? [ ], }: rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.11.9"; + version = "0.13.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s="; + hash = "sha256-Ur6UTd3XsI2ZyVboQA9r3WDkl7hd1wQ0NCgTlYFF/C0="; }; - cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ="; + cargoHash = "sha256-LfaYRrJ4ZXoNVDsI650t+A7mWB9+2+znATp+mqDwTiE="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = lib.optionalString (extraPackages != [ ]) '' + wrapProgram $out/bin/tv \ + --prefix PATH : ${lib.makeBinPath extraPackages} + ''; + + # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them + # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941 + doCheck = false; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 5917a06ec4dd..a10f60404767 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tidy-viewer"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; rev = version; - sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; + sha256 = "sha256-ZiwZS7fww1dphEhJsScFfu1sBs35CB9LsGnI3qsyvrk="; }; - cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds="; + cargoHash = "sha256-Cd3yNqDZcvaO8H9IwSOvZ+HGQ85fubbBYztOCgy60ls="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/by-name/vi/vial/package.nix b/pkgs/by-name/vi/vial/package.nix index 4586ca25d039..a1e6c450d136 100644 --- a/pkgs/by-name/vi/vial/package.nix +++ b/pkgs/by-name/vi/vial/package.nix @@ -4,12 +4,12 @@ appimageTools, }: let - version = "0.7.4"; + version = "0.7.5"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-SxZC+ihJsmIQAZ31G6wS42qTxdt1/8lx80bHox3sy28="; + hash = "sha256-sN8i/MOPhaLZ4iJNKz/MdpRIGTZVV/G5qD7o+ID8dAM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index a0cfd095817c..cbc548582c4d 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=", + "version": "0.2025.08.06.08.12.stable_01" }, "linux_x86_64": { - "hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=", + "version": "0.2025.08.06.08.12.stable_01" }, "linux_aarch64": { - "hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=", + "version": "0.2025.08.06.08.12.stable_01" } } diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 35dea3a7130e..6fb1c4692905 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.3"; + version = "1.40.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-0IyFSdOam+ft9PRs6j2IdzPWI9CexUHwocbiOgZXLuE="; + hash = "sha256-17alwgsvFrR7RChEr8po4K7t9t3aZnvFbLUGsEtUXdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 166eaba86ea4..731c78292b68 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.17"; + version = "0.8.29"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM="; + hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY="; }; pythonRelaxDeps = [ @@ -84,5 +84,7 @@ buildPythonPackage rec { changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; + # https://github.com/mpenning/ciscoconfparse2/issues/19 + broken = lib.versionAtLeast hier-config.version "3"; }; } diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix index 0767727a927b..844ba0f6de2d 100644 --- a/pkgs/development/python-modules/fastapi-mcp/default.nix +++ b/pkgs/development/python-modules/fastapi-mcp/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "fastapi-mcp"; - version = "0.3.7"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "tadata-org"; repo = "fastapi_mcp"; tag = "v${version}"; - hash = "sha256-WQ+Y/TM5fz0lHjCKvEuYGY6hzxo2ePcgRnq7piNC+KQ="; + hash = "sha256-TCmM5n6BF3CWEuGVSZnUL2rTYitKtn4vSCkiQvKFLKw="; }; build-system = [ @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = { description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth"; homepage = "https://github.com/tadata-org/fastapi_mcp"; - changelog = "https://github.com/tadata-org/fastapi_mcp/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/tadata-org/fastapi_mcp/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index faaab1ce7e80..f395d6b61d2c 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -8,7 +8,10 @@ # dependencies click, + langgraph, + langgraph-runtime-inmem, langgraph-sdk, + python-dotenv, # testing pytest-asyncio, @@ -40,21 +43,20 @@ buildPythonPackage rec { langgraph-sdk ]; - # Not yet. Depemnds on `langgraph-runtime-inmem` which isn't in github yet - # https://github.com/langchain-ai/langgraph/issues/5802 - # optional-dependencies = { - # "inmem" = [ - # langgraph-api - # langgraph-runtime-inmem - # python-dotenv - # ] - # } + optional-dependencies = { + "inmem" = [ + langgraph + langgraph-runtime-inmem + python-dotenv + ]; + }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook docker-compose - ]; + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); enabledTestPaths = [ "tests/unit_tests" ]; diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix new file mode 100644 index 000000000000..87d660138956 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + blockbuster, + langgraph, + langgraph-checkpoint, + sse-starlette, + starlette, + structlog, +}: + +buildPythonPackage rec { + pname = "langgraph-runtime-inmem"; + version = "0.6.8"; + pyproject = true; + + # Not available in any repository + src = fetchPypi { + pname = "langgraph_runtime_inmem"; + inherit version; + hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + blockbuster + langgraph + langgraph-checkpoint + sse-starlette + starlette + structlog + ]; + + # Can remove after blockbuster version bump + # https://github.com/NixOS/nixpkgs/pull/431547 + pythonRelaxDeps = [ + "blockbuster" + ]; + + pythonImportsCheck = [ + "langgraph_runtime_inmem" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Inmem implementation for the LangGraph API server"; + homepage = "https://pypi.org/project/langgraph-runtime-inmem/"; + # no changelog + license = lib.licenses.elastic20; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/lib50/default.nix b/pkgs/development/python-modules/lib50/default.nix index 4dedfc40b05b..37a8b51eb111 100644 --- a/pkgs/development/python-modules/lib50/default.nix +++ b/pkgs/development/python-modules/lib50/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "lib50"; - version = "3.0.12"; + version = "3.1.1"; pyproject = true; # latest GitHub release is several years old. Pypi is up to date. src = fetchPypi { pname = "lib50"; inherit version; - hash = "sha256-Fc4Hb1AbSeetK3gH1/dRCUfHGDlMzfzgF1cnK3Se01U="; + hash = "sha256-DSAYgtce9lU9dlfLejdIH9K8jVeNaPl0wSqStMgwUD4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 82e3584482c8..97ab3ceefe0c 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.12.2"; + version = "1.12.4"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-K3S+2Z4yuo8eAOo8gDhrI8OOfV6ADH4dAb1h8PqYntc="; + hash = "sha256-FHVhufv4O7vM/9fNHyDU4L15dNLFMmoVaYd98Iw6l2o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 83fc4979cd11..08c8832a6c76 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -12,18 +12,20 @@ pytestCheckHook, python-dotenv, smolagents, + soundfile, + torchaudio, }: buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.10"; + version = "0.1.12"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-605e28p1rlJ5teCLxL/Lh8p5zV7cPuSzZWwfkE1gM5I="; + hash = "sha256-mU/zcNEHmPfSMEMgjj4u0iwmXBH2cJzGEANPxyiR1l0="; }; build-system = [ hatchling ]; @@ -35,12 +37,18 @@ buildPythonPackage rec { ]; optional-dependencies = { + audio = [ + torchaudio + soundfile + ]; + # crewai = [ crewai ]; langchain = [ langchain # langchain-anthropic langgraph ]; llamaindex = [ llama-index ]; + smolagents = [ smolagents ]; }; pythonImportsCheck = [ "mcpadapt" ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b92b558c588c..1ef0824e39b0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -130,8 +130,8 @@ rec { "sha256-xrpy1Eq+Kleg0oYEQY/UDXvUUdZp9B6rz4OrXo/A9bA="; mypy-boto3-appstream = - buildMypyBoto3Package "appstream" "1.40.0" - "sha256-TuIQx9qeu+JL1+Y3Gp83J4am1IYua7Ps40mqN8YLln8="; + buildMypyBoto3Package "appstream" "1.40.4" + "sha256-AgYaQp4AQUly5DO83NgCojU7cKOP5LdStYr1X3lMAE0="; mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.40.0" @@ -178,8 +178,8 @@ rec { "sha256-YZKJblhTzoW0I/ozKw+RzELF9nJ0+3Z/zjZhb/lEd80="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.40.0" - "sha256-nY9RvXgjyeNsiuVtM+2pWsc0kGuAggZNpkF7SXkHVwk="; + buildMypyBoto3Package "budgets" "1.40.4" + "sha256-6kCRDur13G+GTZK8R7gknc1J3L/E3YA4/xi+9qQhVp0="; mypy-boto3-ce = buildMypyBoto3Package "ce" "1.40.0" @@ -446,8 +446,8 @@ rec { "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.40.0" - "sha256-iyPAkVpfnqz2RX12klUOTH2NaFO/tAfiWFXLF+FHGe0="; + buildMypyBoto3Package "ec2" "1.40.4" + "sha256-fotmSGj+r85lJZPKq4UOc3OvCdnX0pO+qSQVQozxGJw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.40.0" @@ -974,8 +974,8 @@ rec { "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.40.0" - "sha256-IKxLTdH0V590cXVZ1JNdp3Hg4sFEs2ZAiAir4eicpZ4="; + buildMypyBoto3Package "opensearchserverless" "1.40.4" + "sha256-nkt68bkNRfKMeO9TJV/P5PGzy8ps4CZpYcF2LmDUs2c="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.40.0" diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 41723897cc1c..53590690dbec 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.20"; + version = "0.11.21"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-ZZTmWW0PZHk8Evhk6JnbAyl7RQOAxN4GwXUv5M6GfIQ="; + hash = "sha256-hb7Y/usg4JFRKsahKNV8rvjMGAN4xYEaaWsedGKcK+Y="; }; sourceRoot = "${src.name}/checkpoint"; diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix index 326906f3ab5e..51b9e629b86f 100644 --- a/pkgs/development/python-modules/py-ocsf-models/default.nix +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-ocsf-models"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "prowler-cloud"; repo = "py-ocsf-models"; tag = version; - hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M="; + hash = "sha256-6mVu508FyLUUqKTKSFHXnsna/KDMh3RXVQ051sqozQs="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix deleted file mode 100644 index bf2bf239145a..000000000000 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - openssl, -}: - -buildPythonPackage rec { - pname = "py-scrypt"; - version = "0.8.27"; - format = "setuptools"; - - src = fetchPypi { - pname = "scrypt"; - inherit version; - hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc="; - }; - - buildInputs = [ openssl ]; - doCheck = false; - - meta = with lib; { - description = "Bindings for scrypt key derivation function library"; - homepage = "https://pypi.python.org/pypi/scrypt"; - maintainers = [ ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 3213913fe641..236d7c69e553 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.32.0"; + version = "0.32.1"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-hVWyZv978hDjAOdk4S9S9RJOkxqhOL0ZBpi4wGk0h1c="; + hash = "sha256-P40m8ak0A2l4zGAYcbvXGidQpIT3+ayERbleWcVuLbE="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +51,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-ZUNAZsOpLdpdsKhIp/6QD3Ys7MOeO6H3ve8au7g+riU="; + hash = "sha256-rCaLREl2LSfpu0vwa1Vx2rQ7phWsGz58RTjo6yfHKLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix index 4f5c0f3a1e13..968a60515fc4 100644 --- a/pkgs/development/python-modules/pyobjc-core/default.nix +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyobjc-core"; - version = "11.0"; + version = "11.1"; pyproject = true; src = fetchFromGitHub { owner = "ronaldoussoren"; repo = "pyobjc"; tag = "v${version}"; - hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; }; sourceRoot = "${src.name}/pyobjc-core"; @@ -31,18 +31,6 @@ buildPythonPackage rec { darwin.DarwinTools # sw_vers ]; - # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we - # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. - postPatch = '' - for file in Modules/objc/test/*.m; do - substituteInPlace "$file" --replace "[[clang::suppress]]" "" - done - - substituteInPlace setup.py \ - --replace-fail "-buildversion" "-buildVersion" \ - --replace-fail "-productversion" "-productVersion" - ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${darwin.libffi.dev}/include" "-Wno-error=cast-function-type-mismatch" diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix index e6904460f4d1..a395f1069420 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyobjc-framework-Cocoa"; - version = "11.0"; + version = "11.1"; pyproject = true; src = fetchFromGitHub { owner = "ronaldoussoren"; repo = "pyobjc"; tag = "v${version}"; - hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; }; sourceRoot = "${src.name}/pyobjc-framework-Cocoa"; @@ -25,7 +25,6 @@ buildPythonPackage rec { buildInputs = [ darwin.libffi - darwin.DarwinTools ]; nativeBuildInputs = [ @@ -37,7 +36,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyobjc_setup.py \ --replace-fail "-buildversion" "-buildVersion" \ - --replace-fail "-productversion" "-productVersion" + --replace-fail "-productversion" "-productVersion" \ + --replace-fail "/usr/bin/sw_vers" "sw_vers" \ + --replace-fail "/usr/bin/xcrun" "xcrun" ''; dependencies = [ pyobjc-core ]; @@ -47,7 +48,13 @@ buildPythonPackage rec { "-Wno-error=unused-command-line-argument" ]; - pythonImportsCheck = [ "Cocoa" ]; + pythonImportsCheck = [ + "Cocoa" + "CoreFoundation" + "Foundation" + "AppKit" + "PyObjCTools" + ]; meta = with lib; { description = "PyObjC wrappers for the Cocoa frameworks on macOS"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 459edd42b611..8b36477d2342 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HvvWak7a2djF6wDJaHsBltaG1dTGbKH7wjsngO+fh2U="; + hash = "sha256-Ute8puO2qc679ttZgzQRnVO8OuBmYnqLT3y7faHpRgA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index eb702067ae81..1adb4250c10f 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.14.3"; + version = "1.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; tag = "v${version}"; - hash = "sha256-OcSR8iYwX1az5BFVNp6xHpVE//Nyk4Nk97SaxAMJQRI="; + hash = "sha256-tZu6NeoStPwZ1f+AlVws8iS3UwpKikxE6Es7WKlFQfw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix index 29f0037601d2..51bc7aac30ba 100644 --- a/pkgs/development/python-modules/scalar-fastapi/default.nix +++ b/pkgs/development/python-modules/scalar-fastapi/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "scalar-fastapi"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchPypi { pname = "scalar_fastapi"; inherit version; - hash = "sha256-r5GoX6f7Ru078WcRvGNyhyYDxL1w4yjbfHvlf+ZF/sc="; + hash = "sha256-z5ujaUfqGwQC/B+jEfMKaQs547rt7x97RVPPVwAtrOs="; }; build-system = [ diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix index df3ad53ff9cb..d85aaa43cb71 100644 --- a/pkgs/development/python-modules/scrypt/default.nix +++ b/pkgs/development/python-modules/scrypt/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.27"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; tag = "v${version}"; - hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M="; + hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix index a9a7210b8b7c..2e339d7e3f33 100644 --- a/pkgs/development/python-modules/smpclient/default.nix +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -1,31 +1,35 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, async-timeout, bleak, + buildPythonPackage, + fetchFromGitHub, intelhex, + poetry-core, + poetry-dynamic-versioning, pyserial, - smp, pytest-asyncio, pytestCheckHook, + smp, }: buildPythonPackage rec { pname = "smpclient"; - version = "4.5.0"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpclient"; tag = version; - hash = "sha256-Z0glcCy3JsL45iT8Q82Vtxozi3hv6xaRJvJ3BkHX4PQ="; + hash = "sha256-NQRVEvi/B+KdhPIzw8pm22uXpYPkoaatkCNFnEcibzo="; }; + pythonRelaxDeps = [ "smp" ]; + build-system = [ poetry-core + poetry-dynamic-versioning ]; dependencies = [ @@ -41,13 +45,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonRelaxDeps = [ - "smp" - ]; - - pythonImportsCheck = [ - "smpclient" - ]; + pythonImportsCheck = [ "smpclient" ]; meta = { description = "Simple Management Protocol (SMP) Client for remotely managing MCU firmware"; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index bc547c7101ce..83b0d6422235 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,9 +7,7 @@ ifaddr, lxml, mock, - nix-update-script, pytestCheckHook, - pythonOlder, requests, requests-mock, setuptools, @@ -18,16 +16,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.10"; + version = "0.30.11"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-BTDKn6JVqXfLiry6jES/OnsO3SGniEMWW2osf9veukU="; + hash = "sha256-x5WKG2KFBr0FQu28160qHB2ckKdpx0cKhgYTH6sLnuw="; }; build-system = [ setuptools ]; @@ -49,12 +45,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "soco" ]; - passthru.updateScript = nix-update-script { }; - meta = with lib; { description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; - changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}"; + changelog = "https://github.com/SoCo/SoCo/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/development/python-modules/speak2mary/default.nix b/pkgs/development/python-modules/speak2mary/default.nix new file mode 100644 index 000000000000..cb5bd25a4ffc --- /dev/null +++ b/pkgs/development/python-modules/speak2mary/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "speak2mary"; + version = "1.5.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5W2E/leT/IiXFVXD+LSPE99zGlz+yKm5XCv830rt8O0="; + }; + + build-system = [ setuptools ]; + + # Tests require a running MaryTTS server + doCheck = false; + + pythonImportsCheck = [ "speak2mary" ]; + + meta = { + description = "Python wrapper for a running MaryTTS server"; + homepage = "https://github.com/Poeschl/speak2mary"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index ddc59e0bc060..08c8964a51f8 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-zoKULi12vIKMzPRE6I4Rtq4dVQL/GfNFjHR+BId1ADg="; + hash = "sha256-Qisp5RTfcKr6W9K6FDFUHMqICSpVshsrZWwpDEgTTQM="; }; dependencies = [ diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index fce0a2c3baca..84f96cdfc1e7 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { version = "65.1"; pyproject = true; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "Kozea"; repo = "WeasyPrint"; @@ -112,10 +114,5 @@ buildPythonPackage rec { homepage = "https://weasyprint.org/"; license = lib.licenses.bsd3; teams = [ lib.teams.apm ]; - badPlatforms = [ - # Fatal Python error: Segmentation fault - # "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index a3ebc1d70688..e2c8c4f5b456 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "jetify-com"; repo = pname; rev = version; - hash = "sha256-LAYGjpaHxlolzzpilD3DOvd+J0eNJ0p+VdRayGQvUWo="; + hash = "sha256-ANbIwR3XiphHbaeg3YtwtHZ9UbwK3BOnPb5ZF1EJtEw="; }; ldflags = [ @@ -27,7 +27,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-cBRdJUviqtzX1W85/rZr23W51mdjoEPCwXxF754Dhqw="; + vendorHash = "sha256-0lDPK9InxoQzndmQvhKCYvqEt2NL2A+rt3sGg+o1HTY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1768aa98e226..192f8ff35901 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.3.2"; + version = "3.3.3"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo="; + hash = "sha256-B3bwHV+f6IuoNESz5B4ij5KsIcCcpUPmoSnJeJj0J0Y="; }; # Don't build and install html documentation diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 2ea83e49054b..d183f505b3c6 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -7,11 +7,6 @@ crt ? stdenv.hostPlatform.libc, }: -assert lib.assertOneOf "crt" crt [ - "msvcrt" - "ucrt" -]; - stdenv.mkDerivation { pname = "mingw-w64"; inherit (mingw_w64_headers) version src meta; diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 2cb86651fc86..a60455b38700 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,20 +1,17 @@ { lib, + nixosTests, stdenvNoCC, fetchurl, crt ? stdenvNoCC.hostPlatform.libc, }: -assert lib.assertOneOf "crt" crt [ - "msvcrt" - "ucrt" -]; stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; - version = "12.0.0"; + version = "13.0.0"; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2"; - hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8="; + hash = "sha256-Wv6CKvXE7b9n2q9F7sYdU49J7vaxlSTeZIl8a5WCjK8="; }; configureFlags = [ @@ -25,6 +22,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { cd mingw-w64-headers ''; + passthru = { + tests = { + inherit (nixosTests) wine; + }; + updateScript = ./update.nu; + }; + meta = { homepage = "https://www.mingw-w64.org/"; downloadPage = "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/"; diff --git a/pkgs/os-specific/windows/mingw-w64/update.nu b/pkgs/os-specific/windows/mingw-w64/update.nu new file mode 100755 index 000000000000..4862aae5e37e --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/update.nu @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i nu -p nushell nix + +use std/log + +def replace [ p: path old: string new: string ] { + open $p + | str replace $old $new + | save -f $p +} + +def eval [ attr: string ] { + with-env { + NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1 + } { + nix eval -f ./. $attr --json + } + | from json +} + +def main [] { + # List of all the link in the RSS feed for + # https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/ + let links = http get https://sourceforge.net/projects/mingw-w64/rss?path=/mingw-w64/mingw-w64-release/ + | from xml + | get content.content.0 + | where tag == item + | get content + | flatten + | where tag == title + | get content + | flatten + | get content + + # Select only files ending in "tar.bz2", then select the largest value + # We only consider values with at least two digits cause they are at + # 13.0 and sorting strings doesn't work well if they aren't the same length + let newest = $links + | where { ($in | str ends-with "tar.bz2") and ($in =~ v[0-9][0-9]\.) } + | sort -r + | get 0 + + # Extract the newest version out of the URL + let new_version = $newest + | split column / + | get column4.0 + | split column - + | get column3.0 + | str replace .tar.bz2 "" + | str trim -c v + + # Get the current version in the drv + let current_version = eval "windows.mingw_w64_headers.version" + + if $new_version == $current_version { + log info "Current mingw-w64 version matches the latest, exiting..." + return + } else { + log info $"Current version is ($current_version)\nLatest version is ($new_version)" + } + + # Get the current hash + let current_hash = eval "windows.mingw_w64_headers.src.outputHash" + + # Set to the new version + replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_version $new_version + + # The nix derivation creates the URL from the version, so just grab that. + let new_url = eval "windows.mingw_w64_headers.src.url" + + # Prefetch to get the new hash + let new_hash = nix-prefetch-url --type sha256 $new_url + | nix hash to-sri --type sha256 $in + + # Set the hash + replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_hash $new_hash +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e262729f73f5..860bcd7a25c2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3406,7 +3406,8 @@ ]; "marytts" = ps: with ps; [ - ]; # missing inputs: speak2mary + speak2mary + ]; "mastodon" = ps: with ps; [ mastodon-py @@ -7290,6 +7291,7 @@ "mailgun" "manual" "manual_mqtt" + "marytts" "mastodon" "matrix" "matter" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a6e76744170..aff3d98cf731 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12304,10 +12304,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - meerk40t = callPackage ../applications/misc/meerk40t { }; - - meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; @@ -13132,8 +13128,6 @@ with pkgs; parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; - pekwm = callPackage ../by-name/pe/pekwm/package.nix { awk = gawk; grep = gnugrep; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 759d13f186ff..86a82c4d1153 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -616,7 +616,7 @@ mapAliases ({ Pyro5 = pyro5; # added 2023-02-19 PyRSS2Gen = pyrss2gen; # added 2023-02-19 pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 - py_scrypt = py-scrypt; # added 2024-01-07 + py-scrypt = scrypt; # added 2025-08-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 999ffb46090f..92610a8ce204 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7892,6 +7892,8 @@ self: super: with self; { langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { }; + langgraph-runtime-inmem = callPackage ../development/python-modules/langgraph-runtime-inmem { }; + langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { }; langid = callPackage ../development/python-modules/langid { }; @@ -12272,8 +12274,6 @@ self: super: with self; { py-schluter = callPackage ../development/python-modules/py-schluter { }; - py-scrypt = callPackage ../development/python-modules/py-scrypt { }; - py-serializable = callPackage ../development/python-modules/py-serializable { }; py-slvs = callPackage ../development/python-modules/py-slvs { }; @@ -16865,6 +16865,8 @@ self: super: with self; { spdx-tools = callPackage ../development/python-modules/spdx-tools { }; + speak2mary = callPackage ../development/python-modules/speak2mary { }; + speaklater = callPackage ../development/python-modules/speaklater { }; speaklater3 = callPackage ../development/python-modules/speaklater3 { };