Unverified Commit 099fd91a authored by Nikolay Korotkiy's avatar Nikolay Korotkiy
Browse files

qlog: migrate to by-name

parent 721e14e9

pkgs/applications/radio/qlog/default.nix→pkgs/by-name/ql/qlog/package.nix

+16 −22
Original line number Diff line number Diff line 
{

  fetchFromGitHub,

  qtbase,

  stdenv,

  lib,

  wrapQtAppsHook,

  qmake,

  qtcharts,

  qtwebengine,

  qtserialport,

  qtwebchannel,

  cups,

  hamlib,

  qtkeychain,

  pkg-config,

  cups,

  qt6,

  qt6Packages,

}:



stdenv.mkDerivation rec {
@@ -22,7 +16,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "foldynl";

    repo = "QLog";

    rev = "v${version}";

    tag = "v${version}";

    hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI=";

    fetchSubmodules = true;

  };
@@ -31,33 +25,33 @@ stdenv.mkDerivation rec { 


  buildInputs =

    [

      qtbase

      qtcharts

      qtwebengine

      qtserialport

      qtwebchannel

      hamlib

      qtkeychain

      qt6.qtbase

      qt6.qtcharts

      qt6.qtserialport

      qt6.qtwebchannel

      qt6.qtwebengine

      qt6Packages.qtkeychain

    ]

    ++ (lib.optionals stdenv.hostPlatform.isDarwin [

      cups

    ]);



  nativeBuildInputs = [

    wrapQtAppsHook

    qmake

    pkg-config

    qt6.qmake

    qt6.wrapQtAppsHook

  ];



  meta = with lib; {

  meta = {

    description = "Amateur radio logbook software";

    mainProgram = "qlog";

    license = with licenses; [ gpl3Only ];

    license = with lib.licenses; [ gpl3Only ];

    homepage = "https://github.com/foldynl/QLog";

    maintainers = with maintainers; [

    maintainers = with lib.maintainers; [

      oliver-koss

      mkg20001

    ];

    platforms = with platforms; unix;

    platforms = with lib.platforms; unix;

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -4975,8 +4975,6 @@ with pkgs; 














  qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };



























  qlog = qt6Packages.callPackage ../applications/radio/qlog { };



























  quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };





























  qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { };