diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/by-name/ck/ckb-next/install-dirs.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/install-dirs.patch rename to pkgs/by-name/ck/ckb-next/install-dirs.patch diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/by-name/ck/ckb-next/modprobe.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/modprobe.patch rename to pkgs/by-name/ck/ckb-next/modprobe.patch diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/by-name/ck/ckb-next/package.nix similarity index 78% rename from pkgs/tools/misc/ckb-next/default.nix rename to pkgs/by-name/ck/ckb-next/package.nix index 61682c9b017c..70f4db66cb5d 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/by-name/ck/ckb-next/package.nix @@ -1,51 +1,48 @@ { lib, - wrapQtAppsHook, fetchFromGitHub, replaceVars, udev, stdenv, pkg-config, - qtbase, + qt6, + qt6Packages, cmake, zlib, kmod, libXdmcp, - qttools, - qtx11extras, - libdbusmenu, gnused, withPulseaudio ? stdenv.hostPlatform.isLinux, libpulseaudio, - quazip, udevCheckHook, + wayland-protocols, }: -stdenv.mkDerivation rec { - version = "0.6.2"; +stdenv.mkDerivation { + version = "0.6.2-unstable-2025-09-25"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; - rev = "v${version}"; - hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU="; + rev = "4bf942dba5e73c2778ef797b6b8dd6b0239aca9a"; + hash = "sha256-sKgA1LZXZ64OixhbBWYUyCN4y29DRG0O0b/bAMd1I8M="; }; buildInputs = [ udev - qtbase + qt6.qtbase zlib libXdmcp - qttools - qtx11extras - libdbusmenu - quazip + qt6.qttools + qt6Packages.quazip + qt6.qtwayland + wayland-protocols ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config cmake udevCheckHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e256646fa9b..1d744ba764a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2303,8 +2303,6 @@ with pkgs; cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; - ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { }; cmdpack = callPackages ../tools/misc/cmdpack { };