commit b209617ff0a8f26ea1d1fe3716a7fa717a50dd95 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/i18n/input-method/ibus.nix

···

       48
       48
        
             panel = mkOption {

     

       49
       49
        
               type = with types; nullOr path;

     

       50
       50
        
               default = null;

     

       51
       51
       -
               example = literalExample "''${pkgs.plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";

     

       51
       51
       +
               example = literalExample "''${pkgs.plasma5Packages.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";

     

       52
       52
        
               description = "Replace the IBus panel with another panel.";

     

       53
       53
        
             };

     

       54
       54
        
           };

+4 -4

nixos/modules/security/pam.nix

···

       430
       430
        
                     ${optionalString cfg.pamMount

     

       431
       431
        
                       "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}

     

       432
       432
        
                     ${optionalString cfg.enableKwallet

     

       433
       433
       -
                       ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       434
       434
       -
                        " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}

     

       433
       433
       +
                       ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       434
       434
       +
                        " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}

     

       435
       435
        
                     ${optionalString cfg.enableGnomeKeyring

     

       436
       436
        
                       "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"}

     

       437
       437
        
                     ${optionalString cfg.gnupg.enable

     
···

       509
       509
        
                 ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)

     

       510
       510
        
                     "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}

     

       511
       511
        
                 ${optionalString (cfg.enableKwallet)

     

       512
       512
       -
                     ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       513
       513
       -
                      " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")}

     

       512
       512
       +
                     ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +

     

       513
       513
       +
                      " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}

     

       514
       514
        
                 ${optionalString (cfg.enableGnomeKeyring)

     

       515
       515
        
                     "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}

     

       516
       516
        
                 ${optionalString cfg.gnupg.enable

+5 -5

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       7
       7
        
         xcfg = config.services.xserver;

     

       8
       8
        
         cfg = xcfg.desktopManager.plasma5;

     

       9
       9
        
       

     

       10
       10
       -
         inherit (pkgs) kdeApplications kdeFrameworks plasma5;

     

       11
       11
       -
         inherit (pkgs) qt5 libsForQt5;

     

       10
       10
       +
         libsForQt5 = pkgs.plasma5Packages;

     

       11
       11
       +
         inherit (libsForQt5) kdeApplications kdeFrameworks plasma5;

     

       12
       12
        
         inherit (pkgs) writeText;

     

       13
       13
        
       

     

       14
       14
        
         pulseaudio = config.hardware.pulseaudio;

     
···

       198
       198
        
             };

     

       199
       199
        
       

     

       200
       200
        
             security.wrappers = {

     

       201
       201
       -
               kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";

     

       202
       202
       -
               start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";

     

       201
       201
       +
               kcheckpass.source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";

     

       202
       202
       +
               start_kdeinit.source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";

     

       203
       203
        
               kwin_wayland = {

     

       204
       204
        
                 source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";

     

       205
       205
        
                 capabilities = "cap_sys_nice+ep";

     
···

       213
       213
        
             '';

     

       214
       214
        
       

     

       215
       215
        
             environment.systemPackages =

     

       216
       216
       -
               with qt5; with libsForQt5;

     

       216
       216
       +
               with libsForQt5;

     

       217
       217
        
               with plasma5; with kdeApplications; with kdeFrameworks;

     

       218
       218
        
               [

     

       219
       219
        
                 frameworkintegration

+1 -1

nixos/modules/system/boot/plymouth.nix

···

       9
       9
        
       

     

       10
       10
        
         cfg = config.boot.plymouth;

     

       11
       11
        
       

     

       12
       12
       -
         nixosBreezePlymouth = pkgs.plasma5.breeze-plymouth.override {

     

       12
       12
       +
         nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override {

     

       13
       13
        
           logoFile = cfg.logo;

     

       14
       14
        
           logoName = "nixos";

     

       15
       15
        
           osName = "NixOS";

+2 -2

pkgs/applications/networking/browsers/firefox/wrapper.nix

···

       5
       5
        
       , flashplayer, hal-flash

     

       6
       6
        
       , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd

     

       7
       7
        
       , gnome3/*.gnome-shell*/

     

       8
       8
       -
       , browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow

     

       8
       8
       +
       , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow

     

       9
       9
        
       , tridactyl-native

     

       10
       10
        
       , fx_cast_bridge

     

       11
       11
        
       , udev

     
···

       76
       76
        
                 ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native

     

       77
       77
        
                 ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell

     

       78
       78
        
                 ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator

     

       79
       79
       -
                 ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration

     

       79
       79
       +
                 ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration

     

       80
       80
        
                 ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge

     

       81
       81
        
                 ++ extraNativeMessagingHosts

     

       82
       82
        
               );

+5 -5

pkgs/top-level/aliases.nix

···

       251
       251
        
         k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06

     

       252
       252
        
         julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15

     

       253
       253
        
         julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15

     

       254
       254
       -
         kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28

     

       254
       254
       +
         kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28

     

       255
       255
        
         kdiff3-qt5 = kdiff3; # added 2017-02-18

     

       256
       256
        
         keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02

     

       257
       257
        
         keepassx-community = keepassxc; # added 2017-11

     
···

       808
       808
        
         between mixed versions of qt. See:

     

       809
       809
        
         https://github.com/NixOS/nixpkgs/pull/101369 */

     

       810
       810
        
       

     

       811
       811
       -
         inherit (kdeFrameworks) breeze-icons oxygen-icons5;

     

       812
       812
       -
         inherit (kdeApplications)

     

       811
       811
       +
         inherit (plasma5Packages) breeze-icons oxygen-icons5;

     

       812
       812
       +
         inherit (plasma5Packages)

     

       813
       813
        
           akonadi akregator ark

     

       814
       814
        
           bomber bovo

     

       815
       815
        
           dolphin dragon

     
···

       841
       841
        
           spectacle

     

       842
       842
        
           yakuake

     

       843
       843
        
         ;

     

       844
       844
       -
         inherit (plasma5)

     

       844
       844
       +
         inherit (plasma5Packages)

     

       845
       845
        
           bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover

     

       846
       846
        
           kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5

     

       847
       847
        
           kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard

     
···

       850
       850
        
           plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm

     

       851
       851
        
           systemsettings xdg-desktop-portal-kde

     

       852
       852
        
         ;

     

       853
       853
       -
         inherit (plasma5.thirdParty)

     

       853
       853
       +
         inherit (plasma5Packages.thirdParty)

     

       854
       854
        
           plasma-applet-caffeine-plus

     

       855
       855
        
           kwin-dynamic-workspaces

     

       856
       856
        
           kwin-tiling

+4 -7

pkgs/top-level/all-packages.nix

···

       11510
       11510
        
         };

     

       11511
       11511
        
       

     

       11512
       11512
        
         # Does not actually depend on Qt 5

     

       11513
       11513
       -
         inherit (kdeFrameworks) extra-cmake-modules;

     

       11513
       11513
       +
         inherit (plasma5Packages) extra-cmake-modules;

     

       11514
       11514
        
       

     

       11515
       11515
        
         coccinelle = callPackage ../development/tools/misc/coccinelle {

     

       11516
       11516
        
           ocamlPackages = ocaml-ng.ocamlPackages_4_05;

     
···

       13920
       13920
        
       

     

       13921
       13921
        
         judy = callPackage ../development/libraries/judy { };

     

       13922
       13922
        
       

     

       13923
       13923
       -
         inherit (libsForQt5) kdeFrameworks;

     

       13924
       13924
       -
       

     

       13925
       13923
        
         keybinder = callPackage ../development/libraries/keybinder {

     

       13926
       13924
        
           automake = automake111x;

     

       13927
       13925
        
           lua = lua5_1;

     
···

       15836
       15834
        
         qt5 =        if stdenv.hostPlatform.isDarwin then qt512 else qt515;

     

       15837
       15835
        
         libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515;

     

       15838
       15836
        
       

     

       15837
       15837
       +
         # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop

     

       15838
       15838
       +
         plasma5Packages = libsForQt515;

     

       15839
       15839
       +
       

     

       15839
       15840
        
         qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };

     

       15840
       15841
        
       

     

       15841
       15842
        
         qtEnv = qt5.env;

     
···

       22444
       22445
        
       

     

       22445
       22446
        
         kapow = libsForQt5.callPackage ../applications/misc/kapow { };

     

       22446
       22447
        
       

     

       22447
       22447
       -
         inherit (libsForQt514) kdeApplications;

     

       22448
       22448
       -
       

     

       22449
       22448
        
         okteta = libsForQt5.callPackage ../applications/editors/okteta { };

     

       22450
       22449
        
       

     

       22451
       22450
        
         k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };

     
···

       26731
       26730
        
         mate = recurseIntoAttrs (callPackage ../desktops/mate { });

     

       26732
       26731
        
       

     

       26733
       26732
        
         pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });

     

       26734
       26734
       -
       

     

       26735
       26735
       -
         inherit (libsForQt5) plasma5;

     

       26736
       26733
        
       

     

       26737
       26734
        
         plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };

     

       26738
       26735