Unverified Commit 1e4c95f3 authored by K900's avatar K900 Committed by GitHub
Browse files

kdePackages: Plasma 6.1.5 -> 6.2 (#341487)

parents a0c9222e bf21badc

maintainers/scripts/kde/collect-missing-deps.py

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ OK_MISSING_BY_PACKAGE = { 
    },

    "kwin": {

        "display-info",  # newer versions identify as libdisplay-info

        "Libcap",  # used to call setcap at build time and nothing else

    },

    "libksysguard": {

        "Libcap",  # used to call setcap at build time and nothing else
@@ -90,6 +91,7 @@ OK_MISSING_BY_PACKAGE = { 
    },

    "powerdevil": {

        "DDCUtil",  # cursed, intentionally disabled

        "Libcap",  # used to call setcap at build time and nothing else

    },

    "print-manager": {

        "PackageKitQt6",  # used for auto-installing drivers which does not work for obvious reasons

maintainers/scripts/kde/generate-sources.py

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ mkKdeDerivation { 
'''.strip())



ROOT_TEMPLATE = jinja2.Template('''

{callPackage}: {

{ callPackage }:

{

  {%- for p in packages %}

  {{ p }} = callPackage ./{{ p }} { };

  {%- endfor %}

nixos/modules/services/desktop-managers/plasma6.nix

+2 −1
Original line number Diff line number Diff line
@@ -249,10 +249,11 @@ in { 


    xdg.portal.enable = true;

    xdg.portal.extraPortals = [

      kdePackages.kwallet

      kdePackages.xdg-desktop-portal-kde

      pkgs.xdg-desktop-portal-gtk

    ];

    xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];

    xdg.portal.configPackages = mkDefault [kdePackages.plasma-workspace];

    services.pipewire.enable = mkDefault true;



    # Enable screen reader by default

pkgs/kde/generated/licenses.json

+30 −1
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ 
    "GPL-2.0-only",

    "GPL-2.0-or-later",

    "GPL-3.0-only",

    "LGPL-2.0-or-later",

    "LicenseRef-KDE-Accepted-GPL",

    "MIT"

  ],
@@ -326,6 +327,7 @@ 
    "GPL-3.0-only",

    "LGPL-2.0-or-later",

    "LGPL-2.1-only",

    "LGPL-2.1-or-later",

    "LGPL-3.0-only",

    "LGPL-3.0-or-later",

    "LicenseRef-KDE-Accepted-GPL",
@@ -2515,6 +2517,19 @@ 
    "LicenseRef-KDE-Accepted-LGPL",

    "MIT"

  ],

  "plasma-dialer": [

    "BSD-3-Clause",

    "CC0-1.0",

    "GPL-2.0-only",

    "GPL-2.0-or-later",

    "GPL-3.0-only",

    "LGPL-2.0-or-later",

    "LGPL-2.1-only",

    "LGPL-2.1-or-later",

    "LGPL-3.0-only",

    "LicenseRef-KDE-Accepted-GPL",

    "LicenseRef-KDE-Accepted-LGPL"

  ],

  "plasma-disks": [

    "BSD-3-Clause",

    "CC0-1.0",
@@ -2646,6 +2661,7 @@ 
    "GPL-2.0-only",

    "GPL-2.0-or-later",

    "GPL-3.0-only",

    "GPL-3.0-or-later",

    "LGPL-2.0-only",

    "LGPL-2.0-or-later",

    "LGPL-2.1-only",
@@ -2662,6 +2678,7 @@ 
    "BSD-3-Clause",

    "CC0-1.0",

    "GPL-2.0-or-later",

    "LGPL-2.0-only",

    "LGPL-2.0-or-later",

    "LGPL-2.1-or-later"

  ],
@@ -2687,18 +2704,21 @@ 
    "LGPL-2.0-or-later"

  ],

  "powerdevil": [

    "BSD-2-Clause",

    "BSD-3-Clause",

    "CC0-1.0",

    "GPL-2.0-only",

    "GPL-2.0-or-later",

    "GPL-3.0-only",

    "GPL-3.0-or-later",

    "LGPL-2.0-only",

    "LGPL-2.0-or-later",

    "LGPL-2.1-only",

    "LGPL-2.1-or-later",

    "LGPL-3.0-only",

    "LicenseRef-KDE-Accepted-GPL",

    "LicenseRef-KDE-Accepted-LGPL"

    "LicenseRef-KDE-Accepted-LGPL",

    "MIT"

  ],

  "poxml": [

    "CC0-1.0"
@@ -2808,6 +2828,15 @@ 
    "LGPL-2.0-or-later",

    "LGPL-2.1-or-later"

  ],

  "spacebar": [

    "BSD-2-Clause",

    "CC0-1.0",

    "GPL-2.0-only",

    "GPL-2.0-or-later",

    "GPL-3.0-only",

    "LGPL-2.0-or-later",

    "LicenseRef-KDE-Accepted-GPL"

  ],

  "spectacle": [

    "BSD-3-Clause",

    "CC0-1.0",

pkgs/kde/generated/sources/plasma.json

+202 −192

File changed.

Preview size limit exceeded, changes collapsed.