libsForQt5.mauiPackages: init at 2.1.2

This commit is contained in:
Robert Schütz 2022-05-17 01:11:06 +00:00 committed by Robert Schütz
parent dfd82985c2
commit d5a2974e52
17 changed files with 231 additions and 150 deletions

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "buho";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "buho";
rev = "v${version}";
sha256 = "sha256-rHjjvjRY2WsyZfj3fzp46copZ1g2ae6PVv9lBNZDzcI=";
};
nativeBuildInputs = [
cmake

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, ffmpeg
}:
mkDerivation rec {
mkDerivation {
pname = "clip";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "clip";
rev = "v${version}";
sha256 = "sha256-vW3A0PKJSC2QNs+QVZ9w0g4aVmcndhahrpkd4wWoUko=";
};
nativeBuildInputs = [
cmake

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -19,17 +18,8 @@
, kcontacts
}:
mkDerivation rec {
mkDerivation {
pname = "communicator";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "communicator";
rev = "v${version}";
sha256 = "sha256-tHuFQgssZ6bohELx8tHrd4vvnrWixTyqCqK8WKJEdRE=";
};
nativeBuildInputs = [
cmake

View File

@ -0,0 +1,80 @@
/*
# New packages
READ THIS FIRST
This module is for the MauiKit framework and official Maui applications. All
available packages are listed in `callPackage ./srcs.nix`, although some are not yet
packaged in Nixpkgs.
IF YOUR PACKAGE IS NOT LISTED IN `callPackage ./srcs.nix`, IT DOES NOT GO HERE.
See also `pkgs/applications/kde` as this is what this is based on.
# Updates
1. Update the URL in `callPackage ./fetch.sh`.
2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
from the top of the Nixpkgs tree.
3. Use `nixpkgs-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
{ lib
, libsForQt5
, fetchurl
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
mkDerivation = args:
let
inherit (args) pname;
inherit (srcs.${pname}) src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
inherit pname version src;
outputs = args.outputs or [ "out" ];
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "https://mauikit.org/";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;
let
callPackage = self.newScope {
inherit mkDerivation;
};
in {
# libraries
mauikit = callPackage ./mauikit.nix { };
mauikit-accounts = callPackage ./mauikit-accounts.nix { };
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
# applications
buho = callPackage ./buho.nix { };
clip = callPackage ./clip.nix { };
communicator = callPackage ./communicator.nix { };
index = callPackage ./index.nix { };
nota = callPackage ./nota.nix { };
shelf = callPackage ./shelf.nix { };
vvave = callPackage ./vvave.nix { };
};
in lib.makeScope libsForQt5.newScope packages

View File

@ -0,0 +1 @@
WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*-2.1.2.tar.xz' )

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, karchive
@ -14,17 +13,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "index-fm";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "index-fm";
rev = "v${version}";
hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-accounts";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-accounts";
rev = "v${version}";
sha256 = "sha256-B0VmgE0L8kBOqR/lrWCHO3psCQ7GZVPIGljGAwpuymE=";
};
nativeBuildInputs = [
cmake
@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-accounts";
description = "MauiKit utilities to handle User Accounts";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-filebrowsing";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-filebrowsing";
rev = "v${version}";
hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM=";
};
nativeBuildInputs = [
cmake
@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-filebrowsing";
description = "MauiKit File Browsing utilities and controls";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -9,17 +8,8 @@
, syntax-highlighting
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-texteditor";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-texteditor";
rev = "v${version}";
sha256 = "sha256-C0EOc0CE6Ef7vnmOKRqTzeJUamGXsvREpHRPGTcAaIc=";
};
nativeBuildInputs = [
cmake
@ -36,7 +26,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-texteditor";
description = "MauiKit Text Editor components";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@ -12,17 +11,8 @@
, qtx11extras
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit";
rev = "v${version}";
hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY=";
};
nativeBuildInputs = [
cmake
@ -41,8 +31,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://mauikit.org/";
description = "Free and modular front-end framework for developing fast and compelling user experiences";
license = licenses.lgpl2Plus;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
broken = versionOlder qtbase.version "5.15.0";
};
}

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -16,17 +15,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "nota";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "nota";
rev = "v${version}";
sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8=";
};
nativeBuildInputs = [
cmake

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, poppler
}:
mkDerivation rec {
mkDerivation {
pname = "shelf";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "shelf";
rev = "v${version}";
sha256 = "sha256-0a5UHrYrkLR35cezjin+K9cTk3+aLeUAkvBbmKMK61w=";
};
nativeBuildInputs = [
cmake

View File

@ -0,0 +1,118 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui
{ fetchurl, mirror }:
{
buho = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.1.2/buho-2.1.2.tar.xz";
sha256 = "0xc623w1zp0yh929b8h6mf9r4frnfabd30634ba43x4ac12jk7g8";
name = "buho-2.1.2.tar.xz";
};
};
clip = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.1.2/clip-2.1.2.tar.xz";
sha256 = "168lz2qi4y56pwfwyzqnhwz4lgh2763w260l860527aw049crv4z";
name = "clip-2.1.2.tar.xz";
};
};
communicator = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.1.2/communicator-2.1.2.tar.xz";
sha256 = "0m7axdjpl7s9cz6fcaj4kwr9wdxybwdb76k9rz5yigyy35vigcfi";
name = "communicator-2.1.2.tar.xz";
};
};
index-fm = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.1.2/index-fm-2.1.2.tar.xz";
sha256 = "1yawnzx51h6yrlnivbwz9d7481k382pzg3jnczrajfjnv7ir29dn";
name = "index-fm-2.1.2.tar.xz";
};
};
mauikit = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.1.2/mauikit-2.1.2.tar.xz";
sha256 = "1n5p8107lwa4m5gbwlcqmmdlyw15vjaq0dfaz5zal733s6rq2gm7";
name = "mauikit-2.1.2.tar.xz";
};
};
mauikit-accounts = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.1.2/mauikit-accounts-2.1.2.tar.xz";
sha256 = "00nc54gi34r8z6cwa0h8490gd0w01a245rh2g4d9fvbkrybwg7sk";
name = "mauikit-accounts-2.1.2.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.1.2/mauikit-filebrowsing-2.1.2.tar.xz";
sha256 = "09pfjr449mkf27ywmwsvflzq0dgaiprw8b2lcms3m5ad7i6jvvyq";
name = "mauikit-filebrowsing-2.1.2.tar.xz";
};
};
mauikit-imagetools = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.1.2/mauikit-imagetools-2.1.2.tar.xz";
sha256 = "1830x8xwyjs7bj0qi63pl1dk5h2qi6f84mki1schviddddq5cv6j";
name = "mauikit-imagetools-2.1.2.tar.xz";
};
};
mauikit-texteditor = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.1.2/mauikit-texteditor-2.1.2.tar.xz";
sha256 = "19z9qry56h2624kdx5xnfjzd3spv5shc87p2m6ix33x9mmrf92p1";
name = "mauikit-texteditor-2.1.2.tar.xz";
};
};
nota = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.1.2/nota-2.1.2.tar.xz";
sha256 = "11z1mw6yhwin3wj19gj9495az4p40yjkwrn0nb6i8h9b0nh44pn7";
name = "nota-2.1.2.tar.xz";
};
};
pix = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.1.2/pix-2.1.2.tar.xz";
sha256 = "0ycpazi267pl4l178i34lwzc0ssjklp0indz79r7mcfpr1vicz1s";
name = "pix-2.1.2.tar.xz";
};
};
shelf = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.1.2/shelf-2.1.2.tar.xz";
sha256 = "0f3781l8wfbpj0irmri0zkp3ia3qlik4aaq3w6qk97xjv24d98xh";
name = "shelf-2.1.2.tar.xz";
};
};
station = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.1.2/station-2.1.2.tar.xz";
sha256 = "0lrw7rf8i277nl9bwyx5sc05bswgll00k1jzad1i69rwdfiy9ghg";
name = "station-2.1.2.tar.xz";
};
};
vvave = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.1.2/vvave-2.1.2.tar.xz";
sha256 = "14b6b034899vyvvhzl2jqifqq715lb26dnw3d5wxzxhdplfd7pdf";
name = "vvave-2.1.2.tar.xz";
};
};
}

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@ -17,17 +16,8 @@
, taglib
}:
mkDerivation rec {
mkDerivation {
pname = "vvave";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "vvave";
rev = "v${version}";
sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE=";
};
nativeBuildInputs = [
cmake

View File

@ -129,6 +129,7 @@ mapAliases ({
bro = zeek; # Added 2019-09-29
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05
# bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
@ -170,6 +171,7 @@ mapAliases ({
cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
@ -193,6 +195,7 @@ mapAliases ({
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
codimd = hedgedoc; # Added 2020-11-29
inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17
compton = picom; # Added 2019-12-02
compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22
concurrencykit = libck; # Added 2021-03
@ -578,6 +581,7 @@ mapAliases ({
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
infiniband-diags = rdma-core; # Added 2019-08-09
ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12
inotifyTools = inotify-tools;
@ -807,6 +811,7 @@ mapAliases ({
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
matrique = spectral; # Added 2020-01-27
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23
mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
meme = meme-image-generator; # Added 2021-04-21
@ -1202,6 +1207,7 @@ mapAliases ({
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11
shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15
sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
@ -1390,6 +1396,7 @@ mapAliases ({
vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21
vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22
vtun = throw "vtune has been removed as it's unmaintained upstream"; # Added 2021-10-29
inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
### W ###

View File

@ -25451,8 +25451,6 @@ with pkgs;
btops = callPackage ../applications/window-managers/btops { };
buho = libsForQt5.callPackage ../applications/office/buho { };
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@ -25583,8 +25581,6 @@ with pkgs;
clightd = callPackage ../applications/misc/clight/clightd.nix { };
clip = libsForQt5.callPackage ../applications/video/clip { };
clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
clipcat = callPackage ../applications/misc/clipcat { };
@ -25619,8 +25615,6 @@ with pkgs;
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
communicator = libsForQt5.callPackage ../tools/misc/communicator { };
complete-alias = callPackage ../tools/misc/complete-alias { };
confclerk = callPackage ../applications/misc/confclerk { };
@ -27095,8 +27089,6 @@ with pkgs;
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
shelf = libsForQt5.callPackage ../applications/office/shelf { };
shepherd = nodePackages."@nerdwallet/shepherd";
skate = callPackage ../applications/misc/skate { };
@ -27363,8 +27355,6 @@ with pkgs;
imgp = python3Packages.callPackage ../applications/graphics/imgp { };
index-fm = libsForQt5.callPackage ../applications/misc/index-fm { };
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
inkscape = callPackage ../applications/graphics/inkscape {
@ -28234,8 +28224,6 @@ with pkgs;
ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
maui-nota = libsForQt5.callPackage ../applications/editors/maui-nota { };
pragha = libsForQt5.callPackage ../applications/audio/pragha { };
rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
@ -30436,8 +30424,6 @@ with pkgs;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
vvave = libsForQt5.callPackage ../applications/video/vvave { };
vwm = callPackage ../applications/window-managers/vwm { };
yeahwm = callPackage ../applications/window-managers/yeahwm { };

View File

@ -51,9 +51,17 @@ let
};
in (lib.makeOverridable mkPlamoGear attrs);
in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
mauiPackages = let
mkMaui = import ../applications/maui;
attrs = {
inherit libsForQt5;
inherit (pkgs) lib fetchurl;
};
in (lib.makeOverridable mkMaui attrs);
inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear qt5;
in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {
inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5;
# Alias for backwards compatibility. Added 2021-05-07.
kdeApplications = kdeGear;
@ -144,14 +152,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
maplibre-gl-native = callPackage ../development/libraries/maplibre-gl-native { };
mauikit = callPackage ../development/libraries/mauikit { };
mauikit-accounts = callPackage ../development/libraries/mauikit-accounts { };
mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { };
mauikit-texteditor = callPackage ../development/libraries/mauikit-texteditor { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
phonon = callPackage ../development/libraries/phonon { };