alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'master' into haskell-updates

Browse source
This commit is contained in:
maralorn 2023-04-20 13:48:57 +02:00
parent d7f6c4a239 cb4ab614ee
commit 3ce82d477b
156 changed files with 1979 additions and 1882 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -12667,6 +12667,12 @@
fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
}];
};
qjoly = {
email = "github@thoughtless.eu";
github = "qjoly";
githubId = 82603435;
name = "Quentin JOLY";
};
qknight = {
email = "js@lastlog.de";
github = "qknight";

2
nixos/modules/services/development/lorri.nix
View file

@ -50,6 +50,6 @@ in {
};
};
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [ cfg.package pkgs.direnv ];
};
}

102
nixos/modules/services/security/kanidm.nix
View file

@ -7,6 +7,18 @@ let
serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings);
clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings);
unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings);
certPaths = builtins.map builtins.dirOf [ cfg.serverSettings.tls_chain cfg.serverSettings.tls_key ];
# Merge bind mount paths and remove paths where a prefix is already mounted.
# This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is alread in the mount
# paths, no new bind mount is added. Adding subpaths caused problems on ofborg.
hasPrefixInList = list: newPath: lib.any (path: lib.hasPrefix (builtins.toString path) (builtins.toString newPath)) list;
mergePaths = lib.foldl' (merged: newPath: let
# If the new path is a prefix to some existing path, we need to filter it out
filteredPaths = lib.filter (p: !lib.hasPrefix (builtins.toString newPath) (builtins.toString p)) merged;
# If a prefix of the new path is already in the list, do not add it
filteredNew = if hasPrefixInList filteredPaths newPath then [] else [ newPath ];
in filteredPaths ++ filteredNew) [];
defaultServiceConfig = {
BindReadOnlyPaths = [
@ -16,7 +28,7 @@ let
"-/etc/hosts"
"-/etc/localtime"
];
CapabilityBoundingSet = "";
CapabilityBoundingSet = [];
# ProtectClock= adds DeviceAllow=char-rtc r
DeviceAllow = "";
# Implies ProtectSystem=strict, which re-mounts all paths
@ -216,22 +228,28 @@ in
description = "kanidm identity management daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = defaultServiceConfig // {
StateDirectory = "kanidm";
StateDirectoryMode = "0700";
ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
User = "kanidm";
Group = "kanidm";
serviceConfig = lib.mkMerge [
# Merge paths and ignore existing prefixes needs to sidestep mkMerge
(defaultServiceConfig // {
BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ certPaths);
})
{
StateDirectory = "kanidm";
StateDirectoryMode = "0700";
ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
User = "kanidm";
Group = "kanidm";
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
# This would otherwise override the CAP_NET_BIND_SERVICE capability.
PrivateUsers = false;
# Port needs to be exposed to the host network
PrivateNetwork = false;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
TemporaryFileSystem = "/:ro";
};
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
# This would otherwise override the CAP_NET_BIND_SERVICE capability.
PrivateUsers = lib.mkForce false;
# Port needs to be exposed to the host network
PrivateNetwork = lib.mkForce false;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
TemporaryFileSystem = "/:ro";
}
];
environment.RUST_LOG = "info";
};
@ -240,34 +258,32 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
restartTriggers = [ unixConfigFile clientConfigFile ];
serviceConfig = defaultServiceConfig // {
CacheDirectory = "kanidm-unixd";
CacheDirectoryMode = "0700";
RuntimeDirectory = "kanidm-unixd";
ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
User = "kanidm-unixd";
Group = "kanidm-unixd";
serviceConfig = lib.mkMerge [
defaultServiceConfig
{
CacheDirectory = "kanidm-unixd";
CacheDirectoryMode = "0700";
RuntimeDirectory = "kanidm-unixd";
ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
User = "kanidm-unixd";
Group = "kanidm-unixd";
BindReadOnlyPaths = [
"/nix/store"
"-/etc/resolv.conf"
"-/etc/nsswitch.conf"
"-/etc/hosts"
"-/etc/localtime"
"-/etc/kanidm"
"-/etc/static/kanidm"
"-/etc/ssl"
"-/etc/static/ssl"
];
BindPaths = [
# To create the socket
"/run/kanidm-unixd:/var/run/kanidm-unixd"
];
# Needs to connect to kanidmd
PrivateNetwork = false;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
TemporaryFileSystem = "/:ro";
};
BindReadOnlyPaths = [
"-/etc/kanidm"
"-/etc/static/kanidm"
"-/etc/ssl"
"-/etc/static/ssl"
];
BindPaths = [
# To create the socket
"/run/kanidm-unixd:/var/run/kanidm-unixd"
];
# Needs to connect to kanidmd
PrivateNetwork = lib.mkForce false;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
TemporaryFileSystem = "/:ro";
}
];
environment.RUST_LOG = "info";
};

