Merge master into staging-next

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

@@ -322,6 +322,7 @@ in
             elementary-files
             elementary-mail
             elementary-maps
+            elementary-monitor
             elementary-music
             elementary-photos
             elementary-screenshot

pkgs/applications/misc/ArchiSteamFarm/default.nix

@@ -63,7 +63,7 @@ buildDotnetModule rec {
 
   doCheck = true;
 
-  installPhase = ''
+  preInstall = ''
     dotnetProjectFiles=(ArchiSteamFarm)
 
     # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.
@@ -71,14 +71,15 @@ buildDotnetModule rec {
       --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}'
       --set "ASF_PATH" "~/.config/archisteamfarm"
     )
+  '';
 
-    dotnetInstallPhase
-
+  postInstall = ''
     buildPlugin() {
       echo "Publishing plugin $1"
-      dotnetProjectFiles=("$1")
-      dotnetInstallPath="$out/lib/ArchiSteamFarm/plugins/$1"
-      dotnetInstallPhase
+      dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
+        --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \
+        --no-restore --no-build --runtime $dotnetRuntimeIds \
+        $dotnetFlags $dotnetInstallFlags
     }
 
   ''

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "144.0b6";
+  version = "144.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b0e8398513db7de1f16412bedba519b3d307022c0eadc1c114f3ad247ac368c027bd968f98a38c41076c1e6e06c96ec3821230d470f4f804e51ff09ede84a618";
+    sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";
   };
 
   meta = {

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "144.0b6";
+  version = "144.0b9";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "08a42497eef413f097c4c8191ef2d0e4e7a6f39a63744d51352aaa4016ed8877da4eace81bfc85e97f8e4f17c7ea9225fe11c94e70d6e4c9f4ec69cd43aeecc4";
+    sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

pkgs/applications/system/monitor/default.nix

@@ -1,116 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gitUpdater,
-  meson,
-  ninja,
-  vala,
-  pkg-config,
-  pantheon,
-  python3,
-  curl,
-  flatpak,
-  gettext,
-  glib,
-  gtk3,
-  json-glib,
-  libwnck,
-  libgee,
-  libgtop,
-  libhandy,
-  sassc,
-  udisks2,
-  wrapGAppsHook3,
-  libX11,
-  libXext,
-  libXNVCtrl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "monitor";
-  version = "0.17.2";
-
-  src = fetchFromGitHub {
-    owner = "stsdc";
-    repo = "monitor";
-    rev = version;
-    hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    gettext
-    meson
-    ninja
-    vala
-    pkg-config
-    python3
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    curl
-    flatpak
-    glib
-    gtk3
-    json-glib
-    pantheon.granite
-    pantheon.wingpanel
-    libgee
-    libgtop
-    libhandy
-    libwnck
-    sassc
-    udisks2
-    libX11
-    libXext
-    libXNVCtrl
-  ];
-
-  # Force link against Xext, otherwise build fails with:
-  # ld: /nix/store/...-libXNVCtrl-495.46/lib/libXNVCtrl.a(NVCtrl.o): undefined reference to symbol 'XextAddDisplay'
-  # ld: /nix/store/...-libXext-1.3.4/lib/libXext.so.6: error adding symbols: DSO missing from command line
-  # https://github.com/stsdc/monitor/issues/292
-  NIX_LDFLAGS = "-lXext";
-
-  mesonFlags = [ "-Dindicator-wingpanel=enabled" ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-
-    # Alternatively, using pkg-config here should just work.
-    substituteInPlace meson.build --replace \
-      "meson.get_compiler('c').find_library('libcurl', dirs: vapidir)" \
-      "meson.get_compiler('c').find_library('libcurl', dirs: '${curl.out}/lib')"
-
-    # Fix build with Vala 0.56.18
-    # https://github.com/elementary/monitor/issues/444
-    for i in $(find src/Resources -type f -name "*.vala"); do
-      substituteInPlace $i --replace-warn "[Compact]" ""
-    done
-  '';
-
-  passthru = {
-    updateScript = gitUpdater {
-      # Upstream frequently tags these to fix CI, which are mostly irrelevant to us.
-      ignoredVersions = "-";
-    };
-  };
-
-  meta = with lib; {
-    description = "Manage processes and monitor system resources";
-    longDescription = ''
-      Manage processes and monitor system resources.
-      To use the wingpanel indicator in this application, see the Pantheon
-      section in the NixOS manual.
-    '';
-    homepage = "https://github.com/stsdc/monitor";
-    maintainers = with maintainers; [ xiorcale ];
-    teams = [ teams.pantheon ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
-    mainProgram = "com.github.stsdc.monitor";
-  };
-}

pkgs/by-name/pl/planify/package.nix

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.14.1";
+  version = "4.15.1";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
-    rev = version;
-    hash = "sha256-4N+2DWOriuxQJX5hfDmGy066ypSn1HkkildBIJjOXhc=";
+    tag = "v${version}";
+    hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ra/ranger/package.nix

@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "ranger";
-  version = "1.9.3-unstable-2025-09-10";
+  version = "1.9.3-unstable-2025-10-12";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ranger";
     repo = "ranger";
-    rev = "3f7a3546e59d52e5de5bbb13b9d9968bfaf6b659";
-    hash = "sha256-a+bfOE0/TfYvyxKjPXo5Q2WKSmfPaM+YJdggjcWFv5I=";
+    rev = "6d5e0d8dc4cc5ddf53211e19f48c5b5e9ee47b18";
+    hash = "sha256-gGJPa2k90BF28EB5cPnY0yn0YblJkhn105V2JQQv+xA=";
   };
 
   LC_ALL = "en_US.UTF-8";

pkgs/by-name/re/reco/package.nix

@@ -2,13 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  blueprint-compiler,
   meson,
   ninja,
   pkg-config,
   vala,
   wrapGAppsHook4,
+  libadwaita,
   libgee,
-  live-chart,
   ryokucha,
   pantheon,
   gst_all_1,
@@ -16,16 +17,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "reco";
-  version = "5.0.2";
+  version = "5.1.1";
 
   src = fetchFromGitHub {
     owner = "ryonakano";
     repo = "reco";
     rev = finalAttrs.version;
-    hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI=";
+    hash = "sha256-vSVWGXC0QJ20t2MRImBwG8ZTrTLE5Z98GO6No80mCUU=";
   };
 
   nativeBuildInputs = [
+    blueprint-compiler
     meson
     ninja
     pkg-config
@@ -34,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libadwaita
     libgee
-    live-chart
+    pantheon.live-chart
     ryokucha
-    pantheon.granite7
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good

pkgs/by-name/so/solvespace/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -23,6 +24,7 @@
   libspnav,
   libthai,
   libxkbcommon,
+  mimalloc,
   pangomm,
   pcre,
   util-linuxMinimal, # provides libmount
@@ -42,6 +44,13 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch";
+      hash = "sha256-XEeh6vb4fYsTmAro1ZR/8NyFl+Y+S+m/Lx+tA7o2omM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -67,6 +76,7 @@ stdenv.mkDerivation rec {
     libspnav
     libthai
     libxkbcommon
+    mimalloc
     pangomm
     pcre
     util-linuxMinimal
@@ -90,7 +100,11 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
+  cmakeFlags = [
+    "-DENABLE_OPENMP=ON"
+    # CMake 4 needs a minimum version
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+  ];
 
   meta = {
     description = "Parametric 3d CAD program";

pkgs/by-name/sp/spirit/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spirit";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "spirit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KGjK4kXQTIXiCK6eIzv44WpwS3OGeelcG2o+4mLGIP8=";
+    hash = "sha256-7tgSFbH0nvw5b5IoSb3GHFYR2Xn5+pKi1IFt0HpDIA0=";
   };
 
   vendorHash = "sha256-pMvZxGNnLLAiyWtRRRHJcF28wEQkHgUI3nJCKTlMJhY=";

pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-iconbrowser";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "iconbrowser";
     rev = version;
-    sha256 = "sha256-T0VCpk3pdq+2gr/UblLu8mRX7TKJrAtyyFk4i+tAVfI=";
+    sha256 = "sha256-o73RtSkhH1s4dtIvPPuy+CSLChIPAkkXy5bQ8LloitQ=";
   };
 
   nativeBuildInputs = [

pkgs/desktops/pantheon/apps/elementary-monitor/default.nix

@@ -0,0 +1,93 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  desktop-file-utils,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  sassc,
+  vala,
+  wrapGAppsHook4,
+  flatpak,
+  glib,
+  granite7,
+  gtk4,
+  json-glib,
+  libadwaita,
+  libgee,
+  libgtop,
+  libX11,
+  linuxPackages,
+  live-chart,
+  pciutils,
+  udisks2,
+  wingpanel,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "elementary-monitor";
+  version = "8.0.0";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "monitor";
+    tag = finalAttrs.version;
+    hash = "sha256-pFyDC22YzThHPElBt/JjFP1A8hoCw9QoIjS2Re8Se9w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gettext
+    meson
+    ninja
+    pkg-config
+    sassc
+    vala
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    flatpak
+    glib
+    granite7
+    gtk4
+    json-glib
+    libadwaita
+    libgee
+    libgtop
+    libX11
+    linuxPackages.nvidia_x11.settings.libXNVCtrl
+    live-chart
+    pciutils
+    udisks2
+    wingpanel
+  ];
+
+  mesonFlags = [ "-Dindicator-wingpanel=enabled" ];
+
+  postPatch = ''
+    # Fix build with Vala 0.56.18
+    # https://github.com/elementary/monitor/issues/444
+    for i in $(find src/Resources -type f -name "*.vala"); do
+      substituteInPlace $i --replace-warn "[Compact]" ""
+    done
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Manage processes and monitor system resources";
+    homepage = "https://github.com/elementary/monitor";
+    teams = [ lib.teams.pantheon ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "io.elementary.monitor";
+  };
+})

pkgs/desktops/pantheon/default.nix

@@ -29,6 +29,7 @@ lib.makeScope pkgs.newScope (
     ];
 
     wingpanelIndicators = [
+      elementary-monitor
       wingpanel-applications-menu
       wingpanel-indicator-bluetooth
       wingpanel-indicator-datetime
@@ -76,6 +77,8 @@ lib.makeScope pkgs.newScope (
 
     elementary-maps = callPackage ./apps/elementary-maps { };
 
+    elementary-monitor = callPackage ./apps/elementary-monitor { };
+
     elementary-music = callPackage ./apps/elementary-music { };
 
     elementary-photos = callPackage ./apps/elementary-photos { };
@@ -122,6 +125,8 @@ lib.makeScope pkgs.newScope (
 
     granite7 = callPackage ./libraries/granite/7 { };
 
+    live-chart = callPackage ./libraries/live-chart { };
+
     pantheon-wayland = callPackage ./libraries/pantheon-wayland { };
 
     #### SERVICES

pkgs/desktops/pantheon/desktop/wingpanel/default.nix

@@ -10,6 +10,7 @@
   ninja,
   vala,
   gala,
+  glib,
   gtk3,
   libgee,
   granite,
@@ -54,13 +55,17 @@ stdenv.mkDerivation rec {
     elementary-icon-theme
     gala
     granite
-    gtk3
     json-glib
     libgee
     mutter
     wayland
   ];
 
+  propagatedBuildInputs = [
+    glib
+    gtk3
+  ];
+
   preFixup = ''
     gappsWrapperArgs+=(
       # this GTK theme is required

pkgs/desktops/pantheon/libraries/live-chart/default.nix

@@ -1,24 +1,26 @@
 {
-  lib,
   stdenv,
+  lib,
   fetchFromGitHub,
   meson,
   ninja,
   pkg-config,
   vala,
+  xvfb-run,
   gtk4,
   libgee,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "live-chart";
-  version = "1.10.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
-    owner = "lcallarec";
+    owner = "elementary";
     repo = "live-chart";
-    rev = finalAttrs.version;
-    hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8=";
+    tag = finalAttrs.version;
+    hash = "sha256-X/wdmKw381Fkjcvj7k2AmA/nXWKFFNx5KDNxeWEiqzs=";
   };
 
   outputs = [
@@ -26,11 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     vala
+    xvfb-run
   ];
 
   buildInputs = [
@@ -38,13 +43,15 @@ stdenv.mkDerivation (finalAttrs: {
     libgee
   ];
 
-  strictDeps = true;
+  passthru = {
+    updateScript = nix-update-script { };
+  };
 
   meta = {
     description = "Real-time charting library for Vala and GTK4 based on Cairo";
-    homepage = "https://github.com/lcallarec/live-chart";
+    homepage = "https://github.com/elementary/live-chart";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ aleksana ];
-    platforms = lib.platforms.unix;
+    teams = [ lib.teams.pantheon ];
+    platforms = lib.platforms.linux;
   };
 })

pkgs/servers/home-assistant/custom-components/sensi/package.nix

@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "iprak";
   domain = "sensi";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-IMtM9tD1F4vbvICNovuzXZ9+4TBlNCaID+0P17cRieY=";
+    hash = "sha256-rF+BAP3Du+4Xoct63VzyGhQh933b8QyNMWk6qFj4e5s=";
   };
 
   dependencies = [

pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix

@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "jmcollin78";
   domain = "versatile_thermostat";
-  version = "7.3.5";
+  version = "7.4.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     rev = "refs/tags/${version}";
-    hash = "sha256-oX1C7N1i1ssmLgYv0uL2MQm3SCNMNKvBm6xLhfN3qKk=";
+    hash = "sha256-QE3XTummNZCziZPKfFjTI0ell+bftGqbcG0hh+QHx9s=";
   };
 
   passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; };

pkgs/top-level/aliases.nix

@@ -1443,6 +1443,7 @@ mapAliases {
   litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
   Literate = literate; # Added 2024-06-12
   littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
+  live-chart = throw "live-chart has been removed as it is no longer used in Nixpkgs. livechart-2 (elementary's fork) is available as pantheon.live-chart"; # Added 2025-10-10
   llama = walk; # Added 2023-01-23
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
 
@@ -1768,6 +1769,7 @@ mapAliases {
   mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17
   mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17
   mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17
+  monitor = pantheon.elementary-monitor; # Added 2025-10-10
   mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
   mono4 = mono6; # Added 2025-08-25
   mono5 = mono6; # Added 2025-08-25

pkgs/top-level/all-packages.nix

@@ -11885,10 +11885,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
   };
 
-  monitor = callPackage ../applications/system/monitor {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-  };
-
   moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
 
   mopidyPackages =