Merge staging into staging-next

This commit is contained in:
Frederik Rietdijk 2020-12-28 08:45:43 +01:00
commit 92cc19490e
184 changed files with 1346 additions and 1165 deletions

View file

@ -14,13 +14,12 @@ fi
tmp=$(mktemp -d) tmp=$(mktemp -d)
pushd $tmp >/dev/null pushd $tmp >/dev/null
wget -nH -r -c --no-parent "${WGET_ARGS[@]}" -A '*.tar.xz.sha256' -A '*.mirrorlist' >/dev/null wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null
find -type f -name '*.mirrorlist' -delete
csv=$(mktemp) csv=$(mktemp)
find . -type f | while read src; do find . -type f | while read src; do
# Sanitize file name # Sanitize file name
filename=$(gawk '{ print $2 }' "$src" | tr '@' '_') filename=$(basename "$src" | tr '@' '_')
nameVersion="${filename%.tar.*}" nameVersion="${filename%.tar.*}"
name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,')
version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
@ -40,8 +39,8 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
latestVersion=$(echo "$versions" | sort -rV | head -n 1) latestVersion=$(echo "$versions" | sort -rV | head -n 1)
src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv) src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" $csv)
filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv) filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
url="$(dirname "${src:2}")/$filename" url="${src:2}"
sha256=$(gawk '{ print $1 }' "$src") sha256=$(nix-hash --type sha256 --base32 --flat "$src")
cat >>"$SRCS" <<EOF cat >>"$SRCS" <<EOF
$name = { $name = {
version = "$latestVersion"; version = "$latestVersion";

View file

@ -287,6 +287,12 @@
This avoids that the password gets exposed in the nix store. This avoids that the password gets exposed in the nix store.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>wafHook</literal> hook does not wrap Python anymore.
Packages depending on <literal>wafHook</literal> need to include any Python into their <literal>nativeBuildInputs</literal>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
Starting with version 1.7.0, the project formerly named <literal>CodiMD</literal> Starting with version 1.7.0, the project formerly named <literal>CodiMD</literal>

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig
, wafHook }: , wafHook, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ams-lv2"; pname = "ams-lv2";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig wafHook python3 ];
buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: { stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mda-lv2"; pname = "mda-lv2";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig wafHook python3 ];
buildInputs = [ fftwSinglePrec lv2 ]; buildInputs = [ fftwSinglePrec lv2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec {
# There are no tests # There are no tests
doCheck = false; doCheck = false;
preFixup = ''
gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.mopidy.com/"; homepage = "https://www.mopidy.com/";
description = '' description = ''

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-calendar"; pname = "akonadi-calendar";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -8,7 +8,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-contacts"; pname = "akonadi-contacts";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-import-wizard"; pname = "akonadi-import-wizard";
meta = { meta = {
license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-mime"; pname = "akonadi-mime";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-notes"; pname = "akonadi-notes";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi-search"; pname = "akonadi-search";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadi"; pname = "akonadi";
meta = { meta = {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akonadiconsole"; pname = "akonadiconsole";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -10,7 +10,7 @@
}: }:
mkDerivation { mkDerivation {
name = "akregator"; pname = "akregator";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -20,7 +20,7 @@ let
in in
mkDerivation { mkDerivation {
name = "ark"; pname = "ark";
meta = { meta = {
description = "Graphical file compression/decompression utility"; description = "Graphical file compression/decompression utility";
license = with lib.licenses; license = with lib.licenses;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "baloo-widgets"; pname = "baloo-widgets";
meta = { meta = {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -4,7 +4,7 @@
}: }:
mkDerivation { mkDerivation {
name = "bomber"; pname = "bomber";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.bomber"; homepage = "https://kde.org/applications/en/games/org.kde.bomber";
description = "A single player arcade game"; description = "A single player arcade game";

View file

@ -4,7 +4,7 @@
}: }:
mkDerivation { mkDerivation {
name = "bovo"; pname = "bovo";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.bovo"; homepage = "https://kde.org/applications/en/games/org.kde.bovo";
description = "Five in a row application"; description = "Five in a row application";

View file

@ -1,16 +1,23 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
kholidays, kidentitymanagement, kmime, pimcommon, qttools, kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}: }:
mkDerivation { mkDerivation {
name = "calendarsupport"; pname = "calendarsupport";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch";
sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools

View file

@ -35,15 +35,13 @@ let
mkDerivation = args: mkDerivation = args:
let let
inherit (args) name; inherit (args) pname;
sname = args.sname or name; inherit (srcs.${pname}) src version;
inherit (srcs.${sname}) src version;
mkDerivation = mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in in
mkDerivation (args // { mkDerivation (args // {
pname = name; inherit pname version src;
inherit src version;
outputs = args.outputs or [ "out" ]; outputs = args.outputs or [ "out" ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "dolphin-plugins"; pname = "dolphin-plugins";
meta = { meta = {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -9,7 +9,7 @@
}: }:
mkDerivation { mkDerivation {
name = "dolphin"; pname = "dolphin";
meta = { meta = {
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -8,7 +8,7 @@
}: }:
mkDerivation { mkDerivation {
name = "dragon"; pname = "dragon";
meta = { meta = {
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];
description = "A simple media player for KDE"; description = "A simple media player for KDE";

View file

@ -19,7 +19,7 @@
}: }:
mkDerivation rec { mkDerivation rec {
name = "elisa"; pname = "elisa";
buildInputs = [ libvlc ]; buildInputs = [ libvlc ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "eventviews"; pname = "eventviews";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -1 +1 @@
WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.2/src) WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' )

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "ffmpegthumbs"; pname = "ffmpegthumbs";
meta = { meta = {
license = with lib.licenses; [ gpl2 bsd3 ]; license = with lib.licenses; [ gpl2 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "filelight"; pname = "filelight";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ]; maintainers = with lib.maintainers; [ fridh vcunat ];

View file

@ -4,7 +4,7 @@
}: }:
mkDerivation { mkDerivation {
name = "granatier"; pname = "granatier";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.granatier"; homepage = "https://kde.org/applications/en/games/org.kde.granatier";
description = "Clone of the classic Bomberman game"; description = "Clone of the classic Bomberman game";

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "grantleetheme"; pname = "grantleetheme";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "gwenview"; pname = "gwenview";
meta = { meta = {
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "incidenceeditor"; pname = "incidenceeditor";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -8,7 +8,7 @@
}: }:
mkDerivation { mkDerivation {
name = "k3b"; pname = "k3b";
meta = with lib; { meta = with lib; {
license = with licenses; [ gpl2Plus ]; license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ sander phreedom ]; maintainers = with maintainers; [ sander phreedom ];

View file

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
@ -8,11 +8,18 @@
}: }:
mkDerivation { mkDerivation {
name = "kaddressbook"; pname = "kaddressbook";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch";
sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash

View file

@ -16,7 +16,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kalarm"; pname = "kalarm";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.rittelle ]; maintainers = [ lib.maintainers.rittelle ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kalarmcal"; pname = "kalarmcal";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:
mkDerivation { mkDerivation {
name = "kalzium"; pname = "kalzium";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium"; homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium";
description = "Program that shows you the Periodic Table of Elements"; description = "Program that shows you the Periodic Table of Elements";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "kapman"; pname = "kapman";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kapman"; homepage = "https://kde.org/applications/en/games/org.kde.kapman";
description = "Clone of the well known game Pac-Man"; description = "Clone of the well known game Pac-Man";

View file

@ -8,7 +8,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kapptemplate"; pname = "kapptemplate";
nativeBuildInputs = [ extra-cmake-modules cmake ]; nativeBuildInputs = [ extra-cmake-modules cmake ];

View file

@ -8,7 +8,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kate"; pname = "kate";
meta = { meta = {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
mkDerivation { mkDerivation {
name = "katomic"; pname = "katomic";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.katomic"; homepage = "https://kde.org/applications/en/games/org.kde.katomic";
description = "Fun educational game built around molecular geometry"; description = "Fun educational game built around molecular geometry";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "kblackbox"; pname = "kblackbox";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";
description = "Game of hide and seek played on a grid of boxes"; description = "Game of hide and seek played on a grid of boxes";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "kblocks"; pname = "kblocks";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; homepage = "https://kde.org/applications/en/games/org.kde.kblocks";
description = "Classic falling blocks game"; description = "Classic falling blocks game";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }: { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }:
mkDerivation { mkDerivation {
name = "kbounce"; pname = "kbounce";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; homepage = "https://kde.org/applications/en/games/org.kde.kbounce";
description = "Single player arcade game with the elements of puzzle"; description = "Single player arcade game with the elements of puzzle";

View file

@ -10,7 +10,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kbreakout"; pname = "kbreakout";
meta.license = with lib.licenses; [ lgpl21 gpl3 ]; meta.license = with lib.licenses; [ lgpl21 gpl3 ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kcachegrind"; pname = "kcachegrind";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ orivej ]; maintainers = with lib.maintainers; [ orivej ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kcalc"; pname = "kcalc";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.fridh ]; maintainers = [ lib.maintainers.fridh ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kcalutils"; pname = "kcalutils";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kcharselect"; pname = "kcharselect";
meta = { meta = {
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.schmittlauch ]; maintainers = [ lib.maintainers.schmittlauch ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kcolorchooser"; pname = "kcolorchooser";
meta = { meta = {
license = with lib.licenses; [ mit ]; license = with lib.licenses; [ mit ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdebugsettings"; pname = "kdebugsettings";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.rittelle ]; maintainers = [ lib.maintainers.rittelle ];

View file

@ -26,15 +26,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdeconnect-kde"; pname = "kdeconnect-kde";
patches = [
# https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328
(fetchpatch {
url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff";
sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac";
})
];
buildInputs = [ buildInputs = [
kcmutils kcmutils

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdegraphics-mobipocket"; pname = "kdegraphics-mobipocket";
meta = { meta = {
license = [ lib.licenses.gpl2Plus ]; license = [ lib.licenses.gpl2Plus ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -4,7 +4,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdegraphics-thumbnailers"; pname = "kdegraphics-thumbnailers";
meta = { meta = {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdenetwork-filesharing"; pname = "kdenetwork-filesharing";
meta = { meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -35,7 +35,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdenlive"; pname = "kdenlive";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
kdoctools kdoctools

View file

@ -9,7 +9,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdepim-addons"; pname = "kdepim-addons";
meta = { meta = {
license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdepim-apps-libs"; pname = "kdepim-apps-libs";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -9,7 +9,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdepim-runtime"; pname = "kdepim-runtime";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdf"; pname = "kdf";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.peterhoeg ]; maintainers = [ lib.maintainers.peterhoeg ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kdialog"; pname = "kdialog";
meta = { meta = {
license = with lib.licenses; [ gpl2 fdl12 ]; license = with lib.licenses; [ gpl2 fdl12 ];

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }:
mkDerivation { mkDerivation {
name = "kdiamond"; pname = "kdiamond";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";
description = "A single player puzzle game"; description = "A single player puzzle game";

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "keditbookmarks"; pname = "keditbookmarks";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kio kparts kwindowsystem ]; buildInputs = [ kio kparts kwindowsystem ];
meta = with lib; { meta = with lib; {

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kfind"; pname = "kfind";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.iblech ]; maintainers = [ lib.maintainers.iblech ];

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: { mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }:
mkDerivation { mkDerivation {
name = "kfloppy"; pname = "kfloppy";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy";
description = "Utility to format 3.5\" and 5.25\" floppy disks"; description = "Utility to format 3.5\" and 5.25\" floppy disks";

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kgeography"; pname = "kgeography";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.globin ]; maintainers = [ lib.maintainers.globin ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kget"; pname = "kget";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kgpg"; pname = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [ buildInputs = [
akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "khelpcenter"; pname = "khelpcenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kidentitymanagement"; pname = "kidentitymanagement";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kig"; pname = "kig";
meta = { meta = {
license = with lib.licenses; [ gpl2 ]; license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ raskin ]; maintainers = with lib.maintainers; [ raskin ];

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
mkDerivation { mkDerivation {
name = "kigo"; pname = "kigo";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kigo"; homepage = "https://kde.org/applications/en/games/org.kde.kigo";
description = "An open-source implementation of the popular Go game"; description = "An open-source implementation of the popular Go game";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "killbots"; pname = "killbots";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.killbots"; homepage = "https://kde.org/applications/en/games/org.kde.killbots";
description = "A game where you avoid robots"; description = "A game where you avoid robots";

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kimap"; pname = "kimap";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kio-extras"; pname = "kio-extras";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 ]; license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kipi-plugins"; pname = "kipi-plugins";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kitinerary"; pname = "kitinerary";
meta = { meta = {
license = with lib.licenses; [ lgpl21 ]; license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ]; maintainers = [ lib.maintainers.bkchr ];

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kldap"; pname = "kldap";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kleopatra"; pname = "kleopatra";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }:
mkDerivation { mkDerivation {
name = "klettres"; pname = "klettres";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.klettres"; homepage = "https://kde.org/applications/en/utilities/org.kde.klettres";
description = "An application specially designed to help the user to learn an alphabet"; description = "An application specially designed to help the user to learn an alphabet";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "klines"; pname = "klines";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.klines"; homepage = "https://kde.org/applications/en/games/org.kde.klines";
description = "A simple but highly addictive one player game"; description = "A simple but highly addictive one player game";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:
mkDerivation { mkDerivation {
name = "kmag"; pname = "kmag";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";
description = "A small Linux utility to magnify a part of the screen"; description = "A small Linux utility to magnify a part of the screen";

View file

@ -9,7 +9,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmahjongg"; pname = "kmahjongg";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];
meta = { meta = {

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmail-account-wizard"; pname = "kmail-account-wizard";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -11,7 +11,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmail"; pname = "kmail";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmailtransport"; pname = "kmailtransport";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmbox"; pname = "kmbox";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -5,7 +5,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmime"; pname = "kmime";
meta = { meta = {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }: { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }:
mkDerivation { mkDerivation {
name = "kmines"; pname = "kmines";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kmines"; homepage = "https://kde.org/applications/en/games/org.kde.kmines";
description = "A classic Minesweeper game"; description = "A classic Minesweeper game";

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmix"; pname = "kmix";
meta = { meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.rongcuid ]; maintainers = [ lib.maintainers.rongcuid ];

View file

@ -3,7 +3,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kmplot"; pname = "kmplot";
meta = { meta = {
license = with lib.licenses; [ gpl2Plus fdl12 ]; license = with lib.licenses; [ gpl2Plus fdl12 ];
maintainers = [ lib.maintainers.orivej ]; maintainers = [ lib.maintainers.orivej ];

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }:
mkDerivation { mkDerivation {
name = "knavalbattle"; pname = "knavalbattle";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle";
description = "Naval Battle is a ship sinking game"; description = "Naval Battle is a ship sinking game";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "knetwalk"; pname = "knetwalk";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";
description = "A single player logic game"; description = "A single player logic game";

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }:
mkDerivation { mkDerivation {
name = "knights"; pname = "knights";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knights"; homepage = "https://kde.org/applications/en/games/org.kde.knights";
description = "A chess game"; description = "A chess game";

View file

@ -13,7 +13,7 @@
}: }:
mkDerivation { mkDerivation {
name = "knotes"; pname = "knotes";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kcrash kcompletion kconfig kconfigwidgets kcoreaddons kcrash

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kolf"; pname = "kolf";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libkdegames kio ktextwidgets ]; buildInputs = [ libkdegames kio ktextwidgets ];
meta = { meta = {

View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation { mkDerivation {
name = "kollision"; pname = "kollision";
meta = with lib; { meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kollision"; homepage = "https://kde.org/applications/en/games/org.kde.kollision";
description = "A casual game"; description = "A casual game";

View file

@ -7,7 +7,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kolourpaint"; pname = "kolourpaint";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kdelibs4support libkexiv2 ]; buildInputs = [ kdelibs4support libkexiv2 ];
meta = { meta = {

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "kompare"; pname = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; }; meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [

View file

@ -6,7 +6,7 @@
}: }:
mkDerivation { mkDerivation {
name = "konqueror"; pname = "konqueror";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kdelibs4support kcmutils khtml kdesu kdelibs4support kcmutils khtml kdesu

Some files were not shown because too many files have changed in this diff Show more