3
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -429,7 +429,8 @@ in
dolphin-plugins
ffmpegthumbs
kdegraphics-thumbnailers
pkgs.kio-admin
kde-inotify-survey
kio-admin
kio-extras
];
optionalPackages = [

4
nixos/tests/kanidm.nix
View file

@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
};
networking.hosts."${nodes.server.config.networking.primaryIPAddress}" = [ serverDomain ];
networking.hosts."${nodes.server.networking.primaryIPAddress}" = [ serverDomain ];
security.pki.certificateFiles = [ certs.ca.cert ];
};
@ -56,7 +56,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# We need access to the config file in the test script.
filteredConfig = pkgs.lib.converge
(pkgs.lib.filterAttrsRecursive (_: v: v != null))
nodes.server.config.services.kanidm.serverSettings;
nodes.server.services.kanidm.serverSettings;
serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig;
in

9
pkgs/applications/audio/rhythmbox/default.nix
View file

@ -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"
];

4
pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
View file

@ -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; {

43
pkgs/applications/editors/ghostwriter/default.nix
View file

@ -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;
};
}

4
pkgs/applications/kde/akonadi-calendar.nix
View file

@ -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"
'';
}

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

@ -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"
'';
}

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

@ -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"
'';
}

4
pkgs/applications/kde/akonadi-notes.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/akonadi-search.nix
View file

@ -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"
'';
}

12
pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
View file

@ -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@

6
pkgs/applications/kde/akonadi/default.nix
View file

@ -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"
'';
}

0
pkgs/applications/plasma-mobile/alligator.nix → pkgs/applications/kde/alligator.nix
View file

8
pkgs/applications/plasma-mobile/angelfish.nix → pkgs/applications/kde/angelfish.nix
View file

@ -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
];

4
pkgs/applications/plasma-mobile/audiotube.nix → pkgs/applications/kde/audiotube.nix
View file

@ -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

4
pkgs/applications/kde/calendarsupport.nix
View file

@ -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"
'';
}

0
pkgs/applications/plasma-mobile/calindori.nix → pkgs/applications/kde/calindori.nix
View file

8
pkgs/applications/kde/colord-kde.nix
View file

@ -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; {

23
pkgs/applications/kde/default.nix
View file

@ -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

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

@ -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" ];
}

4
pkgs/applications/kde/eventviews.nix
View file

@ -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"
'';
}

2
pkgs/applications/kde/fetch.sh
View file

@ -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
View 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 ];
};
}

4
pkgs/applications/kde/grantleetheme/default.nix
View file

@ -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"
'';
}

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

@ -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) ];
}

4
pkgs/applications/kde/incidenceeditor.nix
View file

@ -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"
'';
}

3
pkgs/applications/kde/kaccounts-integration.nix
View file

@ -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
];
}

0
pkgs/applications/plasma-mobile/kalk.nix → pkgs/applications/kde/kalk.nix
View file

0
pkgs/applications/plasma-mobile/kasts.nix → pkgs/applications/kde/kasts.nix
View file

6
pkgs/applications/kde/kate.nix
View file

@ -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 ];
}

4
pkgs/applications/kde/kcalutils.nix
View file

@ -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"
'';
}

0
pkgs/applications/plasma-mobile/kclock.nix → pkgs/applications/kde/kclock.nix
View file

30
pkgs/applications/kde/kde-inotify-survey.nix Normal file
View 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 = [];
};
}

4
pkgs/applications/kde/kdebugsettings.nix
View file

@ -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 = [ ];
}

4
pkgs/applications/kde/kdeconnect-kde.nix
View file

@ -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

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

@ -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 ];
}

0
pkgs/applications/plasma-mobile/keysmith.nix → pkgs/applications/kde/keysmith.nix
View file

4
pkgs/applications/kde/kidentitymanagement.nix
View file

@ -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"
'';
}

8
pkgs/applications/kde/kimap.nix
View file

