Merge staging-next into staging

doc/hooks/tauri.section.md

@@ -14,15 +14,13 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
   rustPlatform,
   fetchNpmDeps,
   cargo-tauri,
-  darwin,
   glib-networking,
-  libsoup,
   nodejs,
   npmHooks,
   openssl,
   pkg-config,
-  webkitgtk_4_0,
-  wrapGAppsHook3,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -47,25 +45,15 @@ rustPlatform.buildRustPackage rec {
 
     # Make sure we can find our libraries
     pkg-config
-    wrapGAppsHook3
+    wrapGAppsHook4
   ];
 
   buildInputs =
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       glib-networking # Most Tauri apps need networking
-      libsoup
-      webkitgtk_4_0
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        CoreServices
-        Security
-        WebKit
-      ]
-    );
+      webkitgtk_4_1
+    ];
 
   # Set our Tauri source directory
   cargoRoot = "src-tauri";

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

@@ -81,6 +81,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- Cinnamon has been updated to 6.4.
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

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

@@ -111,6 +111,7 @@ in
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
+      services.power-profiles-daemon.enable = mkDefault true;
       services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
       services.touchegg.enable = mkDefault true;
       services.udisks2.enable = true;
@@ -151,9 +152,6 @@ in
         # cinnamon-killer-daemon: provided by cinnamon-common
         networkmanagerapplet # session requirement - also nm-applet not needed
 
-        # For a polkit authentication agent
-        polkit_gnome
-
         # packages
         nemo-with-extensions
         gnome-online-accounts-gtk

nixos/modules/tasks/filesystems.nix

@@ -4,6 +4,8 @@ with lib;
 with utils;
 
 let
+  # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
+  escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
 
   addCheckDesc = desc: elemType: check: types.addCheck elemType check
     // { description = "${elemType.description} (with check: ${desc})"; };
@@ -136,6 +138,8 @@ let
 
     };
 
+    config.device = lib.mkIf (config.label != null) "/dev/disk/by-label/${escape config.label}";
+
     config.options = let
       inInitrd = utils.fsNeededForBoot config;
     in mkMerge [
@@ -196,11 +200,8 @@ let
       ];
       isBindMount = fs: builtins.elem "bind" fs.options;
       skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
-      # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
-      escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
     in fstabFileSystems: { }: concatMapStrings (fs:
       (if fs.device != null then escape fs.device
-         else if fs.label != null then "/dev/disk/by-label/${escape fs.label}"
          else throw "No device specified for mount point ‘${fs.mountPoint}’.")
       + " " + escape fs.mountPoint
       + " " + fs.fsType

pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix

@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-AwVjRwjwx53/2jNz2VdluIh+zhNqbAP883xw8ULzZK0=";
+    hash = "sha256-dHxeyqVe7cA/xK0RpprWRt5xPViyLHHal0pO6xhq4aE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ca/cables/package.nix

@@ -7,12 +7,12 @@
 
 let
   pname = "cables";
-  version = "0.3.2";
+  version = "0.4.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
-    sha256 = "sha256-D5Bgg5D03FPQF2HKow4yehcqToo4dpPudBg0W4UnqFs=";
+    sha256 = "sha256-+PMENdKs/bcmszlrk0hQILZzKCV8uQbCgR0bbKMk7ic=";
   };
 
   appimageContents = appimageTools.extract {

pkgs/by-name/ci/cinnamon-common/package.nix

@@ -9,6 +9,7 @@
 , cjs
 , evolution-data-server
 , fetchFromGitHub
+, gcr
 , gdk-pixbuf
 , gettext
 , libgnomekbd
@@ -18,6 +19,7 @@
 , gtk3
 , intltool
 , json-glib
+, libsecret
 , libstartup_notification
 , libXtst
 , libXdamage
@@ -71,13 +73,13 @@ in
 # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "6.2.9";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-CW87zZogjdTOCp6mx5ctV6T9YQVQGo3yw0lPTkiCNkE=";
+    hash = "sha256-xkM6t1AiFpfAJOUEP2eeWBtYLQa36FNxrpPiRgHot3w=";
   };
 
   patches = [
@@ -94,11 +96,13 @@ stdenv.mkDerivation rec {
     cjs
     dbus
     evolution-data-server # for calendar-server
+    gcr
     gdk-pixbuf
     glib
     gsound
     gtk3
     json-glib
+    libsecret
     libstartup_notification
     libXtst
     libXdamage
@@ -136,6 +140,7 @@ stdenv.mkDerivation rec {
     intltool
     gtk-doc
     perl
+    python3.pkgs.libsass # for pysassc
     python3.pkgs.wrapPython
     pkg-config
   ];
@@ -160,12 +165,13 @@ stdenv.mkDerivation rec {
       substituteInPlace ./modules/cs_info.py              --replace-fail "lspci" "${pciutils}/bin/lspci"
       substituteInPlace ./modules/cs_keyboard.py          --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command"
       substituteInPlace ./modules/cs_themes.py            --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
+      substituteInPlace ./modules/cs_user.py              --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd"
     popd
 
     substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \
       --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session"
 
-    patchShebangs src/data-to-c.pl
+    patchShebangs src/data-to-c.pl data/theme/parse-sass.sh
   '';
 
   postInstall = ''

pkgs/by-name/ci/cinnamon-control-center/package.nix

@@ -19,7 +19,6 @@
 , libgudev
 , libwacom
 , wrapGAppsHook3
-, tzdata
 , glibc
 , libnma
 , modemmanager
@@ -34,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-control-center";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI=";
+    hash = "sha256-hS1vFrwMYUinFLWx33nnlcXwcMkqDCivElI1HaZsSSE=";
   };
 
   buildInputs = [
@@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
     colord
     libgudev
     libwacom
-    tzdata
     networkmanager
     libnma
     modemmanager
@@ -67,15 +65,7 @@ stdenv.mkDerivation rec {
     upower
   ];
 
-  /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/"
-    ./panels/datetime/tz.h:32:#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-    ./panels/datetime/tz.h:34:#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
-
   postPatch = ''
-    sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c
-    sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h
-    sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c
-
     patchShebangs meson_install_schemas.py
   '';
 

pkgs/by-name/ci/cinnamon-desktop/package.nix

@@ -3,6 +3,7 @@
 , gobject-introspection
 , gtk3
 , intltool
+, isocodes
 , meson
 , ninja
 , pkg-config
@@ -19,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-desktop";
-  version = "6.2.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI=";
+    hash = "sha256-YKGVuT28MLcLO9T8ZJqbHqMN0SAn1P1l8JTDBo4n838=";
   };
 
   outputs = [ "out" "dev" ];
@@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gdk-pixbuf
+    isocodes
     systemd
     xkeyboard_config
     xorg.libxkbfile

pkgs/by-name/ci/cinnamon-menus/package.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-menus";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY=";
+    hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";
   };
 
   buildInputs = [

pkgs/by-name/ci/cinnamon-screensaver/package.nix

@@ -28,15 +28,21 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-screensaver";
-  version = "6.2.1";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-f1Z3fmtCokWNLJwsTOAIAZB3lwFfqakJJco3umyEaYk=";
+    hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";
   };
 
+  patches = [
+    # Do not override GI_TYPELIB_PATH set by wrapGAppsHook3.
+    # https://github.com/linuxmint/cinnamon-screensaver/pull/456#discussion_r1702738776.
+    ./preserve-existing-gi-typelib-path.patch
+  ];
+
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook3
@@ -80,8 +86,6 @@ stdenv.mkDerivation rec {
     # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit.
     find . -type f -exec sed -i \
       -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
-      -e s,/usr/lib/cinnamon-screensaver,$out/lib,g \
-      -e s,/usr/share/cinnamon-screensaver,$out/share,g \
       -e s,/usr/share/iso-flag-png,${iso-flags-png-320x240}/share/iso-flags-png,g \
       {} +
   '';
@@ -93,6 +97,11 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  postFixup = ''
+    # Shared objects can't be wrapped.
+    mv $out/libexec/cinnamon-screensaver/{.libcscreensaver.so-wrapped,libcscreensaver.so}
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/cinnamon-screensaver";
     description = "Cinnamon screen locker and screensaver program";

pkgs/by-name/ci/cinnamon-screensaver/preserve-existing-gi-typelib-path.patch

@@ -0,0 +1,14 @@
+diff --git a/src/binfile.in b/src/binfile.in
+index 0674567..1faba9c 100644
+--- a/src/binfile.in
++++ b/src/binfile.in
+@@ -5,7 +5,7 @@ if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+   exit 1
+ fi
+ 
+-export GI_TYPELIB_PATH="@typelibdir@"
+-export LD_LIBRARY_PATH="@pkglibdir@"
++export GI_TYPELIB_PATH="@typelibdir@${GI_TYPELIB_PATH:+:}$GI_TYPELIB_PATH"
++export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+ 
+ exec @install_dir@/@target@ "$@"

pkgs/by-name/ci/cinnamon-session/package.nix

@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon-session";
-  version = "6.2.1";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-mr+QOFogzoloasGt1uK6zH/KHuH+uWYzXAZxPYkW57A=";
+    hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU=";
   };
 
   patches = [
@@ -88,9 +88,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # patchShebangs requires executable file
-    chmod +x data/meson_install_schemas.py cinnamon-session-quit/cinnamon-session-quit.py
-    patchShebangs --build data/meson_install_schemas.py
-    patchShebangs --host cinnamon-session-quit/cinnamon-session-quit.py
+    chmod +x data/meson_install_schemas.py
+    patchShebangs data/meson_install_schemas.py
   '';
 
   preFixup = ''

pkgs/by-name/ci/cinnamon-settings-daemon/package.nix

@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "6.2.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-OAG5Tes+0bi+vKqm77Y7OykTpUkMdRaXIJYLuomIDMo=";
+    hash = "sha256-GY5uq+CLBKhHYr5RTVlE3vqCfP6+2Tmztw0ymwT4jKU=";
   };
 
   patches = [

pkgs/by-name/ci/cinnamon-translations/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-translations";
-  version = "6.2.2";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-uZVF2CsKTQOvMJsyXBW405W3vdIGxYlW8+xPiwSgUSg=";
+    hash = "sha256-aR1O/NaEJcu4W3bGMWVeaIVGeuMYTrQrPfeS1V+4Nmk=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/cj/cjs/package.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cjs";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
     rev = version;
-    hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg=";
+    hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";
   };
 
   outputs = [ "out" "dev" ];
@@ -60,9 +60,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs --build build/choose-tests-locale.sh
-
-    # https://github.com/linuxmint/cjs/issues/123
-    substituteInPlace meson.build --replace-fail "extra_args: '--warn-error'," ""
   '';
 
   meta = with lib; {

pkgs/by-name/cl/clusternet/package.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+
+buildGoModule rec {
+  pname = "clusternet";
+  version = "0.17.1";
+
+  src = fetchFromGitHub {
+    owner = "clusternet";
+    repo = "clusternet";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZjFybox6BeezDj+Jvb6MRfaTRozpXGUIG1n1GDVS4aM=";
+  };
+
+  vendorHash = "sha256-hY4bgQXwKjL4UT3omDYuxy9xN9XOr00mMvGssKOSsG4=";
+
+  ldFlags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "CNCF Sandbox Project for managing your Kubernetes clusters";
+    homepage = "https://github.com/clusternet/clusternet";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ genga898 ];
+  };
+}

