commit 2653a98ef8448ed9e549c31fac5e050f1a0ea37b · pyrox.dev/nixpkgs

+14 -13

pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation,

     

       3
       2
        
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
        
         fetchFromGitLab,

     

       5
       5
       -
         qtbase,

     

       5
       5
       +
         qt6,

     

       6
       6
        
         cmake,

     

       7
       7
        
         ninja,

     

       8
       8
        
         libcprime,

     

       9
       9
        
         libcsys,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       mkDerivation rec {

     

       12
       12
       +
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
        
         pname = "coreuniverse";

     

       14
       14
       -
         version = "4.5.0";

     

       14
       14
       +
         version = "5.0.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitLab {

     

       17
       17
        
           owner = "cubocore/coreapps";

     

       18
       18
       -
           repo = pname;

     

       19
       19
       -
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";

     

       18
       18
       +
           repo = "coreuniverse";

     

       19
       19
       +
           tag = "v${finalAttrs.version}";

     

       20
       20
       +
           hash = "sha256-T5BYHzOqSED40hOc5VwD+oLTwBJ1wARvS8MwiYOWlXM=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
        
           cmake

     

       25
       25
        
           ninja

     

       26
       26
       +
           qt6.wrapQtAppsHook

     

       26
       27
        
         ];

     

       27
       28
        
       

     

       28
       29
        
         buildInputs = [

     

       29
       29
       -
           qtbase

     

       30
       30
       +
           qt6.qtbase

     

       30
       31
        
           libcprime

     

       31
       32
        
           libcsys

     

       32
       33
        
         ];

     

       33
       34
        
       

     

       34
       34
       -
         meta = with lib; {

     

       35
       35
       +
         meta = {

     

       35
       36
        
           description = "Shows information about apps from the C Suite";

     

       36
       37
        
           mainProgram = "coreuniverse";

     

       37
       38
        
           homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse";

     

       38
       38
       -
           license = licenses.gpl3Plus;

     

       39
       39
       -
           maintainers = with maintainers; [ dan4ik605743 ];

     

       40
       40
       -
           platforms = platforms.linux;

     

       39
       39
       +
           license = lib.licenses.gpl3Plus;

     

       40
       40
       +
           maintainers = with lib.maintainers; [ dan4ik605743 ];

     

       41
       41
       +
           platforms = lib.platforms.linux;

     

       41
       42
        
         };

     

       42
       42
       -
       }

     

       43
       43
       +
       })

-1

pkgs/top-level/all-packages.nix

+2 -3

pkgs/top-level/cubocore-packages.nix

···

       1
       1
        
       {

     

       2
       2
       +
         lib,

     

       2
       3
        
         newScope,

     

       3
       4
        
         lxqt,

     

       4
       4
       -
         lib,

     

       5
       5
       -
         libsForQt5,

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       let

     
···

       92
       91
        
               inherit libcprime libcsys;

     

       93
       92
        
             };

     

       94
       93
        
       

     

       95
       95
       -
             coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse {

     

       94
       94
       +
             coreuniverse = callPackage ../applications/misc/cubocore-packages/coreuniverse {

     

       96
       95
        
               inherit libcprime libcsys;

     

       97
       96
        
             };

     

       98
       97
        
           };