diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 5e51bda47d68..2a9912f269fc 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -170,7 +170,7 @@ - `meilisearch_1_11` has been removed, as it is no longer supported. -- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`. +- `budgie-desktop` has been updated [10.9.4](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.4). This changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie` and contains ABI bumps for libpeas2 migration. - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index f2c93edc49b6..d050b32d7ff1 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -8,6 +8,7 @@ vala, budgie-desktop, gtk3, + gtk-layer-shell, libpeas2, nix-update-script, }: @@ -33,15 +34,22 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ budgie-desktop gtk3 + gtk-layer-shell libpeas2 ]; postPatch = '' - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')" + # 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 { }; }; diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 8e14de959279..ac014cfcd01a 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -48,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.3-unstable-2025-09-13"; + version = "10.9.4"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; - rev = "68d5136613fa1b15d39cc67ada3085590ec162ae"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs="; + hash = "sha256-e1kkmzSYX8TwiY0IIZYIK/FgMbZ/8PqkUn8pk3CcXHU="; }; outputs = [ @@ -147,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: { teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; pkgConfigModules = [ - "budgie-1.0" - "budgie-raven-plugin-1.0" + "budgie-2.0" + "budgie-raven-plugin-2.0" "budgie-theme-1.0" ]; }; diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 9e2f0419ae0c..4e42ee0e6482 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -43,12 +43,18 @@ stdenv.mkDerivation (finalAttrs: { requests ]; + mesonFlags = [ + # The meson option actually enables libpeas2 support + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + "-Dfor-wayland=true" + ]; + postPatch = '' substituteInPlace meson.build --replace-fail "/usr" "$out" - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace budgie-media-player-applet.plugin.in \ - --replace-fail "Loader=@PYTHON@" "Loader=python" + # https://github.com/zalesyc/budgie-media-player-applet/issues/25 + substituteInPlace src/{applet,testWin,Popover,BudgieMediaPlayer}.py \ + --replace-fail "gi.require_version('Budgie', '1.0')" "gi.require_version('Budgie', '2.0')" ''; postFixup = '' diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix index 14ca2c0c4188..462a6daa5bf8 100644 --- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + # https://github.com/prateekmedia/budgie-systemmonitor-applet/issues/4 substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" + --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" \ + --replace-fail "dependency('budgie-1.0', version: '>= 2')" "dependency('budgie-2.0')" ''; passthru = { diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix index 4c398702469d..1da60058ec24 100644 --- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix +++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-user-indicator-redux"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "EbonJaeger"; repo = "budgie-user-indicator-redux"; - rev = "v${finalAttrs.version}"; - hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZvT114F0g+3zpskyb4Bn6grAXHWtMqRqb9MzfF0WLQ8="; }; nativeBuildInputs = [ @@ -44,12 +44,6 @@ stdenv.mkDerivation (finalAttrs: { sassc ]; - postPatch = '' - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')" - ''; - passthru = { updateScript = nix-update-script { }; };