pkgs/by-name/da/dash-mpd-cli/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  protobuf,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "dash-mpd-cli";
+  version = "0.2.23";
+
+  src = fetchFromGitHub {
+    owner = "emarsden";
+    repo = "dash-mpd-cli";
+    rev = "v${version}";
+    hash = "sha256-gRtt7iocGmnFpdTEMv/U4izeR/NtdYYXX3eFXW5LGYs=";
+  };
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  nativeBuildInputs = [ protobuf ];
+
+  # The tests depend on network access.
+  doCheck = false;
+
+  meta = {
+    description = "Download media content from a DASH-MPEG or DASH-WebM MPD manifest";
+    longDescription = ''
+      A commandline application for downloading media content from a DASH MPD
+      file, as used for on-demand replay of TV content and video streaming
+      services.
+    '';
+    homepage = "https://emarsden.github.io/dash-mpd-cli/";
+    downloadPage = "https://github.com/emarsden/dash-mpd-cli/releases";
+    changelog = "https://github.com/emarsden/dash-mpd-cli/blob/main/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ al3xtjames ];
+    mainProgram = "dash-mpd-cli";
+  };
+}

pkgs/by-name/fa/fastjet/package.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fastjet";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
-    hash = "sha256-s9MxVbVc5D9CDNbZm1Jaz3vcJZOnu36omKnds9jKOOM=";
+    hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM=";
   };
 
   buildInputs = lib.optional withPython python;

