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

Merge pull request #107086 from NixOS/staging-next

Browse source 
Staging next with systemd privacy fix
This commit is contained in:
Florian Klink 2020-12-23 15:32:32 +01:00 committed by GitHub
parent ae48d62bb8 bb5bf5cd27
commit e7659b6288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
107 changed files with 1638 additions and 1009 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -238,6 +238,7 @@ in
kidletime
kimageformats
kinit
kirigami2 # In system profile for SDDM theme. TODO: wrapper.
kio
kjobwidgets
knewstuff

12
nixos/modules/services/x11/display-managers/startx.nix
View file

@ -39,6 +39,18 @@ in
displayManager.lightdm.enable = lib.mkForce false;
};
systemd.services.display-manager.enable = false;
# Other displayManagers log to /dev/null because they're services and put
# Xorg's stdout in the journal
#
# To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do
# not specify a log file when running X
services.xserver.logFile = mkDefault null;
# Implement xserverArgs via xinit's system-wide xserverrc
environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" ''
exec ${pkgs.xorg.xorgserver}/bin/X ${toString config.services.xserver.displayManager.xserverArgs} "$@"
'';
environment.systemPackages = with pkgs; [ xorg.xinit ];
};

16
nixos/modules/services/x11/xserver.nix
View file

@ -518,6 +518,19 @@ in
'';
};
logFile = mkOption {
type = types.nullOr types.str;
default = "/dev/null";
example = "/var/log/Xorg.0.log";
description = ''
Controls the file Xorg logs to.
The default of <literal>/dev/null</literal> is set so that systemd services (like <literal>displayManagers</literal>) only log to the journal and don't create their own log files.
Setting this to <literal>null</literal> will not pass the <literal>-logfile</literal> argument to Xorg which allows it to log to its default logfile locations instead (see <literal>man Xorg</literal>). You probably only want this behaviour when running Xorg manually (e.g. via <literal>startx</literal>).
'';
};
verbose = mkOption {
type = types.nullOr types.int;
default = 3;
@ -692,11 +705,10 @@ in
services.xserver.displayManager.xserverArgs =
[ "-config ${configFile}"
"-xkbdir" "${cfg.xkbDir}"
# Log at the default verbosity level to stderr rather than /var/log/X.*.log.
"-logfile" "/dev/null"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"
++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
++ optional (!cfg.enableTCP) "-nolisten tcp"
++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"

12
nixos/modules/tasks/network-interfaces-systemd.nix
View file

@ -93,7 +93,17 @@ in
(if i.useDHCP != null then i.useDHCP else false));
address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
networkConfig.IPv6PrivacyExtensions = "kernel";
# IPv6PrivacyExtensions=kernel seems to be broken with networkd.
# Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of
# `tempAddress`:
networkConfig.IPv6PrivacyExtensions = {
# generate temporary addresses and use them by default
"default" = true;
# generate temporary addresses but keep using the standard EUI-64 ones by default
"enabled" = "prefer-public";
# completely disable temporary addresses
"disabled" = false;
}.${i.tempAddress};
linkConfig = optionalAttrs (i.macAddress != null) {
MACAddress = i.macAddress;
} // optionalAttrs (i.mtu != null) {

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

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

2
pkgs/applications/kde/elisa.nix
View file

@ -43,6 +43,6 @@ mkDerivation rec {
description = "A simple media player for KDE";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
broken = lib.versionOlder qtbase.version "5.14";
broken = lib.versionOlder qtbase.version "5.15";
};
}

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

@ -9,6 +9,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.13.0";
};
output = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

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

@ -13,4 +13,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

13
pkgs/applications/kde/kompare.nix
View file

@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
fetchpatch
}:
mkDerivation {
@ -11,5 +12,15 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
patches = [
(fetchpatch {
# Portaway from Obsolete methods of QPrinter
# Part of v20.12.0
url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
})
];
outputs = [ "out" "dev" ];
}

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

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools,
qtspeech
}:
@ -11,6 +11,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.13.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

2
pkgs/applications/kde/kpkpass.nix
View file

@ -8,7 +8,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
broken = lib.versionOlder qtbase.version "5.13";
broken = lib.versionOlder qtbase.version "5.15";
};
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ qtbase karchive ];

3
pkgs/applications/kde/libkgapi.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine, kio, kcalendarcore, kcontacts,
qtbase, qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@ -10,6 +10,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
broken = lib.versionOlder qtbase.version "5.14.0";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];

4
pkgs/applications/networking/openbazaar/client.nix
View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "openbazaar-client";
version = "2.4.8";
version = "2.4.9";
src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64";
sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p";
};
dontBuild = true;

4
pkgs/data/misc/cacert/default.nix
View file

@ -17,7 +17,7 @@ let
sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
};
version = "3.57";
version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in
@ -26,7 +26,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz";
sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382";
sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0=";
};
outputs = [ "out" "unbundled" ];

13
pkgs/desktops/plasma-5/bluedevil.nix
View file

@ -1,14 +1,17 @@
{
mkDerivation, extra-cmake-modules, shared-mime-info,
bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
mkDerivation, lib, extra-cmake-modules, shared-mime-info,
qtbase, qtdeclarative, bluez-qt,
kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications,
kwidgetsaddons, kwindowsystem, plasma-framework
}:
mkDerivation {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
kdbusaddons kded kiconthemes knotifications kwidgetsaddons
qtbase qtdeclarative bluez-qt
ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
kiconthemes knotifications kwidgetsaddons
];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

3
pkgs/desktops/plasma-5/default.nix
View file

@ -118,6 +118,7 @@ let
ksysguard = callPackage ./ksysguard.nix {};
kwallet-pam = callPackage ./kwallet-pam.nix {};
kwayland-integration = callPackage ./kwayland-integration.nix {};
kwayland-server = callPackage ./kwayland-server {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen {};
@ -126,6 +127,7 @@ let
oxygen = callPackage ./oxygen.nix {};
plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
plasma-desktop = callPackage ./plasma-desktop {};
plasma-disks = callPackage ./plasma-disks.nix {};
plasma-integration = callPackage ./plasma-integration {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
@ -137,7 +139,6 @@ let
powerdevil = callPackage ./powerdevil.nix {};
sddm-kcm = callPackage ./sddm-kcm.nix {};
systemsettings = callPackage ./systemsettings.nix {};
user-manager = callPackage ./user-manager.nix {};
xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {};
thirdParty = let inherit (libsForQt5) callPackage; in {

5
pkgs/desktops/plasma-5/discover.nix
View file

@ -1,14 +1,15 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools, python,
appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
qtquickcontrols2,
qtbase, qtquickcontrols2,
karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
knewstuff, kwindowsystem, kxmlgui, plasma-framework
}:
mkDerivation {
name = "discover";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
# discount is needed for libmarkdown

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ )

5
pkgs/desktops/plasma-5/kactivitymanagerd.nix
View file

@ -1,12 +1,13 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
kwindowsystem, kxmlgui, kcrash
kwindowsystem, kxmlgui, kcrash, qtbase
}:
mkDerivation {
name = "kactivitymanagerd";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem

4
pkgs/desktops/plasma-5/kde-gtk-config/default.nix
View file

@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules, wrapGAppsHook,
glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
knewstuff, gsettings-desktop-schemas, xsettingsd
knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass
}:
mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff gsettings-desktop-schemas xsettingsd
knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass
];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

3
pkgs/desktops/plasma-5/kdecoration.nix
View file

@ -1,8 +1,9 @@
{ mkDerivation, extra-cmake-modules, qtbase, ki18n }:
{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }:
mkDerivation {
name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

5
pkgs/desktops/plasma-5/kgamma5.nix
View file

@ -1,11 +1,12 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm
kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm
}:
mkDerivation {
name = "kgamma5";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ];
meta.broken = lib.versionOlder qtbase.version "5.15";
}

4
pkgs/desktops/plasma-5/kinfocenter.nix
View file

@ -1,6 +1,7 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
qtbase,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
@ -9,6 +10,7 @@
mkDerivation {
name = "kinfocenter";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons

5
pkgs/desktops/plasma-5/kscreenlocker.nix
View file

@ -1,13 +1,14 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras,
wayland,
}:
mkDerivation {
name = "kscreenlocker";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland

3
pkgs/desktops/plasma-5/ksshaskpass.nix
View file

@ -1,5 +1,5 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
}:
@ -8,4 +8,5 @@ mkDerivation {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

5
pkgs/desktops/plasma-5/ksysguard.nix
View file

@ -1,13 +1,14 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard
knewstuff, libksysguard, qtbase
}:
mkDerivation {
name = "ksysguard";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard

3
pkgs/desktops/plasma-5/kwayland-integration.nix
View file

@ -1,5 +1,5 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
kguiaddons, kidletime, kwayland, kwindowsystem, qtbase,
}:
@ -8,4 +8,5 @@ mkDerivation {
name = "kwayland-integration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

25
pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch Normal file
View file

@ -0,0 +1,25 @@
From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 29 Aug 2020 19:14:30 +0100
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
---
src/server/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 0f99682..35e3601 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI
SOVERSION ${KWAYLANDSERVER_SOVERSION}
)
-install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
set(SERVER_LIB_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h
--
2.26.2

19
pkgs/desktops/plasma-5/kwayland-server/default.nix Normal file
View file

@ -0,0 +1,19 @@
{
mkDerivation, lib, cmake,
extra-cmake-modules, kdoctools,
kwayland, plasma-wayland-protocols,
wayland, wayland-protocols, qtbase
}:
mkDerivation {
name = "kwayland-server";
nativeBuildInputs = [
cmake
extra-cmake-modules #kdoctools
];
buildInputs = [
kwayland plasma-wayland-protocols wayland wayland-protocols
];
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

11
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -11,7 +11,7 @@
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, libcap, libdrm, mesa
}:
@ -30,18 +30,13 @@ mkDerivation {
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
libcap libdrm mesa
];
outputs = [ "bin" "dev" "out" ];
outputs = [ "dev" "out" ];
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
(fetchpatch { # included in >= 5.18.6
name = "EGL_TEXTURE_Y_XUXV_WL.diff";
url = "https://github.com/KDE/kwin/commit/2c76cc478.diff";
sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy";
})
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''

3
pkgs/desktops/plasma-5/kwrited.nix
View file

@ -1,5 +1,5 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
}:
@ -8,4 +8,5 @@ mkDerivation {
name = "kwrited";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

2
pkgs/desktops/plasma-5/libkscreen/default.nix
View file

@ -7,7 +7,7 @@
mkDerivation {
name = "libkscreen";
meta = {
broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
broken = lib.versionOlder qtbase.version "5.15.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kwayland libXrandr qtx11extras ];

9
pkgs/desktops/plasma-5/libksysguard/default.nix
View file

@ -1,13 +1,14 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine,
qtx11extras
knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework,
qtbase, qtscript, qtwebengine, qtx11extras
}:
mkDerivation {
name = "libksysguard";
meta.broken = lib.versionOlder qtbase.version "5.14.0";
patches = [
./0001-qdiriterator-follow-symlinks.patch
];
@ -15,7 +16,7 @@ mkDerivation {
buildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
qtwebengine
qtwebengine knewstuff
];
outputs = [ "bin" "dev" "out" ];
}

5
pkgs/desktops/plasma-5/milou.nix
View file

@ -1,12 +1,13 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice,
plasma-framework, qtscript, qtdeclarative
plasma-framework, qtbase, qtscript, qtdeclarative
}:
mkDerivation {
name = "milou";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework

4
pkgs/desktops/plasma-5/oxygen.nix
View file

@ -3,7 +3,7 @@
extra-cmake-modules,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
qtx11extras
qtx11extras, libXdmcp
}:
mkDerivation {
@ -12,7 +12,7 @@ mkDerivation {
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
qtx11extras
qtx11extras libXdmcp
];
outputs = [ "bin" "dev" "out" ];
}

4
pkgs/desktops/plasma-5/plasma-desktop/default.nix
View file

@ -19,7 +19,7 @@ mkDerivation {
name = "plasma-desktop";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft
boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
@ -35,7 +35,7 @@ mkDerivation {
./tzdir.patch
];
postPatch = ''
sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp
'';
CXXFLAGS = [
"-I${lib.getDev xorgserver}/include/xorg"

19
pkgs/desktops/plasma-5/plasma-disks.nix Normal file
View file

@ -0,0 +1,19 @@
{
mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace,
systemsettings
}:
mkDerivation {
name = "plasma-disks";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
kactivities kactivities-stats kirigami2 kcrash plasma-workspace
systemsettings
];
outputs = [ "bin" "dev" "out" ];
}

6
pkgs/desktops/plasma-5/plasma-nm/default.nix
View file

@ -1,15 +1,17 @@
{
mkDerivation, substituteAll,
mkDerivation, lib, substituteAll,
extra-cmake-modules, kdoctools,
kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt,
openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
openconnect, openvpn, plasma-framework, qca-qt5, qtbase, qtdeclarative,
qttools, solid
}:
mkDerivation {
name = "plasma-nm";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
buildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework

7
pkgs/desktops/plasma-5/plasma-pa.nix
View file

@ -1,8 +1,8 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
qtdeclarative,
qtbase, qtdeclarative,
gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
}:
@ -15,6 +15,7 @@ mkDerivation {
kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
kwindowsystem
qtdeclarative
qtbase qtdeclarative
];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

68
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View file

@ -1,19 +1,33 @@
From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Jan 2020 05:00:53 -0600
Subject: [PATCH 1/2] startkde
From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde
---
startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 24 ++++++++++--------------
3 files changed, 12 insertions(+), 16 deletions(-)
startkde/startplasma.cpp | 22 +++++++++-------------
4 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
index 89cc144ba..8ca9e81d2 100644
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent):
upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart;
- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
KJob* phase1;
QProcessEnvironment kdedProcessEnv;
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
index 87c71c6b3..5fc53140e 100644
index f59654d18..5e3a93db0 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
@@ -61,7 +61,7 @@ int main(int argc, char** argv)
waitForKonqi();
out << "startplasma-waylandsession: Shutting down...\n";
@ -23,10 +37,10 @@ index 87c71c6b3..5fc53140e 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index 3314b6283..14cbe29fa 100644
index ae1c4d101..0df24b5be 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
@@ -110,7 +110,7 @@ int main(int argc, char** argv)
out << "startkde: Shutting down...\n";
@ -36,10 +50,10 @@ index 3314b6283..14cbe29fa 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index 4c9f5cef6..5ea4c2cf1 100644
index a055d5635..62afb1513 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -34,7 +34,7 @@ QTextStream out(stderr);
@@ -41,7 +41,7 @@ QTextStream out(stderr);
void messageBox(const QString &text)
{
out << text;
@ -48,7 +62,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
QStringList allServices(const QLatin1String& prefix)
@@ -242,15 +242,15 @@ void setupX11()
@@ -262,15 +262,15 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
@ -69,20 +83,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
// TODO: Check if Necessary
@@ -267,11 +267,7 @@ bool syncDBusEnvironment()
{
int exitCode;
// At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) {
- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") });
- } else {
- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {});
- }
+ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") });
return exitCode == 0;
}
@@ -287,7 +283,7 @@ void setupFontDpi()
@@ -306,7 +302,7 @@ void setupFontDpi()
//TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
@ -91,7 +92,7 @@ index 4c9f5cef6..5ea4c2cf1 100644
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
@@ -309,7 +305,7 @@ QProcess* setupKSplash()
@@ -328,7 +324,7 @@ QProcess* setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
@ -100,15 +101,6 @@ index 4c9f5cef6..5ea4c2cf1 100644
}
}
return p;
@@ -331,7 +327,7 @@ bool startKDEInit()
{
// We set LD_BIND_NOW to increase the efficiency of kdeinit.
// kdeinit unsets this variable before loading applications.
- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
+ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") });
if (exitCode != 0) {
messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
return false;
--
2.25.1
2.28.0

8
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View file

@ -4,7 +4,7 @@
extra-cmake-modules, kdoctools,
coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot,
libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot,
baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
@ -12,7 +12,7 @@
kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
appstream-qt,
appstream-qt, plasma-wayland-protocols,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qqc2-desktop-style,
@ -25,14 +25,14 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
isocodes libdbusmenu libSM libXcursor libXtst pam wayland
isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland
baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons
kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
libqalculate networkmanager-qt phonon plasma-framework prison solid
kholidays kquickcharts appstream-qt
kholidays kquickcharts appstream-qt plasma-wayland-protocols
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
qtx11extras qqc2-desktop-style

5
pkgs/desktops/plasma-5/polkit-kde-agent.nix
View file

@ -1,7 +1,7 @@
{
mkDerivation, extra-cmake-modules,
mkDerivation, lib, extra-cmake-modules,
kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
kwidgetsaddons, kwindowsystem, polkit-qt
kwidgetsaddons, kwindowsystem, polkit-qt, qtbase
}:
mkDerivation {
@ -12,4 +12,5 @@ mkDerivation {
knotifications kwindowsystem polkit-qt
];
outputs = [ "out" "dev" ];
meta.broken = lib.versionOlder qtbase.version "5.15.0";
}

16
pkgs/desktops/plasma-5/powerdevil.nix
View file

@ -19,18 +19,10 @@ mkDerivation {
"-DHAVE_DDCUTIL=On"
];
patches = [
# This fixes an issue where 'DDCA_Feature_List*' cannot be converted to
# 'DDCA_Feature_List'.
# https://bugs.kde.org/show_bug.cgi?id=423605
(fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
})
# Reduce log message spam by setting the default log level to Warning.
(fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2";
})
#(fetchpatch {
# url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
# sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2";
#})
];
}

5
pkgs/desktops/plasma-5/sddm-kcm.nix
View file

@ -1,12 +1,13 @@
{
mkDerivation, extra-cmake-modules, shared-mime-info,
mkDerivation, lib, extra-cmake-modules, shared-mime-info,
libpthreadstubs, libXcursor, libXdmcp,
qtquickcontrols2, qtx11extras,
qtbase, qtquickcontrols2, qtx11extras,
karchive, ki18n, kio, knewstuff
}:
mkDerivation {
name = "sddm-kcm";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
libpthreadstubs libXcursor libXdmcp

402
pkgs/desktops/plasma-5/srcs.nix
View file

@ -1,390 +1,398 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz";
sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66";
name = "bluedevil-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz";
sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129";
name = "bluedevil-5.20.4.tar.xz";
};
};
breeze = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz";
sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563";
name = "breeze-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz";
sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f";
name = "breeze-5.20.4.tar.xz";
};
};
breeze-grub = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz";
sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1";
name = "breeze-grub-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz";
sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb";
name = "breeze-grub-5.20.4.tar.xz";
};
};
breeze-gtk = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz";
sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9";
name = "breeze-gtk-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz";
sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d";
name = "breeze-gtk-5.20.4.tar.xz";
};
};
breeze-plymouth = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz";
sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281";
name = "breeze-plymouth-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz";
sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada";
name = "breeze-plymouth-5.20.4.tar.xz";
};
};
discover = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz";
sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6";
name = "discover-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz";
sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012";
name = "discover-5.20.4.tar.xz";
};
};
drkonqi = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz";
sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1";
name = "drkonqi-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz";
sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8";
name = "drkonqi-5.20.4.tar.xz";
};
};
kactivitymanagerd = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz";
sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7";
name = "kactivitymanagerd-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz";
sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34";
name = "kactivitymanagerd-5.20.4.tar.xz";
};
};
kde-cli-tools = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz";
sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8";
name = "kde-cli-tools-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz";
sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3";
name = "kde-cli-tools-5.20.4.tar.xz";
};
};
kdecoration = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz";
sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8";
name = "kdecoration-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz";
sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8";
name = "kdecoration-5.20.4.tar.xz";
};
};
kde-gtk-config = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz";
sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab";
name = "kde-gtk-config-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz";
sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1";
name = "kde-gtk-config-5.20.4.tar.xz";
};
};
kdeplasma-addons = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz";
sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f";
name = "kdeplasma-addons-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz";
sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7";
name = "kdeplasma-addons-5.20.4.tar.xz";
};
};
kgamma5 = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz";
sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f";
name = "kgamma5-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz";
sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41";
name = "kgamma5-5.20.4.tar.xz";
};
};
khotkeys = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz";
sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766";
name = "khotkeys-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz";
sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648";
name = "khotkeys-5.20.4.tar.xz";
};
};
kinfocenter = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz";
sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5";
name = "kinfocenter-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz";
sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3";
name = "kinfocenter-5.20.4.tar.xz";
};
};
kmenuedit = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz";
sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6";
name = "kmenuedit-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz";
sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b";
name = "kmenuedit-5.20.4.tar.xz";
};
};
kscreen = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz";
sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2";
name = "kscreen-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz";
sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c";
name = "kscreen-5.20.4.tar.xz";
};
};
kscreenlocker = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz";
sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2";
name = "kscreenlocker-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz";
sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126";
name = "kscreenlocker-5.20.4.tar.xz";
};
};
ksshaskpass = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz";
sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5";
name = "ksshaskpass-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz";
sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218";
name = "ksshaskpass-5.20.4.tar.xz";
};
};
ksysguard = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz";
sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f";
name = "ksysguard-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz";
sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4";
name = "ksysguard-5.20.4.tar.xz";
};
};
kwallet-pam = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz";
sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a";
name = "kwallet-pam-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz";
sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9";
name = "kwallet-pam-5.20.4.tar.xz";
};
};
kwayland-integration = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz";
sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5";
name = "kwayland-integration-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz";
sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d";
name = "kwayland-integration-5.20.4.tar.xz";
};
};
kwayland-server = {
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz";
sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44";
name = "kwayland-server-5.20.4.tar.xz";
};
};
kwin = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz";
sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8";
name = "kwin-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz";
sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a";
name = "kwin-5.20.4.tar.xz";
};
};
kwrited = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz";
sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe";
name = "kwrited-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz";
sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2";
name = "kwrited-5.20.4.tar.xz";
};
};
libkscreen = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz";
sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c";
name = "libkscreen-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz";
sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d";
name = "libkscreen-5.20.4.tar.xz";
};
};
libksysguard = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz";
sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b";
name = "libksysguard-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz";
sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422";
name = "libksysguard-5.20.4.tar.xz";
};
};
milou = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz";
sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2";
name = "milou-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz";
sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201";
name = "milou-5.20.4.tar.xz";
};
};
oxygen = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz";
sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8";
name = "oxygen-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz";
sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67";
name = "oxygen-5.20.4.tar.xz";
};
};
plasma-browser-integration = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz";
sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383";
name = "plasma-browser-integration-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz";
sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4";
name = "plasma-browser-integration-5.20.4.tar.xz";
};
};
plasma-desktop = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz";
sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f";
name = "plasma-desktop-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz";
sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355";
name = "plasma-desktop-5.20.4.tar.xz";
};
};
plasma-disks = {
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz";
sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845";
name = "plasma-disks-5.20.4.tar.xz";
};
};
plasma-integration = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz";
sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870";
name = "plasma-integration-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz";
sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299";
name = "plasma-integration-5.20.4.tar.xz";
};
};
plasma-nano = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz";
sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341";
name = "plasma-nano-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz";
sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd";
name = "plasma-nano-5.20.4.tar.xz";
};
};
plasma-nm = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz";
sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa";
name = "plasma-nm-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz";
sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf";
name = "plasma-nm-5.20.4.tar.xz";
};
};
plasma-pa = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz";
sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209";
name = "plasma-pa-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz";
sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3";
name = "plasma-pa-5.20.4.tar.xz";
};
};
plasma-phone-components = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz";
sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070";
name = "plasma-phone-components-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz";
sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e";
name = "plasma-phone-components-5.20.4.tar.xz";
};
};
plasma-sdk = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz";
sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5";
name = "plasma-sdk-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz";
sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea";
name = "plasma-sdk-5.20.4.tar.xz";
};
};
plasma-tests = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz";
sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a";
name = "plasma-tests-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz";
sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735";
name = "plasma-tests-5.20.4.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz";
sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1";
name = "plasma-thunderbolt-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz";
sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429";
name = "plasma-thunderbolt-5.20.4.tar.xz";
};
};
plasma-vault = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz";
sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41";
name = "plasma-vault-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz";
sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c";
name = "plasma-vault-5.20.4.tar.xz";
};
};
plasma-workspace = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz";
sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354";
name = "plasma-workspace-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz";
sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9";
name = "plasma-workspace-5.20.4.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz";
sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d";
name = "plasma-workspace-wallpapers-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz";
sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808";
name = "plasma-workspace-wallpapers-5.20.4.tar.xz";
};
};
plymouth-kcm = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz";
sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3";
name = "plymouth-kcm-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz";
sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77";
name = "plymouth-kcm-5.20.4.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.18.5";
version = "1-5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz";
sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91";
name = "polkit-kde-agent-1-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz";
sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61";
name = "polkit-kde-agent-1-5.20.4.tar.xz";
};
};
powerdevil = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz";
sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548";
name = "powerdevil-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz";
sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d";
name = "powerdevil-5.20.4.tar.xz";
};
};
sddm-kcm = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz";
sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b";
name = "sddm-kcm-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz";
sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e";
name = "sddm-kcm-5.20.4.tar.xz";
};
};
systemsettings = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz";
sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b";
name = "systemsettings-5.18.5.tar.xz";
};
};
user-manager = {
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz";
sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484";
name = "user-manager-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz";
sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9";
name = "systemsettings-5.20.4.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.18.5";
version = "5.20.4";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz";
sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224";
name = "xdg-desktop-portal-kde-5.18.5.tar.xz";
url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz";
sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8";
name = "xdg-desktop-portal-kde-5.20.4.tar.xz";
};
};
}

13
pkgs/desktops/plasma-5/user-manager.nix
View file

@ -1,13 +0,0 @@
{
mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml,
ki18n, kiconthemes, kio, kwindowsystem, libpwquality
}:
mkDerivation {
name = "user-manager";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem
libpwquality
];
}

12
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
View file

@ -1,18 +1,20 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools, python,
cups, epoxy, mesa, pcre, pipewire,
cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
kirigami2, kdeclarative, plasma-framework, kio
kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
qtbase
}:
mkDerivation {
name = "xdg-desktop-portal-kde";
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
cups epoxy mesa pcre pipewire
cups epoxy mesa pcre pipewire wayland wayland-protocols
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
kirigami2 kdeclarative plasma-framework
kirigami2 kdeclarative plasma-framework plasma-wayland-protocols
];
}

15
pkgs/development/compilers/rust/1_45.nix
View file

@ -11,15 +11,24 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_5, llvm_10
} @ args:
import ./default.nix {
rustcVersion = "1.45.2";
rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp";
llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; };
llvmBootstrapForDarwin = llvmPackages_5;
# For use at runtime
llvmShared = llvm_10.override { enableSharedLibraries = true; };
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.44.1";
@ -41,4 +50,4 @@ import ./default.nix {
];
}
(builtins.removeAttrs args [ "fetchpatch" ])
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_10" ])

15
pkgs/development/compilers/rust/1_48.nix
View file

@ -13,15 +13,24 @@
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform
, llvmPackages_5, llvm_11
} @ args:
import ./default.nix {
rustcVersion = "1.48.0";
rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf";
llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; };
llvmBootstrapForDarwin = llvmPackages_5;
# For use at runtime
llvmShared = llvm_11.override { enableSharedLibraries = true; };
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.47.0";
@ -43,4 +52,4 @@ import ./default.nix {
];
}
(builtins.removeAttrs args [ "fetchpatch" ])
(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"])

15
pkgs/development/compilers/rust/default.nix
View file

@ -5,12 +5,16 @@
, bootstrapHashes
, selectRustPackage
, rustcPatches ? []
, llvmBootstrapForDarwin
, llvmShared
, llvmSharedForBuild
, llvmSharedForHost
, llvmSharedForTarget
}:
{ stdenv, lib
, buildPackages
, newScope, callPackage
, CoreFoundation, Security
, llvmPackages
, pkgsBuildTarget, pkgsBuildBuild
, makeRustPlatform
}: rec {
@ -76,16 +80,17 @@
version = rustcVersion;
sha256 = rustcSha256;
inherit enableRustcDev;
inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget;
patches = rustcPatches;
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
stdenv = llvmPackages.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages.stdenv; };
stdenv = llvmBootstrapForDarwin.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
});
rustfmt = self.callPackage ./rustfmt.nix { inherit Security; };
cargo = self.callPackage ./cargo.nix {

15
pkgs/development/compilers/rust/rustc.nix
View file

@ -1,6 +1,7 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
, fetchurl, file, python3
, llvm_10, darwin, cmake, rust, rustPlatform
, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl
, which, libffi
, withBundledLLVM ? false
@ -13,13 +14,6 @@
let
inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; };
# For use at runtime
llvmShared = llvm_10.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
inherit version;
@ -154,6 +148,11 @@ in stdenv.mkDerivation rec {
python x.py dist rustc-dev
tar xf build/dist/rustc-dev*tar.gz
cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/
rm $out/lib/rustlib/install.log
for m in $out/lib/rustlib/manifest-rust*
do
sort --output=$m < $m
done
'' + ''
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so

44
pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
View file

@ -1,19 +1,19 @@
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 Aug 2017 09:24:06 +0200
From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig
---
Lib/ctypes/util.py | 70 ++----------------------------------------------------
1 file changed, 2 insertions(+), 68 deletions(-)
Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 5e8b31a854..7b45ce6c15 100644
index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -94,46 +94,7 @@ elif os.name == "posix":
import re, tempfile
@@ -100,53 +100,7 @@ elif os.name == "posix":
return thefile.read(4) == elf_header
def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
- # library name it prints out. The GCC command will fail because we
@ -51,17 +51,24 @@ index 5e8b31a854..7b45ce6c15 100644
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
- res = re.search(expr, trace)
- res = re.findall(expr, trace)
- if not res:
- return None
- return os.fsdecode(res.group(0))
-
- for file in res:
- # Check if the given file is an elf file: gcc can report
- # some files that are linker scripts and not actual
- # shared objects. See bpo-41976 for more details
- if not _is_elf(file):
- continue
- return os.fsdecode(file)
+ return None
if sys.platform == "sunos5":
@@ -255,34 +216,7 @@ elif os.name == "posix":
@@ -268,34 +222,7 @@ elif os.name == "posix":
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
@ -92,9 +99,8 @@ index 5e8b31a854..7b45ce6c15 100644
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.15.0
--
2.24.3 (Apple Git-128)

4
pkgs/development/interpreters/python/default.nix
View file

@ -167,10 +167,10 @@ in {
sourceVersion = {
major = "3";
minor = "9";
patch = "0";
patch = "1";
suffix = "";
};
sha256 = "0m18z05nlmqm1zjw9s0ifgrn1jvjn3jwjg0bpswhjmw5k4yfcwww";
sha256 = "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r";
inherit (darwin) configd;
inherit passthruFun;
};

11
pkgs/development/libraries/aws-c-common/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "aws-c-common";
@ -13,15 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped
patches = [
(fetchpatch {
name = "fix-re-export-of-target.patch";
url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch";
sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
})
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-Wno-nullability-extension -Wno-typedef-redefinition";

10
pkgs/development/libraries/aws-checksums/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }:
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "aws-checksums";
@ -13,14 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped
patches = [
(fetchpatch {
url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch";
sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a";
})
];
cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ];
meta = with lib; {

9
pkgs/development/libraries/boost/generic.nix
View file

@ -1,4 +1,5 @@
{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
, fetchpatch
, which
, buildPackages
, toolset ? /**/ if stdenv.cc.isClang then "clang"
@ -113,6 +114,14 @@ stdenv.mkDerivation {
if version == "1.55.0"
then ./darwin-1.55-no-system-python.patch
else ./darwin-no-system-python.patch)
# Fix boost-context segmentation faults on ppc64 due to ABI violation
++ optional (versionAtLeast version "1.61" &&
versionOlder version "1.71") (fetchpatch {
url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
stripLen = 1;
extraPrefix = "libs/context/";
})
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch;

4
pkgs/development/libraries/gdk-pixbuf/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "gdk-pixbuf";
version = "2.42.0";
version = "2.42.2";
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k";
sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
};
patches = [

4
pkgs/development/libraries/gstreamer/bad/default.nix
View file

@ -89,13 +89,13 @@ let
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.18.1";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1cn18cbqyysrxnrk5bpxdzd5xcws9g2kmm5rbv00cx6rhn69g5f1";
sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
};
patches = [

4
pkgs/development/libraries/gstreamer/base/default.nix
View file

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-base";
version = "1.18.1";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0hf66sh8d4x2ksfnvaq2rqrrfq0vi0pv6wbh9i5jixrhvvbm99hv";
sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
};
patches = [

4
pkgs/development/libraries/gstreamer/core/default.nix
View file

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "gstreamer";
version = "1.18.1";
version = "1.18.2";
outputs = [
"out"
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1fpcpsw740svvdxvvwn0hly5i72miizm4s0mbid10ji83zi8vpvr";
sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
};
patches = [

4
pkgs/development/libraries/gstreamer/devtools/default.nix
View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.18.1";
version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1pxhg8n5nl34baq6mb07i27b33gaw47zrv5yalyj6f12pnx148ki";
sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
};
patches = [

4
pkgs/development/libraries/gstreamer/ges/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.18.1";
version = "1.18.2";
outputs = [
"out"
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "09rr5a198p1r9wcbsjl01xg6idkfkgj5h9x7xxywarb5i7qv6g79";
sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
};
patches = [

4
pkgs/development/libraries/gstreamer/good/default.nix
View file

@ -51,13 +51,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.18.1";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0v329xi4qhlfh9aksfyviryqk9lclm4wj1lxrjnbdv4haldfj472";
sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/libav/default.nix
View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
version = "1.18.1";
version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1n1fkkbxxsndblnbm0c2ziqp967hrz5gag6z36xbpvqk4sy1g9rr";
sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
version = "1.18.1";
version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "0m7p7sarvi6n9pz0rrl9k3gp3l5s42qs8z0165kyd6fiqdjjia0h";
sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
};
outputs = [

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
version = "1.18.1";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "09gpbykjchw3lb51ipxj53fy238gr9mg9jybcg5135pb56w6rk8q";
sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/vaapi/default.nix
View file

@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
version = "1.18.1";
version = "1.18.2";
src = fetchurl {
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "1sm6x2qa7ng78w0w8q4mjs7pbpbbk8qkfgzhdmbb8l0bh513q3a0";
sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
};
outputs = [

11
pkgs/development/libraries/gtk/3.x.nix
View file

@ -51,7 +51,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.23";
version = "3.24.24";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx";
sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc";
};
patches = [
@ -73,13 +73,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
# Fix path handling in pkg-config. MR for the gtk-3-24 branch:
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/)
WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/)

14
pkgs/development/libraries/kde-frameworks/kded.nix
View file

@ -1,16 +1,22 @@
{
mkDerivation, lib, propagate,
mkDerivation, lib, propagate, wrapGAppsHook,
extra-cmake-modules, kdoctools,
kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit,
kservice, qtbase,
}:
mkDerivation {
name = "kded";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit
kservice qtbase
];
outputs = [ "out" "dev" ];
setupHook = propagate "out";
dontWrapGApps = true;
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
}

8
pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
View file

@ -1,16 +1,18 @@
{
mkDerivation,
mkDerivation, lib,
extra-cmake-modules,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtbase, qttools, qtx11extras,
qtbase, qttools, qtx11extras, libXdmcp,
}:
mkDerivation {
name = "kglobalaccel";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
qtx11extras
qtx11extras libXdmcp
];
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ qtbase ];
}

50
pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch Normal file
View file

@ -0,0 +1,50 @@
From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 9 Dec 2020 10:01:59 -0600
Subject: [PATCH] platform plugins path
---
src/pluginwrapper.cpp | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
index a255d83..9699b08 100644
--- a/src/pluginwrapper.cpp
+++ b/src/pluginwrapper.cpp
@@ -25,20 +25,19 @@ static QStringList pluginCandidates()
{
QStringList ret;
const auto paths = QCoreApplication::libraryPaths();
- for (const QString &path : paths) {
- static const QStringList searchFolders {
- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
- QStringLiteral("/kf5/kwindowsystem"),
- };
- for (const QString &searchFolder : searchFolders) {
- QDir pluginDir(path + searchFolder);
- if (!pluginDir.exists()) {
- continue;
- }
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH);
+ static const QStringList searchFolders {
+ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
+ QStringLiteral("/kf5/kwindowsystem"),
+ };
+ for (const QString &searchFolder : searchFolders) {
+ QDir pluginDir(path + searchFolder);
+ if (!pluginDir.exists()) {
+ continue;
+ }
+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+ for (const QString &entry : entries) {
+ ret << pluginDir.absoluteFilePath(entry);
}
}
return ret;
--
2.28.0

4
pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
View file

@ -9,13 +9,13 @@ mkDerivation {
name = "kwindowsystem";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
broken = lib.versionOlder qtbase.version "5.7.0";
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
patches = [
./platform-plugins-path.patch
./0001-platform-plugins-path.patch
];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""

25
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
View file

@ -1,25 +0,0 @@
Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
===================================================================
--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
static QStringList pluginCandidates()
{
QStringList ret;
- const auto paths = QCoreApplication::libraryPaths();
- for (const QString &path : paths) {
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
- if (!pluginDir.exists()) {
- continue;
- }
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+ for (const QString &entry : entries) {
+ ret << pluginDir.absoluteFilePath(entry);
}
return ret;
}

3
pkgs/development/libraries/kde-frameworks/purpose.nix
View file

@ -1,6 +1,7 @@
{
mkDerivation, lib, extra-cmake-modules, qtbase
, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
, fetchpatch
}:
mkDerivation {
@ -8,7 +9,7 @@ mkDerivation {
meta = { maintainers = [ lib.maintainers.bkchr ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative kconfig kcoreaddons
qtbase qtdeclarative kconfig kcoreaddons
ki18n kio kirigami2
];
}

666
pkgs/development/libraries/kde-frameworks/srcs.nix
View file

File diff suppressed because it is too large Load diff

2
pkgs/development/libraries/libseccomp/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# src input for buildPythonPackage calls
postInstall = ''
cp -R ./src/python/ tmp-pythonsrc/
tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/
'';
meta = with stdenv.lib; {

4
pkgs/development/libraries/libusb1/default.nix
View file

@ -13,13 +13,13 @@ assert enableUdev -> udev != null;
stdenv.mkDerivation rec {
pname = "libusb";
version = "1.0.23";
version = "1.0.24";
src = fetchFromGitHub {
owner = "libusb";
repo = "libusb";
rev = "v${version}";
sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";
sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/nss/default.nix
View file

@ -15,7 +15,7 @@ let
# It will rebuild itself using the version of this package (NSS) and if
# an update is required do the required changes to the expression.
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
version = "3.59";
version = "3.60";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6";
sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/development/libraries/openssl/default.nix
View file

@ -160,8 +160,8 @@ in {
};
openssl_1_1 = common {
version = "1.1.1h";
sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
version = "1.1.1i";
sha256 = "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8";
patches = [
./1.1/nix-ssl-cert-file.patch

4
pkgs/development/libraries/pmix/default.nix
View file

@ -3,7 +3,7 @@
} :
let
version = "3.2.1";
version = "3.2.2";
in stdenv.mkDerivation {
pname = "pmix";
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
repo = "openpmix";
owner = "openpmix";
rev = "v${version}";
sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh";
sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7";
};
postPatch = ''

17
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -57,6 +57,12 @@ let
# Downgrade minimal required SDK to 10.12
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch
./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch
./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch
./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch
./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch
./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch
./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
# Patch framework detection to support X.framework/X.tbd,
@ -77,16 +83,7 @@ let
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
(fetchpatch {
name = "qtwebengine-bison-3.7-build.patch";
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
stripLen = 1;
extraPrefix = "src/3rdparty/";
})
]
qtwebengine = [ ]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [
(fetchpatch {

2
pkgs/development/libraries/qt-5/5.15/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ )
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ )

47
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch Normal file
View file

@ -0,0 +1,47 @@
From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 12:32:29 -0500
Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag
item"
This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc.
---
src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index 4bd1b129bd..a506126c72 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems()
// 0. We start from URLs, which can be actually in a list (thus technically
// only ONE item in the pasteboard. The fact it's only one does not help, we are
// still getting an exception because of the number of items/images mismatch ...
- // We only set the image for the first item and nil for the rest, the image already
- // contains a combined picture for all urls we drag.
- auto imageOrNil = dragImage;
for (const auto &qtUrl : qtUrls) {
NSURL *nsUrl = qtUrl.toNSURL();
auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
dragImage.size.width,
dragImage.size.height);
-
- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
- imageOrNil = nil;
+ [newItem setDraggingFrame:itemFrame contents:dragImage];
[dragItems addObject:newItem];
}
// 1. Repeat for non-url items, if any:
@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
dragImage.size.width,
dragImage.size.height);
- [newItem setDraggingFrame:itemFrame contents:imageOrNil];
+ [newItem setDraggingFrame:itemFrame contents:dragImage];
[dragItems addObject:newItem];
}
--
2.21.0

40
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch Normal file
View file

@ -0,0 +1,40 @@
From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 12:32:31 -0500
Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours
and populated"
This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7.
---
src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index a506126c72..c6ee4323ce 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
m_drag = o;
m_executed_drop_action = Qt::IgnoreAction;
- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
-
if (maybeDragMultipleItems())
return m_executed_drop_action;
@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
Q_ASSERT(dragImage);
+ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
+
NSPoint event_location = [m_lastEvent locationInWindow];
NSWindow *theWindow = [m_lastEvent window];
Q_ASSERT(theWindow);
--
2.21.0

27
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch Normal file
View file

@ -0,0 +1,27 @@
From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 12:32:32 -0500
Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix
erroneous size check"
This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd.
---
src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index c6ee4323ce..ab6863a432 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems()
const auto &qtUrls = m_drag->mimeData()->urls();
NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
- if (qtUrls.size() <= 1) {
+ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
// Good old -dragImage: works perfectly for this ...
return false;
}
--
2.21.0

192
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch Normal file
View file

@ -0,0 +1,192 @@
From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 12:32:34 -0500
Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if
possible"
This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f.
---
src/plugins/platforms/cocoa/qcocoadrag.h | 6 --
src/plugins/platforms/cocoa/qcocoadrag.mm | 90 -------------------
.../platforms/cocoa/qnsview_dragging.mm | 9 +-
3 files changed, 1 insertion(+), 104 deletions(-)
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h
index 975741c270..5a5b985c6e 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.h
+++ b/src/plugins/platforms/cocoa/qcocoadrag.h
@@ -48,8 +48,6 @@
#include <QtGui/private/qdnd_p.h>
#include <QtGui/private/qinternalmimedata_p.h>
-#include <QtCore/qeventloop.h>
-
QT_BEGIN_NAMESPACE
class QCocoaDrag : public QPlatformDrag
@@ -71,15 +69,11 @@ public:
void setLastMouseEvent(NSEvent *event, NSView *view);
void setAcceptedAction(Qt::DropAction act);
- void exitDragLoop();
private:
QDrag *m_drag;
NSEvent *m_lastEvent;
NSView *m_lastView;
Qt::DropAction m_executed_drop_action;
- QEventLoop internalDragLoop;
-
- bool maybeDragMultipleItems();
QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const;
};
diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
index ab6863a432..b4a16ab912 100644
--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
+++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
@@ -44,9 +44,6 @@
#include <QtWidgets/qwidget.h>
#endif
#include <QtGui/private/qcoregraphics_p.h>
-#include <QtCore/qsysinfo.h>
-
-#include <vector>
QT_BEGIN_NAMESPACE
@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
m_drag = o;
m_executed_drop_action = Qt::IgnoreAction;
- if (maybeDragMultipleItems())
- return m_executed_drop_action;
-
QPoint hotSpot = m_drag->hotSpot();
QPixmap pm = dragPixmap(m_drag, hotSpot);
NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
return m_executed_drop_action;
}
-bool QCocoaDrag::maybeDragMultipleItems()
-{
- Q_ASSERT(m_drag && m_drag->mimeData());
- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction);
-
- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) {
- // -dragImage: stopped working in 10.14 first.
- return false;
- }
-
- const QMacAutoReleasePool pool;
-
- NSWindow *theWindow = [m_lastEvent window];
- Q_ASSERT(theWindow);
-
- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)])
- return false;
-
- auto *sourceView = static_cast<NSView<NSDraggingSource>*>(theWindow.contentView);
-
- const auto &qtUrls = m_drag->mimeData()->urls();
- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
-
- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) {
- // Good old -dragImage: works perfectly for this ...
- return false;
- }
-
- std::vector<NSPasteboardItem *> nonUrls;
- for (NSPasteboardItem *item in dragBoard.pasteboardItems) {
- bool isUrl = false;
- for (NSPasteboardType type in item.types) {
- using NSStringRef = NSString *;
- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) {
- isUrl = true;
- break;
- }
- }
-
- if (!isUrl)
- nonUrls.push_back(item);
- }
-
- QPoint hotSpot = m_drag->hotSpot();
- const auto pixmap = dragPixmap(m_drag, hotSpot);
- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()];
- Q_ASSERT(dragImage);
-
- NSMutableArray<NSDraggingItem *> *dragItems = [[[NSMutableArray alloc] init] autorelease];
- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint();
- // 0. We start from URLs, which can be actually in a list (thus technically
- // only ONE item in the pasteboard. The fact it's only one does not help, we are
- // still getting an exception because of the number of items/images mismatch ...
- for (const auto &qtUrl : qtUrls) {
- NSURL *nsUrl = qtUrl.toNSURL();
- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease];
- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
- dragImage.size.width,
- dragImage.size.height);
- [newItem setDraggingFrame:itemFrame contents:dragImage];
- [dragItems addObject:newItem];
- }
- // 1. Repeat for non-url items, if any:
- for (auto *pbItem : nonUrls) {
- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease];
- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y,
- dragImage.size.width,
- dragImage.size.height);
- [newItem setDraggingFrame:itemFrame contents:dragImage];
- [dragItems addObject:newItem];
- }
-
- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView];
- internalDragLoop.exec();
- return true;
-}
-
void QCocoaDrag::setAcceptedAction(Qt::DropAction act)
{
m_executed_drop_action = act;
}
-void QCocoaDrag::exitDragLoop()
-{
- if (internalDragLoop.isRunning())
- internalDragLoop.exit();
-}
-
-
QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const
{
const QMimeData* data = drag->mimeData();
diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm
index 978d73f7d9..463e3c5579 100644
--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm
+++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm
@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
if (!target)
return;
- auto *nativeDrag = QCocoaIntegration::instance()->drag();
- Q_ASSERT(nativeDrag);
- nativeDrag->exitDragLoop();
-
QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint();
qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint;
@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
if (!target)
return;
- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
- Q_ASSERT(nativeDrag);
- nativeDrag->exitDragLoop();
- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
+ QCocoaIntegration::instance()->drag();
// Qt starts drag-and-drop on a mouse button press event. Cococa in
// this case won't send the matching release event, so we have to
--
2.21.0

26
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch Normal file
View file

@ -0,0 +1,26 @@
From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 12:32:37 -0500
Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState"
This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd.
---
src/plugins/styles/mac/qmacstyle_mac.mm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index d1febd81d4..b5e6e60ec0 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
pbCell = static_cast<NSPopUpButtonCell *>(pb.cell);
oldPosition = pbCell.arrowPosition;
pbCell.arrowPosition = NSPopUpNoArrow;
- if (pb.state == NSControlStateValueOff) {
+ if (pb.state == NSOffState) {
// NSPopUpButton in this state is smaller.
rAdjusted.origin.x -= 3;
rAdjusted.size.width += 6;
--
2.21.0

77
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch Normal file
View file

@ -0,0 +1,77 @@
From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 7 Dec 2020 13:22:02 -0500
Subject: [PATCH 6/6] git checkout v5.15.0 --
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
---
.../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index 5ad1f9d7bb..c9fa035d87 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);
- (void)updateQtColor
{
- // Discard the color space and pass the color components to QColor. This
- // is a good option as long as QColor is color-unmanaged: we preserve the
- // exact RGB value from the color picker, which is predictable. Further,
- // painting with the color will reproduce the same color on-screen, as
- // long as the the same screen is used for selecting the color.
- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased];
- switch (componentColor.colorSpace.colorSpaceModel)
- {
- case NSColorSpaceModelGray: {
- CGFloat white = 0, alpha = 0;
- [componentColor getWhite:&white alpha:&alpha];
- mQtColor.setRgbF(white, white, white, alpha);
- } break;
- case NSColorSpaceModelRGB: {
- CGFloat red = 0, green = 0, blue = 0, alpha = 0;
- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha];
- mQtColor.setRgbF(red, green, blue, alpha);
- } break;
- case NSColorSpaceModelCMYK: {
+ NSColor *color = [mColorPanel color];
+ NSString *colorSpaceName = [color colorSpaceName];
+ if (colorSpaceName == NSDeviceCMYKColorSpace) {
CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0;
- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
+ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
mQtColor.setCmykF(cyan, magenta, yellow, black, alpha);
- } break;
- default:
- qWarning("QNSColorPanelDelegate: Unsupported color space model");
- break;
+ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) {
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+ [color getRed:&red green:&green blue:&blue alpha:&alpha];
+ mQtColor.setRgbF(red, green, blue, alpha);
+ } else if (colorSpaceName == NSNamedColorSpace) {
+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
+ mQtColor.setRgbF(red, green, blue, alpha);
+ } else {
+ NSColorSpace *colorSpace = [color colorSpace];
+ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){
+ CGFloat components[5];
+ [color getComponents:components];
+ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]);
+ } else {
+ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
+ mQtColor.setRgbF(red, green, blue, alpha);
+ }
}
-
if (mHelper)
emit mHelper->currentColorChanged(mQtColor);
}
--
2.21.0

336
pkgs/development/libraries/qt-5/5.15/srcs.nix
View file

@ -4,339 +4,339 @@
{
qt3d = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz";
sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd";
name = "qt3d-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
name = "qt3d-everywhere-src-5.15.2.tar.xz";
};
};
qtactiveqt = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz";
sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51";
name = "qtactiveqt-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
};
};
qtandroidextras = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz";
sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671";
name = "qtandroidextras-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
};
};
qtbase = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz";
sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5";
name = "qtbase-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
name = "qtbase-everywhere-src-5.15.2.tar.xz";
};
};
qtcharts = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz";
sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7";
name = "qtcharts-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
name = "qtcharts-everywhere-src-5.15.2.tar.xz";
};
};
qtconnectivity = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz";
sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd";
name = "qtconnectivity-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
};
};
qtdatavis3d = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz";
sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3";
name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
};
};
qtdeclarative = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz";
sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699";
name = "qtdeclarative-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
};
};
qtdoc = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz";
sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f";
name = "qtdoc-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
name = "qtdoc-everywhere-src-5.15.2.tar.xz";
};
};
qtgamepad = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz";
sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a";
name = "qtgamepad-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda";
name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
};
};
qtimageformats = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz";
sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8";
name = "qtimageformats-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
};
};
qtlocation = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz";
sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f";
name = "qtlocation-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
name = "qtlocation-everywhere-src-5.15.2.tar.xz";
};
};
qtlottie = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz";
sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833";
name = "qtlottie-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
name = "qtlottie-everywhere-src-5.15.2.tar.xz";
};
};
qtmacextras = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz";
sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439";
name = "qtmacextras-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
};
};
qtmultimedia = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz";
sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7";
name = "qtmultimedia-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
};
};
qtnetworkauth = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz";
sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85";
name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
};
};
qtpurchasing = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz";
sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16";
name = "qtpurchasing-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
};
};
qtquick3d = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz";
sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb";
name = "qtquick3d-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
};
};
qtquickcontrols = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz";
sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee";
name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f";
name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
};
};
qtquicktimeline = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz";
sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00";
name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
};
};
qtremoteobjects = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz";
sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf";
name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
};
};
qtscript = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz";
sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373";
name = "qtscript-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
name = "qtscript-everywhere-src-5.15.2.tar.xz";
};
};
qtscxml = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz";
sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72";
name = "qtscxml-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
name = "qtscxml-everywhere-src-5.15.2.tar.xz";
};
};
qtsensors = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz";
sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da";
name = "qtsensors-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
name = "qtsensors-everywhere-src-5.15.2.tar.xz";
};
};
qtserialbus = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz";
sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379";
name = "qtserialbus-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
};
};
qtserialport = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz";
sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67";
name = "qtserialport-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
name = "qtserialport-everywhere-src-5.15.2.tar.xz";
};
};
qtspeech = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz";
sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61";
name = "qtspeech-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
name = "qtspeech-everywhere-src-5.15.2.tar.xz";
};
};
qtsvg = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz";
sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d";
name = "qtsvg-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
name = "qtsvg-everywhere-src-5.15.2.tar.xz";
};
};
qttools = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz";
sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437";
name = "qttools-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
name = "qttools-everywhere-src-5.15.2.tar.xz";
};
};
qttranslations = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz";
sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe";
name = "qttranslations-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
name = "qttranslations-everywhere-src-5.15.2.tar.xz";
};
};
qtvirtualkeyboard = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be";
name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
};
};
qtwayland = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz";
sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb";
name = "qtwayland-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
name = "qtwayland-everywhere-src-5.15.2.tar.xz";
};
};
qtwebchannel = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz";
sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f";
name = "qtwebchannel-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
};
};
qtwebengine = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz";
sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df";
name = "qtwebengine-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
};
};
qtwebglplugin = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz";
sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15";
name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
};
};
qtwebsockets = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz";
sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092";
name = "qtwebsockets-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
};
};
qtwebview = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz";
sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660";
name = "qtwebview-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
name = "qtwebview-everywhere-src-5.15.2.tar.xz";
};
};
qtwinextras = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz";
sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0";
name = "qtwinextras-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
};
};
qtx11extras = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz";
sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1";
name = "qtx11extras-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
};
};
qtxmlpatterns = {
version = "5.15.0";
version = "5.15.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507";
name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz";
url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
};
};
}

4
pkgs/development/python-modules/cryptography/default.nix
View file

@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "cryptography";
version = "3.2.1"; # Also update the hash in vectors.nix
version = "3.3.1"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
sha256 = "1qxz02kfsrihq1h4afyqwcsv9nh3s9mmrr6y9lhi4angw05y3mfk";
sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy";
};
outputs = [ "out" "dev" ];

2
pkgs/development/python-modules/cryptography/vectors.nix
View file

@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "12dq1grn0bjj7c6sj6apd6328525n7xq4kbbmww63sn3x7081vls";
sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03";
};
# No tests included

4
pkgs/development/python-modules/pyqt/5.x.nix
View file

@ -30,12 +30,12 @@ let
in buildPythonPackage rec {
pname = "PyQt5";
version = "5.15.1";
version = "5.15.2";
format = "other";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr";
sha256 = "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp";
};
outputs = [ "out" "dev" ];

6
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch
# Fix namelink failures, can be removed in 3.19.2+
(fetchpatch {
url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch";
sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc";
})
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];

4
pkgs/development/tools/database/liquibase/default.nix
View file

@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
version = "4.2.1";
version = "4.2.2";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b";
sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0";
};
buildInputs = [ jre makeWrapper ];

4
pkgs/os-specific/linux/apparmor/default.nix
View file

@ -14,7 +14,7 @@
let
apparmor-series = "2.13";
apparmor-patchver = "5";
apparmor-patchver = "6";
apparmor-version = apparmor-series + "." + apparmor-patchver;
apparmor-meta = component: with stdenv.lib; {
@ -27,7 +27,7 @@ let
apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3";
sha256 = "13xshy7905d9q9n8d8i0jmdi9m36wr525g4wlsp8k21n7yvvh9j4";
};
prePatchCommon = ''

2
pkgs/os-specific/linux/keyutils/default.nix
View file

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
./conf-symlink.patch
];
makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";
BUILDDATE = "1970-01-01";
outputs = [ "out" "lib" "dev" ];

6
pkgs/os-specific/linux/systemd/default.nix
View file

@ -111,7 +111,7 @@ assert withCryptsetup ->
let
wantCurl = withRemote || withImportd;
version = "247";
version = "247.2";
in
stdenv.mkDerivation {
inherit version pname;
@ -120,9 +120,9 @@ stdenv.mkDerivation {
# This has proven to be less error-prone than the previous systemd fork.
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
repo = "systemd-stable";
rev = "v${version}";
sha256 = "1nwsr6p65zy5jpabvjbszq5g556l1npaf2xsik4p4pvjjwnn1nx6";
sha256 = "091pwrvxz3gcf80shlp28d6l4gvjzc6pb61v4mwxmk9d71qaq7ry";
};
# If these need to be regenerated, `git am path/to/00*.patch` them into a

4
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "util-linux";
version = "2.36";
version = "2.36.1";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1cg0m4psswg71v6wrqc2bngcw20fsp01vbijxdzvdf8kxdkiqjwy";
sha256 = "1vbyydl1b13lx73di4bhc4br9ih24hcqv7bky0kyrn1c2x1c5yh9";
};
patches = [

32
pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch Normal file
View file

@ -0,0 +1,32 @@
---
hw/xfree86/Makefile.am | 1 -
hw/xfree86/Makefile.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 9aeaea1..dcca3b8 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -100,7 +100,6 @@ EXTRA_DIST = xorgconf.cpp
# Without logdir, X will post an error on the terminal and will not start
install-data-local:
- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
if CYGWIN
$(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
endif
diff --git a/hw/xfree86/Makefile.in b/hw/xfree86/Makefile.in
index c4fceee..74da8f1 100644
--- a/hw/xfree86/Makefile.in
+++ b/hw/xfree86/Makefile.in
@@ -1161,7 +1161,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \
# Without logdir, X will post an error on the terminal and will not start
install-data-local:
- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
@CYGWIN_TRUE@ $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
install-exec-hook:
--
2.25.4

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