From 2653a98ef8448ed9e549c31fac5e050f1a0ea37b Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 20 Apr 2025 11:49:38 +0800 Subject: [PATCH] CuboCore.coreuniverse: 4.5.0 -> 5.0.0 Diff: https://gitlab.com/cubocore/coreapps/coreuniverse/-/compare/v4.5.0...v5.0.0 --- .../coreuniverse/default.nix | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/cubocore-packages.nix | 5 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index dfe9e4f1ea89..b5fa399805ac 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -1,42 +1,43 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, - qtbase, + qt6, cmake, ninja, libcprime, libcsys, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coreuniverse"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q="; + repo = "coreuniverse"; + tag = "v${finalAttrs.version}"; + hash = "sha256-T5BYHzOqSED40hOc5VwD+oLTwBJ1wARvS8MwiYOWlXM="; }; nativeBuildInputs = [ cmake ninja + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase libcprime libcsys ]; - meta = with lib; { + meta = { description = "Shows information about apps from the C Suite"; mainProgram = "coreuniverse"; homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dan4ik605743 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97746d8cf8a4..e1ffa20114ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7466,7 +7466,6 @@ with pkgs; newScope lxqt lib - libsForQt5 ; } ); diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix index 673ffe022a89..a66b02e84f0e 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -1,8 +1,7 @@ { + lib, newScope, lxqt, - lib, - libsForQt5, }: let @@ -92,7 +91,7 @@ let inherit libcprime libcsys; }; - coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse { + coreuniverse = callPackage ../applications/misc/cubocore-packages/coreuniverse { inherit libcprime libcsys; }; };