pkgs/by-name/jh/jhentai/package.nix

@@ -0,0 +1,69 @@
+{
+  autoPatchelfHook,
+  lib,
+  fetchFromGitHub,
+  flutter,
+  pkg-config,
+  webkitgtk_4_1,
+}:
+flutter.buildFlutterApplication rec {
+  pname = "jhentai";
+  version = "8.0.5";
+
+  src = fetchFromGitHub {
+    owner = "jiangtian616";
+    repo = "JHenTai";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LL1TyLF37NtwTRN9vhHBY+xHDg0E0ACt2ilacIKpduU=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  postUnpack = ''
+    substituteInPlace $sourceRoot/linux/my_application.cc \
+      --replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))"
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    webkitgtk_4_1
+  ];
+
+  gitHashes = {
+    desktop_webview_window = "sha256-QDlumlZ3pbmBRkMSJJVgz8HcCdANzV3cU142URvkY1w=";
+    dio = "sha256-eHGAV/yIqTaC/wJeSXiPwonPePq+GT1u1dgjbBrW8OI=";
+    flutter_draggable_gridview = "sha256-kntjeWEhRl4rdJBO8kt7GCaaLdPWy6b7zmBIjHyP7h8=";
+    flutter_slidable = "sha256-nBPEZBvKV3D/eEa/cYb7jgbJ60rbh823yDJALLz1/8c=";
+    flutter_socks_proxy = "sha256-a8XZTPTz521o7G7NsEXv2E/H7uVJcY4rcouIkdQC+jg=";
+    flutter_windowmanager = "sha256-+T2w1VLnrkzyvODGmWefa6aN1N+/i4itBgps2zouAas=";
+    j_downloader = "sha256-x5RG/SqbfOiRd51dL8H+phLIBrpVdOJiASWhbB5gCNQ=";
+    like_button = "sha256-OVzfpIEnw88496H345NHn7nZ48+QDTaneBzN2UCdwk8=";
+    photo_view = "sha256-k/+ncCzGkF4XmFpo3wmJOQbElSh2r+SlyeI3M9yDFtM=";
+  };
+
+  flutterBuildFlags = [
+    "--target lib/src/main.dart"
+  ];
+
+  postInstall = ''
+    install -Dm644 ./linux/assets/top.jtmonster.jhentai.desktop $out/share/applications/top.jtmonster.jhentai.desktop
+    install -Dm644 ./assets/icon_512.png $out/share/icons/hicolor/512x512/apps/top.jtmonster.jhentai.png
+  '';
+
+  extraWrapProgramArgs = ''
+    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
+  '';
+
+  meta = {
+    description = "Cross-platform manga app made for e-hentai & exhentai by Flutter";
+    homepage = "https://github.com/jiangtian616/JHenTai";
+    mainProgram = "jhentai";
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ aucub ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/mu/muffin/package.nix

@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "6.2.0";
+  version = "6.4.1";
 
   outputs = [ "out" "dev" "man" ];
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-k8hUYA4/OzL2TB8s5DJpa2nFXV2U9eY09TLkqBDq9WE=";
+    hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs=";
   };
 
   patches = [

pkgs/by-name/ne/nemo-emblems/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
-  version = "6.2.1";
+  version = "6.4.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    rev = "nemo-emblems-${version}";
-    hash = "sha256-HfWZntG+SHrzkN4fa3qYj9+fM6zF32qFquL/InoUi/k=";
+    rev = version;
+    hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
   format = "setuptools";

pkgs/by-name/ne/nemo-fileroller/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo-fileroller";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
     rev = version;
-    hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+    hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
   sourceRoot = "${src.name}/nemo-fileroller";

pkgs/by-name/ne/nemo-python/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo-python";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
     rev = version;
-    hash = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA=";
+    hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
   };
 
   sourceRoot = "${src.name}/nemo-python";

pkgs/by-name/ne/nemo/package.nix

@@ -7,7 +7,7 @@
 , lib
 , stdenv
 , wrapGAppsHook3
-, libxml2
+, libxmlb
 , gtk3
 , gvfs
 , cinnamon-desktop
@@ -19,17 +19,26 @@
 , shared-mime-info
 , cinnamon-translations
 , libgsf
+, python3
 }:
 
