diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 671e1e586cee..fbc2a0a100dd 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -74,6 +74,8 @@ - [postfix-tlspol](https://github.com/Zuplu/postfix-tlspol), MTA-STS and DANE resolver and TLS policy server for Postfix. Available as [services.postfix-tlspol](#opt-services.postfix-tlspol.enable). +- [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable). + - [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable). - [IfState](https://ifstate.net), manage host interface settings in a declarative manner. Available as [networking.ifstate](options.html#opt-networking.ifstate.enable) and [boot.initrd.network.ifstate](options.html#opt-boot.initrd.network.ifstate.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 30f542ac1cc9..2b9bef2a3004 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1446,6 +1446,7 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix + ./services/security/crowdsec.nix ./services/security/e-imzo.nix ./services/security/endlessh-go.nix ./services/security/endlessh.nix diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix index 9c498fc16e37..7c1c2752006b 100644 --- a/nixos/modules/services/security/crowdsec.nix +++ b/nixos/modules/services/security/crowdsec.nix @@ -170,6 +170,11 @@ in }; }; }; + description = '' + The set of parser specifications. + + See for details. + ''; default = { }; }; postOverflows = lib.mkOption { @@ -198,6 +203,11 @@ in }; }; }; + description = '' + The set of Postoverflows specifications. + + See for details. + ''; default = { }; }; contexts = lib.mkOption { @@ -306,6 +316,9 @@ in }; patterns = lib.mkOption { type = lib.types.listOf lib.types.package; + description = '' + A list of files containing custom grok patterns. + ''; default = [ ]; example = lib.literalExpression '' [ (pkgs.writeTextDir "custom_service_logs" (builtins.readFile ./custom_service_logs)) ] @@ -313,6 +326,9 @@ in }; }; }; + description = '' + The configuration for a crowdsec security engine. + ''; default = { }; }; @@ -473,6 +489,9 @@ in }; }; }; + description = '' + Set of various configuration attributes + ''; }; }; config = diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 01bcfdebd40c..074ccaf08af3 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "kubernetes-helm"; - version = "3.18.6"; + version = "3.19.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aUnPLjSt1law6O2M4IQnHB3QiMDYVQ6h//zJbE2vap8="; + sha256 = "sha256-ssOebBeIFVd6N0CDWfAU3HN0j4Rw7twncokzorHWJig="; }; - vendorHash = "sha256-Gn2h7a4bu9nWPEiqW9uN8SnKSZ7NRfchfRoFfpp49+M="; + vendorHash = "sha256-G3PLT2jE+Oitct5F+o/hr8GDAKWcvp23dcpezuBge6k="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 135f44e30add..86383f95aca2 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-SY7pf6bHvX6tezTYpOu/pqda3IsIqaR5g7JZS+eEEZw="; + hash = "sha256-sYhmXVc1pU0nzG57AIuaLqUOWz9MfFlpJZQ9B5Ki5ik="; }; doCheck = false; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index c2bcfa6ca23c..1bc2f5bd79f8 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-m+2D1Vrh6Qi7iDOCuio76p7d4eAkjuCSZXxJD9spPrw="; + hash = "sha256-NTdz7NtjvVQolSiqyCdR0P4dD0+ZQBKMEXTzwHPZgxU="; }; - cargoHash = "sha256-W94oaBgws5FUF2Xax+O7faiQgfhcyTeGoCu+VJD0Wd0="; + cargoHash = "sha256-iLExF4lwXQ1BVBxEK+iD5HDkbjk38AbLaIirS04C4iw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix index 1b31c6d7d0e3..5e6dcde3b0f6 100644 --- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix +++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bash-pinyin-completion-rs"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "bash-pinyin-completion-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-tcgpPFB/BHVbGFYHfs8y0yOVK/KJmjNJ95I41TX+pu4="; + hash = "sha256-TBTVUDtlBCvfmWcwcSr9xLXE1cBLHeptklwR3hD+49Y="; }; strictDeps = true; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index df6574840d76..dedff8b05ab8 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-bubC2cGlZDam0IGGwB/GSiVt9LFfKmy0uZwwPhAPrl0="; + hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc="; }; - cargoHash = "sha256-LJYAVism63OVzAEJS8WeaL+XTpxOTCy22U5MUPu8rA4="; + cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix index e7eac8e0a91c..fa915b6be73f 100644 --- a/pkgs/by-name/di/discount/package.nix +++ b/pkgs/by-name/di/discount/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.0.0d"; + version = "3.0.1"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = "discount"; rev = "v${version}"; - sha256 = "sha256-fFSlW9qnH3NL9civ793LrScOJSuRe9i377BgpNzOXa0="; + hash = "sha256-Bb6vcEICzxaQmBIm9xQy5dKV485iwcxgkA3PAHaR2cw="; }; patches = [ ./fix-configure-path.patch ]; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index b0e2d3910e5a..b7426c7d43ba 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.30.5"; + version = "1.30.6"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y="; + hash = "sha256-UCioROzdfYYtTzKegEUNsF1ecKxbwW4k1cPygjpiXjo="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 6fd2daa147b2..37948bc4807a 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -5,7 +5,6 @@ gettext, coreutils, gnused, - gnome, adwaita-icon-theme, gnugrep, parted, @@ -17,7 +16,7 @@ gpart, hdparm, procps, - util-linux, + util-linuxMinimal, polkit, wrapGAppsHook3, replaceVars, @@ -26,13 +25,13 @@ xhost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gparted"; version = "1.7.0"; src = fetchurl { - url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz"; - sha256 = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI="; + url = "mirror://sourceforge/gparted/gparted-${finalAttrs.version}.tar.gz"; + hash = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI="; }; # Tries to run `pkexec --version` to get version. @@ -77,7 +76,7 @@ stdenv.mkDerivation rec { lib.makeBinPath [ gpart hdparm - util-linux + util-linuxMinimal procps coreutils gnused @@ -108,4 +107,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gparted"; }; -} +}) diff --git a/pkgs/by-name/ju/juce/package.nix b/pkgs/by-name/ju/juce/package.nix index df319aa7a094..0aa204ca091e 100644 --- a/pkgs/by-name/ju/juce/package.nix +++ b/pkgs/by-name/ju/juce/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "8.0.8"; + version = "8.0.9"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; tag = finalAttrs.version; - hash = "sha256-kp3rMaHWBbEh4UaRMxcLo/DiSJV942OY+LYxh6W7dFc="; + hash = "sha256-RUrKQFRLX68L3ROCUFaODSaRMH6zPpAKbc4/e5yDcZ4="; }; patches = [ diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 933c08625314..e6327b1a04fb 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,37 +2,41 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kor"; version = "0.6.4"; src = fetchFromGitHub { owner = "yonahd"; repo = "kor"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hGiak28gwxwYOogYyZjTgQ+aGSumxzeZiQKlbVvvrIU="; }; vendorHash = "sha256-a7B0cJi71mqGDPbXaWYKZ2AeuuQyNDxwWNgahTN5AW8="; - preCheck = '' - HOME=$(mktemp -d) - export HOME - ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; ldflags = [ "-s" "-w" + "-X github.com/yonahd/kor/pkg/utils.Version=${finalAttrs.version}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + meta = { description = "Golang Tool to discover unused Kubernetes Resources"; homepage = "https://github.com/yonahd/kor"; - changelog = "https://github.com/yonahd/kor/releases/tag/v${version}"; + changelog = "https://github.com/yonahd/kor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ivankovnatsky ]; mainProgram = "kor"; }; -} +}) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index af715ae58f64..5ce43325ace3 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-EoRUoZz2L+k9M5J5OQUFUOkjUc1Qqy8ERZkdtG3ur+k="; + hash = "sha256-ZKLdCyg0wypJA16QHLWENiE20hUzr53BPHuwjSIhSOc="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-PNi1oA9iBBQZRQXIHcWMAmLlgzlzt0nxh8hkPsFEx28="; + hash = "sha256-swPk+KMOnvKcYznA6aHoQff6TRZ8npqfWmI/4Jr9fkw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 04df1fc24747..f5ccc3485ba9 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "25.03.1"; + version = "25.09.0"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; tag = "v${version}"; - hash = "sha256-nDW3jwZ0RE9i+5+8eRKb7P7KQxiGd22dn/s7bzx/CjQ="; + hash = "sha256-DNaf3vWb6tlzViMEI02+3st/0AiMVAomSaiGplcjkIc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pd/pdf2htmlex/0001-fix-apple-sdk-iconv.patch b/pkgs/by-name/pd/pdf2htmlex/0001-fix-apple-sdk-iconv.patch new file mode 100644 index 000000000000..1e52090aaf77 --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/0001-fix-apple-sdk-iconv.patch @@ -0,0 +1,16 @@ +diff --git a/pdf2htmlEX/CMakeLists.txt b/pdf2htmlEX/CMakeLists.txt +index b5cb520..dad760e 100644 +--- a/pdf2htmlEX/CMakeLists.txt ++++ b/pdf2htmlEX/CMakeLists.txt +@@ -227,6 +227,11 @@ set(PDF2HTMLEX_SRC ${PDF2HTMLEX_SRC} + add_executable(pdf2htmlEX ${PDF2HTMLEX_SRC}) + target_link_libraries(pdf2htmlEX ${PDF2HTMLEX_LIBS}) + ++if(APPLE) ++ target_link_libraries(pdf2htmlEX PRIVATE iconv) ++ target_link_libraries(pdf2htmlEX PRIVATE "-framework CoreServices" "-framework CoreFoundation") ++endif() ++ + add_custom_target(pdf2htmlEX_resources ALL DEPENDS + ${CMAKE_SOURCE_DIR}/share/base.min.css + ${CMAKE_SOURCE_DIR}/share/fancy.min.css diff --git a/pkgs/by-name/pd/pdf2htmlex/0002-include-glib.patch b/pkgs/by-name/pd/pdf2htmlex/0002-include-glib.patch new file mode 100644 index 000000000000..232366e8d0c9 --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/0002-include-glib.patch @@ -0,0 +1,16 @@ +diff --git a/pdf2htmlEX/CMakeLists.txt b/pdf2htmlEX/CMakeLists.txt +index dad760e..767992e 100644 +--- a/pdf2htmlEX/CMakeLists.txt ++++ b/pdf2htmlEX/CMakeLists.txt +@@ -232,6 +232,11 @@ if(APPLE) + target_link_libraries(pdf2htmlEX PRIVATE "-framework CoreServices" "-framework CoreFoundation") + endif() + ++pkg_check_modules(GLIB REQUIRED glib-2.0 gio-2.0 gobject-2.0) ++target_include_directories(pdf2htmlEX PRIVATE ${GLIB_INCLUDE_DIRS}) ++link_directories(${GLIB_LIBRARY_DIRS}) ++target_link_libraries(pdf2htmlEX PRIVATE ${GLIB_LIBRARIES}) ++ + add_custom_target(pdf2htmlEX_resources ALL DEPENDS + ${CMAKE_SOURCE_DIR}/share/base.min.css + ${CMAKE_SOURCE_DIR}/share/fancy.min.css diff --git a/pkgs/by-name/pd/pdf2htmlex/fontforge.nix b/pkgs/by-name/pd/pdf2htmlex/fontforge.nix new file mode 100644 index 000000000000..eec7b3949d1f --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/fontforge.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + freetype, + glib, + libjpeg, + libpng, + libxml2, + uthash, + zeromq, + zlib, + fontforge, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fontforge"; + # Follow https://github.com/pdf2htmlEX/pdf2htmlEX/blob/v0.18.8.rc1/buildScripts/versionEnvs + version = "20200314"; + + src = fetchFromGitHub { + owner = "fontforge"; + repo = "fontforge"; + tag = finalAttrs.version; + hash = "sha256-QygbZVJLel+QKTdJSO2hIzA1JgcUDsOOF67O35t4uxw="; + }; + + patches = [ + # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 + # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see + # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 + # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. + (fetchpatch { + name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; + url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; + hash = "sha256-E8/SsYytYLE4pmDpQBULjCILu2FWYEhW/H8DyC+6DpM="; + }) + ]; + + # https://github.com/fontforge/fontforge/issues/5251 + postPatch = '' + rm -fv po/{fr,it}.po + substituteInPlace po/LINGUAS \ + --replace-fail "fr" "" \ + --replace-fail "it" "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + freetype + glib + libjpeg + libpng + libxml2 + uthash + zeromq + zlib + ]; + + # Follow https://github.com/pdf2htmlEX/pdf2htmlEX/blob/v0.18.8.rc1/buildScripts/buildFontforge + cmakeFlags = with lib; [ + (cmakeBool "BUILD_SHARED_LIBS" false) + (cmakeBool "ENABLE_GUI" false) + (cmakeBool "ENABLE_X11" false) + (cmakeBool "ENABLE_NATIVE_SCRIPTING" true) + (cmakeBool "ENABLE_PYTHON_SCRIPTING" false) + (cmakeBool "ENABLE_PYTHON_EXTENSION" false) + (cmakeBool "ENABLE_LIBSPIRO" false) + (cmakeBool "ENABLE_LIBUNINAMESLIST" false) + (cmakeBool "ENABLE_LIBGIF" false) + (cmakeBool "ENABLE_LIBJPEG" true) + (cmakeBool "ENABLE_LIBPNG" true) + (cmakeBool "ENABLE_LIBREADLINE" false) + (cmakeBool "ENABLE_LIBTIFF" false) + (cmakeBool "ENABLE_WOFF2" false) + (cmakeBool "ENABLE_DOCS" false) + (cmakeBool "ENABLE_CODE_COVERAGE" false) + (cmakeBool "ENABLE_DEBUG_RAW_POINTS" false) + (cmakeBool "ENABLE_FONTFORGE_EXTRAS" false) + (cmakeBool "ENABLE_MAINTAINER_TOOLS" false) + (cmakeBool "ENABLE_TILE_PATH" false) + (cmakeBool "ENABLE_WRITE_PFM" false) + (cmakeFeature "ENABLE_SANITIZER" "none") + (cmakeFeature "ENABLE_FREETYPE_DEBUGGER" "") + (cmakeBool "SPHINX_USE_VENV" false) + (cmakeFeature "REAL_TYPE" "double") + (cmakeFeature "THEME" "tango") + ]; + + postInstall = '' + install -Dvm644 -t $out/lib/ ./lib/libfontforge.a + install -Dvm644 -t $out/include/ ./inc/*.h + ''; + + meta = fontforge.meta // { + maintainers = with lib.maintainers; [ + Cryolitia + ]; + }; +}) diff --git a/pkgs/by-name/pd/pdf2htmlex/package.nix b/pkgs/by-name/pd/pdf2htmlex/package.nix new file mode 100644 index 000000000000..b719dc6d35f3 --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + callPackage, + fetchFromGitLab, + fetchgit, + cmake, + jdk17, + pkg-config, + cairo, + expat, + fontconfig, + freetype, + glib, + libjpeg, + libpng, + libxml2, + xorg, +}: +let + poppler = callPackage ./poppler.nix { }; + poppler-data = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "poppler"; + repo = "poppler-data"; + tag = "POPPLER_DATA_0_4_9"; + hash = "sha256-sNvIgxXXLuTe7JWs67Z+fv4r4smLPKpDu83fvRYoasQ="; + }; + fontforge = callPackage ./fontforge.nix { }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "pdf2htmlex"; + version = "0.18.8.rc1"; + + src = fetchgit { + url = "https://github.com/pdf2htmlEX/pdf2htmlex.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ylLDLheRUy1hAxVneF1HQwDnGTWko0SE3G1M9SFCr9w="; + }; + + patches = [ + ./0001-fix-apple-sdk-iconv.patch + ./0002-include-glib.patch + ]; + + # The pdf2htmlEX needs lots of private headers from poppler and fontforge, + # it also needs the static libraries. + postUnpack = '' + pushd pdf2htmlex + + install -Dvm644 -t ./poppler/build/poppler/glib ${poppler}/include/poppler/glib/*.h + install -Dvm644 -t ./poppler/poppler/ ${poppler}/include/poppler/*.h + install -Dvm644 -t ./poppler/poppler/ ${poppler.src}/poppler/*.h + install -Dvm644 -t ./poppler/fofi/ ${poppler.src}/fofi/*.h + install -Dvm644 -t ./poppler/goo/ ${poppler.src}/goo/*.h + install -Dvm644 -t ./poppler/splash/ ${poppler.src}/splash/*.h + install -Dvm644 -t ./poppler/build/ ${poppler}/lib/libpoppler.a + install -Dvm644 -t ./poppler/build/glib/ ${poppler}/lib/libpoppler-glib.a + + cp -rv ${poppler-data} poppler-data + + install -Dvm644 -t ./fontforge/inc/ ${fontforge}/include/*.h + install -Dvm644 -t ./fontforge/inc/ ${fontforge.src}/inc/*.h + install -Dvm644 -t ./fontforge/fontforge/ ${fontforge.src}/fontforge/*.h + install -Dvm644 -t ./fontforge/build/lib/ ${fontforge}/lib/libfontforge.a + + popd + ''; + + preConfigure = '' + cd pdf2htmlEX + ''; + + buildInputs = [ + cairo + expat + fontconfig + freetype + glib + libjpeg + libpng + libxml2 + xorg.libXdmcp + ]; + + nativeBuildInputs = [ + cmake + jdk17 + pkg-config + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" (lib.makeLibraryPath [ freetype ])) + ]; + + meta = { + description = "Convert PDF to HTML"; + homepage = "https://github.com/pdf2htmlEX/pdf2htmlEX"; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; (linux ++ darwin); + maintainers = with lib.maintainers; [ Cryolitia ]; + mainProgram = "pdf2htmlEX"; + }; +}) diff --git a/pkgs/by-name/pd/pdf2htmlex/poppler-private.patch b/pkgs/by-name/pd/pdf2htmlex/poppler-private.patch new file mode 100644 index 000000000000..df73703f27f8 --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/poppler-private.patch @@ -0,0 +1,12 @@ +From: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pdf2htmlex +--- a/glib/poppler-private.h 2020-05-28 05:23:59.000000000 +0800 ++++ b/glib/poppler-private.h 2022-06-07 21:57:01.848597082 +0800 +@@ -154,7 +154,7 @@ + GType \ + type_name##_get_type (void) \ + { \ +- static volatile gsize g_define_type_id__volatile = 0; \ ++ static gsize g_define_type_id__volatile = 0; \ + if (g_once_init_enter (&g_define_type_id__volatile)) { \ + GType g_define_type_id = \ + g_boxed_type_register_static (g_intern_static_string (#TypeName), \ diff --git a/pkgs/by-name/pd/pdf2htmlex/poppler.nix b/pkgs/by-name/pd/pdf2htmlex/poppler.nix new file mode 100644 index 000000000000..e93a7e610e6b --- /dev/null +++ b/pkgs/by-name/pd/pdf2htmlex/poppler.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitLab, + poppler, + cmake, + pkg-config, + cairo, + curl, + fontconfig, + freetype, + lcms, + libjpeg, + openjpeg, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "poppler-${finalAttrs.version}-static"; + # Follow https://github.com/pdf2htmlEX/pdf2htmlEX/blob/v0.18.8.rc1/buildScripts/versionEnvs#L11 + version = "0.89.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "poppler"; + repo = "poppler"; + tag = "poppler-${finalAttrs.version}"; + hash = "sha256-I6hapmimQSueU+mcaH/RBtWENPqNeM9cMSZ139Q4j70="; + }; + + patches = [ + ./poppler-private.patch + ]; + + buildInputs = [ + cairo + curl + fontconfig + freetype + lcms + libjpeg + openjpeg + zlib + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + # Follow https://github.com/pdf2htmlEX/pdf2htmlEX/blob/v0.18.8.rc1/buildScripts/buildPoppler + cmakeFlags = with lib; [ + (cmakeBool "ENABLE_UNSTABLE_API_ABI_HEADERS" false) + (cmakeBool "ENABLE_SPLASH" true) + (cmakeBool "ENABLE_UTILS" false) + (cmakeBool "ENABLE_CPP" false) + (cmakeBool "ENABLE_GLIB" true) + (cmakeBool "ENABLE_GOBJECT_INTROSPECTION" false) + (cmakeBool "ENABLE_GTK_DOC" false) + (cmakeBool "ENABLE_QT5" false) + (cmakeFeature "ENABLE_LIBOPENJPEG" "none") + (cmakeFeature "ENABLE_CMS" "none") + (cmakeFeature "ENABLE_DCTDECODER" "libjpeg") + (cmakeBool "ENABLE_LIBCURL" false) + (cmakeBool "ENABLE_ZLIB" true) + (cmakeBool "ENABLE_ZLIB_UNCOMPRESS" false) + (cmakeBool "USE_FLOAT" false) + (cmakeBool "BUILD_SHARED_LIBS" false) + (cmakeBool "RUN_GPERF_IF_PRESENT" false) + (cmakeBool "EXTRA_WARN" false) + (cmakeBool "WITH_JPEG" true) + (cmakeBool "WITH_PNG" true) + (cmakeBool "WITH_TIFF" false) + (cmakeBool "WITH_NSS3" false) + (cmakeBool "WITH_Cairo" true) + ]; + + postInstall = '' + cp -rv poppler/* $out/include/poppler/ + ''; + + meta = poppler.meta // { + maintainers = with lib.maintainers; [ + Cryolitia + ]; + }; +}) diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index b100c3f78eb8..b80c6d1a9bc8 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ramalama"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; src = fetchFromGitHub { owner = "containers"; repo = "ramalama"; tag = "v${version}"; - hash = "sha256-BFJoM9MEprCdCANQntb4IIuWhtUXvCnK/mE7vOdf2PM="; + hash = "sha256-v9/cE6GFOUT5urHQwif7skP5vnRCdu435QGAAypWX0w="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index e3533687a464..c3891e1badff 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.86.4"; + version = "1.86.5"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE="; + hash = "sha256-fEQsusnp/XtKyXQD+M3nAP7zpsnr/TD5rt1b366LtKw="; }; vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA="; diff --git a/pkgs/by-name/te/tennix/package.nix b/pkgs/by-name/te/tennix/package.nix index 11bdb0bc78c0..5bb9e9e4dad7 100644 --- a/pkgs/by-name/te/tennix/package.nix +++ b/pkgs/by-name/te/tennix/package.nix @@ -3,33 +3,36 @@ stdenv, fetchgit, which, - SDL, - SDL_mixer, - SDL_image, - SDL_ttf, - SDL_net, + SDL2, + SDL2_gfx, + SDL2_mixer, + SDL2_image, + SDL2_ttf, + SDL2_net, python3, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tennix"; - version = "1.3.1"; + version = "1.3.4"; src = fetchgit { url = "git://repo.or.cz/tennix.git"; - tag = "tennix-${version}"; - hash = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; + tag = "tennix-${finalAttrs.version}"; + hash = "sha256-siGfnpZPMYMTgYzaPVhNXEuA/OSWmEl891cLhvgGr7o="; }; nativeBuildInputs = [ which ]; buildInputs = [ python3 - SDL - SDL_mixer - SDL_image - SDL_ttf - SDL_net + SDL2 + SDL2_gfx + SDL2_mixer + SDL2_image + SDL2_ttf + SDL2_net ]; configurePhase = '' @@ -40,12 +43,14 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with lib; { + passthru.updateScript = gitUpdater { rev-prefix = "tennix-"; }; + + meta = { homepage = "https://icculus.org/tennix/"; description = "Classic Championship Tour 2011"; mainProgram = "tennix"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 356a72cb6a52..660b295030eb 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,17 +10,17 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-08-30"; + version = "0-unstable-2025-09-11"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "0a3c816da9be581f3b567df9f05b73533f5c9384"; - hash = "sha256-OAOQgHAojYadrv6bn2kXGHYisB928zW0c1g2Hx3jK50="; + rev = "4c9b8f6b7856de7e5598350424f243e6d17d73a6"; + hash = "sha256-8qxq9JR+w7Dy1Mm2Y1wKDuYzRwvo5ORNZ7vdJla51EI="; fetchSubmodules = false; }; - vendorHash = "sha256-w+v74GjOKyhBLj557m2yjgtCqcBOi+IKJ6kkI68AjKk="; + vendorHash = "sha256-k1fKa93zxMnORDPWnZrMahNHG0sCa3JOJl+d4T8PyIM="; ldflags = [ "-s" diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 0b858e9153b1..98ca4e8e7ce5 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.38.2"; + version = "0.39.2"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${version}"; - hash = "sha256-Ec6gPwg5I5QplILFXlwl6AmwlaBytkRiQ9+FoRKdhTY="; + hash = "sha256-7dguSGEDnshjBw6ImtteE39oLbbvsMdX9hz+wmOCcYU="; leaveDotGit = true; }; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 764096e323ca..4bd029ffed57 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.13.0"; + version = "0.13.1"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = "malcontent"; rev = version; - hash = "sha256-DVoTJrpXk5AoRMz+TxEP3NIAA/OOGRzZurLyGp0UBUo="; + hash = "sha256-ekRi4yXu8u8t1AjyS3bD6tdqqnqtKyI6yZs+28LnfRY="; }; patches = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 34823f6338f9..296967728fd0 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; tag = version; - hash = "sha256-/ZzswdGGA4IGc7djTuSIzLtBLA9oRhJBQHMBUlPci7o="; + hash = "sha256-pFbX92UxhNcbHjU1Leoyr225Q6lCHT3hfv/mLSm7y2c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4b2f31610076..9f3715c9ef47 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.27"; + version = "1.40.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-0PC11/PsEACqI/Tt2pYEZ2eHpVaxdGsqduHoMkNtbGw="; + hash = "sha256-DZHXS8e88DDjFVdoaJmbrSri9/OyEc5KGA3YfSFN5Zg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 232389d55040..82b60c474bad 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.27"; + version = "1.40.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-AicOiBPMx/xNBvc2ZT5aHXbo7i3VYPhex22srJfqQB8="; + hash = "sha256-aGbQa+t4oekxPIKX20xor6UXRYalEVgaH899JLgv5Uc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 63244068e674..dca42e401eed 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.22"; + version = "3.23.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; tag = version; - hash = "sha256-N7GxaXQj7mrTOsNGek4ZZlVF9GH/rm5CFKpYFMLJw8k="; + hash = "sha256-WOFtDFCN3OfhEjfhEgwtJN/tQVRGvd2RMQzcKtf0atU="; fetchLFS = true; }; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 6031ee190f68..09f0c930c4f9 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, poetry-core, charset-normalizer, - tomli, untokenize, mock, pytestCheckHook, @@ -14,10 +13,7 @@ buildPythonPackage rec { pname = "docformatter"; version = "1.7.7"; - - disabled = pythonOlder "3.7"; - - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; @@ -29,17 +25,14 @@ buildPythonPackage rec { patches = [ ./test-path.patch ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'charset_normalizer = "^2.0.0"' 'charset_normalizer = ">=2.0.0"' substituteInPlace tests/conftest.py \ --subst-var-by docformatter $out/bin/docformatter ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer - tomli untokenize ]; @@ -49,10 +42,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream - "test_do_format_code.py" - "test_docformatter.py" - # some different issue + # AssertionError: assert 'utf_16' == 'latin-1' + # fixed by https://github.com/PyCQA/docformatter/pull/323 "test_detect_encoding_with_undetectable_encoding" ]; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index e8ec4ac3dbf6..1eb06f0f6066 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -19,7 +19,6 @@ pytest-mock, pytest-random-order, pytestCheckHook, - pythonOlder, sanic, sanic-testing, setuptools, @@ -33,28 +32,16 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.23.0"; + version = "6.24.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "elastic"; repo = "apm-agent-python"; tag = "v${version}"; - hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c="; + hash = "sha256-mHDUcIII1gERlGMJvXPe3Hb38wNAylfMQpeLjA1Xbuk="; }; - patches = [ - (fetchpatch { - name = "fix-tests-with-latest-starlette-and-sanic.patch"; - url = "https://github.com/elastic/apm-agent-python/commit/80d167f54b6bf1db8b6e7ee52e2ac6803bc64f54.patch"; - hash = "sha256-VtA7+SyEZiL3aqpikyYJQ4tmdmsUpIdkSx6RtC1AzqY="; - }) - ]; - - pythonRelaxDeps = [ "wrapt" ]; - build-system = [ setuptools ]; dependencies = [ @@ -94,6 +81,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Exclude tornado tests "tests/contrib/asyncio/tornado/tornado_tests.py" + # Exclude client tests + "tests/instrumentation/asyncio_tests/aiohttp_client_tests.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky tests on Darwin @@ -105,8 +94,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python agent for the Elastic APM"; homepage = "https://github.com/elastic/apm-agent-python"; - changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; + changelog = "https://github.com/elastic/apm-agent-python/releases/tag/${src.tag}"; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "elasticapm-run"; }; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 23b99708a471..c27da986a748 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.28"; + version = "0.2.30"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-dx1MqsZRDjz0U8RU2idW5GiJBQaSyXPxnEDPk0XkLCI="; + hash = "sha256-JCcQl7awYUnRWWVoKgirgn494HM9uXqT69f3XauTG5E="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 00e7776fb290..0b2b5e24aa5c 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -19,27 +19,27 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.9.2"; + version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; tag = version; - hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA="; + hash = "sha256-+EhxoO5X/ANGh008WE0sJeBsu8SRnuds3hXGxNWpKnk="; }; build-system = [ setuptools ]; dependencies = [ - async-timeout chacha20poly1305-reuseable cryptography h11 orjson zeroconf + ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; optional-dependencies.QRCode = [ @@ -54,30 +54,13 @@ buildPythonPackage rec { ] ++ optional-dependencies.QRCode; - disabledTestPaths = [ - # Disable tests requiring network access - "tests/test_accessory_driver.py" - "tests/test_hap_handler.py" - "tests/test_hap_protocol.py" - ]; - - disabledTests = [ - "test_persist_and_load" - "test_we_can_connect" - "test_idle_connection_cleanup" - "test_we_can_start_stop" - "test_push_event" - "test_bridge_run_stop" - "test_migration_to_include_client_properties" - ]; - pythonImportsCheck = [ "pyhap" ]; - meta = with lib; { + meta = { description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; - changelog = "https://github.com/ikalchev/HAP-python/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ oro ]; + changelog = "https://github.com/ikalchev/HAP-python/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ oro ]; }; } diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix index 78dfbf23f35a..886e2df0f011 100644 --- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-readers-txtai"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_txtai"; inherit version; - hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs="; + hash = "sha256-GMloD+eqjYdMCqFM03NhdKjN9bMHqIdZYORA1OtWd/0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 33ca2ef2c0d4..4552da953556 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1001,8 +1001,8 @@ rec { "sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU="; mypy-boto3-payment-cryptography = - buildMypyBoto3Package "payment-cryptography" "1.40.0" - "sha256-TLCQDRpGN61tRE49LnH3wdi5rl/LV64WO6tDN30+74E="; + buildMypyBoto3Package "payment-cryptography" "1.40.28" + "sha256-kVtSgmoVmZ2QJ1qSBlXLrFxob3ZbO3qvoJoM/1zlSYk="; mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.40.0" diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index ee3cc7a354e8..5d81f264a971 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.28.0"; + version = "4.29.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; tag = version; - hash = "sha256-T6OzlL+IzQr38sjE8DhVO3NN3apgHzJQjGx3No8kRNA="; + hash = "sha256-djiuIHTcPiKIfMxFevCa4c3V8ydGpSqH4mo0qH+Cpw8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 696b3e20142a..ceef62732855 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2024.2.3"; + version = "2024.2.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = "pylitterbot"; tag = "v${version}"; - hash = "sha256-r0Nd9xDj6l913ofu7jeBbCud01yw/lgiHO1L6XN9B+Y="; + hash = "sha256-/GN2b4rlE6j60O5ZxH8I58qwcZewAYJu0EHwQ7mrdBY="; }; pythonRelaxDeps = [ "deepdiff" ]; diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 64184d126a94..241556be6829 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -5,19 +5,20 @@ setuptools, requests, pycryptodome, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.1.8"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-hawPxP8WqpHUikmbcSFIjSeSTNyWu1zYtgT/TCPbOro="; + hash = "sha256-cfLKFvhzLN9dM0cMogCL93LVfRd8jDFo9x+nnEWInSc="; }; build-system = [ setuptools ]; @@ -27,12 +28,15 @@ buildPythonPackage rec { pycryptodome ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "pymitsubishi" ]; meta = { - description = "A Python library for controlling and monitoring Mitsubishi MAC-577IF-2E air conditioners"; + description = "Library for controlling and monitoring Mitsubishi MAC-577IF-2E air conditioners"; homepage = "https://github.com/pymitsubishi/pymitsubishi"; changelog = "https://github.com/pymitsubishi/pymitsubishi/releases/tag/${src.tag}"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 4a2456811c4c..c9f20c0fbc6a 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.50"; + version = "1.0.51"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-ApZoltkqbbBVqbVouLNJj80FlQhAJIf2qCiGLgwrZbk="; + hash = "sha256-v/7OQ/jBDpu27mCeSO1iY5EH3Aa7urDQge8dKbQZd0I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index d69b1ffd1db5..1eb62818730c 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.69.0"; + version = "0.70.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = version; - hash = "sha256-5hXFfWGRWPY0fbokw/+61PGlGC6UlQV9FbLuXfWX0KI="; + hash = "sha256-8W+RxehW68x3RULvKh+DkL/YH1usdmM8kOLEO579csE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 4c25a8091069..4a3e57accea5 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "7.3.0.post1"; + version = "7.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; tag = "v${version}"; - hash = "sha256-79q1uQML7WMHsaKQ7+4JA6LpeysJRA4fFxYVqQFntag="; + hash = "sha256-yrJmcwCVjPnkP8931xdb5fsOteBd+d/xEkg1/xahio8="; }; build-system = [ diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7a56afa1c9a1..db8d684b874c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,18 +5,18 @@ "lts": false }, "6.1": { - "version": "6.1.151", - "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq", + "version": "6.1.152", + "hash": "sha256:1ndpnlmpsp2137aqis8bpa2cvdl28jg66pi0p2c6d26cm7i3n5qs", "lts": true }, "5.15": { - "version": "5.15.192", - "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb", + "version": "5.15.193", + "hash": "sha256:168ymh51hm0l6pd9g2kc33ji28gznc25rwzj7rvhnw82z79640n7", "lts": true }, "5.10": { - "version": "5.10.243", - "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m", + "version": "5.10.244", + "hash": "sha256:1h3dqaran5zrfgs0vybwq576yka8s9jirahiy3bb7hpm1763f2i1", "lts": true }, "5.4": { @@ -25,18 +25,18 @@ "lts": true }, "6.6": { - "version": "6.6.105", - "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z", + "version": "6.6.106", + "hash": "sha256:18584vys8qmbqj4hndiyhwbsn6z3832djm1mx07vgl6wv3i80c8c", "lts": true }, "6.12": { - "version": "6.12.46", - "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif", + "version": "6.12.47", + "hash": "sha256:099fj9qd8knafbl400drm8aqn5h7y6g39gc7d4i4hc3lf44f8bz8", "lts": true }, "6.16": { - "version": "6.16.6", - "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8", + "version": "6.16.7", + "hash": "sha256:108sk9r6ac0sc7h6ydvlyv7kib6z3af4v2f46kdinys2z6hxmqsv", "lts": false } } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9866c0d36c85..17841e6a60f3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "570.181"; - sha256_64bit = "sha256-8G0lzj8YAupQetpLXcRrPCyLOFA9tvaPPvAWurjj3Pk="; - sha256_aarch64 = "sha256-1pUDdSm45uIhg0HEhfhak9XT/IE/XUVbdtrcpabZ3KU="; - openSha256 = "sha256-U/uqAhf83W/mns/7b2cU26B7JRMoBfQ3V6HiYEI5J48="; - settingsSha256 = "sha256-iBx/X3c+1NSNmG+11xvGyvxYSMbVprijpzySFeQVBzs="; - persistencedSha256 = "sha256-RoAcutBf5dTKdAfkxDPtMsktFVQt5uPIPtkAkboQwcQ="; + version = "580.82.09"; + sha256_64bit = "sha256-Puz4MtouFeDgmsNMKdLHoDgDGC+QRXh6NVysvltWlbc="; + sha256_aarch64 = "sha256-6tHiAci9iDTKqKrDIjObeFdtrlEwjxOHJpHfX4GMEGQ="; + openSha256 = "sha256-YB+mQD+oEDIIDa+e8KX1/qOlQvZMNKFrI5z3CoVKUjs="; + settingsSha256 = "sha256-um53cr2Xo90VhZM1bM2CH4q9b/1W2YOqUcvXPV6uw2s="; + persistencedSha256 = "sha256-lbYSa97aZ+k0CISoSxOMLyyMX//Zg2Raym6BC4COipU="; }; latest = selectHighestVersion production (generic { diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 8157e57eaf13..67d80f81a247 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-qxYdE70APMO+ydv+lQzJY3gRYr/y5p0zJSgPt/k1cys="; + hash = "sha256-V8fT/w7a/uUN4yKJ+jB6UUQDP6dif80MvlqV9n4KENc="; }; dependencies = [