Merge staging-next into staging

nixos/modules/services/hardware/monado.nix

@@ -1,10 +1,18 @@
-{ config
+{
-, lib
+  config,
-, pkgs
+  lib,
-, ...
+  pkgs,
+  ...
 }:
 let
-  inherit (lib) mkDefault mkEnableOption mkIf mkOption mkPackageOption types;
+  inherit (lib)
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
 
   cfg = config.services.monado;
 
@@ -27,7 +35,8 @@ in
       example = true;
     };
 
-    highPriority = mkEnableOption "high priority capability for monado-service"
+    highPriority =
+      mkEnableOption "high priority capability for monado-service"
       // mkOption { default = true; };
   };
 
@@ -61,9 +70,10 @@ in
 
         serviceConfig = {
           ExecStart =
-            if cfg.highPriority
+            if cfg.highPriority then
-            then "${config.security.wrapperDir}/monado-service"
+              "${config.security.wrapperDir}/monado-service"
-            else lib.getExe' cfg.package "monado-service";
+            else
+              lib.getExe' cfg.package "monado-service";
           Restart = "no";
         };
 
@@ -93,7 +103,7 @@ in
     environment.systemPackages = [ cfg.package ];
     environment.pathsToLink = [ "/share/openxr" ];
 
-    hardware.opengl.extraPackages = [ pkgs.monado-vulkan-layers ];
+    hardware.graphics.extraPackages = [ pkgs.monado-vulkan-layers ];
 
     environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
       source = "${cfg.package}/share/openxr/1/openxr_monado.json";

nixos/tests/all-tests.nix

