Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kde/frameworks: 5.93 -> 5.94 #173266

Merged
merged 8 commits into from
May 22, 2022
Merged

kde/frameworks: 5.93 -> 5.94 #173266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
be20107
kde/frameworks: 5.93 -> 5.94
andrevmatos May 14, 2022
a2e8dd2
kapidox: fix build with python packages
andrevmatos May 14, 2022
efb845f
plasma-wayland-protocols: 1.6.0 -> 1.7.0
andrevmatos May 15, 2022
27b6da0
kf5/kguiaddons: add plasma-wayland-protocols to buildInputs
andrevmatos May 15, 2022
4b6301d
loki-lib: compile with c++11
andrevmatos May 15, 2022
2fce453
semantik: fix for new kf5
andrevmatos May 15, 2022
d7ee690
ksmoothdock: 6.2 -> 6.3
andrevmatos May 15, 2022
39a7708
kf5/kapidox: apply suggestions from code review
andrevmatos May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions pkgs/applications/misc/ksmoothdock/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, kactivities
Expand All @@ -10,28 +9,15 @@

mkDerivation rec {
pname = "KSmoothDock";
version = "6.2";
version = "6.3";

src = fetchFromGitHub {
owner = "dangvd";
repo = "ksmoothdock";
rev = "v${version}";
sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam";
sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk=";
};

patches = [
# Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead
(fetchpatch {
url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch";
sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4";
})
# Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123
(fetchpatch {
url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch";
sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc";
})
];

nativeBuildInputs = [ cmake extra-cmake-modules ];

buildInputs = [ kactivities qtbase ];
Expand Down
10 changes: 9 additions & 1 deletion pkgs/applications/office/semantik/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, mkDerivation
, fetchFromGitLab
, fetchpatch
, wafHook
, pkg-config
, cmake
Expand Down Expand Up @@ -33,7 +34,14 @@ mkDerivation rec {
sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss=";
};

patches = [ ./qt5.patch ];
patches = [
(fetchpatch {
name = "fix-kdelibs4support.patch";
url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch";
sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo=";
})
./qt5.patch
];

postPatch = ''
echo "${lib.getDev qtwebengine}"
Expand Down
11 changes: 6 additions & 5 deletions pkgs/applications/office/semantik/qt5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ diff --color -ur a/wscript b/wscript
if not os.path.exists(specpath):
raise ValueError('No spec path, cannot build')

@@ -196,17 +220,28 @@
@@ -196,17 +220,29 @@

conf.env.append_value('INCLUDES_KDECORE', specpath)

- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi']
- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
+ libs = {
+ 'KF5KIOCore': '@KF5KIOCore_dev@',
+ 'KF5Auth': '@KF5Auth_dev@',
Expand All @@ -61,6 +61,7 @@ diff --color -ur a/wscript b/wscript
+ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
+ 'KF5I18n': '@KF5I18n_dev@',
+ 'KF5SonnetUi': '@KF5SonnetUi_dev@',
+ 'KF5AuthCore': '@KF5Auth_dev@',
+ }

- for lib in libs:
Expand All @@ -73,6 +74,6 @@ diff --color -ur a/wscript b/wscript
- p = '%s/qt_%s.pri' % (path, name)
+ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
+ print("[log] path :",path,", name : ",name)
for line in Utils.readf(p).splitlines():
lst = line.strip().split(' = ')
if lst[0].endswith('.name'):
try:
code = Utils.readf(p)
except EnvironmentError:
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.93/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.94/ -A '*.tar.xz' )
25 changes: 21 additions & 4 deletions pkgs/development/libraries/kde-frameworks/kapidox.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
{ mkDerivation, lib, extra-cmake-modules, python3 }:
{ mkDerivation, python3, qtbase }:

mkDerivation {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would be happier if we used buildPythonApplication.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me too, but not sure how that'd pan out with kde's custom mkDerivation (which merges these attributes with srcs.nix and versions). Would you have a suggestion on how to integrate buildPythonApplication with that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add it next to https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/kde-frameworks/default.nix#L92-L94 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the trouble worth it? Not like we build several python libraries/applications for all supported python environments/versions, the build is just a couple of setup.py commands, only enough to satisfy this marginally required dependency. Also, I tried it a little, and my Nix knowledge may not be enough, as it may involve passing the whole attrset of pythonPackages as parameters of the derivation, as is done with the libsForQt5 set, but I'm not sure about the safe way to do this with both in the same call.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternately, we could just drop this package. It's never been used in Nixpkgs. I'm not even sure it has ever been buildable before.

pname = "kapidox";
nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ];
postFixup = ''
moveToOutput bin $bin
nativeBuildInputs = [ python3.pkgs.setuptools qtbase ];

buildInputs = with python3.pkgs; [ jinja2 pyyaml requests ];

postPatch = ''
sed -i -e 's|"doxy\w\+", ||g' setup.py
'';

buildPhase = ''
runHook preBuild
${python3.interpreter} setup.py build
runHook postBuild
'';

installPhase = ''
runHook preInstall
${python3.interpreter} setup.py install --prefix="$out"
runHook postInstall
'';

outputs = [ "out" ];
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kde-frameworks/kguiaddons.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ mkDerivation
, extra-cmake-modules
, qtbase, qtx11extras, wayland
, qtbase, qtx11extras, wayland, plasma-wayland-protocols
}:

mkDerivation {
pname = "kguiaddons";

nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras wayland ];
buildInputs = [ qtx11extras wayland plasma-wayland-protocols ];
propagatedBuildInputs = [ qtbase ];

outputs = [ "out" "dev" ];
Expand Down
Loading