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: 24f73573e52c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10a0a23c4f0e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 20, 2019

  1. konsole: add missing kglobalaccel

    @FRidh
    FRidh committed Nov 20, 2019
    Copy the full SHA
    7232ea4 View commit details

  2. yakuake: add missing kglobalaccel

    @FRidh
    FRidh committed Nov 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    targos Michaël Zasso
    GPG key ID: 770F7A9A5AE15600
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88dc84c View commit details

Commits on Nov 24, 2019

  1. Merge pull request #73756 from FRidh/kde5 

    WIP KDE5: fix breakage due to set -u changes
    @Ericson2314
    Ericson2314 authored Nov 24, 2019
    Copy the full SHA
    10a0a23 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 pkgs/applications/kde/konsole.nix
  2. +2 −2 pkgs/applications/kde/yakuake.nix
3 changes: 2 additions & 1 deletion pkgs/applications/kde/konsole.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
kwindowsystem, kxmlgui, qtscript, knewstuff
kwindowsystem, kxmlgui, qtscript, knewstuff, kglobalaccel
}:

mkDerivation {
@@ -18,6 +18,7 @@ mkDerivation {
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
kglobalaccel
];

propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
4 changes: 2 additions & 2 deletions pkgs/applications/kde/yakuake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
mkDerivation, lib, kdoctools, extra-cmake-modules,
karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras, kglobalaccel
}:

mkDerivation {
name = "yakuake";

buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
knotifyconfig kparts kwindowsystem qtx11extras
knotifyconfig kparts kwindowsystem qtx11extras kglobalaccel
];

propagatedBuildInputs = [