commit 3d2f1c5501a633ee28e63426c4caed2e79a0ac1d · pyrox.dev/nixpkgs

+2

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

···

       208
       208
        
       

     

       209
       209
        
       - `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.

     

       210
       210
        
       

     

       211
       211
       +
       - mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.

     

       212
       212
       +
       

     

       211
       213
        
       - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.

     

       212
       214
        
       

     

       213
       215
        
       - Revamp of the ACME certificate acquisication and renewal process to help scale systems with lots (100+) of certificates.

-1

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

···

       114
       114
        
           })

     

       115
       115
        
           (mkIf cfg.enableWaylandSession {

     

       116
       116
        
             programs.wayfire.enable = true;

     

       117
       117
       -
             programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ];

     

       118
       117
        
       

     

       119
       118
        
             environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${pkgs.mate.mate-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

     

       120
       119

+1 -1

nixos/tests/mate-wayland.nix

···

       56
       56
        
                 machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")

     

       57
       57
        
       

     

       58
       58
        
             with subtest("Check if Wayfire config is properly configured"):

     

       59
       59
       -
                 for i in ["button_style = mate", "firedecor", "mate-wayland-components.sh"]:

     

       59
       59
       +
                 for i in ["autostart_wf_shell = false", "mate-wayland-components.sh"]:

     

       60
       60
        
                     machine.wait_until_succeeds(f"cat /home/${user.name}/.config/mate/wayfire.ini | grep '{i}'")

     

       61
       61
        
       

     

       62
       62
        
             with subtest("Check if Wayfire has ever coredumped"):

-66

pkgs/applications/window-managers/wayfire/firedecor.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         meson,

     

       6
       6
       -
         ninja,

     

       7
       7
       -
         pkg-config,

     

       8
       8
       -
         boost,

     

       9
       9
       -
         glib,

     

       10
       10
       -
         libGL,

     

       11
       11
       -
         libinput,

     

       12
       12
       -
         librsvg,

     

       13
       13
       -
         libxkbcommon,

     

       14
       14
       -
         udev,

     

       15
       15
       -
         wayfire,

     

       16
       16
       -
         xcbutilwm,

     

       17
       17
       -
         mate,

     

       18
       18
       -
       }:

     

       19
       19
       -
       

     

       20
       20
       -
       stdenv.mkDerivation (finalAttrs: {

     

       21
       21
       -
         pname = "firedecor";

     

       22
       22
       -
         version = "2023-10-23";

     

       23
       23
       -
       

     

       24
       24
       -
         src = fetchFromGitHub {

     

       25
       25
       -
           owner = "mntmn";

     

       26
       26
       -
           repo = "Firedecor";

     

       27
       27
       -
           rev = finalAttrs.version;

     

       28
       28
       -
           hash = "sha256-7or8HkmIZnLpXEZzUhJ3u8SIPfIQFgn32Ju/5OzK06Y=";

     

       29
       29
       -
         };

     

       30
       30
       -
       

     

       31
       31
       -
         nativeBuildInputs = [

     

       32
       32
       -
           meson

     

       33
       33
       -
           ninja

     

       34
       34
       -
           pkg-config

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         buildInputs = [

     

       38
       38
       -
           boost

     

       39
       39
       -
           glib

     

       40
       40
       -
           libGL

     

       41
       41
       -
           libinput

     

       42
       42
       -
           librsvg

     

       43
       43
       -
           libxkbcommon

     

       44
       44
       -
           udev

     

       45
       45
       -
           wayfire

     

       46
       46
       -
           xcbutilwm

     

       47
       47
       -
         ];

     

       48
       48
       -
       

     

       49
       49
       -
         postPatch = ''

     

       50
       50
       -
           substituteInPlace src/firedecor-theme.cpp \

     

       51
       51
       -
             --replace-fail "/usr/share" "/run/current-system/sw/share"

     

       52
       52
       -
         '';

     

       53
       53
       -
       

     

       54
       54
       -
         env = {

     

       55
       55
       -
           PKG_CONFIG_WAYFIRE_PLUGINDIR = "${placeholder "out"}/lib/wayfire";

     

       56
       56
       -
           PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata";

     

       57
       57
       -
         };

     

       58
       58
       -
       

     

       59
       59
       -
         meta = with lib; {

     

       60
       60
       -
           homepage = "https://github.com/mntmn/Firedecor";

     

       61
       61
       -
           description = "Advanced window decoration plugin for the Wayfire window manager";

     

       62
       62
       -
           license = licenses.mit;

     

       63
       63
       -
           inherit (mate.mate-wayland-session.meta) teams;

     

       64
       64
       -
           inherit (wayfire.meta) platforms;

     

       65
       65
       -
         };

     

       66
       66
       -
       })

+8 -2

pkgs/applications/window-managers/wayfire/plugins.nix

···

       1
       1
       -
       { lib, pkgs }:

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
       }:

     

       2
       6
        
       

     

       3
       7
        
       lib.makeScope pkgs.newScope (

     

       4
       8
        
         self:

     
···

       6
       10
        
           inherit (self) callPackage;

     

       7
       11
        
         in

     

       8
       12
        
         {

     

       9
       9
       -
           firedecor = callPackage ./firedecor.nix { };

     

       10
       13
        
           focus-request = callPackage ./focus-request.nix { };

     

       11
       14
        
           wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { };

     

       12
       15
        
           wayfire-shadows = callPackage ./wayfire-shadows.nix { };

     
···

       16
       19
        
           wwp-switcher = callPackage ./wwp-switcher.nix { };

     

       17
       20
        
         }

     

       18
       21
        
       )

     

       22
       22
       +
       // lib.optionalAttrs config.allowAliases {

     

       23
       23
       +
         firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03

     

       24
       24
       +
       }

+10

pkgs/desktops/mate/caja/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         pkg-config,

     

       6
       7
        
         gettext,

     

       7
       8
        
         gtk-layer-shell,

     
···

       25
       26
        
           url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       26
       27
        
           sha256 = "HjAUzhRVgX7C73TQnv37aDXYo3LtmhbvtZGe97ghlXo=";

     

       27
       28
        
         };

     

       29
       29
       +
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           # wayland: ensure windows can be moved if compositor is using CSD

     

       32
       32
       +
           # https://github.com/mate-desktop/caja/pull/1787

     

       33
       33
       +
           (fetchpatch {

     

       34
       34
       +
             url = "https://github.com/mate-desktop/caja/commit/b0fb727c62ef9f45865d5d7974df7b79bcf0d133.patch";

     

       35
       35
       +
             hash = "sha256-2QAXveJnrPPyFSBST6wQcXz9PRsJVdt4iSYy0gubDAs=";

     

       36
       36
       +
           })

     

       37
       37
       +
         ];

     

       28
       38
        
       

     

       29
       39
        
         nativeBuildInputs = [

     

       30
       40
        
           pkg-config

+5 -8

pkgs/desktops/mate/mate-wayland-session/default.nix

···

       7
       7
        
         glib,

     

       8
       8
        
         mate-polkit,

     

       9
       9
        
         mate-notification-daemon,

     

       10
       10
       +
         mate-settings-daemon,

     

       10
       11
        
         wayfire,

     

       11
       11
       -
         wayfirePlugins,

     

       12
       12
        
         gitUpdater,

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       stdenvNoCC.mkDerivation rec {

     

       16
       16
        
         pname = "mate-wayland-session";

     

       17
       17
       -
         version = "1.28.3";

     

       17
       17
       +
         version = "1.28.4";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "mate-desktop";

     

       21
       21
        
           repo = "mate-wayland-session";

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           hash = "sha256-sUAq2BylsvjYn8Lt+nm4yIfVhzIEefxKZYnhJnuxjs0=";

     

       23
       23
       +
           hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     
···

       33
       33
        
           substituteInPlace session/mate-wayland-components.sh \

     

       34
       34
        
             --replace-fail "polkit-mate-authentication-agent-1" "${mate-polkit}/libexec/polkit-mate-authentication-agent-1" \

     

       35
       35
        
             --replace-fail "mate-notification-daemon" "${mate-notification-daemon}/libexec/mate-notification-daemon" \

     

       36
       36
       +
             --replace-fail "mate-settings-daemon" "${mate-settings-daemon}/libexec/mate-settings-daemon" \

     

       36
       37
        
             --replace-fail "cat /usr/bin/blueman-applet" "command -v blueman-applet" \

     

       37
       38
        
             --replace-fail "cat /usr/bin/gnome-keyring-daemon" "command -v gnome-keyring-daemon"

     

       38
       39
        
       

     

       39
       39
       -
           # Ensure wayfire.ini is writable, as this script tries to modify it later.

     

       40
       40
        
           substituteInPlace session/mate-wayland.sh \

     

       41
       41
       -
             --replace-fail "cp /usr/share/doc/wayfire/examples/wayfire.ini" "cp --no-preserve=mode,ownership ${wayfire.src}/wayfire.ini" \

     

       42
       42
       -
             --replace-fail "/usr/share/doc/wayfire/examples/wayfire.ini" "${wayfire.src}/wayfire.ini" \

     

       43
       43
       -
             --replace-fail "/usr/lib/x86_64-linux-gnu/wayfire/libfiredecor.so" "${wayfirePlugins.firedecor}/lib/wayfire/libfiredecor.so" \

     

       44
       44
       -
             --replace-fail "/usr/share/doc/firedecor/firedecor.config" "$out/share/doc/firedecor/firedecor.config"

     

       41
       41
       +
             --replace-fail "/usr/share/doc/wayfire/examples/wayfire.ini" "${wayfire.src}/wayfire.ini"

     

       45
       42
        
         '';

     

       46
       43
        
       

     

       47
       44
        
         passthru = {