diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4432311f920d..7401acb68b2b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19070,6 +19070,12 @@ github = "Nemin32"; githubId = 2953293; }; + nemith = { + email = "nix@brbe.me"; + github = "nemith"; + githubId = 349360; + name = "Brandon Bennett"; + }; neosimsim = { email = "me@abn.sh"; github = "neosimsim"; diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index e262ee5e8535..05bdb9677f23 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -15,20 +15,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.4.tar.gz"; - hash = "sha256-uG3a46P9bCr7rKFgo7fVT0tPptE2GsJha9t6ZBZjLqE="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.tar.gz"; + hash = "sha256-9X09uplwx3TPN3WDYprqVAQY5nfsY2VXDnbeqcsvP5s="; }; aarch64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.4-aarch64.tar.gz"; - hash = "sha256-d72Gs32hU20h66HsvmL10uI9+vliAbJOEVqxi5hzepI="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.tar.gz"; + hash = "sha256-wjX2ZMNcIEIsOrKMhQuG6kq3oF2d+cAnWBo6jJi+QBs="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.4.dmg"; - hash = "sha256-cYDCzPYh1/S77SCx9xctQfBQYSv2aS0o7VOeu+7limQ="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.dmg"; + hash = "sha256-dN5eiknRaqGJIRWmdQbfO5MriAbGa6SU7Vc6cpAcGJk="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2025.3.4-aarch64.dmg"; - hash = "sha256-POxaLX5XfjIIEGAe7Qv2mpYo8/G4KjPkC/ZHIjG/xrg="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.dmg"; + hash = "sha256-kPKuyj/QFzECs9JzSthjYCuxcUbDF/4tiLBhj9R+pgA="; }; }; # update-script-end: urls @@ -43,8 +43,8 @@ mkJetBrainsProduct { productShort = "IDEA"; # update-script-start: version - version = "2025.3.4"; - buildNumber = "253.32098.37"; + version = "2026.1"; + buildNumber = "261.22158.277"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index a188935fda19..7d3bc000554b 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -18,20 +18,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.4.tar.gz"; - hash = "sha256-FRyVijhsm2JOwPT9u4DNOPZMayIn0EjQdy1TWRdmYLs="; + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5.tar.gz"; + hash = "sha256-2yEZOWUoD6ELs0WSvdMSZSVAmA/LsoKyfJiR20I86aQ="; }; aarch64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.4-aarch64.tar.gz"; - hash = "sha256-MNmyf6wTy1jsos3KIBuu7IZqe2IFJEL5FxqWuh5Whnk="; + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5-aarch64.tar.gz"; + hash = "sha256-tl8lxMH6XH+2VGqv6vxGEjjALevaEl7VAzs9LAjwtPQ="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.4.dmg"; - hash = "sha256-U2pGxWaKp68U2gPfZCqbpjks7iM5PT1lGMxHzBFifMA="; + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5.dmg"; + hash = "sha256-8ONWTld29DJjaDH4ubsBRmYYosQ6wTAQInuko76Ucoc="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.4-aarch64.dmg"; - hash = "sha256-fohFjjgnM5nH6zxwyM4AeKLtGeNLiUY54TZJbaMmNi4="; + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5-aarch64.dmg"; + hash = "sha256-N3D6YE6vV8x+slvphyqzDu2mTp8y2uAeSZTZg0pMABQ="; }; }; # update-script-end: urls @@ -45,8 +45,8 @@ in product = "RustRover"; # update-script-start: version - version = "2025.3.4"; - buildNumber = "253.31033.132"; + version = "2025.3.5"; + buildNumber = "253.31033.204"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index 78ab34496281..c9c0c7beebe4 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -11,18 +11,18 @@ vimUtils, }: let - version = "0.5.1-nightly.538c593-unstable-2026-04-01"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "538c593b7ba173b08beec15e6bce66fccb8f6ab0"; - hash = "sha256-e+x1ELa2m60j2cQ9g99XSrAMMvmF3WtlMF5HWYrrJps="; + tag = "v${version}"; + hash = "sha256-pFOmYa6JgGsLefkqgBtS1IvQJ+dVnkyLTXObxrfhZno="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-K6xAzx6YqzrDUalZ1rE4eOBRc1xvXVhac14krskl87M="; + cargoHash = "sha256-ylQtZa3ZRs38mhge5tLLCRpnUdHYSjuZOwU+/6TO8Cw="; nativeBuildInputs = [ pkg-config @@ -67,7 +67,6 @@ vimUtils.buildVimPlugin { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; attrPath = "vimPlugins.fff-nvim.fff-nvim-lib"; }; diff --git a/pkgs/applications/emulators/libretro/cores/mrboom.nix b/pkgs/applications/emulators/libretro/cores/mrboom.nix index 1d6f38bf026a..852182f14ede 100644 --- a/pkgs/applications/emulators/libretro/cores/mrboom.nix +++ b/pkgs/applications/emulators/libretro/cores/mrboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "mrboom"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "Javanaise"; repo = "mrboom-libretro"; - rev = "d011acfbdb2d93ed38bd684ccfa0db79bda1c932"; - hash = "sha256-DjTSrp38MwdEtUZPTgZYEZHWgv48IN1oHkKsVqmOwII="; + rev = "96f89550a3518dffe2e7561c971119a39d90de97"; + hash = "sha256-EcRXh39mldlI6fcrV1gaL/r1SGvrFe7jo35iQ47nTmo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index b0f52a1a437b..ce99ba79142d 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buf"; - version = "1.66.1"; + version = "1.67.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; tag = "v${finalAttrs.version}"; - hash = "sha256-bBQSQ/ZLLSEYVmfpgh5OKapSHdBOFjrjAaMT/0js1Ts="; + hash = "sha256-lipptVcjSRYh1EP1hOQwnJrnZScrua/ViXw8eBAvzio="; }; - vendorHash = "sha256-JFuH/NXWhw/Myzk2ct5xzKGuMM4ma0og2YT7ZIq3kKg="; + vendorHash = "sha256-stzZSzM8volS26qLsDll1errJe+cwpmIHnzlMEJCv8I="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 3a737c7be448..17b2e646e5d4 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cook-cli"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${finalAttrs.version}"; - hash = "sha256-lU+EgMPG7NfhI3DSfwwy39fz7lPmT3QsICZOHzUOYyU="; + hash = "sha256-18TyADsUpzuaEW3AzjhIhCW4xjSLj7sqqEPk+tdJxh8="; }; - cargoHash = "sha256-9oi0jNknMhXpyIbRurkEpn5R3SA4r12JskGEifDVvTA="; + cargoHash = "sha256-QSLj6/tu0a4Vb1Q4I/dUoMlZTB95jsEZjl1HbpchtDo="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 6f3559ba6d42..b15c31745dd7 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -16,18 +16,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.84.1"; + version = "0.85.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kQcAYachBjzSFK40L4RGDBB9xU0lUlsMHQWvAWgZ06w="; + hash = "sha256-NYRnc6yXMDspb9bXMlxDUqYaH6Dp/Kmo6VgAQ0kDh+c="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-gPkGWRozLlNYV8WVaC8ZCIkJr09R6nGRKjCDKJWbgXY="; + hash = "sha256-py5ArB/mqWCu2bKWJB83kT+my6nn/FU9FPOSjbxwbL4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ep/eprover/fix-cross-toolchains.patch b/pkgs/by-name/ep/eprover/fix-cross-toolchains.patch new file mode 100644 index 000000000000..b2e316fcd665 --- /dev/null +++ b/pkgs/by-name/ep/eprover/fix-cross-toolchains.patch @@ -0,0 +1,25 @@ +--- a/CONTRIB/picosat-965/makefile.in ++++ b/CONTRIB/picosat-965/makefile.in +@@ -49,8 +49,7 @@ config.h: makefile VERSION mkconfig.sh # and actually picosat.c + rm -f $@; ./mkconfig.sh > $@ + + libpicosat.a: picosat.o version.o +- ar rc $@ picosat.o version.o +- ranlib $@ ++ $(AR) $@ picosat.o version.o + + SONAME=-Xlinker -soname -Xlinker libpicosat.so + libpicosat.so: picosat.o version.o +--- a/Makefile.vars ++++ b/Makefile.vars +@@ -160,8 +160,8 @@ LD = $(CC) $(LDFLAGS) + + # Generic + # AR = sleep 1;ar rcs +- AR = ar rcs +- CC = gcc ++# AR = ar rcs ++# CC = gcc + + # Builds with link time optimization + # diff --git a/pkgs/by-name/ep/eprover/package.nix b/pkgs/by-name/ep/eprover/package.nix index e9153ef2ddae..8beb6a794c8d 100644 --- a/pkgs/by-name/ep/eprover/package.nix +++ b/pkgs/by-name/ep/eprover/package.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ which ]; - preConfigure = '' - sed -e 's/ *CC *= *gcc$//' -i Makefile.vars - ''; + patches = [ + ./fix-cross-toolchains.patch + ]; + + configurePlatforms = [ ]; configureFlags = [ "--exec-prefix=$(out)" @@ -29,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { "--enable-ho" ]; + # need to directly insert into makeFlagsArray as the makefile expects the binary + # in the AR variable to already be passed the `rcs` flags, which requires us to + # specify them. As this requires spaces, we need makeFlagsArray, as makeFlags + # will just make the make script see the `rcs` as a target + preBuild = '' + makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc" AR="${stdenv.cc.targetPrefix}ar rcs") + ''; + meta = { description = "Automated theorem prover for full first-order logic with equality"; homepage = "http://www.eprover.org/"; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 6d12bfdb2658..50add263db9a 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2026.3.1"; + version = "2026.3.2"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-lAqoL0bd0ATLPkbehYLLC83ZIg0J3WtnsH+clD7HP/0="; + hash = "sha256-0v9K2zXIfp5Ka/DJarnVB4kmhgXh95Yvzm8Ts72eCZE="; }; patches = [ diff --git a/pkgs/by-name/fe/feedr/package.nix b/pkgs/by-name/fe/feedr/package.nix index 902e3934315c..9cbb36278125 100644 --- a/pkgs/by-name/fe/feedr/package.nix +++ b/pkgs/by-name/fe/feedr/package.nix @@ -6,20 +6,22 @@ pkg-config, openssl, versionCheckHook, + writableTmpDirAsHomeHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "feedr"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bahdotsh"; repo = "feedr"; tag = "v${finalAttrs.version}"; - hash = "sha256-owdJDY61170g28Ujnwzt/8dZ+uyPHlM0iXRyfOL9gls="; + hash = "sha256-5s4QgkUX27WNrTyzyYDQjf4VjKD0Kdkicjf7hlO9OKE="; }; - cargoHash = "sha256-gl6kiDNvRzn5ZG6syuZ9Y8EgwcHpr+5lVEmn3mI5qSw="; + cargoHash = "sha256-3xSvqj2kW0lOFUzkAbBJThJx6u7f1tSk1qgFdm2tVfg="; nativeBuildInputs = [ pkg-config @@ -42,7 +44,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/bahdotsh/feedr/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index 11bf3af92722..be5b7aa40408 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -65,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ea0aeecc/Feishu-linux_x64-7.58.14.deb"; - sha256 = "sha256-Yg9QA/ugCPaY9yOHBOvmFuFQ8AzxvpP9+j9Gjtps900="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f63223d9/Feishu-linux_x64-7.62.9.deb"; + sha256 = "sha256-96hOYAKsfKaZtvv+jnNCkFeeCVuwuQdwSHSPg5AGmIM="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f8addda9/Feishu-linux_arm64-7.58.14.deb"; - sha256 = "sha256-Mx09KaZ2eIuJbUxePwzZceVj7tdiq/vZN/dwFzc1uyg="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/d95df105/Feishu-linux_arm64-7.62.9.deb"; + sha256 = "sha256-j+fEtJd+jaHV3NB+MXg8anks6F3cd8V/Tz2PcHMQt2o="; }; }; @@ -133,7 +133,7 @@ let ]; in stdenv.mkDerivation { - version = "7.58.14"; + version = "7.62.9"; pname = "feishu"; src = diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix index abd0c820bba3..74d6ff153ba5 100644 --- a/pkgs/by-name/go/gobgp/package.nix +++ b/pkgs/by-name/go/gobgp/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gobgp"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-zUWesDBGRi7SQH0A9WXWvNQ73H1Za3uwexFN4RZ5Hl8="; + sha256 = "sha256-7Rk/Bciy4qYrLzpKGXSZbJPlOzLjfNKR+gbYIbRy7D4="; }; - vendorHash = "sha256-y8nhrKQnTXfnDDyr/xZd5b9ccXaM85rd8RKHtoDBuwI="; + vendorHash = "sha256-XZIcjBMNZbNDYmZLiH5s5kFoSi62n5JruqnsnlQFP4I="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index 81510cd8b485..7b18d13d7fab 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gobgpd"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${finalAttrs.version}"; - hash = "sha256-zUWesDBGRi7SQH0A9WXWvNQ73H1Za3uwexFN4RZ5Hl8="; + hash = "sha256-7Rk/Bciy4qYrLzpKGXSZbJPlOzLjfNKR+gbYIbRy7D4="; }; - vendorHash = "sha256-y8nhrKQnTXfnDDyr/xZd5b9ccXaM85rd8RKHtoDBuwI="; + vendorHash = "sha256-XZIcjBMNZbNDYmZLiH5s5kFoSi62n5JruqnsnlQFP4I="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index c8799002d678..cada59eedc1f 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo126Module (finalAttrs: { pname = "gotenberg"; - version = "8.27.0"; + version = "8.29.1"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo126Module (finalAttrs: { owner = "gotenberg"; repo = "gotenberg"; tag = "v${finalAttrs.version}"; - hash = "sha256-TLfIsvxKrlqNTJtdnASlGCA1XrOx7huMJ11aohVyuKI="; + hash = "sha256-Sgpx4ewBe88RuXRWi7JEgCAHjtpt3+8uo1ZFcXfPYs4="; }; - vendorHash = "sha256-AzaN0xpQWw+Nfw22G7xgww8UsgpTIHpTPK3Bicf6gMY="; + vendorHash = "sha256-XhKf0Kucp6bGjw3UXXV86gsyaDyk5nS2acc4PgVs9yw="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${finalAttrs.src}#g' {} \; diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index ca4dac862f19..0528c9ab72f1 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,14 +29,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gpu-viewer"; - version = "3.30"; + version = "3.32"; pyproject = false; src = fetchFromGitHub { owner = "arunsivaramanneo"; repo = "gpu-viewer"; tag = "v${finalAttrs.version}"; - hash = "sha256-DlNmReKWt1rCZUp6tL5bWBYZuRrh17tdtpu4cj7mXWY="; + hash = "sha256-gtYdWNceeB4gKS7s14rM/yt0xeaFA+DVrHR/DDkJouU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/influxdb-mcp-server/package.nix b/pkgs/by-name/in/influxdb-mcp-server/package.nix new file mode 100644 index 000000000000..de20451f0e11 --- /dev/null +++ b/pkgs/by-name/in/influxdb-mcp-server/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "influxdb-mcp-server"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "idoru"; + repo = "influxdb-mcp-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9JDEAKCgEyhnWxYLomnYU/mazBnDsbb2va9x+cIsgOQ="; + }; + + npmDepsHash = "sha256-83jchkTARy4DxuQmBd5VorWrrQrQccq9lIggAQSk2yE="; + + dontNpmBuild = true; + + meta = { + description = "An MCP Server for querying InfluxDB"; + homepage = "https://github.com/idoru/influxdb-mcp-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "influxdb-mcp-server"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 0975cb2f9883..eb0e34df5d7a 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-rcmiBDDQaJYpESJt/gWkcitWtcvQosDY9pUbX5YpFjA="; + hash = "sha256-PBrsNHywOUEiFyyHW6J4WHDmLwVWv2JkbHCNvbE0tHE="; }; - cargoHash = "sha256-WqM9NJQIrbu+ynhh1pq9nXjoL30A56vIE2lHi7ZUQoc="; + cargoHash = "sha256-jOklgYw6mYCs/FnTczmkT7MlepNtnHXfFB4lghpLOVE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index c9f5a562d11b..34216cc59e6a 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - python3Packages, + python3, fetchFromGitHub, # tests @@ -10,16 +10,32 @@ writableTmpDirAsHomeHook, }: +let + python = python3.override { + packageOverrides = _final: prev: { + # Many tests fail with the current version of opentelemetry we have in nixpkgs + # vibe.acp.exceptions.InternalError: module '...' has no attribute 'GEN_AI_PROVIDER_NAME' + opentelemetry-api = prev.opentelemetry-api.overridePythonAttrs (old: rec { + version = "1.40.0"; + src = old.src.override { + tag = "v${version}"; + hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg="; + }; + }); + }; + }; + python3Packages = python.pkgs; +in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.5.0"; + version = "2.7.2"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-5su0Qfg3M+Yq4pkptDOJhvM8VFGCaOLeeDijeFeywP4="; + hash = "sha256-xQg7skgf0uFD8dLxESbbO1C341+I6BJXK716pX5xbNA="; }; build-system = with python3Packages; [ @@ -33,6 +49,9 @@ python3Packages.buildPythonApplication (finalAttrs: { "cryptography" "gitpython" "mistralai" + "opentelemetry-exporter-otlp-proto-http" + "opentelemetry-sdk" + "opentelemetry-semantic-conventions" "pydantic-settings" "zstandard" ]; @@ -46,9 +65,13 @@ python3Packages.buildPythonApplication (finalAttrs: { google-auth httpx keyring - mcp markdownify + mcp mistralai + opentelemetry-api + opentelemetry-exporter-otlp-proto-http + opentelemetry-sdk + opentelemetry-semantic-conventions packaging pexpect pydantic @@ -89,21 +112,41 @@ python3Packages.buildPythonApplication (finalAttrs: { "test_audio_stream_yields_chunks" "test_auto_stops_after_max_duration" "test_buffer_mode_audio_stream_yields_nothing" + "test_callback_feeds_audio_data" + "test_callback_pads_silence_at_end" + "test_can_play_multiple_times" "test_can_record_multiple_times" "test_cancel_discards_audio" + "test_creates_stream_with_correct_params" + "test_finished_callback_resets_state" "test_manual_stop_prevents_on_expire" "test_on_expire_receives_audio" + "test_on_finished_called_after_natural_completion" "test_peak_clamps_to_one" "test_peak_updates_from_callback" + "test_play_sets_playing_state" + "test_play_when_already_playing_raises" "test_silent_audio_has_zero_peak" "test_start_sets_recording_state" "test_start_when_already_recording_raises" + "test_stop_closes_stream" "test_stop_from_event_loop_does_not_block" "test_stop_returns_empty_data_in_stream_mode" "test_stop_returns_positive_duration" "test_stop_returns_valid_wav" + "test_stop_triggers_on_finished_via_callback" "test_stop_without_drain_returns_promptly" "test_stream_audio_does_not_leak_into_buffer_recording" + "test_unsupported_format_raises" + + # AssertionError: assert True is False + # + where True = VibeApp(title='VibeApp', ...)._rewind_mode + "test_rewind_confirm_edits_message_and_prefills_input" + "test_rewind_option_selection_with_number_keys" + + # AssertionError: assert 3 == 1 + # + where 3 = len([UserMessage(classes='user-message'), UserMessage(classes='... + "test_rewind_removes_messages_after_selected" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # AssertionError @@ -125,6 +168,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # ACP tests require network access "tests/acp/test_acp.py" + "tests/acp/test_acp_entrypoint_smoke.py" ]; meta = { diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index b5f3dda285dd..601bf5c6897b 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.3.10"; + version = "1.3.13"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-/pVesY9fyfeAheT1gMvoVCaO9GlRHQB0H4HIB56pwnE="; + hash = "sha256-P6Md0WzHK2/oAZ6VbpYnabVJyVcqwuYizoOqbxaf+lU="; }; node_modules = stdenvNoCC.mkDerivation { @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-Q7eyK6GNYE5dBYooDHbIQSkfe4fs6L7tzCfbsIlYY7o="; + outputHash = "sha256-fWc9xVn6HbNxnJ9S8Q+hdlYQYkdGk+4RWWbYaB+L09Q="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 197d964065f0..03ac629334c5 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pay-respects"; - version = "0.7.12"; + version = "0.7.13"; src = fetchFromCodeberg { owner = "iff"; repo = "pay-respects"; tag = "v${finalAttrs.version}"; - hash = "sha256-bx5PSKWRLzU8OLOtrspI1GT+DMmzqAk+NDZgvcw/OEU="; + hash = "sha256-jKK8wc+M5U8L7D4z8aQT/VJdZE1q2Z2BTRrtw+UWoeo="; }; - cargoHash = "sha256-dCZGPIipSotcA7DT3VvTCYq8+DxWHi5cp/fwh/44Jwc="; + cargoHash = "sha256-w9BJ0S6q13udi2JWHtbCCXDjgUYo59/FRjxQGuM5r8c="; env = { _DEF_PR_AI_API_KEY = ""; diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix index 03a37f476f23..725ef9df4db6 100644 --- a/pkgs/by-name/pv/pv-migrate/package.nix +++ b/pkgs/by-name/pv/pv-migrate/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "pv-migrate"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = "pv-migrate"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-6y4PC9dFTy/Pz3hu19XH7e2aIWGlGseQVL0XKkCIoKQ="; + sha256 = "sha256-zWE0jpBYauI8Xm4HcArV3I0m3LMLEz8CoThjNrjxddE="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-IT44RdqcXq4sJbQtIGUaQUcEzJBmqXMjC5UuFxUkuM4="; + vendorHash = "sha256-0KO5kIAP53VGau2M78PIMn6KCGAkymV7Y0msnlDjvjg="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/starship-jj/package.nix b/pkgs/by-name/st/starship-jj/package.nix new file mode 100644 index 000000000000..188935d6e00c --- /dev/null +++ b/pkgs/by-name/st/starship-jj/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchCrate, + rustPlatform, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "starship-jj"; + version = "0.7.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-oisz3V3UDHvmvbA7+t5j7waN9NykMUWGOpEB5EkmYew="; + }; + + cargoHash = "sha256-NNeovW27YSK/fO2DjAsJqBvebd43usCw7ni47cgTth8="; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Starship plugin for jj"; + homepage = "https://gitlab.com/lanastara_foss/starship-jj"; + changelog = "https://gitlab.com/lanastara_foss/starship-jj/-/blob/${finalAttrs.version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + nemith + ]; + license = lib.licenses.mit; + mainProgram = "starship-jj"; + }; +}) diff --git a/pkgs/by-name/st/stoolap/package.nix b/pkgs/by-name/st/stoolap/package.nix index 06ebd037c37b..989d7c33dc1a 100644 --- a/pkgs/by-name/st/stoolap/package.nix +++ b/pkgs/by-name/st/stoolap/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stoolap"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "stoolap"; repo = "stoolap"; tag = "v${finalAttrs.version}"; - hash = "sha256-NfGs9TDyX+8hC2bCGJL0AWFd3C1joowT061vea5hxx0="; + hash = "sha256-TE16vsLzhwmqZRZrmWx8ikv2HJbB4sAXaKSPPNsMeLw="; }; - cargoHash = "sha256-tzgxffwXd331Sz1xftXNBowqud29pKvbw+Epv01xOiQ="; + cargoHash = "sha256-ZWu1uu607n3wl3k7xcpS7cHbX7mifAX9gvo8KQmCB/E="; # On aarch64-darwin, dev target needs to set panic strategy to abort # However this must be set while the flag `-Zpanic_abort_tests` is also set, diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index a0b65fa40b3d..344d52586270 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -12,20 +12,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.10.0"; + version = "19.11.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-jkVbPEHSO2ZZwxfxzq6GUsAi0O/BJYv2YLghpiLM66g="; + hash = "sha256-lWCfaIZF1g8tO+QKd5igxCI44OEiLk1cNS4MMtqGL4M="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-+kORi1CwLD567b2L0PRs+t16Qi7HegpYoc8W127rp9k="; + hash = "sha256-cLh9iiDLW3CDg8R+I3TSEMdnyv1KaHelubvF31oGrWk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index d3898557ad43..6faef182017f 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-IAhIp4j9jgQFj7bNrzyG6gLHvXjfZVR5SBhiuvpePB0="; + hash = "sha256-tTPm/2ftCz0G6ytkzsyzQiJDWp48f9nzzY/J2Z1TZjo="; }; - vendorHash = "sha256-9qNI/S3pdmiFNQeRNHze4NlrbKk/2b6cynJ7Gyv+qLs="; + vendorHash = "sha256-/3c1J0i0hr309G7iEmtnc24reqH17Q9E5dxOPufmYQc="; overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 diff --git a/pkgs/by-name/te/temporal_capi/package.nix b/pkgs/by-name/te/temporal_capi/package.nix index 008f64850915..8add501dd8e2 100644 --- a/pkgs/by-name/te/temporal_capi/package.nix +++ b/pkgs/by-name/te/temporal_capi/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "temporal_capi"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "boa-dev"; repo = "temporal"; tag = "v${finalAttrs.version}"; - hash = "sha256-RPbyl45Rl0a0c954m6c6449HQFPtbyAsDC19W8rRVnc="; + hash = "sha256-aAe8gaMAkUrVcEbe8PJfo1Mn8wEwriH4PPjbgNdcUkY="; }; - cargoHash = "sha256-i5vsQ12J1T9Pe2x7WCdrOLzsSKEDtSfDn/pqEDOd6aE="; + cargoHash = "sha256-25NBtoWc/YrBjvRT/AqMYwFVBuGuEyn3Nrq+ZlzTIXQ="; postPatch = '' # Force crate-type to include staticlib diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index adc38c806c1d..972afea18375 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -8,13 +8,13 @@ buildGo126Module (finalAttrs: { pname = "tsgolint"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-1qz4lP3kz7Njg9f513z/RS566vIN3f3Mbko7dhOjp+8="; + hash = "sha256-f7X/aOaINVLJslOowHoqIL4AmSZjaO7feCGs4df7Kfg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ub/ubase/package.nix b/pkgs/by-name/ub/ubase/package.nix index d6d1e7d58591..3ee4c1d688e1 100644 --- a/pkgs/by-name/ub/ubase/package.nix +++ b/pkgs/by-name/ub/ubase/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "ubase"; - version = "0-unstable-2024-03-07"; + version = "0-unstable-2025-12-30"; src = fetchgit { url = "https://git.suckless.org/ubase"; - rev = "a570a80ed1606bed43118cb148fc83c3ac22b5c1"; - hash = "sha256-afsTkctATIZ6ug9S2gIGoxtFM1h/esgsexyuxXpocs0="; + rev = "e8249b49ca3e02032dece5e0cdac3d236667a6d9"; + hash = "sha256-/XwDmhIBjISUyS1hBMcfBe5i4ISKj6sJTGb4lYfJqO0="; }; strictDeps = true; diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index f5f55e65d17d..f81daaa62de0 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -22,14 +22,14 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.6.1"; + version = "1.6.2"; pyproject = false; src = fetchFromGitHub { owner = "waydroid"; repo = "waydroid"; tag = version; - hash = "sha256-2ywAgWYMQ7N2P4x/0maNUSn3pdaRAWyATaraRAGafxI="; + hash = "sha256-idO2eFR+OZBYce5WpCpIEWgMGDuq+vW9nT9i56trt34="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index 8ddc30ac74fa..f6ac57056cc8 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zensical"; - version = "0.0.28"; + version = "0.0.31"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-r311obKXch38m4l/cptgHlaz5WaZCpienj43OozQTEA="; + hash = "sha256-nBLwe95wxL/bE9bK4b7fjRgGTSV6boESihUlArKKj8M="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-pykOMh1BsGyMWwvxvGdfQP9XwH9GDBqPig1L/MA+974="; + hash = "sha256-5lsL42TYg7AsnCxzLcg/KEewcTKLBKvRMJtu+fBkgeY="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/agent-client-protocol/default.nix b/pkgs/development/python-modules/agent-client-protocol/default.nix index e42e73d9ff6d..edd1c8bb5704 100644 --- a/pkgs/development/python-modules/agent-client-protocol/default.nix +++ b/pkgs/development/python-modules/agent-client-protocol/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "agent-client-protocol"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "python-sdk"; tag = finalAttrs.version; - hash = "sha256-pP2exnCiXPw4mPKBQVUWaCE7N132WIGU//whsJGTwgY="; + hash = "sha256-8Xf2S85yNsP/HhpCw9UqdoDdeDHdggvYcnvJbilAVuU="; }; build-system = [ diff --git a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix index 8f2defcb177d..11dfddb45ec7 100644 --- a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix +++ b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "apify-fingerprint-datapoints"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchPypi { pname = "apify_fingerprint_datapoints"; inherit (finalAttrs) version; - hash = "sha256-P5BcOSsRon+1nM/kCJHBZqvXN6ucYglzPxAruzswJRU="; + hash = "sha256-p0jWzyzuhT8CdkIeZh05jPcl5/RToagijhGjso2x2CU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mistralai/default.nix b/pkgs/development/python-modules/mistralai/default.nix index 7c7e0e75e04e..72b4cec190eb 100644 --- a/pkgs/development/python-modules/mistralai/default.nix +++ b/pkgs/development/python-modules/mistralai/default.nix @@ -9,6 +9,7 @@ # dependencies eval-type-backport, httpx, + jsonpath-python, opentelemetry-api, opentelemetry-semantic-conventions, pydantic, @@ -29,14 +30,14 @@ buildPythonPackage (finalAttrs: { pname = "mistralai"; - version = "2.0.4"; + version = "2.1.3"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "client-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-SLPLj9rp8TTOSE3ldobBFU1+MpffzH1Bpshw+7LLUvU="; + hash = "sha256-d6z8l7h8PVPV72Phbb7zPg4pyhxcXA/V5q1Ao+Jtgms="; }; preBuild = '' @@ -53,6 +54,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ eval-type-backport httpx + jsonpath-python opentelemetry-api opentelemetry-semantic-conventions pydantic diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 3d69a3315731..8e7fed21b184 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -15,21 +16,21 @@ # tests onnx, + pyparsing, pytestCheckHook, torchvision, - pythonAtLeast, }: buildPythonPackage (finalAttrs: { pname = "pytorch-pfn-extras"; - version = "0.8.4"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pfnet"; repo = "pytorch-pfn-extras"; tag = "v${finalAttrs.version}"; - hash = "sha256-OrUYO0V5fWqkIjHiYkhvjeFy0YX8CxeRqzrw3NfGK2A="; + hash = "sha256-4XS2Poa8lUQM0p3vks77e/HSlhaxbZOsORUyk4Iqvyw="; }; build-system = [ setuptools ]; @@ -44,10 +45,13 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ onnx pytestCheckHook + pyparsing torchvision ]; - pytestFlags = [ + pytestFlags = lib.optionals (pythonAtLeast "3.14") [ + # DeprecationWarning: `torch.jit.script` is not supported in Python 3.14+ and may break. + # Please switch to `torch.compile` or `torch.export`. "-Wignore::DeprecationWarning" ]; diff --git a/pkgs/development/python-modules/sklearn2pmml/default.nix b/pkgs/development/python-modules/sklearn2pmml/default.nix new file mode 100644 index 000000000000..6e364097f442 --- /dev/null +++ b/pkgs/development/python-modules/sklearn2pmml/default.nix @@ -0,0 +1,88 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + dill, + jre_minimal, + joblib, + pandas, + scikit-learn, + + # tests + pytestCheckHook, + statsmodels, +}: + +let + jre = jre_minimal.override { + modules = [ + "java.base" + "java.desktop" + "java.instrument" + "java.logging" + "java.net.http" + "java.sql" + "java.xml" + ]; + }; +in +buildPythonPackage (finalAttrs: { + pname = "sklearn2pmml"; + version = "0.129.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jpmml"; + repo = "sklearn2pmml"; + tag = finalAttrs.version; + hash = "sha256-xntm+AUwylJuMhTAYi6o2tIxlzzeo8lkwtSvgeuQpQU="; + }; + + postPatch = '' + substituteInPlace sklearn2pmml/__init__.py \ + --replace-fail 'result.extend(["java"])' 'result.extend(["${lib.getExe jre}"])' + + # Fix deprecated dash-separated key in setup.cfg + substituteInPlace setup.cfg \ + --replace-fail "description-file" "description_file" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + dill + joblib + pandas + scikit-learn + ]; + + nativeCheckInputs = [ + pytestCheckHook + statsmodels + ]; + + pytestFlagsArray = [ + # Only run the main test suite; subpackage tests require + # sklearn-pandas which is not available in nixpkgs + "sklearn2pmml/tests" + ]; + + pythonImportsCheck = [ "sklearn2pmml" ]; + + meta = { + description = "Python library for converting Scikit-Learn pipelines to PMML"; + homepage = "https://github.com/jpmml/sklearn2pmml"; + changelog = "https://github.com/jpmml/sklearn2pmml/blob/${finalAttrs.version}/NEWS.md"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # bundled JAR files + ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ b-rodrigues ]; + }; +}) diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index 35e4e1883e86..0f10d74990d3 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -5,29 +5,26 @@ buildPythonPackage, dataclasses-json, fetchFromGitHub, + hatchling, marshmallow, - poetry-core, pytest-asyncio, pytestCheckHook, - pythonOlder, websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "weatherflow4py"; - version = "1.4.1"; + version = "1.5.2"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "jeeftor"; repo = "weatherflow4py"; - tag = "v${version}"; - hash = "sha256-nHpLdzO49HhX5+gtYrgche4whs7Onzp4HeRNFwLHcVI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cfQWdQhjW6KjBLQWO9BSAVZ2btRCMjx1CpUifoOwPsU="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp @@ -54,8 +51,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with the WeatherFlow REST API"; homepage = "https://github.com/jeeftor/weatherflow4py"; - changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/${src.tag}"; + changelog = "https://github.com/jeeftor/weatherflow4py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index debe38b82b7d..db46867c0dfb 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "yolink-api"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "YoSmart-Inc"; repo = "yolink-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-m/AYuGZNXGk7h0YL4p6jRnqbY/XV91u73lpdgSpstnE="; + hash = "sha256-8gzVaBne79t2Muen9QuYg8/tKwxWwDWBS98IopxiWn0="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index bcf0d77cf130..f3ba282ef41f 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.14"; + version = "1.6.15"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-TGdRBynBC9ML0GTofrrz+aLSYjCASGJDBYAmC4agFgk="; + sha256 = "sha256-SMnyEsd0YBMkkfZwq69EC3ZcgnYmg0mmkJE3ZNJq++8="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 9da07883ce03..061a2fe543c3 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -53,13 +53,13 @@ }: let - version = "2026.1.2"; + version = "2026.1.3"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-iFopbpr0wr9tkpaoHkyboH22w5P9aq6utuulK4sGar8="; + sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE="; }; ruby = ruby_3_3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0139394c19fc..fd93bc07c70d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17753,6 +17753,8 @@ self: super: with self; { sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + sklearn2pmml = callPackage ../development/python-modules/sklearn2pmml { }; + skodaconnect = callPackage ../development/python-modules/skodaconnect { }; skops = callPackage ../development/python-modules/skops { };