JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdeApplications: rename kdeApp to mkDerivation

Browse Source
This commit is contained in:
Thomas Tuegel 2017-06-02 10:49:52 -05:00
parent 7b6f8dc77f
commit 6beea32ab1
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
47 changed files with 96 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/kile/default.nix
View File

@ -1,4 +1,4 @@
{ kdeDerivation
{ mkDerivation
, lib
, fetchgit
, extra-cmake-modules
@ -23,7 +23,7 @@
let
unwrapped =
kdeDerivation rec {
mkDerivation rec {
name = "kile-${version}";
version = "2017-02-09";

4
pkgs/applications/kde/akonadi-contacts.nix
View File

@ -1,11 +1,11 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules,
akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
akonadi
}:
kdeApp {
mkDerivation {
name = "akonadi-contacts";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];

4
pkgs/applications/kde/akonadi-mime.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules,
akonadi, kdbusaddons, kio, kitemmodels, kmime
}:
kdeApp {
mkDerivation {
name = "akonadi-mime";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];

4
pkgs/applications/kde/akonadi.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules,
kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
kio,
boost, kitemmodels
}:
kdeApp {
mkDerivation {
name = "akonadi";
meta = {
license = [ lib.licenses.lgpl21 ];

4
pkgs/applications/kde/ark/default.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, config, kdeWrapper,
mkDerivation, lib, config, kdeWrapper,
extra-cmake-modules, kdoctools, makeWrapper,
@ -15,7 +15,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "ark";
nativeBuildInputs = [
extra-cmake-modules kdoctools makeWrapper

4
pkgs/applications/kde/baloo-widgets.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
}:
kdeApp {
mkDerivation {
name = "baloo-widgets";
meta = {
license = [ lib.licenses.lgpl21 ];

2
pkgs/applications/kde/default.nix
View File

@ -40,7 +40,7 @@ let
packages = self: with self;
let
callPackage = self.newScope {
kdeApp = import ./build-support/application.nix {
mkDerivation = import ./build-support/application.nix {
inherit lib;
inherit srcs;
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};

4
pkgs/applications/kde/dolphin-plugins.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
dolphin, kdelibs4support, ki18n, kio, kxmlgui
}:
kdeApp {
mkDerivation {
name = "dolphin-plugins";
meta = {
license = [ lib.licenses.gpl2 ];

4
pkgs/applications/kde/dolphin.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools, makeQtWrapper,
baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
@ -9,7 +9,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "dolphin";
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];

4
pkgs/applications/kde/ffmpegthumbs.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules,
ffmpeg, kio
}:
kdeApp {
mkDerivation {
name = "ffmpegthumbs";
meta = {
license = with lib.licenses; [ gpl2 bsd3 ];

4
pkgs/applications/kde/filelight.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kio, kparts, kxmlgui, qtscript, solid
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "filelight";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/gwenview.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
@ -7,7 +7,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "gwenview";
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];

4
pkgs/applications/kde/k3b.nix
View File

@ -1,4 +1,4 @@
{ kdeApp, lib, kdeWrapper, extra-cmake-modules
{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
, qtwebkit
, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
@ -9,7 +9,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "k3b";
meta = with lib; {
license = with licenses; [ gpl2Plus ];

4
pkgs/applications/kde/kate.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
@ -9,7 +9,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "kate";
meta = {
license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];

4
pkgs/applications/kde/kcachegrind.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kio, ki18n,
perl, python, php
}:
kdeWrapper {
unwrapped = kdeApp {
unwrapped = mkDerivation {
name = "kcachegrind";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/kcalc.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "kcalc";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/kcolorchooser.nix
View File

@ -1,11 +1,11 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "kcolorchooser";
meta = {
license = with lib.licenses; [ mit ];

4
pkgs/applications/kde/kcontacts.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, ki18n,
kcoreaddons, kconfig, kcodecs
}:
kdeApp {
mkDerivation {
name = "kcontacts";
meta = {
license = [ lib.licenses.lgpl21 ];

4
pkgs/applications/kde/kde-locale-4.nix
View File

@ -1,8 +1,8 @@
name: args:
{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
kdeApp (args // {
mkDerivation (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt4";

4
pkgs/applications/kde/kde-locale-5.nix
View File

@ -1,8 +1,8 @@
name: args:
{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
kdeApp (args // {
mkDerivation (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt5";

4
pkgs/applications/kde/kdegraphics-mobipocket.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules,
kio
}:
kdeApp {
mkDerivation {
name = "kdegraphics-mobipocket";
meta = {
license = [ lib.licenses.gpl2Plus ];

4
pkgs/applications/kde/kdegraphics-thumbnailers.nix
View File

@ -1,9 +1,9 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, kio, libkexiv2, libkdcraw
}:
kdeApp {
mkDerivation {
name = "kdegraphics-thumbnailers";
meta = {
license = [ lib.licenses.lgpl21 ];

4
pkgs/applications/kde/kdelibs/default.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib,
mkDerivation, lib,
automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
}:
kdeApp {
mkDerivation {
name = "kdelibs";
outputs = [ "out" "dev" ];

4
pkgs/applications/kde/kdenetwork-filesharing.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kio, kwidgetsaddons, samba
}:
kdeApp {
mkDerivation {
name = "kdenetwork-filesharing";
meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];

4
pkgs/applications/kde/kdenlive.nix
View File

@ -1,4 +1,4 @@
{ kdeApp
{ mkDerivation
, kdeWrapper
, lib
, extra-cmake-modules
@ -32,7 +32,7 @@
}:
let
unwrapped = kdeApp {
unwrapped = mkDerivation {
name = "kdenlive";
patches = [
./kdenlive-cmake-concurrent-module.patch

4
pkgs/applications/kde/kdf.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kcmutils
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "kdf";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/kgpg.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, makeQtWrapper,
mkDerivation, lib, makeQtWrapper,
extra-cmake-modules, kdoctools, ki18n,
akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
}:
kdeApp {
mkDerivation {
name = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
buildInputs = [

4
pkgs/applications/kde/khelpcenter.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, kdeWrapper,
mkDerivation, kdeWrapper,
extra-cmake-modules, kdoctools,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian
@ -7,7 +7,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "khelpcenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

8
pkgs/applications/kde/kig.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper
, extra-cmake-modules, kdoctools, kparts
, qtsvg, qtxmlpatterns, ktexteditor, boost
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "kig";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/kio-extras.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info,
mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
qtsvg, samba, solid
}:
kdeApp {
mkDerivation {
name = "kio-extras";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];

4
pkgs/applications/kde/kmime.nix
View File

@ -1,10 +1,10 @@
{
kdeApp, lib,
mkDerivation, lib,
extra-cmake-modules, ki18n,
kcodecs
}:
kdeApp {
mkDerivation {
name = "kmime";
meta = {
license = [ lib.licenses.lgpl21 ];

4
pkgs/applications/kde/kmix.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
@ -7,7 +7,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "kmix";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

6
pkgs/applications/kde/kolourpaint.nix
View File

@ -1,5 +1,5 @@
{ lib
, kdeApp
, mkDerivation
, kdeWrapper
, extra-cmake-modules
, kdoctools
@ -9,7 +9,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "kolourpaint";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
@ -25,4 +25,4 @@ let
in kdeWrapper {
inherit unwrapped;
targets = ["bin/kolourpaint"];
}
}

4
pkgs/applications/kde/kompare.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

4
pkgs/applications/kde/konsole.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
@ -9,7 +9,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "konsole";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

4
pkgs/applications/kde/krfb.nix
View File

@ -1,12 +1,12 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kdelibs4support, kdnssd, libvncserver, libXtst
}:
let
unwrapped =
kdeApp {
mkDerivation {
name = "krfb";
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];

4
pkgs/applications/kde/kwalletmanager.nix
View File

@ -1,5 +1,5 @@
{ lib
, kdeApp
, mkDerivation
, kdeWrapper
, extra-cmake-modules
, kdoctools
@ -13,7 +13,7 @@
}:
let
unwrapped = kdeApp {
unwrapped = mkDerivation {
name = "kwalletmanager";
meta = {
license = with lib.licenses; [ gpl2 ];

5
pkgs/applications/kde/libkcddb.nix
View File

@ -1,8 +1,8 @@
{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
, kcodecs, ki18n, kio, kwidgetsaddons
, libmusicbrainz5 }:
kdeApp {
mkDerivation {
name = "libkcddb";
meta = with lib; {
license = with licenses; [ gpl2 lgpl21 bsd3 ];
@ -14,5 +14,4 @@ kdeApp {
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
];
enableParallelBuilding = true;
}

4
pkgs/applications/kde/libkdcraw.nix
View File

@ -1,6 +1,6 @@
{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }:
{ mkDerivation, lib, extra-cmake-modules, libraw, qtbase }:
kdeApp {
mkDerivation {
name = "libkdcraw";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];

4
pkgs/applications/kde/libkexiv2.nix
View File

@ -1,6 +1,6 @@
{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }:
{ mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }:
kdeApp {
mkDerivation {
name = "libkexiv2";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];

4
pkgs/applications/kde/libkipi.nix
View File

@ -1,6 +1,6 @@
{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
{ mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
kdeApp {
mkDerivation {
name = "libkipi";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];

4
pkgs/applications/kde/libkomparediff2.nix
View File

@ -1,6 +1,6 @@
{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
kdeApp {
mkDerivation {
name = "libkomparediff2";
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];

4
pkgs/applications/kde/marble.nix
View File

@ -1,4 +1,4 @@
{ kdeApp, lib, kdeWrapper
{ mkDerivation, lib, kdeWrapper
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff
@ -7,7 +7,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "marble";
meta.license = with lib.licenses; [ lgpl21 gpl3 ];

4
pkgs/applications/kde/okteta.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kconfig, kinit,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
@ -7,7 +7,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "okteta";
meta = {
license = with lib.licenses; [ gpl2 ];

4
pkgs/applications/kde/okular.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
@ -8,7 +8,7 @@
}:
let
unwrapped = kdeApp {
unwrapped = mkDerivation {
name = "okular";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [

4
pkgs/applications/kde/print-manager.nix
View File

@ -1,11 +1,11 @@
{
kdeApp, lib, extra-cmake-modules,
mkDerivation, lib, extra-cmake-modules,
cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
qtdeclarative
}:
kdeApp {
mkDerivation {
name = "print-manager";
meta = {
license = [ lib.licenses.gpl2 ];

4
pkgs/applications/kde/spectacle.nix
View File

@ -1,5 +1,5 @@
{
kdeApp, lib, kdeWrapper,
mkDerivation, lib, kdeWrapper,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
@ -8,7 +8,7 @@
let
unwrapped =
kdeApp {
mkDerivation {
name = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];