@ -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
View 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 ];
};
}

8
pkgs/applications/kde/kitinerary.nix
View file

@ -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" ];

4
pkgs/applications/kde/kldap.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/kleopatra.nix
View file

@ -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 = {

4
pkgs/applications/kde/kmailtransport.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/kmbox.nix
View file

@ -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"
'';
}

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

@ -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"
'';
}

0
pkgs/applications/plasma-mobile/koko.nix → pkgs/applications/kde/koko.nix
View file

36
pkgs/applications/kde/kongress.nix Normal file
View 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
pkgs/applications/kde/konsole.nix
View file

@ -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;

9
pkgs/applications/kde/kontactinterface.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/kpimtextedit.nix
View file

@ -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"
'';
}

9
pkgs/applications/kde/kpublictransport.nix
View file

@ -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
];
}

0
pkgs/applications/plasma-mobile/krecorder.nix → pkgs/applications/kde/krecorder.nix
View file

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

@ -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

25
pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
View file

@ -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

5
pkgs/applications/kde/ksmtp/default.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/ktnef.nix
View file

@ -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"
'';
}

0
pkgs/applications/plasma-mobile/ktrip.nix → pkgs/applications/kde/ktrip.nix
View file

0
pkgs/applications/plasma-mobile/kweather.nix → pkgs/applications/kde/kweather.nix
View file

4
pkgs/applications/kde/libgravatar.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/libkcddb.nix
View file

@ -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

4
pkgs/applications/kde/libkdepim.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/libkleo.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/mailcommon.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/mailimporter.nix
View file

@ -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"
'';
}

4
pkgs/applications/kde/messagelib.nix
View file

@ -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"
'';
}

7
pkgs/applications/plasma-mobile/neochat.nix → pkgs/applications/kde/neochat.nix
View file

@ -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

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

@ -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
pkgs/applications/kde/pimcommon.nix
View file

@ -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

10
pkgs/applications/plasma-mobile/plasmatube/default.nix → pkgs/applications/kde/plasmatube/default.nix
View file

@ -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[@]}")
'';

0
pkgs/applications/plasma-mobile/qmlkonsole.nix → pkgs/applications/kde/qmlkonsole.nix
View file

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

@ -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 \

2048
pkgs/applications/kde/srcs.nix
View file

File diff suppressed because it is too large Load diff

24
pkgs/applications/kde/telly-skout.nix Normal file
View 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 = [];
};
}

21
pkgs/applications/plasma-mobile/tokodon.nix → pkgs/applications/kde/tokodon.nix
View file

@ -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

2
pkgs/applications/maui/default.nix
View file

@ -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 { };

10
pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch Normal file
View file

@ -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)

4
pkgs/applications/maui/mauikit-calendar.nix → pkgs/applications/maui/mauikit-calendar/default.nix
View file

@ -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

4
pkgs/applications/misc/logseq/default.nix
View file

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.9.2";
version = "0.9.3";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-nXNzUHZXh2NGcg/OXRKhag/BWLB/YOAkCPITiBiMIIE=";
hash = "sha256-hwBTS6hjD66SPOPctcS2esybnVrgw77fFpt8phGt334=";
name = "${pname}-${version}.AppImage";
};

6
pkgs/applications/networking/cluster/fn-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fn";
version = "0.6.23";
version = "0.6.24";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
hash = "sha256-3g8S3cJ3RC06rvPMyQSKf8L4DkDTZ0Oe+6eh+rwyqg8=";
hash = "sha256-em9Bfrk7jJdmg3N+zH0VTpCdKPEOBK8vc297V5vmKzM=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = ["."];

6
pkgs/applications/networking/cluster/gatekeeper/default.nix
View file

@ -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

6
pkgs/applications/networking/cluster/helm/default.nix
View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.11.2";
version = "3.11.3";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-aUzVICPCxAUoPvnE7pqz+bscfukbEwB+iGmXAYuQ/eE=";
sha256 = "sha256-BIjbSHs0sOLYB+26EHy9f3YJtUYnzgdADIXB4n45Rv0=";
};
vendorSha256 = "sha256-Hf4ElC3H5sJkzKFELeDygTmfuqBHLqRhaHG1bfnqigM=";
vendorHash = "sha256-uz3ZqCcT+rmhNCO+y3PuCXWjTxUx8u3XDgcJxt7A37g=";
subPackages = [ "cmd/helm" ];
ldflags = [

33
pkgs/applications/networking/cluster/ktop/default.nix Normal file
View 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 ];
};
}

