JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #165868 from LibreCybernetics/remove-python2-dependencies-from-gnome

Browse Source
This commit is contained in:
Sandro 2022-03-28 14:38:17 +02:00 committed by GitHub
commit 44fe73efbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -690,6 +690,13 @@
before, you will need to have it enabled using GSettings. before, you will need to have it enabled using GSettings.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>services.telepathy</literal> will no longer be
enabled by default for GNOME desktops, one should enable it in
their configs if using Empathy or Polari.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
If you previously used If you previously used

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -279,6 +279,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings. - `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings.
- `services.telepathy` will no longer be enabled by default for GNOME desktops, one should enable it in their configs if using Empathy or Polari.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. - Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected.

1
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -386,7 +386,6 @@ in
services.gnome.rygel.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true;
services.gvfs.enable = true; services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true;
systemd.packages = with pkgs.gnome; [ systemd.packages = with pkgs.gnome; [
gnome-session gnome-session

5
pkgs/desktops/gnome/core/gnome-keyring/default.nix
View File

@ -5,7 +5,7 @@
, dbus , dbus
, libgcrypt , libgcrypt
, pam , pam
, python2 , python3
, glib , glib
, libxslt , libxslt
, gettext , gettext
@ -51,8 +51,7 @@ stdenv.mkDerivation rec {
p11-kit p11-kit
]; ];
# In 3.20.1, tests do not support Python 3 checkInputs = [ dbus python3 ];
checkInputs = [ dbus python2 ];
configureFlags = [ configureFlags = [
"--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories