Merge remote-tracking branch 'origin/master' into staging-next

pkgs/by-name/cl/clever-tools/package.nix

···
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "3.12.0";
+  version = "3.13.0";
 
   nodejs = nodejs_20;
 
···
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-n4rmgOeooLPGLkgBjSBKkevbDPujAORc2i63LiINpcU=";
+    hash = "sha256-E6MD/fQO7cpczaaTbkZOf/lMOywUUXBP9uUVfTH+Iv8=";
   };
 
-  npmDepsHash = "sha256-M7sHNszz2uiD4PVVFRBhaUmKde0s7Cnbr8XQBVlnpLo=";
+  npmDepsHash = "sha256-Q66Gq8LvZEoRVpwzwbK4D9KLVNk6Rc5SztFGwQUuePI=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/gi/gitleaks/package.nix

···
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.27.1";
+  version = "8.27.2";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     tag = "v${version}";
-    hash = "sha256-Wsd/jyM16Ztkj4vNnui1qZE4v2ZBffdOVHJG4S+YLXU=";
+    hash = "sha256-MuFIQYQb+KqxR/KyFrGnDMvwwH9WZ+AupFhc8RgMHTo=";
   };
 
   vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM=";

pkgs/by-name/kc/kcc/package.nix

···
+{
+  stdenv,
+  lib,
+  qt6,
+  fetchFromGitHub,
+  p7zip,
+  versionCheckHook,
+  nix-update-script,
+  python3,
+  archiveSupport ? true,
+}:
+python3.pkgs.buildPythonApplication rec {
+  pname = "kcc";
+  version = "7.3.3";
+
+  src = fetchFromGitHub {
+    owner = "ciromattia";
+    repo = "kcc";
+    tag = "v${version}";
+    hash = "sha256-6zHUV4s1bOdARsTwNRxFM+s0p+6FLJhqJ9qG5BaBgas=";
+  };
+
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+
+  buildInputs = [ qt6.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
+  propagatedBuildInputs = with python3.pkgs; [
+    packaging
+    pillow
+    psutil
+    python-slugify
+    raven
+    requests
+    natsort
+    mozjpeg_lossless_optimization
+    distro
+    pyside6
+    numpy
+  ];
+
+  qtWrapperArgs = lib.optionals archiveSupport [ ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/kcc-c2e";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
+    homepage = "https://kcc.iosphe.re";
+    mainProgram = "kcc";
+    changelog = "https://github.com/ciromattia/kcc/releases/tag/v${version}";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [
+      dawidsowa
+      adfaure
+    ];
+  };
+}

pkgs/by-name/pd/pdm/package.nix

···
           hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
         };
       });
+      # pdm requires ...... -> jbig2dec which is AGPL only
+      moto = super.moto.overridePythonAttrs (old: rec {
+        doCheck = false;
+      });
     };
   };
 in

pkgs/by-name/re/recoverdm/package.nix

···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "recoverdm";
-  version = "0.20-8";
+  version = "0.20-9";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "pkg-security-team";
     repo = "recoverdm";
     rev = "debian/${finalAttrs.version}";
-    hash = "sha256-1iW3Ug85ZLGpvG29N5zJt8oooSQGnLsr+8XIcp4aSSM=";
+    hash = "sha256-HLaiTeeqXn0mgRnG5FZflkPiDiB8CGzq4FR7lDj5oHI=";
   };
 
   patches =
···
       (patch "20_fix-typo-binary.patch")
       (patch "30-fix-BTS-mergebad-crash.patch")
       (patch "40_dev-c.patch")
+      (patch "50_ftbfs-with-gcc-14.patch")
       ./0001-darwin-build-fixes.patch
     ];
 

pkgs/by-name/ta/talhelper/package.nix