6
pkgs/applications/networking/cluster/linkerd/default.nix
View file

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "stable";
version = "2.12.4";
sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd";
vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M=";
version = "2.13.1";
sha256 = "1qsf2d4haqs93qf88f2vvjsgm5a5gnmivkdpdbvpwy0q8bd8rfnj";
vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
}

30
pkgs/applications/networking/cluster/nova/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "nova";
version = "3.6.2";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = pname;
rev = version;
hash = "sha256-l2HBjM5DyeWkdAwQGzPp+A3UuXXc0OTizInsVL0k/0I=";
};
vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
ldflags = [ "-X main.version=${version}" "-s" "-w" ];
meta = with lib; {
description = "Find outdated or deprecated Helm charts running in your cluster";
longDescription = ''
Nova scans your cluster for installed Helm charts, then
cross-checks them against all known Helm repositories. If it
finds an updated version of the chart you're using, or notices
your current version is deprecated, it will let you know.
'';
homepage = "https://nova.docs.fairwinds.com/";
license = licenses.asl20;
maintainers = with maintainers; [ qjoly ];
};
}

6
pkgs/applications/networking/cluster/pluto/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pluto";
version = "5.16.0";
version = "5.16.1";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
sha256 = "sha256-M5zTnzuei/sECvRe89Dau72iIUuMtaLJyYTGeEF4GPo=";
sha256 = "sha256-UCq+aMUffvDWmPtSSc/PNbrak1LGWQe8Oe340O5q6LM=";
};
vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U=";
vendorHash = "sha256-0VFCZ+U0W21tF35148Valpc7fDXkC9dPpz1O0+4D30U=";
ldflags = [
"-w" "-s"

54
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -119,11 +119,11 @@
"vendorHash": "sha256-t6Hg1FLCd4dh6d3J0uNsNKKnz5T8/yoIXFo7bRO+XHM="
},
"azuread": {
"hash": "sha256-qFDCGj1ZhLnqG3Vg1bI+cdbExIbmDZaig9VYg6caWd0=",
"hash": "sha256-bCnCj2pEd29aQVePGeaTbVhH6sF/Y+lj94SEw1+tROc=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
"owner": "hashicorp",
"repo": "terraform-provider-azuread",
"rev": "v2.37.1",
"rev": "v2.37.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -218,13 +218,13 @@
"vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs="
},
"cloudflare": {
"hash": "sha256-dhSjFeTkbiG/Gx/DS1WzW2b31u3apfXX4Safh29e6Fw=",
"hash": "sha256-DDoPVceQpRTN23JaQ79uXrEStBgtb7WWrKBIVpIpok4=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.3.0",
"rev": "v4.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-sgJ1HhhWQpvOGFVEC43pymBKyVcqdn8jLlW5fR21mFE="
"vendorHash": "sha256-b7h8CI1NeFAAXGdDsZ4CRXcomceoijon8IGriqP6tko="
},
"cloudfoundry": {
"hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",
@ -354,13 +354,13 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
"hash": "sha256-zyRPpAaDgjRafn5RcrzmbVTzO6gGS1HMmvLR8VFdKow=",
"hash": "sha256-GGJNfHizFc+wXNo7u/mqtonIs5D/S8RydBsIkftNcjc=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
"rev": "v1.13.0",
"rev": "v1.14.0",
"spdx": "MIT",
"vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
"vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k="
},
"exoscale": {
"hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=",
@ -381,11 +381,11 @@
"vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
},
"fastly": {
"hash": "sha256-YKF4aW+K5JffPd5b3Kh540ml0uc9q5WSvcNgj9g6/Bk=",
"hash": "sha256-Z38tG5Of+nYuIT3IxY/hxbV0HIgkITBnaXcr3oYIf6Y=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
"rev": "v4.2.0",
"rev": "v4.3.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -437,22 +437,22 @@
"vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g="
},
"google": {
"hash": "sha256-vfcRR8EKR/axaD2RJ+3r3B1pmX1XSBYTBYPmwUTx3E8=",
"hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.62.0",
"rev": "v4.62.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
},
"google-beta": {
"hash": "sha256-PksNHhTzIuZxTzFRheiNutEnQSJ2WRu/IgF+8b1w9Eg=",
"hash": "sha256-/wcNrCMaXjameyE3o09N+bPjL8r627BJy1vYy1u2iAI=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.62.0",
"rev": "v4.62.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
},
@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-27vdHG/FRWGPZclW9Q0z/6ntY+of/5/PGIsKsePhF4k=",
"hash": "sha256-9Qcwxi8TojsDIWeyqwQcagTeTwKS/hkPukjeHANHGfU=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.116.0",
"rev": "v4.117.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -963,13 +963,13 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-QIrIL0vqiZafggdfWchlSOzLRDCF5Zubh6MqwOzfr3Y=",
"hash": "sha256-b0prqlZNPrg0YjvLk3RdJ+4C6eL4Tzdzt7Berp6G32c=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.16.3",
"rev": "v2.17.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-KUbE00fajvs4p8QxmuKV5IoRfCdWtfZTrOftcRAPSws="
"vendorHash": "sha256-tnZy6uN/lZaW4d6uo/quVAuEZZrXEX7qLAas0GauRJI="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1026,13 +1026,13 @@
"vendorHash": null
},
"snowflake": {
"hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=",
"hash": "sha256-/9TTK33XwMW8izM35y9sOZOKFc6/HC2/CCnX3JMzY3I=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
"rev": "v0.61.0",
"rev": "v0.62.0",
"spdx": "MIT",
"vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g="
"vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE="
},
"sops": {
"hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
@ -1098,22 +1098,22 @@
"vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
},
"tencentcloud": {
"hash": "sha256-j1PffTicdXiit3D+dX9HzkBZFmf8Ch7LxNVU3XGi5uY=",
"hash": "sha256-soskWCOJaPzm2m2ocv3N8hb52Jz/T3xw/sW9hCSsf2s=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.80.3",
"rev": "v1.80.4",
"spdx": "MPL-2.0",
"vendorHash": null
},
"tfe": {
"hash": "sha256-K0l9oaYkgilz47ErUxio9oJtPHQTWZnKdPpjRZ1SDhg=",
"hash": "sha256-y2QBMxn8sXwtL1wASypbARLn80T2eVJuawoQ0XQlK38=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
"rev": "v0.43.0",
"rev": "v0.44.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-plYy3INLi/SeKu7R0lDLY1CvRDU7bmZsQKzFtMc2Wu4="
"vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc="
},
"thunder": {
"hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=",

7
pkgs/applications/networking/dnscontrol/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dnscontrol";
@ -13,7 +13,9 @@ buildGoModule rec {
vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8=";
ldflags = [ "-s" "-w" ];
subPackages = [ "." ];
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
preCheck = ''
# requires network
@ -23,6 +25,7 @@ buildGoModule rec {
meta = with lib; {
description = "Synchronize your DNS to multiple providers from a simple DSL";
homepage = "https://stackexchange.github.io/dnscontrol/";
changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ mmahut SuperSandro2000 ];
};

4
pkgs/applications/networking/firewalld/default.nix
View file

@ -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 = [

4
pkgs/applications/networking/instant-messengers/coyim/default.nix
View file

@ -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 ];

29
pkgs/applications/networking/pjsip/default.nix
View file

@ -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;
};
}
})

16
pkgs/applications/plasma-mobile/default.nix
View file

@ -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

25
pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
View file

@ -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

9
pkgs/applications/science/biology/tandem-aligner/default.nix
View file

@ -6,14 +6,14 @@
, zlib
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "TandemAligner";
version = "unstable-2022-09-17";
version = "0.1";
src = fetchFromGitHub {
owner = "seryrzu";
repo = "tandem_aligner";
rev = "ac6004f108ad20477045f4d0b037d96051a9df70";
rev = "v${finalAttrs.version}";
hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8=";
};
@ -58,9 +58,10 @@ stdenv.mkDerivation {
meta = {
description = "A parameter-free algorithm for sequence alignment";
homepage = "https://github.com/seryrzu/tandem_aligner";
changelog = "https://github.com/seryrzu/tandem_aligner/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ amesgen ];
platforms = lib.platforms.linux;
mainProgram = "tandem_aligner";
};
}
})

19
pkgs/applications/science/electronics/gerbv/default.nix
View file

@ -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;
};
}

41
pkgs/applications/science/logic/sad/default.nix
View file

@ -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
};
}

51
pkgs/applications/science/logic/sad/monoid.patch
View file

@ -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

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