From 28da6b6ae7540e073908fd97ddd5bb9c2f47ed1a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Wed, 31 Dec 2025 16:55:44 +0200 Subject: [PATCH] qgit: move to by-name --- .../qgit/default.nix => by-name/qg/qgit/package.nix} | 12 +++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{applications/version-management/qgit/default.nix => by-name/qg/qgit/package.nix} (83%) diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/by-name/qg/qgit/package.nix similarity index 83% rename from pkgs/applications/version-management/qgit/default.nix rename to pkgs/by-name/qg/qgit/package.nix index cb654c45de32..e01cf9c46780 100644 --- a/pkgs/applications/version-management/qgit/default.nix +++ b/pkgs/by-name/qg/qgit/package.nix @@ -3,9 +3,7 @@ lib, fetchFromGitHub, cmake, - qtbase, - qt5compat, - wrapQtAppsHook, + qt6, }: stdenv.mkDerivation (finalAttrs: { @@ -21,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qt5compat + qt6.qtbase + qt6.qt5compat ]; meta = { @@ -37,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { peterhoeg markuskowa ]; - inherit (qtbase.meta) platforms; + inherit (qt6.qtbase.meta) platforms; mainProgram = "qgit"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa357ead5f9b..ab1283ab50c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1180,8 +1180,6 @@ with pkgs; ; }; - qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { };