Merge master into staging-next

nixos/modules/module-list.nix

@@ -196,6 +196,7 @@
  ./programs/fzf.nix
  ./programs/gamemode.nix
  ./programs/gamescope.nix
+ ./programs/gdk-pixbuf.nix
  ./programs/geary.nix
  ./programs/git.nix
  ./programs/gnome-disks.nix
@@ -1497,7 +1498,6 @@
  ./services/x11/display-managers/xpra.nix
  ./services/x11/extra-layouts.nix
  ./services/x11/fractalart.nix
- ./services/x11/gdk-pixbuf.nix
  ./services/x11/hardware/cmt.nix
  ./services/x11/hardware/digimend.nix
  ./services/x11/hardware/synaptics.nix

nixos/modules/services/x11/gdk-pixbuf.nix → nixos/modules/programs/gdk-pixbuf.nix

@@ -1,16 +1,20 @@
 { config, lib, pkgs, ... }:
 
 let
- cfg = config.services.xserver.gdk-pixbuf;
+ cfg = config.programs.gdk-pixbuf;
 
  loadersCache = pkgs.gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
- extraLoaders = lib.unique (cfg.modulePackages);
+ extraLoaders = lib.unique cfg.modulePackages;
  };
 in
 
 {
+ imports = [
+ (lib.mkRenamedOptionModule [ "services" "xserver" "gdk-pixbuf" ] [ "programs" "gdk-pixbuf" ])
+ ];
+
  options = {
- services.xserver.gdk-pixbuf.modulePackages = lib.mkOption {
+ programs.gdk-pixbuf.modulePackages = lib.mkOption {
  type = lib.types.listOf lib.types.package;
  default = [ ];
  description = "Packages providing GDK-Pixbuf modules, for cache generation.";
@@ -22,7 +26,7 @@ in
  # GDK_PIXBUF_MODULE_FILE to point to it.
  config = lib.mkIf (cfg.modulePackages != []) {
  environment.sessionVariables = {
- GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
+ GDK_PIXBUF_MODULE_FILE = loadersCache;
  };
  };
 }

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

@@ -202,7 +202,7 @@ in {
  environment.sessionVariables.KPACKAGE_DEP_RESOLVERS_PATH = "${kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers";
 
  # Enable GTK applications to load SVG icons
- services.xserver.gdk-pixbuf.modulePackages = [pkgs.librsvg];
+ programs.gdk-pixbuf.modulePackages = [pkgs.librsvg];
 
  fonts.packages = [cfg.notoPackage pkgs.hack-font];
  fonts.fontconfig.defaultFonts = {

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

@@ -327,7 +327,7 @@ in
  };
 
  # Enable GTK applications to load SVG icons
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+ programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 
  fonts.packages = with pkgs; [ cfg.notoPackage hack-font ];
  fonts.fontconfig.defaultFonts = {

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

@@ -153,7 +153,7 @@ in
  }];
 
  services.xserver.updateDbusEnvironment = true;
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+ programs.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 
  # Enable helpful DBus services.
  services.udisks2.enable = true;

pkgs/applications/networking/remote/vmware-horizon-client/update.sh

@@ -2,13 +2,13 @@
 #!nix-shell -p curl -p jq -p common-updater-scripts -i bash
 set -e
 
-entryPointURL='https://customerconnect.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY'
+entryPointURL='https://customerconnect.omnissa.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY'
 
 function getTarballMetaUrl {
  curl "$entryPointURL" | jq -r '
  .dlgEditionsLists | .[] | select(.name | contains("Client for Linux")) |
  .dlgList | .[] | select(.name | contains("tarball version")) |
- @uri "https://customerconnect.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)"
+ @uri "https://customerconnect.omnissa.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)"
  '
 }
 

pkgs/applications/office/planify/default.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
  pname = "planify";
- version = "4.8";
+ version = "4.8.2";
 
  src = fetchFromGitHub {
  owner = "alainm23";
  repo = "planify";
  rev = version;
- hash = "sha256-uzZYrn1nbDoLSYyO1Y2YJk35+1WfVckSgGproaHKTOQ=";
+ hash = "sha256-IwFA/4QGfkMYbuUxbg3/jkrud0MUlEjtkYtCLy+3emc=";
  };
 
  nativeBuildInputs = [

pkgs/tools/networking/getmail6/default.nix → pkgs/by-name/ge/getmail6/package.nix

@@ -5,17 +5,17 @@
 
 python3.pkgs.buildPythonApplication rec {
  pname = "getmail6";
- version = "6.18.14";
+ version = "6.19.00";
  pyproject = true;
 
  src = fetchFromGitHub {
  owner = "getmail6";
  repo = "getmail6";
  rev = "refs/tags/v${version}";
- hash = "sha256-NcUGIddbIjwMyE/6fR8lqs90/chzqROQDftF/cNkxOs=";
+ hash = "sha256-cAho0fAvxUoxKrvS7XJaKYGEGgtA8Xl6dOEtVtUvK10=";
  };
 
- nativeBuildInputs = with python3.pkgs; [
+ build-system = with python3.pkgs; [
  setuptools
  ];
 

pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-shell-extension-EasyScreenCast";
- version = "1.7.1";
+ version = "1.9.0";
 
  src = fetchFromGitHub {
  owner = "EasyScreenCast";
  repo = "EasyScreenCast";
  rev = finalAttrs.version;
- hash = "sha256-G7wdRFA0qL+6inVRLAmKoP0E0IOyvlmQIUwbDv/DbLI=";
+ hash = "sha256-rRRMFAdWseTxW6W194TE3yNlnpPX7gLViLPLQW6zuSI=";
  };
 
  patches = [
@@ -32,6 +32,5 @@ stdenv.mkDerivation (finalAttrs: {
  license = licenses.gpl3Plus;
  maintainers = with maintainers; [ doronbehar ];
  platforms = platforms.linux;
- broken = true;
  };
 })

pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch

@@ -1,19 +1,32 @@
-diff --git a/prefs.js b/prefs.js
-index 97b85a3..2fc6539 100644
---- a/prefs.js
-+++ b/prefs.js
-@@ -14,8 +14,8 @@
+diff --git i/extension.js w/extension.js
+index c151057..1b6dfc3 100644
+--- i/extension.js
++++ w/extension.js
+@@ -717,7 +717,7 @@ const EasyScreenCastIndicator = GObject.registerClass({
+ Lib.TalkativeLog('-*-execute post command');
+
+ // launch cmd after registration
+- const tmpCmd = `/usr/bin/sh -c "${this._settings.getOption('s', Settings.POST_CMD_SETTING_KEY)}"`;
++ const tmpCmd = `/bin/sh -c "${this._settings.getOption('s', Settings.POST_CMD_SETTING_KEY)}"`;
+
+ const mapObj = {
+ _fpath: pathFile,
+diff --git i/prefs.js w/prefs.js
+index e0dd1a2..9dcb87a 100644
+--- i/prefs.js
++++ w/prefs.js
+@@ -13,8 +13,8 @@
  'use strict';
 
- const GIRepository = imports.gi.GIRepository;
+ import GIRepository from 'gi:https://GIRepository';
 -GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell');
 -GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell');
 +GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell');
 +GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell');
 
- const GObject = imports.gi.GObject;
- const Gio = imports.gi.Gio;
-@@ -746,7 +746,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
+ import Adw from 'gi:https://Adw';
+ import GObject from 'gi:https://GObject';
+@@ -713,7 +713,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
  Lib.TalkativeLog('-^-NOT SET xdg-user video');
 
  ctx.CtrlExe.Execute(
@@ -22,19 +35,29 @@ index 97b85a3..2fc6539 100644
  true,
  (success, out) => {
  Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`);
-diff --git a/utilaudio.js b/utilaudio.js
-index 957eda2..84af241 100644
---- a/utilaudio.js
-+++ b/utilaudio.js
-@@ -15,10 +15,7 @@
-
- const GObject = imports.gi.GObject;
- const GIRepository = imports.gi.GIRepository;
+@@ -883,7 +883,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
+ );
+
+ ctx.CtrlExe.Execute(
+- 'journalctl /usr/bin/gnome-shell --since "15 min ago" --output=cat --no-pager',
++ 'journalctl @gnomeShell@/bin/.gnome-shell-wrapped --since "15 min ago" --output=cat --no-pager',
+ false,
+ success => {
+ Lib.TalkativeLog(`-^-CALLBACK async S= ${success}`);
+diff --git i/utilaudio.js w/utilaudio.js
+index b07e181..ed7d3ba 100644
+--- i/utilaudio.js
++++ w/utilaudio.js
+@@ -14,10 +14,8 @@
+
+ import GObject from 'gi:https://GObject';
+ import GIRepository from 'gi:https://GIRepository';
 -GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell');
 -GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell');
 -GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell');
 -GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell');
-+GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell");
- const Gvc = imports.gi.Gvc;
++GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell');
++GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell');
+ import Gvc from 'gi:https://Gvc';
 
- const ExtensionUtils = imports.misc.extensionUtils;
+ import * as Lib from './convenience.js';

pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix

@@ -4,54 +4,45 @@
 , nix-update-script
 , pkg-config
 , meson
-, python3
 , ninja
 , vala
-, desktop-file-utils
-, gtk3
-, granite
+, gtk4
+, granite7
+, libadwaita
 , libgee
-, libhandy
-, gcr
-, webkitgtk_4_1
-, wrapGAppsHook3
+, gcr_4
+, webkitgtk_6_0
+, wrapGAppsHook4
 }:
 
 stdenv.mkDerivation rec {
  pname = "elementary-capnet-assist";
- version = "2.4.4";
+ version = "8.0.0";
 
  src = fetchFromGitHub {
  owner = "elementary";
  repo = "capnet-assist";
  rev = version;
- sha256 = "sha256-vnFrGHt/rtrDmXokYRoebVpNLfkZPe5IShRsXCWWsXs=";
+ sha256 = "sha256-xYywiI8hFjS7ODEhLGVwrlAY8I0pvUHfg6UkDhUsglU=";
  };
 
  nativeBuildInputs = [
- desktop-file-utils
  meson
  ninja
  pkg-config
- python3
  vala
- wrapGAppsHook3
+ wrapGAppsHook4
  ];
 
  buildInputs = [
- gcr
- granite
- gtk3
+ gcr_4
+ granite7
+ gtk4
+ libadwaita
  libgee
- libhandy
- webkitgtk_4_1
+ webkitgtk_6_0
  ];
 
- postPatch = ''
- chmod +x meson/post_install.py
- patchShebangs meson/post_install.py
- '';
-
  passthru = {
  updateScript = nix-update-script { };
  };

pkgs/tools/audio/beets/builtin-plugins.nix

@@ -1,6 +1,5 @@
 { stdenv
 , aacgain
-, essentia-extractor
 , ffmpeg
 , flac
 , imagemagick
@@ -16,6 +15,7 @@
  deprecated = true;
  testPaths = [ ];
  };
+
  acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ];
  albumtypes = { };
  aura = {
@@ -87,7 +87,7 @@
  mbcollection.testPaths = [ ];
  mbsubmit = { };
  mbsync = { };
- metasync = { };
+ metasync.testPaths = [ ];
  missing.testPaths = [ ];
  mpdstats.propagatedBuildInputs = [ python3Packages.mpd2 ];
  mpdupdate = {
@@ -119,12 +119,10 @@
  propagatedBuildInputs = with python3Packages; [ pillow pyxdg ];
  wrapperBins = [ imagemagick ];
  };
- types.testPaths = [ "test/test_types_plugin.py" ];
+ types.testPaths = [ "test/plugins/test_types_plugin.py" ];
  unimported.testPaths = [ ];
  web.propagatedBuildInputs = [ python3Packages.flask ];
  zero = { };
- # NOTE: Condition can be removed once stable beets updates
-} // lib.optionalAttrs ((lib.versions.majorMinor version) != "1.6") {
  limit = { };
  substitute = {
  testPaths = [ ];

pkgs/tools/audio/beets/common.nix

@@ -94,6 +94,7 @@ python3Packages.buildPythonApplication {
  nativeBuildInputs = [
  gobject-introspection
  sphinxHook
+ python3Packages.pydata-sphinx-theme
  ] ++ extraNativeBuildInputs;
 
  buildInputs = [
@@ -119,6 +120,7 @@ python3Packages.buildPythonApplication {
 
  nativeCheckInputs = with python3Packages; [
  pytestCheckHook
+ pytest-cov
  mock
  rarfile
  responses