diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index e1c26a7c6775..f613c7241134 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -149,7 +149,7 @@ import ./make-test-python.nix { client.wait_for_unit("network-online.target") smtp1.wait_for_unit("opensmtpd") smtp2.wait_for_unit("opensmtpd") - smtp2.wait_for_unit("dovecot2") + smtp2.wait_for_unit("dovecot") # To prevent sporadic failures during daemon startup, make sure # services are listening on their ports before sending requests diff --git a/pkgs/by-name/bl/bleachbit/package.nix b/pkgs/by-name/bl/bleachbit/package.nix index f5a15dcf2dad..c22b04f02d16 100644 --- a/pkgs/by-name/bl/bleachbit/package.nix +++ b/pkgs/by-name/bl/bleachbit/package.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "bleachbit"; - version = "5.0.0"; + version = "5.0.2"; pyproject = false; src = fetchurl { url = "mirror://sourceforge/bleachbit/bleachbit-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-CU5IW8NVWuPl4PHu6mYpD5mOpRiDq6oZk9pDmuz8PjA="; + sha256 = "sha256-q3iRdrqsR7U+O2LUaf5qDv4DVNsTOcnf9Po+pewzwMs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 3a00a79ba3f2..b9d8a50804ed 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2026-02-15"; + version = "0.4.0-unstable-2026-02-19"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "304236906f680ab9d2d951d33f9eabd343448a88"; - hash = "sha256-tVwby2gpnfzsKzCUdCZbSbxmbxRmjnm4ek/S5n3Gk5U="; + rev = "1467519e792e8ebcc9a33dc40df0b2e273ce9a53"; + hash = "sha256-hUcuWanQEsDhwpN0UrPpnfn8ff+o5KZr7hgl54CmWSI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index 13c9aca6243f..c37e6c385585 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "django-upgrade"; - version = "1.29.1"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-upgrade"; tag = finalAttrs.version; - hash = "sha256-NnVFMItWiTL82LMxDKeGofaestRBfZFVjTKFjbJFmmU="; + hash = "sha256-IiGwYq6TTNiNIx1jrzQlLiULWNZlam7onJJGFFJ/hVM="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index e223af418c3a..de811df59304 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -21,6 +21,7 @@ icu75, libexttextcat, libsodium, + libxcrypt, libstemmer, cyrus_sasl, nixosTests, @@ -67,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { icu75 libexttextcat libsodium + libxcrypt libstemmer cyrus_sasl.dev ] @@ -180,6 +182,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; + strictDeps = true; + meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index 9b60852f3b9d..885ef8a02c4e 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; tag = "v${version}"; - hash = "sha256-pdkL/QfrrTs/NdXlsr+2Yo+r8UTFLkxw4E6XGDAt1yE="; + hash = "sha256-jXH1T/ey61eFcev4cuLQEVynO+/+BIqRndz+GutR/GU="; }; postPatch = '' diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 786df314649b..57c700cd4961 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-oyNnHEGOLQvxIoBnvH0rA6hYAx+BYY1+aG3qMx1RpX4="; + hash = "sha256-28baWL19mF7QWMZ2UHad9PeA6in+V3FVJXdl3hzCecI="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index b9b6734e1dba..973e5f6463ef 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "gh"; - version = "2.87.2"; + version = "2.87.3"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-QPQVsdZy17rNX5ACoKHiJG+f/2CAiBfO3B1ucton0tw="; + hash = "sha256-F4xUwj/krB5vjIfnvmwySlztBrcxJ+k1GvXb2gs7eXY="; }; vendorHash = "sha256-POrm4lHEO2Eti7dbohKBwXW+DTs22EUZX+tMNUCL3lg="; diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index d33be8fb110b..7936ab5ea391 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -32,6 +32,7 @@ xrandr, glib, libGL, + glfw3, glfw3-minecraft, openal, libglvnd, @@ -43,6 +44,9 @@ callPackage, gtk3, }: +let + glfw3' = if stdenv.hostPlatform.isLinux then glfw3-minecraft else glfw3; +in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; version = "3.11.1"; @@ -137,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { runtimeDeps = [ libGL - glfw3-minecraft + glfw3' glib openal libglvnd @@ -188,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) }" \ --run 'cd $HOME' \ - --prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3-minecraft}/lib/libglfw.so" \ + ${lib.optionalString stdenv.hostPlatform.isLinux ''--prefix JAVA_TOOL_OPTIONS " " "-Dorg.lwjgl.glfw.libname=${lib.getLib glfw3'}/lib/libglfw.so"''} \ ''${gappsWrapperArgs[@]} ''; diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix index 3d5ed2498317..d4444c1c0448 100644 --- a/pkgs/by-name/la/lager/package.nix +++ b/pkgs/by-name/la/lager/package.nix @@ -2,40 +2,72 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, boost, + cereal, immer, zug, + catch2, + qt5, }: stdenv.mkDerivation (finalAttrs: { pname = "lager"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "arximboldi"; repo = "lager"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ssGBQu8ba798MSTtJeCBE3WQ7AFfvSGLhZ7WBYHEgfw="; }; + patches = lib.optionals finalAttrs.finalPackage.doCheck [ + # https://github.com/arximboldi/lager/pull/233 + (fetchpatch { + name = "Stop-using-Boost-system.patch"; + url = "https://github.com/arximboldi/lager/commit/0eb1d3d3a6057723c5b57b3e0ee3e41924ff419a.patch"; + hash = "sha256-peGpuyuCznCDqYo+9zk1FytLV+a6Um8fvjLmrm7Y2CI="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost + cereal immer zug ]; - nativeBuildInputs = [ - cmake + + checkInputs = [ + catch2 + qt5.qtdeclarative ]; + cmakeFlags = [ - "-Dlager_BUILD_EXAMPLES=OFF" + (lib.cmakeBool "lager_BUILD_DEBUGGER_EXAMPLES" false) + (lib.cmakeBool "lager_BUILD_DOCS" false) + (lib.cmakeBool "lager_BUILD_EXAMPLES" false) + (lib.cmakeBool "lager_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; + + # remove BUILD file to avoid conflicts with the build directory preConfigure = '' rm BUILD ''; + + doCheck = true; + + dontWrapQtApps = true; + meta = { - homepage = "https://github.com/arximboldi/lager"; + changelog = "https://github.com/arximboldi/lager/releases/tag/${finalAttrs.src.tag}"; description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; + homepage = "https://sinusoid.es/lager/"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/by-name/li/linux-manual/package.nix b/pkgs/by-name/li/linux-manual/package.nix index d16ed1c9e82f..d42d30fe531a 100644 --- a/pkgs/by-name/li/linux-manual/package.nix +++ b/pkgs/by-name/li/linux-manual/package.nix @@ -2,7 +2,6 @@ lib, stdenv, linuxPackages_latest, - perl, python3, man, }: @@ -11,39 +10,35 @@ stdenv.mkDerivation { pname = "linux-manual"; inherit (linuxPackages_latest.kernel) version src; - nativeBuildInputs = [ - perl - python3 - ]; + nativeBuildInputs = [ python3 ]; nativeInstallCheckInputs = [ man ]; dontConfigure = true; - dontBuild = true; doInstallCheck = true; postPatch = '' - # Use scripts/kernel-doc.py here, not scripts/kernel-doc because - # patchShebangs skips symlinks - + # Releases up to including 6.19.3 still use scripts/kernel-doc.py, but it + # has been moved to tools/docs with 7.0-rc1. patchShebangs --build \ - scripts/kernel-doc.py \ - scripts/split-man.pl + tools/docs \ + scripts/kernel-doc.py + ''; + + buildPhase = '' + runHook preBuild + + # avoid Makefile because it checks for unnecessary Python dependencies + KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH")" \ + tools/docs/sphinx-build-wrapper mandocs + + runHook postBuild ''; installPhase = '' runHook preInstall - export mandir="$out/share/man/man9" - mkdir -p "$mandir" - - KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH")" \ - grep -F -l -Z \ - --exclude-dir Documentation \ - --exclude-dir tools \ - -R '/**' \ - | xargs -0 -n 256 -P "$NIX_BUILD_CORES" \ - "$SHELL" -c '{ scripts/kernel-doc -man "$@" || :; } \ - | scripts/split-man.pl "$mandir"' kernel-doc + mkdir -p "$out/share/man" + cp -r output/man "$out/share/man/man9" runHook postInstall ''; diff --git a/pkgs/by-name/ne/newdoc/package.nix b/pkgs/by-name/ne/newdoc/package.nix index 8d6287da76b1..23697a014d02 100644 --- a/pkgs/by-name/ne/newdoc/package.nix +++ b/pkgs/by-name/ne/newdoc/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "newdoc"; - version = "2.18.5"; + version = "2.18.6"; src = fetchFromGitHub { owner = "redhat-documentation"; repo = "newdoc"; tag = "v${finalAttrs.version}"; - hash = "sha256-oBPF2uN8YketMBmUTRwVLiQ4p1bA48j+9bTcfGTt+os="; + hash = "sha256-fd5B6xC/wKiaepHy5GsHeyqzghcnNCOT7GySfIEW8IM="; }; - cargoHash = "sha256-9rpzmrSXqXs9JHi2eupqGUJKc8wWKxAWWoo8VtMauzg="; + cargoHash = "sha256-6VIC+OZifbIRWKtbG+MFLxhK8C2PM1pFr3MjF2hf6vs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/piper-phonemize/package.nix b/pkgs/by-name/pi/piper-phonemize/package.nix index 8776f98b9eb2..686071ccaa52 100644 --- a/pkgs/by-name/pi/piper-phonemize/package.nix +++ b/pkgs/by-name/pi/piper-phonemize/package.nix @@ -13,25 +13,6 @@ onnxruntime, }: -let - espeak-ng' = espeak-ng.overrideAttrs (oldAttrs: { - version = "1.52-dev"; - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "espeak-ng"; - rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; - hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; - hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; - }) - ./espeak-mbrola.patch - ]; - }); -in stdenv.mkDerivation (finalAttrs: { pname = "piper-phonemize"; version = "2023.11.14-4"; @@ -50,18 +31,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DONNXRUNTIME_DIR=${onnxruntime.dev}" - "-DESPEAK_NG_DIR=${espeak-ng'}" + "-DESPEAK_NG_DIR=${espeak-ng}" ]; buildInputs = [ - espeak-ng' + espeak-ng onnxruntime ]; - passthru = { - espeak-ng = espeak-ng'; - }; - meta = { description = "C++ library for converting text to phonemes for Piper"; homepage = "https://github.com/rhasspy/piper-phonemize"; diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index d424fd98811c..ad9b93c33156 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "spacectl"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-1ucdKSIbShaH4o7kixY2x4t+raW24HBuJij2hdVmfAM="; + hash = "sha256-9CsC9xkMz8BfIegahQ1cpSODqL1yl10Lncn8RdceWcU="; }; vendorHash = "sha256-f/09XZiaYNUZzKM0jITFdUmKt8UQy90K4PGhC6ZupCk="; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 339d811c1738..db03a49d5a6f 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "syft"; - version = "1.41.2"; + version = "1.42.1"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${finalAttrs.version}"; - hash = "sha256-8sGNBf6Mq3V9lJsJ6Q7xwBK7VKBHbxdGdmxlBuGFsuM="; + hash = "sha256-RJGDpjhOP4mToIQN6CRGb9HmWYQLWYlHAi6P9tCmQXo="; # 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; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-3GQ9Ky7U+/SNpvFH9A1eWuqEX/P55+49yXbnYWfCM9Q="; + vendorHash = "sha256-+SoFbJa0toHEJaOYYbukgrBvIhfVUmaibzYFEDt+3cQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index f7b43dc6ef11..16967f5c6fc6 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -7,11 +7,11 @@ }: buildTeleport { - version = "17.7.16"; - hash = "sha256-xO1L4MRGf9OF+wm/9P5IccltO+zvijM8vP5JQwmqLSQ="; - vendorHash = "sha256-BhQOvjSe8URmKWxKPemn/klgLoBFKfWXCYMp82QzaOE="; - cargoHash = "sha256-EnIdf/3idwoQGJd6edQtWaXzVC1Gkwf8X2w2Zq80KGA="; - pnpmHash = "sha256-0BOnrrzX33UncHPM6vc8UWP5GoU7xCDV9FGqBLVYTtM="; + version = "17.7.19"; + hash = "sha256-2bQEW3HllZvMofumLSgvZvWqrlRV6fK9uB3QTJD6x3w="; + vendorHash = "sha256-GUnX3TnHjZyqNsIDIy5Du6jRURWnYBsNb2zWEGl1tzQ="; + cargoHash = "sha256-opLo7UmZzxrVxYZOwn4v4G5lhHFp5GrdOZe7uIb97q0="; + pnpmHash = "sha256-mcv9Paybeu9RnNfzj1v0043UX2WhfgMpmWjVxQX7Fzc="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; inherit buildGoModule withRdpClient extPatches; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index 96209f24b2f3..a2d8fee6a708 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -1,19 +1,19 @@ { buildTeleport, - buildGo124Module, + buildGo125Module, wasm-bindgen-cli_0_2_99, withRdpClient ? true, extPatches ? [ ], }: buildTeleport { - version = "18.6.6"; - hash = "sha256-I5tnWOnQrcOwhK2SCtkhvR/PkTWxfk0R0yDGJwyxh9E="; - vendorHash = "sha256-sXBCfzVjffSyPDIxmAWFp1WINmMPV1HRx9O6JkOgqLM="; - pnpmHash = "sha256-/MJL/VPQxijOyvboUl4+sctAP+5YA4R0luOqmMe8f94="; - cargoHash = "sha256-tp+xxa+sYQpvgD2Yv/W0hegRpUubBeFpdngRyByNxJc="; + version = "18.7.0"; + hash = "sha256-1AzIZ2jbYncpUStIrKgP6jhkJ42HDoXfhEv5hJdyDnA="; + vendorHash = "sha256-p600z/Fm3y5KG8fDItIc/Xq4O0/DWHjcmrh5qJmCy1I="; + pnpmHash = "sha256-/sLG0yfMIguj+yzr3bDj1AoPvDEva6ETjyKcqm4Fvks="; + cargoHash = "sha256-SfVoh4HnHSOz1haPPV7a/RyA6LFjLRe78Mn2fVdVyEA="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; - buildGoModule = buildGo124Module; + buildGoModule = buildGo125Module; inherit withRdpClient extPatches; } diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index e34b43892912..424d29c7cb58 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.99.1"; + version = "0.99.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-WbFXCFzBKnjj5SN84LHNps5grHtreS+gv6b17bu6o4U="; + hash = "sha256-PuAV0RtWTdFM96LVL6i+RMrRF+H0HujgHtTCsrvyCoo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix index ad19f85b376a..ffae4f9c7464 100644 --- a/pkgs/by-name/ti/tinfoil-cli/package.nix +++ b/pkgs/by-name/ti/tinfoil-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tinfoil-cli"; - version = "0.10.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tinfoilsh"; repo = "tinfoil-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-1nzMNX3Xe30JFRWHmh0k+vtW1wgGqlB4ZHS9ucYyslY="; + hash = "sha256-EAC6FGYTTLq2/VeDLLV+o03/mVaEi3WTICERZoWJ8tI="; }; - vendorHash = "sha256-8YzNHlimaUVyrUp8pzWtfpSLDp7PxJ95/qi0ir6TSl8="; + vendorHash = "sha256-5ENb7Wb6iUX0vd/k46sQCs8fZvprlRHS+QGHrUboXGU="; # The attestation test requires internet access checkFlags = [ "-skip=TestAttestationVerifySEV" ]; @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { description = "Command-line interface for making verified HTTP requests to Tinfoil enclaves and validating attestation documents"; homepage = "https://github.com/tinfoilsh/tinfoil-cli"; changelog = "https://github.com/tinfoilsh/tinfoil-cli/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; + license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.haylin ]; mainProgram = "tinfoil"; }; diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix index e7dc4d2f5d41..ff658b382de3 100644 --- a/pkgs/development/compilers/ocaml/4.14.nix +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "14"; - patch_version = "2"; - sha256 = "sha256-eBn2hpPjKUb5M1jfRqjqb1FyImgfzG98uWIUIWz+x2Q="; + patch_version = "3"; + sha256 = "sha256-pdWDuPurnqe/bPly75w45/7ay/9tt6NOMQURXTQ+sGk="; } diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index bc0275b695e7..310031573324 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "elFarto"; repo = "nvidia-vaapi-driver"; rev = "v${version}"; - sha256 = "sha256-q51ChAPcTKgYtMzcesKDDDeZRg0/+bSlA4VxsLKn/BA="; + sha256 = "sha256-9Gwr13j+JjU3BlN/8E3dKGmBj79rtR9rrZuOa1aYyYI="; }; patches = [ diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 50f7e67c30b3..0e9ee6d94c9d 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildDunePackage, + ocaml, cmdliner, dap, fmt, @@ -55,5 +56,6 @@ buildDunePackage (finalAttrs: { description = "OCaml debug adapter"; license = lib.licenses.mit; maintainers = [ lib.maintainers.romildo ]; + broken = ocaml.version == "4.14.3"; }; }) diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 25abe8fa9679..6409fb8fc2e5 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -16,6 +16,8 @@ buildDunePackage rec { sha256 = "sha256-RSJ9AgUEmt23QZCk60ETIXmkJhG7knQe+s8wNxxIHm4="; }; + patches = [ ./ocaml-4_14_3.patch ]; + # Otherwise ./configure script will run and create files conflicting with dune. dontConfigure = true; diff --git a/pkgs/development/ocaml-modules/stdcompat/ocaml-4_14_3.patch b/pkgs/development/ocaml-modules/stdcompat/ocaml-4_14_3.patch new file mode 100644 index 000000000000..eda0a8283330 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdcompat/ocaml-4_14_3.patch @@ -0,0 +1,20 @@ +diff --git a/tools/compiler_version.ml b/tools/compiler_version.ml +index f675a20..c3e7912 100644 +--- a/tools/compiler_version.ml ++++ b/tools/compiler_version.ml +@@ -81,6 +81,7 @@ let v4_13_1 = mk 4 13 1 + let v4_14_0 = mk 4 14 0 + let v4_14_1 = mk 4 14 1 + let v4_14_2 = mk 4 14 2 ++let v4_14_3 = mk 4 14 3 + let v5_0_0 = mk 5 0 0 + let v5_1_0 = mk 5 1 0 + let v5_1_1 = mk 5 1 1 +@@ -127,6 +128,7 @@ let known_versions = + v4_14_0; + v4_14_1; + v4_14_2; ++ v4_14_3; + v5_0_0; + v5_1_0; + v5_1_1; diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index cdae500e2038..5308896a1ba0 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.1.39"; + version = "0.1.41"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-Us2YNfm2WOZVAgNMLhH8ZIWqdSwD2wGHqFQxukDVT+Q="; + hash = "sha256-+UKf4lUgYI3gIa//uEkOTaVkIV3wN9rpEaHIDYpgdIc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/piper-phonemize/default.nix b/pkgs/development/python-modules/piper-phonemize/default.nix index 159e39bb38f6..f3a9e40531ae 100644 --- a/pkgs/development/python-modules/piper-phonemize/default.nix +++ b/pkgs/development/python-modules/piper-phonemize/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + espeak-ng, onnxruntime-native, piper-phonemize-native, pybind11, @@ -18,9 +19,9 @@ buildPythonPackage { ]; buildInputs = [ + espeak-ng onnxruntime-native piper-phonemize-native - piper-phonemize-native.espeak-ng ]; # coredump in onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index 4b9b5b1ca7b0..ea5066b7ad5d 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -2,9 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, gitUpdater, pytestCheckHook, - setuptools, pytest-cov-stub, attrs, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-1aMWRyrmvilON+crWibrREIN2Rf3hCzewI+vmRppvrg="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ attrs ]; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index e5ec848e6946..a1b11b42e01a 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, buildPythonPackage, rustPlatform, @@ -34,6 +35,14 @@ buildPythonPackage (finalAttrs: { hash = "sha256-aBKGJwm9EmGwLOhIx6qTuDco5uNcnwUlZf3ztFzmIGs="; }; + patches = [ + (fetchpatch { + name = "networkx-3.6-test-compat.patch"; + url = "https://github.com/Qiskit/rustworkx/commit/04780a59005d0a80bdc3e22427566aea86783eb8.patch"; + hash = "sha256-oUosh1pu/I6Zpg2Di/Gnp5SCwetgs9HDY96Q2bQ7R6M="; + }) + ]; + # Otherwise, `rust-src` is required # https://github.com/Qiskit/rustworkx/pull/1447 postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-tabs/default.nix b/pkgs/development/python-modules/sphinx-tabs/default.nix index 6360e943dd6b..dc2677f13bf1 100644 --- a/pkgs/development/python-modules/sphinx-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -17,9 +17,9 @@ beautifulsoup4, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sphinx-tabs"; - version = "3.4.7"; + version = "3.4.7-unstable-2026-01-24"; pyproject = true; outputs = [ @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-tabs"; - tag = "v${version}"; - hash = "sha256-bJXm3qMT1y7NqUA0iiEUA+USTWHxdV8tbEEiDrQKk1U="; + rev = "d613cb7b6bff083227e35e9b3a4c56b24f6c6ad4"; + hash = "sha256-aYlc9bs37Mu4Beuggx0dgVdoRa+X65oDNnYg3Wa4dgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/srctools/default.nix b/pkgs/development/python-modules/srctools/default.nix index 3d5b242aef70..ad7adc5476b4 100644 --- a/pkgs/development/python-modules/srctools/default.nix +++ b/pkgs/development/python-modules/srctools/default.nix @@ -25,6 +25,17 @@ buildPythonPackage { hash = "sha256-c+NmrTntpNTEI782aoC4bNpoKpWe4cqSAkxpYS5HH30="; }; + # TODO remove when https://github.com/python/pythoncapi-compat/pull/169 is merged + # and new srctools version is released with fix + patches = [ + ./fix-tests.diff + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "meson-python == 0.18.0" "meson-python >= 0.18.0" + ''; + build-system = [ meson meson-python diff --git a/pkgs/development/python-modules/srctools/fix-tests.diff b/pkgs/development/python-modules/srctools/fix-tests.diff new file mode 100644 index 000000000000..660da62df038 --- /dev/null +++ b/pkgs/development/python-modules/srctools/fix-tests.diff @@ -0,0 +1,13 @@ +diff --git a/src/pythoncapi-compat/tests/test_pythoncapi_compat.py b/src/pythoncapi-compat/tests/test_pythoncapi_compat.py +index 8480415..4137489 100644 +--- a/src/pythoncapi-compat/tests/test_pythoncapi_compat.py ++++ b/src/pythoncapi-compat/tests/test_pythoncapi_compat.py +@@ -21,7 +21,7 @@ except ImportError: + faulthandler = None + + # test.utils +-from utils import run_command, command_stdout ++from .utils import run_command, command_stdout + + + # Windows uses MSVC compiler \ No newline at end of file diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 744d0d841324..5f73f419f420 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -22,7 +22,6 @@ buildDunePackage { pname = "js_of_ocaml-compiler"; inherit version; - minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; @@ -56,5 +55,6 @@ buildDunePackage { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "js_of_ocaml"; + broken = ocaml.version == "4.14.3" && !lib.versionAtLeast version "6.0.0"; }; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 9fbedf1c7b9f..ed64dcad4378 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -24,6 +24,7 @@ "4.14.0" = "4.19-414"; "4.14.1" = "4.19-414"; "4.14.2" = "4.19-414"; + "4.14.3" = "4.19-414"; "5.0.0" = "4.14-500"; "5.1.0" = "4.17.1-501"; "5.1.1" = "4.17.1-501";