Unverified Commit 34d17db7 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #293690 from K900/plasma-6.0.1 

Plasma 6.0.1
parents 4f823431 35f59cc7

maintainers/scripts/kde/generate-sources.py

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path): 


    set_dir.mkdir(parents=True, exist_ok=True)

    with (set_dir / "default.nix").open("w") as fd:

        fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n")

        fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n")



    sources_dir = generated_dir / "sources"

    sources_dir.mkdir(parents=True, exist_ok=True)

pkgs/kde/generated/sources/plasma.json

+193 −193

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/kde/plasma/breeze-gtk/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -10,5 +10,10 @@ mkKdeDerivation { 
  # FIXME(later): upstream

  patches = [./0001-fix-add-executable-bit.patch];



  # FIXME: hack to fix build, remove for 6.0.2

  postPatch = ''

    substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0"

  '';



  extraNativeBuildInputs = [sass python3 python3Packages.pycairo];

}

pkgs/kde/plasma/breeze-plymouth/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ in 
      postPatch =

        ''

          substituteInPlace cmake/FindPlymouth.cmake --subst-var out



          # FIXME: hack to fix build, remove for 6.0.2

          substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0"

        ''

        + lib.optionalString (logoFile != null) ''

          cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png

pkgs/kde/plasma/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
  flatpak-kcm = callPackage ./flatpak-kcm {};

  kactivitymanagerd = callPackage ./kactivitymanagerd {};

  kde-cli-tools = callPackage ./kde-cli-tools {};

  kdecoration = callPackage ./kdecoration {};

  kde-gtk-config = callPackage ./kde-gtk-config {};

  kdecoration = callPackage ./kdecoration {};

  kdeplasma-addons = callPackage ./kdeplasma-addons {};

  kgamma = callPackage ./kgamma {};

  kglobalacceld = callPackage ./kglobalacceld {};
@@ -34,7 +34,6 @@ 
  ocean-sound-theme = callPackage ./ocean-sound-theme {};

  oxygen = callPackage ./oxygen {};

  oxygen-sounds = callPackage ./oxygen-sounds {};

  plasma5support = callPackage ./plasma5support {};

  plasma-activities = callPackage ./plasma-activities {};

  plasma-activities-stats = callPackage ./plasma-activities-stats {};

  plasma-browser-integration = callPackage ./plasma-browser-integration {};
@@ -53,6 +52,7 @@ 
  plasma-welcome = callPackage ./plasma-welcome {};

  plasma-workspace = callPackage ./plasma-workspace {};

  plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {};

  plasma5support = callPackage ./plasma5support {};

  plymouth-kcm = callPackage ./plymouth-kcm {};

  polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {};

  powerdevil = callPackage ./powerdevil {};