Unverified Commit fa6cf37d authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Budgie 10.10 (#478923)

parents 3dff79f9 97734f31

nixos/doc/manual/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>. 


- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.



- Budgie has been updated to 10.10, please check the [upstream announcement](https://buddiesofbudgie.org/blog/budgie-10-10-released) for more details.



- `services.frp` now supports multiple instances through `services.frp.instances` to make it possible to run multiple frp clients or servers at the same time.



- `hyphen` now supports over 40 language variants through `hyphenDicts` and now allows to enable all supported languages through `hyphenDicts.all`.

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

+18 −9
Original line number Diff line number Diff line
@@ -156,15 +156,19 @@ in 
      fi

    '';



    # https://docs.buddiesofbudgie.org/10.10/developer/workflow/building-budgie-desktop/#compositor-recommendations

    programs.labwc.enable = mkDefault true;

    programs.gtklock.enable = mkDefault true;



    environment.systemPackages =

      with pkgs;

      [

        # Budgie Desktop.

        budgie-backgrounds

        budgie-control-center'

        budgie-desktop-services

        (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })

        budgie-desktop-view

        budgie-screensaver

        budgie-session



        # Required by Budgie Menu.
@@ -190,6 +194,17 @@ in 
        mate.mate-system-monitor

        vlc



        # Supplemental tooling.

        # See budgie-desktop's with-runtime-dependencies meson option.

        gammastep

        grim

        killall

        slurp

        swaybg

        swayidle

        wdisplays

        wlopm



        # Desktop themes.

        qogir-theme

        qogir-icon-theme
@@ -224,9 +239,6 @@ in 
    services.xserver.updateDbusEnvironment = true;

    programs.dconf.enable = true;



    # Required by Budgie Screensaver.

    security.pam.services.budgie-screensaver = { };



    # Required by Budgie's Polkit Dialog.

    security.polkit.enable = mkDefault true;
@@ -240,6 +252,7 @@ in 
    xdg.portal.enable = mkDefault true; # for BCC's Applications panel.

    xdg.portal.extraPortals = with pkgs; [

      xdg-desktop-portal-gtk # provides a XDG Portals implementation.

      xdg-desktop-portal-wlr # for screenshot and screencast.

    ];

    xdg.portal.configPackages = mkDefault [ pkgs.budgie-desktop ];
@@ -274,11 +287,7 @@ in 
    # Register packages for DBus.

    services.dbus.packages = [

      budgie-control-center'

    ];



    # Register packages for udev.

    services.udev.packages = with pkgs; [

      magpie

      pkgs.budgie-desktop-services

    ];



    # Shell integration for MATE Terminal.

nixos/tests/budgie.nix

+21 −26
Original line number Diff line number Diff line
@@ -29,37 +29,38 @@ 
          pkgs.budgie-analogue-clock-applet

        ];

      };



      environment.systemPackages = [ pkgs.wlrctl ];

    };



  enableOCR = true;



  testScript =

    { nodes, ... }:

    let

      user = nodes.machine.users.users.alice;

      env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0";

      su = command: "su - ${user.name} -c '${env} ${command}'";

      env = "XDG_RUNTIME_DIR=/run/user/${toString user.uid}";

    in

    ''

      with subtest("Wait for login"):

          machine.wait_for_x()

          machine.wait_for_unit("display-manager.service")

          machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")

          machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')

          machine.wait_for_file("${user.home}/.Xauthority")

          machine.succeed("xauth merge ${user.home}/.Xauthority")

          machine.wait_until_succeeds('journalctl --grep "Compositor is fully initialized"')



      with subtest("Check that logging in has given the user ownership of devices"):

          # Change back to /dev/snd/timer after systemd-258.1

          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")



      with subtest("Check if Budgie session components actually start"):

          for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]:

          for i in ["budgie-daemon", "budgie-panel", "labwc", "budgie-session", "swaybg", "swayidle"]:

              machine.wait_until_succeeds(f"pgrep {i}")

          machine.wait_until_succeeds("pgrep -xf ${pkgs.gnome-settings-daemon}/libexec/gsd-sound")

          machine.wait_until_succeeds("pgrep -xf ${pkgs.budgie-desktop-services}/bin/org.buddiesofbudgie.Services")

          machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view")

          # We don't check xwininfo for budgie-wm.

          # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754

          machine.wait_for_window("budgie-daemon")

          machine.wait_for_window("budgie-panel")



      with subtest("Check if various environment variables are set"):

          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"

          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-panel)/environ"

          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'")

          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")

          # From the nixos/budgie module
@@ -67,28 +68,22 @@ 


      with subtest("Open run dialog"):

          machine.send_key("alt-f2")

          machine.wait_for_window("budgie-run-dialog")

          machine.wait_until_succeeds("pgrep -xf budgie-run-dialog")

          machine.sleep(2)

          machine.screenshot("run_dialog")

          machine.send_key("esc")



      with subtest("Open Budgie Control Center"):

          machine.succeed("${su "budgie-control-center >&2 &"}")

          machine.wait_for_window("Budgie Control Center")



      with subtest("Lock the screen"):

          machine.succeed("${su "budgie-screensaver-command -l >&2 &"}")

          machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is active'")

          machine.sleep(2)

          machine.send_chars("${user.password}", delay=0.5)

          machine.screenshot("budgie_screensaver")

          machine.send_chars("\n")

          machine.wait_until_succeeds("${su "budgie-screensaver-command -q"} | grep 'The screensaver is inactive'")

          machine.sleep(2)

          machine.succeed("su - ${user.name} -c '${env} budgie-control-center >&2 &'")

          machine.wait_until_succeeds("su - ${user.name} -c '${env} wlrctl toplevel list | grep org.buddiesofbudgie.ControlCenter'")

          machine.wait_for_text("Network|Ethernet|Control|Connected")



      with subtest("Open GNOME terminal"):

          machine.succeed("${su "gnome-terminal"}")

          machine.wait_for_window("${user.name}@machine: ~")

          machine.succeed("su - ${user.name} -c '${env} gnome-terminal >&2 &'")

          machine.wait_until_succeeds("su - ${user.name} -c '${env} wlrctl toplevel list | grep ${user.name}@machine'")



      with subtest("Check if labwc bridge is working"):

          machine.wait_until_succeeds("cat /home/${user.name}/.config/budgie-desktop/labwc/rc.xml | grep Qogir")



      with subtest("Check if Budgie has ever coredumped"):

          machine.fail("coredumpctl --json=short | grep budgie")

pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix

+3 −15
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "budgie-analogue-clock-applet";

  version = "2.2";

  version = "2.2-unstable-2026-01-13";



  src = fetchFromGitHub {

    owner = "samlane-ma";

    repo = "analogue-clock-applet";

    rev = "v${finalAttrs.version}";

    hash = "sha256-8kqDEzcUqg/TvwpazYQt1oQDVC00fOxFLVsKYMDuV9I=";

    rev = "22b04faeea8f95eb83ad96ae89529560811d76d9";

    hash = "sha256-8ZFExgE1aJ8XN4+ugSzI34UjdPHbtbhJ+3xetcLZ6sg=";

  };



  nativeBuildInputs = [
@@ -38,18 +38,6 @@ stdenv.mkDerivation (finalAttrs: { 
    libpeas2

  ];



  postPatch = ''

    # https://github.com/samlane-ma/analogue-clock-applet/issues/7

    substituteInPlace budgie-analogue-clock-widget/src/meson.build \

      --replace-fail "dependency('budgie-raven-plugin-1.0')" "dependency('budgie-raven-plugin-2.0')"

  '';



  mesonFlags = [

    # The meson option actually enables libpeas2 support

    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749

    "-Dfor-wayland=true"

  ];



  passthru = {

    updateScript = nix-update-script { };

  };

pkgs/by-name/bu/budgie-control-center/introduction.list

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Introduction panel default applications

# This file contains full paths to .desktop files to display

# Lines starting with # are comments

@wdisplays@/share/applications/network.cycles.wdisplays.desktop

@budgie_desktop@/share/applications/org.buddiesofbudgie.BudgieDesktopSettings.desktop