···
+{
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  lib,
+  stdenv,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "talhelper";
+  version = "3.0.28";
+
+  src = fetchFromGitHub {
+    owner = "budimanjojo";
+    repo = "talhelper";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZAzj0KMGtm0817zKur088fAoYDMcnrlDXY+DjP5PIVY=";
+  };
+
+  vendorHash = "sha256-5cuOUGoSuuc5Ro1XVQGgW+flp3rqaXNhDewzeErq4k0=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/budimanjojo/talhelper/v3/cmd.version=v${finalAttrs.version}"
+  ];
+
+  subPackages = [
+    "."
+    "./cmd"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd talhelper \
+      --bash <($out/bin/talhelper completion bash) \
+      --fish <($out/bin/talhelper completion fish) \
+      --zsh <($out/bin/talhelper completion zsh)
+  '';
+
+  meta = {
+    changelog = "https://github.com/budimanjojo/talhelper/releases/tag/v${finalAttrs.version}";
+    description = "Help creating Talos kubernetes cluster";
+    longDescription = ''
+      Talhelper is a helper tool to help creating Talos Linux cluster
+      in your GitOps repository.
+    '';
+    homepage = "https://github.com/budimanjojo/talhelper";
+    mainProgram = "talhelper";
+    maintainers = with lib.maintainers; [ madeddie ];
+    license = lib.licenses.bsd3;
+  };
+})

pkgs/development/python-modules/filesplit/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "filesplit";
+  version = "4.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ram-jayapalan";
+    repo = "filesplit";
+    tag = "v${version}";
+    hash = "sha256-QttXCK/IalnOVilWQaE0FYhFglQ1nXDLUX3nOFI5Vrc=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "filesplit" ];
+
+  meta = {
+    description = "Split file into multiple chunks based on the given size";
+    homepage = "https://github.com/ram-jayapalan/filesplit";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

···
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  buildPythonPackage,
+  mozjpeg,
+  pytestCheckHook,
+  setuptools,
+  cmake,
+  nix-update-script,
+  cffi,
+}:
+buildPythonPackage rec {
+  pname = "mozjpeg_lossless_optimization";
+  version = "1.1.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "wanadev";
+    repo = "mozjpeg-lossless-optimization";
+    # https://github.com/NixOS/nixpkgs/issues/26302
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OKNt9XtfZ6hhRJN1Asn1T2dVjyXKQAsnFvXKYnrRZ98=";
+    fetchSubmodules = true;
+  };
+
+  # This package needs cmake, but it is not the default builder
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [ mozjpeg ];
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ cffi ];
+
+  # https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    rm -r mozjpeg_lossless_optimization
+  '';
+
+  build-system = [ setuptools ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Python library to optimize JPEGs losslessly using MozJPEG";
+    homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization";
+    changelog = "https://github.com/wanadev/mozjpeg-lossless-optimization/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.adfaure ];
+  };
+}

pkgs/os-specific/linux/kernel/common-config.nix

···
         IP_VS_PROTO_ESP = yes;
         IP_VS_PROTO_AH = yes;
         IP_VS_IPV6 = yes;
-        IP_DCCP_CCID3 = no; # experimental
+        IP_DCCP_CCID3 = whenOlder "6.16" no; # experimental
         CLS_U32_PERF = yes;
         CLS_U32_MARK = yes;
         BPF_JIT = whenPlatformHasEBPFJit yes;

pkgs/top-level/all-packages.nix

···
 
   jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
 
-  kcc = callPackage ../applications/graphics/kcc { };
-
   kustomize = callPackage ../development/tools/kustomize { };
 
   kustomize_3 = callPackage ../development/tools/kustomize/3.nix { };

pkgs/top-level/python-packages.nix

···
 
   files-to-prompt = callPackage ../development/python-modules/files-to-prompt { };
 
+  filesplit = callPackage ../development/python-modules/filesplit { };
+
   filetype = callPackage ../development/python-modules/filetype { };
 
   filterpy = callPackage ../development/python-modules/filterpy { };
···
   mozart-api = callPackage ../development/python-modules/mozart-api { };
 
   mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { };
+
+  mozjpeg_lossless_optimization =
+    callPackage ../development/python-modules/mozjpeg_lossless_optimization
+      { };
 
   mpd2 = callPackage ../development/python-modules/mpd2 { };