+let
+  # For action-layout-editor.
+  pythonEnv = python3.withPackages (pp: with pp; [
+    pycairo
+    pygobject3
+    python-xapp
+  ]);
+in
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.2.8";
+  version = "6.4.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-1GJLsUlptwXcZUWIOztskV0nHA9BnPmnVeTgUwJ+QDQ=";
+    hash = "sha256-J7GQV+T5Lsmu1eELQJE9C3uLI6SoTJNPp648MYqEHvo=";
   };
 
   patches = [
@@ -44,7 +53,8 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     cinnamon-desktop
-    libxml2
+    libxmlb # action-layout-editor
+    pythonEnv
     xapp
     libexif
     exempi

pkgs/by-name/ol/ollama/package.nix

@@ -41,13 +41,13 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.4.5";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-4E3eqqJQEQYWVPFVZjnYSiXe4ZWUA0ifCRoHt7s0SL0=";
+    hash = "sha256-X1xGo054+MpThvZzeg/F+IBczY1wn/gTjcq+j1JztDg=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ti/tinymist/package.nix

@@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.12.4";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xX0dA6ode2YGT+aFCHDn1LjQHWcXdqRiKP+sxdoPvI0=";
+    hash = "sha256-yEvWPCFxdwc+fJOYRpxH1M5Fr+SedPm5fIE5tS1Fzhk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mkL7zQM7LOp9MxmGL2JZsFErnKp3rc0OSwek10Uj5tc=";
+  cargoHash = "sha256-k4X62J5SUDkg70acESbwlqQIF9mnQzNgA0pvHuxCwfs=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/development/compilers/flutter/flutter.nix

@@ -92,6 +92,8 @@ let
         # Some of flutter_tools's dependencies contain static assets. The
         # application attempts to read its own package_config.json to find these
         # assets at runtime.
+        # TODO: Remove this once Flutter 3.24 is the lowest version in Nixpkgs.
+        # https://github.com/flutter/flutter/pull/150340 makes it redundant.
         mkdir -p packages/flutter_tools/.dart_tool
         ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
 
@@ -131,7 +133,7 @@ let
         makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \
           --set-default FLUTTER_ROOT "$out" \
           --set FLUTTER_ALREADY_LOCKED true \
-          --add-flags "--disable-dart-dev \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot"
+          --add-flags "--disable-dart-dev --packages='${flutterTools.pubcache}/package_config.json' \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot"
 
         runHook postInstall
       '';

pkgs/development/python-modules/aiosomecomfort/default.nix

@@ -4,27 +4,26 @@
   buildPythonPackage,
   fetchFromGitHub,
   prettytable,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.25";
+  version = "0.0.26";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
     rev = "refs/tags/${version}";
-    hash = "sha256-EmglZW9gzgswxoEtDT+evjn8N+3aPooYFudwAXP8XEE=";
+    hash = "sha256-Vu49mJoS2FTXvlyJ/BFDJmh8uS/ZYM+Lb3IO8TTcZYg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     prettytable
   ];

pkgs/development/tools/kustomize/kustomize-sops.nix

@@ -14,8 +14,10 @@ buildGoModule rec {
   vendorHash = "sha256-1qnNJltam04uLMhH8YftAl2jjEZP2UhVIMp9Vcy3jeg=";
 
   installPhase = ''
+    mkdir -p $out/lib/viaduct.ai/v1/ksops/
     mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
-    mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec
+    mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops/ksops
+    ln -s $out/lib/viaduct.ai/v1/ksops/ksops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec
   '';
 
   # Tests are broken in a nix environment

pkgs/os-specific/linux/broadcom-sta/default.nix

@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
+  fetchpatch2,
   kernel,
 }:
 
@@ -66,7 +67,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  patches = map (patch: "${rpmFusionPatches}/${patch}") patchset;
+  patches = map (patch: "${rpmFusionPatches}/${patch}") patchset ++ [
+    # Fix for Kernel 6.12 and later (5f60d5f6bbc1)
+    (fetchpatch2 {
+      url = "https://gist.githubusercontent.com/joanbm/20db669eed4d8367a457780747be8cb9/raw/5536ba1354b6b97013530e7345d3bf29e92225b1/broadcom-wl-fix-linux-6.12.patch";
+      hash = "sha256-Y5VgWp0m5tNp8lxDhIg7IodbqyUsJVHHiVIFgP9ioHE=";
+    })
+  ];
 
   makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ];