diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix index 444adfbdab90..cc946a3e78d1 100644 --- a/pkgs/applications/version-management/qgit/default.nix +++ b/pkgs/applications/version-management/qgit/default.nix @@ -1,35 +1,43 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, cmake, qtbase, + qt5compat, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qgit"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "tibirna"; repo = "qgit"; - rev = "${pname}-${version}"; - sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU="; + rev = "qgit-${finalAttrs.version}"; + hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk="; }; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ + qtbase + qt5compat + ]; - meta = with lib; { - license = licenses.gpl2Only; + meta = { + license = lib.licenses.gpl2Only; homepage = "https://github.com/tibirna/qgit"; description = "Graphical front-end to Git"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; mainProgram = "qgit"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cff1a56fb94e..9b11818e8562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1259,7 +1259,7 @@ with pkgs; python3Packages.callPackage ../applications/version-management/pass-git-helper { }; - qgit = qt5.callPackage ../applications/version-management/qgit { }; + qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };