Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a8d5dc8a676
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fe9f55907e2a
Choose a head ref

Commits on Oct 30, 2020

  1. kdeApplications: Use latest qt515 by default

    Fixes #100707 - Since KDE's maintainers don't allow non official kde
    applications under the `kdeApplications` path, many packages that depend
    on KDE libraries and applications are defined in all-packages.nix.
    Overriding all kdeApplications to use qt514 while all other
    `libsForQt5.callPackage` in all-packages.nix are using qt515, causes
    collisions.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    c172f14 View commit details
  2. kpmcore: Use kio directly - from the scope of libsForQt5 used

    Make sure only compatible qt versions are used for it (#101369) -
    kdeFrameworks is always using `libsForQt5` where e.g
    `libsForQt514.kpmcore` would have otherwise used a kio compiled with
    qt515.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    d44460b View commit details
  3. all-packages.nix: Inherit kdesu in a different scope

    Part of #101369: In order to avoid packages using the default `kdesu`
    always built with qt515, we put it in scope only for packages defined
    with a `libsForQt5`, to avoid incompatible qt versions used together in
    inputs of a package.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    cb29abf View commit details
  4. kf5gpgmepp: Define in libsForQt5

    Since it's a qt library, we can't guarantee every package using it as a
    dependency will need it compiled with the same qt version, we put it in
    all `libsForQt5*` scopes (#101369).
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    62318eb View commit details
  5. Copy the full SHA
    2df5272 View commit details
  6. treewide: Safer libsForQt5.callPackage

    Intro:
    
    Part of #101369: Every attribute from kdeApplications and kdeFrameworks
    can be built with a few different qt5 versions. It's hard to tell the
    difference between an application and a library and some applications
    rely on inputs from kdeApplications and libsForQt5 alike.
    
    Before this change, some applications that were defined with
    `libsForQt5.callPackage` used libraries from the kde* sets compiled with
    a specific qt5 version,
    
    Due to `inherit (kde*) <lib or app>;` used in the widest scope, we had
    issues with packages that depended on packages defined by this
    `inherit`. This led to mismatched qt versions used in the same inputs,
    or the inputs of inputs etc.
    
    Hence, we added to all libsForQt5* sets, packages that will be used from
    the correct libsForQt5 set, in accordance to the
    `libsForQt5*.callPackage` used. All `inherit (kdeApplications) <pkgs>`
    and similar inheritance was moved out of all-packages.nix to aliases.nix
    only for backwards compatibility.
    
    Now some KDE applications show up in the attribute sets `libsForQt5*`
    which didn't show up there previously. This is sort of misleading, as
    these are not necessary libraries, but they show up in the wider scope
    thanks to them in aliases.nix. Hence it's the best that can be done
    considering the circumstances and the urgency of the issue.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    b5c6505 View commit details
  7. tellico: Use libkcddb from libsForQt5's scope.

    Part of (#101369): kdeApplications points to a set of derivations built
    with a specific qt version, where libkcddb is available in libsForQt5's
    callPackage scope, thanks to the parent commit of this commit.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    ea9de43 View commit details
  8. maia-icon-theme: Don't import kdeApplications

    Use libsForQt5.callPackage (#101369).
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    cf9f00b View commit details
  9. lxqt.compton-conf: Use compatible qt5 versions

    Slightly related to #101369, a follow up to:
    4fd58aa
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    2508fa5 View commit details
  10. firefox/wrapper: Use plasma-browser-integration correctly

    Don't rely on the attribute from the aliases.nix, as ofborg checks that
    in PRs.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    c8a7e4d View commit details
  11. drumstick: Define in libsForQt5 scope.

    Since it is used in minuet and kde's metronome and kmetronome, it's
    safer this way to make sure the same qt version is used there.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    3ce9e20 View commit details
  12. packagekit-qt: Move to libsForQt5 scope.

    Since it's a dependency of kde's "discover", it's best to define it
    there to avoid a possible mixed qt5 versions usage (#101369).
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    9f9bdab View commit details
  13. Copy the full SHA
    e681f44 View commit details
  14. Revert "plasma5: mark broken with Qt >= 5.15"

    This reverts commit 575b3a0.
    
    We don't know why ttuegel did it, and we suspect it was due to packages
    breaking due to mixed qt5 versions used together, and not plasma itself
    with qt5.15 - (#101369).
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    368302a View commit details
  15. sddm: Move to libsForQt5*

    Part of #101369: Inherit it in aliases.nix, for backwards compatibility.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    a728279 View commit details
  16. nixos/sddm: Use libsForQt514.sddm if needed (for lxqt)

    Currently lxqt is a desktop environment that's compiled against qt514.
    To avoid possible issues (#101369), we (hopefully) use the same qt
    version as the desktop environment at hand. LXQT should move to qt515,
    and for the long term the correct qt version should be inherited by the
    sddm module.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    77e081b View commit details
  17. kile: some slight improvements/fixes

    Use `buildInputs` instead of `propagatedBuildInputs` - should reduce
    closure size a bit. Don't wrap executables twice. Move `kdoctools` to
    native. Use libsForQt5 - default version (works).
    
    Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
    doronbehar and FRidh committed Oct 30, 2020
    Copy the full SHA
    09fd427 View commit details
  18. kdiagram: 2.6.0 -> 2.7.0

    Use fetchFromGitLab as it seems to be unavailable in the previous url.
    doronbehar committed Oct 30, 2020
    Copy the full SHA
    35078d9 View commit details

Commits on Oct 31, 2020

  1. cshatag: init at 2019-12-03

    rnhmjoj committed Oct 31, 2020
    Copy the full SHA
    2aaf963 View commit details

Commits on Nov 1, 2020

  1. Merge pull request #102102 from rnhmjoj/cshatag

    cshatag: init at 2019-12-03
    rnhmjoj authored Nov 1, 2020
    Copy the full SHA
    93e0a06 View commit details
  2. Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515

    kdeApplications: Use latest qt515 by default
    FRidh authored Nov 1, 2020
    Copy the full SHA
    54f7498 View commit details
  3. Merge master into staging-next

    FRidh committed Nov 1, 2020
    Copy the full SHA
    fe9f559 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -200,7 +200,7 @@ in

security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
capabilities = "cap_sys_nice+ep";
7 changes: 6 additions & 1 deletion nixos/modules/services/x11/display-managers/sddm.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,12 @@ let
cfg = dmcfg.sddm;
xEnv = config.systemd.services.display-manager.environment;

inherit (pkgs) sddm;
sddm = if config.services.xserver.desktopManager.lxqt.enable then
# TODO: Move lxqt to libsForQt515
pkgs.libsForQt514.sddm
else
pkgs.libsForQt5.sddm
;

xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
13 changes: 10 additions & 3 deletions pkgs/applications/editors/kile/default.nix
Original file line number Diff line number Diff line change
@@ -29,14 +29,17 @@ mkDerivation rec {
sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
};

nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
nativeBuildInputs = [
extra-cmake-modules
wrapGAppsHook
kdoctools
];

propagatedBuildInputs = [
buildInputs = [
kconfig
kcrash
kdbusaddons
kdelibs4support
kdoctools
kguiaddons
kiconthemes
kinit
@@ -48,6 +51,10 @@ mkDerivation rec {
poppler
qtscript
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

propagatedUserEnvPkgs = [ konsole ];

4 changes: 2 additions & 2 deletions pkgs/applications/misc/tellico/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, fetchurl
, mkDerivation
, kdeApplications
, libkcddb
, kinit
, kdelibs4support
, solid
@@ -46,7 +46,7 @@ mkDerivation rec {
exempi
extra-cmake-modules
karchive
kdeApplications.libkcddb
libkcddb
kdelibs4support
kfilemetadata
khtml
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, flashplayer, hal-flash
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow
, tridactyl-native
, fx_cast_bridge
, udev
@@ -65,7 +65,7 @@ let
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts
);
14 changes: 11 additions & 3 deletions pkgs/data/icons/maia-icon-theme/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
{ stdenv
, fetchFromGitLab
, cmake
, extra-cmake-modules
, gtk3
, plasma-framework
, kwindowsystem
, hicolor-icon-theme
}:

stdenv.mkDerivation {
pname = "maia-icon-theme";
@@ -17,8 +25,8 @@ stdenv.mkDerivation {
cmake
extra-cmake-modules
gtk3
kdeFrameworks.plasma-framework
kdeFrameworks.kwindowsystem
plasma-framework
kwindowsystem
];

propagatedBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/desktops/lxqt/default.nix
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ let

### OPTIONAL
qterminal = callPackage ./qterminal {};
compton-conf = pkgs.qt5.callPackage ./compton-conf {};
compton-conf = qt5.callPackage ./compton-conf {};
obconf-qt = callPackage ./obconf-qt {};
lximage-qt = callPackage ./lximage-qt {};
qps = callPackage ./qps {};
2 changes: 0 additions & 2 deletions pkgs/desktops/plasma-5/default.nix
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@ let
};

mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {};

packages = self: with self;
let
@@ -83,7 +82,6 @@ let
setupHook = args.setupHook or defaultSetupHook;

meta = {
broken = lib.versionAtLeast qtbase.version "5.15";
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/drumstick/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen
, fluidsynth, pkgconfig, qt5
, fluidsynth, pkgconfig, qtbase, qtsvg
}:

stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];
buildInputs = [
alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg
alsaLib doxygen fluidsynth qtbase qtsvg
];

meta = with stdenv.lib; {
16 changes: 10 additions & 6 deletions pkgs/development/libraries/kdiagram/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{
mkDerivation, fetchurl, lib,
mkDerivation, fetchFromGitLab, lib,
extra-cmake-modules, qttools,
qtbase, qtsvg,
}:

mkDerivation {
name = "kdiagram-2.6.0";
src = fetchurl {
url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz";
sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02";
mkDerivation rec {
pname = "kdiagram";
version = "2.7.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = pname;
rev = "v${version}";
sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtbase qtsvg ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kpmcore/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, extra-cmake-modules
, qtbase, kdeFrameworks
, qtbase, kio
, libatasmart, parted
, utillinux }:

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libatasmart
parted # we only need the library

kdeFrameworks.kio
kio

utillinux # needs blkid (note that this is not provided by utillinux-compat)
];
32 changes: 32 additions & 0 deletions pkgs/os-specific/linux/cshatag/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
pname = "cshatag";
version = "2019-12-03";

goPackagePath = "github.com/rfjakob/cshatag";
goDeps = ./deps.nix;

src = fetchFromGitHub {
owner = "rfjakob";
repo = pname;
rev = "b169f0a9dd35a7381774eb176d4badf64d403560";
sha256 = "16kam3w75avh8khkk6jfdnxwggz2pw6ccv6v7d064j0fbb9y8x0v";
};

makeFlags = [ "PREFIX=$(out)" "GITVERSION=${version}" ];

postInstall = ''
# Install man page
cd go/src/${goPackagePath}
make install $makeFlags
'';

meta = with lib; {
description = "A tool to detect silent data corruption";
homepage = "https://github.com/rfjakob/cshatag";
license = licenses.mit;
platforms = platforms.linux;
};

}
21 changes: 21 additions & 0 deletions pkgs/os-specific/linux/cshatag/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
@@ -752,4 +752,60 @@ mapAliases ({

ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";

/* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See:
https://github.com/NixOS/nixpkgs/pull/101369 */

inherit (kdeFrameworks) breeze-icons oxygen-icons5;
inherit (kdeApplications)
akonadi akregator ark
bomber bovo
dolphin dragon
elisa
ffmpegthumbs filelight
granatier gwenview
k3b
kaddressbook kalzium kapptemplate kapman kate katomic
kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser
kdenlive kdf kdialog kdiamond
keditbookmarks
kfind kfloppy
kget kgpg
khelpcenter
kig kigo killbots kitinerary
kleopatra klettres klines
kmag kmail kmines kmix kmplot
knavalbattle knetwalk knights
kollision kolourpaint kompare konsole kontact korganizer
kpkpass
krdc kreversi krfb
kshisen ksquares ksystemlog
kteatime ktimer ktouch kturtle
kwalletmanager kwave
marble minuet
okular
picmi
spectacle
yakuake
;
inherit (plasma5)
bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
systemsettings user-manager xdg-desktop-portal-kde
;
inherit (plasma5.thirdParty)
plasma-applet-caffeine-plus
kwin-dynamic-workspaces
kwin-tiling
krohnkite
;
inherit (libsForQt5)
sddm
;

})
Loading