Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e2ba84f234
@ -50,6 +50,6 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.systemPackages = [ cfg.package pkgs.direnv ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -429,7 +429,8 @@ in
|
||||
dolphin-plugins
|
||||
ffmpegthumbs
|
||||
kdegraphics-thumbnailers
|
||||
pkgs.kio-admin
|
||||
kde-inotify-survey
|
||||
kio-admin
|
||||
kio-extras
|
||||
];
|
||||
optionalPackages = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, glib
|
||||
, gtk3
|
||||
, libpeas
|
||||
, libsoup
|
||||
, libsoup_3
|
||||
, libxml2
|
||||
, libsecret
|
||||
, libnotify
|
||||
@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rhythmbox";
|
||||
version = "3.4.6";
|
||||
version = "3.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
|
||||
sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
libsoup
|
||||
libsoup_3
|
||||
libxml2
|
||||
tdb
|
||||
json-glib
|
||||
@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddaap=enabled"
|
||||
"-Dtests=disabled"
|
||||
];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
trivialBuild rec {
|
||||
pname = "ebuild-mode";
|
||||
version = "1.61";
|
||||
version = "1.63";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk=";
|
||||
sha256 = "sha256-Ar11zz0IVMu0g9+PN9dXvj8yeKnUGi8M+CTJfGP3bd4=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, hunspell
|
||||
, cmark
|
||||
, multimarkdown
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ghostwriter";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
|
||||
buildInputs = [ qtwebengine hunspell ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform, aesthetic, distraction-free Markdown editor";
|
||||
homepage = "https://kde.github.io/ghostwriter";
|
||||
changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda erictapen ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
kio kmailtransport
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -22,4 +22,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ akonadi grantleetheme ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -13,4 +13,8 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
|
||||
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -15,4 +15,8 @@ mkDerivation {
|
||||
akonadi kcompletion ki18n kitemmodels kmime kxmlgui
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
|
||||
|
||||
---
|
||||
CMakeLists.txt | 3 ---
|
||||
KF5AkonadiConfig.cmake.in | 6 +++---
|
||||
KPimAkonadiConfig.cmake.in | 6 +++---
|
||||
2 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
@ -13,8 +13,8 @@ index 4e8cc81..63161b7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -368,9 +368,6 @@ configure_package_config_file(
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
|
||||
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||||
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
|
||||
- AKONADI_INCLUDE_DIR
|
||||
@ -22,10 +22,10 @@ index 4e8cc81..63161b7 100644
|
||||
)
|
||||
|
||||
install(FILES
|
||||
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
|
||||
diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
|
||||
index bcf7320..1574319 100644
|
||||
--- a/KF5AkonadiConfig.cmake.in
|
||||
+++ b/KF5AkonadiConfig.cmake.in
|
||||
--- a/KPimAkonadiConfig.cmake.in
|
||||
+++ b/KPimAkonadiConfig.cmake.in
|
||||
@@ -1,10 +1,10 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
|
||||
@ -44,10 +44,8 @@ mkDerivation {
|
||||
|
||||
cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
|
||||
|
||||
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
|
||||
postInstall = ''
|
||||
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
|
||||
ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
|
||||
ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, cmake
|
||||
, corrosion
|
||||
, extra-cmake-modules
|
||||
, gcc12
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
@ -15,13 +14,14 @@
|
||||
, kwindowsystem
|
||||
, qtfeedback
|
||||
, qtquickcontrols2
|
||||
, qqc2-desktop-style
|
||||
, qtwebengine
|
||||
, rustPlatform
|
||||
, srcs
|
||||
|
||||
# These must be updated in tandem with package updates.
|
||||
, cargoShaForVersion ? "23.01.0"
|
||||
, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk="
|
||||
, cargoShaForVersion ? "23.03.80"
|
||||
, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
|
||||
}:
|
||||
|
||||
# Guard against incomplete updates.
|
||||
@ -46,7 +46,6 @@ mkDerivation rec {
|
||||
cmake
|
||||
corrosion
|
||||
extra-cmake-modules
|
||||
gcc12 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
@ -65,6 +64,7 @@ mkDerivation rec {
|
||||
kwindowsystem
|
||||
qtfeedback
|
||||
qtquickcontrols2
|
||||
qqc2-desktop-style
|
||||
qtwebengine
|
||||
];
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, mkDerivation
|
||||
|
||||
, extra-cmake-modules
|
||||
, gcc12
|
||||
, wrapGAppsHook
|
||||
|
||||
, gst_all_1
|
||||
@ -10,6 +9,7 @@
|
||||
, kcrash
|
||||
, ki18n
|
||||
, kirigami2
|
||||
, kirigami-addons
|
||||
, qtimageformats
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
@ -22,7 +22,6 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapGAppsHook
|
||||
gcc12 # doesn't build with GCC 9 from stdenv on aarch64
|
||||
python3Packages.wrapPython
|
||||
python3Packages.pybind11
|
||||
];
|
||||
@ -32,6 +31,7 @@ mkDerivation rec {
|
||||
kcrash
|
||||
ki18n
|
||||
kirigami2
|
||||
kirigami-addons
|
||||
qtimageformats
|
||||
qtmultimedia
|
||||
qtquickcontrols2
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ mkDerivation, lib, fetchurl
|
||||
{ mkDerivation, lib
|
||||
, extra-cmake-modules, ki18n
|
||||
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
|
||||
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
|
||||
, kitemviews, lcms2, libXrandr, qtx11extras
|
||||
, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "colord-kde";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
@ -13,7 +13,7 @@ mkDerivation rec {
|
||||
buildInputs = [
|
||||
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
|
||||
kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons
|
||||
kwindowsystem kitemviews lcms2 libXrandr qtx11extras
|
||||
kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -86,6 +86,7 @@ let
|
||||
falkon = callPackage ./falkon.nix {};
|
||||
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
|
||||
filelight = callPackage ./filelight.nix {};
|
||||
ghostwriter = callPackage ./ghostwriter.nix {};
|
||||
granatier = callPackage ./granatier.nix {};
|
||||
grantleetheme = callPackage ./grantleetheme {};
|
||||
gwenview = callPackage ./gwenview.nix {};
|
||||
@ -112,6 +113,7 @@ let
|
||||
kcalutils = callPackage ./kcalutils.nix {};
|
||||
kcharselect = callPackage ./kcharselect.nix {};
|
||||
kcolorchooser = callPackage ./kcolorchooser.nix {};
|
||||
kde-inotify-survey = callPackage ./kde-inotify-survey.nix {};
|
||||
kdebugsettings = callPackage ./kdebugsettings.nix {};
|
||||
kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
|
||||
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
|
||||
@ -140,6 +142,7 @@ let
|
||||
kigo = callPackage ./kigo.nix {};
|
||||
killbots = callPackage ./killbots.nix {};
|
||||
kimap = callPackage ./kimap.nix {};
|
||||
kio-admin = callPackage ./kio-admin.nix {};
|
||||
kio-extras = callPackage ./kio-extras.nix {};
|
||||
kio-gdrive = callPackage ./kio-gdrive.nix {};
|
||||
kipi-plugins = callPackage ./kipi-plugins.nix {};
|
||||
@ -233,6 +236,26 @@ let
|
||||
umbrello = callPackage ./umbrello.nix {};
|
||||
yakuake = callPackage ./yakuake.nix {};
|
||||
zanshin = callPackage ./zanshin.nix {};
|
||||
|
||||
# Plasma Mobile Gear
|
||||
alligator = callPackage ./alligator.nix {};
|
||||
angelfish = callPackage ./angelfish.nix { inherit srcs; };
|
||||
audiotube = callPackage ./audiotube.nix {};
|
||||
calindori = callPackage ./calindori.nix {};
|
||||
kalk = callPackage ./kalk.nix {};
|
||||
kasts = callPackage ./kasts.nix {};
|
||||
kclock = callPackage ./kclock.nix {};
|
||||
keysmith = callPackage ./keysmith.nix {};
|
||||
koko = callPackage ./koko.nix {};
|
||||
kongress = callPackage ./kongress.nix {};
|
||||
krecorder = callPackage ./krecorder.nix {};
|
||||
ktrip = callPackage ./ktrip.nix {};
|
||||
kweather = callPackage ./kweather.nix {};
|
||||
neochat = callPackage ./neochat.nix {};
|
||||
plasmatube = callPackage ./plasmatube {};
|
||||
qmlkonsole = callPackage ./qmlkonsole.nix {};
|
||||
telly-skout = callPackage ./telly-skout.nix {};
|
||||
tokodon = callPackage ./tokodon.nix {};
|
||||
};
|
||||
|
||||
in lib.makeScope libsForQt5.newScope packages
|
||||
|
||||
@ -5,8 +5,7 @@
|
||||
kcompletion, kconfig, kcoreaddons, kdbusaddons,
|
||||
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
|
||||
kparts, ktexteditor, kwindowsystem, phonon, solid,
|
||||
kuserfeedback,
|
||||
wayland, qtwayland
|
||||
kuserfeedback, wayland, qtwayland, qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -26,6 +25,7 @@ mkDerivation {
|
||||
phonon solid
|
||||
kuserfeedback
|
||||
wayland qtwayland
|
||||
qtx11extras
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
libkdepim qtbase qttools kholidays
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.0/src -A '*.tar.xz' )
|
||||
|
||||
41
pkgs/applications/kde/ghostwriter.nix
Normal file
41
pkgs/applications/kde/ghostwriter.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, extra-cmake-modules
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, kcoreaddons
|
||||
, kconfigwidgets
|
||||
, sonnet
|
||||
, kxmlgui
|
||||
, hunspell
|
||||
, cmark
|
||||
, multimarkdown
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "ghostwriter";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
|
||||
buildInputs = [
|
||||
qtwebengine
|
||||
hunspell
|
||||
kcoreaddons
|
||||
kconfigwidgets
|
||||
sonnet
|
||||
kxmlgui
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform, aesthetic, distraction-free Markdown editor";
|
||||
homepage = "https://ghostwriter.kde.org/";
|
||||
changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda erictapen ];
|
||||
};
|
||||
}
|
||||
@ -16,4 +16,8 @@ mkDerivation {
|
||||
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
|
||||
];
|
||||
propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
extra-cmake-modules, kdoctools,
|
||||
exiv2, lcms2, cfitsio,
|
||||
baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
|
||||
phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator
|
||||
phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator,
|
||||
wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -19,6 +20,7 @@ mkDerivation {
|
||||
baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
|
||||
exiv2 lcms2 cfitsio
|
||||
qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator
|
||||
wayland wayland-protocols
|
||||
];
|
||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
kldap kmime pimcommon qtbase
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }:
|
||||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond, qcoro }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kaccounts-integration";
|
||||
@ -19,5 +19,6 @@ mkDerivation {
|
||||
kwallet
|
||||
accounts-qt
|
||||
signond
|
||||
qcoro
|
||||
];
|
||||
}
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
|
||||
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
|
||||
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
|
||||
kuserfeedback,
|
||||
plasma-framework, qtscript, threadweaver
|
||||
kuserfeedback, plasma-framework, qtscript, threadweaver, qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -33,8 +32,7 @@ mkDerivation {
|
||||
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
|
||||
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
|
||||
kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
|
||||
knewstuff
|
||||
kuserfeedback
|
||||
knewstuff kuserfeedback qtx11extras
|
||||
];
|
||||
propagatedUserEnvPkgs = [ konsole ];
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
kidentitymanagement kpimtextedit
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
30
pkgs/applications/kde/kde-inotify-survey.nix
Normal file
30
pkgs/applications/kde/kde-inotify-survey.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kauth
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
, ki18n
|
||||
, knotifications
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kde-inotify-survey";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
kauth
|
||||
kcoreaddons
|
||||
kdbusaddons
|
||||
ki18n
|
||||
knotifications
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached";
|
||||
homepage = "https://invent.kde.org/system/kde-inotify-survey";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
gettext,
|
||||
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
|
||||
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, kxmlgui,
|
||||
python3
|
||||
}:
|
||||
|
||||
@ -16,7 +16,7 @@ mkDerivation {
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
|
||||
gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion kxmlgui python3
|
||||
];
|
||||
propagatedUserEnvPkgs = [ ];
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
, libXtst
|
||||
, libfakekey
|
||||
, makeWrapper
|
||||
, modemmanager-qt
|
||||
, pulseaudio-qt
|
||||
, qca-qt5
|
||||
, qqc2-desktop-style
|
||||
@ -26,6 +27,7 @@
|
||||
, breeze-icons
|
||||
, sshfs
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, plasma-wayland-protocols
|
||||
}:
|
||||
@ -47,6 +49,7 @@ mkDerivation {
|
||||
kwayland
|
||||
libXtst
|
||||
libfakekey
|
||||
modemmanager-qt
|
||||
pulseaudio-qt
|
||||
qca-qt5
|
||||
qqc2-desktop-style
|
||||
@ -55,6 +58,7 @@ mkDerivation {
|
||||
qtquickcontrols2
|
||||
qtx11extras
|
||||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
plasma-wayland-protocols
|
||||
# otherwise buttons are blank on non-kde
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
|
||||
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qcoro
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -11,5 +11,5 @@ mkDerivation {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
|
||||
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba qcoro ];
|
||||
}
|
||||
|
||||
@ -17,4 +17,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
cyrus_sasl, kcoreaddons, ki18n, kio, kmime
|
||||
cyrus_sasl, kcoreaddons, ki18n, kio, kmime, kitemmodels
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -12,6 +12,10 @@ mkDerivation {
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ ki18n kio ];
|
||||
propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
|
||||
propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
16
pkgs/applications/kde/kio-admin.nix
Normal file
16
pkgs/applications/kde/kio-admin.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, qtbase, kio, ki18n, polkit-qt }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kio-admin";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase kio ki18n polkit-qt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage files as administrator using the admin:// KIO protocol.";
|
||||
homepage = "https://invent.kde.org/system/kio-admin";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ k900 ];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules
|
||||
, qtdeclarative, ki18n, kmime, kpkpass
|
||||
, poppler, kcontacts, kcalendarcore
|
||||
, shared-mime-info
|
||||
, shared-mime-info, zxing-cpp
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -16,11 +16,7 @@ mkDerivation {
|
||||
];
|
||||
buildInputs = [
|
||||
qtdeclarative kmime kpkpass poppler
|
||||
kcontacts kcalendarcore
|
||||
];
|
||||
|
||||
CXXFLAGS = [
|
||||
"-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory
|
||||
kcontacts kcalendarcore ki18n zxing-cpp
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,4 +14,8 @@ mkDerivation {
|
||||
buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
|
||||
propagatedBuildInputs = [ cyrus_sasl openldap ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
|
||||
knotifications, kwindowsystem, kxmlgui, libkleo, kcrash
|
||||
knotifications, kwindowsystem, kxmlgui, libkleo, kcrash, kpipewire
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -12,7 +12,7 @@ mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
|
||||
knotifications kwindowsystem kxmlgui libkleo kcrash
|
||||
knotifications kwindowsystem kxmlgui libkleo kcrash kpipewire
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -19,4 +19,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -13,4 +13,8 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kmime qtbase kcodecs ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -13,4 +13,8 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ kcodecs ki18n qtbase ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
36
pkgs/applications/kde/kongress.nix
Normal file
36
pkgs/applications/kde/kongress.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, qtquickcontrols2
|
||||
, kcalendarcore
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
, kirigami2
|
||||
, ki18n
|
||||
, knotifications
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kongress";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
qtquickcontrols2
|
||||
kcalendarcore
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kdbusaddons
|
||||
kirigami2
|
||||
ki18n
|
||||
knotifications
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A companion application for conferences";
|
||||
homepage = "https://apps.kde.org/kongress/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
|
||||
ki18n, kiconthemes, kinit, kio, knotifications,
|
||||
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
|
||||
kwindowsystem, kxmlgui, qtscript, knewstuff
|
||||
kwindowsystem, kxmlgui, qtscript, knewstuff, qtmultimedia
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -19,7 +19,7 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
|
||||
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
|
||||
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
|
||||
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff qtmultimedia
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.konsole;
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{
|
||||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kiconthemes, kparts, kwindowsystem, kxmlgui
|
||||
kiconthemes, kparts, kwindowsystem, kxmlgui,
|
||||
qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -12,7 +13,11 @@ mkDerivation {
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kiconthemes kwindowsystem kxmlgui
|
||||
kiconthemes kwindowsystem kxmlgui qtx11extras
|
||||
];
|
||||
propagatedBuildInputs = [ kparts ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$out/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -19,4 +19,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ ktextwidgets ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, qtquickcontrols2
|
||||
, networkmanager-qt
|
||||
, ki18n
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -10,4 +13,10 @@ mkDerivation {
|
||||
maintainers = [ maintainers.samueldr ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [
|
||||
qtquickcontrols2
|
||||
networkmanager-qt
|
||||
ki18n
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation, lib
|
||||
, extra-cmake-modules, kdoctools
|
||||
, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
|
||||
, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
|
||||
, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire
|
||||
, libvncserver, libXtst, libXdamage
|
||||
, qtx11extras, pipewire, plasma-wayland-protocols, wayland
|
||||
}:
|
||||
@ -18,7 +18,7 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
libvncserver libXtst libXdamage
|
||||
kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
|
||||
kwindowsystem kxmlgui kwayland
|
||||
kwindowsystem kxmlgui kwayland kpipewire
|
||||
qtx11extras
|
||||
pipewire
|
||||
plasma-wayland-protocols
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
|
||||
From: gnidorah <gnidorah@users.noreply.github.com>
|
||||
Date: Fri, 22 Dec 2017 19:32:47 +0300
|
||||
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 83c2bcb..5f6d47c 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
|
||||
REQUIRED_HEADERS KSMTP_HEADERS
|
||||
)
|
||||
|
||||
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -13,5 +13,8 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ kcoreaddons kio kmime ];
|
||||
propagatedBuildInputs = [ cyrus_sasl ];
|
||||
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$out/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -15,4 +15,8 @@ mkDerivation {
|
||||
kcalendarcore kcalutils kcontacts
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -15,4 +15,8 @@ mkDerivation {
|
||||
kconfig kio ktextwidgets kwidgetsaddons pimcommon
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
|
||||
, kcodecs, ki18n, kio, kwidgetsaddons
|
||||
, kcodecs, ki18n, kio, kwidgetsaddons, kcmutils
|
||||
, libmusicbrainz5 }:
|
||||
|
||||
mkDerivation {
|
||||
@ -9,7 +9,7 @@ mkDerivation {
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ qtbase kcmutils ];
|
||||
propagatedBuildInputs = [
|
||||
kcodecs ki18n kio kwidgetsaddons
|
||||
libmusicbrainz5
|
||||
|
||||
@ -18,4 +18,8 @@ mkDerivation {
|
||||
kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
|
||||
kwallet
|
||||
];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$out/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -18,4 +18,8 @@ mkDerivation {
|
||||
];
|
||||
propagatedBuildInputs = [ qgpgme ];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -19,4 +19,8 @@ mkDerivation {
|
||||
kwindowsystem mailimporter messagelib phonon libkdepim
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -16,4 +16,8 @@ mkDerivation {
|
||||
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
|
||||
kxmlgui libkdepim pimcommon
|
||||
];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$out/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -26,4 +26,8 @@ mkDerivation {
|
||||
qtwebengine
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
# added as an include directory by cmake files and fails to compile if it's missing
|
||||
mkdir -p "$dev/include/KF5"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ gcc12Stdenv
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, srcs
|
||||
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
@ -30,10 +29,8 @@
|
||||
, sonnet
|
||||
}:
|
||||
|
||||
# Workaround for AArch64 not using GCC11 yet.
|
||||
gcc12Stdenv.mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "neochat";
|
||||
inherit (srcs.neochat) version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -5,7 +5,7 @@
|
||||
, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts
|
||||
, kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler
|
||||
, qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
|
||||
, withSpeech ? true, qtspeech
|
||||
, withSpeech ? true, qtspeech, qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -18,7 +18,7 @@ mkDerivation {
|
||||
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
|
||||
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
|
||||
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
|
||||
qtdeclarative qtsvg threadweaver kcrash chmlib
|
||||
qtdeclarative qtsvg threadweaver kcrash chmlib qtx11extras
|
||||
] ++ lib.optional withSpeech qtspeech;
|
||||
|
||||
# InitialPreference values are too high and end up making okular
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
|
||||
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
|
||||
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
|
||||
kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
|
||||
kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine, ktextaddons
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -17,7 +17,7 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
|
||||
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
|
||||
kpurpose kwallet kwindowsystem libkdepim qtwebengine
|
||||
kpurpose kwallet kwindowsystem libkdepim qtwebengine ktextaddons
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
, mpv
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
, yt-dlp
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -37,15 +36,6 @@ mkDerivation {
|
||||
gstreamer
|
||||
]);
|
||||
|
||||
patches = [
|
||||
./0001-Add-placeholders-for-runtime-dependencies.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/videomodel.cpp \
|
||||
--replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
@ -4,6 +4,7 @@
|
||||
, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
|
||||
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
|
||||
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -12,7 +13,8 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
||||
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
|
||||
knewstuff kwayland kcolorpicker kimageannotator
|
||||
knewstuff kwayland kcolorpicker kimageannotator qcoro qtquickcontrols2
|
||||
wayland plasma-wayland-protocols kpurpose kpipewire
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
24
pkgs/applications/kde/telly-skout.nix
Normal file
24
pkgs/applications/kde/telly-skout.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, qtquickcontrols2
|
||||
, kcoreaddons
|
||||
, kconfig
|
||||
, ki18n
|
||||
, kirigami2
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "telly-skout";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
||||
buildInputs = [ qtquickcontrols2 kcoreaddons kconfig ki18n kirigami2 ];
|
||||
|
||||
meta = {
|
||||
description = "A convergent Kirigami TV guide";
|
||||
homepage = "https://apps.kde.org/telly-skout/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,6 @@
|
||||
, kirigami2
|
||||
, kirigami-addons
|
||||
, knotifications
|
||||
, libwebsockets
|
||||
, qqc2-desktop-style
|
||||
, qtbase
|
||||
, qtkeychain
|
||||
@ -21,29 +20,11 @@
|
||||
, qtwebsockets
|
||||
, kitemmodels
|
||||
, pimcommon
|
||||
|
||||
# Workarounds for the point release being missing.
|
||||
, libsForQt5
|
||||
, fetchFromGitLab
|
||||
}:
|
||||
|
||||
# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package
|
||||
# set for the point release, as the point release was not uploaded to
|
||||
# the Plasma Mobile gear repo, and the injected `mkDerivation` only can
|
||||
# use the src (and version) from the `srcs` set.
|
||||
libsForQt5.mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "tokodon";
|
||||
|
||||
version = "23.01.0";
|
||||
# NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo.
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "network";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
@ -60,7 +60,7 @@ let
|
||||
# libraries
|
||||
mauikit = callPackage ./mauikit.nix { };
|
||||
mauikit-accounts = callPackage ./mauikit-accounts.nix { };
|
||||
mauikit-calendar = callPackage ./mauikit-calendar.nix { };
|
||||
mauikit-calendar = callPackage ./mauikit-calendar { };
|
||||
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
|
||||
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
|
||||
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES
|
||||
find_package(MauiKit)
|
||||
|
||||
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
|
||||
+find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)
|
||||
find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
|
||||
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
|
||||
find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
|
||||
@ -6,6 +6,7 @@
|
||||
, qtquickcontrols2
|
||||
, akonadi
|
||||
, akonadi-contacts
|
||||
, akonadi-calendar
|
||||
, calendarsupport
|
||||
, eventviews
|
||||
}:
|
||||
@ -13,6 +14,8 @@
|
||||
mkDerivation {
|
||||
pname = "mauikit-calendar";
|
||||
|
||||
patches = [ ./add-akonadi-calendar.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
@ -21,6 +24,7 @@ mkDerivation {
|
||||
buildInputs = [
|
||||
akonadi
|
||||
akonadi-contacts
|
||||
akonadi-calendar
|
||||
calendarsupport
|
||||
eventviews
|
||||
mauikit
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gatekeeper";
|
||||
version = "3.10.0";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "gatekeeper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4U03gdOls1uPpTqxmjLo1ruE4eeuUlGxphOgS9e5C1A=";
|
||||
sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
33
pkgs/applications/networking/cluster/ktop/default.nix
Normal file
33
pkgs/applications/networking/cluster/ktop/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ktop";
|
||||
version = "0.3.5";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vladimirvivien";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/vladimirvivien/ktop/buildinfo.Version=v${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/hack
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A top-like tool for your Kubernetes cluster";
|
||||
longDescription = ''
|
||||
Following the tradition of Unix/Linux top tools, ktop is a tool that displays useful metrics information about nodes, pods, and other workload resources running in a Kubernetes cluster.
|
||||
'';
|
||||
homepage = "https://github.com/vladimirvivien/ktop/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ qjoly ];
|
||||
};
|
||||
}
|
||||
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firewalld";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firewalld";
|
||||
repo = "firewalld";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q=";
|
||||
sha256 = "sha256-P9jErGxylTAgWGoefqglAgU7FNRVpKHVXu9JzyjBnA8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "coyim";
|
||||
version = "0.4";
|
||||
version = "0.4.1";
|
||||
|
||||
goPackagePath = "github.com/coyim/coyim";
|
||||
|
||||
@ -21,7 +21,7 @@ buildGoPackage rec {
|
||||
owner = "coyim";
|
||||
repo = "coyim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dpTU5Tx1pfUGZMt9QNEYDytgArhhvEvh1Yvj6IAjgeI=";
|
||||
sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, testers
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
@ -11,17 +12,16 @@
|
||||
, Security
|
||||
, python3
|
||||
, pythonSupport ? true
|
||||
, pjsip
|
||||
, runCommand
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pjsip";
|
||||
version = "2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
owner = finalAttrs.pname;
|
||||
repo = "pjproject";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
|
||||
};
|
||||
|
||||
@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
|
||||
mkdir -p $out/share/${pname}-${version}/samples
|
||||
cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
|
||||
mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
|
||||
cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
|
||||
'' + lib.optionalString pythonSupport ''
|
||||
(cd pjsip-apps/src/swig/python && \
|
||||
python setup.py install --prefix=$py
|
||||
@ -98,11 +98,26 @@ stdenv.mkDerivation rec {
|
||||
install_name_tool -id $lib "''${change_args[@]}" $lib
|
||||
fi
|
||||
done
|
||||
|
||||
# Rewrite library references for all executables.
|
||||
find "$out" -executable -type f | while read executable; do
|
||||
install_name_tool "''${change_args[@]}" "$executable"
|
||||
done
|
||||
'';
|
||||
|
||||
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "pjsua --version";
|
||||
};
|
||||
|
||||
passthru.tests.pkg-config = testers.hasPkgConfigModule {
|
||||
package = finalAttrs.finalPackage;
|
||||
moduleName = "libpjproject";
|
||||
};
|
||||
|
||||
passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
|
||||
${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
|
||||
'';
|
||||
@ -115,4 +130,4 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "pjsua";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -57,26 +57,10 @@ let
|
||||
inherit mkDerivation;
|
||||
};
|
||||
in {
|
||||
alligator = callPackage ./alligator.nix {};
|
||||
angelfish = callPackage ./angelfish.nix { inherit srcs; };
|
||||
audiotube = callPackage ./audiotube.nix {};
|
||||
calindori = callPackage ./calindori.nix {};
|
||||
kalk = callPackage ./kalk.nix {};
|
||||
kasts = callPackage ./kasts.nix {};
|
||||
kclock = callPackage ./kclock.nix {};
|
||||
keysmith = callPackage ./keysmith.nix {};
|
||||
koko = callPackage ./koko.nix {};
|
||||
krecorder = callPackage ./krecorder.nix {};
|
||||
ktrip = callPackage ./ktrip.nix {};
|
||||
kweather = callPackage ./kweather.nix {};
|
||||
neochat = callPackage ./neochat.nix { inherit srcs; };
|
||||
plasma-dialer = callPackage ./plasma-dialer.nix {};
|
||||
plasma-phonebook = callPackage ./plasma-phonebook.nix {};
|
||||
plasma-settings = callPackage ./plasma-settings.nix {};
|
||||
plasmatube = callPackage ./plasmatube {};
|
||||
qmlkonsole = callPackage ./qmlkonsole.nix {};
|
||||
spacebar = callPackage ./spacebar.nix {};
|
||||
tokodon = callPackage ./tokodon.nix {};
|
||||
};
|
||||
|
||||
in lib.makeScope libsForQt5.newScope packages
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 7a9405ed02b0d86839644a2c237ca7ca8b891b76 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
|
||||
Date: Wed, 30 Nov 2022 21:07:56 -0500
|
||||
Subject: [PATCH] Add placeholders for runtime dependencies
|
||||
|
||||
---
|
||||
src/videomodel.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/videomodel.cpp b/src/videomodel.cpp
|
||||
index 4bb3451..b558f31 100644
|
||||
--- a/src/videomodel.cpp
|
||||
+++ b/src/videomodel.cpp
|
||||
@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl()
|
||||
return {};
|
||||
}
|
||||
|
||||
- QString youtubeDl = QStringLiteral("yt-dlp");
|
||||
+ QString youtubeDl = QStringLiteral("@yt-dlp@");
|
||||
QStringList arguments;
|
||||
arguments << QLatin1String("--dump-json")
|
||||
<< m_videoId;
|
||||
--
|
||||
2.38.0
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerbv";
|
||||
version = "2015-10-08";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.geda-project.org/gerbv.git";
|
||||
rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659";
|
||||
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gerbv/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-xe6AjEIwzmvjrRCrY8VHCYOG1DAicE3iXduTeOYgU7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -21,15 +20,17 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
|
||||
buildInputs = [ gettext libtool cairo gtk2 ];
|
||||
buildInputs = [ gettext libtool cairo gtk2-x11 ];
|
||||
|
||||
configureFlags = ["--disable-update-desktop-database"];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Gerber (RS-274X) viewer";
|
||||
homepage = "http://gerbv.geda-project.org/";
|
||||
maintainers = with maintainers; [ mog ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, haskell, spass }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "system-for-automated-deduction";
|
||||
version = "2.3.25";
|
||||
src = fetchurl {
|
||||
url = "http://nevidal.org/download/sad-${version}.tar.gz";
|
||||
sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
|
||||
};
|
||||
buildInputs = [ haskell.compiler.ghc844 spass ];
|
||||
patches = [
|
||||
./patch.patch
|
||||
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
|
||||
# the <> operator with a different meaning defined by this package
|
||||
./monoid.patch
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,provers}
|
||||
install alice $out/bin
|
||||
install provers/moses $out/provers
|
||||
substituteAll provers/provers.dat $out/provers/provers.dat
|
||||
substituteAll init.opt $out/init.opt
|
||||
cp -r examples $out
|
||||
'';
|
||||
inherit spass;
|
||||
meta = {
|
||||
description = "A program for automated proving of mathematical texts";
|
||||
longDescription = ''
|
||||
The system for automated deduction is intended for automated processing of formal mathematical texts
|
||||
written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.schmitthenner ];
|
||||
homepage = "http://nevidal.org/sad.en.html";
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true; # ghc-8.4.4 is gone from Nixpkgs
|
||||
};
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs
|
||||
index 0700fa0388f..69815864710 100644
|
||||
--- a/Alice/Core/Check.hs
|
||||
+++ b/Alice/Core/Check.hs
|
||||
@@ -18,8 +18,12 @@
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-}
|
||||
|
||||
+{-# LANGUAGE NoImplicitPrelude #-}
|
||||
+
|
||||
module Alice.Core.Check (fillDef) where
|
||||
|
||||
+import Prelude hiding ((<>))
|
||||
+
|
||||
import Control.Monad
|
||||
import Data.Maybe
|
||||
|
||||
diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs
|
||||
index c361bcf220d..4e493d8c91b 100644
|
||||
--- a/Alice/Core/Reason.hs
|
||||
+++ b/Alice/Core/Reason.hs
|
||||
@@ -17,9 +17,12 @@
|
||||
- You should have received a copy of the GNU General Public License
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-}
|
||||
+{-# LANGUAGE NoImplicitPrelude #-}
|
||||
|
||||
module Alice.Core.Reason where
|
||||
|
||||
+import Prelude hiding ((<>))
|
||||
+
|
||||
import Control.Monad
|
||||
|
||||
import Alice.Core.Base
|
||||
diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs
|
||||
index 4f8550bdf11..0f59d135b16 100644
|
||||
--- a/Alice/Core/Verify.hs
|
||||
+++ b/Alice/Core/Verify.hs
|
||||
@@ -18,8 +18,12 @@
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-}
|
||||
|
||||
+{-# LANGUAGE NoImplicitPrelude #-}
|
||||
+
|
||||
module Alice.Core.Verify (verify) where
|
||||
|
||||
+import Prelude hiding ((<>))
|
||||
+
|
||||
import Control.Monad
|
||||
import Data.IORef
|
||||
import Data.Maybe
|
||||
@ -1,200 +0,0 @@
|
||||
diff -aur serious/sad-2.3-25/Alice/Core/Base.hs sad-2.3-25/Alice/Core/Base.hs
|
||||
--- serious/sad-2.3-25/Alice/Core/Base.hs 2008-03-29 18:24:12.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Core/Base.hs 2015-11-27 06:38:28.740840823 +0000
|
||||
@@ -21,6 +21,7 @@
|
||||
module Alice.Core.Base where
|
||||
|
||||
import Control.Monad
|
||||
+import Control.Applicative
|
||||
import Data.IORef
|
||||
import Data.List
|
||||
import Data.Time
|
||||
@@ -61,10 +62,21 @@
|
||||
type CRMC a b = IORef RState -> IO a -> (b -> IO a) -> IO a
|
||||
newtype CRM b = CRM { runCRM :: forall a . CRMC a b }
|
||||
|
||||
+instance Functor CRM where
|
||||
+ fmap = liftM
|
||||
+
|
||||
+instance Applicative CRM where
|
||||
+ pure = return
|
||||
+ (<*>) = ap
|
||||
+
|
||||
instance Monad CRM where
|
||||
return r = CRM $ \ _ _ k -> k r
|
||||
m >>= n = CRM $ \ s z k -> runCRM m s z (\ r -> runCRM (n r) s z k)
|
||||
|
||||
+instance Alternative CRM where
|
||||
+ (<|>) = mplus
|
||||
+ empty = mzero
|
||||
+
|
||||
instance MonadPlus CRM where
|
||||
mzero = CRM $ \ _ z _ -> z
|
||||
mplus m n = CRM $ \ s z k -> runCRM m s (runCRM n s z k) k
|
||||
diff -aur serious/sad-2.3-25/Alice/Core/Thesis.hs sad-2.3-25/Alice/Core/Thesis.hs
|
||||
--- serious/sad-2.3-25/Alice/Core/Thesis.hs 2008-03-05 13:10:50.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Core/Thesis.hs 2015-11-27 06:35:08.311015166 +0000
|
||||
@@ -21,6 +21,7 @@
|
||||
module Alice.Core.Thesis (thesis) where
|
||||
|
||||
import Control.Monad
|
||||
+import Control.Applicative
|
||||
import Data.List
|
||||
import Data.Maybe
|
||||
|
||||
@@ -126,11 +127,22 @@
|
||||
|
||||
newtype TM res = TM { runTM :: [String] -> [([String], res)] }
|
||||
|
||||
+instance Functor TM where
|
||||
+ fmap = liftM
|
||||
+
|
||||
+instance Applicative TM where
|
||||
+ pure = return
|
||||
+ (<*>) = ap
|
||||
+
|
||||
instance Monad TM where
|
||||
return r = TM $ \ s -> [(s, r)]
|
||||
m >>= k = TM $ \ s -> concatMap apply (runTM m s)
|
||||
where apply (s, r) = runTM (k r) s
|
||||
|
||||
+instance Alternative TM where
|
||||
+ (<|>) = mplus
|
||||
+ empty = mzero
|
||||
+
|
||||
instance MonadPlus TM where
|
||||
mzero = TM $ \ _ -> []
|
||||
mplus m k = TM $ \ s -> runTM m s ++ runTM k s
|
||||
diff -aur serious/sad-2.3-25/Alice/Export/Base.hs sad-2.3-25/Alice/Export/Base.hs
|
||||
--- serious/sad-2.3-25/Alice/Export/Base.hs 2008-03-09 09:36:39.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Export/Base.hs 2015-11-27 06:32:47.782738005 +0000
|
||||
@@ -39,7 +39,7 @@
|
||||
-- Database reader
|
||||
|
||||
readPrDB :: String -> IO [Prover]
|
||||
-readPrDB file = do inp <- catch (readFile file) $ die . ioeGetErrorString
|
||||
+readPrDB file = do inp <- catchIOError (readFile file) $ die . ioeGetErrorString
|
||||
|
||||
let dws = dropWhile isSpace
|
||||
cln = reverse . dws . reverse . dws
|
||||
diff -aur serious/sad-2.3-25/Alice/Export/Prover.hs sad-2.3-25/Alice/Export/Prover.hs
|
||||
--- serious/sad-2.3-25/Alice/Export/Prover.hs 2008-03-09 09:36:39.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Export/Prover.hs 2015-11-27 06:36:47.632919161 +0000
|
||||
@@ -60,7 +60,7 @@
|
||||
when (askIB IBPdmp False ins) $ putStrLn tsk
|
||||
|
||||
seq (length tsk) $ return $
|
||||
- do (wh,rh,eh,ph) <- catch run
|
||||
+ do (wh,rh,eh,ph) <- catchIOError run
|
||||
$ \ e -> die $ "run error: " ++ ioeGetErrorString e
|
||||
|
||||
hPutStrLn wh tsk ; hClose wh
|
||||
diff -aur serious/sad-2.3-25/Alice/ForTheL/Base.hs sad-2.3-25/Alice/ForTheL/Base.hs
|
||||
--- serious/sad-2.3-25/Alice/ForTheL/Base.hs 2008-03-09 09:36:39.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/ForTheL/Base.hs 2015-11-27 06:31:51.921230428 +0000
|
||||
@@ -226,7 +226,7 @@
|
||||
varlist = do vs <- chainEx (char ',') var
|
||||
nodups vs ; return vs
|
||||
|
||||
-nodups vs = unless (null $ dups vs) $
|
||||
+nodups vs = unless ((null :: [a] -> Bool) $ dups vs) $
|
||||
fail $ "duplicate names: " ++ show vs
|
||||
|
||||
hidden = askPS psOffs >>= \ n -> return ('h':show n)
|
||||
diff -aur serious/sad-2.3-25/Alice/Import/Reader.hs sad-2.3-25/Alice/Import/Reader.hs
|
||||
--- serious/sad-2.3-25/Alice/Import/Reader.hs 2008-03-09 09:36:39.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Import/Reader.hs 2015-11-27 06:36:41.818866167 +0000
|
||||
@@ -24,7 +24,7 @@
|
||||
import Control.Monad
|
||||
import System.IO
|
||||
import System.IO.Error
|
||||
-import System.Exit
|
||||
+import System.Exit hiding (die)
|
||||
|
||||
import Alice.Data.Text
|
||||
import Alice.Data.Instr
|
||||
@@ -44,7 +44,7 @@
|
||||
readInit "" = return []
|
||||
|
||||
readInit file =
|
||||
- do input <- catch (readFile file) $ die file . ioeGetErrorString
|
||||
+ do input <- catchIOError (readFile file) $ die file . ioeGetErrorString
|
||||
let tkn = tokenize input ; ips = initPS ()
|
||||
inp = ips { psRest = tkn, psFile = file, psLang = "Init" }
|
||||
liftM fst $ fireLPM instf inp
|
||||
@@ -74,7 +74,7 @@
|
||||
reader lb fs (ps:ss) [TI (InStr ISfile file)] =
|
||||
do let gfl = if null file then hGetContents stdin
|
||||
else readFile file
|
||||
- input <- catch gfl $ die file . ioeGetErrorString
|
||||
+ input <- catchIOError gfl $ die file . ioeGetErrorString
|
||||
let tkn = tokenize input
|
||||
ips = initPS $ (psProp ps) { tvr_expr = [] }
|
||||
sps = ips { psRest = tkn, psFile = file, psOffs = psOffs ps }
|
||||
diff -aur serious/sad-2.3-25/Alice/Parser/Base.hs sad-2.3-25/Alice/Parser/Base.hs
|
||||
--- serious/sad-2.3-25/Alice/Parser/Base.hs 2008-03-09 09:36:40.000000000 +0000
|
||||
+++ sad-2.3-25/Alice/Parser/Base.hs 2015-11-27 06:14:28.616734527 +0000
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
module Alice.Parser.Base where
|
||||
|
||||
+import Control.Applicative
|
||||
import Control.Monad
|
||||
import Data.List
|
||||
|
||||
@@ -45,11 +46,22 @@
|
||||
type CPMC a b c = (c -> CPMS a b) -> (String -> CPMS a b) -> CPMS a b
|
||||
newtype CPM a c = CPM { runCPM :: forall b . CPMC a b c }
|
||||
|
||||
+instance Functor (CPM a) where
|
||||
+ fmap = liftM
|
||||
+
|
||||
+instance Applicative (CPM a) where
|
||||
+ pure = return
|
||||
+ (<*>) = ap
|
||||
+
|
||||
instance Monad (CPM a) where
|
||||
return r = CPM $ \ k _ -> k r
|
||||
m >>= n = CPM $ \ k l -> runCPM m (\ b -> runCPM (n b) k l) l
|
||||
fail e = CPM $ \ _ l -> l e
|
||||
|
||||
+instance Alternative (CPM a) where
|
||||
+ (<|>) = mplus
|
||||
+ empty = mzero
|
||||
+
|
||||
instance MonadPlus (CPM a) where
|
||||
mzero = CPM $ \ _ _ _ z -> z
|
||||
mplus m n = CPM $ \ k l s -> runCPM m k l s . runCPM n k l s
|
||||
diff -aur serious/sad-2.3-25/init.opt sad-2.3-25/init.opt
|
||||
--- serious/sad-2.3-25/init.opt 2007-10-11 15:25:45.000000000 +0000
|
||||
+++ sad-2.3-25/init.opt 2015-11-27 07:23:41.372816854 +0000
|
||||
@@ -1,6 +1,6 @@
|
||||
# Alice init options
|
||||
-[library examples]
|
||||
-[provers provers/provers.dat]
|
||||
+[library @out@/examples]
|
||||
+[provers @out@/provers/provers.dat]
|
||||
[prover spass]
|
||||
[timelimit 3]
|
||||
[depthlimit 7]
|
||||
diff -aur serious/sad-2.3-25/provers/provers.dat sad-2.3-25/provers/provers.dat
|
||||
--- serious/sad-2.3-25/provers/provers.dat 2008-08-26 21:20:25.000000000 +0000
|
||||
+++ sad-2.3-25/provers/provers.dat 2015-11-27 07:24:18.878169702 +0000
|
||||
@@ -3,7 +3,7 @@
|
||||
Pmoses
|
||||
LMoses
|
||||
Fmoses
|
||||
-Cprovers/moses
|
||||
+C@out@/provers/moses
|
||||
Yproved in
|
||||
Nfound unprovable in
|
||||
Utimeout in
|
||||
@@ -12,7 +12,7 @@
|
||||
Pspass
|
||||
LSPASS
|
||||
Fdfg
|
||||
-Cprovers/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
|
||||
+C@spass@/bin/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
|
||||
YSPASS beiseite: Proof found.
|
||||
NSPASS beiseite: Completion found.
|
||||
USPASS beiseite: Ran out of time.
|
||||
@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://raffalli.eu/~christophe/glsurf/";
|
||||
description = "A program to draw implicit surfaces and curves";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, gperf
|
||||
, sqlite
|
||||
, libarchive
|
||||
, libdmapsharing
|
||||
, libsoup_3
|
||||
, gnome
|
||||
, libxml2
|
||||
@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
|
||||
gnome-online-accounts
|
||||
totem-pl-parser
|
||||
libarchive
|
||||
libdmapsharing
|
||||
libsoup_3
|
||||
gmime
|
||||
gom
|
||||
|
||||
@ -12,19 +12,16 @@
|
||||
, gdk-pixbuf
|
||||
, gst_all_1
|
||||
, glib
|
||||
, gtk3
|
||||
, libgee
|
||||
, check
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, gobject-introspection
|
||||
, libsoup
|
||||
, libsoup_3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdmapsharing";
|
||||
version = "3.9.10";
|
||||
version = "3.9.12";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
@ -34,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g";
|
||||
sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -60,31 +57,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libsoup
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
libgee
|
||||
check
|
||||
gtk3
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gtk-doc"
|
||||
"--disable-tests" # Tests require mDNS server.
|
||||
];
|
||||
|
||||
# Cannot disable tests here or `check` from nativeCheckInputs would not be included.
|
||||
# Cannot disable building the tests or docs will not build:
|
||||
# https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49
|
||||
doCheck = true;
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
# Tests require mDNS server.
|
||||
checkPhase = ":";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.flyn.org/projects/libdmapsharing/";
|
||||
description = "Library that implements the DMAP family of protocols";
|
||||
|
||||
@ -127,10 +127,14 @@ qtModule {
|
||||
# which cannot be set at the same time as -Wformat-security
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# removes macOS 12+ dependencies
|
||||
patches = [
|
||||
# removes macOS 12+ dependencies
|
||||
../patches/qtwebengine-darwin-no-low-latency-flag.patch
|
||||
../patches/qtwebengine-darwin-no-copy-certificate-chain.patch
|
||||
# Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
|
||||
# environment variable, since NixOS relies on it working.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
|
||||
../patches/qtwebengine-xkb-includes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -161,9 +165,6 @@ qtModule {
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
|
||||
substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
|
||||
--replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure.cmake \
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
--- a/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc 2023-04-19 21:58:29.127258300 +0900
|
||||
+++ b/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc 2023-04-19 22:01:35.860196284 +0900
|
||||
@@ -637,8 +637,7 @@
|
||||
.variant = layout_variant.c_str(),
|
||||
.options = ""};
|
||||
std::unique_ptr<xkb_context, XkbContextDeleter> context;
|
||||
- context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES));
|
||||
- xkb_context_include_path_append(context.get(), "/usr/share/X11/xkb");
|
||||
+ context.reset(xkb_context_new(XKB_CONTEXT_NO_FLAGS));
|
||||
std::unique_ptr<xkb_keymap, XkbKeymapDeleter> keymap;
|
||||
keymap.reset(xkb_keymap_new_from_names(context.get(), &names,
|
||||
XKB_KEYMAP_COMPILE_NO_FLAGS));
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } :
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } :
|
||||
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
then throw "lablgl is not available for OCaml ${ocaml.version}"
|
||||
@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
buildInputs = [ freeglut ];
|
||||
propagatedBuildInputs = [ libGLU libGL ];
|
||||
propagatedBuildInputs = [
|
||||
libGLU
|
||||
libGL
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.GLUT
|
||||
darwin.apple_sdk.libs.Xplugin
|
||||
];
|
||||
|
||||
patches = [ ./Makefile.config.patch ./META.patch ];
|
||||
|
||||
@ -46,6 +52,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ pSub vbgl ];
|
||||
mainProgram = "lablglut";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,7 +29,8 @@ def test_entities(doc_en_core_web_sm):
|
||||
('Google', 'ORG'),
|
||||
('2007', 'DATE'),
|
||||
('American', 'NORP'),
|
||||
('Thrun', 'GPE'),
|
||||
('Thrun', 'PERSON'),
|
||||
('Recode', 'ORG'),
|
||||
('earlier this week', 'DATE'),
|
||||
]
|
||||
|
||||
@ -64,6 +65,5 @@ def test_verbs(doc_en_core_web_sm):
|
||||
'tell',
|
||||
'shake',
|
||||
'turn',
|
||||
'be',
|
||||
'talk',
|
||||
'say']
|
||||
|
||||
@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gRrhRoxYuX/JqjEYfWtVMXeEJY8KR+v2nYHKtjnj+hU=";
|
||||
hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "utm";
|
||||
version = "4.1.5";
|
||||
version = "4.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
|
||||
hash = "sha256-YOmTf50UUvvh4noWnmV6WsoWSua0tpWTgLTg+Cdr3bQ=";
|
||||
hash = "sha256-d0xEND95u/PFnKfogLwO2vLgv+tQubMea8XWSJRuZF4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg makeWrapper ];
|
||||
|
||||
@ -12,13 +12,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-ld";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mic92";
|
||||
repo = "nix-ld";
|
||||
rev = version;
|
||||
sha256 = "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA=";
|
||||
sha256 = "sha256-dM9YPN+yq6sHmRhJQinYdAVXBkTgEtrVQcsd/mIIX0o=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kio-admin";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "system";
|
||||
repo = "kio-admin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase kio ki18n polkit-qt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage files as administrator using the admin:// KIO protocol.";
|
||||
homepage = "https://invent.kde.org/system/kio-admin";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ k900 ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user