@@ -1100,7 +1100,6 @@ in {
   uwsgi = handleTest ./uwsgi.nix {};
   v2ray = handleTest ./v2ray.nix {};
   varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
-  varnish74 = handleTest ./varnish.nix { package = pkgs.varnish74; };
   varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
   vault = handleTest ./vault.nix {};
   vault-agent = handleTest ./vault-agent.nix {};

pkgs/applications/science/robotics/mavproxy/default.nix

@@ -5,7 +5,7 @@
 , lxml
 , matplotlib
 , numpy
-, opencv4
+, opencv-python
 , pymavlink
 , pyserial
 , setuptools
@@ -25,16 +25,11 @@ buildPythonApplication rec {
     hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "opencv-python" ""
-  '';
-
   propagatedBuildInputs = [
     lxml
     matplotlib
     numpy
-    opencv4
+    opencv-python
     pymavlink
     pyserial
     setuptools

pkgs/applications/video/deface/default.nix

@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
     numpy
     onnx
     onnxruntime # Nixpkgs onnxruntime is missing CUDA support
-    opencv4
+    opencv-python
     scikit-image
     tqdm
   ];
@@ -39,11 +39,6 @@ python3.pkgs.buildPythonApplication rec {
     ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"''
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "opencv-python" "opencv"
-  '';
-
   pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ];
 
   meta = {

pkgs/applications/video/vdr/epgsearch/default.nix

@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  vdr,
+  util-linux,
+  groff,
+  perl,
+  pcre,
+}:
+stdenv.mkDerivation rec {
+  pname = "vdr-epgsearch";
+  version = "2.4.3";
+
+  src = fetchFromGitHub {
+    repo = "vdr-plugin-epgsearch";
+    owner = "vdr-projects";
+    sha256 = "sha256-hOMISobeEt/jB4/18t5ZeN+EcPHhm8Jz8Kar72KYS3E=";
+    rev = "v${version}";
+  };
+
+  postPatch = ''
+    for f in *.sh; do
+      patchShebangs "$f"
+    done
+  '';
+
+  nativeBuildInputs = [
+    perl # for pod2man and pos2html
+    util-linux
+    groff
+  ];
+
+  buildInputs = [
+    vdr
+    pcre
+  ];
+
+  buildFlags = [
+    "SENDMAIL="
+    "REGEXLIB=pcre"
+  ];
+
+  installFlags = [
+    "DESTDIR=$(out)"
+  ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  meta = {
+    inherit (src.meta) homepage;
+    description = "Searchtimer and replacement of the VDR program menu";
+    mainProgram = "createcats";
+    maintainers = [ lib.maintainers.ck3d ];
+    license = lib.licenses.gpl2;
+    inherit (vdr.meta) platforms;
+  };
+}

pkgs/applications/video/vdr/markad/default.nix

@@ -1,21 +1,25 @@
-{ lib
+{
-, stdenv
+  lib,
-, vdr
+  stdenv,
-, fetchFromGitHub
+  vdr,
-, ffmpeg
+  fetchFromGitHub,
+  ffmpeg,
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-markad";
-  version = "3.6.0";
+  version = "4.2.5";
 
   src = fetchFromGitHub {
     repo = "vdr-plugin-markad";
     owner = "kfb77";
-    sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs=";
+    hash = "sha256-zN52wyER1PuMr0oAj/BWaiX7kHqq5qW8JZqGXrVPtbU=";
     rev = "V${version}";
   };
 
-  buildInputs = [ vdr ffmpeg ];
+  buildInputs = [
+    vdr
+    ffmpeg
+  ];
 
   postPatch = ''
     substituteInPlace command/Makefile --replace '/usr' ""
@@ -35,13 +39,11 @@ stdenv.mkDerivation rec {
 
   installFlags = buildFlags;
 
-  meta = with lib; {
+  meta = {
     inherit (src.meta) homepage;
     description = "Plugin for VDR that marks advertisements";
     mainProgram = "markad";
-    maintainers = [ maintainers.ck3d ];
+    maintainers = [ lib.maintainers.ck3d ];
-    license = licenses.gpl2;
+    inherit (vdr.meta) platforms license;
-    inherit (vdr.meta) platforms;
   };
-
 }

pkgs/applications/video/vdr/nopacity/default.nix

@@ -1,16 +1,25 @@
-{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }:
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  vdr,
+  graphicsmagick,
+}:
 stdenv.mkDerivation rec {
   pname = "vdr-skin-nopacity";
-  version = "1.1.17";
+  version = "1.1.18";
 
   src = fetchFromGitLab {
     repo = "SkinNopacity";
     owner = "kamel5";
-    hash = "sha256-QJKlh5my7e+H5R4E0fCWB/PtwIAXCXw4drQEQzhzfag=";
+    hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4=";
     rev = version;
   };
 
-  buildInputs = [ vdr graphicsmagick ];
+  buildInputs = [
+    vdr
+    graphicsmagick
+  ];
 
   installFlags = [ "DESTDIR=$(out)" ];
 

pkgs/applications/video/vdr/plugins.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, vdr, fetchFromGitHub
-, graphicsmagick, pcre
+, graphicsmagick
-, boost, libgcrypt, perl, util-linux, groff, ncurses
+, boost, libgcrypt, ncurses
 , callPackage
 }: let
   mkPlugin = name: stdenv.mkDerivation {
@@ -12,6 +12,8 @@
   };
 in {
 
+  epgsearch = callPackage ./epgsearch {};
+
   markad = callPackage ./markad {};
 
   nopacity = callPackage ./nopacity {};
@@ -57,56 +59,6 @@ in {
 
   };
 
-  epgsearch = stdenv.mkDerivation rec {
-    pname = "vdr-epgsearch";
-    version = "2.4.2";
-
-    src = fetchFromGitHub {
-      repo = "vdr-plugin-epgsearch";
-      owner = "vdr-projects";
-      sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y=";
-      rev = "v${version}";
-    };
-
-    postPatch = ''
-      for f in *.sh; do
-        patchShebangs "$f"
-      done
-    '';
-
-    nativeBuildInputs = [
-      perl # for pod2man and pos2html
-      util-linux
-      groff
-    ];
-
-    buildInputs = [
-      vdr
-      pcre
-    ];
-
-    buildFlags = [
-      "SENDMAIL="
-      "REGEXLIB=pcre"
-    ];
-
-    installFlags = [
-      "DESTDIR=$(out)"
-    ];
-
-    outputs = [ "out" "man" ];
-
-    meta = with lib; {
-      inherit (src.meta) homepage;
-      description = "Searchtimer and replacement of the VDR program menu";
-      mainProgram = "createcats";
-      maintainers = [ maintainers.ck3d ];
-      license = licenses.gpl2;
-      inherit (vdr.meta) platforms;
-    };
-
-  };
-
   vnsiserver = stdenv.mkDerivation rec {
     pname = "vdr-vnsiserver";
     version = "1.8.3";

pkgs/by-name/ca/caido/package.nix

@@ -15,14 +15,14 @@ let
     "cli"
     "desktop"
   ];
-  version = "0.42.0";
+  version = "0.43.1";
   cli = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz";
-    hash = "sha256-Y0ygbdL9IKvTRLwR0oW1LjFQZfPxKOoZnSDV2zgtJjM=";
+    hash = "sha256-6thdJf6UCzeKOgjPTkK4FsgbQ2u6Eu+tnHihXJPMEUQ=";
   };
   desktop = fetchurl {
     url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage";
-    hash = "sha256-zS/lbcXK1iN2tuUMWc6Us0q2eUypD8mXsw0C+QKE3+w=";
+    hash = "sha256-HEx+RFWF+qfFut5n1ZxKQHjSTGq5EbXAupPJ+5H5LQ0=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version;

pkgs/by-name/ca/cargo-make/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.37.20";
+  version = "0.37.23";
 
   src = fetchFromGitHub {
     owner = "sagiegurari";
     repo = "cargo-make";
     rev = version;
-    hash = "sha256-PmCpm+ZOqnJdGrQtOciU6hEKV2lfoUT8bGtWzRpBXxQ=";
+    hash = "sha256-yYZasrnfxpLf0z6GndLYhkIFfVNjTkx4zdfHYX6WyXk=";
   };
 
-  cargoHash = "sha256-RjsYrFbS/OiMQKTiPshGcBI9KF75Z5stn2HaB6mniZE=";
+  cargoHash = "sha256-X4FhUqhf58wbl3A8nlXAqnYkkaXajxxqRyJn5K7BVqM=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/dg/dgen-sdl/package.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
     "--enable-debug-vdp"
     "--enable-debugger"
     "--enable-joystick"
@@ -34,6 +35,8 @@ stdenv.mkDerivation rec {
     "--with-star=no" # Needs ASM support
   ];
 
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-reserved-user-defined-literal";
+
   meta = with lib; {
     homepage = "https://dgen.sourceforge.net/";
     description = "Sega Genesis/Mega Drive emulator";

pkgs/by-name/do/dotbot/0001-fix-build.patch

@@ -0,0 +1,30 @@
+From c82a6e988594e6bb703df1f39d31451ea5be6967 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Sun, 3 Nov 2024 16:23:50 +0800
+Subject: [PATCH]  fix build
+
+---
+ tests/conftest.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 162781b..d13808d 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -47,11 +47,12 @@ def wrap_function(function, function_path, arg_index, kwarg_key, root):
+ 
+         msg = "The '{0}' argument to {1}() must be an absolute path"
+         msg = msg.format(kwarg_key, function_path)
++        value = os.path.join(value)
+         assert value == os.path.abspath(value), msg
+ 
+         msg = "The '{0}' argument to {1}() must be rooted in {2}"
+         msg = msg.format(kwarg_key, function_path, root)
+-        assert value[: len(str(root))] == str(root), msg
++        assert value[: len(str(root))] == str(root) or value.find("pytest-cache")!=-1, msg
+ 
+         return function(*args, **kwargs)
+ 
+-- 
+2.46.1
+

pkgs/by-name/do/dotbot/package.nix

@@ -1,6 +1,7 @@
-{ lib
+{
-, python3Packages
+  lib,
-, fetchFromGitHub
+  python3Packages,
+  fetchFromGitHub,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -19,13 +20,18 @@ python3Packages.buildPythonApplication rec {
     patchShebangs bin/dotbot
   '';
 
+  patches = [
+    # ignore pytest-cache because it was not at /tmp/nix-shell and it was used by pytest itself not our program
+    ./0001-fix-build.patch
+  ];
+
   nativeBuildInputs = with python3Packages; [ setuptools ];
 
   propagatedBuildInputs = with python3Packages; [ pyyaml ];
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool that bootstraps your dotfiles";
     mainProgram = "dotbot";
     longDescription = ''
@@ -36,9 +42,8 @@ python3Packages.buildPythonApplication rec {
       dotfiles.
     '';
     homepage = "https://github.com/anishathalye/dotbot";
-    changelog =
+    changelog = "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md";
-      "https://github.com/anishathalye/dotbot/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ludat ];
-    maintainers = with maintainers; [ ludat ];
   };
 }

pkgs/by-name/lo/local-ai/package.nix

@@ -147,8 +147,8 @@ let
         src = fetchFromGitHub {
           owner = "ggerganov";
           repo = "llama.cpp";
-          rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657";
+          rev = "45f097645efb11b6d09a5b4adbbfd7c312ac0126";
-          hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk=";
+          hash = "sha256-kZlH+Xpt38Ymc9TW7qRVyN7ISwed4ycA0M0808+UcXM=";
           fetchSubmodules = true;
         };
         postPatch =
@@ -299,8 +299,8 @@ let
     src = fetchFromGitHub {
       owner = "ggerganov";
       repo = "whisper.cpp";
-      rev = "fdbfb460ed546452a5d53611bba66d10d842e719";
+      rev = "a5abfe6a90495f7bf19fe70d016ecc255e97359c";
-      hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk=";
+      hash = "sha256-XSPO1Wtqlq1krwAH98jMIGWa1Npmnjd5oCJ0lc3D3H4=";
     };
 
     nativeBuildInputs = [
@@ -431,12 +431,12 @@ let
       stdenv;
 
   pname = "local-ai";
-  version = "2.22.0";
+  version = "2.22.1";
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
     rev = "v${version}";
-    hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0=";
+    hash = "sha256-vIjjGs3IIxnWlLsybQNWJHbWNnoInVh+otJ7vNODcik=";
   };
 
   prepare-sources =

pkgs/by-name/lo/local-ai/tests.nix

@@ -33,7 +33,10 @@ in
 
   health = testers.runNixOSTest {
     name = self.name + "-health";
-    nodes.machine = common-config;
+    nodes.machine = {
+      imports = [ common-config ];
+      virtualisation.memorySize = 2048;
+    };
     testScript =
       let
         port = "8080";
@@ -47,6 +50,8 @@ in
       '';
   };
 
+}
+// lib.optionalAttrs (!self.features.with_cublas) {
   # https://localai.io/features/embeddings/#bert-embeddings
   bert =
     let
@@ -73,7 +78,7 @@ in
       nodes.machine = {
         imports = [ common-config ];
         virtualisation.cores = 2;
-        virtualisation.memorySize = 2048;
+        virtualisation.memorySize = 4096;
         services.local-ai.models = models;
       };
       passthru = {

pkgs/by-name/mo/mokuro/package.nix

@@ -17,12 +17,6 @@ python3Packages.buildPythonApplication rec {
     fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-        --replace-fail 'opencv-python' 'opencv'
-  '';
-
-
   pythonRelaxDeps = [ "torchvision" ];
 
   build-system = with python3Packages; [ setuptools-scm ];
@@ -33,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     manga-ocr
     natsort
     numpy
-    opencv4
+    opencv-python
     pillow
     pyclipper
     requests

pkgs/by-name/ni/nix-search/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "nix-search";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "diamondburned";
+    repo = "nix-search";
+    rev = "v${version}";
+    hash = "sha256-dOdcXKfSwi0THOjtgP3O/46SWoUY+T7LL9nGwOXXJfw=";
+  };
+
+  vendorHash = "sha256-bModWDH5Htl5rZthtk/UTw/PXT+LrgyBjsvE6hgIePY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Nix-channel-compatible package search";
+    homepage = "https://github.com/diamondburned/nix-search";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "nix-search";
+    maintainers = with lib.maintainers; [ azuwis ];
+    platforms = lib.platforms.all;
+  };
+}

pkgs/by-name/or/ord/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ord";
-  version = "0.20.1";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "ordinals";
     repo = "ord";
     rev = version;
-    hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA=";
+    hash = "sha256-k2SG1PPU14Q8X6F+w5xRbEZuW5hpCPvCci3x175Utc0=";
   };
 
-  cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw=";
+  cargoHash = "sha256-oJecSINVjcoV8Ew8W53wjihOsF9lrQ78tNpRjfhyew8=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pw/pwru/package.nix

@@ -1,19 +1,19 @@
 { lib
-, buildGo123Module
+, buildGoModule
 , fetchFromGitHub
 , clang
 , libpcap
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "pwru";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "pwru";
     rev = "v${version}";
-    hash = "sha256-HK8t+IaeFLuyqUTuVSShbO426uaFyZcr+jZyz0wo4jw=";
+    hash = "sha256-3lIKbzwPX6okJT9CeErX5/innUK3VqnnbWPpvlSN+6U=";
   };
 
   vendorHash = null;

pkgs/by-name/sd/SDL_sound/package.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    (lib.enableFeature enableSdltest "--disable-sdltest")
+    (lib.enableFeature enableSdltest "sdltest")
   ];
 
   strictDeps = true;

pkgs/by-name/sd/SDL_ttf/package.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    (lib.enableFeature enableSdltest "-sdltest")
+    (lib.enableFeature enableSdltest "sdltest")
   ];
 
   strictDeps = true;

pkgs/development/libraries/agg/default.nix

@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    (lib.strings.enableFeature stdenv.hostPlatform.isLinux "platform")
+    (lib.enableFeature stdenv.hostPlatform.isLinux "platform")
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
     "--enable-examples=no"
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     "--x-includes=${lib.getDev libX11}/include"

pkgs/development/libraries/libnixxml/default.nix

@@ -29,7 +29,10 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = [ "--with-gd" "--with-glib" ];
-  CFLAGS = "-Wall";
+  CFLAGS = [
+    "-Wall"
+    "-std=c90"
+  ];
 
   strictDeps = true;
   nativeBuildInputs = [

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

@@ -6,7 +6,7 @@
   setuptools,
   pytestCheckHook,
   numpy,
-  opencv4,
+  opencv-python,
   stringzilla,
 }:
 
@@ -24,13 +24,13 @@ buildPythonPackage rec {
     hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw=";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     stringzilla
   ];
 

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

@@ -11,7 +11,7 @@
   albucore,
   eval-type-backport,
   numpy,
-  opencv4,
+  opencv-python,
   pydantic,
   pyyaml,
   scikit-image,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     ./dont-check-for-updates.patch
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     albucore
     eval-type-backport
     numpy
-    opencv4
+    opencv-python
     pydantic
     pyyaml
     scikit-image

pkgs/development/python-modules/bimmer-connected/default.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "bimmer-connected";
-  version = "0.16.3";
+  version = "0.16.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "bimmerconnected";
     repo = "bimmer_connected";
     rev = "refs/tags/${version}";
-    hash = "sha256-IrGOhUnWTtCI5juFFuNdWSWxeFr7s8bRNT8sUludGo0=";
+    hash = "sha256-1Ef+8G30LdMtmOKOPoN3Xa7yhlHLBQvwoiPHJazu3c4=";
   };
 
   build-system = [

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

@@ -8,7 +8,7 @@
   fetchFromGitHub,
   fetchPypi,
   minexr,
-  opencv4,
+  opencv-python,
   requests,
   runCommand,
   zcs,
@@ -29,14 +29,10 @@ buildPythonPackage rec {
     minexr
     zcs
     requests
-    opencv4
+    opencv-python
     boxx
   ];
 
-  postPatch = ''
-    sed -i 's/opencv-python//g' requirements.txt
-  '';
-
   # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
   doCheck = false;
 

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

@@ -6,7 +6,7 @@
   lib,
   libjpeg,
   numba,
-  opencv4,
+  opencv-python,
   pandas,
   pkg-config,
   pytorch-pfn-extras,
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace-fail "'assertpy'," "" \
       --replace-fail "'fastargs'," "" \
-      --replace-fail "'opencv-python'," "" \
       --replace-fail "'psutil'," "" \
   '';
 
@@ -48,7 +47,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libjpeg ];
   propagatedBuildInputs = [
-    opencv4
+    opencv-python
     numba
     pandas
     pytorch-pfn-extras

pkgs/development/python-modules/grad-cam/default.nix

@@ -6,7 +6,7 @@
   setuptools,
   matplotlib,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   scikit-learn,
   torch,
@@ -27,11 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements.txt\
-      --replace "opencv-python" "opencv"
-  '';
-
   nativeBuildInputs = [
   ];
 
@@ -46,7 +41,7 @@ buildPythonPackage rec {
   dependencies = [
     matplotlib
     numpy
-    opencv4
+    opencv-python
     pillow
     scikit-learn
     torchvision

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

@@ -5,7 +5,7 @@
   numpy,
   scikit-image,
   lib,
-  opencv4,
+  opencv-python,
 }:
 
 buildPythonPackage rec {
@@ -18,14 +18,12 @@ buildPythonPackage rec {
     sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
     scikit-image
-    opencv4
+    opencv-python
   ];
 
   doCheck = false;

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

@@ -4,7 +4,7 @@
   lib,
   setuptools,
   numpy,
-  opencv4,
+  opencv-python,
   lxml,
   xmljson,
   pytestCheckHook,
@@ -22,13 +22,11 @@ buildPythonPackage rec {
     sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     lxml
     xmljson
   ];

pkgs/development/python-modules/invisible-watermark/default.nix

@@ -4,7 +4,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   torch,
   onnx,
   onnxruntime,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [
-      opencv4
+      opencv-python
       torch
       pillow
       pywavelets
@@ -42,8 +42,6 @@ buildPythonPackage rec {
     ];
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'opencv-python>=4.1.0.25' 'opencv'
     substituteInPlace imwatermark/rivaGan.py --replace \
       'You can install it with pip: `pip install onnxruntime`.' \
       'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.'

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

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   # build inputs
   numpy,
-  opencv4,
+  opencv-python,
   scipy,
   pandas,
   pillow,
@@ -54,14 +54,9 @@ buildPythonPackage {
     hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scipy
     pandas
     pillow

pkgs/development/python-modules/manim-slides/default.nix

@@ -15,7 +15,7 @@
   jinja2,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   pydantic,
   pydantic-extra-types,
@@ -52,8 +52,6 @@ buildPythonPackage rec {
     hatch-fancy-pypi-readme
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonRelaxDeps = [
     "rtoml"
     "qtpy"
@@ -67,7 +65,7 @@ buildPythonPackage rec {
       jinja2
       lxml
       numpy
-      opencv4
+      opencv-python
       pillow
       pydantic
       pydantic-extra-types

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

@@ -12,12 +12,8 @@
   texliveInfraOnly,
 
   click,
-  click-default-group,
   cloup,
-  colour,
+  decorator,
-  grpcio,
-  grpcio-tools,
-  importlib-metadata,
   isosurfaces,
   jupyterlab,
   manimpango,
@@ -25,6 +21,7 @@
   moderngl,
   moderngl-window,
   networkx,
+  notebook,
   numpy,
   pillow,
   pycairo,
@@ -37,6 +34,7 @@
   srt,
   svgelements,
   tqdm,
+  typing-extensions,
   watchdog,
 }:
 
@@ -188,7 +186,7 @@ buildPythonPackage rec {
     hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
 
@@ -209,16 +207,11 @@ buildPythonPackage rec {
 
   buildInputs = [ cairo ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
-    click-default-group
     cloup
-    colour
+    decorator
-    grpcio
-    grpcio-tools
-    importlib-metadata
     isosurfaces
-    jupyterlab
     manimpango
     mapbox-earcut
     moderngl
@@ -236,9 +229,19 @@ buildPythonPackage rec {
     srt
     svgelements
     tqdm
+    typing-extensions
     watchdog
   ];
 
+  optional-dependencies = {
+    jupyterlab = [
+      jupyterlab
+      notebook
+    ];
+    # TODO package dearpygui
+    # gui = [ dearpygui ];
+  };
+
   makeWrapperArgs = [
     "--prefix"
     "PATH"

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

@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -28,7 +28,6 @@ buildPythonPackage {
     substituteInPlace setup.py \
       --replace-fail "setup, setuptools" "setup, find_packages"\
       --replace-fail "setuptools.find_packages" "find_packages"\
-      --replace-fail "opencv-python>=4.1.0" ""\
       --replace-fail "keras>=2.0.0" ""\
       --replace-fail "tests_require=['nose']," ""
   '';
@@ -36,7 +35,7 @@ buildPythonPackage {
   build-system = [ setuptools ];
 
   dependencies = [
-    opencv4
+    opencv-python
     tensorflow
   ];
 

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

@@ -0,0 +1,14 @@
+{
+  mkPythonMetaPackage,
+  opencv4,
+}:
+
+mkPythonMetaPackage {
+  pname = "opencv-python";
+  inherit (opencv4) version;
+  dependencies = [ opencv4 ];
+  optional-dependencies = opencv4.optional-dependencies or { };
+  meta = {
+    inherit (opencv4.meta) description homepage;
+  };
+}

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

@@ -10,7 +10,7 @@
   lmdb,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   openpyxl,
   pdf2docx,
   pillow,
@@ -58,7 +58,6 @@ buildPythonPackage {
   pythonRemoveDeps = [
     "imgaug"
     "visualdl"
-    "opencv-python"
     "opencv-contrib-python"
   ];
 
@@ -71,7 +70,7 @@ buildPythonPackage {
     lmdb
     lxml
     numpy
-    opencv4
+    opencv-python
     openpyxl
     pdf2docx
     pillow

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

@@ -9,7 +9,7 @@
   fire,
   fonttools,
   numpy,
-  opencv4,
+  opencv-python-headless,
   tkinter,
   python-docx,
   setuptools,
@@ -34,8 +34,6 @@ buildPythonPackage {
     setuptools
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   preBuild = "echo '${version}' > version.txt";
 
   dependencies = [
@@ -43,7 +41,7 @@ buildPythonPackage {
     fire
     fonttools
     numpy
-    opencv4
+    opencv-python-headless
     python-docx
   ];
 

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

@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   numpy,
-  opencv4,
+  opencv-python,
   pythonOlder,
   scikit-learn,
   typing-extensions,
@@ -21,12 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg=";
   };
 
-
-  pythonRemoveDeps = [ "opencv-python" ];
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scikit-learn
     typing-extensions
   ];

pkgs/development/python-modules/rapidocr-onnxruntime/default.nix

@@ -10,7 +10,7 @@
 
   setuptools,
   pyclipper,
-  opencv4,
+  opencv-python,
   numpy,
   six,
   shapely,
@@ -90,7 +90,7 @@ buildPythonPackage {
 
   dependencies = [
     pyclipper
-    opencv4
+    opencv-python
     numpy
     six
     shapely
@@ -99,9 +99,6 @@ buildPythonPackage {
     onnxruntime
   ];
 
-  # Remove because we have adopted the `opencv4` as an attribute name.
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonImportsCheck = [ "rapidocr_onnxruntime" ];
 
   nativeCheckInputs = [ pytestCheckHook ];

pkgs/development/python-modules/unstructured-inference/default.nix

@@ -6,7 +6,7 @@
   layoutparser,
   python-multipart,
   huggingface-hub,
-  opencv,
+  opencv-python,
   onnxruntime,
   transformers,
   detectron2,
@@ -33,17 +33,12 @@ buildPythonPackage rec {
     hash = "sha256-2k7gFlBUevVnz2A5pvUE4eIGmXwEr5s4F8BbX6j5lzc=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements/base.in \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs =
     [
       layoutparser
       python-multipart
       huggingface-hub
-      opencv
+      opencv-python
       onnxruntime
       transformers
       detectron2

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

@@ -5,7 +5,7 @@
   setuptools,
   levenshtein,
   pytesseract,
-  opencv4,
+  opencv-python,
   fuzzywuzzy,
 }:
 
@@ -24,14 +24,13 @@ buildPythonPackage rec {
   dependencies = [
     levenshtein
     pytesseract
-    opencv4
+    opencv-python
     fuzzywuzzy
   ];
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail "python-Levenshtein" "Levenshtein" \
+      --replace-fail "python-Levenshtein" "Levenshtein"
-      --replace-fail "opencv-python" "opencv"
     substituteInPlace videocr/constants.py \
       --replace-fail "master" "main"
     substituteInPlace videocr/video.py \

pkgs/development/tools/continuous-integration/woodpecker/common.nix

@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "2.7.2";
+  version = "2.7.1";
-  srcHash = "sha256-p4PH/rRcswrKVO1uEykCa0wgrJvawp58oD6/kLRxoS4=";
+  srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

pkgs/os-specific/linux/tbs/default.nix

@@ -1,28 +1,39 @@
-{ stdenv, lib, fetchFromGitHub, kernel, kmod, patchutils, perlPackages }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  kernel,
+  kmod,
+  patchutils,
+  perlPackages,
+}:
 let
 
   media = fetchFromGitHub rec {
     name = repo;
     owner = "tbsdtv";
     repo = "linux_media";
-    rev = "d8d1ff33c0c47e34fe3e860b52b4d6c457520866";
+    rev = "36ce48448be5dd42669a5199f61e85da1a68cf60";
-    hash = "sha256-1Z9itZ5GFpfUeRtp5xTnS+I91LUZLDhsEcF2v8ThaCs=";
+    hash = "sha256-fbb1ITcWymLoybA7VkfdpJmuRHKCP1s0CqLn0Rl2E2I=";
   };
 
   build = fetchFromGitHub rec {
     name = repo;
     owner = "tbsdtv";
     repo = "media_build";
-    rev = "8cd12a6e90999f3a341018812a5d66d7e6b30913";
+    rev = "0f49c76b80838ded04bd64c56af9e1f9b8ac1965";
-    hash = "sha256-+I0NrML54ni37qgDHbRUQiLmmw/UZgXmoFoiDNDeH5A=";
+    hash = "sha256-S5g7OTBJjzClLfy6C0PJwUtukrqoCiIjyU26Yy26hDo=";
   };
 
 in
 stdenv.mkDerivation {
   pname = "tbs";
-  version = "20240506-${kernel.version}";
+  version = "20241026-${kernel.version}";
 
-  srcs = [ media build ];
+  srcs = [
+    media
+    build
+  ];
   sourceRoot = build.name;
 
   # https://github.com/tbsdtv/linux_media/wiki
@@ -53,19 +64,22 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "pic" ];
 
-  nativeBuildInputs = [ patchutils kmod perlPackages.ProcProcessTable ]
+  nativeBuildInputs = [
-    ++ kernel.moduleBuildDependencies;
+    patchutils
+    kmod
+    perlPackages.ProcProcessTable
+  ] ++ kernel.moduleBuildDependencies;
 
   postInstall = ''
     find $out/lib/modules/${kernel.modDirVersion} -name "*.ko" -exec xz {} \;
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.tbsdtv.com/";
     description = "Linux driver for TBSDTV cards";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
-    maintainers = with maintainers; [ ck3d ];
+    maintainers = with lib.maintainers; [ ck3d ];
     priority = -1;
-    broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.9";
+    broken = kernel.kernelOlder "4.14" || kernel.kernelAtLeast "6.12";
   };
 }

pkgs/servers/varnish/default.nix

@@ -56,11 +56,6 @@ in
     version = "6.0.13";
     hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
   };
-  # EOL 2024-09-15
-  varnish74 = common {
-    version = "7.4.3";
-    hash = "sha256-655DUH+Dbu8uMoAtRt08+S7KPVR7pLZA/aWbQHzbG4g=";
-  };
   # EOL 2025-03-15
   varnish75 = common {
     version = "7.5.0";

pkgs/servers/varnish/modules.nix

@@ -41,10 +41,6 @@ in
     version = "0.15.1";
     hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
   };
-  modules23 = common {
-    version = "0.23.0";
-    hash = "sha256-Dd1pLMmRC59iRRpReDeQJ8Sv00ojb8InvaMrb+iRv4I=";
-  };
   modules24 = common {
     version = "0.24.0";
     hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";

pkgs/servers/varnish/packages.nix

@@ -1,4 +1,4 @@
-{ callPackages, callPackage, varnish60, varnish74, varnish75 }: {
+{ callPackages, callPackage, varnish60, varnish75 }: {
   varnish60Packages = rec {
     varnish = varnish60;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules15;
@@ -13,10 +13,6 @@
       sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
     };
   };
-  varnish74Packages = rec {
-    varnish = varnish74;
-    modules = (callPackages ./modules.nix { inherit varnish; }).modules23;
-  };
   varnish75Packages = rec {
     varnish = varnish75;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules24;

pkgs/tools/misc/dbus-map/default.nix

@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, glib, procps, libxml2 }:
-
-stdenv.mkDerivation {
-  pname = "dbus-map";
-  version = "2015-05-28";
-  src = fetchFromGitHub {
-    owner = "taviso";
-    repo = "dbusmap";
-    rev = "43703fc5e15743309b67131b5ba457b0d6ea7667";
-    sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc";
-  };
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    glib procps libxml2
-  ];
-  installPhase = ''
-    mkdir -p $out/bin
-    mv dbus-map $out/bin
-  '';
-  meta = with lib; {
-    description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus";
-    homepage = "https://github.com/taviso/dbusmap";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = [ ];
-    mainProgram = "dbus-map";
-  };
-}

pkgs/tools/misc/vix/default.nix

@@ -13,6 +13,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  configureFlags = [
+    (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
+  ];
+
   buildInputs = [ SDL ];
 
   meta = with lib; {
@@ -21,5 +25,7 @@ stdenv.mkDerivation {
     license = licenses.gpl3;
     maintainers = [ maintainers.ehmry ];
     mainProgram = "vix";
+    # sys/io.h missing on other platforms
+    platforms = [ "x86_64-linux" ];
   };
 }

pkgs/top-level/aliases.nix

@@ -267,6 +267,7 @@ mapAliases {
   dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself.";
   dat = nodePackages.dat;
   dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
+  dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
   deadpixi-sam = deadpixi-sam-unstable;
 
   debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
@@ -1262,6 +1263,8 @@ mapAliases {
   vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
   vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
   vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
+  varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
+  varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12

pkgs/top-level/all-packages.nix

@@ -13611,11 +13611,11 @@ with pkgs;
   valum = callPackage ../development/web/valum { };
 
   inherit (callPackages ../servers/varnish { })
-    varnish60 varnish74 varnish75;
+    varnish60 varnish75;
   inherit (callPackages ../servers/varnish/packages.nix { })
-    varnish60Packages varnish74Packages varnish75Packages;
+    varnish60Packages varnish75Packages;
 
-  varnishPackages = varnish74Packages;
+  varnishPackages = varnish75Packages;
   varnish = varnishPackages.varnish;
 
   hitch = callPackage ../servers/hitch { };
@@ -36764,8 +36764,6 @@ with pkgs;
 
   dbacl = callPackage ../tools/misc/dbacl { };
 
-  dbus-map = callPackage ../tools/misc/dbus-map { };
-
   dell-530cdn = callPackage ../misc/drivers/dell-530cdn { };
 
   dockutil = callPackage ../os-specific/darwin/dockutil { };

pkgs/top-level/python-packages.nix

@@ -9420,6 +9420,8 @@ self: super: with self; {
     pythonPackages = self;
   });
 
+  opencv-python = callPackage ../development/python-modules/opencv-python { };
+
   opencv-python-headless = callPackage ../development/python-modules/opencv-python-headless { };
 
   openerz-api = callPackage ../development/python-modules/openerz-api { };