diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/by-name/cu/cutecom/package.nix similarity index 68% rename from pkgs/tools/misc/cutecom/default.nix rename to pkgs/by-name/cu/cutecom/package.nix index 2ef00647be52..969ab97b2451 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/by-name/cu/cutecom/package.nix @@ -2,20 +2,19 @@ stdenv, lib, fetchFromGitLab, - qtserialport, + qt6, cmake, - wrapQtAppsHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cutecom"; - version = "0.51.0+patch"; + version = "0.60.0-RC1"; src = fetchFromGitLab { owner = "cutecom"; repo = "cutecom"; - rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca"; - sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w="; }; postPatch = '' @@ -23,10 +22,11 @@ stdenv.mkDerivation { --replace "/Applications" "$out/Applications" ''; - buildInputs = [ qtserialport ]; + buildInputs = [ qt6.qtserialport ]; + nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; postInstall = @@ -43,12 +43,12 @@ stdenv.mkDerivation { cp cutecom.1 "$out/share/man/man1" ''; - meta = with lib; { + meta = { description = "Graphical serial terminal"; homepage = "https://gitlab.com/cutecom/cutecom/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = lib.platforms.unix; mainProgram = "cutecom"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 616607d21917..26f8ddc1e49f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10865,8 +10865,6 @@ with pkgs; hamlib = hamlib_4; }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; - darcs = haskell.lib.compose.disableCabalFlag "library" ( haskell.lib.compose.justStaticExecutables haskellPackages.darcs );