Merge master into staging-next

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

@@ -153,8 +153,6 @@
 
 - [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks).
 
-- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
-
 - [Collabora Online](https://www.collaboraonline.com/), a collaborative online office suite based on LibreOffice technology. Available as [services.collabora-online](options.html#opt-services.collabora-online.enable).
 
 - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a WebUI for connecting devices. Available as [services.wg-access-server](#opt-services.wg-access-server.enable).

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

@@ -16,6 +16,8 @@
 
 - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
 
+- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}

pkgs/by-name/fo/folio/package.nix

@@ -1,27 +1,28 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, vala
-, blueprint-compiler
-, wrapGAppsHook4
-, desktop-file-utils
-, libadwaita
-, libgee
-, gtksourceview5
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  blueprint-compiler,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  libadwaita,
+  libgee,
+  gtksourceview5,
 }:
 
 stdenv.mkDerivation rec {
   pname = "folio";
-  version = "24.12";
+  version = "24.13";
 
   src = fetchFromGitHub {
     owner = "toolstack";
     repo = "Folio";
-    rev = version;
-    hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-mtUo1auHpE0kmbF0EvJUtGrPehuRfP1y/m8rDmqWYPs=";
   };
 
   nativeBuildInputs = [
@@ -40,12 +41,12 @@ stdenv.mkDerivation rec {
     gtksourceview5
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Beautiful markdown note-taking app for GNOME (forked from Paper)";
     homepage = "https://github.com/toolstack/Folio";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "com.toolstack.Folio";
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/ll/lla/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  versionCheckHook,
+  nix-update-script,
+}:
+let
+  version = "0.2.9";
+in
+rustPlatform.buildRustPackage {
+  pname = "lla";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "triyanox";
+    repo = "lla";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bemu4MuZYmn6LDIGxCAxIuS78alz8UE6qHhLoxtZSUk=";
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  cargoHash = "sha256-sjJUG32jchAG/q4y649PyTJ2kqjT+0COSvO2QM6GnV0=";
+
+  cargoBuildFlags = [ "--workspace" ];
+
+  postFixup = ''
+    wrapProgram $out/bin/lla \
+      --add-flags "--plugins-dir $out/lib"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modern alternative to ls";
+    longDescription = ''
+      `lla` is a high-performance, extensible alternative to the traditional ls command, written in Rust.
+      It offers enhanced functionality, customizable output, and a plugin system for extended capabilities.
+    '';
+    homepage = "https://github.com/triyanox/lla";
+    changelog = "https://github.com/triyanox/lla/blob/refs/tags/v${version}/CHANGELOG.md";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ pluiedev ];
+    platforms = lib.platforms.unix;
+    mainProgram = "lla";
+  };
+}

pkgs/development/php-packages/xdebug/default.nix

@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "3.3.2";
+  version = "3.4.0";
 in
 buildPecl {
   inherit version;
@@ -17,7 +17,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-3Hj/6pFLwJkVfsUIkX9lP8cOa1cVjobqHZd/cnH0TaU=";
+    hash = "sha256-Gt6/ARrUzmsAhsdkKPNiX0CBmWTv7D3mHnxvvWjbLnE=";
   };
 
   doCheck = true;

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

@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "mss";
-  version = "9.0.2";
+  version = "10.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4=";
+    hash = "sha256-2QPg1RJivw+HgoQc8W6qbX4+HxLq41q0HC4xiDfGY38=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [

pkgs/games/pegasus-frontend/default.nix

@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation rec {
   pname = "pegasus-frontend";
-  version = "0-unstable-2023-12-05";
+  version = "0-unstable-2024-11-11";
 
   src = fetchFromGitHub {
     owner = "mmatyas";
     repo = "pegasus-frontend";
-    rev = "86d3eed534ef8e79f412270b955dc2ffd4d172a3";
+    rev = "54362976fd4c6260e755178d97e9db51f7a896af";
     fetchSubmodules = true;
-    hash = "sha256-lUoL63yFOVwTOcsGd8+pWqgcS5b3a6uuR8M4L6OvlXM=";
+    hash = "sha256-DqtkvDg0oQL9hGB+6rNXe3sDBywvnqy9N31xfyl6nbI=";
   };
 
   nativeBuildInputs = [

pkgs/games/sgt-puzzles/default.nix

@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20240928.182b3d9";
+  version = "20241123.5e74004";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-D4Mdec7h7MPG+WStDDapzjWLiaLWzqbOipmfWUpk7bA=";
+    hash = "sha256-r96rQWq2UJoLoIB+w1xcxIvd5kNGGYq+Wri/Vojeb0Q=";
   };
 
   sgt-puzzles-menu = fetchurl {

pkgs/servers/http/nginx/modules.nix

@@ -853,8 +853,8 @@ let self = {
       name = "subsFilter";
       owner = "yaoweibin";
       repo = "ngx_http_substitutions_filter_module";
-      rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0";
-      sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f";
+      rev = "e12e965ac1837ca709709f9a26f572a54d83430e";
+      sha256 = "sha256-3sWgue6QZYwK69XSi9q8r3WYGVyMCIgfqqLvPBHqJKU=";
     };
 
     meta = with lib; {

pkgs/tools/security/proxmark3/default.nix

@@ -26,13 +26,13 @@
 assert withBlueshark -> stdenv.hostPlatform.isLinux;
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxmark3";
-  version = "4.18994";
+  version = "4.19552";
 
   src = fetchFromGitHub {
     owner = "RfidResearchGroup";
     repo = "proxmark3";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LeVQnidlCGFwtgJZdGlIFEYgf3M3BtfxoBKsxSFEo2w=";
+    hash = "sha256-5Rlw5QlceQGiIuVFNZhyrszCdG+idFo8Vvps46VJSlE=";
   };
 
   patches = [