From 5effd6403dbe11a515f33033051c727614ba6c27 Mon Sep 17 00:00:00 2001
From: Jeshua Lin <jeslinmx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:31:10 +0800
Subject: [PATCH 0001/1497] adapted AUR's cozette PKGBUILD

---
 pkgs/by-name/co/cozette/package.nix | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index 38ac3c054cf5..20b853f7bf00 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -2,8 +2,18 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  fetchgit,
+  bdf2psf,
+  # zstd,
 }:
 
+let
+  aur = fetchgit {
+    url = "https://aur.archlinux.org/psf-cozette.git/";
+    rev = "1c0d5429310f21abf7dbfc358198f250d77fb0bd";
+    hash = "sha256-dZ+ayjR2tzUtjgN1peYBEcQgHIZE/K79IvWDBafP6eE=";
+  };
+in
 stdenvNoCC.mkDerivation rec {
   pname = "cozette";
   version = "1.25.2";
@@ -15,6 +25,23 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-LtZHbsma9EuegS349gQo4W+ZT8x+Vb3CD/5vRKjwkzc=";
   };
 
+  nativeBuildInputs = [ bdf2psf ];
+  # nativeBuildInputs = [ bdf2psf zstd ];
+
+  postBuild = ''
+    # Confine Powerline left divider symbols to strictly 6 pixels wide
+    awk -i inplace 'BEGIN { l=-128 } $1=="ENCODING"&&($2==57520||$2==57521||$2==57524) { l=FNR } l+4<FNR&&FNR<=l+17 { printf("%02X\n", and(lshift(strtonum("0x"$1), 1), 0xFF)); next; }{ print }' cozette.bdf
+    awk -i inplace 'BEGIN { l=-128 } $1=="ENCODING"&&($2==57520||$2==57521||$2==57524) { l=FNR } l+4<FNR&&FNR<=l+30 { printf("%04X\n", and(lshift(strtonum("0x"$1), 1), 0xFFFF)); next; }{ print }' cozette_hidpi.bdf
+
+    # Fix for bdf2psf limitation (See https://github.com/slavfox/Cozette/issues/122#issuecomment-2165328416)
+    sed -i -e 's/^BBX [2-8]/BBX 9/g' cozette_hidpi.bdf
+
+    bdf2psf --fb cozette.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${aur}/codepoints.set 512 cozette6x13.psfu
+    bdf2psf --fb cozette_hidpi.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${aur}/codepoints.set 512 cozette12x26.psfu
+    # zstd -f cozette6x13.psfu
+    # zstd -f cozette12x26.psfu
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -25,6 +52,9 @@ stdenvNoCC.mkDerivation rec {
     install -Dm644 *.woff -t $out/share/fonts/woff
     install -Dm644 *.woff2 -t $out/share/fonts/woff2
 
+    install -Dm644 *.psfu -t "$out/share/consolefonts/"
+    # install -Dm644 *.psfu.zst -t "$out/share/consolefonts/"
+
     runHook postInstall
   '';
 

From 39409302e4d890a4ef5050d23f764e19d001132a Mon Sep 17 00:00:00 2001
From: Jeshua Lin <jeslinmx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 14:53:39 +0800
Subject: [PATCH 0002/1497] allow psf codepoints to be overridden

---
 .../by-name/co/cozette/default-codepoints.nix | 712 ++++++++++++++++++
 pkgs/by-name/co/cozette/package.nix           |  18 +-
 2 files changed, 717 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/co/cozette/default-codepoints.nix

diff --git a/pkgs/by-name/co/cozette/default-codepoints.nix b/pkgs/by-name/co/cozette/default-codepoints.nix
new file mode 100644
index 000000000000..01ddb5f29d56
--- /dev/null
+++ b/pkgs/by-name/co/cozette/default-codepoints.nix
@@ -0,0 +1,712 @@
+[
+  # ISO-8859-1
+  "U+0000"
+  "U+0001"
+  "U+0002"
+  "U+0003"
+  "U+0004"
+  "U+0005"
+  "U+0006"
+  "U+0007"
+  "U+0008"
+  "U+0009"
+  "U+000A"
+  "U+000B"
+  "U+000C"
+  "U+000D"
+  "U+000E"
+  "U+000F"
+  "U+0010"
+  "U+0011"
+  "U+0012"
+  "U+0013"
+  "U+0014"
+  "U+0015"
+  "U+0016"
+  "U+0017"
+  "U+0018"
+  "U+0019"
+  "U+001A"
+  "U+001B"
+  "U+001C"
+  "U+001D"
+  "U+001E"
+  "U+001F"
+  "U+0020"
+  "U+0021"
+  "U+0022"
+  "U+0023"
+  "U+0024"
+  "U+0025"
+  "U+0026"
+  "U+0027"
+  "U+0028"
+  "U+0029"
+  "U+002A"
+  "U+002B"
+  "U+002C"
+  "U+002D"
+  "U+002E"
+  "U+002F"
+  "U+0030"
+  "U+0031"
+  "U+0032"
+  "U+0033"
+  "U+0034"
+  "U+0035"
+  "U+0036"
+  "U+0037"
+  "U+0038"
+  "U+0039"
+  "U+003A"
+  "U+003B"
+  "U+003C"
+  "U+003D"
+  "U+003E"
+  "U+003F"
+  "U+0040"
+  "U+0041"
+  "U+0042"
+  "U+0043"
+  "U+0044"
+  "U+0045"
+  "U+0046"
+  "U+0047"
+  "U+0048"
+  "U+0049"
+  "U+004A"
+  "U+004B"
+  "U+004C"
+  "U+004D"
+  "U+004E"
+  "U+004F"
+  "U+0050"
+  "U+0051"
+  "U+0052"
+  "U+0053"
+  "U+0054"
+  "U+0055"
+  "U+0056"
+  "U+0057"
+  "U+0058"
+  "U+0059"
+  "U+005A"
+  "U+005B"
+  "U+005C"
+  "U+005D"
+  "U+005E"
+  "U+005F"
+  "U+0060"
+  "U+0061"
+  "U+0062"
+  "U+0063"
+  "U+0064"
+  "U+0065"
+  "U+0066"
+  "U+0067"
+  "U+0068"
+  "U+0069"
+  "U+006A"
+  "U+006B"
+  "U+006C"
+  "U+006D"
+  "U+006E"
+  "U+006F"
+  "U+0070"
+  "U+0071"
+  "U+0072"
+  "U+0073"
+  "U+0074"
+  "U+0075"
+  "U+0076"
+  "U+0077"
+  "U+0078"
+  "U+0079"
+  "U+007A"
+  "U+007B"
+  "U+007C"
+  "U+007D"
+  "U+007E"
+  "U+007F"
+  "U+0080"
+  "U+0081"
+  "U+0082"
+  "U+0083"
+  "U+0084"
+  "U+0085"
+  "U+0086"
+  "U+0087"
+  "U+0088"
+  "U+0089"
+  "U+008A"
+  "U+008B"
+  "U+008C"
+  "U+008D"
+  "U+008E"
+  "U+008F"
+  "U+0090"
+  "U+0091"
+  "U+0092"
+  "U+0093"
+  "U+0094"
+  "U+0095"
+  "U+0096"
+  "U+0097"
+  "U+0098"
+  "U+0099"
+  "U+009A"
+  "U+009B"
+  "U+009C"
+  "U+009D"
+  "U+009E"
+  "U+009F"
+  "U+00A0"
+  "U+00A1"
+  "U+00A2"
+  "U+00A3"
+  "U+00A4"
+  "U+00A5"
+  "U+00A6"
+  "U+00A7"
+  "U+00A8"
+  "U+00A9"
+  "U+00AA"
+  "U+00AB"
+  "U+00AC"
+  "U+00AD"
+  "U+00AE"
+  "U+00AF"
+  "U+00B0"
+  "U+00B1"
+  "U+00B2"
+  "U+00B3"
+  "U+00B4"
+  "U+00B5"
+  "U+00B6"
+  "U+00B7"
+  "U+00B8"
+  "U+00B9"
+  "U+00BA"
+  "U+00BB"
+  "U+00BC"
+  "U+00BD"
+  "U+00BE"
+  "U+00BF"
+  "U+00C0"
+  "U+00C1"
+  "U+00C2"
+  "U+00C3"
+  "U+00C4"
+  "U+00C5"
+  "U+00C6"
+  "U+00C7"
+  "U+00C8"
+  "U+00C9"
+  "U+00CA"
+  "U+00CB"
+  "U+00CC"
+  "U+00CD"
+  "U+00CE"
+  "U+00CF"
+  "U+00D0"
+  "U+00D1"
+  "U+00D2"
+  "U+00D3"
+  "U+00D4"
+  "U+00D5"
+  "U+00D6"
+  "U+00D7"
+  "U+00D8"
+  "U+00D9"
+  "U+00DA"
+  "U+00DB"
+  "U+00DC"
+  "U+00DD"
+  "U+00DE"
+  "U+00DF"
+  "U+00E0"
+  "U+00E1"
+  "U+00E2"
+  "U+00E3"
+  "U+00E4"
+  "U+00E5"
+  "U+00E6"
+  "U+00E7"
+  "U+00E8"
+  "U+00E9"
+  "U+00EA"
+  "U+00EB"
+  "U+00EC"
+  "U+00ED"
+  "U+00EE"
+  "U+00EF"
+  "U+00F0"
+  "U+00F1"
+  "U+00F2"
+  "U+00F3"
+  "U+00F4"
+  "U+00F5"
+  "U+00F6"
+  "U+00F7"
+  "U+00F8"
+  "U+00F9"
+  "U+00FA"
+  "U+00FB"
+  "U+00FC"
+  "U+00FD"
+  "U+00FE"
+  "U+00FF"
+
+  # Box Drawing and Block Elements
+  "U+2500"
+  "U+2501"
+  "U+2502"
+  "U+2503"
+  "U+2504"
+  "U+2505"
+  "U+2506"
+  "U+2507"
+  "U+2508"
+  "U+2509"
+  "U+250A"
+  "U+250B"
+  "U+250C"
+  "U+250D"
+  "U+250E"
+  "U+250F"
+  "U+2510"
+  "U+2511"
+  "U+2512"
+  "U+2513"
+  "U+2514"
+  "U+2515"
+  "U+2516"
+  "U+2517"
+  "U+2518"
+  "U+2519"
+  "U+251A"
+  "U+251B"
+  "U+251C"
+  "U+251D"
+  "U+251E"
+  "U+251F"
+  "U+2520"
+  "U+2521"
+  "U+2522"
+  "U+2523"
+  "U+2524"
+  "U+2525"
+  "U+2526"
+  "U+2527"
+  "U+2528"
+  "U+2529"
+  "U+252A"
+  "U+252B"
+  "U+252C"
+  "U+252D"
+  "U+252E"
+  "U+252F"
+  "U+2530"
+  "U+2531"
+  "U+2532"
+  "U+2533"
+  "U+2534"
+  "U+2535"
+  "U+2536"
+  "U+2537"
+  "U+2538"
+  "U+2539"
+  "U+253A"
+  "U+253B"
+  "U+253C"
+  "U+253D"
+  "U+253E"
+  "U+253F"
+  "U+2540"
+  "U+2541"
+  "U+2542"
+  "U+2543"
+  "U+2544"
+  "U+2545"
+  "U+2546"
+  "U+2547"
+  "U+2548"
+  "U+2549"
+  "U+254A"
+  "U+254B"
+  "U+254C"
+  "U+254D"
+  "U+254E"
+  "U+254F"
+  "U+2550"
+  "U+2551"
+  "U+2552"
+  "U+2553"
+  "U+2554"
+  "U+2555"
+  "U+2556"
+  "U+2557"
+  "U+2558"
+  "U+2559"
+  "U+255A"
+  "U+255B"
+  "U+255C"
+  "U+255D"
+  "U+255E"
+  "U+255F"
+  "U+2560"
+  "U+2561"
+  "U+2562"
+  "U+2563"
+  "U+2564"
+  "U+2565"
+  "U+2566"
+  "U+2567"
+  "U+2568"
+  "U+2569"
+  "U+256A"
+  "U+256B"
+  "U+256C"
+  "U+256D"
+  "U+256E"
+  "U+256F"
+  "U+2570"
+  "U+2571"
+  "U+2572"
+  "U+2573"
+  "U+2574"
+  "U+2575"
+  "U+2576"
+  "U+2577"
+  "U+2578"
+  "U+2579"
+  "U+257A"
+  "U+257B"
+  "U+257C"
+  "U+257D"
+  "U+257E"
+  "U+257F"
+  "U+2580"
+  "U+2581"
+  "U+2582"
+  "U+2583"
+  "U+2584"
+  "U+2585"
+  "U+2586"
+  "U+2587"
+  "U+2588"
+  "U+2589"
+  "U+258A"
+  "U+258B"
+  "U+258C"
+  "U+258D"
+  "U+258E"
+  "U+258F"
+  "U+2590"
+  "U+2591"
+  "U+2592"
+  "U+2593"
+  #"U+2594"
+  #"U+2595"
+  "U+2596"
+  "U+2597"
+  "U+2598"
+  "U+2599"
+  "U+259A"
+  "U+259B"
+  "U+259C"
+  "U+259D"
+  "U+259E"
+  "U+259F"
+
+  # Braille Patterns
+  #"U+2800"
+  "U+2801"
+  "U+2802"
+  "U+2803"
+  "U+2804"
+  "U+2805"
+  "U+2806"
+  "U+2807"
+  "U+2808"
+  "U+2809"
+  "U+280A"
+  "U+280B"
+  "U+280C"
+  "U+280D"
+  "U+280E"
+  "U+280F"
+  "U+2810"
+  "U+2811"
+  "U+2812"
+  "U+2813"
+  "U+2814"
+  "U+2815"
+  "U+2816"
+  "U+2817"
+  "U+2818"
+  "U+2819"
+  "U+281A"
+  "U+281B"
+  "U+281C"
+  "U+281D"
+  "U+281E"
+  "U+281F"
+  "U+2820"
+  "U+2821"
+  "U+2822"
+  "U+2823"
+  "U+2824"
+  "U+2825"
+  "U+2826"
+  "U+2827"
+  "U+2828"
+  "U+2829"
+  "U+282A"
+  "U+282B"
+  "U+282C"
+  "U+282D"
+  "U+282E"
+  "U+282F"
+  "U+2830"
+  "U+2831"
+  "U+2832"
+  "U+2833"
+  "U+2834"
+  "U+2835"
+  "U+2836"
+  "U+2837"
+  "U+2838"
+  "U+2839"
+  "U+283A"
+  "U+283B"
+  "U+283C"
+  "U+283D"
+  "U+283E"
+  "U+283F"
+  "U+2840"
+  "U+2841"
+  "U+2842"
+  "U+2843"
+  "U+2844"
+  "U+2845"
+  "U+2846"
+  "U+2847"
+  "U+2848"
+  "U+2849"
+  "U+284A"
+  "U+284B"
+  "U+284C"
+  "U+284D"
+  "U+284E"
+  "U+284F"
+  "U+2850"
+  "U+2851"
+  "U+2852"
+  "U+2853"
+  "U+2854"
+  "U+2855"
+  "U+2856"
+  "U+2857"
+  "U+2858"
+  "U+2859"
+  "U+285A"
+  "U+285B"
+  "U+285C"
+  "U+285D"
+  "U+285E"
+  "U+285F"
+  "U+2860"
+  "U+2861"
+  "U+2862"
+  "U+2863"
+  "U+2864"
+  "U+2865"
+  "U+2866"
+  "U+2867"
+  "U+2868"
+  "U+2869"
+  "U+286A"
+  "U+286B"
+  "U+286C"
+  "U+286D"
+  "U+286E"
+  "U+286F"
+  "U+2870"
+  "U+2871"
+  "U+2872"
+  "U+2873"
+  "U+2874"
+  "U+2875"
+  "U+2876"
+  "U+2877"
+  "U+2878"
+  "U+2879"
+  "U+287A"
+  "U+287B"
+  "U+287C"
+  "U+287D"
+  "U+287E"
+  "U+287F"
+  "U+2880"
+  "U+2881"
+  "U+2882"
+  "U+2883"
+  "U+2884"
+  "U+2885"
+  "U+2886"
+  "U+2887"
+  "U+2888"
+  "U+2889"
+  "U+288A"
+  "U+288B"
+  "U+288C"
+  "U+288D"
+  "U+288E"
+  "U+288F"
+  "U+2890"
+  "U+2891"
+  "U+2892"
+  "U+2893"
+  "U+2894"
+  "U+2895"
+  "U+2896"
+  "U+2897"
+  "U+2898"
+  "U+2899"
+  "U+289A"
+  "U+289B"
+  "U+289C"
+  "U+289D"
+  "U+289E"
+  "U+289F"
+  "U+28A0"
+  "U+28A1"
+  "U+28A2"
+  "U+28A3"
+  "U+28A4"
+  "U+28A5"
+  "U+28A6"
+  "U+28A7"
+  "U+28A8"
+  "U+28A9"
+  "U+28AA"
+  "U+28AB"
+  "U+28AC"
+  "U+28AD"
+  "U+28AE"
+  "U+28AF"
+  "U+28B0"
+  "U+28B1"
+  "U+28B2"
+  "U+28B3"
+  "U+28B4"
+  "U+28B5"
+  "U+28B6"
+  "U+28B7"
+  "U+28B8"
+  "U+28B9"
+  "U+28BA"
+  "U+28BB"
+  "U+28BC"
+  "U+28BD"
+  "U+28BE"
+  "U+28BF"
+  "U+28C0"
+  "U+28C1"
+  "U+28C2"
+  "U+28C3"
+  "U+28C4"
+  "U+28C5"
+  "U+28C6"
+  "U+28C7"
+  "U+28C8"
+  "U+28C9"
+  "U+28CA"
+  "U+28CB"
+  "U+28CC"
+  "U+28CD"
+  "U+28CE"
+  "U+28CF"
+  "U+28D0"
+  "U+28D1"
+  "U+28D2"
+  "U+28D3"
+  "U+28D4"
+  "U+28D5"
+  "U+28D6"
+  "U+28D7"
+  "U+28D8"
+  "U+28D9"
+  "U+28DA"
+  "U+28DB"
+  "U+28DC"
+  "U+28DD"
+  "U+28DE"
+  "U+28DF"
+  "U+28E0"
+  "U+28E1"
+  "U+28E2"
+  "U+28E3"
+  "U+28E4"
+  "U+28E5"
+  "U+28E6"
+  "U+28E7"
+  "U+28E8"
+  "U+28E9"
+  "U+28EA"
+  "U+28EB"
+  "U+28EC"
+  "U+28ED"
+  "U+28EE"
+  "U+28EF"
+  "U+28F0"
+  "U+28F1"
+  "U+28F2"
+  "U+28F3"
+  "U+28F4"
+  "U+28F5"
+  "U+28F6"
+  "U+28F7"
+  "U+28F8"
+  "U+28F9"
+  "U+28FA"
+  "U+28FB"
+  "U+28FC"
+  "U+28FD"
+  "U+28FE"
+  "U+28FF"
+
+  # Superscripts and Subscripts
+  "U+2070"
+  "U+2074"
+  "U+2075"
+  "U+2076"
+  "U+2077"
+  "U+2078"
+  "U+2079"
+
+  "U+2080"
+  "U+2081"
+  "U+2082"
+  "U+2083"
+  "U+2084"
+  "U+2085"
+  "U+2086"
+  "U+2087"
+  "U+2088"
+  "U+2089"
+
+  # Powerline and Extra Symbols
+  "U+E0A0"
+  "U+E0A1"
+  "U+E0A2"
+  "U+E0B0"
+  "U+E0B1"
+  "U+E0B2"
+  "U+E0B3"
+
+  "U+E0A3" # column number
+  "U+E0B4" # right half circle
+  "U+E0B6" # left half circle }
+]
diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index 20b853f7bf00..0bb65e6b4e66 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -2,17 +2,13 @@
   lib,
   stdenvNoCC,
   fetchzip,
-  fetchgit,
+  writeText,
   bdf2psf,
-  # zstd,
+  codepoints ? (import ./default-codepoints.nix),
 }:
 
 let
-  aur = fetchgit {
-    url = "https://aur.archlinux.org/psf-cozette.git/";
-    rev = "1c0d5429310f21abf7dbfc358198f250d77fb0bd";
-    hash = "sha256-dZ+ayjR2tzUtjgN1peYBEcQgHIZE/K79IvWDBafP6eE=";
-  };
+  codepoints_set = writeText "codepoints.set" (builtins.concatStringsSep "\n" codepoints);
 in
 stdenvNoCC.mkDerivation rec {
   pname = "cozette";
@@ -26,7 +22,6 @@ stdenvNoCC.mkDerivation rec {
   };
 
   nativeBuildInputs = [ bdf2psf ];
-  # nativeBuildInputs = [ bdf2psf zstd ];
 
   postBuild = ''
     # Confine Powerline left divider symbols to strictly 6 pixels wide
@@ -36,10 +31,8 @@ stdenvNoCC.mkDerivation rec {
     # Fix for bdf2psf limitation (See https://github.com/slavfox/Cozette/issues/122#issuecomment-2165328416)
     sed -i -e 's/^BBX [2-8]/BBX 9/g' cozette_hidpi.bdf
 
-    bdf2psf --fb cozette.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${aur}/codepoints.set 512 cozette6x13.psfu
-    bdf2psf --fb cozette_hidpi.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${aur}/codepoints.set 512 cozette12x26.psfu
-    # zstd -f cozette6x13.psfu
-    # zstd -f cozette12x26.psfu
+    bdf2psf --fb cozette.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${codepoints_set} 512 cozette6x13.psfu
+    bdf2psf --fb cozette_hidpi.bdf ${bdf2psf}/share/bdf2psf/standard.equivalents ${codepoints_set} 512 cozette12x26.psfu
   '';
 
   installPhase = ''
@@ -53,7 +46,6 @@ stdenvNoCC.mkDerivation rec {
     install -Dm644 *.woff2 -t $out/share/fonts/woff2
 
     install -Dm644 *.psfu -t "$out/share/consolefonts/"
-    # install -Dm644 *.psfu.zst -t "$out/share/consolefonts/"
 
     runHook postInstall
   '';

From dbcc74bfe10b2a4bdc1b268a6b1624287a265087 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Tue, 18 Feb 2025 23:23:34 -0500
Subject: [PATCH 0003/1497] kodiPackages.six: set PYTHON_PATH

---
 pkgs/applications/video/kodi/addons/six/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix
index 0f07ec3cae79..9d7ecc1fad0d 100644
--- a/pkgs/applications/video/kodi/addons/six/default.nix
+++ b/pkgs/applications/video/kodi/addons/six/default.nix
@@ -16,8 +16,11 @@ buildKodiAddon rec {
     sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno=";
   };
 
-  passthru.updateScript = addonUpdateScript {
-    attrPath = "kodi.packages.six";
+  passthru = {
+    pythonPath = "lib";
+    updateScript = addonUpdateScript {
+      attrPath = "kodi.packages.six";
+    };
   };
 
   meta = with lib; {

From 9ad8aafad28f37dc6d6ffc98634525306e6db38e Mon Sep 17 00:00:00 2001
From: hakan-demirli <ehdemirli@gmail.com>
Date: Tue, 18 Feb 2025 01:03:04 +0300
Subject: [PATCH 0004/1497] veridian: init at d094c9d

---
 pkgs/by-name/ve/veridian/package.nix | 81 ++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 pkgs/by-name/ve/veridian/package.nix

diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix
new file mode 100644
index 000000000000..c9f6d5149ed7
--- /dev/null
+++ b/pkgs/by-name/ve/veridian/package.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+
+  cmake,
+  makeWrapper,
+  pkg-config,
+
+  boost,
+  fmt_11,
+  openssl,
+  sv-lang,
+  mimalloc,
+
+  verible,
+  verilator,
+}:
+rustPlatform.buildRustPackage {
+  pname = "veridian";
+  version = "0-unstable-2024-12-25";
+
+  src = fetchFromGitHub {
+    owner = "vivekmalneedi";
+    repo = "veridian";
+    rev = "d094c9d2fa9745b2c4430eef052478c64d5dd3b6";
+    hash = "sha256-3KjUunXTqdesvgDSeQMoXL0LRGsGQXZJGDt+xLWGovM=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-qJQD9HjSrrHdppbLNgLnXCycgzbmPePydZve3A8zGtU=";
+
+  buildFeatures = [ "slang" ];
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    fmt_11
+    openssl
+    sv-lang
+    mimalloc
+  ];
+
+  # the tests also need these to be on the PATH
+  nativeCheckInputs = [
+    verible
+    verilator
+  ];
+
+  postInstall =
+    let
+      runtimePathDeps = [
+        verible
+        verilator
+      ];
+    in
+    ''
+      wrapProgram $out/bin/veridian \
+        --prefix PATH : ${lib.makeBinPath runtimePathDeps}
+    '';
+
+  env = {
+    OPENSSL_NO_VENDOR = "1";
+    RUSTFLAGS = "-C link-args=-lmimalloc";
+    # this is needed so that veridian doesn't try to build the sv-lang package itself
+    SLANG_INSTALL_PATH = sv-lang;
+  };
+
+  meta = {
+    description = "SystemVerilog Language Server";
+    homepage = "https://github.com/vivekmalneedi/veridian";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.hakan-demirli ];
+  };
+}

From bec562981304f4997fd129b81c3aa49b72e93a0e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 9 Mar 2025 09:56:48 +0100
Subject: [PATCH 0005/1497] python313Packages.simplekv: fix inputs

---
 pkgs/development/python-modules/simplekv/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix
index 55daa60befe2..364b7156ba5f 100644
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@@ -26,8 +26,9 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [
-    dulwich
+  dependencies = [ dulwich ];
+
+  nativeCheckInputs = [
     mock
     pytestCheckHook
     six

From c8def8c2181fe49d78a50547fcbd1ac79aabf1f6 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 2 Mar 2025 13:15:35 +0100
Subject: [PATCH 0006/1497] rott: move to pkgs/by-name tree

---
 pkgs/{games/rott/default.nix => by-name/ro/rott/package.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                              | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{games/rott/default.nix => by-name/ro/rott/package.nix} (98%)

diff --git a/pkgs/games/rott/default.nix b/pkgs/by-name/ro/rott/package.nix
similarity index 98%
rename from pkgs/games/rott/default.nix
rename to pkgs/by-name/ro/rott/package.nix
index f9d39a527daa..40ffb1fe3831 100644
--- a/pkgs/games/rott/default.nix
+++ b/pkgs/by-name/ro/rott/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchurl,
   writeShellScript,
-  SDL,
+  SDL_compat,
   SDL_mixer,
   makeDesktopItem,
   copyDesktopItems,
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ copyDesktopItems ];
 
   buildInputs = [
-    SDL
+    SDL_compat
     SDL_mixer
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c29393bed25..16ad662a8a84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16412,9 +16412,7 @@ with pkgs;
     ncurses = ncurses5;
   };
 
-  rott = callPackage ../games/rott { SDL = SDL_compat; };
-
-  rott-shareware = rott.override {
+  rott-shareware = callPackage ../by-name/ro/rott/package.nix {
     buildShareware = true;
   };
 

From fa72edbde75f4f75a73266f82ee39e65513a5730 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 2 Mar 2025 16:19:15 +0100
Subject: [PATCH 0007/1497] rott: refactor

---
 pkgs/by-name/ro/rott/package.nix | 38 ++++++++++----------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ro/rott/package.nix b/pkgs/by-name/ro/rott/package.nix
index 40ffb1fe3831..a1b39f27c196 100644
--- a/pkgs/by-name/ro/rott/package.nix
+++ b/pkgs/by-name/ro/rott/package.nix
@@ -2,33 +2,19 @@
   stdenv,
   lib,
   fetchurl,
-  writeShellScript,
   SDL_compat,
   SDL_mixer,
   makeDesktopItem,
   copyDesktopItems,
-  runtimeShell,
   buildShareware ? false,
 }:
-
-let
-  # Allow the game to be launched from a user's PATH and load the game data from the user's home directory.
-  launcher = writeShellScript "rott" ''
-    set -eEuo pipefail
-    dir=$HOME/.rott/data
-    test -e $dir || mkdir -p $dir
-    cd $dir
-    exec @out@/libexec/rott "$@"
-  '';
-
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rott";
   version = "1.1.2";
 
   src = fetchurl {
-    url = "https://icculus.org/rott/releases/${pname}-${version}.tar.gz";
-    sha256 = "1zr7v5dv2iqx40gzxbg8mhac7fxz3kqf28y6ysxv1xhjqgl1c98h";
+    url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8=";
   };
 
   nativeBuildInputs = [ copyDesktopItems ];
@@ -38,7 +24,9 @@ stdenv.mkDerivation rec {
     SDL_mixer
   ];
 
-  sourceRoot = "rott-${version}/rott";
+  enableParallelBuilding = true;
+
+  sourceRoot = "rott-${finalAttrs.version}/rott";
 
   makeFlags = [
     "SHAREWARE=${if buildShareware then "1" else "0"}"
@@ -47,9 +35,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm555 -t $out/libexec rott
-    install -Dm555 ${launcher} $out/bin/${launcher.name}
-    substituteInPlace $out/bin/rott --subst-var out
+    install -Dm755 -t $out/bin rott
 
     runHook postInstall
   '';
@@ -63,12 +49,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "SDL port of Rise of the Triad";
     mainProgram = "rott";
     homepage = "https://icculus.org/rott/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sander ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ sander ];
+    platforms = lib.platforms.all;
   };
-}
+})

From c0f8e318d77c0c3d9afdd095632282c47555a322 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 2 Mar 2025 16:19:15 +0100
Subject: [PATCH 0008/1497] rott-shareware: include shareware data

---
 pkgs/by-name/ro/rott/package.nix | 38 +++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ro/rott/package.nix b/pkgs/by-name/ro/rott/package.nix
index a1b39f27c196..0a65dd4ae39e 100644
--- a/pkgs/by-name/ro/rott/package.nix
+++ b/pkgs/by-name/ro/rott/package.nix
@@ -2,22 +2,41 @@
   stdenv,
   lib,
   fetchurl,
+  fetchzip,
   SDL_compat,
   SDL_mixer,
   makeDesktopItem,
   copyDesktopItems,
+  unzip,
   buildShareware ? false,
+  withSharewareData ? buildShareware,
 }:
+assert withSharewareData -> buildShareware;
+
+let
+  datadir = "share/data/rott-shareware/";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rott";
   version = "1.1.2";
 
-  src = fetchurl {
-    url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8=";
-  };
+  __structuredAttrs = true;
+  srcs =
+    [
+      (fetchurl {
+        url = "https://icculus.org/rott/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+        hash = "sha256-ECUW6MMS9rC79sYj4fAcv7vDFKzorf4fIB1HsVvZJ/8=";
+      })
+    ]
+    ++ lib.optional withSharewareData (fetchzip {
+      url = "http://icculus.org/rott/share/1rott13.zip";
+      hash = "sha256-l0pP+mNPAabGh7LZrwcB6KOhPRSycrZpAlPVTyDXc6Y=";
+      stripRoot = false;
+    });
 
-  nativeBuildInputs = [ copyDesktopItems ];
+  sourceRoot = "rott-${finalAttrs.version}/rott";
+
+  nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional withSharewareData unzip;
 
   buildInputs = [
     SDL_compat
@@ -26,15 +45,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  sourceRoot = "rott-${finalAttrs.version}/rott";
-
   makeFlags = [
     "SHAREWARE=${if buildShareware then "1" else "0"}"
+    ''EXTRACFLAGS=-DDATADIR=\"${if withSharewareData then "${placeholder "out"}/${datadir}" else ""}\"''
   ];
 
   installPhase = ''
     runHook preInstall
 
+    ${lib.optionalString withSharewareData ''
+      mkdir -p "$out/${datadir}"
+      unzip -d "$out/${datadir}" ../../source/ROTTSW13.SHR
+    ''}
     install -Dm755 -t $out/bin rott
 
     runHook postInstall
@@ -53,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDL port of Rise of the Triad";
     mainProgram = "rott";
     homepage = "https://icculus.org/rott/";
-    license = lib.licenses.gpl2Plus;
+    license = with lib.licenses; [ gpl2Plus ] ++ lib.optional withSharewareData unfreeRedistributable;
     maintainers = with lib.maintainers; [ sander ];
     platforms = lib.platforms.all;
   };

From 723f9b5d881f0f4bbc0da909718f4abafd1e7b2c Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 3 Mar 2025 23:55:40 +0100
Subject: [PATCH 0009/1497] saxon: use stdenvNoCC instead of stdenv

---
 pkgs/development/libraries/java/saxon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 15f6d104a220..f0e34478e01e 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchurl,
   unzip,
   jre,
@@ -27,7 +27,7 @@ let
       license ? lib.licenses.mpl20,
       updateScript ? null,
     }:
-    stdenv.mkDerivation (
+    stdenvNoCC.mkDerivation (
       finalAttrs:
       let
         mainProgram = if prog == null then pname else prog;

From 8a8dab4758bc503f8df90dd712b1db5c4f17b4b3 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 3 Mar 2025 23:57:32 +0100
Subject: [PATCH 0010/1497] saxon: use installPhase instead of buildCommand

---
 pkgs/development/libraries/java/saxon/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index f0e34478e01e..e7d5cd8798a9 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -37,8 +37,9 @@ let
         inherit pname version src;
 
         nativeBuildInputs = [ unzip ];
+        dontUnpack = true;
 
-        buildCommand = ''
+        installPhase = ''
           unzip $src -d $out
           mkdir -p $out/bin $out/share $out/share/java
           cp -s "$out"/*.jar "$out/share/java/"  # */

From a1ac54e2679f77f09f69c5cd06acabc466cd4551 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 3 Mar 2025 23:58:23 +0100
Subject: [PATCH 0011/1497] saxon: use makeWrapper to create mainProgram and
 additional binaries

---
 .../libraries/java/saxon/default.nix          | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index e7d5cd8798a9..4d38f9a188b7 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -7,6 +7,7 @@
   jre8,
   genericUpdater,
   writeShellScript,
+  makeWrapper,
   common-updater-scripts,
   gnused,
 }:
@@ -36,22 +37,30 @@ let
       {
         inherit pname version src;
 
-        nativeBuildInputs = [ unzip ];
+        nativeBuildInputs = [
+          unzip
+          makeWrapper
+        ];
         dontUnpack = true;
 
-        installPhase = ''
-          unzip $src -d $out
-          mkdir -p $out/bin $out/share $out/share/java
-          cp -s "$out"/*.jar "$out/share/java/"  # */
-          rm -rf $out/notices
-          mv $out/doc $out/share
-          cat > $out/bin/${mainProgram} <<EOF
-          #! $shell
-          export JAVA_HOME=${jre}
-          exec ${jre}/bin/java -jar $out/${jar'}.jar "\$@"
-          EOF
-          chmod a+x $out/bin/${mainProgram}
-        '';
+        installPhase =
+          ''
+            unzip $src -d $out
+            mkdir -p $out/bin $out/share $out/share/java
+            cp -s "$out"/*.jar "$out/share/java/"  # */
+            rm -rf $out/notices
+            mv $out/doc $out/share
+
+            makeWrapper ${lib.getExe jre} $out/bin/${mainProgram} \
+              --add-flags "-jar $out/${jar'}.jar"
+          ''
+          + lib.optionalString (versionAtLeast finalAttrs.version "8") ''
+            makeWrapper ${lib.getExe jre} $out/bin/transform \
+              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Transform"
+
+            makeWrapper ${lib.getExe jre} $out/bin/query \
+              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Query"
+          '';
 
         passthru = lib.optionalAttrs (updateScript != null) {
           inherit updateScript;

From 09a349e10410d02cd7f283c97b1ffa877a432ed9 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 13 Mar 2025 09:27:01 +0100
Subject: [PATCH 0012/1497] saxon: use sri hashes

---
 pkgs/development/libraries/java/saxon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 4d38f9a188b7..d36d0b3cc711 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -123,7 +123,7 @@ in
     version = "6.5.3";
     src = fetchurl {
       url = "mirror://sourceforge/saxon/saxon${dashify version}.zip";
-      sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3";
+      hash = "sha256-Q28wzqyUCPBJ2C3a8acdG2lmeee8GeEAgg9z8oUfvlA=";
     };
     description = "XSLT 1.0 processor";
     # https://saxon.sourceforge.net/saxon6.5.3/conditions.html
@@ -137,7 +137,7 @@ in
     jar = "saxon8";
     src = fetchurl {
       url = "mirror://sourceforge/saxon/saxonb${dashify version}j.zip";
-      sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8";
+      hash = "sha256-aOk+BB5kAbZElAifVG+AP1bo7Se3patzISA40bzLf5U=";
     };
     description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0";
     java = jre8;

From 55fc5541738eda81a2876e5efa1a4001c4781a92 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <Bryan.Bennett@proton.me>
Date: Mon, 10 Mar 2025 16:09:32 -0400
Subject: [PATCH 0013/1497] python313Packages.simplekv: Move dulwich to
 nativeCheckInputs

---
 pkgs/development/python-modules/simplekv/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix
index 364b7156ba5f..42d0ffa39a54 100644
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@@ -26,9 +26,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ dulwich ];
-
   nativeCheckInputs = [
+    dulwich
     mock
     pytestCheckHook
     six

From 613cca1638182c1d4ca3edc3264c323b9e61c3b9 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <Bryan.Bennett@proton.me>
Date: Mon, 10 Mar 2025 16:10:01 -0400
Subject: [PATCH 0014/1497] python313Packages.simplekv: Add dependency groups
 for backends

---
 .../python-modules/simplekv/default.nix       | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix
index 42d0ffa39a54..85828fdb1ead 100644
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@@ -1,12 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  dulwich,
   fetchFromGitHub,
-  mock,
-  pytestCheckHook,
   pythonOlder,
   setuptools,
+
+  # optional dependencies
+  azure-storage-blob,
+  boto3,
+  dulwich,
+  google-cloud-storage,
+  pymongo,
+  redis,
+
+  # testing
+  mock,
+  pytestCheckHook,
   six,
 }:
 
@@ -27,11 +36,10 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
-    dulwich
     mock
     pytestCheckHook
     six
-  ];
+  ] ++ optional-dependencies.git;
 
   pythonImportsCheck = [ "simplekv" ];
 
@@ -40,6 +48,20 @@ buildPythonPackage rec {
     "test_concurrent_mkdir"
   ];
 
+  optional-dependencies = {
+    amazon = [ boto3 ];
+    azure = [ azure-storage-blob ];
+    google = [ google-cloud-storage ];
+    redis = [ redis ];
+    mongodb = [ pymongo ];
+    git = [ dulwich ];
+    /*
+      Additional potential dependencies not exposed here:
+        sqlalchemy: Our version is too new for simplekv
+        appengine-python-standard: Not packaged in nixpkgs
+    */
+  };
+
   meta = with lib; {
     description = "Simple key-value store for binary data";
     homepage = "https://github.com/mbr/simplekv";

From 01b6a6d00f7ab75cfc16721b840d3a32c416ced1 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <Bryan.Bennett@proton.me>
Date: Mon, 10 Mar 2025 16:14:12 -0400
Subject: [PATCH 0015/1497] python313Packages.simplekv: Add bbenne10 as
 maintainer

---
 pkgs/development/python-modules/simplekv/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/simplekv/default.nix b/pkgs/development/python-modules/simplekv/default.nix
index 85828fdb1ead..b47cef41fc9c 100644
--- a/pkgs/development/python-modules/simplekv/default.nix
+++ b/pkgs/development/python-modules/simplekv/default.nix
@@ -67,6 +67,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/mbr/simplekv";
     changelog = "https://github.com/mbr/simplekv/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [
+      fab
+      bbenne10
+    ];
   };
 }

From 15e3bd7ab07cbb2c761615c759ff1af0c8521b3f Mon Sep 17 00:00:00 2001
From: Bryan Bennett <Bryan.Bennett@proton.me>
Date: Mon, 10 Mar 2025 16:14:36 -0400
Subject: [PATCH 0016/1497] maintainer-list: update bbenne10 information

---
 maintainers/maintainer-list.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b9cc3b38425e..3086156ab95b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2726,17 +2726,11 @@
     name = "Brandon Elam Barker";
   };
   bbenne10 = {
-    email = "Bryan.Bennett@protonmail.com";
+    email = "Bryan.Bennett+nixpkgs@proton.me";
     matrix = "@bryan.bennett:matrix.org";
     github = "bbenne10";
     githubId = 687376;
     name = "Bryan Bennett";
-    keys = [
-      {
-        # compare with https://keybase.io/bbenne10
-        fingerprint = "41EA 00B4 00F9 6970 1CB2  D3AF EF90 E3E9 8B8F 5C0B";
-      }
-    ];
   };
   bbenno = {
     email = "nix@bbenno.com";

From 4d657c9c560a33b93290fce2ac22d36e6c8152b2 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 13 Mar 2025 09:33:12 +0100
Subject: [PATCH 0017/1497] saxon: use sourceRoot

---
 .../libraries/java/saxon/default.nix          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index d36d0b3cc711..b802b2b09711 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -41,26 +41,31 @@ let
           unzip
           makeWrapper
         ];
-        dontUnpack = true;
+
+        sourceRoot = ".";
 
         installPhase =
           ''
-            unzip $src -d $out
-            mkdir -p $out/bin $out/share $out/share/java
-            cp -s "$out"/*.jar "$out/share/java/"  # */
-            rm -rf $out/notices
-            mv $out/doc $out/share
+            runHook preInstall
 
+            install -Dm444 -t $out/share/java/ *.jar
+            mv doc $out/share
+
+            mkdir -p $out/bin
             makeWrapper ${lib.getExe jre} $out/bin/${mainProgram} \
-              --add-flags "-jar $out/${jar'}.jar"
+              --add-flags "-jar $out/share/java/${jar'}.jar"
+          ''
+          + lib.optionalString (versionAtLeast finalAttrs.version "11") ''
+            mv lib $out/share/java
           ''
           + lib.optionalString (versionAtLeast finalAttrs.version "8") ''
             makeWrapper ${lib.getExe jre} $out/bin/transform \
-              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Transform"
+              --add-flags "-cp $out/share/java/${jar'}.jar net.sf.saxon.Transform"
 
             makeWrapper ${lib.getExe jre} $out/bin/query \
-              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Query"
-          '';
+              --add-flags "-cp $out/share/java/${jar'}.jar net.sf.saxon.Query"
+          ''
+          + "runHook postInstall";
 
         passthru = lib.optionalAttrs (updateScript != null) {
           inherit updateScript;

From 133974d0174b36f6a15d75d7826d3087462f4949 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Tue, 25 Mar 2025 11:08:23 +0100
Subject: [PATCH 0018/1497] nixos/tailscale-auth: restart on-failure and wait
 for tailscaled

---
 nixos/modules/services/networking/tailscale-auth.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/tailscale-auth.nix b/nixos/modules/services/networking/tailscale-auth.nix
index 32ddbdfd155d..b9657ff4bc16 100644
--- a/nixos/modules/services/networking/tailscale-auth.nix
+++ b/nixos/modules/services/networking/tailscale-auth.nix
@@ -68,6 +68,7 @@ in
     systemd.services.tailscale-nginx-auth = {
       description = "Tailscale NGINX Authentication service";
       requires = [ "tailscale-nginx-auth.socket" ];
+      after = [ "tailscaled.service" ];
 
       serviceConfig = {
         ExecStart = getExe cfg.package;
@@ -107,6 +108,8 @@ in
           "~@privileged"
           "~@setuid"
         ];
+
+        Restart = "on-failure";
       };
     };
   };

From 65cc82caaec0458b8177246d1b725d32ff8a1052 Mon Sep 17 00:00:00 2001
From: 3pleX-dev <afuadajoe@gmail.com>
Date: Mon, 31 Mar 2025 10:28:08 +0000
Subject: [PATCH 0019/1497] cargo-component: 0.20.0 -> 0.21.1

---
 pkgs/by-name/ca/cargo-component/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index 9d052d9df626..b81d672dbcf1 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-component";
-  version = "0.20.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "cargo-component";
     rev = "v${version}";
-    hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
+    hash = "sha256-Tlx14q/2k/0jZZ1nECX7zF/xNTeMCZg/fN+fhRM4uhc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vnef3ApklZtN417dXhA+YWcsAeSTDSt6wA+7SjBKHm0=";
+  cargoHash = "sha256-ZwxVhoqAzkaIgcH9GMR+IGkJ6IOQVtmt0qcDjdix6cU=";
 
   nativeBuildInputs = [
     pkg-config

From 11badbc0093b552aab5b7e302d8cba40395d306d Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Wed, 2 Apr 2025 14:36:22 +0200
Subject: [PATCH 0020/1497] python312Packages.curl-cffi: 0.7.4 -> 0.10.0

---
 pkgs/development/python-modules/curl-cffi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index e5434c6247c3..1f55b5bc466f 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.7.4";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-Q1VppzQ1Go+ia1D1BemTf40o9wV0miWyoGy/tY+95qE==";
+    hash = "sha256-h7PPlxjIVT6T9x7gKBSifuWl8wzUNDwRcaUifUS0icM=";
   };
 
   patches = [ ./use-system-libs.patch ];

From d8f9c63512b01e519465476a4dc7acb0848d676b Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 2 Apr 2025 16:27:33 -0700
Subject: [PATCH 0021/1497] nixos/networkd: update valid KeepConfiguration
 values

These changed with the release of systemd v257 from "dhcp*" to
"dynamic*".
---
 nixos/modules/system/boot/networkd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 89d967ccc0bf..6b7b0ee336ac 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -899,8 +899,8 @@ let
           boolValues
           ++ [
             "static"
-            "dhcp-on-stop"
-            "dhcp"
+            "dynamic-on-stop"
+            "dynamic"
           ]
         ))
       ];

From 9bf1c6850bdb4d8cf65811941bf8e8562764f6f8 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 4 Apr 2025 22:12:58 +0200
Subject: [PATCH 0022/1497] pavucontrol: remove libpressureaudio build input

`libpressureaudio` is an alternative to `libpulseaudio` which is also
present in the build inputs. Since the latter is listed earlier, it
shadows the `libpressureaudio` during pkg-config lookup which means that
it's unused. This just bloats the closure for no reason.
---
 pkgs/by-name/pa/pavucontrol/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/pa/pavucontrol/package.nix b/pkgs/by-name/pa/pavucontrol/package.nix
index a7ca399e4946..bb0c09158d8c 100644
--- a/pkgs/by-name/pa/pavucontrol/package.nix
+++ b/pkgs/by-name/pa/pavucontrol/package.nix
@@ -15,7 +15,6 @@
   wrapGAppsHook4,
   meson,
   ninja,
-  libpressureaudio,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.optionals withLibcanberra libcanberra-gtk3)
     json-glib
     adwaita-icon-theme
-    libpressureaudio
   ];
 
   nativeBuildInputs = [

From fa56896456dd075d1db65105ed12c05e150276a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@mguentner.de>
Date: Sun, 6 Apr 2025 21:48:05 +0200
Subject: [PATCH 0023/1497] librespot: add withMDNS + withDNS-SD arguments

librespot always included the zeroconf mdns backend prior to
https://github.com/librespot-org/librespot/commit/94d174c33d30a4baa30799b4e9a85b63d4331b2c
(included in release 0.6.0).

This added the `with-libmdns` feature and enabled it by default,
reflecting the settings of 0.5.0.

Since the derivation disables all default features, switching to 0.6.0
silently removed the mdns zeroconf backend of librespot.

Also removes `avahi-compat` as buildInput for `withAvahi` as it is
not needed.
---
 pkgs/applications/audio/librespot/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 6a29a96e470b..bcb2d3a739f8 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -15,6 +15,8 @@
   libpulseaudio,
   withRodio ? true,
   withAvahi ? false,
+  withMDNS ? true,
+  withDNS-SD ? false,
   avahi-compat,
 }:
 
@@ -44,13 +46,15 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [ openssl ]
     ++ lib.optional withALSA alsa-lib
-    ++ lib.optional withAvahi avahi-compat
+    ++ lib.optional withDNS-SD avahi-compat
     ++ lib.optional withPortAudio portaudio
     ++ lib.optional withPulseAudio libpulseaudio;
 
   buildNoDefaultFeatures = true;
   buildFeatures =
     lib.optional withRodio "rodio-backend"
+    ++ lib.optional withMDNS "with-libmdns"
+    ++ lib.optional withDNS-SD "with-dns-sd"
     ++ lib.optional withALSA "alsa-backend"
     ++ lib.optional withAvahi "with-avahi"
     ++ lib.optional withPortAudio "portaudio-backend"

From 88ef9cf9940497d28bf392e4e497eea7eb090e9d Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Mon, 10 Mar 2025 23:50:41 -0500
Subject: [PATCH 0024/1497] zig: unconditionally enable strictDeps

strictDeps works with Clang after #318226.
---
 pkgs/development/compilers/zig/generic.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 0dba4983ea98..ddef3c1ef5b2 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -66,9 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  # strictDeps breaks zig when clang is being used.
-  # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
-  strictDeps = !stdenv.cc.isClang;
+  strictDeps = true;
 
   # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
   # which parses /System/Library/CoreServices/SystemVersion.plist and

From 82493b30a07543680635a18c94a0dfaee7c86af9 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Mon, 10 Mar 2025 23:57:25 -0500
Subject: [PATCH 0025/1497] zig: remove SystemVersion.plist from Darwin
 __impureHostDeps

[The default Nix sandbox profile already allows access to
SystemVersion.plist][1]. Drop it from `__impureHostDeps` as this is
redundant.

[1]: https://github.com/NixOS/nix/blob/cacab33f0df21c2ea54d553d75872bcf50717269/src/libstore/unix/build/sandbox-defaults.sb#L39-L42
---
 pkgs/development/compilers/zig/generic.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index ddef3c1ef5b2..707d3070e451 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -75,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
   # OSVersionDetectionFail when the sandbox is enabled.
   __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
     "/System/Library/CoreServices/.SystemVersionPlatform.plist"
-    "/System/Library/CoreServices/SystemVersion.plist"
   ];
 
   preBuild = ''

From 409d7cdfa9e855bc24868e69c4dde06447f7ebcd Mon Sep 17 00:00:00 2001
From: Gavin Zhao <git@gzgz.dev>
Date: Fri, 18 Apr 2025 00:16:45 -0400
Subject: [PATCH 0026/1497] zluda: provide fallback CMAKE_BUILD_TYPE

Signed-off-by: Gavin Zhao <git@gzgz.dev>
---
 pkgs/by-name/zl/zluda/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix
index c13e0440e4f9..7ffb292133af 100644
--- a/pkgs/by-name/zl/zluda/package.nix
+++ b/pkgs/by-name/zl/zluda/package.nix
@@ -55,6 +55,11 @@ rustPlatform.buildRustPackage rec {
 
   # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget;
+  # Future packagers:
+  # This is a fix for https://github.com/NixOS/nixpkgs/issues/390469. Ideally
+  # ZLUDA should configure this automatically. Therefore, on every new update,
+  # please try removing this line and see if ZLUDA builds.
+  env.CMAKE_BUILD_TYPE = "Release";
 
   preConfigure = ''
     # disable test written for windows only: https://github.com/vosen/ZLUDA/blob/774f4bcb37c39f876caf80ae0d39420fa4bc1c8b/zluda_inject/tests/inject.rs#L55

From 261aa665176b4641da822f068a4c2d4d242a3e07 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 22 Apr 2025 11:58:20 +0200
Subject: [PATCH 0027/1497] osquery: 5.16.0 -> 5.17.0

https://github.com/osquery/osquery/releases/tag/5.17.0
---
 pkgs/by-name/os/osquery/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osquery/info.json b/pkgs/by-name/os/osquery/info.json
index fa2e3291ad18..dfc1eff28dc9 100644
--- a/pkgs/by-name/os/osquery/info.json
+++ b/pkgs/by-name/os/osquery/info.json
@@ -1,13 +1,13 @@
 {
     "openssl": {
-        "hash": "sha256-g8cyn+UshQZ3115dCwyiRTCbl+jsvP3B39xKufrDWzk=",
-        "url": "https://www.openssl.org/source/openssl-3.2.1.tar.gz"
+        "hash": "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM=",
+        "url": "https://www.openssl.org/source/openssl-3.4.1.tar.gz"
     },
     "osquery": {
         "fetchSubmodules": true,
-        "hash": "sha256-Q5KiPqkyciuC5vlgBuY9ObRnDhM7Xhq6Oe5GbtatH/s=",
+        "hash": "sha256-zv6R6MR9uaizwkDWw0sT3XSzT1qmPDAkL9crbzBTKTk=",
         "owner": "osquery",
         "repo": "osquery",
-        "rev": "5.16.0"
+        "rev": "5.17.0"
     }
 }

From a2219e5559ab8626ec607b67e57fb22e3744efa8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 17 Apr 2025 19:15:28 +0900
Subject: [PATCH 0028/1497] pinact: ignore pre-release versions in updateScript

For example, v2.1.0-0, v3.0.0-0 and v3.0.4-0 are pre-release versions.
---
 pkgs/by-name/pi/pinact/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index a13b2f069682..64277582f4a5 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -34,7 +34,11 @@ buildGoModule {
   versionCheckProgramArg = "version";
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex=^v([\\d\\.]+)$"
+      ];
+    };
   };
 
   ldflags = [

From a8fd6871bc7fcd2f7c641c46dfe9de0c16108602 Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sat, 26 Apr 2025 20:19:11 +0200
Subject: [PATCH 0029/1497] perlPackages.NetMQTTSimple: Add IO::Socket::SSL

---
 pkgs/top-level/perl-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4590a9b3fd36..0a34c8806577 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25708,6 +25708,9 @@ with self;
       url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.28.tar.gz";
       hash = "sha256-Sp6hB+a8IuJrUzZ4oKPMbEI7N4TsP8ROjjM5t8Vr7gM=";
     };
+    propagatedBuildInputs = [
+      IOSocketSSL
+    ];
     meta = {
       description = "Minimal MQTT version 3 interface";
       license = with lib.licenses; [

From 3cef998e3880128858030cb49ef53bee67a71f13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Oct 2024 03:34:19 +0000
Subject: [PATCH 0030/1497] ns-usbloader: 7.1 -> 7.2

---
 pkgs/by-name/ns/ns-usbloader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ns/ns-usbloader/package.nix b/pkgs/by-name/ns/ns-usbloader/package.nix
index e06dd6f3b5d9..0d934b21e797 100644
--- a/pkgs/by-name/ns/ns-usbloader/package.nix
+++ b/pkgs/by-name/ns/ns-usbloader/package.nix
@@ -21,13 +21,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "ns-usbloader";
-  version = "7.1";
+  version = "7.2";
 
   src = fetchFromGitHub {
     owner = "developersu";
     repo = "ns-usbloader";
     rev = "v${version}";
-    sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w=";
+    sha256 = "sha256-nZfAZ+IjoYXEWwH9oOhOQ5TOYUNiAGAqhHRhskyx/Vo=";
   };
 
   patches = [

From 22d5893faec01fce7b9abbe9f9ba415f924c21b0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 28 Apr 2025 22:59:06 +0100
Subject: [PATCH 0031/1497] prelink: unstable-2019-06-24 ->
 20151030-unstable-2024-07-02

Without the change build fails on `gcc-14` as
https://hydra.nixos.org/build/294837353:

    execstack.c: In function 'execstack_make_rdwr':
    execstack.c:138:17: error: passing argument 1 of 'asprintf' from incompatible pointer type []
      138 |       asprintf (&prelink_path, "%s/%s", dirname, PRELINK_PROG EXEEXT);
          |                 ^~~~~~~~~~~~~
          |                 |
          |                 const char **
---
 pkgs/by-name/pr/prelink/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prelink/package.nix b/pkgs/by-name/pr/prelink/package.nix
index b149e2e857f5..b5328d7b5d05 100644
--- a/pkgs/by-name/pr/prelink/package.nix
+++ b/pkgs/by-name/pr/prelink/package.nix
@@ -5,17 +5,18 @@
   autoreconfHook,
   libelf,
   libiberty,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation {
   pname = "prelink";
-  version = "unstable-2019-06-24";
+  version = "20151030-unstable-2024-07-02";
 
   src = fetchgit {
-    url = "https://git.yoctoproject.org/git/prelink-cross";
+    url = "https://git.yoctoproject.org/prelink-cross";
     branchName = "cross_prelink";
-    rev = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37";
-    sha256 = "sha256-O9/oZooLRyUBBZX3SFcB6LFMmi2vQqkUlqtZnrq5oZc=";
+    rev = "ff2561c02ade96c5d4d56ddd4e27ff064840a176";
+    sha256 = "sha256-wmX7ybrZDWEop9fiInZMvgK/fpEk3sq+Wu8DSWWIvQY=";
   };
 
   strictDeps = true;
@@ -40,6 +41,8 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "ELF prelinking utility to speed up dynamic linking";
     homepage = "https://wiki.yoctoproject.org/wiki/Cross-Prelink";

From bb33175535573b926ad840e224a3529dc26ee0c4 Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Tue, 29 Apr 2025 09:21:06 +0200
Subject: [PATCH 0032/1497] whatsapp-chat-exporter: 0.10.5 -> 0.12.0

For further information about changes see the GitHub releases:
https://github.com/KnugiHK/WhatsApp-Chat-Exporter/releases
---
 pkgs/by-name/wh/whatsapp-chat-exporter/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
index bf5633e48c30..8577be591b41 100644
--- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
+++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
@@ -4,16 +4,19 @@
   fetchFromGitHub,
 }:
 
-python3Packages.buildPythonApplication rec {
+let
+  version = "0.12.0";
+in
+python3Packages.buildPythonApplication {
   pname = "whatsapp-chat-exporter";
-  version = "0.10.5";
-  format = "setuptools";
+  inherit version;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KnugiHK";
     repo = "Whatsapp-Chat-Exporter";
     tag = version;
-    hash = "sha256-TPXQaWnUy+blTS+Tz84K6cxJu4+dLbT2Dl9SKqlhDHY=";
+    hash = "sha256-0FJZqqmuSA+te5lzi1okkmuT3s2JNX7uHoYl9ayNt/Q=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From e9d158c842fed0e530682dd7dd2ef587900ab82e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 27 Apr 2025 18:55:42 +0200
Subject: [PATCH 0033/1497] pnpm.fetchDeps: allow overriding the pnpm version

---
 pkgs/development/tools/pnpm/fetch-deps/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index 7e2b82d9b414..45a051620072 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -10,11 +10,15 @@
   yq,
 }:
 
+let
+  pnpm' = pnpm;
+in
 {
   fetchDeps =
     {
       hash ? "",
       pname,
+      pnpm ? pnpm',
       pnpmWorkspaces ? [ ],
       prePnpmInstall ? "",
       pnpmInstallFlags ? [ ],
@@ -52,7 +56,7 @@
             cacert
             jq
             moreutils
-            pnpm
+            args.pnpm or pnpm'
             yq
           ];
 
@@ -109,7 +113,7 @@
 
           passthru = {
             serve = callPackage ./serve.nix {
-              inherit pnpm;
+              pnpm = args.pnpm or pnpm';
               pnpmDeps = finalAttrs.finalPackage;
             };
           };

From ec71f25aca0c85f41f599bf83de9df2301f98fef Mon Sep 17 00:00:00 2001
From: Merleur l'enchantin <le.neko@gmail.com>
Date: Thu, 1 May 2025 20:40:57 +0200
Subject: [PATCH 0034/1497] bitwig-studio: 5.3.5 -> 5.3.8

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index 38f8f1cac98c..a7eafdf1d201 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -31,12 +31,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio-unwrapped";
-  version = "5.3.5";
+  version = "5.3.8";
 
   src = fetchurl {
     name = "bitwig-studio-${version}.deb";
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-dfEWOQTZVMUb6v+u2wQlFgTXupokFTjWgKKA6W/Rrzc=";
+    hash = "sha256-ccDgNsKskEsaL3G5ISZUMckvFosMALFzEzOM9D4/Xgo=";
   };
 
   nativeBuildInputs = [

From 1c73ac43d63197a65ad82b936415cbb6dedc32c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Mon, 31 Mar 2025 15:14:31 +0100
Subject: [PATCH 0035/1497] tandoor-recipes: 1.5.32 -> 1.5.34

---
 pkgs/by-name/ta/tandoor-recipes/common.nix  | 6 +++---
 pkgs/by-name/ta/tandoor-recipes/package.nix | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index d840bc808327..887fd5c92410 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -1,15 +1,15 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.5.32";
+  version = "1.5.34";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    hash = "sha256-CNlst4bpvRSOPABg85k9xltbrZhs5MQLfJr+t7l7hhI=";
+    hash = "sha256-PnC1Z4UtHqfQOenNIQpxcRysD4Hpb/WfjDe0OZP/k+0=";
   };
 
-  yarnHash = "sha256-CFPofExwhvto6FVBXdsEY/uZaVKPkWaSdfqkEV7KY70=";
+  yarnHash = "sha256-IVCT1KUhShCXY5ocmOul7DMzTe6ULm32azFE8HES1vc=";
 
   meta = with lib; {
     homepage = "https://tandoor.dev/";
diff --git a/pkgs/by-name/ta/tandoor-recipes/package.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix
index 19da7136ab1e..fa463635a57b 100644
--- a/pkgs/by-name/ta/tandoor-recipes/package.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/package.nix
@@ -76,6 +76,10 @@ python.pkgs.buildPythonPackage {
     aiohttp
     inflection
     redis
+    requests-oauthlib
+    pyjwt
+    python3-openid
+    python3-saml
   ];
 
   configurePhase = ''

From cefb33646aee9e36f77e9f3f7a04b7487b137075 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sat, 3 May 2025 22:35:53 +0200
Subject: [PATCH 0036/1497] spectre-meltdown-checker: 0.46 ->
 0.46-unstable-2024-08-04

---
 pkgs/by-name/sp/spectre-meltdown-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
index 976647ff3e25..b71ef96afd80 100644
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spectre-meltdown-checker";
-  version = "0.46";
+  version = "0.46-unstable-2024-08-04";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-M4ngdtp2esZ+CSqZAiAeOnKtaK8Ra+TmQfMsr5q5gkg=";
+    rev = "34c6095912d115551f69435a55d6e0445932fdf9";
+    hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w=";
   };
 
   prePatch = ''

From 2da84ac31d69ddcdf70a9dff741d985fccccbabc Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sat, 3 May 2025 22:36:22 +0200
Subject: [PATCH 0037/1497] spectre-meltdown-checker: use replace-fail

---
 pkgs/by-name/sp/spectre-meltdown-checker/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
index b71ef96afd80..ed4fbb2e8693 100644
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   prePatch = ''
     substituteInPlace spectre-meltdown-checker.sh \
-      --replace /bin/echo ${coreutils}/bin/echo
+      --replace-fail /bin/echo ${coreutils}/bin/echo
   '';
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From ccb9ae1decb8350c88b63a88544b351caeca5e5f Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sat, 3 May 2025 22:37:57 +0200
Subject: [PATCH 0038/1497] spectre-meltdown-checker: add updateScript

---
 .../by-name/sp/spectre-meltdown-checker/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
index ed4fbb2e8693..e54ee54ffbbe 100644
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@@ -1,10 +1,11 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  makeBinaryWrapper,
-  coreutils,
   binutils-unwrapped,
+  coreutils,
+  fetchFromGitHub,
+  lib,
+  makeBinaryWrapper,
+  stdenv,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w=";
   };
 
+  passthru.updateScript = unstableGitUpdater { };
+
   prePatch = ''
     substituteInPlace spectre-meltdown-checker.sh \
       --replace-fail /bin/echo ${coreutils}/bin/echo

From bd3f055ed832f92cfd3d923ae27c8de2bc2e204c Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Sun, 4 May 2025 17:53:59 +0100
Subject: [PATCH 0039/1497] joplin-desktop: correct WMClass

This allows GNOME sessions launching Joplin know which window belongs to that app.
---
 pkgs/by-name/jo/joplin-desktop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index 2fcab1654d77..499909c465bd 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -64,6 +64,7 @@ let
       install -Dm644 ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop
       install -Dm644 ${appimageContents}/joplin.png $out/share/pixmaps/joplin.png
       substituteInPlace $out/share/applications/joplin.desktop \
+        --replace-fail StartupWMClass=Joplin StartupWMClass=@joplin/app-desktop \
         --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop'
     '';
 

From b58041abb1aaf09cde92843107f0288a191d6290 Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Wed, 7 May 2025 02:32:59 +0200
Subject: [PATCH 0040/1497] autopsy: fix java.lang.UnsatisfiedLinkError

Fix https://github.com/NixOS/nixpkgs/issues/338870
---
 pkgs/by-name/au/autopsy/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/au/autopsy/package.nix b/pkgs/by-name/au/autopsy/package.nix
index e9fc15a10076..1eec7007d043 100644
--- a/pkgs/by-name/au/autopsy/package.nix
+++ b/pkgs/by-name/au/autopsy/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     testdisk
     imagemagick
     jdkWithJfx
+    sleuthkit
   ];
 
   installPhase = ''
@@ -44,9 +45,11 @@ stdenv.mkDerivation rec {
     # Run the provided setup script to make files executable and copy sleuthkit
     TSK_JAVA_LIB_PATH="${sleuthkit}/share/java" bash $out/unix_setup.sh -j '${jdkWithJfx}' -n autopsy
 
+    # --add-flags "--nosplash" -> https://github.com/sleuthkit/autopsy/issues/6980
     substituteInPlace $out/bin/autopsy \
       --replace-warn 'APPNAME=`basename "$PRG"`' 'APPNAME=autopsy'
     wrapProgram $out/bin/autopsy \
+      --add-flags "--nosplash" \
       --run 'export SOLR_LOGS_DIR="$HOME/.autopsy/dev/var/log"' \
       --run 'export SOLR_PID_DIR="$HOME/.autopsy/dev"' \
       --prefix PATH : "${

From 34cd7596702ceb02bcd54f25e3c4628f5c855c1d Mon Sep 17 00:00:00 2001
From: Chan Siu Man <siuman.chan@gmail.com>
Date: Sun, 23 Mar 2025 08:48:11 -0700
Subject: [PATCH 0041/1497] ibus-table-chinese: 1.8.3 -> 1.8.12

Fixes https://github.com/NixOS/nixpkgs/issues/392191.

1. `github:definite/ibus-table-chinese` is deprecated by `github:mike-fabian/ibus-table-chinese`, as per the [README of github:definite/ibus-table-chinese](https://github.com/definite/ibus-table-chinese/blob/master/README).
2. `github:mike-fabian/ibus-table-chinese` is at `1.8.12`.
3. `github:mike-fabian/ibus-table-chinese` [removed the dependency on `cmake-fedora`](https://github.com/mike-fabian/ibus-table-chinese/commit/17239945c650cdeb289a9d36c1fceb2626060060).
4. This commit fixes `cmake` builds. (Which also fixes https://github.com/NixOS/nixpkgs/issues/392191.)
5. Optionally, this commit replaces `preBuild` and `postFixup` with `writableTmpDirAsHomeHook`.
---
 .../ibus-table-chinese/default.nix            | 56 +++----------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index 23341215e279..c87a32d9715d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -1,78 +1,40 @@
 {
   lib,
   stdenv,
-  fetchgit,
   fetchFromGitHub,
   pkg-config,
   ibus,
   ibus-table,
   python3,
   cmake,
+  writableTmpDirAsHomeHook,
 }:
 
 let
   src = fetchFromGitHub {
-    owner = "definite";
+    owner = "mike-fabian";
     repo = "ibus-table-chinese";
-    rev = "3380c96b5230721e9b80685a719508c505b8137a";
-    hash = "sha256-Ymzkim1k6KQxcSX2LaczRsxV2DYCFxIWI5xulmhOrw8=";
-  };
-
-  cmakeFedoraSrc = fetchgit {
-    url = "https://pagure.io/cmake-fedora.git";
-    rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992";
-    hash = "sha256-9uQbQ9hbiT+IpYh7guA4IOOIiLeeYuWc2EntePuWqVc=";
+    rev = "3a416012f3b898fe17225925f59d0672a8a0c0db";
+    sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM=";
   };
 in
 stdenv.mkDerivation {
   pname = "ibus-table-chinese";
-  version = "1.8.3";
+  version = "1.8.12";
 
-  srcs = [
-    src
-    cmakeFedoraSrc
-  ];
+  inherit src;
 
-  sourceRoot = src.name;
-
-  postUnpack = ''
-    chmod u+w -R ${cmakeFedoraSrc.name}
-    mv ${cmakeFedoraSrc.name}/* source/cmake-fedora
-  '';
-
-  preConfigure = ''
-    # cmake script needs ./Modules folder to link to cmake-fedora
-    ln -s cmake-fedora/Modules ./
-  '';
-
-  # Fails when writing to /prj_info.cmake in https://pagure.io/cmake-fedora/blob/master/f/Modules/ManageVersion.cmake
-  cmakeFlags = [
-    "-DPRJ_INFO_CMAKE_FILE=/dev/null"
-    "-DPRJ_DOC_DIR=REPLACE"
-    "-DDATA_DIR=share"
-  ];
-  # Must replace PRJ_DOC_DIR with actual share/ folder for ibus-table-chinese
-  # Otherwise it tries to write to /ibus-table-chinese if not defined (!)
   postConfigure = ''
-    substituteInPlace cmake_install.cmake --replace '/build/source/REPLACE' $out/share/ibus-table-chinese
+    substituteInPlace cmake_install.cmake --replace-fail /var/empty $out
+    substituteInPlace CMakeLists.txt --replace-fail /var/empty $out
   '';
   # Fails otherwise with "no such file or directory: <table>.txt"
   dontUseCmakeBuildDir = true;
-  # Fails otherwise sometimes with
-  # FileExistsError: [Errno 17] File exists: '/build/tmp.BfVAUM4llr/ibus-table-chinese/.local/share/ibus-table'
-  enableParallelBuilding = false;
-
-  preBuild = ''
-    export HOME=$(mktemp -d)/ibus-table-chinese
-  '';
-
-  postFixup = ''
-    rm -rf $HOME
-  '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [

From 4eb5ddb53decdf5314247e554d95e5e053c0e565 Mon Sep 17 00:00:00 2001
From: Vishal Das <26341736+dvishal485@users.noreply.github.com>
Date: Wed, 7 May 2025 22:46:38 +0530
Subject: [PATCH 0042/1497] signal-desktop: add commandLineArgs for persistent
 flags

---
 pkgs/by-name/si/signal-desktop/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 57b5baece03b..5581e4dff591 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -14,6 +14,10 @@
   replaceVars,
   noto-fonts-color-emoji,
   nixosTests,
+
+  # command line arguments which are always set e.g "--password-store=kwallet6"
+  commandLineArgs ? "",
+
   withAppleEmojis ? false,
 }:
 let
@@ -211,7 +215,8 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \
       --add-flags "$out/share/signal-desktop/app.asar" \
       --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
   '';

From 89187a62b44068351c8395ed28195bdfd81da9ef Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 8 May 2025 16:20:39 +0200
Subject: [PATCH 0043/1497] nixos/kandim: Fix pkg name withSecretProvisioning

https://github.com/NixOS/nixpkgs/blob/b22909a5fe8490fa06451718cf3224eea506dac8/pkgs/by-name/ka/kanidm/generic.nix#L156-L156
---
 nixos/modules/services/security/kanidm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 67b219595458..49624c457510 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -767,7 +767,7 @@ in
             -> cfg.package.enableSecretProvisioning;
           message = ''
             Specifying an admin account password or oauth2 basicSecretFile requires kanidm to be built with the secret provisioning patches.
-            You may want to set `services.kanidm.package = pkgs.kanidmWithSecretProvisioning;`.
+            You may want to set `services.kanidm.package = pkgs.kanidm.withSecretProvisioning;`.
           '';
         }
         # Entity names must be globally unique:

From cd3824f7bc8eaa57a3d2332a0c0349715c9ea35f Mon Sep 17 00:00:00 2001
From: ztmr <1504424+ztmr@users.noreply.github.com>
Date: Thu, 8 May 2025 15:25:27 +0100
Subject: [PATCH 0044/1497] nixos/alloy: add environmentFile option

This is a common practice among other NixOS modules, and allows
people to inject secrets via tools like `sops-nix` and similar.
---
 nixos/modules/services/monitoring/alloy.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/monitoring/alloy.nix b/nixos/modules/services/monitoring/alloy.nix
index fe0ed2cab8b3..e9d850b85a27 100644
--- a/nixos/modules/services/monitoring/alloy.nix
+++ b/nixos/modules/services/monitoring/alloy.nix
@@ -48,6 +48,15 @@ in
       '';
     };
 
+    environmentFile = lib.mkOption {
+      type = with lib.types; nullOr path;
+      default = null;
+      example = "/run/secrets/alloy.env";
+      description = ''
+        EnvironmentFile as defined in {manpage}`systemd.exec(5)`.
+      '';
+    };
+
     extraFlags = lib.mkOption {
       type = with lib.types; listOf str;
       default = [ ];
@@ -84,6 +93,7 @@ in
         StateDirectory = "alloy";
         WorkingDirectory = "%S/alloy";
         Type = "simple";
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
       };
     };
   };

From 07932025155462e4b0363b39d76188dffb91df6b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 9 May 2025 00:55:55 +0200
Subject: [PATCH 0045/1497] ignition: 1.1.3 -> 2.1.1

---
 pkgs/by-name/ig/ignition/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix
index 3d934752cce4..285bdfb7d6e1 100644
--- a/pkgs/by-name/ig/ignition/package.nix
+++ b/pkgs/by-name/ig/ignition/package.nix
@@ -10,6 +10,7 @@
   meson,
   ninja,
   pkg-config,
+  typescript,
   wrapGAppsHook4,
 
   gjs,
@@ -19,13 +20,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ignition";
-  version = "1.1.3";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "flattool";
     repo = "ignition";
     tag = finalAttrs.version;
-    hash = "sha256-XVBlwonMHb78XF6mpPYLJ68E5Tb+dFVFqNSsVCCS0xc=";
+    fetchSubmodules = true;
+    hash = "sha256-T0bVMJnJPpKdS5T6rPxVAEvIXFNSj5BtypaexSJhl2I=";
   };
 
   patches = [
@@ -46,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
+    typescript
     wrapGAppsHook4
   ];
 

From 484833bcf85721cea12e7ef8ca112a5bfcd7e112 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 9 May 2025 21:46:45 +0100
Subject: [PATCH 0046/1497] bootspec: 1.0.0 -> 1.0.1

Changes: https://github.com/DeterminateSystems/bootspec/releases/tag/v1.0.1
---
 pkgs/by-name/bo/bootspec/package.nix | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index b34ef43d0b2a..242a3450e1e0 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -2,32 +2,20 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "bootspec";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "bootspec";
     rev = "v${version}";
-    hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg=";
+    hash = "sha256-0MO+SqG7Gjq+fmMJkIFvaKsfTmC7z3lGfi7bbBv7iBE=";
   };
 
-  patches = [
-    # https://github.com/DeterminateSystems/bootspec/pull/127
-    # Fixes the synthesize tool for aarch64-linux
-    (fetchpatch {
-      name = "aarch64-support.patch";
-      url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch";
-      sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0=";
-    })
-
-  ];
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ=";
+  cargoHash = "sha256-fKbF5SyI0UlZTWsygdE8BGWuOoNSU4jx+CGdJoJFhZs=";
 
   meta = with lib; {
     description = "Implementation of RFC-0125's datatype and synthesis tooling";

From 4a80f62ecbe36ca1de4265d187e85556f479710c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 13:10:37 +0200
Subject: [PATCH 0047/1497] arrow-cpp: ignore one more test

---
 pkgs/by-name/ar/arrow-cpp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 44c23d06329c..eef9bf284287 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -281,6 +281,8 @@ stdenv.mkDerivation (finalAttrs: {
         # requires networking
         "arrow-gcsfs-test"
         "arrow-flight-integration-test"
+        # File already exists in database: orc_proto.proto
+        "arrow-orc-adapter-test"
       ];
     in
     ''

From 62fb31ee74ebc169f83dfe6a73bcf3f2cb820cd8 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:35:04 +0200
Subject: [PATCH 0048/1497] arrow-cpp: update for protobuf 30

fix:
arrow-cpp> /nix/store/wcv8n2k53w8sbffpf716gxj6mjb5jf26-binutils-2.44/bin/ld: release/libarrow.so.1900.1.0: undefined reference to `google::protobuf::internal::fixed_address_empty_string'
arrow-cpp> collect2: error: ld returned 1 exit status
---
 pkgs/by-name/ar/arrow-cpp/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index eef9bf284287..3ab226007d48 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -36,7 +36,7 @@
   openssl,
   perl,
   pkg-config,
-  protobuf_29,
+  protobuf,
   python3,
   rapidjson,
   re2,
@@ -61,9 +61,6 @@
 }:
 
 let
-  # https://github.com/apache/arrow/issues/45807
-  protobuf = protobuf_29;
-
   arrow-testing = fetchFromGitHub {
     name = "arrow-testing";
     owner = "apache";

From 93e26688f170c65813929728b5e7748a1dd21a19 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:10:14 +0200
Subject: [PATCH 0049/1497] arrow-cpp: enable Apache ORC

---
 pkgs/by-name/ar/arrow-cpp/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix
index 3ab226007d48..4ae15af60d36 100644
--- a/pkgs/by-name/ar/arrow-cpp/package.nix
+++ b/pkgs/by-name/ar/arrow-cpp/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   fixDarwinDylibNames,
+  apache-orc,
   autoconf,
   aws-sdk-cpp,
   aws-sdk-cpp-arrow ? aws-sdk-cpp.override {
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs =
     [
+      apache-orc
       boost
       brotli
       bzip2
@@ -170,6 +172,12 @@ stdenv.mkDerivation (finalAttrs: {
       nlohmann_json
     ];
 
+  # apache-orc looks for things in caps
+  env = {
+    LZ4_ROOT = lz4;
+    ZSTD_ROOT = zstd.dev;
+  };
+
   preConfigure = ''
     patchShebangs build-support/
     substituteInPlace "src/arrow/vendored/datetime/tz.cpp" \
@@ -214,6 +222,7 @@ stdenv.mkDerivation (finalAttrs: {
       "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}"
       "-DARROW_S3=${if enableS3 then "ON" else "OFF"}"
       "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}"
+      "-DARROW_ORC=ON"
       # Parquet options:
       "-DARROW_PARQUET=ON"
       "-DPARQUET_BUILD_EXECUTABLES=ON"

From 493cbcc714712f050bb97ab0eeb6fe346e4400e6 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 9 May 2025 12:04:54 +0200
Subject: [PATCH 0050/1497] python3Packages.pyarrow: check orc import

---
 pkgs/development/python-modules/pyarrow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 9b0cf844422a..15b489bd7b73 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -164,6 +164,7 @@ buildPythonPackage rec {
       "flight"
       "fs"
       "json"
+      "orc"
       "parquet"
     ];
 

From 55d05faa1f57d312b29a0a36386fd641a4aa344d Mon Sep 17 00:00:00 2001
From: Shelvacu <git@shelvacu.com>
Date: Sat, 10 May 2025 16:59:24 -0700
Subject: [PATCH 0051/1497] nodeenv: expose binary from python3Packages.nodeenv
 as an application package

---
 pkgs/by-name/no/nodeenv/package.nix | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 pkgs/by-name/no/nodeenv/package.nix

diff --git a/pkgs/by-name/no/nodeenv/package.nix b/pkgs/by-name/no/nodeenv/package.nix
new file mode 100644
index 000000000000..ddf3cd59ef3e
--- /dev/null
+++ b/pkgs/by-name/no/nodeenv/package.nix
@@ -0,0 +1,4 @@
+{
+  python3Packages,
+}:
+python3Packages.toPythonApplication python3Packages.nodeenv

From c00a9089374d41bb6f04c856ef05a9cdd37b2bff Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 11 May 2025 00:48:49 +0900
Subject: [PATCH 0052/1497] shogihome: refine updateScript to support electron
 version

---
 pkgs/by-name/sh/shogihome/package.nix | 34 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 3e67d315d25f..d891b32ed12f 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -11,6 +11,11 @@
   copyDesktopItems,
   commandLineArgs ? [ ],
   nix-update-script,
+  _experimental-update-script-combinators,
+  writeShellApplication,
+  nix,
+  jq,
+  gnugrep,
 }:
 
 let
@@ -124,11 +129,30 @@ buildNpmPackage (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex=^v([\\d\\.]+)$"
-      ];
-    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script {
+        extraArgs = [
+          "--version-regex=^v([\\d\\.]+)$"
+        ];
+      })
+      (lib.getExe (writeShellApplication {
+        name = "${finalAttrs.pname}-electron-updater";
+        runtimeInputs = [
+          nix
+          jq
+          gnugrep
+        ];
+        runtimeEnv = {
+          PNAME = finalAttrs.pname;
+          PKG_FILE = builtins.toString ./package.nix;
+        };
+        text = ''
+          new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
+          new_electron_major="$(jq '.devDependencies.electron' "$new_src/package.json" | grep --perl-regexp --only-matching '\d+' | head -n 1)"
+          sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE"
+        '';
+      }))
+    ];
   };
 
   meta = {

From d2358d770d1718d8b18752f72bd5dea96f6df9ed Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 11 May 2025 01:40:23 +0900
Subject: [PATCH 0053/1497] shogihome: 1.22.1 -> 1.23.0

Diff: https://github.com/sunfish-shogi/shogihome/compare/v1.22.1...v1.23.0

This patch was created using the following steps:

1. Removed outdated patch that was released in 1.23.0.
2. `nix-shell --pure maintainers/scripts/update.nix --argstr package shogihome`
3. Added a workaround to replace `process.resourcesPath`, it is required since this version:
  https://github.com/sunfish-shogi/shogihome/commit/161891d7ecaae32ab38744751b9528fb465429b5
  Without this replacement, the shogi board background image will not be displayed.
---
 pkgs/by-name/sh/shogihome/package.nix | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index d891b32ed12f..456bf64e8106 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -3,9 +3,8 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  fetchpatch,
   makeWrapper,
-  electron_35,
+  electron_36,
   vulkan-loader,
   makeDesktopItem,
   copyDesktopItems,
@@ -19,30 +18,20 @@
 }:
 
 let
-  electron = electron_35;
+  electron = electron_36;
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.22.1";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vVKdaFKOx4xm4BK+AjVr4cEDOHpOjOe58k2wUAhB9XA=";
+    hash = "sha256-uJ3cCwGp2cZ/6uCi0YmRZ+0Q9X7KuPfJRDbIUZqmdmU=";
   };
 
-  npmDepsHash = "sha256-OS5DR+24F98ICgQ6zL4VD231Rd5JB/gJKl+qNfnP3PE=";
-
-  patches = [
-    # Make it possible to load the electron-builder config without sideeffects.
-    # PR at https://github.com/sunfish-shogi/shogihome/pull/1184
-    # Should be removed next 1.22.X ShogiHome update or possibly 1.23.X.
-    (fetchpatch {
-      url = "https://github.com/sunfish-shogi/shogihome/commit/a075571a3bf4f536487e1212a2e7a13802dc7ec7.patch";
-      sha256 = "sha256-dJyaoWOC+fEufzpYenmfnblgd2C9Ymv4Cl8Y/hljY6c=";
-    })
-  ];
+  npmDepsHash = "sha256-QYTnOZ9eSE6H3iXbWCQG6FUlNR6LLQdsmsfayawolBQ=";
 
   postPatch = ''
     substituteInPlace package.json \
@@ -51,6 +40,10 @@ buildNpmPackage (finalAttrs: {
 
     substituteInPlace .electron-builder.config.mjs \
       --replace-fail 'AppImage' 'dir'
+
+    # Workaround for https://github.com/electron/electron/issues/31121
+    substituteInPlace src/background/window/path.ts \
+      --replace-fail 'process.resourcesPath' "'$out/share/lib/shogihome/resources'"
   '';
 
   env = {

From e9c93a13161bb1bda0e5510ee43243e58562904c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 11 May 2025 14:02:46 +0400
Subject: [PATCH 0054/1497] =?UTF-8?q?libsForQt5.qtpbfimageplugin:=204.0=20?=
 =?UTF-8?q?=E2=86=92=204.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/qtpbfimageplugin/default.nix         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 38629fe04c33..c19e971db598 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
-  version = "4.0";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "QtPBFImagePlugin";
     tag = version;
-    hash = "sha256-17mQ7aTpZhmsoAHhnueHSRTvCIHRcpWwZHZM+YUdeps=";
+    hash = "sha256-yk/DsLjNLqtmhvPcHDZGsNiAI1zBv1vBtgERvtNjF4I=";
   };
 
   nativeBuildInputs = [
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # Fix plugin dir
     substituteInPlace pbfplugin.pro \
-      --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+      --replace-warn "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Qt image plugin for displaying Mapbox vector tiles";
     longDescription = ''
       QtPBFImagePlugin is a Qt image plugin that enables applications capable of
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
       vector tiles without (almost) any application modifications.
     '';
     homepage = "https://github.com/tumic0/QtPBFImagePlugin";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 }

From e39a2999310d7d3fdbf56d17121d503bcd4cdb10 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 18:50:41 +0100
Subject: [PATCH 0055/1497] gpu-screen-recorder{,-gtk}: move to pkgs/by-name

---
 .../gp/gpu-screen-recorder-gtk/package.nix}                 | 0
 .../gp/gpu-screen-recorder/package.nix}                     | 0
 pkgs/top-level/all-packages.nix                             | 6 ------
 3 files changed, 6 deletions(-)
 rename pkgs/{applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix => by-name/gp/gpu-screen-recorder-gtk/package.nix} (100%)
 rename pkgs/{applications/video/gpu-screen-recorder/default.nix => by-name/gp/gpu-screen-recorder/package.nix} (100%)

diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
similarity index 100%
rename from pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
rename to pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
similarity index 100%
rename from pkgs/applications/video/gpu-screen-recorder/default.nix
rename to pkgs/by-name/gp/gpu-screen-recorder/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bf80e166da9..7a09f18c79b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12721,12 +12721,6 @@ with pkgs;
     withDoc = true;
   };
 
-  gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
-
-  gpu-screen-recorder-gtk =
-    callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
-      { };
-
   gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };
 
   gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };

From 2f3a205f64a9123a02077582c76d59d2cf4eeb0c Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Mon, 23 Dec 2024 05:18:04 +0100
Subject: [PATCH 0056/1497] gpu-screen-recorder{,-gtk}: add
 passthru.updateScript

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 3 +++
 pkgs/by-name/gp/gpu-screen-recorder/package.nix     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index fe4b4a391135..c87fdc10a912 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -19,6 +19,7 @@
   wayland,
   wrapGAppsHook3,
   wrapperDir ? "/run/wrappers/bin",
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
       })
     '';
 
+  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; };
+
   meta = {
     changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82";
     description = "GTK frontend for gpu-screen-recorder.";
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index a508f27f8c48..65f97cac4de6 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -22,6 +22,7 @@
   libXrandr,
   libXfixes,
   wrapperDir ? "/run/wrappers/bin",
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -82,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
       --suffix PATH : "$out/bin"
   '';
 
+  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder"; };
+
   meta = {
     description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only";
     homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";

From ee022814764a73749561b069ae3d677aea78ce44 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 19:42:44 +0100
Subject: [PATCH 0057/1497] gpu-screen-recorder{,-gtk}: use fetchgit instead of
 fetchurl

---
 .../gp/gpu-screen-recorder-gtk/package.nix      | 17 ++++++++---------
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index c87fdc10a912..d593aac17444 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchgit,
   pkg-config,
   addDriverRunpath,
   desktop-file-utils,
@@ -22,17 +22,16 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder-gtk";
   version = "5.1.6";
 
-  src = fetchurl {
-    url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-op5cDILQglVAW/oajc0rdrMC02JZZ8bdER1B1qWPkSk=";
+  src = fetchgit {
+    url = "https://repo.dec05eba.com/${pname}";
+    tag = version;
+    hash = "sha256-/0TyqSFBZ/6xwJnX8ePEQTSwrwgi5R8fmRw3wTS/6a8=";
   };
 
-  sourceRoot = ".";
-
   nativeBuildInputs = [
     desktop-file-utils
     pkg-config
@@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       })
     '';
 
-  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82";
@@ -80,4 +79,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ babbaj ];
     platforms = [ "x86_64-linux" ];
   };
-})
+}
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 65f97cac4de6..d6c2b043d11b 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchgit,
   makeWrapper,
   meson,
   ninja,
@@ -25,17 +25,16 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
   version = "5.2.0";
 
-  src = fetchurl {
-    url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-7aUW0WhoTpkJhj9WjjI2lnq+vOCG53vl/4DckHmLPBo=";
+  src = fetchgit {
+    url = "https://repo.dec05eba.com/${pname}";
+    tag = version;
+    hash = "sha256-8/EtO0nuretHWo7atgWXrmAPcvnYtdE06BkwlhbrNsI=";
   };
 
-  sourceRoot = ".";
-
   nativeBuildInputs = [
     pkg-config
     makeWrapper
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
       --suffix PATH : "$out/bin"
   '';
 
-  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder"; };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only";
@@ -93,4 +92,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.babbaj ];
     platforms = [ "x86_64-linux" ];
   };
-})
+}

From 9bfb3e72b7be38cc255e775cc22296b5f4b404b4 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 19:40:09 +0100
Subject: [PATCH 0058/1497] gpu-screen-recorder{,-gtk}: add myself as
 maintainer

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 5 ++++-
 pkgs/by-name/gp/gpu-screen-recorder/package.nix     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index d593aac17444..11ced0c9a965 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -76,7 +76,10 @@ stdenv.mkDerivation rec {
     homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/";
     license = lib.licenses.gpl3Only;
     mainProgram = "gpu-screen-recorder-gtk";
-    maintainers = with lib.maintainers; [ babbaj ];
+    maintainers = with lib.maintainers; [
+      babbaj
+      js6pak
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index d6c2b043d11b..37faf6346b54 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -89,7 +89,10 @@ stdenv.mkDerivation rec {
     homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";
     license = lib.licenses.gpl3Only;
     mainProgram = "gpu-screen-recorder";
-    maintainers = [ lib.maintainers.babbaj ];
+    maintainers = with lib.maintainers; [
+      babbaj
+      js6pak
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 6fe3a6135eb94799ca106aa38ba4c922d72709e7 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 2 Feb 2025 21:15:35 +0100
Subject: [PATCH 0059/1497] gpu-screen-recorder: 5.2.0 -> 5.5.3

---
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 37faf6346b54..538d9d32a7c8 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -12,6 +12,7 @@
   dbus,
   ffmpeg,
   wayland,
+  wayland-scanner,
   vulkan-headers,
   pipewire,
   libdrm,
@@ -27,12 +28,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
-  version = "5.2.0";
+  version = "5.5.3";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-8/EtO0nuretHWo7atgWXrmAPcvnYtdE06BkwlhbrNsI=";
+    hash = "sha256-XXSHTS/WWqGblbBLuzHSYCY5FVTDSHBHfBWubmoNSy0=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     pipewire
     wayland
+    wayland-scanner
     vulkan-headers
     libdrm
     libva

From f18cf012cfef88a114ab2c414e6302fec9a5e929 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 11 May 2025 17:16:25 +0200
Subject: [PATCH 0060/1497] nixos/gpu-screen-recorder: add `cap_sys_nice` back

This reverts commit 7b69d089ca4c96096f06ed848d55a28e41d6b271, because gpu-screen-recorder 5.5.2 fixes the original issue.
---
 nixos/modules/programs/gpu-screen-recorder.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/programs/gpu-screen-recorder.nix b/nixos/modules/programs/gpu-screen-recorder.nix
index 5a9401943dfe..156123de7a38 100644
--- a/nixos/modules/programs/gpu-screen-recorder.nix
+++ b/nixos/modules/programs/gpu-screen-recorder.nix
@@ -34,6 +34,12 @@ in
       capabilities = "cap_sys_admin+ep";
       source = "${package}/bin/gsr-kms-server";
     };
+    security.wrappers."gpu-screen-recorder" = {
+      owner = "root";
+      group = "root";
+      capabilities = "cap_sys_nice+ep";
+      source = "${package}/bin/gpu-screen-recorder";
+    };
   };
 
   meta.maintainers = with lib.maintainers; [ timschumi ];

From 110d7b29b30208a6aaa4e95b8c878e3d6e4c0709 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 2 Feb 2025 21:16:05 +0100
Subject: [PATCH 0061/1497] gpu-screen-recorder-gtk: 5.1.6 -> 5.7.0

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index 11ced0c9a965..c887c7e01fbb 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -24,12 +24,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder-gtk";
-  version = "5.1.6";
+  version = "5.7.0";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-/0TyqSFBZ/6xwJnX8ePEQTSwrwgi5R8fmRw3wTS/6a8=";
+    hash = "sha256-/s8FCV3hE7Gq1Ad6EhRNTZJwyskV+uRYvjJ43298AOw=";
   };
 
   nativeBuildInputs = [

From b94066224171c81d56a278c87eeb0f4509ab6139 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 8 May 2025 18:56:46 +0200
Subject: [PATCH 0062/1497] libresprite: 1.1 -> 1.2

---
 pkgs/by-name/li/libresprite/package.nix | 43 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix
index ce7e93fba84f..eb3ed3e133d7 100644
--- a/pkgs/by-name/li/libresprite/package.nix
+++ b/pkgs/by-name/li/libresprite/package.nix
@@ -18,6 +18,7 @@
   libX11,
   pixman,
   tinyxml-2,
+  xorg,
   zlib,
   SDL2,
   SDL2_image,
@@ -28,14 +29,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libresprite";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "LibreSprite";
     repo = "LibreSprite";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-piA/hLQqdfyVH4GPu5ElXZtowQL9AGaK7GhZOME4L0Q=";
+    hash = "sha256-jXjrA859hR46Cp5qi6Z1C+hLWCUR7yGlASOGlTveeW8=";
   };
 
   nativeBuildInputs = [
@@ -45,23 +46,27 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
   ];
 
-  buildInputs = [
-    curl
-    freetype
-    giflib
-    libjpeg
-    libpng
-    libwebp
-    libarchive
-    libX11
-    pixman
-    tinyxml-2
-    zlib
-    SDL2
-    SDL2_image
-    lua
-    # no v8 due to missing libplatform and libbase
-  ];
+  buildInputs =
+    [
+      curl
+      freetype
+      giflib
+      libjpeg
+      libpng
+      libwebp
+      libarchive
+      libX11
+      pixman
+      tinyxml-2
+      zlib
+      SDL2
+      SDL2_image
+      lua
+      # no v8 due to missing libplatform and libbase
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      xorg.libXi
+    ];
 
   cmakeFlags = [
     "-DWITH_DESKTOP_INTEGRATION=ON"

From 4848711568852e98e3452bcb77ad8b20e13626ea Mon Sep 17 00:00:00 2001
From: Fazzi <faaris.ansari@proton.me>
Date: Sun, 11 May 2025 23:11:04 +0100
Subject: [PATCH 0063/1497] app2unit: init at 0-unstable-2025-05-09

---
 pkgs/by-name/ap/app2unit/package.nix | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ap/app2unit/package.nix

diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
new file mode 100644
index 000000000000..206426146251
--- /dev/null
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  dash,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "app2unit";
+  version = "0-unstable-2025-05-09";
+
+  src = fetchFromGitHub {
+    owner = "Vladimir-csp";
+    repo = "app2unit";
+    rev = "7b9672a2dc16bdfbe7b7b7c27043529ca3bcb6ae";
+    sha256 = "03dnx5v75530fwppfgpjl6xzzmdbk73ymrlix129d9n5sqrz9wgk";
+  };
+
+  installPhase = ''
+    install -Dt $out/bin app2unit
+    ln -s $out/bin/app2unit $out/bin/app2unit-open
+  '';
+
+  dontPatchShebangs = true;
+  postFixup = ''
+    substituteInPlace $out/bin/app2unit \
+      --replace-fail '#!/bin/sh' '#!${lib.getExe dash}'
+  '';
+
+  meta = {
+    description = "Launches Desktop Entries as Systemd user units";
+    homepage = "https://github.com/Vladimir-csp/app2unit";
+    license = lib.licenses.gpl3;
+    mainProgram = "app2unit";
+    maintainers = with lib.maintainers; [ fazzi ];
+    platforms = lib.platforms.linux;
+  };
+}

From d3e0b0e297cbd867b35909fa55987cff9110ee82 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Mon, 12 May 2025 14:16:21 +0200
Subject: [PATCH 0064/1497] radicle: Remove sunset package aliases

---
 pkgs/top-level/aliases.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6f6dbc1d17dd..b918984c754c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1600,8 +1600,6 @@ mapAliases {
   radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
   radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
   radicale3 = radicale; # Added 2024-11-29
-  radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04
-  radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04
   railway-travel = diebahn; # Added 2024-04-01
   rambox-pro = rambox; # Added 2022-12-12
   rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28

From f41757fecf565e9666dc3e373ccd69ece0484cbd Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 13 May 2025 17:52:21 +0900
Subject: [PATCH 0065/1497] chawan: 0-unstable-2025-04-18 ->
 0-unstable-2025-05-13

* Add missing brotli dependency
  Without the Brotli development library, linking fails with the following error:
  > gcc: error: libbrotlidec: linker input file not found: no such file or directory

* Remove unused variable
---
 pkgs/by-name/ch/chawan/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index acd3bfeed975..353a22c5e5a6 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -9,20 +9,20 @@
   nim,
   pandoc,
   pkg-config,
+  brotli,
   zlib,
   unstableGitUpdater,
-  replaceVars,
 }:
 
 stdenv.mkDerivation {
   pname = "chawan";
-  version = "0-unstable-2025-04-18";
+  version = "0-unstable-2025-05-13";
 
   src = fetchFromSourcehut {
     owner = "~bptato";
     repo = "chawan";
-    rev = "656092f399d36c13a551b4a2474c8aded3388b1a";
-    hash = "sha256-GYCmRIswHFM+VehBlf8NSAt0ewrl7SVD0y9lLhFYkvo=";
+    rev = "5223a6e86f53dd47a5de33f5e8f1fe6206174329";
+    hash = "sha256-V9D1PqvqAvRfQvp+dINf9A1GJzCBX+UV9dRuRza+wK8=";
   };
 
   patches = [ ./mancha-augment-path.diff ];
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
     nim
     pandoc
     pkg-config
+    brotli
   ];
 
   buildInputs = [

From a1d904f9a4803e5c1a411e01307de25f212d6658 Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Thu, 15 May 2025 08:06:18 +0200
Subject: [PATCH 0066/1497] alacritty-graphics: init at 0.15.1

---
 pkgs/by-name/al/alacritty/package.nix | 32 ++++++++++++++++++++-------
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 6fd102d45387..b1e36dd0ea31 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -23,6 +23,7 @@
   xdg-utils,
 
   nix-update-script,
+  withGraphics ? false,
 }:
 let
   rpathLibs =
@@ -44,17 +45,32 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "alacritty";
-  version = "0.15.1";
+  version = "0.15.1" + lib.optionalString withGraphics "-graphics";
 
-  src = fetchFromGitHub {
-    owner = "alacritty";
-    repo = "alacritty";
-    tag = "v${version}";
-    hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
-  };
+  src =
+    # by default we want the official package
+    if !withGraphics then
+      fetchFromGitHub {
+        owner = "alacritty";
+        repo = "alacritty";
+        tag = "v${version}";
+        hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
+      }
+    # optionally we want to build the sixels feature fork
+    else
+      fetchFromGitHub {
+        owner = "ayosec";
+        repo = "alacritty";
+        tag = "v${version}";
+        hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM=";
+      };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M=";
+  cargoHash =
+    if !withGraphics then
+      "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="
+    else
+      "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57c631edd034..3221dff980ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -274,6 +274,8 @@ with pkgs;
         ''
       );
 
+  alacritty-graphics = callPackage ../by-name/al/alacritty/package.nix { withGraphics = true; };
+
   # addDriverRunpath is the preferred package name, as this enables
   # many more scenarios than just opengl now.
   aocd = with python3Packages; toPythonApplication aocd;

From 3196134d906ffeca4e56c9dae6b7062c6cd3f71c Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 15 May 2025 12:31:07 -0400
Subject: [PATCH 0067/1497] gleam: add myself as maintainer

---
 pkgs/by-name/gl/gleam/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index f5bf49d08e5f..ba739669ea84 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -53,7 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://gleam.run/";
     changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.philtaken ];
+    maintainers = with lib.maintainers; [
+      philtaken
+      llakala
+    ];
     teams = [ lib.teams.beam ];
   };
 })

From 21e7164d77ec2e5c9913159a94eac7b797e4f024 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 16 May 2025 06:28:28 +0100
Subject: [PATCH 0068/1497] libkate: 0.4.1 -> 0.4.3

Changes: https://gitlab.xiph.org/xiph/kate/-/blob/kate-0.4.3/ChangeLog?ref_type=tags
---
 pkgs/by-name/li/libkate/package.nix | 38 ++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/li/libkate/package.nix b/pkgs/by-name/li/libkate/package.nix
index 418e91d7ebb0..553ba6e89ce3 100644
--- a/pkgs/by-name/li/libkate/package.nix
+++ b/pkgs/by-name/li/libkate/package.nix
@@ -1,34 +1,50 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
+  autoreconfHook,
+  bison,
+  flex,
   libogg,
   libpng,
+  pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libkate";
-  version = "0.4.1";
+  version = "0.4.3";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${pname}-${version}.tar.gz";
-    sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4";
+  src = fetchFromGitLab {
+    domain = "gitlab.xiph.org/";
+    owner = "xiph";
+    repo = "kate";
+    tag = "kate-${finalAttrs.version}";
+    hash = "sha256-HwDahmjDC+O321Ba7MnHoQdHOFUMpFzaNdLHQeEg11Q=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    flex
+    pkg-config # provides macro PKG_CHECK_MODULES
+  ];
+
   buildInputs = [
     libogg
     libpng
   ];
 
-  meta = with lib; {
+  enableParallelBuilding = true;
+
+  meta = {
     description = "Library for encoding and decoding Kate streams";
     longDescription = ''
       This is libkate, the reference implementation of a codec for the Kate
       bitstream format. Kate is a karaoke and text codec meant for encapsulation
       in an Ogg container. It can carry Unicode text, images, and animate
       them.'';
-    homepage = "https://code.google.com/archive/p/libkate/";
-    platforms = platforms.unix;
-    license = licenses.bsd3;
+    homepage = "https://wiki.xiph.org/index.php/OggKate";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
   };
-}
+})

From a4854954965a0597ba85e082f4e93452aefc2de4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 May 2025 18:52:18 +0000
Subject: [PATCH 0069/1497] libsidplayfp: 2.13.1 -> 2.14.0

---
 pkgs/by-name/li/libsidplayfp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 6e26145bfbea..4d2c10f4a1cc 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.13.1";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U=";
+    hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];

From 58dc404ae053730777f87a96b7366a6978695d16 Mon Sep 17 00:00:00 2001
From: dansbandit <4530687+dansbandit@users.noreply.github.com>
Date: Tue, 11 Feb 2025 21:41:12 +0100
Subject: [PATCH 0070/1497] ocrodjvu: 0.13.2 -> 0.14;
 python3Packages.python-djvulibre: 0.9.1 -> 0.9.3

---
 pkgs/by-name/oc/ocrodjvu/package.nix          |  6 ++---
 .../python-djvulibre/default.nix              | 25 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix
index e42ceb81f101..039660149e7b 100644
--- a/pkgs/by-name/oc/ocrodjvu/package.nix
+++ b/pkgs/by-name/oc/ocrodjvu/package.nix
@@ -20,14 +20,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ocrodjvu";
-  version = "0.13.2";
+  version = "0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "FriedrichFroebel";
     repo = "ocrodjvu";
-    rev = version;
-    hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA=";
+    tag = version;
+    hash = "sha256-/TPo8YCE8JKKKBBeV12ilgTNDmuklwfy0TPI/7dBiOs=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix
index 235e12246730..c505e132ee07 100644
--- a/pkgs/development/python-modules/python-djvulibre/default.nix
+++ b/pkgs/development/python-modules/python-djvulibre/default.nix
@@ -1,44 +1,41 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
-  cython,
   djvulibre,
   ghostscript_headless,
-  packaging,
   pkg-config,
-  setuptools,
   unittestCheckHook,
-  wheel,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "python-djvulibre";
-  version = "0.9.1";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "FriedrichFroebel";
     repo = "python-djvulibre";
     tag = version;
-    hash = "sha256-5jOJyVPGJvR4YgxgJgyN47/OzsK3ASJXfn1Gt9y8rbs=";
+    hash = "sha256-ntDRntNxVchZm+i+qBbiZlfHAXJRKMin9Hi+BoJQjTM=";
   };
 
-  nativeBuildInputs = [
-    cython
-    packaging
+  build-system = [
+    python3Packages.cython
+    djvulibre
+    ghostscript_headless
     pkg-config
-    setuptools
-    wheel
+    python3Packages.setuptools
   ];
 
-  buildInputs = [
+  dependencies = with python3Packages; [
     djvulibre
     ghostscript_headless
   ];
 
   preCheck = ''
     rm -rf djvu
+    rm -rf tests/examples
   '';
 
   nativeCheckInputs = [ unittestCheckHook ];

From 3a45ce7bb0779c0da6bb38602d6e0cd553132881 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 16 May 2025 23:44:54 +0200
Subject: [PATCH 0071/1497] adw-gtk3: 5.10 -> 6.2

---
 pkgs/by-name/ad/adw-gtk3/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index 7511b95242c7..de4424e7a986 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -5,34 +5,27 @@
   nix-update-script,
   meson,
   ninja,
-  sassc,
+  dart-sass,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adw-gtk3";
-  version = "5.10";
+  version = "6.2";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "adw-gtk3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10=";
+    hash = "sha256-YYaqSEnIYHHkY4L3UhFBkR3DehoB6QADhSGOP/9NKx8=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    sassc
+    dart-sass
   ];
 
-  postPatch = ''
-    chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
-    patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Theme from libadwaita ported to GTK-3";

From 4f91e6463eedb45a9ce6a37083f46cfe7f595532 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 16 May 2025 23:45:04 +0200
Subject: [PATCH 0072/1497] adw-gtk3: add myself as maintainer

---
 pkgs/by-name/ad/adw-gtk3/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index de4424e7a986..395f60d5571f 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -32,6 +32,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/lassekongo83/adw-gtk3";
     license = lib.licenses.lgpl21Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ciferkey ];
+    maintainers = with lib.maintainers; [
+      ciferkey
+      Gliczy
+    ];
   };
 })

From b7ae196d3f6e5c3f3fbff73aff73b6697514c041 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sat, 17 May 2025 19:25:28 +0900
Subject: [PATCH 0073/1497] shogihome: 1.23.0 -> 1.23.2

Diff: https://github.com/sunfish-shogi/shogihome/compare/v1.23.0...v1.23.2
---
 pkgs/by-name/sh/shogihome/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 456bf64e8106..31fbead6651d 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.23.0";
+  version = "1.23.2";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uJ3cCwGp2cZ/6uCi0YmRZ+0Q9X7KuPfJRDbIUZqmdmU=";
+    hash = "sha256-tZw9iEhZ5ss+mv/WUFaj+xQ6GP4GAHq+PvBOv6F5tgM=";
   };
 
-  npmDepsHash = "sha256-QYTnOZ9eSE6H3iXbWCQG6FUlNR6LLQdsmsfayawolBQ=";
+  npmDepsHash = "sha256-dx66k82o+TWrrK9xBHPbnudDn0CG8mM7c1xeoSAM4Fs=";
 
   postPatch = ''
     substituteInPlace package.json \

From ca8ccdb5f20dfc080a87d7b92a5fb4ee0cf3248c Mon Sep 17 00:00:00 2001
From: Merleur l'enchantin <le.neko@gmail.com>
Date: Sun, 18 May 2025 00:50:21 +0200
Subject: [PATCH 0074/1497] bitwig-studio: fix missing lcms dependency

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index a7eafdf1d201..b4918bcd7eb6 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -11,6 +11,7 @@
   glib,
   gtk3,
   harfbuzz,
+  lcms,
   lib,
   libglvnd,
   libjack2,
@@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     harfbuzz
+    lcms
     libglvnd
     libjack2
     # libjpeg8 is required for converting jpeg's to colour palettes

From 712e1a622e7dd630d8c3b4e71ad9a6bfa4fd8c51 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Mon, 19 May 2025 04:19:14 +0900
Subject: [PATCH 0075/1497] super-productivity: 12.0.5 -> 13.0.10

Updates super-productivity to 13.0.10.
This addresses the changes in the build process and cleans some files in
the output that were not used.
I have found that this app only needs the `app.asar` file to run, so
many files were cleaned in this commit.
---
 .../by-name/su/super-productivity/package.nix | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 78fe7df51084..787b57039a6e 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -7,27 +7,25 @@
   makeDesktopItem,
   nix-update-script,
   npm-lockfile-fix,
-  python3,
   stdenv,
 }:
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "12.0.5";
+  version = "13.0.10";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw=";
+    hash = "sha256-2K/6T4f9tLlrKimT/DPSdoz8LHij5nsaF6BWSQf6u7U=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c=";
-  npmFlags = [ "--legacy-peer-deps" ];
+  npmDepsHash = "sha256-l9P11ZvLYiTu/cVPQIw391ZTJ0K+cNPUzoVMsdze2uo=";
   makeCacheWritable = true;
 
   env = {
@@ -36,19 +34,11 @@ buildNpmPackage rec {
     CSC_IDENTITY_AUTO_DISCOVERY = "false";
   };
 
-  nativeBuildInputs =
-    [ copyDesktopItems ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
-      (python3.withPackages (ps: [ ps.setuptools ]))
-    ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
-  # package.json does not include `core-js` and the comment suggests
-  # it is only needed on some mobile platforms
   postPatch = ''
     substituteInPlace electron-builder.yaml \
       --replace-fail "notarize: true" "notarize: false"
-    substituteInPlace src/polyfills.ts \
-      --replace-fail "import 'core-js/es/object';" ""
   '';
 
   buildPhase = ''
@@ -58,8 +48,8 @@ buildNpmPackage rec {
     cp -r ${electron.dist} electron-dist
     chmod -R u+w electron-dist
 
-    npm run buildFrontend:prod:es6
-    npm run electron:build
+    npm run prepare
+    npm run build
     npm exec electron-builder -- --dir \
       -c.electronDist=electron-dist \
       -c.electronVersion=${electron.version}
@@ -79,18 +69,12 @@ buildNpmPackage rec {
         ''
       else
         ''
-          mkdir -p $out/share/super-productivity/{app,defaults,static/plugins,static/resources/plugins}
-          cp -r app-builds/*-unpacked/{locales,resources{,.pak}} "$out/share/super-productivity/app"
-
-          for size in 16 32 48 64 128 256 512 1024; do
-            local sizexsize="''${size}x''${size}"
-            mkdir -p $out/share/icons/hicolor/$sizexsize/apps
-            cp -v build/icons/$sizexsize.png \
-              $out/share/icons/hicolor/$sizexsize/apps/super-productivity.png
-          done
+          mkdir -p $out/share/{super-productivity,icons/hicolor/scalable/apps}
+          cp -r app-builds/*-unpacked/resources/app.asar $out/share/super-productivity
+          cp electron/assets/icons/ico-circled.svg $out/share/icons/hicolor/scalable/apps/super-productivity.svg
 
           makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \
-            --add-flags "$out/share/super-productivity/app/resources/app.asar" \
+            --add-flags "$out/share/super-productivity/app.asar" \
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
             --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
             --inherit-argv0
@@ -110,8 +94,11 @@ buildNpmPackage rec {
       type = "Application";
       icon = "super-productivity";
       startupWMClass = "superProductivity";
-      comment = builtins.replaceStrings [ "\n" ] [ " " ] meta.longDescription;
-      categories = [ "Utility" ];
+      comment = "ToDo list and Time Tracking";
+      categories = [
+        "Office"
+        "ProjectManagement"
+      ];
     })
   ];
 

From 2e3bb9581af4775889d690f19bd4dbc911dbebad Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Sun, 18 May 2025 23:50:57 +0000
Subject: [PATCH 0076/1497] nixos/nix-required-mounts: example typo

`s/ifps/ipfs/`

I happened to see it and I cannot unsee it ;-;

Signed-off-by: benaryorg <binary@benary.org>
---
 nixos/modules/programs/nix-required-mounts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix
index 47019dafab8f..787947226e79 100644
--- a/nixos/modules/programs/nix-required-mounts.nix
+++ b/nixos/modules/programs/nix-required-mounts.nix
@@ -90,7 +90,7 @@ in
           }
         '';
         example.require-ipfs.paths = [ "/ipfs" ];
-        example.require-ipfs.onFeatures = [ "ifps" ];
+        example.require-ipfs.onFeatures = [ "ipfs" ];
       };
     extraWrapperArgs = lib.mkOption {
       type = with lib.types; listOf str;

From 1e2df291f14c433663d5755b48f891c98724f26e Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 24 Mar 2025 20:27:34 +0900
Subject: [PATCH 0077/1497] anki: minorly simplify build

Upstream makes it easier to build offline now, simplify the yarn part a
little
---
 pkgs/games/anki/default.nix | 38 ++++---------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 8e1d69a26acf..c5b0df865df8 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -19,7 +19,6 @@
   qt6,
   rsync,
   rustPlatform,
-  writeShellScriptBin,
   yarn,
 
   swift,
@@ -52,38 +51,10 @@ let
 
   anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]);
 
-  # anki shells out to git to check its revision, and also to update submodules
-  # We don't actually need the submodules, so we stub that out
-  fakeGit = writeShellScriptBin "git" ''
-    case "$*" in
-      "rev-parse --short=8 HEAD")
-        echo ${builtins.substring 0 8 rev}
-      ;;
-      *"submodule update "*)
-        exit 0
-      ;;
-      *)
-        echo "Unrecognized git: $@"
-        exit 1
-      ;;
-    esac
-  '';
-
-  # We don't want to run pip-sync, it does network-io
-  fakePipSync = writeShellScriptBin "pip-sync" ''
-    exit 0
-  '';
-
-  offlineYarn = writeShellScriptBin "yarn" ''
-    [[ "$1" == "install" ]] && exit 0
-    exec ${yarn}/bin/yarn --offline "$@"
-  '';
-
   pyEnv = buildEnv {
     name = "anki-pyenv-${version}";
     paths = with python3.pkgs; [
       pip
-      fakePipSync
       anki-build-python
     ];
     pathsToLink = [ "/bin" ];
@@ -134,8 +105,7 @@ python3.pkgs.buildPythonApplication {
   inherit cargoDeps yarnOfflineCache;
 
   nativeBuildInputs = [
-    fakeGit
-    offlineYarn
+    yarn
     fixup-yarn-lock
 
     cargo
@@ -227,10 +197,12 @@ python3.pkgs.buildPythonApplication {
     # Activate optimizations
     RELEASE = true;
 
+    # https://github.com/ankitects/anki/blob/24.11/docs/linux.md#packaging-considerations
+    OFFLINE_BUILD = "1";
     NODE_BINARY = lib.getExe nodejs;
     PROTOC_BINARY = lib.getExe protobuf;
     PYTHON_BINARY = lib.getExe python3;
-    YARN_BINARY = lib.getExe offlineYarn;
+    YARN_BINARY = lib.getExe yarn;
   };
 
   buildPhase = ''
@@ -240,8 +212,6 @@ python3.pkgs.buildPythonApplication {
     mkdir -p out/pylib/anki .git
 
     echo ${builtins.substring 0 8 rev} > out/buildhash
-    touch out/env
-    touch .git/HEAD
 
     ln -vsf ${pyEnv} ./out/pyenv
     rsync --chmod +w -avP ${anki-nodemodules}/ out/node_modules/

From 3e76f46fb9335648771914ce0bdac86fcb6e952a Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 24 Mar 2025 22:50:49 +0900
Subject: [PATCH 0078/1497] anki: 24.11 -> 25.02.5

This update is a bit more involved than previous ones because the yarn
format also updated to yarn-berry, so we have to deal with that.
---
 pkgs/games/anki/default.nix         |  94 ++++++++++++------------
 pkgs/games/anki/missing-hashes.json | 109 ++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/games/anki/missing-hashes.json

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c5b0df865df8..ab520dea5da0 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -2,24 +2,25 @@
   lib,
   stdenv,
 
+  writableTmpDirAsHomeHook,
   buildEnv,
   cargo,
   fetchFromGitHub,
-  fetchYarnDeps,
   installShellFiles,
   lame,
   mpv-unwrapped,
   ninja,
   nixosTests,
   nodejs,
-  nodejs-slim,
-  fixup-yarn-lock,
+  jq,
   protobuf,
   python3,
   qt6,
   rsync,
   rustPlatform,
+  writeShellScriptBin,
   yarn,
+  yarn-berry_4,
 
   swift,
 
@@ -27,27 +28,42 @@
 }:
 
 let
+  yarn-berry = yarn-berry_4;
+
   pname = "anki";
-  version = "24.11";
-  rev = "87ccd24efd0ea635558b1679614b6763e4f514eb";
+  version = "25.02.5";
+  rev = "29192d156ae60d6ce35e80ccf815a8331c9db724";
+
+  srcHash = "sha256-lx3tK57gcQpwmiqUzO6iU7sE31LPFp6s80prYaB2jHE=";
+  cargoHash = "sha256-BPCfeUiZ23FdZaF+zDUrRZchauNZWQ3gSO+Uo9WRPes=";
+  yarnHash = "sha256-3G+9N3xOzog3XDCKDQJCY/6CB3i6oXixRgxEyv7OG3U=";
 
   src = fetchFromGitHub {
     owner = "ankitects";
     repo = "anki";
     rev = version;
-    hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA=";
+    hash = srcHash;
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-4V75+jS250XfUH6B4VBxtL2t308nyKzhDoq86kq6rp4=";
+    hash = cargoHash;
   };
 
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-4KQKWwlr+FuUmomKO3TEoDoSStjnyLutDxCfqGr6jzk=";
-  };
+  # a wrapper for yarn to skip 'install'
+  # We do this because we need to patchShebangs after install, so we do it
+  # ourselves beforehand.
+  # We also, confusingly, have to use yarn-berry to handle the lockfile (anki's
+  # lockfile is too new for yarn), but have to use 'yarn' here, because anki's
+  # build system uses yarn-1 style flags and such.
+  # I think what's going on here is that yarn-1 in anki's normal build system
+  # ends up noticing the yarn-file is too new and shelling out to yarn-berry
+  # itself.
+  noInstallYarn = writeShellScriptBin "yarn" ''
+    [[ "$1" == "install" ]] && exit 0
+    exec ${yarn}/bin/yarn "$@"
+  '';
 
   anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]);
 
@@ -59,33 +75,8 @@ let
     ];
     pathsToLink = [ "/bin" ];
   };
-
-  # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3
-  anki-nodemodules = stdenv.mkDerivation {
-    pname = "anki-nodemodules";
-
-    inherit version src yarnOfflineCache;
-
-    nativeBuildInputs = [
-      nodejs-slim
-      fixup-yarn-lock
-      yarn
-    ];
-
-    configurePhase = ''
-      export HOME=$NIX_BUILD_TOP
-      yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-      fixup-yarn-lock yarn.lock
-      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules/
-    '';
-
-    installPhase = ''
-      mv node_modules $out
-    '';
-  };
 in
-python3.pkgs.buildPythonApplication {
+python3.pkgs.buildPythonApplication rec {
   inherit pname version;
 
   outputs = [
@@ -102,18 +93,26 @@ python3.pkgs.buildPythonApplication {
     ./patches/skip-formatting-python-code.patch
   ];
 
-  inherit cargoDeps yarnOfflineCache;
+  inherit cargoDeps;
+
+  missingHashes = ./missing-hashes.json;
+  yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit missingHashes;
+    yarnLock = "${src}/yarn.lock";
+    hash = yarnHash;
+  };
 
   nativeBuildInputs = [
-    yarn
-    fixup-yarn-lock
-
     cargo
     installShellFiles
+    jq
     ninja
+    nodejs
     qt6.wrapQtAppsHook
     rsync
     rustPlatform.cargoSetupHook
+    writableTmpDirAsHomeHook
+    yarn-berry_4.yarnBerryConfigHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin swift;
 
   buildInputs = [
@@ -202,7 +201,6 @@ python3.pkgs.buildPythonApplication {
     NODE_BINARY = lib.getExe nodejs;
     PROTOC_BINARY = lib.getExe protobuf;
     PYTHON_BINARY = lib.getExe python3;
-    YARN_BINARY = lib.getExe yarn;
   };
 
   buildPhase = ''
@@ -214,15 +212,15 @@ python3.pkgs.buildPythonApplication {
     echo ${builtins.substring 0 8 rev} > out/buildhash
 
     ln -vsf ${pyEnv} ./out/pyenv
-    rsync --chmod +w -avP ${anki-nodemodules}/ out/node_modules/
-    ln -vsf out/node_modules node_modules
 
-    export HOME=$NIX_BUILD_TOP
-    yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-    fixup-yarn-lock yarn.lock
+    mv node_modules out
 
+    # Run everything else
     patchShebangs ./ninja
-    PIP_USER=1 ./ninja build wheels
+
+    # Necessary for yarn to not complain about 'corepack'
+    jq 'del(.packageManager)' package.json > package.json.tmp && mv package.json.tmp package.json
+    YARN_BINARY="${lib.getExe noInstallYarn}" PIP_USER=1 ./ninja build wheels
   '';
 
   # mimic https://github.com/ankitects/anki/blob/76d8807315fcc2675e7fa44d9ddf3d4608efc487/build/ninja_gen/src/python.rs#L232-L250
diff --git a/pkgs/games/anki/missing-hashes.json b/pkgs/games/anki/missing-hashes.json
new file mode 100644
index 000000000000..8bdf63335cca
--- /dev/null
+++ b/pkgs/games/anki/missing-hashes.json
@@ -0,0 +1,109 @@
+{
+  "@dprint/darwin-arm64@npm:0.47.4": "67db15f5ae385010d1d80435c1b856ffe461739ab5e9bfb9972d21ef627f610b4aae40d7c53985ddff7d1109e8fc3c283c5a3c0d529b4b010e690577b7d0a36d",
+  "@dprint/darwin-x64@npm:0.47.4": "fcbbb05193c9174eec7491f2bc4551681099c9930c6ec1bab96699031d6bc83a417e07d332c8e1b4881d18a2814dfa08b1723066ead0d2e93833300ada81ea3a",
+  "@dprint/linux-arm64-glibc@npm:0.47.4": "9c3d6afd31938f51fe1da6b6aa8f4007c674667ee51edffa8ed92f9ea343b08b3df779f5b4d843363eb656df164ecc2f337b929446e5e9151a1c783d42fef03e",
+  "@dprint/linux-arm64-musl@npm:0.47.4": "af08edd5fed8725daf6cc49ca5bad03bc6e550d7fa42b596fd3fdc2c5b15013f83a4ae36ee0986934170e18148baf5c4f12c414fba09360624e1cdcf957121f1",
+  "@dprint/linux-x64-glibc@npm:0.47.4": "215c4033a6f8b0f73cbce552c9e0b39a16169a82088b293bc14b54fc5115de8ecb4f703c943cbf0f9c10375396ff9aed510ed2476723fd31f767c51b408457ab",
+  "@dprint/linux-x64-musl@npm:0.47.4": "c8b4c979a92fe897220877b40d59aa6e899ca2a39ce5368ba181ef3c3a376a119f4608b2a5e5271d1d811e055882cad86b890abd91970a32fb32ecfb5bbebdd7",
+  "@dprint/win32-arm64@npm:0.47.4": "5278a87a006758a9fe2b870a571895a6b19afb938cff35a180f192413ddfb8a4b612fcd1817c92e03dc0b587ed0c8ff750213c59d60ef3f0d02a4e2a4c938c5a",
+  "@dprint/win32-x64@npm:0.47.4": "5c5737f28ca10e51f3a548ad0160868a0b643f56a32eae5c8c151944ff47cb79aa109630c1ecf458233c2a3b521d5d284d3a25b60bbcd38885e7908f0db25d16",
+  "@esbuild/aix-ppc64@npm:0.19.12": "0740fd9160dffa94e55cd58d2f9faf4624a2be68d2696376d5c60cfced508809275eac76315796a1aef8daf3b0975b0df0f2d94de10c14c3f40087b7c6eeb047",
+  "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16",
+  "@esbuild/android-arm64@npm:0.18.20": "8c1aa2455aab70b61c19e5d818ce418090a6a300619df48000a10ba0caf4649b388d4d039771a5b012621246dcb5ff9bd6b86c98ad74b62caa0e26e821870456",
+  "@esbuild/android-arm64@npm:0.19.12": "29d94e32a47af3ae1cc7c0364b00b3145db0b16539bd8d30356bb3a8769499867a7a3f1bc070f10a63cdb33c29752a43f3e4d4594a316e7d179e82bf12edf47c",
+  "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d",
+  "@esbuild/android-arm@npm:0.18.20": "c38427fdc325049c8d73237693c637f829de68293d853c41e9ac1ef70773fc6099ab6008194216f89e1f22855fdf7e6ef8f01ee46353fcbc3bea387ab592cfe0",
+  "@esbuild/android-arm@npm:0.19.12": "f6784506ff94332d1332536cfcabe54dacb6ddc0ce285cdc3d00bb30a71c5dc57b81e3552354c59fe992d6dbc0f66eb8040d18cba76d44ee9cd7b7ed2a3feece",
+  "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a",
+  "@esbuild/android-x64@npm:0.18.20": "751957e816cf676117fbec20ab530fe2ce818492fbf32c8f6d9bb24e5963b54395b903adab95f6b874e4191845177f8e9cdd771f6b42298552b8573a5f24a150",
+  "@esbuild/android-x64@npm:0.19.12": "6253d60665402e38a080c101651c6e1617002b7aa53ed7a81f33d89fd5f99f37f11757bdd534faa3bf115dacf4723412a7cda532abdf0458bb478340772ba8d1",
+  "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6",
+  "@esbuild/darwin-arm64@npm:0.18.20": "16b1feeec7b1523da839e834e77f85a722bda5f2a9fb6800455e55684bd59bc11f8988b91ffefdb5ba3f4e8c1d7958f58413c74c729de92c26e31e0c326f658e",
+  "@esbuild/darwin-arm64@npm:0.19.12": "d934b758e8d6f7c69660f699a627963742a79dd5a917855c878700cc70eda3e629461e1fc69f8bb7242c15ec84f015e40f6877acd599604b784190514de4717f",
+  "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f",
+  "@esbuild/darwin-x64@npm:0.18.20": "a80288dea978a549e4fc42a3b1f0a1bc5f6341bbde3788b6b9fd6b9ba6ffd92a0b61cfe608543a8455d292d00094abbe7dc51bcd6487c9dc796a2e543299a9c4",
+  "@esbuild/darwin-x64@npm:0.19.12": "a436c4b3037a6a68c2b11fe487057c2cd4579363d94562d026a6d1a58eaf019c6ea94ba109e0b0a0597526fb6d2244d261fb7e6a18648f375ec90898b8bc14d6",
+  "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a",
+  "@esbuild/freebsd-arm64@npm:0.18.20": "72b69f1ba7fe6e8b7708809054cd96e9af3fd0bd561ce414c3bf7638abab15f7efc3782060dc7aa56dd4d1fcd43204355f2e0182a356d105a44e7c2efdec470c",
+  "@esbuild/freebsd-arm64@npm:0.19.12": "527060fd8bc2c9771d861a9a62935605e190dc17f454408fd87afc7d2fafe2a35cbca5cb171aaeab28cce187a21e5e2bfd607014e229360a8b4fa32438393203",
+  "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654",
+  "@esbuild/freebsd-x64@npm:0.18.20": "b2cdcd81f3f7cd7be2f72c38790698993a6853ad241193bf085c2ad5d2df1495478a9d67a2282a54efeee3b827c26a412795b8064e19321c7aaf59ffc34f293f",
+  "@esbuild/freebsd-x64@npm:0.19.12": "b4d54892b0eec50f259fa6ab5527a5b4e48e1c68351d2c8febf60835bb5ac957564d2ab2ddf16ee66335b58a69ec367f48b125fb9646f8a39a11e1248c579501",
+  "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87",
+  "@esbuild/linux-arm64@npm:0.18.20": "08216b531dc42e48abb6754f2b4f7f633055cd666ceb77c220c61c25aa84479b36ddeab25ecc23cf22965354314b84cabf1e8408a5cb1ba57b8343475613a782",
+  "@esbuild/linux-arm64@npm:0.19.12": "23dd17cd5b3f3d64726baa5632bd8079059ebf8419e3f9e82d900f8c781a7788980f6e6d1a604c1d84bd539f555227559f4916d52e2447a30f5886bbf1ed486c",
+  "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c",
+  "@esbuild/linux-arm@npm:0.18.20": "8fc75953ddebd11be542a224e0c73971e83556272d75d3f4023bebf4b0658a68314ee5721eb5dfabffb9ca9afcd7ae5404425f3d56cc6363c68bffa86f08fac3",
+  "@esbuild/linux-arm@npm:0.19.12": "76b9b411ba41320d57632347d1a09db7e745aec425db2cffe1c6467928c8d67bc122b544aa7fcbdca74a32262bfe0d48aa479931f6943bd84434389fada189a0",
+  "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17",
+  "@esbuild/linux-ia32@npm:0.18.20": "563d35963cfb7b94fec9e22986a4edfa8fd4f6d6d82fa6be1833eb7c50b996cdc9b53a656e2ccf02dc2ecc8676748b02d77ad20afbaf087ef802e562790390fa",
+  "@esbuild/linux-ia32@npm:0.19.12": "be7a5294d9387fe09e154c5c771761291ce2278c2e04d36396f737736d185ab4a23d97830afaec67bb593549745ba9e240ac86b0ad4c0e0044e553c408105aed",
+  "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5",
+  "@esbuild/linux-loong64@npm:0.18.20": "8a728161c3221ecc35e8d55f700d065e59fefbed5130feea6e3975f1e209cc8c31de55d908ff4abf29ec2d37e88e22f9b2590e9764e72a47825610b104a39374",
+  "@esbuild/linux-loong64@npm:0.19.12": "964386dd94bdd05383e6a8223a6af222a113bef78e4c8f7a77684c9c2e56c30d876c502ce4d28b4d91d21c402cdd491eb1e62bb72448c7077276c4714b299263",
+  "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296",
+  "@esbuild/linux-mips64el@npm:0.18.20": "e5d99e6c151323ea3ca5ddd6cbaab9bde45424932282adce064d90ad4e26fcaef1adce54b01734641616f65b89f1a5a69a715a9d05368b7c496a46c9ccca4744",
+  "@esbuild/linux-mips64el@npm:0.19.12": "5608d554f1db3311315eb29780e312e66d106d41ad53fb3458e201fbbddda198836fc4ca04314f7ae4e61462214c92494928804abab0759a384adff773da40d0",
+  "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75",
+  "@esbuild/linux-ppc64@npm:0.18.20": "aebef9d269b964698128199821c8b1d9a45ca1898656d12add3f52cd335b098923565b7ef3bdea37297b14991f56f6b351681229d153904819b767ccc3af97db",
+  "@esbuild/linux-ppc64@npm:0.19.12": "7523a8c6b4b46324698b6aecfc661b369326099ebf72a36562ce69d8a6e2158cbe1d9af6d2588f130000c49875b719910df4b426885fcbac1065af590c1cd985",
+  "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5",
+  "@esbuild/linux-riscv64@npm:0.18.20": "3eb88a207ea74ed6a2cce3a3d91ce590b508fe673e0bdc5f72f58babd32ccd0fa79908f64ee25ce82bddc7a29d47a603c5522637d23cdad52d1ee4b6ba34b3cb",
+  "@esbuild/linux-riscv64@npm:0.19.12": "da7aedccce7377c1991a3bfce3767a41c2bd688a361ff5df9a16b56874d1bd198c4fa70ca15bd7234497ea5ff9a44ddbbece95733a1dbd9f43918b4bf27fb76c",
+  "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363",
+  "@esbuild/linux-s390x@npm:0.18.20": "77172f6572740cda637f5beed73b3ff6bda8648b4c3632290dbfead82b3ff2f8431bdc3b43f2c7af881151b172eea086db24669658c4f9711f20366da21aace5",
+  "@esbuild/linux-s390x@npm:0.19.12": "5f55ca2284c1cd1034a0bdf1ded7d38f43539f028fd58ec157f36fd89701f5fd0d0d45514b82c4199e3bd16049635a3a16c96a694f5a8d9c8a40429ad3e2172e",
+  "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae",
+  "@esbuild/linux-x64@npm:0.18.20": "9d438aec79e046e3527217fee95f39985e6e2df8c4390c9398ee24a6bff3f15e8f5fc2d5cc6564b1e182f864a99d8fd83818f880dba9616a2dcea6c7f16a57c5",
+  "@esbuild/linux-x64@npm:0.19.12": "401ff8f1d6d5ae6ebdd0d8e24cef86ba1c3adc4fac2014033c8e690331495cb57922e31cdaa96619e2b190a5bfc88ae8b90b1cd3a59952969a29da418bda58b1",
+  "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674",
+  "@esbuild/netbsd-x64@npm:0.18.20": "2523c64d41b2d8252f5f8f11fb5f8438d4e9fcbc5856e8644fb79b1c18175144b4c36c5a62306064639e444e938cd4641248dfdc167b15af26d72d90a1217898",
+  "@esbuild/netbsd-x64@npm:0.19.12": "0e4b3ae706cb82356e20862ec0066e9eb61bc7f7bf3cc09da27a72fa5790a59f5256f4e2cd255aac6023a37036c8ad805d51498dbd56fe7d913711858d3c8ebc",
+  "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1",
+  "@esbuild/openbsd-x64@npm:0.18.20": "3e04b67db2a5ae3440dea5a0dddc6744cea6bc05bd7ce7b64ff4350efb16e804e701a14875199d62018e8322891dde4ba04ea7d6717556d6cc12e4178a1d7159",
+  "@esbuild/openbsd-x64@npm:0.19.12": "f55049053a978c178bf1d7f4857af395afa9b7708410707eef8149f42adc3ed6d72088419cc17f75f1b7be4991ad28007fe298be84f95ca4e02d28bac1b518c7",
+  "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85",
+  "@esbuild/sunos-x64@npm:0.18.20": "921cbdd363e622d854e83b9e868ccad05b0f0c09cb181e59f6ae1b74ddd6023974d1cba9116c56cc819d15063bf5a5bffa67c23a19b5b60b5a099ce1d9ec419d",
+  "@esbuild/sunos-x64@npm:0.19.12": "da944741c1d6c8d814633445f068b27cdff337f309513982125f633d7365154ba6073719ba4389e471479886841d0152f37426f5bd890b7a8c33b89b7f775c82",
+  "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a",
+  "@esbuild/win32-arm64@npm:0.18.20": "9de26948654e871289a5b6a5ef0c238ca92b0973b00eea692689edd278a9e791ac2220e33cfc24eca673212571242c08e041cd0a97087b247716d9538609f68d",
+  "@esbuild/win32-arm64@npm:0.19.12": "c9e6922908588569a8cf396ab0c5230cd1634db77039cb635d83eb825eba64a4ac3e19f28917185495d9d7b043161bfbd4cd49eb7d3592b88cf4594d9d628d08",
+  "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366",
+  "@esbuild/win32-ia32@npm:0.18.20": "98d18afeb689679b73ee823b297d8fb160e97fb183cd5f39d716b787465c024b0489bebaec96e37157cfb10d5296e803070e90f07eaf9235a2afb041d25e9e31",
+  "@esbuild/win32-ia32@npm:0.19.12": "71487cca9ac6cce6bf214be36e5c6aa1eaac49a2bcd538fafb6168fecbbe2624edf2a057be531b5393c4e2672b24bd316a872cc081df1d9c06e3a12704662675",
+  "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be",
+  "@esbuild/win32-x64@npm:0.18.20": "b019d085b43c247251b8d3791fa8f3251851d34cfce54bbe8b15a3a73efb1bc903e884551c8a821d5e681a48bc91c80a6f7e394762b938a266d8b602b13664ee",
+  "@esbuild/win32-x64@npm:0.19.12": "33341d6ae7d0682fb679170c91efa3933fc58dfe3d2f95c19b9856db55af6c8af4785f3669f3de34907ab222b2a6a201a8557213bd37dcc8406593e9eddbaa3c",
+  "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1",
+  "@parcel/watcher-android-arm64@npm:2.4.1": "88cb813d54227fc25e487f00497cdd58974a07e1c22a5cc7cf922983d908b460e0876ec0c9acf333a5b6f5623dc50729f8b92612970bfbd5a12d4e5cffc025ff",
+  "@parcel/watcher-darwin-arm64@npm:2.4.1": "342502e0f175dbd0649f2edffc9f7d76823668e12184a62d8e542df454a067bcade1cfd298975bf7238a7575a9d721c6d7ccb0e8c9102dca5394c9fef2349561",
+  "@parcel/watcher-darwin-x64@npm:2.4.1": "175868753e64ea7bc70993a05a34694e8ad85d9d4a08bf9a36573925777369a0701f2971d6ff14f9ed525c9b7725ce40629cad97fd7c67dc653f247884d99a62",
+  "@parcel/watcher-freebsd-x64@npm:2.4.1": "844f009d836628ff11119c885bf490077f36a24800ccc2fe8d5acf88c59d29d2495ab5773d1960bc568e9225a4c91147c7804dce2eaace86f3ac619fb0357a44",
+  "@parcel/watcher-linux-arm-glibc@npm:2.4.1": "f75d589f7403934c39f01c51e89b0d2e43a07041b6d9b7bb14078971cc520a8cb2ca296f6bf19d68335db433fb4bdf7bfd5f445a2a0cebf763e2cc47cd0ecc0c",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.4.1": "9831629227633c577dc9b3abc3cc7b6c1c5c3635128663cff1658f6cf4546f8ab7803e20f2e33243a566234edcb7591c4a900e2df5a6bed35f4d4b6e19875f04",
+  "@parcel/watcher-linux-arm64-musl@npm:2.4.1": "b2b1106f5403cbaf3953a8bd99ff82498b7f399ef9ec6e26701e8734db8bffeaeb83b373e71cf71fd936dbf1a0143c72248d94b3eebaced03dc25e529930b945",
+  "@parcel/watcher-linux-x64-glibc@npm:2.4.1": "fd0e4b06aa26f631b95fc3034d32c83dcce1818c57842ba2c29d79a15b9afa096fd5afc2cd099bb148e4816c3944b831ed1efa421c06317b9e0807664a852556",
+  "@parcel/watcher-linux-x64-musl@npm:2.4.1": "b7cb299eaeb400e92b0a0a19a343905fe5c4152a12535c9e414a0aa0d6a1151dc9a8b254598be2d82ccee902e9132a4b7a2bee4df85d8f8219d95083daf87d35",
+  "@parcel/watcher-win32-arm64@npm:2.4.1": "35fc4e90eb74a4e583377821775d5f90269deeaa61221fbb69127b3151279a37d4038df91beb38e51367ebb9d92f6b0295b58c0e4a7ac3ecc0adb0f27c935c69",
+  "@parcel/watcher-win32-ia32@npm:2.4.1": "0b12602039c1ebb6ea711bde1996ca66d814668a02d33b2b949c66111de9e3fbc6f4d8b9b6c985affa1eafa6089b4c13b0e0db8f8d3a7a2d19849c7d7f639f1c",
+  "@parcel/watcher-win32-x64@npm:2.4.1": "56f160729dc8c47d940187b4a2e9a4100be77fc2acc2dd5e4cb527d036676eecba454548cf00fb6d7c44757e42d77dc4d2d8ff19c1ce64759a7fde2097aa6bfe",
+  "@rollup/rollup-android-arm-eabi@npm:4.31.0": "c737cb26689f9d34357921d15ee6a7261e5d7cc068dbb93a36c2f40c34a59bd8721e7bb392943a212ecfb97d9326ced8254469e39e9d6b012db636269eb66577",
+  "@rollup/rollup-android-arm64@npm:4.31.0": "94957eda1ab8894a6fdf0b1772bc00e7563f2e520179542dfdd6f9797bbb9cde164693b29439da631fd8ee6b5117c36ea7ba7ad8ab43d1747c296b22d6c09cad",
+  "@rollup/rollup-darwin-arm64@npm:4.31.0": "2b408eef19930929008806adc87f29bb9cacbbea1f32770be339281d72a5bbc52a88da1269a34b88052a0037a0b2b61e70daf166ed9d3c982b4fb4bd606ad020",
+  "@rollup/rollup-darwin-x64@npm:4.31.0": "9e7bc70cfd1ccbdddad3016d9fd36616c8a71725f9c47bbdad1f3ef40b656f7db90f02c88a4724b399f8a46555e4f90c4880d5eea0f12fdeba2f71a555077db5",
+  "@rollup/rollup-freebsd-arm64@npm:4.31.0": "3e149a14c1930b539e1d0a733bc2582bc5e84a5906723b5ac0384d46c43861a05120dd4566bb4f1efca8f930fd1f0eb78646587fc3c0cc32606d32ce6fb7bb13",
+  "@rollup/rollup-freebsd-x64@npm:4.31.0": "fe381b185187a5c2e8383920090bcec0c1273d058cc113eba23a70bc9f49cbadacd92c2a6255d345971bd2cf283941f623b00035d051758f743cf3207c233b54",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.31.0": "7bfe07f535125f59cc12fc0af162b9bae4400a364f5e2b1eae44377904deb3dc1c558048a0a8b059be1a54e609a7597c109f0a26a2a0baaf21a5539a331d14f4",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.31.0": "a1bb7593a83e2c2dbd32e8a3447e68ac43874a46aaa501c63a533695c47b66c7156527951bd84ad53c73a3155b5b50fd658c0aacad8790b6e4c03c0a83c94cad",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.31.0": "e2e85814bcbaeb8b39e17ee5f8510c8856c5cc4c2ec1787245e8f8e0531563e36844549b02956b881d5aa9405e838a7d1b1697c305c394a57889c0b1c521c064",
+  "@rollup/rollup-linux-arm64-musl@npm:4.31.0": "00d8411e0516b298913d19dc2f4991ee184a4799b041f9c2a2eae5cf91f3aa315a4cc69d51d04c2540bfe0793b628af105d8df419ba541dba24981ccdc1a372a",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.31.0": "ea1e4d813a12e8e9eda908d705dbf013835034a95cb63046a3bc15d43a6bf9812034d3779ab01c5ec87338ff1115ea86c6af2383efa4485b18da1423c68c3b79",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.31.0": "903350e968edd4d9fcb4c53831672ff5980f4d58c32a1b34e2c6446d0ae965d522173a82d9dccdf040805f82507b05e3c7e629782e56ccc51c78e01bc0b02dc2",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.31.0": "02bf4d53b6edc386103fdfaa6f1c774b1859e61146a305f3a0942159902b829ba67fbb6a6dbf914ed77fa7ae20826f601d11de79f033b37666077f26ccc0bfb6",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.31.0": "bd6a2a45d36e11a80d4675c6427eafbe85165ffdac4c75945c89c650897ac8c582b57b76e0a69a39c09ba06c58edd865e4d8a54e1c7a245d2c192db465ae2c55",
+  "@rollup/rollup-linux-x64-gnu@npm:4.31.0": "6100d9bd7a0de95a54b3ad15d953ea74bef4c9c4424c24c5187ee1641f81d8fcaa30e48d16faeec0957e3a48517fcf78486e47fedc277f8f26fb6fbc7619df4b",
+  "@rollup/rollup-linux-x64-musl@npm:4.31.0": "b9a94514d6606e8b320ecad50f7c4142b86bb688aa1e87f076a462f76488000a90b8f75db01250cc17b540a70f231ab4064e79b79b66a2c7ad76c224d30b05e3",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.31.0": "d0fee5e492f22df8885e0dcf2eccc2b8424c926050b1506d5a59fb97388de9ac5bd149a20d8521cf379cc3a46af92cb5de5d15cf749e648062f9f6ebf17e5754",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.31.0": "c0e4d6f7cde9fc9a28eff19c04a96807a76d911141bb9fbe2a41d7ba394f4ebf334d3cd9b712c086498cd5de73ab2f2d1c12e6d22b08178ea4ede84474c656b8",
+  "@rollup/rollup-win32-x64-msvc@npm:4.31.0": "c3c397ddceb47db9631887caed7ec437b3bb9d1ff0de24440614720d3fe322a0c712617b869177fc37c2386430bad2e92cc3735a52ef579e25c9aded76f75580"
+}

From 1b4bcf24b59d90bc11318b24e3edd0c86f2abb58 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Tue, 20 May 2025 16:13:42 +0100
Subject: [PATCH 0079/1497] zabbix70: 7.0.12 -> 7.0.13

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 34ad087497dd..4cd732fe12b4 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -4,8 +4,8 @@ generic: {
     hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
   };
   v70 = generic {
-    version = "7.0.12";
-    hash = "sha256-YGntYEql4z/mMczGi3gmVKaXBxlSoc82UVFlWgoSKwU=";
+    version = "7.0.13";
+    hash = "sha256-2e9/HPsL3lZY2rsigIIPnOHPMyV/rHn0DwM3Org60Xw=";
   };
   v60 = generic {
     version = "6.0.36";

From 3bf8940c4ac0ba38dc145ebb7938f6fbd87e760f Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 20 May 2025 19:35:46 +0200
Subject: [PATCH 0080/1497] jazz2: 3.2.0 -> 3.3.0

---
 pkgs/by-name/ja/jazz2/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index a5e97f26f2d5..f3520349b13a 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   jazz2-content,
+  curl,
   libopenmpt,
   libvorbis,
   openal,
@@ -16,19 +17,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jazz2";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "deathkiller";
     repo = "jazz2-native";
     tag = finalAttrs.version;
-    hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo=";
+    hash = "sha256-dj+BEAx626vSPy26+Ip3uaj3SBE1SWkfbh5P8U0iXsg=";
   };
 
   patches = [ ./nocontent.patch ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
+    curl
     libGL
     libopenmpt
     libvorbis

From f0bee9da80d0a461df1ddac9c7cc3bef2681bbe0 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 20 May 2025 19:36:17 +0200
Subject: [PATCH 0081/1497] jazz2: sort and enable strictDeps

---
 pkgs/by-name/ja/jazz2/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index f3520349b13a..d7781911b0f5 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -1,18 +1,18 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
   cmake,
-  jazz2-content,
   curl,
+  fetchFromGitHub,
+  gitUpdater,
+  jazz2-content,
+  lib,
+  libGL,
   libopenmpt,
   libvorbis,
   openal,
   SDL2,
-  libGL,
-  zlib,
+  stdenv,
   versionCheckHook,
-  gitUpdater,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [ ./nocontent.patch ];
 
+  strictDeps = true;
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     curl
@@ -40,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt")
     (lib.cmakeBool "NCINE_DOWNLOAD_DEPENDENCIES" false)
+    (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt")
     (lib.cmakeFeature "NCINE_OVERRIDE_CONTENT_PATH" "${jazz2-content}")
   ];
 

From bd6c30c1b0efdb44609301bd357d750bc9e87cf5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 May 2025 20:23:49 +0000
Subject: [PATCH 0082/1497] python3Packages.dep-logic: 0.5.0 -> 0.5.1

---
 pkgs/development/python-modules/dep-logic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix
index fbad80861cee..c85fc1b95e29 100644
--- a/pkgs/development/python-modules/dep-logic/default.nix
+++ b/pkgs/development/python-modules/dep-logic/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dep-logic";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pdm-project";
     repo = "dep-logic";
     tag = version;
-    hash = "sha256-30n3ZojY3hFUIRViap88V7HjyRiC6rHvnSHxESfK+o4=";
+    hash = "sha256-W/y5iM9dHnle7y3VzqvW7DSGy8ALvjqt5CN/2z5oEi8=";
   };
 
   nativeBuildInputs = [ pdm-backend ];

From c4f052c08ae5724614fda2913280233cb3c142f0 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 21 May 2025 08:49:52 +0200
Subject: [PATCH 0083/1497] nixos/kanidm: Fix bind paths
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. We bound the directory of certificates, this lead to forced read-only
   binds of these directories, even if they should have been bound
   read-write for other files in there. Looking at the history, there
   seems to be no compelling reason for this, so switch to binding
   the files directly.
2. `/run/kanidmd` is configured as `RuntimeDirectory` so bound
   automatically and we don’t need to specify it explicitly.
---
 nixos/modules/services/security/kanidm.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 67b219595458..9e624abf599b 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -54,15 +54,10 @@ let
     ++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile
     ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2
   );
-  secretDirectories = unique (
-    map builtins.dirOf (
-      [
-        cfg.serverSettings.tls_chain
-        cfg.serverSettings.tls_key
-      ]
-      ++ optionals cfg.provision.enable provisionSecretFiles
-    )
-  );
+  secretPaths = [
+    cfg.serverSettings.tls_chain
+    cfg.serverSettings.tls_key
+  ] ++ optionals cfg.provision.enable provisionSecretFiles;
 
   # Merge bind mount paths and remove paths where a prefix is already mounted.
   # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount
@@ -881,7 +876,7 @@ in
         (
           defaultServiceConfig
           // {
-            BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretDirectories);
+            BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretPaths);
           }
         )
         {
@@ -895,8 +890,6 @@ in
 
           BindPaths =
             [
-              # To create the socket
-              "/run/kanidmd:/run/kanidmd"
               # To store backups
               cfg.serverSettings.online_backup.path
             ]

From 60e131c86b442453d10d26f61029785560a81fea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 22 May 2025 01:08:42 +0200
Subject: [PATCH 0084/1497] python313Packages.starlette-admin: 0.14.1 -> 0.15.0

Changelog: https://github.com/jowilf/starlette-admin/blob/0.15.0/CHANGELOG.md
---
 .../starlette-admin/default.nix               | 36 ++++---------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix
index 5ff77b3a6488..46c0825ce59b 100644
--- a/pkgs/development/python-modules/starlette-admin/default.nix
+++ b/pkgs/development/python-modules/starlette-admin/default.nix
@@ -32,42 +32,16 @@
 
 buildPythonPackage rec {
   pname = "starlette-admin";
-  version = "0.14.1";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jowilf";
     repo = "starlette-admin";
-    rev = version;
-    hash = "sha256-DoYD8Hc5pd68+BhASw3mwwCdhu0vYHiELjVmVwU8FHs=";
+    tag = version;
+    hash = "sha256-R9ZRrJaBp1joT3DtymvS+Ac0MzEUFYFovgxMW0njsT0=";
   };
 
-  # recreates https://github.com/jowilf/starlette-admin/pull/630 which cannot be cherry-picked
-  postPatch = ''
-    test_files_to_fix=(
-      tests/mongoengine/test_auth.py
-      tests/odmantic/test_async_engine.py
-      tests/odmantic/test_auth.py
-      tests/odmantic/test_sync_engine.py
-      tests/sqla/test_async_engine.py
-      tests/sqla/test_auth.py
-      tests/sqla/test_multiple_pks.py
-      tests/sqla/test_sqla_and_pydantic.py
-      tests/sqla/test_sqla_utils.py
-      tests/sqla/test_sqlmodel.py
-      tests/sqla/test_sync_engine.py
-      tests/sqla/test_view_serialization.py
-      tests/test_auth.py
-    )
-    substituteInPlace "''${test_files_to_fix[@]}" \
-      --replace-fail  \
-        'from httpx import AsyncClient'  \
-        'from httpx import AsyncClient, ASGITransport' \
-      --replace-fail \
-        'AsyncClient(app=app,'  \
-        'AsyncClient(transport=ASGITransport(app=app),'
-  '';
-
   build-system = [ hatchling ];
 
   dependencies = [
@@ -122,6 +96,8 @@ buildPythonPackage rec {
     [
       # odmantic is not packaged
       "tests/odmantic"
+      # beanie is not packaged
+      "tests/beanie"
       # needs mongodb running on port 27017
       "tests/mongoengine"
     ]
@@ -146,7 +122,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Fast, beautiful and extensible administrative interface framework for Starlette & FastApi applications";
     homepage = "https://github.com/jowilf/starlette-admin";
-    changelog = "https://github.com/jowilf/starlette-admin/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/jowilf/starlette-admin/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ pbsds ];
   };

From 3f47b2cf27dbd04fb0e7c6122fbf5cc91dcbd018 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 22 May 2025 11:24:45 -0400
Subject: [PATCH 0085/1497] fish-lsp: use finalAttrs

---
 pkgs/by-name/fi/fish-lsp/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index 1fd36a8edffb..227edead777b 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -13,19 +13,19 @@
   yarnBuildHook,
   yarnConfigHook,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fish-lsp";
   version = "1.0.8-4";
 
   src = fetchFromGitHub {
     owner = "ndonfris";
     repo = "fish-lsp";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk=";
   };
 
@@ -85,4 +85,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ petertriho ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 28189a7ac0226c2ee2d3738a4ead413de4be095e Mon Sep 17 00:00:00 2001
From: vaw <vaw@nlih.de>
Date: Thu, 22 May 2025 19:02:30 +0200
Subject: [PATCH 0086/1497] nixos/matrix-synapse: Fix merging log configuration

---
 nixos/modules/services/matrix/synapse.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 1adc02852a4d..b13488940e81 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -124,12 +124,13 @@ let
   genLogConfigFile =
     logName:
     format.generate "synapse-log-${logName}.yaml" (
-      cfg.log
-      // optionalAttrs (cfg.log ? handlers.journal) {
-        handlers.journal = cfg.log.handlers.journal // {
-          SYSLOG_IDENTIFIER = logName;
-        };
-      }
+      attrsets.recursiveUpdate cfg.log (
+        optionalAttrs (cfg.log ? handlers.journal) {
+          handlers.journal = cfg.log.handlers.journal // {
+            SYSLOG_IDENTIFIER = logName;
+          };
+        }
+      )
     );
 
   toIntBase8 =

From d8eb7d36e0dff8470b73c9180c76f179d6cc29f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 19:57:22 +0000
Subject: [PATCH 0087/1497] nats-server: 2.11.3 -> 2.11.4

---
 pkgs/by-name/na/nats-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index 41f5d202f377..dbc3cca86225 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nats-server";
-  version = "2.11.3";
+  version = "2.11.4";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Z4EBXWUtBzW65ONvt94sKzVDHw8qVz2cR5qewUm5nXI=";
+    hash = "sha256-LlAvT+u/FLuufWmUno/RM2E9/EEXSyM585My8eR156E=";
   };
 
-  vendorHash = "sha256-uCNTUfYfMDjgM3RXsgAIzIFSuoHOCVks8aBR58RlU6Q=";
+  vendorHash = "sha256-d83bZWfZ+obEi79RHQJaucwlRfuLj1bleOfCVJpc7bU=";
 
   doCheck = false;
 

From 1b2f0d579db076f383e6294f40c7f201dcde1f6c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 22 May 2025 21:17:31 +0100
Subject: [PATCH 0088/1497] xdg-desktop-portal: 1.20.0 -> 1.20.3

Changes:
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.1
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.2
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.3
---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++--
 .../xdg-desktop-portal/fix-icon-validation.patch          | 8 +++-----
 .../xdg-desktop-portal/fix-sound-validation.patch         | 8 +++-----
 .../libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch | 6 ++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 96cca8a71268..4313ac5e84fc 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal";
-  version = "1.20.0";
+  version = "1.20.3";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     tag = finalAttrs.version;
-    hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww=";
+    hash = "sha256-ntTGEsk8GlXkp3i9RtF+T7jqnNdL2GVbu05d68WVTYc=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
index 08b7a3c0b3b0..4511b20dae97 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-icon.c b/src/validate-icon.c
-index c42265b..320f028 100644
 --- a/src/validate-icon.c
 +++ b/src/validate-icon.c
 @@ -254,7 +254,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index c42265b..320f028 100644
    g_autofree char* arg_input_fd = NULL;
    char validate_icon[PATH_MAX + 1];
 @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
index bfc6982d2dfd..3c716d96cde7 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-sound.c b/src/validate-sound.c
-index 7348d46..8b87c78 100644
 --- a/src/validate-sound.c
 +++ b/src/validate-sound.c
 @@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index 7348d46..8b87c78 100644
    g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
    char validate_sound[PATH_MAX + 1];
 @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
index b7ca73e5afed..369dd2a860f1 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
@@ -1,5 +1,3 @@
-diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
-index 770c265..a34ca8e 100644
 --- a/src/xdp-portal-impl.c
 +++ b/src/xdp-portal-impl.c
 @@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
@@ -8,6 +6,6 @@ index 770c265..a34ca8e 100644
    portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
 +  if (portal_dir == NULL)
 +    portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR");
-   if (portal_dir == NULL)
-     portal_dir = DATADIR "/xdg-desktop-portal/portals";
+   if (portal_dir != NULL)
+     {
  

From 77e4c5a0fafae63c61161ba32462f665f244ae43 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Fri, 23 May 2025 08:09:08 +0200
Subject: [PATCH 0089/1497] mariadb: 10.6.22, 10.11.13, 11.4.7

---
 pkgs/servers/sql/mariadb/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 51277f42aada..ef9cbc751256 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -370,17 +370,17 @@ self: {
   # see https://mariadb.org/about/#maintenance-policy for EOLs
   mariadb_106 = self.callPackage generic {
     # Supported until 2026-07-06
-    version = "10.6.21";
-    hash = "sha256-jX+XFps7ogRIWJZbjPwlQ2RADfQ+kFBC+S4kuPp7DZY=";
+    version = "10.6.22";
+    hash = "sha256-LKYA3H6F6tHzPCEvnXax8vgS0knIveAuXzjq0Jit5CA=";
   };
   mariadb_1011 = self.callPackage generic {
     # Supported until 2028-02-16
-    version = "10.11.11";
-    hash = "sha256-bynU1+QPxJr0oP5giYRQnvLRU9882K/kNZ3OPKDieJA=";
+    version = "10.11.13";
+    hash = "sha256-+Lc0dJ+9ZS6k4lW+jMeID5jQe2p/604eqMc2y0gNI+Q=";
   };
   mariadb_114 = self.callPackage generic {
     # Supported until 2029-05-29
-    version = "11.4.5";
-    hash = "sha256-/2WV+MSC+ZIeObl/oRIjd6afDcvZJVPGuQMsvw6bU1Q=";
+    version = "11.4.7";
+    hash = "sha256-vyBofKEvp+/ajficqx8qZhKIzqQaz49TGJtp1SlDR9A=";
   };
 }

From ca1ec659ee9168db0a159a7d433cdc241c5616e3 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Fri, 23 May 2025 18:05:07 +0700
Subject: [PATCH 0090/1497] kubie: wrap kubectl

kubie executes kubectl to list namespaces for `kubie ns` command.
---
 pkgs/by-name/ku/kubie/package.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix
index cf25e473476a..70603e620d1c 100644
--- a/pkgs/by-name/ku/kubie/package.nix
+++ b/pkgs/by-name/ku/kubie/package.nix
@@ -1,8 +1,10 @@
 {
   lib,
+  kubectl,
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  makeWrapper,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,10 +22,20 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
 
   postInstall = ''
     installShellCompletion completion/kubie.bash
+
+    wrapProgram "$out/bin/kubie" \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          kubectl
+        ]
+      }"
   '';
 
   meta = with lib; {

From 1d8ea85cdaf870196d91915c0793e12f4f939aad Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Fri, 23 May 2025 18:07:02 +0700
Subject: [PATCH 0091/1497] kubie: add fish completion

---
 pkgs/by-name/ku/kubie/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix
index 70603e620d1c..0b305dfe42eb 100644
--- a/pkgs/by-name/ku/kubie/package.nix
+++ b/pkgs/by-name/ku/kubie/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    installShellCompletion completion/kubie.bash
+    installShellCompletion completion/kubie.{bash,fish}
 
     wrapProgram "$out/bin/kubie" \
       --prefix PATH : "${

From 0ab19b633c82225c7ab350a2631b5959337f4d93 Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Fri, 23 May 2025 16:01:35 +0200
Subject: [PATCH 0092/1497] terragrunt: 0.78.4 -> 0.80.2

---
 pkgs/by-name/te/terragrunt/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 0831edfc2990..7d610bfb4ede 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -4,29 +4,31 @@
   fetchFromGitHub,
   versionCheckHook,
   go-mockery,
+  mockgen,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "terragrunt";
-  version = "0.78.4";
+  version = "0.80.2";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Xlqq1d6itQx0Y6MQJTY3tsZ8Q2S8EqRbqD1GGdIu9oA=";
+    hash = "sha256-FgytHWKtXK0tNDFOVOEciEzyVEXLbk9T2Nk8Se35HnY=";
   };
 
   nativeBuildInputs = [
     versionCheckHook
     go-mockery
+    mockgen
   ];
 
   preBuild = ''
     make generate-mocks
   '';
 
-  vendorHash = "sha256-sVA2bzQoeDdYRDaAC6DZtF4izuXhlHTUMKNkOIveG7c=";
+  vendorHash = "sha256-Zgoon6eMUXn2zaxHfJovtWV9Q11rDdkBrYzNqa73DsM=";
 
   doCheck = false;
 

From 1d32087125a9bb3e700b206ceb6eea28fdf07716 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Fri, 23 May 2025 14:15:40 -0700
Subject: [PATCH 0093/1497] fetchpatch: add support for patches to files with
 apostrophes

We're feeding a list of files from `lsdiff` to `filterdiff` via `xargs`.
That list is newline separated, and looks something like this:

```
$ lsdiff <(curl -s https://github.com/jfly/annoying-filenames/commit/1e86a219f5fc9c4137b409bc9c38036f3922724b.patch)
a/README.md
b/files/The Answer to the Ultimate Question of Life, The Universe, and Everything.txt
```

However, if the list contains files with apostrophes in it, xargs freaks
out:

```
$ echo "there's an apostrophe here" | xargs -I{} python -c "import sys; print(sys.argv)" {}
xargs: unmatched single quote; by default quotes are special to xargs unless you use the -0 option
```

The fix is simple, just explicitly specify a delimiter:

```
$ echo "there's an apostrophe here" | xargs -I{} --delimiter='\n' python -c "import sys; print(sys.argv)" {}
['-c', "there's an apostrophe here"]
```

I added 2 tests here:

- `nix-build -A pkgs.tests.fetchpatch.fileWithApostrophe` fails without the code change.
- `nix-build -A pkgs.tests.fetchpatch.fileWithSpace` passes both before
  and after this change, but I wanted to add it to prove that I didn't
  break anything.
---
 pkgs/build-support/fetchpatch/default.nix |  2 +-
 pkgs/build-support/fetchpatch/tests.nix   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 1b1f23b44c69..fa06d8631be4 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -67,7 +67,7 @@ lib.throwIfNot (excludes == [ ] || includes == [ ])
             ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \
             "$out" \
           | sort -u | sed -e 's/[*?]/\\&/g' \
-          | xargs -I{} \
+          | xargs -I{} --delimiter='\n' \
             filterdiff \
             --include={} \
             --strip=${toString stripLen} \
diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix
index 82482a820592..77fe380d9710 100644
--- a/pkgs/build-support/fetchpatch/tests.nix
+++ b/pkgs/build-support/fetchpatch/tests.nix
@@ -48,4 +48,22 @@ in
       else
         "sha256-SJHk8XrutqAyoIdORlhCpBCN626P+uzed7mjKz5eQYY=";
   };
+
+  fileWithSpace = testers.invalidateFetcherByDrvHash fetchpatch {
+    url = "https://github.com/jfly/annoying-filenames/commit/1e86a219f5fc9c4137b409bc9c38036f3922724b.patch";
+    sha256 =
+      if isFetchpatch2 then
+        "sha256-RB6pjigoXtzHILkGFXYd3Lz2aM9DvO0NRmLdey1N6gg="
+      else
+        "sha256-aptUvVojqIIIVNuHqkl+C+dZBGFfs+1MUd0FNV+4j4E=";
+  };
+
+  fileWithApostrophe = testers.invalidateFetcherByDrvHash fetchpatch {
+    url = "https://github.com/jfly/annoying-filenames/commit/8b6d8f8d7094ce646523b3369cfdf5030289c66c.patch";
+    sha256 =
+      if isFetchpatch2 then
+        "sha256-CrQFmVvLEvWpo2ucVrWyLb5qk2GVOxyUbFN3hp9sV68="
+      else
+        "sha256-CrQFmVvLEvWpo2ucVrWyLb5qk2GVOxyUbFN3hp9sV68=";
+  };
 }

From b2a979a4b468139f3cf102d9d83dc5bed91620d7 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:28:52 -0400
Subject: [PATCH 0094/1497] python313Packages.stomp-py: init at 8.2.0

---
 .../python-modules/stomp-py/default.nix       | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/stomp-py/default.nix

diff --git a/pkgs/development/python-modules/stomp-py/default.nix b/pkgs/development/python-modules/stomp-py/default.nix
new file mode 100644
index 000000000000..27c5a1639933
--- /dev/null
+++ b/pkgs/development/python-modules/stomp-py/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  docopt,
+  websocket-client,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "stomp-py";
+  version = "8.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jasonrbriggs";
+    repo = "stomp.py";
+    tag = "v${version}";
+    hash = "sha256-UkNmE0+G9d3k1OhkNl98Jy5sP6MAywynzBmBtK9mZ90=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    docopt
+    websocket-client
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  doCheck = false; # needs external services setup
+
+  pythonImportsCheck = [ "stomp" ];
+
+  meta = {
+    description = "Client library for accessing messaging servers (such as ActiveMQ or RabbitMQ) using the STOMP protocol";
+    homepage = "https://github.com/jasonrbriggs/stomp.py";
+    changelog = "https://github.com/jasonrbriggs/stomp.py/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 764bab2093a5..b9e2c49d1ee5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16784,6 +16784,8 @@ self: super: with self; {
 
   stm32loader = callPackage ../development/python-modules/stm32loader { };
 
+  stomp-py = callPackage ../development/python-modules/stomp-py { };
+
   stone = callPackage ../development/python-modules/stone { };
 
   stookalert = callPackage ../development/python-modules/stookalert { };

From f40fdc43f53b68b367e61b7bf7a152910940cf83 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:52:11 +0200
Subject: [PATCH 0095/1497] python3Packages.luna-usb: 0.1.3 -> 0.2.0

---
 pkgs/development/python-modules/luna-usb/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix
index 4469dea12b5d..7d4da8148302 100644
--- a/pkgs/development/python-modules/luna-usb/default.nix
+++ b/pkgs/development/python-modules/luna-usb/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -21,15 +20,14 @@
 }:
 buildPythonPackage rec {
   pname = "luna-usb";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna";
     tag = version;
-    hash = "sha256-BKFfEkhgOH0lYfkAE94h27pb+T/uJxKFmMeVJI9I3qg=";
+    hash = "sha256-SVpAPq77IH2/2WZrc25j7q6qTMW2ToPY5lYQcYUlJfs=";
   };
 
   postPatch = ''
@@ -70,6 +68,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/greatscottgadgets/luna";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ carlossless ];
-    broken = lib.versionAtLeast amaranth.version "0.5";
   };
 }

From ed96ad9101a0e3e74dcde8fd8bf81520c0a33b25 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:52:42 +0200
Subject: [PATCH 0096/1497] python3Packages.luna-soc: 0.2.2 -> 0.3.2

---
 pkgs/development/python-modules/luna-soc/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/luna-soc/default.nix b/pkgs/development/python-modules/luna-soc/default.nix
index abfccc8e8f83..6501a47440c0 100644
--- a/pkgs/development/python-modules/luna-soc/default.nix
+++ b/pkgs/development/python-modules/luna-soc/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -13,15 +12,14 @@
 
 buildPythonPackage rec {
   pname = "luna-soc";
-  version = "0.2.2";
+  version = "0.3.2";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna-soc";
     tag = version;
-    hash = "sha256-fP2Pg0H/Aj3nFP0WG1yZjfZMqLutLwmibTohWUbgG34=";
+    hash = "sha256-Rks1wC0CR5FSu4TrE1thzolT3QBd0yh7q+SxZ1U+pB4=";
   };
 
   postPatch = ''

From fd2905b9a8e25b412a28b91c42beeffe9bf24e2f Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:53:20 +0200
Subject: [PATCH 0097/1497] python3Packages.cynthion: 0.1.8 -> 0.2.0

---
 pkgs/development/python-modules/cynthion/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index 53df6a47a08d..a2bf3b2b2c70 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -28,15 +27,14 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.1.8";
+  version = "0.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
     tag = version;
-    hash = "sha256-twkCv47Goob2cO7FeHegvab3asf8fqbY9qg97Vw4ZCo=";
+    hash = "sha256-rbvw2eieZwTxStwCRuvIx/f4vdPsOFnV/U80Ga+fNPA=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";
@@ -75,11 +73,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cynthion" ];
 
   meta = {
-    changelog = "https://github.com/greatscottgadgets/cynthion/releases/tag/${version}";
+    changelog = "https://github.com/greatscottgadgets/cynthion/releases/tag/${src.tag}";
     description = "Python package and utilities for the Great Scott Gadgets Cynthion USB Test Instrument";
     homepage = "https://github.com/greatscottgadgets/cynthion";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ carlossless ];
-    broken = lib.versionAtLeast amaranth.version "0.5";
   };
 }

From c1d715fce65a032123e885024516498277aab2ca Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:53:51 +0200
Subject: [PATCH 0098/1497] cynthion: remove amaranth version override

---
 pkgs/by-name/cy/cynthion/package.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/by-name/cy/cynthion/package.nix b/pkgs/by-name/cy/cynthion/package.nix
index 70c767cf8ef7..59c1005d8628 100644
--- a/pkgs/by-name/cy/cynthion/package.nix
+++ b/pkgs/by-name/cy/cynthion/package.nix
@@ -1,26 +1,5 @@
 {
   python3,
-  fetchFromGitHub,
 }:
 
-let
-  python = python3.override {
-    self = python3;
-    packageOverrides = _: super: {
-      amaranth = super.amaranth.overridePythonAttrs rec {
-        version = "0.4.1";
-
-        src = fetchFromGitHub {
-          owner = "amaranth-lang";
-          repo = "amaranth";
-          rev = "refs/tags/v${version}";
-          sha256 = "sha256-VMgycvxkphdpWIib7aZwh588En145RgYlG2Zfi6nnDo=";
-        };
-
-        postPatch = null;
-      };
-    };
-  };
-in
-
-python.pkgs.toPythonApplication python.pkgs.cynthion
+python3.pkgs.toPythonApplication python3.pkgs.cynthion

From f443d8a56e90484f375acd7a1192167c46ae9bbc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 22 May 2025 03:26:14 +0200
Subject: [PATCH 0099/1497] python313Packages.pyrender: use llvmpipeHook

Didn't know about this one, pretty neat!
---
 .../python-modules/pyrender/default.nix            | 14 +++++++++++---
 pkgs/top-level/python-packages.nix                 |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyrender/default.nix b/pkgs/development/python-modules/pyrender/default.nix
index 1399a21b6fdb..04bbda7aa8ef 100644
--- a/pkgs/development/python-modules/pyrender/default.nix
+++ b/pkgs/development/python-modules/pyrender/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
@@ -16,6 +17,7 @@
   six,
   trimesh,
   pytestCheckHook,
+  mesa,
 }:
 
 buildPythonPackage rec {
@@ -77,10 +79,16 @@ buildPythonPackage rec {
 
   env.PYOPENGL_PLATFORM = "egl"; # enables headless rendering during check
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs =
+    [
+      pytestCheckHook
+    ]
+    ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
+      mesa.llvmpipeHook
+    ];
 
-  disabledTestPaths = [
-    # does not work inside sandbox, no GPU
+  disabledTestPaths = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook) [
+    # requires opengl context
     "tests/unit/test_offscreen.py"
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c535be56dcdf..d81d719e9e4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13290,7 +13290,9 @@ self: super: with self; {
 
   pyregion = callPackage ../development/python-modules/pyregion { };
 
-  pyrender = callPackage ../development/python-modules/pyrender { };
+  pyrender = callPackage ../development/python-modules/pyrender {
+    inherit (pkgs) mesa;
+  };
 
   pyrevolve = callPackage ../development/python-modules/pyrevolve { };
 

From 5c4cd8db3abeec10739ad2128c055e32153c1d30 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 May 2025 23:03:10 +0200
Subject: [PATCH 0100/1497] kissfftFloat: migrate cmakeFeature to cmakeBool

---
 pkgs/by-name/ki/kissfft/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix
index 03d0e7d04584..985ecb761996 100644
--- a/pkgs/by-name/ki/kissfft/package.nix
+++ b/pkgs/by-name/ki/kissfft/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "KISSFFT_DATATYPE" datatype)
     (lib.cmakeBool "KISSFFT_STATIC" enableStatic)
     # `test/testkiss.py` expects this…
-    (lib.cmakeFeature "KISSFFT_OPENMP" (if enableOpenmp then "ON" else "OFF"))
+    (lib.cmakeBool "KISSFFT_OPENMP" enableOpenmp)
   ];
 
   # Required for `test/testcpp.c`.

From eb222495bcbf7df5b8a7d3929ef05b08b57044e7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 24 May 2025 23:03:11 +0200
Subject: [PATCH 0101/1497] vanillara: migrate cmakeFeature to cmakeBool

---
 pkgs/by-name/va/vanillatd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix
index 3864e687d3cf..4b17a2527e1a 100644
--- a/pkgs/by-name/va/vanillatd/package.nix
+++ b/pkgs/by-name/va/vanillatd/package.nix
@@ -66,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "BUILD_VANILLATD" (if appName == "vanillatd" then "ON" else "OFF"))
-    (lib.cmakeFeature "BUILD_VANILLARA" (if appName == "vanillara" then "ON" else "OFF"))
-    (lib.cmakeFeature "BUILD_REMASTERTD" (if appName == "remastertd" then "ON" else "OFF"))
-    (lib.cmakeFeature "BUILD_REMASTERRA" (if appName == "remasterra" then "ON" else "OFF"))
+    (lib.cmakeBool "BUILD_VANILLATD" (appName == "vanillatd"))
+    (lib.cmakeBool "BUILD_VANILLARA" (appName == "vanillara"))
+    (lib.cmakeBool "BUILD_REMASTERTD" (appName == "remastertd"))
+    (lib.cmakeBool "BUILD_REMASTERRA" (appName == "remasterra"))
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" CMAKE_BUILD_TYPE)
   ];
 

From 664bd068f5a03611b9a582e0e7b00c2609ba25a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 May 2025 22:12:04 +0000
Subject: [PATCH 0102/1497] python3Packages.djangosaml2: 1.10.1 -> 1.11.0

---
 pkgs/development/python-modules/djangosaml2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix
index 37db74d9c29b..062f09075612 100644
--- a/pkgs/development/python-modules/djangosaml2/default.nix
+++ b/pkgs/development/python-modules/djangosaml2/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "djangosaml2";
-  version = "1.10.1";
+  version = "1.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "IdentityPython";
     repo = "djangosaml2";
     tag = "v${version}";
-    hash = "sha256-5o89tqGlklVS6WwxPUG+3rXBFVSqv8QXmoGVonBucK4=";
+    hash = "sha256-AkyXxWcckBVWUZAhjuUru2b1/t4iwoCKxmTvvqSziV0=";
   };
 
   build-system = [ setuptools ];

From 2844748c4bdf9d001079c225b309df7d5a3b9d2d Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 May 2025 17:26:27 -0600
Subject: [PATCH 0103/1497] mozhi: init at 0-unstable-2025-04-14

---
 pkgs/by-name/mo/mozhi/package.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/mo/mozhi/package.nix

diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix
new file mode 100644
index 000000000000..0f5fdeb998aa
--- /dev/null
+++ b/pkgs/by-name/mo/mozhi/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitea,
+  unstableGitUpdater,
+}:
+buildGoModule {
+  pname = "mozhi";
+  version = "0-unstable-2025-04-14";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "aryak";
+    repo = "mozhi";
+    rev = "c2c14988c09e6c5fae5a8ac59c07a650f0997a5a";
+    hash = "sha256-xJw9BkdKlN1VToKyDlkW8UUZB94gzD9nclNciDmVIkk=";
+  };
+
+  vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    homepage = "https://codeberg.org/aryak/mozhi";
+    description = "Alternative-frontend for many translation engines, fork of SimplyTranslate";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.ryand56 ];
+    mainProgram = "mozhi";
+  };
+}

From f0c9b09b8552ea0e44a3a0447b8604fa1a1119b2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 25 May 2025 03:56:49 +0200
Subject: [PATCH 0104/1497] python313Packages.textx.passthru.tests.*: fix
 meta.homepage

---
 pkgs/development/python-modules/textx/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix
index 924464439578..cffd4d5483f2 100644
--- a/pkgs/development/python-modules/textx/default.nix
+++ b/pkgs/development/python-modules/textx/default.nix
@@ -85,7 +85,7 @@ let
     meta = with lib; {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
-      homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
+      homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot;
     };
   };
 
@@ -108,7 +108,7 @@ let
     meta = with lib; {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
-      homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
+      homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot;
     };
   };
 
@@ -128,7 +128,7 @@ let
     meta = with lib; {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
-      homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
+      homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot;
     };
   };
 
@@ -148,7 +148,7 @@ let
     meta = with lib; {
       inherit (textx.meta) license maintainers;
       description = "Sample textX language for testing";
-      homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
+      homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot;
     };
   };
 
@@ -168,7 +168,7 @@ let
     meta = with lib; {
       inherit (textx.meta) license maintainers;
       description = "Sample textX sub-command for testing";
-      homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot;
+      homepage = textx.meta.homepage + "tree/${version}/" + pathToSourceRoot;
     };
   };
 in

From d24d2fc0d956e6d480a33885421fe37870417863 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 May 2025 14:18:35 +0000
Subject: [PATCH 0105/1497] python3Packages.influxdb-client: 1.48.0 -> 1.49.0

---
 pkgs/development/python-modules/influxdb-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index f9054acb542d..003a4e59013e 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "influxdb-client";
-  version = "1.48.0";
+  version = "1.49.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "influxdata";
     repo = "influxdb-client-python";
     tag = "v${version}";
-    hash = "sha256-MKTfRsqizZDXPMqJAypUDQBm+a2s6FaEG3TM30wucrI=";
+    hash = "sha256-lu3we/KXwP3oC9bfv6gzbwacOVLGSuPBf9giwmsHXgI=";
   };
 
   build-system = [ setuptools ];
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "InfluxDB client library";
     homepage = "https://github.com/influxdata/influxdb-client-python";
-    changelog = "https://github.com/influxdata/influxdb-client-python/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/influxdata/influxdb-client-python/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ mic92 ];
   };

From fb78afbbd0ea83eed2e02d6f8d5a43719fb438df Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 22 May 2025 18:09:31 -0400
Subject: [PATCH 0106/1497] linux/common-config: Enable ACPI_DEBUG

---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0c5ee542de44..15668f239c73 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -134,6 +134,12 @@ let
         # APEI Generic Hardware Error Source
         ACPI_APEI_GHES = (option yes);
 
+        # Without this, on some hardware the kernel fails at some
+        # point after the EFI stub has executed but before a console
+        # is set up. Regardless, it's good to have the extra debug
+        # anyway.
+        ACPI_DEBUG = yes;
+
         # Enable lazy RCUs for power savings:
         # https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/
         # RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL

From 60a907b76a50c85aae6cbcf51aea8b8bd2c060dd Mon Sep 17 00:00:00 2001
From: Andrew Voynov <andrewvoynov.b@gmail.com>
Date: Tue, 1 Apr 2025 13:40:32 +0300
Subject: [PATCH 0107/1497] hyphen: add Russian dictionary, update
 readmeFileName values

For some reason README file for Russian has different naming upstream,
therefore `readmeFileName` for all languages was changed to accommodate
both naming schemes.
---
 .../libraries/hyphen/dictionaries.nix         | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix
index 01303652017a..34fe0729643f 100644
--- a/pkgs/development/libraries/hyphen/dictionaries.nix
+++ b/pkgs/development/libraries/hyphen/dictionaries.nix
@@ -44,7 +44,7 @@ let
         install -m644 "hyph_${dictFileName}.dic" "$out/share/hyphen"
         # docs
         install -dm755 "$out/share/doc/"
-        install -m644 "README_hyph_${readmeFileName}.txt" "$out/share/doc/${pname}.txt"
+        install -m644 "README_${readmeFileName}.txt" "$out/share/doc/${pname}.txt"
         runHook postInstall
       '';
     };
@@ -84,7 +84,7 @@ rec {
     shortName = "de-de";
     shortDescription = "German (Germany)";
     dictFileName = "de_DE";
-    readmeFileName = "de";
+    readmeFileName = "hyph_de";
   };
 
   de_AT = de-at;
@@ -93,7 +93,7 @@ rec {
     shortName = "de-at";
     shortDescription = "German (Austria)";
     dictFileName = "de_AT";
-    readmeFileName = "de";
+    readmeFileName = "hyph_de";
   };
 
   de_CH = de-ch;
@@ -102,6 +102,17 @@ rec {
     shortName = "de-ch";
     shortDescription = "German (Switzerland)";
     dictFileName = "de_CH";
-    readmeFileName = "de";
+    readmeFileName = "hyph_de";
+  };
+
+  # RUSSIAN
+
+  ru_RU = ru-ru;
+  ru-ru = mkDictFromLibreofficeGit {
+    subdir = "ru_RU";
+    shortName = "ru-ru";
+    shortDescription = "Russian (Russia)";
+    dictFileName = "ru_RU";
+    readmeFileName = "ru_RU";
   };
 }

From c2fcace1ac068de1f603993a64c5b0f56c873e34 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sun, 18 May 2025 20:09:08 -0400
Subject: [PATCH 0108/1497] eduke32: automatically update VC_REV

---
 pkgs/by-name/ed/eduke32/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index bcafef63bade..adc9bca5de40 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -33,7 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "terminx";
     repo = "eduke32";
     rev = "b8759847124c2c53a165a02efef4a0c778674baf";
-    hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg=";
+    hash = "sha256-+XaIoCP6TA5QMzs/VxXIv1NP8X4i9rIm6iw+pFH8Q6Q=";
+    deepClone = true;
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+      git rev-list --count HEAD > VC_REV
+      rm -rf .git
+    '';
   };
 
   patches = [
@@ -83,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "SDLCONFIG=${SDL2}/bin/sdl2-config"
-    # git rev-list --count HEAD
-    "VC_REV=10619"
     "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
     "VC_BRANCH=master"
   ];
@@ -94,6 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
     "sw"
   ];
 
+  preConfigure = ''
+    appendToVar makeFlags "VC_REV=$(cat VC_REV)"
+  '';
+
   desktopItems = [
     (makeDesktopItem {
       name = "eduke32";

From 120880f12c0b8214776eb0981a0a682f07d9becb Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sun, 18 May 2025 20:27:19 -0400
Subject: [PATCH 0109/1497] eduke32: add update script

---
 pkgs/by-name/ed/eduke32/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index adc9bca5de40..d91708be249c 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -16,6 +16,7 @@
   SDL2,
   SDL2_mixer,
   graphicsmagick,
+  unstableGitUpdater,
 }:
 
 let
@@ -178,6 +179,8 @@ stdenv.mkDerivation (finalAttrs: {
       runHook postInstall
     '';
 
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
   meta = {
     description = "Enhanched port of Duke Nukem 3D for various platforms";
     homepage = "http://eduke32.com";

From e189ab9ace70332fc8f89b2ed6b17cb6c685466a Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 May 2025 21:53:08 +0400
Subject: [PATCH 0110/1497] kchmviewer: enable on unix

---
 pkgs/applications/misc/kchmviewer/default.nix | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix
index f3ecbdf87e37..41dac9e9f745 100644
--- a/pkgs/applications/misc/kchmviewer/default.nix
+++ b/pkgs/applications/misc/kchmviewer/default.nix
@@ -36,6 +36,15 @@ stdenv.mkDerivation rec {
       url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch";
       sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
     })
+    # Fix build on macOS
+    (fetchpatch {
+      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/b68ed6fe72eaf9ee4e7e42925f5071fbd02dc6b3.patch";
+      hash = "sha256-sJA0RE0Z83tYv0S42yQYWKKeLhW+YDsrxLkY5aMKKT4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/d307e4e829c5a6f57ab0040f786c3da7fd2f0a99.patch";
+      hash = "sha256-FWYfqG8heL6AnhevueCWHQc+c6Yj4+DuIdjIwXVZ+O4=";
+    })
   ];
 
   buildInputs = [
@@ -49,11 +58,19 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  postInstall = ''
-    install -Dm755 bin/kchmviewer -t $out/bin
-    install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps
-    install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
-  '';
+  postInstall =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/{Applications,bin}
+        mv bin/kchmviewer.app $out/Applications
+        ln -s $out/Applications/kchmviewer.app/Contents/MacOS/kchmviewer $out/bin/kchmviewer
+      ''
+    else
+      ''
+        install -Dm755 bin/kchmviewer -t $out/bin
+        install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps
+        install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
+      '';
 
   meta = with lib; {
     description = "CHM (Winhelp) files viewer";
@@ -61,6 +78,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.ulduzsoft.com/linux/kchmviewer/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From b05f6f1403ef3eeaf6c64bea2d89b0e0b39af43b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 May 2025 21:55:39 +0400
Subject: [PATCH 0111/1497] kchmviewer: modernize

---
 pkgs/applications/misc/kchmviewer/default.nix | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix
index 41dac9e9f745..29ac5deb04c3 100644
--- a/pkgs/applications/misc/kchmviewer/default.nix
+++ b/pkgs/applications/misc/kchmviewer/default.nix
@@ -10,31 +10,31 @@
   qtwebengine,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kchmviewer";
   version = "8.0";
 
   src = fetchFromGitHub {
     owner = "gyunaev";
-    repo = pname;
-    rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw=";
+    repo = "kchmviewer";
+    tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw=";
   };
 
   patches = [
     # remove unused webkit
     (fetchpatch {
       url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch";
-      sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28=";
+      hash = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28=";
     })
     # QtWebengine fixes
     (fetchpatch {
       url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch";
-      sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY=";
+      hash = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY=";
     })
     (fetchpatch {
       url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch";
-      sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
+      hash = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
     })
     # Fix build on macOS
     (fetchpatch {
@@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
         install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
       '';
 
-  meta = with lib; {
+  meta = {
     description = "CHM (Winhelp) files viewer";
     mainProgram = "kchmviewer";
     homepage = "http://www.ulduzsoft.com/linux/kchmviewer/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From f399a6d589bcd77af1cbed55eb476369ec29882c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 25 May 2025 21:57:43 +0400
Subject: [PATCH 0112/1497] kchmviewer: migrate to by-name

---
 .../default.nix => by-name/kc/kchmviewer/package.nix}  | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/kchmviewer/default.nix => by-name/kc/kchmviewer/package.nix} (96%)

diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/by-name/kc/kchmviewer/package.nix
similarity index 96%
rename from pkgs/applications/misc/kchmviewer/default.nix
rename to pkgs/by-name/kc/kchmviewer/package.nix
index 29ac5deb04c3..3e84705d0992 100644
--- a/pkgs/applications/misc/kchmviewer/default.nix
+++ b/pkgs/by-name/kc/kchmviewer/package.nix
@@ -3,11 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qmake,
-  wrapQtAppsHook,
+  qt5,
   chmlib,
   libzip,
-  qtwebengine,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     chmlib
     libzip
-    qtwebengine
+    qt5.qtwebengine
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   postInstall =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21affad468e6..56dd7df4c430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13017,8 +13017,6 @@ with pkgs;
 
   kapow = libsForQt5.callPackage ../applications/misc/kapow { };
 
-  kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { };
-
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };

From 597012fb7006b32aeaa1d0c6cd5114fcab0a1cdb Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 26 May 2025 03:01:45 +0900
Subject: [PATCH 0113/1497] typescript-go: init at 0-unstable-2025-05-23

---
 pkgs/by-name/ty/typescript-go/package.nix | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/ty/typescript-go/package.nix

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
new file mode 100644
index 000000000000..f2abcecb006d
--- /dev/null
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+buildGoModule {
+  pname = "typescript-go";
+  version = "0-unstable-2025-05-23";
+
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "typescript-go";
+    rev = "1b88303de8ad861566d479b0bcf5b88874494536";
+    hash = "sha256-qxP8MhUK9ww3yB0ko2K6GPUfY1bcfGL3u5qRACf9ZK0=";
+    fetchSubmodules = false;
+  };
+
+  vendorHash = "sha256-SoBlxQfMg59UOO+99HPeKqEPxD2p7JauLMTpQ7Jl03s=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "cmd/tsgo"
+  ];
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    version="$("$out/bin/tsgo" --version)"
+    [[ "$version" == *"7.0.0"* ]]
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  meta = {
+    description = "Go implementation of TypeScript";
+    homepage = "https://github.com/microsoft/typescript-go";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
+    mainProgram = "tsgo";
+  };
+}

From d5c77fd3fb83b3f983088ff516ca3b00c08c26dd Mon Sep 17 00:00:00 2001
From: John Rodewald <jnrodewald99@gmail.com>
Date: Sun, 25 May 2025 11:46:14 +0200
Subject: [PATCH 0114/1497] gex: fix Darwin build

`zlib` dependency was missing.
---
 pkgs/by-name/ge/gex/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix
index 0ecba4acd1e0..d0422f2b142c 100644
--- a/pkgs/by-name/ge/gex/package.nix
+++ b/pkgs/by-name/ge/gex/package.nix
@@ -5,6 +5,8 @@
   pkg-config,
   libgit2,
   nix-update-script,
+  zlib,
+  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,7 +26,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libgit2
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ];
 
   env = {
     LIBGIT2_NO_VENDOR = 1;

From 9456b271f4f86303a6562ec8d8cf0e14acf3b915 Mon Sep 17 00:00:00 2001
From: RatCornu <balthazar.patiachvili@crans.org>
Date: Mon, 26 May 2025 13:47:52 +0200
Subject: [PATCH 0115/1497] pingvin-share: 1.11.1 -> 1.13.0 Moved pingvin-share
 in pkgs/servers/web-app folder

---
 pkgs/servers/{ => web-apps}/pingvin-share/backend.nix  | 2 +-
 pkgs/servers/{ => web-apps}/pingvin-share/default.nix  | 4 ++--
 pkgs/servers/{ => web-apps}/pingvin-share/frontend.nix | 2 +-
 pkgs/top-level/all-packages.nix                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/servers/{ => web-apps}/pingvin-share/backend.nix (93%)
 rename pkgs/servers/{ => web-apps}/pingvin-share/default.nix (79%)
 rename pkgs/servers/{ => web-apps}/pingvin-share/frontend.nix (92%)

diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/web-apps/pingvin-share/backend.nix
similarity index 93%
rename from pkgs/servers/pingvin-share/backend.nix
rename to pkgs/servers/web-apps/pingvin-share/backend.nix
index 0fe2cddcefdf..787f9b4870c9 100644
--- a/pkgs/servers/pingvin-share/backend.nix
+++ b/pkgs/servers/web-apps/pingvin-share/backend.nix
@@ -31,7 +31,7 @@ buildNpmPackage {
     prisma
   ];
 
-  npmDepsHash = "sha256-o++v2dy9Cq2DW1owY8ea2wRr8wxr0bzuswd3ljM5Rbg=";
+  npmDepsHash = "sha256-bc2suSGa7YTonIhUxEtNzdIUeUBubwJ6upW2tydVCnU=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 
diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix
similarity index 79%
rename from pkgs/servers/pingvin-share/default.nix
rename to pkgs/servers/web-apps/pingvin-share/default.nix
index d230a01ca261..08a1907646b7 100644
--- a/pkgs/servers/pingvin-share/default.nix
+++ b/pkgs/servers/web-apps/pingvin-share/default.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.11.1";
+  version = "1.13.0";
   src = fetchFromGitHub {
     owner = "stonith404";
     repo = "pingvin-share";
     rev = "v${version}";
-    hash = "sha256-ye26VyfeKcQk1gTLxVqsYmrqK0nqmU2Cl+fIrWdryLQ=";
+    hash = "sha256-FWc0Yo2Phh8ee5izHj0ol1pwLSVJgIqyeaJo1o4drsM=";
   };
 in
 
diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/web-apps/pingvin-share/frontend.nix
similarity index 92%
rename from pkgs/servers/pingvin-share/frontend.nix
rename to pkgs/servers/web-apps/pingvin-share/frontend.nix
index 92035856fbde..bf320dd95531 100644
--- a/pkgs/servers/pingvin-share/frontend.nix
+++ b/pkgs/servers/web-apps/pingvin-share/frontend.nix
@@ -23,7 +23,7 @@ buildNpmPackage {
   buildInputs = [ vips ];
   nativeBuildInputs = [ pkg-config ];
 
-  npmDepsHash = "sha256-OLlh1YLS+fKw9Mcc2y724+WyK/j80McM2nGDLf2UzPA=";
+  npmDepsHash = "sha256-ykq98Bd67TY/t8JYraii7XnCIoSLk454decdHpQGorw=";
   makeCacheWritable = true;
   npmFlags = [ "--legacy-peer-deps" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21affad468e6..111e797e422a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9331,7 +9331,7 @@ with pkgs;
     physfs
     ;
 
-  pingvin-share = callPackage ../servers/pingvin-share { };
+  pingvin-share = callPackage ../servers/web-apps/pingvin-share { };
 
   pipelight = callPackage ../tools/misc/pipelight {
     stdenv = stdenv_32bit;

From 415318fedf90bc8d72988597dbdaa65cdc0be796 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 28 Jan 2025 20:18:45 +0100
Subject: [PATCH 0116/1497] aseprite: 1.3.7 -> 1.3.13

---
 pkgs/by-name/as/aseprite/package.nix          | 66 ++++++++++---------
 pkgs/by-name/as/aseprite/shared-fmt.patch     | 40 ++++++-----
 pkgs/by-name/as/aseprite/shared-libwebp.patch | 32 ++++-----
 3 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 6aae1d237f64..aac5c6790550 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -33,15 +33,35 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "aseprite";
-  version = "1.3.7";
+  version = "1.3.13";
 
-  src = fetchFromGitHub {
-    owner = "aseprite";
-    repo = "aseprite";
-    rev = "v" + finalAttrs.version;
-    fetchSubmodules = true;
-    hash = "sha256-75kYJXmyags0cW2D5Ksq1uUrFSCAkFOdmn7Ya/6jLXc=";
-  };
+  srcs = [
+    (fetchFromGitHub {
+      name = "aseprite-source";
+      owner = "aseprite";
+      repo = "aseprite";
+      tag = "v${finalAttrs.version}";
+      fetchSubmodules = true;
+      hash = "sha256-eeB/4fQp1lbNYQj9LpNhOn7DYxaTc+BcmyvY2vPzpxk=";
+    })
+
+    # Translation strings
+    (fetchFromGitHub {
+      name = "aseprite-strings";
+      owner = "aseprite";
+      repo = "strings";
+      rev = "7b0af61dec1d98242d7eb2e9cab835d442d21235";
+      hash = "sha256-8OwwHCFP55pwLjk5O+a36hDZf9uX3P7cNliJM5SZdAg=";
+    })
+  ];
+
+  # Sets the main build directory to "aseprite-source" since multiple sources are fetched.
+  sourceRoot = "aseprite-source";
+
+  # Translation files are copied without overwriting existing ones to preserve the potentially more up-to-date English file from the main source.
+  postUnpack = ''
+    cp --no-clobber $PWD/aseprite-strings/* ./aseprite-source/data/strings
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -75,33 +95,15 @@ clangStdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # https://github.com/aseprite/aseprite/issues/4486
-    # FIXME: remove on next release.
-    (fetchpatch {
-      name = "ENABLE_UPDATER-fix.patch";
-      url = "https://github.com/aseprite/aseprite/commit/8fce589.patch";
-      hash = "sha256-DbL6kK//gQXbsXEn/t+KTuoM7E9ocPAsVqEO+lYrka4=";
-    })
     ./shared-fmt.patch
     ./shared-libwebp.patch
     ./shared-skia-deps.patch
   ];
 
-  postPatch =
-    let
-      # Translation strings
-      strings = fetchFromGitHub {
-        owner = "aseprite";
-        repo = "strings";
-        rev = "e18a09fefbb6cd904e506183d5fbe08558a52ed4";
-        hash = "sha256-GyCCxbhgf0vST20EH/+KkNLrF+U9Xzgpxlao8s925PQ=";
-      };
-    in
-    ''
-      sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-"
-      rm -rf data/strings
-      cp -r ${strings} data/strings
-    '';
+  postPatch = ''
+    substituteInPlace src/ver/CMakeLists.txt \
+      --replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
+  '';
 
   cmakeFlags = [
     "-DENABLE_DESKTOP_INTEGRATION=ON"
@@ -116,7 +118,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     "-DUSE_SHARED_LIBPNG=ON"
     "-DUSE_SHARED_LIBWEBP=ON"
     "-DUSE_SHARED_PIXMAN=ON"
-    "-DUSE_SHARED_TINYXML=ON"
+    "-DUSE_SHARED_TINYXML=OFF"
     "-DUSE_SHARED_WEBP=ON"
     "-DUSE_SHARED_ZLIB=ON"
     # Disable libarchive programs.
@@ -124,7 +126,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     "-DENABLE_CPIO=OFF"
     "-DENABLE_TAR=OFF"
     # UI backend.
-    "-DLAF_OS_BACKEND=skia"
+    "-DLAF_BACKEND=skia"
     "-DLAF_WITH_EXAMPLES=OFF"
     "-DSKIA_DIR=${skia-aseprite}"
     "-DSKIA_LIBRARY_DIR=${skia-aseprite}/lib"
diff --git a/pkgs/by-name/as/aseprite/shared-fmt.patch b/pkgs/by-name/as/aseprite/shared-fmt.patch
index 794d8a4adcc1..6cac2ecc0459 100644
--- a/pkgs/by-name/as/aseprite/shared-fmt.patch
+++ b/pkgs/by-name/as/aseprite/shared-fmt.patch
@@ -1,6 +1,8 @@
---- a/CMakeLists.txt	2022-01-08 00:37:08.165330523 +0100
-+++ b/CMakeLists.txt	2022-01-08 00:52:41.163585173 +0100
-@@ -54,6 +54,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1bd0189b..3fb7abffb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,7 @@ enable_testing()
  
  option(USE_SHARED_CMARK   "Use your installed copy of cmark" off)
  option(USE_SHARED_CURL    "Use your installed copy of curl" off)
@@ -8,7 +10,7 @@
  option(USE_SHARED_GIFLIB  "Use your installed copy of giflib" off)
  option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
  option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
-@@ -165,6 +165,7 @@
+@@ -185,6 +186,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/bin")
  set(SOURCE_DATA_DIR     ${CMAKE_CURRENT_SOURCE_DIR}/data)
  set(CMARK_DIR           ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark)
  set(CURL_DIR            ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl)
@@ -16,10 +18,11 @@
  set(GIFLIB_DIR          ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib)
  set(LIBJPEG_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg)
  set(LIBPNG_DIR          ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng)
-@@ -204,6 +205,15 @@
+@@ -225,6 +227,16 @@ if(NOT USE_SHARED_CURL)
    set(CURL_STATICLIB ON BOOL)
  endif()
  
++# fmt
 +if(USE_SHARED_FMT)
 +  find_package(FMT REQUIRED)
 +  set(FMT_LIBRARIES fmt::fmt)
@@ -32,10 +35,12 @@
  # zlib
  if(USE_SHARED_ZLIB)
    find_package(ZLIB REQUIRED)
---- a/src/app/CMakeLists.txt	2022-01-08 00:37:07.378671200 +0100
-+++ b/src/app/CMakeLists.txt	2022-01-08 00:53:13.669969512 +0100
-@@ -741,7 +741,7 @@ target_link_libraries(app-lib
-   ${HARFBUZZ_LIBRARIES}
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index 9c67c0268..b19a3e412 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -754,7 +754,7 @@ target_link_libraries(app-lib
+   ${ZLIB_LIBRARIES}
    json11
    archive_static
 -  fmt
@@ -43,10 +48,11 @@
    tinyexpr
    qoi)
  
- if(ENABLE_PSD)
---- a/src/dio/CMakeLists.txt	2022-01-08 00:41:50.712726972 +0100
-+++ b/src/dio/CMakeLists.txt	2022-01-08 00:53:39.936408022 +0100
-@@ -10,7 +10,7 @@
+diff --git a/src/dio/CMakeLists.txt b/src/dio/CMakeLists.txt
+index 55cb24de5..b253dca0b 100644
+--- a/src/dio/CMakeLists.txt
++++ b/src/dio/CMakeLists.txt
+@@ -16,7 +16,7 @@ endif()
  
  target_link_libraries(dio-lib
    ${ZLIB_LIBRARIES}
@@ -55,9 +61,11 @@
    flic-lib
    laf-base
    fixmath-lib
---- a/third_party/CMakeLists.txt	2022-01-08 00:37:08.165330523 +0100
-+++ b/third_party/CMakeLists.txt	2022-01-08 00:54:30.455969136 +0100
-@@ -106,7 +106,10 @@
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index 9d09a98c8..1973b134b 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -117,7 +117,10 @@ if(NOT USE_SHARED_HARFBUZZ AND NOT LAF_BACKEND STREQUAL "skia")
  endif()
  
  add_subdirectory(simpleini)
diff --git a/pkgs/by-name/as/aseprite/shared-libwebp.patch b/pkgs/by-name/as/aseprite/shared-libwebp.patch
index 20191f46b8b1..e4526a34e9fd 100644
--- a/pkgs/by-name/as/aseprite/shared-libwebp.patch
+++ b/pkgs/by-name/as/aseprite/shared-libwebp.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index af077f6..fed17ff 100644
+index  87aed2f28f9c..498472ec2a60 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
+@@ -76,6 +76,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
  option(USE_SHARED_PIXMAN  "Use your installed copy of pixman" off)
  option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
  option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
@@ -10,7 +10,7 @@ index af077f6..fed17ff 100644
  option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
  option(ENABLE_MEMLEAK      "Enable memory-leaks detector (only for developers)" off)
  option(ENABLE_NEWS         "Enable the news in Home tab" on)
-@@ -328,14 +351,17 @@ add_subdirectory(laf)
+@@ -380,7 +381,20 @@ add_subdirectory(laf)
  # libwebp
  if(ENABLE_WEBP)
    # Use libwebp from Skia
@@ -21,27 +21,27 @@ index af077f6..fed17ff 100644
 +    find_library(WEBPMUX_LIBRARY NAMES webpmux)
 +    set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY})
 +    find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
-+  else()
++    find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++    find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp)
++    if(WEBP_LIBRARIES)
++      set(WEBP_FOUND ON)
++    else()
++      set(WEBP_FOUND OFF)
++    endif()
++  elseif(LAF_BACKEND STREQUAL "skia")
      find_library(WEBP_LIBRARIES webp
        NAMES libwebp # required for Windows
        PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH)
-     set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src")
--  else()
--    set(WEBP_LIBRARIES webp webpdemux libwebpmux)
--    set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
-   endif()
-   include_directories(${WEBP_INCLUDE_DIR})
- endif()
 diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
-index 4839d4097c..e8c3e83cbc 100644
+index 1973b134b9f8..f15dba5a7968 100644
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB)
+@@ -33,7 +33,7 @@ if(NOT USE_SHARED_GIFLIB)
    add_subdirectory(giflib)
  endif()
- 
+
 -if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
 +if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP)
    set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
-   add_subdirectory(libwebp)
- endif()
\ No newline at end of file
+   set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
+   set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")

From 31fb64851e752b18fc9fbda1af6b94fce7c23e1e Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Sun, 18 May 2025 11:29:07 +0800
Subject: [PATCH 0117/1497] racket, racket-minimal: 8.16 -> 8.17

---
 pkgs/development/interpreters/racket/manifest.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json
index 022680c991ab..e7250d32f99d 100644
--- a/pkgs/development/interpreters/racket/manifest.json
+++ b/pkgs/development/interpreters/racket/manifest.json
@@ -1,11 +1,11 @@
 {
-  "version": "8.16",
+  "version": "8.17",
   "full": {
-    "filename": "racket-8.16-src.tgz",
-    "sha256": "b233a968f4a561f7b005ce06f2c4c29428562f308c1a04d28e2e2286f6b945c3"
+    "filename": "racket-8.17-src.tgz",
+    "sha256": "44431395138f7b8c5e67d416ff063b8fb6ce056f4c4f0fda27b7b1ec58bfa33b"
   },
   "minimal": {
-    "filename": "racket-minimal-8.16-src.tgz",
-    "sha256": "4e727db75574ab11d6bec7af5e5d72a084fa7f662e200c35d5bc200772f5ce96"
+    "filename": "racket-minimal-8.17-src.tgz",
+    "sha256": "4acb365869290881fa07c69588cfa8b2dc1000bdc69955d70964b0b1e76b71ba"
   }
 }

From 84047a3142a9ac2f17957aec8e35a5d97a80decb Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Sun, 18 May 2025 11:32:04 +0800
Subject: [PATCH 0118/1497] racket, racket-minimal: move to pkgs/by-name

---
 .../ra}/racket/configure-installation.rkt                      | 0
 .../interpreters => by-name/ra}/racket/manifest.json           | 0
 .../interpreters => by-name/ra}/racket/minimal.nix             | 0
 .../racket/default.nix => by-name/ra/racket/package.nix}       | 0
 .../ra}/racket/patches/force-cs-variant.patch                  | 0
 .../ra}/racket/patches/force-remove-codesign-then-add.patch    | 0
 .../interpreters => by-name/ra}/racket/tests/draw-crossing.nix | 0
 .../ra}/racket/tests/get-version-and-variant.nix               | 0
 .../interpreters => by-name/ra}/racket/tests/load-openssl.nix  | 0
 .../ra}/racket/tests/nix-write-script.nix                      | 0
 .../ra}/racket/tests/write-greeting.nix                        | 0
 pkgs/{development/interpreters => by-name/ra}/racket/update.py | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 13 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{development/interpreters => by-name/ra}/racket/configure-installation.rkt (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/manifest.json (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/minimal.nix (100%)
 rename pkgs/{development/interpreters/racket/default.nix => by-name/ra/racket/package.nix} (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/patches/force-cs-variant.patch (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/patches/force-remove-codesign-then-add.patch (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/tests/draw-crossing.nix (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/tests/get-version-and-variant.nix (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/tests/load-openssl.nix (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/tests/nix-write-script.nix (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/tests/write-greeting.nix (100%)
 rename pkgs/{development/interpreters => by-name/ra}/racket/update.py (100%)

diff --git a/pkgs/development/interpreters/racket/configure-installation.rkt b/pkgs/by-name/ra/racket/configure-installation.rkt
similarity index 100%
rename from pkgs/development/interpreters/racket/configure-installation.rkt
rename to pkgs/by-name/ra/racket/configure-installation.rkt
diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/by-name/ra/racket/manifest.json
similarity index 100%
rename from pkgs/development/interpreters/racket/manifest.json
rename to pkgs/by-name/ra/racket/manifest.json
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/minimal.nix
rename to pkgs/by-name/ra/racket/minimal.nix
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/by-name/ra/racket/package.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/default.nix
rename to pkgs/by-name/ra/racket/package.nix
diff --git a/pkgs/development/interpreters/racket/patches/force-cs-variant.patch b/pkgs/by-name/ra/racket/patches/force-cs-variant.patch
similarity index 100%
rename from pkgs/development/interpreters/racket/patches/force-cs-variant.patch
rename to pkgs/by-name/ra/racket/patches/force-cs-variant.patch
diff --git a/pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch b/pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch
similarity index 100%
rename from pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch
rename to pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch
diff --git a/pkgs/development/interpreters/racket/tests/draw-crossing.nix b/pkgs/by-name/ra/racket/tests/draw-crossing.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/tests/draw-crossing.nix
rename to pkgs/by-name/ra/racket/tests/draw-crossing.nix
diff --git a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/tests/get-version-and-variant.nix
rename to pkgs/by-name/ra/racket/tests/get-version-and-variant.nix
diff --git a/pkgs/development/interpreters/racket/tests/load-openssl.nix b/pkgs/by-name/ra/racket/tests/load-openssl.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/tests/load-openssl.nix
rename to pkgs/by-name/ra/racket/tests/load-openssl.nix
diff --git a/pkgs/development/interpreters/racket/tests/nix-write-script.nix b/pkgs/by-name/ra/racket/tests/nix-write-script.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/tests/nix-write-script.nix
rename to pkgs/by-name/ra/racket/tests/nix-write-script.nix
diff --git a/pkgs/development/interpreters/racket/tests/write-greeting.nix b/pkgs/by-name/ra/racket/tests/write-greeting.nix
similarity index 100%
rename from pkgs/development/interpreters/racket/tests/write-greeting.nix
rename to pkgs/by-name/ra/racket/tests/write-greeting.nix
diff --git a/pkgs/development/interpreters/racket/update.py b/pkgs/by-name/ra/racket/update.py
similarity index 100%
rename from pkgs/development/interpreters/racket/update.py
rename to pkgs/by-name/ra/racket/update.py
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21affad468e6..27781fc6e79b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6696,8 +6696,7 @@ with pkgs;
 
   wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
 
-  racket = callPackage ../development/interpreters/racket { };
-  racket-minimal = callPackage ../development/interpreters/racket/minimal.nix {
+  racket-minimal = callPackage ../by-name/ra/racket/minimal.nix {
     stdenv = stdenvAdapters.makeStaticLibraries stdenv;
   };
 

From a8d0fd7e40a2368dcb88296b0c52bd0e8116b9a4 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Sun, 18 May 2025 11:33:32 +0800
Subject: [PATCH 0119/1497] racket, racket-minimal: specify
 meta.sourceProvenance

---
 pkgs/by-name/ra/racket/minimal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix
index 8d85729c2a58..498ac889ae29 100644
--- a/pkgs/by-name/ra/racket/minimal.nix
+++ b/pkgs/by-name/ra/racket/minimal.nix
@@ -173,6 +173,10 @@ stdenv.mkDerivation (finalAttrs: {
       asl20
       mit
     ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
     maintainers = with lib.maintainers; [ rc-zb ];
     mainProgram = "racket";
     platforms = lib.platforms.all;

From 1b17b966d46898db1d11deb3efc7e342836a974e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 12:32:58 +0000
Subject: [PATCH 0120/1497] python3Packages.molecule: 25.4.0 -> 25.5.0

---
 pkgs/development/python-modules/molecule/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 5aba9687badd..9365a52811a7 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "25.4.0";
+  version = "25.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xTHioQUfgn84eNzX1A1taGjaBm1GHvKLXo/t6l6T8Pk=";
+    hash = "sha256-WF2M4K1JO+OulN4Jb4tKiWq5AQp+o2qGn99eKb1mj0s=";
   };
 
   nativeBuildInputs = [

From 56267970c2a7818a5f89508e1733520d7deb7df8 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 26 May 2025 14:35:06 +0200
Subject: [PATCH 0121/1497] adw-gtk3: add normalcea as maintainer

---
 pkgs/by-name/ad/adw-gtk3/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index 395f60d5571f..a7695a4d10fe 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ciferkey
       Gliczy
+      normalcea
     ];
   };
 })

From 1228b36dbf39428356553f19db23c2e152e99885 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 26 May 2025 14:36:33 +0200
Subject: [PATCH 0122/1497] adw-gtk3: change description

---
 pkgs/by-name/ad/adw-gtk3/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix
index a7695a4d10fe..274e21c3af28 100644
--- a/pkgs/by-name/ad/adw-gtk3/package.nix
+++ b/pkgs/by-name/ad/adw-gtk3/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Theme from libadwaita ported to GTK-3";
+    description = "Unofficial GTK 3 port of libadwaita";
     homepage = "https://github.com/lassekongo83/adw-gtk3";
     license = lib.licenses.lgpl21Only;
     platforms = lib.platforms.unix;

From 42af7c534c901d08a4435f196578844d173358aa Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Mon, 26 May 2025 20:25:41 +0800
Subject: [PATCH 0123/1497] racket, racket-minimal: remove redundant patch for
 Darwin

---
 pkgs/by-name/ra/racket/minimal.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix
index 498ac889ae29..2acd10f83bd7 100644
--- a/pkgs/by-name/ra/racket/minimal.nix
+++ b/pkgs/by-name/ra/racket/minimal.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchurl,
 
   libiconvReal,
@@ -50,13 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
       circumvent this error.
     */
     ./patches/force-remove-codesign-then-add.patch
-
-    (fetchpatch {
-      name = "darwin-cs-preprocess.patch";
-      url = "https://github.com/racket/racket/commit/ee9fb20a10a1a8e36650681afcafe99f0b044423.patch";
-      hash = "sha256-9aTRzfd3dwznfJg0fwsjhN4SYgXncrGyBCbcmKlxlio=";
-      stripLen = 1;
-    })
   ];
 
   preConfigure =

From bda9a249be44f3643617c4031cd01daecd6042c5 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Sat, 17 May 2025 17:04:05 +0200
Subject: [PATCH 0124/1497] plutovg: 1.0.0 -> 1.1.0

---
 pkgs/by-name/pl/plutovg/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix
index 88b1d186081a..7e795b499e6e 100644
--- a/pkgs/by-name/pl/plutovg/package.nix
+++ b/pkgs/by-name/pl/plutovg/package.nix
@@ -6,15 +6,23 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "plutovg";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "sammycage";
     repo = "plutovg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xNWwACKGU5UIJviVZ3wU4GMuRxKn/rR8jBsZQpZiFZ8=";
+    hash = "sha256-989MA60nc1Tzp/4RzT0iYHz4JBJkU9zgEjEswa4vDpk=";
   };
 
+  cmakeFlags = [
+    # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
+    # (setting it to an absolute path causes include files to go to $out/$out/include,
+    #  because the absolute path is interpreted with root at $out).
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
+
   nativeBuildInputs = [
     cmake
   ];

From c1afaee9edfeada46e3e8c5a2b2aa586860d4cf2 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Mon, 26 May 2025 11:50:36 +0000
Subject: [PATCH 0125/1497] =?UTF-8?q?pre-commit:=204.0.1=20=E2=86=92=204.2?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Release notes: <https://github.com/pre-commit/pre-commit/releases/tag/v4.2.0>
---
 pkgs/by-name/pr/pre-commit/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index 5bee2ddd0c3e..1e0791e70f16 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -11,6 +11,7 @@
   nodejs,
   perl,
   cabal-install,
+  julia,
   pre-commit,
 }:
 
@@ -20,7 +21,7 @@ let
 in
 buildPythonApplication rec {
   pname = "pre-commit";
-  version = "4.0.1";
+  version = "4.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -29,7 +30,7 @@ buildPythonApplication rec {
     owner = "pre-commit";
     repo = "pre-commit";
     tag = "v${version}";
-    hash = "sha256-qMNnzAxJOS7mabHmGYZ/VkDrpaZbqTJyETSCxq/OrGQ=";
+    hash = "sha256-rUhI9NaxyRfLu/mfLwd5B0ybSnlAQV2Urx6+fef0sGM=";
   };
 
   patches = [
@@ -60,6 +61,7 @@ buildPythonApplication rec {
       pytestCheckHook
       re-assert
       cabal-install
+      julia
     ]
     ++ lib.optionals (!i686Linux) [
       # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
@@ -135,6 +137,7 @@ buildPythonApplication rec {
       "test_additional_node_dependencies_installed"
       "test_additional_rust_cli_dependencies_installed"
       "test_additional_rust_lib_dependencies_installed"
+      "test_automatic_toolchain_switching"
       "test_coursier_hook"
       "test_coursier_hook_additional_dependencies"
       "test_dart"
@@ -150,6 +153,8 @@ buildPythonApplication rec {
       "test_language_version_with_rustup"
       "test_installs_rust_missing_rustup"
       "test_installs_without_links_outside_env"
+      "test_julia_hook"
+      "test_julia_repo_local"
       "test_local_golang_additional_deps"
       "test_lua"
       "test_lua_additional_dependencies"

From ac52796e8b16a3a401005baf51aab3778358990e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 26 May 2025 15:09:32 +0000
Subject: [PATCH 0126/1497] maid: update all gems

---
 pkgs/by-name/ma/maid/Gemfile.lock | 18 +++++++++---------
 pkgs/by-name/ma/maid/gemset.nix   | 28 ++++++++++++++--------------
 pkgs/by-name/ma/maid/package.nix  |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/ma/maid/Gemfile.lock b/pkgs/by-name/ma/maid/Gemfile.lock
index edf10273db01..3b706c80212c 100644
--- a/pkgs/by-name/ma/maid/Gemfile.lock
+++ b/pkgs/by-name/ma/maid/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     base64 (0.2.0)
-    concurrent-ruby (1.3.4)
-    csv (3.3.0)
+    concurrent-ruby (1.3.5)
+    csv (3.3.4)
     deprecated (3.0.1)
     dimensions (1.3.0)
     escape (0.0.4)
     et-orbi (1.2.11)
       tzinfo
     exifr (1.3.10)
-    ffi (1.17.0)
+    ffi (1.17.2)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.7.0)
     maid (0.10.0)
       deprecated (~> 3.0.0)
       dimensions (>= 1.0.0, < 2.0)
@@ -33,10 +33,10 @@ GEM
       rufus-scheduler (~> 3.8.2)
       thor (~> 1.2.1)
       xdg (~> 2.2.3)
-    mime-types (3.6.0)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0520)
     raabro (1.4.0)
     rake (13.2.1)
     rb-fsevent (0.11.2)
@@ -58,4 +58,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.5.11
+   2.6.6
diff --git a/pkgs/by-name/ma/maid/gemset.nix b/pkgs/by-name/ma/maid/gemset.nix
index 62c2862636f9..d7618cccc983 100644
--- a/pkgs/by-name/ma/maid/gemset.nix
+++ b/pkgs/by-name/ma/maid/gemset.nix
@@ -14,20 +14,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.3.4";
+    version = "1.3.5";
   };
   csv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.4";
   };
   deprecated = {
     groups = [ "default" ];
@@ -85,10 +85,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "1.17.2";
   };
   fugit = {
     dependencies = [
@@ -113,10 +113,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cvzz9i5s5dngrw6101bc6kn25c4f2jsb6pnq5yb842scjh6848n";
+      sha256 = "1gzn754d1b614svgrxfjcxjvf5ghrpcmsadndls9mzd4wmg4zx6a";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.8.5";
   };
   listen = {
     dependencies = [
@@ -137,10 +137,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.0";
   };
   maid = {
     dependencies = [
@@ -174,20 +174,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   mime-types-data = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
+      sha256 = "042zxrr8xm9nijn7jp0qnrwns32sv5m814ifkbpil8a3kv47ixci";
       type = "gem";
     };
-    version = "3.2024.1001";
+    version = "3.2025.0520";
   };
   raabro = {
     groups = [ "default" ];
diff --git a/pkgs/by-name/ma/maid/package.nix b/pkgs/by-name/ma/maid/package.nix
index 7196ebc9514b..f4b0ce2d3e2d 100644
--- a/pkgs/by-name/ma/maid/package.nix
+++ b/pkgs/by-name/ma/maid/package.nix
@@ -5,12 +5,12 @@
   lib,
 }:
 
-bundlerApp {
+bundlerApp rec {
   pname = "maid";
   gemdir = ./.;
   exes = [ "maid" ];
 
-  passthru.updateScript = bundlerUpdateScript "maid";
+  passthru.updateScript = bundlerUpdateScript pname;
 
   passthru.tests.run = callPackage ./test.nix { };
 

From 2f51cb1f8f65c7e0a6f7a8006e88dfd50fc9746f Mon Sep 17 00:00:00 2001
From: Niko Cantero <97130632+nyabinary@users.noreply.github.com>
Date: Mon, 26 May 2025 11:59:15 -0400
Subject: [PATCH 0127/1497] =?UTF-8?q?dorion:=205.0.1=20=E2=86=92=206.7.1;?=
 =?UTF-8?q?=20dorion:=20build=20from=20source?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: griffi-gh <prasol258@gmail.com>
---
 pkgs/by-name/do/dorion/no-cargo-patch.patch |  31 +++
 pkgs/by-name/do/dorion/package.nix          | 201 ++++++++++++++++----
 2 files changed, 195 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/by-name/do/dorion/no-cargo-patch.patch

diff --git a/pkgs/by-name/do/dorion/no-cargo-patch.patch b/pkgs/by-name/do/dorion/no-cargo-patch.patch
new file mode 100644
index 000000000000..1906d417b517
--- /dev/null
+++ b/pkgs/by-name/do/dorion/no-cargo-patch.patch
@@ -0,0 +1,31 @@
+diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
+index 13a6b54..f6bd9d6 100644
+--- a/src-tauri/Cargo.lock
++++ b/src-tauri/Cargo.lock
+@@ -5049,6 +5049,8 @@ dependencies = [
+ [[package]]
+ name = "tauri-plugin-shell"
+ version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
+ dependencies = [
+  "encoding_rs",
+  "log",
+diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
+index 4dcaa86..daef086 100644
+--- a/src-tauri/Cargo.toml
++++ b/src-tauri/Cargo.toml
+@@ -12,13 +12,6 @@ rust-version = "1.84.1"
+ strip = "debuginfo"
+ lto = false
+ 
+-# Patches
+-[package.metadata.patch]
+-crates = ["tauri-plugin-shell"]
+-
+-[patch.crates-io]
+-tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" }
+-
+ [build-dependencies]
+ tauri-build = { version = "2.0.0", features = [] }
+ 
diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix
index c5e95fa6748b..a7b804dfe9bf 100644
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@@ -1,66 +1,193 @@
 {
   lib,
-  stdenv,
+  fetchFromGitHub,
   fetchurl,
-  autoPatchelfHook,
-  dpkg,
+  rustPlatform,
+  cmake,
+  ninja,
+  wrapGAppsHook4,
   glib-networking,
   gst_all_1,
-  libappindicator,
+  libsysprof-capture,
   libayatana-appindicator,
-  webkitgtk_4_0,
-  wrapGAppsHook3,
+  nodejs,
+  openssl,
+  pkg-config,
+  yq-go,
+  pnpm_9,
+  webkitgtk_4_1,
+  cargo-tauri,
+  desktop-file-utils,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dorion";
-  version = "5.0.1";
-
-  src = fetchurl {
-    url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version}/Dorion_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ=";
+let
+  webkitgtk_4_1' = webkitgtk_4_1.override {
+    enableExperimental = true;
   };
 
-  unpackCmd = ''
-    dpkg -X $curSrc .
-  '';
+  shelter = fetchurl {
+    url = "https://raw.githubusercontent.com/uwu/shelter-builds/fab6f100bd0ab8583d67f792f66722a7d2a14bd1/shelter.js";
+    hash = "sha256-d9vaKLrl8RYNcHnE1iGN49ov6U/Y+9XpEsio+c1Sguc=";
+    meta = {
+      homepage = "https://github.com/uwu/shelter";
+      sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS
+      license = lib.licenses.cc0;
+    };
+  };
+in
 
-  runtimeDependencies = [
-    glib-networking
-    libappindicator
-    libayatana-appindicator
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dorion";
+  version = "6.7.1";
+
+  src = fetchFromGitHub {
+    owner = "SpikeHD";
+    repo = "Dorion";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-d4G3royqhz+te5wPWVLNqqG/w0qOvTd7dKcWSzxUMUo=";
+  };
+
+  cargoPatches = [
+    ./no-cargo-patch.patch
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-1xpAJkS31DjrZCY5WJ4/Z1t1ALED5gz7xYLhVR1Qzww=";
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs=";
+  };
+
+  # CMake (webkit extension)
+  cmakeDir = ".";
+  cmakeBuildDir = "src-tauri/extension_webkit";
+  dontUseCmakeConfigure = true;
+  dontUseNinjaBuild = true;
+  dontUseNinjaCheck = true;
+  dontUseNinjaInstall = true;
+  # cmake's supposed to set this automatically
+  # ... but the detection is based on the presence of ninja build hook
+  cmakeFlags = [
+    "-GNinja"
   ];
 
   nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-    wrapGAppsHook3
+    pnpm_9.configHook
+    cargo-tauri.hook
+    nodejs
+    pkg-config
+    wrapGAppsHook4
+    yq-go
+    desktop-file-utils
+    cmake
+    ninja
   ];
 
   buildInputs = [
-    glib-networking
-    gst_all_1.gst-plugins-bad
+    openssl
+    webkitgtk_4_1'
     gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-good
-    webkitgtk_4_0
+    gst_all_1.gst-plugins-rs
+    glib-networking
+    libsysprof-capture
+    libayatana-appindicator
   ];
 
-  installPhase = ''
-    runHook preInstall
+  postPatch = ''
+    # remove updater
+    rm -rf updater
 
-    mkdir -pv $out
-    mv -v {bin,lib,share} $out
+    # patch cargo-deps
+    pushd $cargoDepsCopy/tauri-plugin-shell-*
+    patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch
+    popd
 
-    runHook postInstall
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+
+    # disable pre-build script and disable auto-updater
+    yq -iPo=json '
+      .bundle.resources = (.bundle.resources | map(select(. != "updater*")))
+    ' src-tauri/tauri.conf.json
+
+    # link shelter injection
+    ln -s ${shelter} src-tauri/injection/shelter.js
+
+    # link html/frontend data
+    ln -s /build/source/src /build/source/src-tauri/html
   '';
 
+  configurePhase = ''
+    cmakeConfigurePhase
+    pnpmConfigHook
+  '';
+
+  buildPhase = ''
+    ninjaBuildPhase
+    cd /build/source
+    tauriBuildHook
+  '';
+
+  postInstall = ''
+    # Set up the resource directories
+    mkdir -p $out/lib/Dorion
+    ln -s $out/lib/Dorion $out/lib/dorion
+    rm -rf $out/lib/Dorion/injection
+    cp -r src-tauri/injection $out/lib/Dorion
+    cp -r src $out/lib/Dorion
+
+    # Modify the desktop file
+    desktop-file-edit \
+      --set-comment "Tiny alternative Discord client" \
+      --set-key="Exec" --set-value="Dorion %U" \
+      --set-key="TryExec" --set-value="Dorion" \
+      --set-key="StartupWMClass" --set-value="Dorion" \
+      --set-key="StartupNotify" --set-value="true" \
+      --set-key="Categories" --set-value="Network;InstantMessaging;Chat;" \
+      --set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \
+      --set-key="Terminal" --set-value="false" \
+      --set-key="MimeType" --set-value="x-scheme-handler/discord" \
+      $out/share/applications/Dorion.desktop
+  '';
+
+  # error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)`
+  # Permission denied (os error 13)
+  doCheck = false;
+
+  env = {
+    TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
+  };
+
   meta = {
-    homepage = "https://github.com/SpikeHD/Dorion";
+    homepage = "https://spikehd.github.io/projects/dorion/";
     description = "Tiny alternative Discord client";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "dorion";
-    maintainers = with lib.maintainers; [ aleksana ];
-    platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64);
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    longDescription = ''
+      Dorion is an alternative Discord client aimed towards lower-spec or
+      storage-sensitive PCs that supports themes, plugins, and more!
+    '';
+    changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      gpl3Only
+      cc0 # Shelter
+    ];
+    mainProgram = "Dorion";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      aleksana
+      griffi-gh
+      getchoo
+    ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = [
+      lib.sourceTypes.binaryBytecode # actually, minified JS
+      lib.sourceTypes.fromSource
+    ];
   };
 })

From 38724aa8849d9ac5c6f7941a81d9cc4552e561fb Mon Sep 17 00:00:00 2001
From: stefan <stefan@s00.xyz>
Date: Wed, 21 May 2025 16:36:43 -0400
Subject: [PATCH 0128/1497] wmenu: 0.1.9-unstable-2025-03-01 -> 0.2.0

---
 pkgs/by-name/wm/wmenu/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wm/wmenu/package.nix b/pkgs/by-name/wm/wmenu/package.nix
index 6dab92eaa079..b58af8aeb359 100644
--- a/pkgs/by-name/wm/wmenu/package.nix
+++ b/pkgs/by-name/wm/wmenu/package.nix
@@ -14,9 +14,9 @@
   scdoc,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wmenu";
-  version = "0.1.9-unstable-2025-03-01";
+  version = "0.2.0";
 
   strictDeps = true;
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
     domain = "codeberg.org";
     owner = "adnano";
     repo = "wmenu";
-    rev = "fc69aa6e2bccca461a0bd0c10b448b64ccda1d42";
-    hash = "sha256-ZssptllD6LPQUinKZime9A1dZJ3CkQvp+DUmk+iyaOA=";
+    tag = finalAttrs.version;
+    hash = "sha256-JkKA3MUfRLsZWgvDyiYdqb8u4nGSfboL6Ecy7poPW1k=";
   };
 
   nativeBuildInputs = [
@@ -51,4 +51,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ eken ];
     mainProgram = "wmenu";
   };
-}
+})

From 94a3c1a13d87525b351a663d2d129340a9dbdc27 Mon Sep 17 00:00:00 2001
From: Stefan Weigl-Bosker <stefan@s00.xyz>
Date: Mon, 26 May 2025 12:03:30 -0400
Subject: [PATCH 0129/1497] wmenu: add sweiglbosker as maintainer

---
 pkgs/by-name/wm/wmenu/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wm/wmenu/package.nix b/pkgs/by-name/wm/wmenu/package.nix
index b58af8aeb359..11f24d59102d 100644
--- a/pkgs/by-name/wm/wmenu/package.nix
+++ b/pkgs/by-name/wm/wmenu/package.nix
@@ -48,7 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://codeberg.org/adnano/wmenu";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ eken ];
+    maintainers = with maintainers; [
+      eken
+      sweiglbosker
+    ];
     mainProgram = "wmenu";
   };
 })

From 28e980411dee1da39f1fe499f57afbb1a4b9aff4 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Mon, 26 May 2025 17:29:01 +0100
Subject: [PATCH 0130/1497] matrix-continuwuity: add rocksdb to passthru

This allows others to use the same version of rocksdb, e.g., for backup
scripts.
---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index fe082b6e8517..9e7f86cd936d 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -87,6 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ++ lib.optional enableLiburing "io_uring";
 
   passthru = {
+    rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };
     tests =
       {

From 554ede7eefb10674057032e44fb3722e999f8427 Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Mon, 26 May 2025 18:35:19 +0200
Subject: [PATCH 0131/1497] maintainers: add nilathedragon

---
 maintainers/maintainer-list.nix       | 6 ++++++
 pkgs/by-name/hi/high-tide/package.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d9731063b760..10f2cd48e71d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17667,6 +17667,12 @@
     github = "nikstur";
     githubId = 61635709;
   };
+  nilathedragon = {
+    email = "nilathedragon@pm.me";
+    name = "Nila The Dragon";
+    github = "nilathedragon";
+    githubId = 43315617;
+  };
   nilp0inter = {
     email = "robertomartinezp@gmail.com";
     github = "nilp0inter";
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index ff68daa49623..439e050cecf2 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -62,6 +62,7 @@ python3Packages.buildPythonApplication {
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "HighTide";
     maintainers = with lib.maintainers; [
+      nilathedragon
       nyabinary
       griffi-gh
     ];

From bff336776d788149c0886d2095ff7015179ed611 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Tue, 13 May 2025 11:27:34 -0500
Subject: [PATCH 0132/1497] oh-my-posh: 24.11.4 -> 25.23.2

---
 pkgs/by-name/oh/oh-my-posh/package.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index 88f3bd6100ac..0fd11af70117 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -2,29 +2,23 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  installShellFiles,
-  gitUpdater,
+  nix-update-script,
 }:
-
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "24.11.4";
+  version = "25.23.3";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-hb5XgwBg9llX/PDX8A8hL5fJbG03nTjrvEd252k2Il0=";
+    hash = "sha256-FStopBbBp5HVH5tXFPpComAuXItEwwtQf8VRGJaicPs=";
   };
 
-  vendorHash = "sha256-bOjIwBPxu/BfRaAcZTXf4xCGvVXnumb2++JZTx7ZG1s=";
+  vendorHash = "sha256-BucMDbubJ+gEb5tBBSOf+P0A+KkDnUSAJRALyL9uhXU=";
 
   sourceRoot = "source/src";
 
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
   ldflags = [
     "-s"
     "-w"
@@ -40,20 +34,16 @@ buildGoModule rec {
 
   postPatch = ''
     # these tests requires internet access
-    rm image/image_test.go config/migrate_glyphs_test.go upgrade/notice_test.go
+    rm image/image_test.go config/migrate_glyphs_test.go upgrade/notice_test.go segments/upgrade_test.go
   '';
 
   postInstall = ''
     mv $out/bin/{src,oh-my-posh}
     mkdir -p $out/share/oh-my-posh
     cp -r $src/themes $out/share/oh-my-posh/
-    installShellCompletion --cmd oh-my-posh \
-      --bash <($out/bin/oh-my-posh completion bash) \
-      --fish <($out/bin/oh-my-posh completion fish) \
-      --zsh <($out/bin/oh-my-posh completion zsh)
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Prompt theme engine for any shell";

From 542dc8f4aeb49bc44566fd153db6bb35716fed1d Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 27 May 2025 02:26:41 +0900
Subject: [PATCH 0133/1497] chawan: 0-unstable-2025-05-13 ->
 0-unstable-2025-05-25

---
 pkgs/by-name/ch/chawan/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index 353a22c5e5a6..612e33636346 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "chawan";
-  version = "0-unstable-2025-05-13";
+  version = "0-unstable-2025-05-25";
 
   src = fetchFromSourcehut {
     owner = "~bptato";
     repo = "chawan";
-    rev = "5223a6e86f53dd47a5de33f5e8f1fe6206174329";
-    hash = "sha256-V9D1PqvqAvRfQvp+dINf9A1GJzCBX+UV9dRuRza+wK8=";
+    rev = "e571c8b1ede3a3c6dc4a5a4d0c6c8f48473076d2";
+    hash = "sha256-OBXc4jnB5Y+KXO9J7P1Z2HXkNCS+xnG+IGWw8wb66J8=";
   };
 
   patches = [ ./mancha-augment-path.diff ];

From 1d6146832fcf8b5d2fc11d355694d725a43ff357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 May 2025 19:37:54 +0000
Subject: [PATCH 0134/1497] ngtcp2-gnutls: 1.12.0 -> 1.13.0

---
 pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index 7d76c4b37941..f8cc5a4031de 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
     rev = "v${version}";
-    hash = "sha256-WAZKlIGwSn/U3MPF2RDOscZ5EVqQyViViy9beQeroNs=";
+    hash = "sha256-SvxGZoV4N9wNAsI5pOjjGECgk2vV0FifzHi1gbGjqnc=";
   };
 
   outputs = [

From 73dd253079c63b08fbea81295584a047499bbeff Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 23 May 2025 11:38:38 +0200
Subject: [PATCH 0135/1497] solarus: 1.6.4 -> 2.0.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/games/solarus/default.nix  | 29 ++++++++++++++++-------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 90b988de4796..a2b7bb295a39 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -1,8 +1,10 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitLab,
+  fetchpatch,
   cmake,
+  ninja,
   luajit,
   SDL2,
   SDL2_image,
@@ -12,21 +14,27 @@
   openal,
   libmodplug,
   libvorbis,
-  qtbase,
-  qttools,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "solarus";
-  version = "1.6.4";
+  version = "2.0.0";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sbdlf+R9OskDQ5U5rqUX2gF8l/fj0sDJv6BL7H1I1Ng=";
+    sha256 = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
   };
 
+  patches = [
+    # https://gitlab.com/solarus-games/solarus/-/merge_requests/1570
+    (fetchpatch {
+      url = "https://gitlab.com/solarus-games/solarus/-/commit/8e1eee51cbfa5acf2511b059739153065b0ba21d.patch";
+      hash = "sha256-KevGavtUhpHRt85WLh9ApmZ8a+NeWB1zDDHKGT08yhQ=";
+    })
+  ];
+
   outputs = [
     "out"
     "lib"
@@ -35,7 +43,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    ninja
   ];
   buildInputs = [
     luajit
@@ -46,19 +54,14 @@ mkDerivation rec {
     openal
     libmodplug
     libvorbis
-    qtbase
     glm
   ];
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGLM_ENABLE_EXPERIMENTAL")
+    (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "lib"}/share")
   ];
 
-  preFixup = ''
-    mkdir $lib/
-    mv $out/lib $lib
-  '';
-
   meta = with lib; {
     description = "Zelda-like ARPG game engine";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a47316c3b36d..5e3e59e68269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15290,7 +15290,7 @@ with pkgs;
   };
 
   # solarus and solarus-quest-editor must use the same version of Qt.
-  solarus = libsForQt5.callPackage ../games/solarus { };
+  solarus = callPackage ../games/solarus { };
   solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
 
   # You still can override by passing more arguments.

From b83872b85a2eb898a35d2d8fc32bf2aab2937b07 Mon Sep 17 00:00:00 2001
From: eilvelia <hi@eilvelia.cat>
Date: Mon, 26 May 2025 21:41:29 +0000
Subject: [PATCH 0136/1497] binaryninja-free: 5.0.7290 -> 5.0.7486

---
 pkgs/by-name/bi/binaryninja-free/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index a9563ea30631..e243827744d5 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -19,11 +19,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "binaryninja-free";
-  version = "5.0.7290";
+  version = "5.0.7486";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250426133400/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
-    hash = "sha256-Fzdv+454Ajj8IxmdcxvcDGePFsTmmyPpnfBXge4p8iU=";
+    url = "https://web.archive.org/web/20250526111956/https://cdn.binary.ninja/installers/binaryninja_free_linux.zip";
+    hash = "sha256-iZjIgokwnHJaY6OgrnDcto3Un5g42MqTWXKo6OL1Rcs=";
   };
 
   icon = fetchurl {

From c7ef20e66c55eab380121e13d3cbf14c6430006c Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Mon, 26 May 2025 16:37:37 -0400
Subject: [PATCH 0137/1497] spotify_player: Install shell completions

---
 pkgs/by-name/sp/spotify-player/package.nix | 31 +++++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 70f9abdc99ea..fd942e25e2a5 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -5,6 +5,9 @@
   pkg-config,
   openssl,
   cmake,
+  installShellFiles,
+  writableTmpDirAsHomeHook,
+
   # deps for audio backends
   alsa-lib,
   libpulseaudio,
@@ -63,6 +66,9 @@ rustPlatform.buildRustPackage rec {
       pkg-config
       cmake
       rustPlatform.bindgenHook
+      installShellFiles
+      # Tries to access $HOME when installing shell files, and on Darwin
+      writableTmpDirAsHomeHook
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       makeBinaryWrapper
@@ -105,16 +111,21 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optionals withSixel [ "sixel" ]
     ++ lib.optionals withFuzzy [ "fzf" ];
 
-  # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys
-  preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-    export HOME=$TMPDIR
-  '';
-
-  # sixel-sys is dynamically linked to libsixel
-  postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) ''
-    wrapProgram $out/bin/spotify_player \
-      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}"
-  '';
+  postInstall =
+    let
+      inherit (lib.strings) optionalString;
+    in
+    # sixel-sys is dynamically linked to libsixel
+    optionalString (stdenv.hostPlatform.isDarwin && withSixel) ''
+      wrapProgram $out/bin/spotify_player \
+        --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}"
+    ''
+    + optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd spotify_player \
+        --bash <($out/bin/spotify_player generate bash) \
+        --fish <($out/bin/spotify_player generate fish) \
+         --zsh <($out/bin/spotify_player generate zsh)
+    '';
 
   passthru = {
     updateScript = nix-update-script { };

From f3752be2ff1ab451324391c2a0d005a9277c657b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 24 May 2025 21:38:02 +0200
Subject: [PATCH 0138/1497] python313Packages.granian: use jemalloc hook to fix
 aarch64-linux

---
 .../python-modules/granian/default.nix           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 58e6159705d9..33dc373c5685 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -13,6 +13,7 @@
   pytest-asyncio,
   websockets,
   httpx,
+  rust-jemalloc-sys,
   sniffio,
   nix-update-script,
 }:
@@ -39,6 +40,21 @@ buildPythonPackage rec {
     maturinBuildHook
   ];
 
+  buildInputs = [
+    # fix "Unsupported system page size" on aarch64-linux with 16k pages
+    # https://github.com/NixOS/nixpkgs/issues/410572
+    (rust-jemalloc-sys.overrideAttrs (
+      { configureFlags, ... }:
+      {
+        configureFlags = configureFlags ++ [
+          # otherwise import check fails with:
+          # ImportError: {{storeDir}}/lib/libjemalloc.so.2: cannot allocate memory in static TLS block
+          "--disable-initial-exec-tls"
+        ];
+      }
+    ))
+  ];
+
   dependencies = [
     click
   ];

From 0b09bcb3f8b88383bcece055b845cc7e315ef299 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 27 May 2025 03:21:59 +0200
Subject: [PATCH 0139/1497] python313Packages.reflex: 0.7.12 -> 0.7.13

Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.13
---
 pkgs/development/python-modules/reflex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index de9f443833a8..9c775e43821d 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.7.12";
+  version = "0.7.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-v7oKfAh+qG+eQC6NKS7r4ZFokXHlF6Di0529xBcEAdk=";
+    hash = "sha256-cspu2bD+ZBr38tRSjpXWYho54Z9NB4sSBAHn/NH11js=";
   };
 
   # 'rich' is also somehow checked when building the wheel,

From 770f223c2bb4e796d11f66cd0ad269de1efef43f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 27 May 2025 03:22:03 +0200
Subject: [PATCH 0140/1497] harper: 0.38.0 -> 0.39.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.39.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 3a65ecf600c9..89ab0226377f 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-kLOU88yz+7uC+AyvAh0DwPLYiClSL4ZgkPrBBFmDu8w=";
+    hash = "sha256-SLAhjeZOjng+ATKXN32VBhThmaP+YQZd6l9HnbqlHjQ=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-WhkIvo5hGYYvurq/7McCu3GMIJ8qmFeWm4JeruaZ00A=";
+  cargoHash = "sha256-tp5WO1FfzkUG69XWnRMW0njCPxr1/A/8ZfQ49xAkpVs=";
 
   passthru.updateScript = nix-update-script { };
 

From 9fc20cc5e9da299098563a5f412f1eb4be2b3551 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Mon, 26 May 2025 20:42:56 -0400
Subject: [PATCH 0141/1497] eduke32: remove gtk2

gtk2 is used for the startup window, but we never actually used it
because we never added gtk2 to LD_LIBRARY_PATH.
---
 pkgs/by-name/ed/eduke32/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index d91708be249c..3033001f6545 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -9,12 +9,12 @@
   copyDesktopItems,
   alsa-lib,
   flac,
-  gtk2,
   libvorbis,
   libvpx,
   libGL,
   SDL2,
   SDL2_mixer,
+  xorg,
   graphicsmagick,
   unstableGitUpdater,
 }:
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
-      gtk2
       libGL
+      xorg.libX11
     ];
 
   nativeBuildInputs =
@@ -93,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     "SDLCONFIG=${SDL2}/bin/sdl2-config"
     "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}"
     "VC_BRANCH=master"
+    "HAVE_GTK2=0"
   ];
 
   buildFlags = [

From f194829964688221378472a48c7897c714dae1be Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 22 May 2025 10:56:16 +0800
Subject: [PATCH 0142/1497] python313Packages.pip-install-test: init at 0.5

---
 .../pip-install-test/default.nix              | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/pip-install-test/default.nix

diff --git a/pkgs/development/python-modules/pip-install-test/default.nix b/pkgs/development/python-modules/pip-install-test/default.nix
new file mode 100644
index 000000000000..81b596ac3fe9
--- /dev/null
+++ b/pkgs/development/python-modules/pip-install-test/default.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+}:
+
+buildPythonPackage rec {
+  pname = "pip-install-test";
+  version = "0.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-wzxGztmGW1mWPoblSQGUdSC9tzv5GEnN27AAdCWYu2c=";
+  };
+
+  pythonImportsCheck = [ "pip_install_test" ];
+
+  meta = {
+    description = "Minimal stub package to test success of pip install";
+    homepage = "https://pypi.org/project/pip-install-test";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

From e54fd3c32a37768ef5b8ee2ccf2bc823e33da45c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 22 May 2025 10:56:37 +0800
Subject: [PATCH 0143/1497] python313Packages.newspaper3k: init at 0.2.8

---
 .../python-modules/newspaper3k/default.nix    | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/newspaper3k/default.nix

diff --git a/pkgs/development/python-modules/newspaper3k/default.nix b/pkgs/development/python-modules/newspaper3k/default.nix
new file mode 100644
index 000000000000..d3db2a05831a
--- /dev/null
+++ b/pkgs/development/python-modules/newspaper3k/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  feedparser,
+  requests,
+  pillow,
+  tldextract,
+  lxml,
+  lxml-html-clean,
+  beautifulsoup4,
+  python-dateutil,
+}:
+
+buildPythonPackage rec {
+  pname = "newspaper3k";
+  version = "0.2.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-nxvT4ftI9ADHFav4dcx7Cme33c2H9Qya7rj8u72QBPs=";
+  };
+
+  dependencies = [
+    feedparser
+    requests
+    pillow
+    tldextract
+    lxml
+    lxml-html-clean
+    beautifulsoup4
+    python-dateutil
+  ];
+
+  pythonImportsCheck = [ "newspaper" ];
+
+  meta = {
+    description = "Simplified python article discovery & extraction";
+    homepage = "https://pypi.org/project/newspaper3k";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db00c2c12939..a4f0278ef389 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9971,6 +9971,8 @@ self: super: with self; {
 
   newick = callPackage ../development/python-modules/newick { };
 
+  newspaper3k = callPackage ../development/python-modules/newspaper3k { };
+
   newversion = callPackage ../development/python-modules/newversion { };
 
   nexia = callPackage ../development/python-modules/nexia { };
@@ -11239,6 +11241,8 @@ self: super: with self; {
 
   pip-chill = callPackage ../development/python-modules/pip-chill { };
 
+  pip-install-test = callPackage ../development/python-modules/pip-install-test { };
+
   pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { };
 
   pip-system-certs = callPackage ../development/python-modules/pip-system-certs { };

From e33586bdacc060dbb5f53853a95025060250c159 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 27 May 2025 14:07:48 +0200
Subject: [PATCH 0144/1497] updfparser: Update src URL

---
 pkgs/by-name/up/updfparser/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix
index 93f6143964b0..7e0ed9efd053 100644
--- a/pkgs/by-name/up/updfparser/package.nix
+++ b/pkgs/by-name/up/updfparser/package.nix
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
   rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115";
 
   src = fetchzip {
-    url = "https://indefero.soutade.fr/p/updfparser/source/download/${rev}/";
     hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM=";
-    extension = "zip";
+    url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz";
   };
 
   makeFlags = [

From 1622902267ec658a71a151799d1f237d463fcbde Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 27 May 2025 14:12:14 +0200
Subject: [PATCH 0145/1497] updfparser: unstable-2023-08-08 ->
 unstable-2023-03-24

---
 pkgs/by-name/up/updfparser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix
index 7e0ed9efd053..4ead9b3cdb9a 100644
--- a/pkgs/by-name/up/updfparser/package.nix
+++ b/pkgs/by-name/up/updfparser/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   name = "updfparser";
-  version = "unstable-2023-08-08";
-  rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115";
+  version = "unstable-2024-03-24";
+  rev = "6060d123441a06df699eb275ae5ffdd50409b8f3";
 
   src = fetchzip {
-    hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM=";
     url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz";
+    hash = "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk=";
   };
 
   makeFlags = [

From 6325ef64df2065516dc7f1479298214c2fa3bae3 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 27 May 2025 14:17:36 +0200
Subject: [PATCH 0146/1497] libgourou: Update src URL

---
 pkgs/by-name/li/libgourou/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix
index cc669b512030..7956656e104c 100644
--- a/pkgs/by-name/li/libgourou/package.nix
+++ b/pkgs/by-name/li/libgourou/package.nix
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
   version = "0.8.2";
 
   src = fetchzip {
-    url = "https://indefero.soutade.fr/p/libgourou/source/download/v${version}/";
     sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc";
-    extension = "zip";
+    url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz";
   };
 
   postPatch = ''

From 64aa7ba7f0721c42d67aa55e2066e8d1d808772d Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 27 May 2025 14:17:55 +0200
Subject: [PATCH 0147/1497] libgourou: 0.8.2 -> 0.8.7

---
 pkgs/by-name/li/libgourou/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix
index 7956656e104c..f55f52edd4b4 100644
--- a/pkgs/by-name/li/libgourou/package.nix
+++ b/pkgs/by-name/li/libgourou/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgourou";
-  version = "0.8.2";
+  version = "0.8.7";
 
   src = fetchzip {
-    sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc";
     url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz";
+    hash = "sha256-Tkft/pe3lH07pmyVibTEutIIvconUWDH1ZVN3qV4sSY=";
   };
 
   postPatch = ''

From dd00f45c405537e34aae1b510c91866bb33ed9ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 May 2025 12:33:53 +0000
Subject: [PATCH 0148/1497] kimai: 2.33.0 -> 2.34.0

---
 pkgs/by-name/ki/kimai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index a5eb7fd6948b..51181a031333 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-YkACx0xl+6yN8pgH56WPdEoNAZxAxHIPLay28V1S5WQ=";
+    hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ=";
+  vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI=";
 
   composerNoPlugins = false;
   composerNoScripts = false;

From d2e750deebe66a7f718d2ea3595e0b1677536e7c Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft+nix@gmail.com>
Date: Tue, 27 May 2025 17:52:05 +0300
Subject: [PATCH 0149/1497] chatzone-desktop: 5.3.0 -> 5.3.2

---
 pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index ccceab6659f0..40d3e792eb5d 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.3.0";
+  version = "5.3.2";
   src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.0/736/chatzone-desktop-linux-5.3.0.AppImage";
-    hash = "sha256-aCu3ZqCBLU4oqf/MnAjwzF/y2CHX0NS9C+eXg46VaY4=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.2/787/chatzone-desktop-linux-5.3.2.AppImage";
+    hash = "sha256-+GzrLNFhdzB+mOmSOiZP+W9sCSF2Mfdxu6Xkgmz1Fuo=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From 41aa024e28dd69ccd1fda2e465d576e943fa2f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20H=C3=A4ring?= <tim.haering@gmail.com>
Date: Tue, 27 May 2025 17:47:28 +0200
Subject: [PATCH 0150/1497] tracee: 0.20.0 -> 0.23.1

---
 nixos/tests/tracee.nix                        |  35 ++-
 .../tracee/0001-fix-do-not-build-libbpf.patch |  60 +++++
 .../tr}/tracee/integration-tests.nix          |   5 +
 .../tr/tracee/package.nix}                    |  25 +-
 .../security/tracee/update-pyroscope.patch    | 229 ------------------
 .../security/tracee/use-our-libbpf.patch      |  48 ----
 pkgs/top-level/all-packages.nix               |   4 -
 7 files changed, 99 insertions(+), 307 deletions(-)
 create mode 100644 pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch
 rename pkgs/{tools/security => by-name/tr}/tracee/integration-tests.nix (86%)
 rename pkgs/{tools/security/tracee/default.nix => by-name/tr/tracee/package.nix} (86%)
 delete mode 100644 pkgs/tools/security/tracee/update-pyroscope.patch
 delete mode 100644 pkgs/tools/security/tracee/use-our-libbpf.patch

diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix
index af9e173bca95..050e7f6a66be 100644
--- a/nixos/tests/tracee.nix
+++ b/nixos/tests/tracee.nix
@@ -20,13 +20,15 @@ import ./make-test-python.nix (
           # Test_EventFilters/trace_only_events_from_"dockerd"_binary_and_contain_it's_pid
           # require docker/dockerd
           virtualisation.docker.enable = true;
-
-          environment.systemPackages = with pkgs; [
-            # required by Test_EventFilters/trace_events_from_ls_and_which_binary_in_separate_scopes
-            which
-            # the go integration tests as a binary
-            tracee.passthru.tests.integration-test-cli
-          ];
+          environment = {
+            variables.PATH = "/tmp/testdir";
+            systemPackages = with pkgs; [
+              # 'ls', 'uname' and 'who' are required by many tests in event_filters_test.go
+              coreutils
+              # the go integration tests as a binary
+              tracee.passthru.tests.integration-test-cli
+            ];
+          };
         };
     };
 
@@ -38,11 +40,18 @@ import ./make-test-python.nix (
           # the policies and run tracee myself but doesn't work in the integration
           # test either with the automatic run or running the commands by hand
           # while it's searching.
-          "Test_EventFilters/comm:_event:_args:_trace_event_set_in_a_specific_policy_with_args_from_ls_command"
+          "Test_EventFilters/comm:_event:_data:_trace_event_magic_write_set_in_multiple_policies_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_and_magic_write_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_and_magic_write_using_multiple_filter_types_combined"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_set_in_multiple_policies_\\(with_and_without_in-kernel_filter\\)"
+          "Test_EventFilters/comm:_event:_data:_trace_event_security_file_open_set_in_multiple_policies_using_multiple_filter_types"
+          "Test_EventFilters/comm:_event:_data:_trace_event_set_in_a_specific_policy_with_data_from_ls_command"
           "Test_EventFilters/comm:_event:_trace_events_set_in_two_specific_policies_from_ls_and_uname_commands"
-
-          # worked at some point, seems to be flakey
-          "Test_EventFilters/pid:_event:_args:_trace_event_sched_switch_with_args_from_pid_0"
+          "Test_EventFilters/pid:_event:_data:_trace_event_sched_switch_with_data_from_pid_0"
+          "Test_EventsDependencies/non_existing_ksymbol_dependency_with_sanity"
+          "Test_EventsDependencies/non_existing_probe_function_with_sanity"
+          "Test_EventsDependencies/sanity_of_exec_test_event"
+          "Test_TraceeCapture/capture_packet_context"
         ];
       in
       ''
@@ -61,11 +70,11 @@ import ./make-test-python.nix (
           )
 
         with subtest("run integration tests"):
-          # Test_EventFilters/trace_event_set_in_a_specific_scope expects to be in a dir that includes "integration"
+          # Test_EventFilters/comm:_event:_data:_trace_event_set_in_a_specific_policy_with_data_from_ls_command expects to be in a dir that includes "integration"
           # tests must be ran with 1 process
           print(machine.succeed(
             'mkdir /tmp/integration',
-            'cd /tmp/integration && export PATH="/tmp/testdir:$PATH" && integration.test -test.v -test.parallel 1 -test.skip="^${builtins.concatStringsSep "$|^" skippedTests}$"'
+            'cd /tmp/integration && integration.test -test.v -test.parallel 1 -test.skip="^${builtins.concatStringsSep "$|^" skippedTests}$"'
           ))
       '';
   }
diff --git a/pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch b/pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch
new file mode 100644
index 000000000000..f4f20839fd4e
--- /dev/null
+++ b/pkgs/by-name/tr/tracee/0001-fix-do-not-build-libbpf.patch
@@ -0,0 +1,60 @@
+From 9a900efb997dee158ce25114633cd07f44ef617a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20H=C3=A4ring?= <tim.haering@gmail.com>
+Date: Sat, 17 May 2025 18:19:45 +0200
+Subject: [PATCH] fix: do not build libbpf
+
+---
+ Makefile | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0fce8de12..bb9937ed5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -77,7 +77,7 @@ get_priv_reqs_recursive() { \
+ 	fi; \
+ 	processed_libs="$$processed_libs $$lib"; \
+ 	if [ "$$lib" = "libbpf" ]; then \
+-		priv_reqs=$$(PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) --print-requires-private $$lib); \
++		priv_reqs=$$($(CMD_PKGCONFIG) --print-requires-private $$lib); \
+ 	else \
+ 		echo $$lib; \
+ 		priv_reqs=$$($(CMD_PKGCONFIG) --print-requires-private $$lib); \
+@@ -374,7 +374,7 @@ LIBBPF_DESTDIR = $(OUTPUT_DIR)/libbpf
+ LIBBPF_OBJDIR = $(LIBBPF_DESTDIR)/obj
+ LIBBPF_OBJ = $(LIBBPF_OBJDIR)/libbpf.a
+ 
+-$(LIBBPF_OBJ): .build_libbpf .build_libbpf_fix
++$(LIBBPF_OBJ):
+ 
+ .build_libbpf: \
+ 	$(LIBBPF_SRC) \
+@@ -413,7 +413,7 @@ LIBBPF_INCLUDE_UAPI = ./3rdparty/libbpf/include/uapi/linux
+ 	@$(CMD_TOUCH) $@
+ 
+ 
+-TRACEE_EBPF_CFLAGS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --cflags $(LIB_BPF))
++TRACEE_EBPF_CFLAGS = $(shell $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --cflags $(LIB_BPF))
+ 
+ .ONESHELL:
+ .eval_goenv: $(LIBBPF_OBJ)
+@@ -430,7 +430,7 @@ endif
+ 		$(eval GO_ENV_EBPF += GOARCH=$(GO_ARCH))
+ 		$(eval CUSTOM_CGO_CFLAGS := "$(TRACEE_EBPF_CFLAGS)")
+ 		$(eval GO_ENV_EBPF += CGO_CFLAGS=$(CUSTOM_CGO_CFLAGS))
+-		$(eval CUSTOM_CGO_LDFLAGS := "$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --libs $(LIB_BPF))")
++		$(eval CUSTOM_CGO_LDFLAGS := "$(shell $(CMD_PKGCONFIG) $(PKG_CONFIG_FLAG) --libs $(LIB_BPF))")
+ 		$(eval GO_ENV_EBPF := $(GO_ENV_EBPF) CGO_LDFLAGS=$(CUSTOM_CGO_LDFLAGS))
+ 		export GO_ENV_EBPF=$(GO_ENV_EBPF)
+ 		echo 'GO_ENV_EBPF := $(GO_ENV_EBPF)' > $(GOENV_MK)
+@@ -486,7 +486,6 @@ TRACEE_SRC_DIRS = ./cmd/ ./pkg/ ./signatures/
+ TRACEE_SRC = $(shell find $(TRACEE_SRC_DIRS) -type f -name '*.go' ! -name '*_test.go')
+ GO_TAGS_EBPF = core,ebpf
+ CGO_EXT_LDFLAGS_EBPF =
+-PKG_CONFIG_PATH = $(LIBBPF_OBJDIR)
+ PKG_CONFIG_FLAG =
+ 
+ TRACEE_PROTOS = ./api/v1beta1/*.proto
+-- 
+2.49.0
+
diff --git a/pkgs/tools/security/tracee/integration-tests.nix b/pkgs/by-name/tr/tracee/integration-tests.nix
similarity index 86%
rename from pkgs/tools/security/tracee/integration-tests.nix
rename to pkgs/by-name/tr/tracee/integration-tests.nix
index b83fb189cabf..99c38857d1e8 100644
--- a/pkgs/tools/security/tracee/integration-tests.nix
+++ b/pkgs/by-name/tr/tracee/integration-tests.nix
@@ -18,6 +18,11 @@ tracee.overrideAttrs (oa: {
         --replace-fail 'syscallerAbsPath := filepath.Join("..", "..", "dist", "syscaller")' "syscallerAbsPath := filepath.Join(\"$out/bin/syscaller\")"
       substituteInPlace tests/integration/exec_test.go \
         --replace-fail "/usr/bin" "/run/current-system/sw/bin"
+      substituteInPlace tests/integration/dependencies_test.go \
+        --replace-fail "/bin" "/run/current-system/sw/bin" \
+        --replace-fail "/tmp/test" "/tmp/ls"
+      substituteInPlace tests/testutils/tracee.go \
+        --replace-fail "../../dist/tracee" "${lib.getExe tracee}"
     '';
   nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ makeWrapper ];
   buildPhase = ''
diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/by-name/tr/tracee/package.nix
similarity index 86%
rename from pkgs/tools/security/tracee/default.nix
rename to pkgs/by-name/tr/tracee/package.nix
index 854f49823e43..2fa919eb5c13 100644
--- a/pkgs/tools/security/tracee/default.nix
+++ b/pkgs/by-name/tr/tracee/package.nix
@@ -3,12 +3,13 @@
   buildGoModule,
   fetchFromGitHub,
 
-  clang,
+  clang_14,
   pkg-config,
 
-  zlib,
   elfutils,
   libbpf,
+  zlib,
+  zstd,
 
   nixosTests,
   testers,
@@ -18,23 +19,20 @@
 
 buildGoModule rec {
   pname = "tracee";
-  version = "0.20.0";
+  version = "0.23.1";
 
+  # src = /home/tim/repos/tracee;
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     # project has branches and tags of the same name
     tag = "v${version}";
-    hash = "sha256-OnOayDxisvDd802kDKGctaQc5LyoyFfdfvC+2JpRjHY=";
+    hash = "sha256-9uP0yoW+xRYv7wHuCfUMU8B2oTQjiSW5p/Ty76ni2wo=";
   };
-  vendorHash = "sha256-26sAKTJQ7Rf5KRlu7j5XiZVr6CkAC6fm60Pam7KH0uA=";
+  vendorHash = "sha256-2+4UN9WB6eGzedogy5dMvhHj1x5VeUUkDM0Z28wKQgM=";
 
   patches = [
-    ./use-our-libbpf.patch
-    # can not vendor dependencies with old pyroscope
-    # remove once https://github.com/aquasecurity/tracee/pull/3927
-    # makes it to a release
-    ./update-pyroscope.patch
+    ./0001-fix-do-not-build-libbpf.patch
   ];
 
   enableParallelBuilding = true;
@@ -42,17 +40,18 @@ buildGoModule rec {
   hardeningDisable = [ "stackprotector" ];
 
   nativeBuildInputs = [
+    clang_14
     pkg-config
-    clang
   ];
   buildInputs = [
     elfutils
     libbpf
-    zlib
+    zlib.dev
+    zstd.dev
   ];
 
   makeFlags = [
-    "VERSION=v${version}"
+    "RELEASE_VERSION=v${version}"
     "GO_DEBUG_FLAG=-s -w"
     # don't actually need git but the Makefile checks for it
     "CMD_GIT=echo"
diff --git a/pkgs/tools/security/tracee/update-pyroscope.patch b/pkgs/tools/security/tracee/update-pyroscope.patch
deleted file mode 100644
index 17f27e6b88dd..000000000000
--- a/pkgs/tools/security/tracee/update-pyroscope.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 8288d7d0a..0ac753fa1 100644
---- a/go.mod
-+++ b/go.mod
-@@ -16,6 +16,7 @@ require (
- 	github.com/docker/docker v24.0.7+incompatible
- 	github.com/golang/protobuf v1.5.3
- 	github.com/google/gopacket v1.1.19
-+	github.com/grafana/pyroscope-go v1.1.1
- 	github.com/hashicorp/golang-lru v0.5.4
- 	github.com/hashicorp/golang-lru/v2 v2.0.2
- 	github.com/mennanov/fmutils v0.2.0
-@@ -23,7 +24,6 @@ require (
- 	github.com/mitchellh/mapstructure v1.5.0
- 	github.com/open-policy-agent/opa v0.52.0
- 	github.com/prometheus/client_golang v1.16.0
--	github.com/pyroscope-io/pyroscope v0.37.2
- 	github.com/sashabaranov/go-gpt3 v1.4.0
- 	github.com/spf13/cobra v1.7.0
- 	github.com/spf13/viper v1.15.0
-@@ -57,15 +57,14 @@ require (
- 	github.com/go-logr/logr v1.2.4 // indirect
- 	github.com/go-logr/stdr v1.2.2 // indirect
- 	github.com/go-logr/zapr v1.2.4 // indirect
--	github.com/go-ole/go-ole v1.2.6 // indirect
- 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
- 	github.com/go-openapi/jsonreference v0.20.2 // indirect
- 	github.com/go-openapi/swag v0.22.3 // indirect
- 	github.com/google/gnostic-models v0.6.8 // indirect
- 	github.com/google/gofuzz v1.2.0 // indirect
-+	github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
- 	github.com/gorilla/websocket v1.5.0 // indirect
--	github.com/hashicorp/errwrap v1.1.0 // indirect
--	github.com/hashicorp/go-multierror v1.1.1 // indirect
-+	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
- 	github.com/hashicorp/hcl v1.0.0 // indirect
- 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
- 	github.com/josharian/intern v1.0.0 // indirect
-@@ -73,24 +72,18 @@ require (
- 	github.com/magiconair/properties v1.8.7 // indirect
- 	github.com/mailru/easyjson v0.7.7 // indirect
- 	github.com/mattn/go-runewidth v0.0.10 // indirect
--	github.com/mitchellh/go-ps v1.0.0 // indirect
- 	github.com/moby/sys/sequential v0.5.0 // indirect
- 	github.com/moby/term v0.5.0 // indirect
-+	github.com/morikuni/aec v1.0.0 // indirect
- 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
- 	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
- 	github.com/philhofer/fwd v1.1.2 // indirect
--	github.com/pyroscope-io/dotnetdiag v1.2.1 // indirect
- 	github.com/rivo/uniseg v0.2.0 // indirect
--	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
- 	github.com/spf13/afero v1.9.5 // indirect
- 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
- 	github.com/spf13/pflag v1.0.5 // indirect
- 	github.com/subosito/gotenv v1.4.2 // indirect
- 	github.com/tinylib/msgp v1.1.8 // indirect
--	github.com/tklauser/go-sysconf v0.3.11 // indirect
--	github.com/tklauser/numcpus v0.6.0 // indirect
--	github.com/valyala/bytebufferpool v1.0.0 // indirect
--	github.com/yusufpapurcu/wmi v1.2.2 // indirect
- 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
- 	go.opentelemetry.io/otel v1.19.0 // indirect
- 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-@@ -145,7 +138,7 @@ require (
- 	github.com/huandu/xstrings v1.4.0 // indirect
- 	github.com/imdario/mergo v0.3.15 // indirect
- 	github.com/json-iterator/go v1.1.12 // indirect
--	github.com/klauspost/compress v1.16.5 // indirect
-+	github.com/klauspost/compress v1.17.3 // indirect
- 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
- 	github.com/mitchellh/copystructure v1.2.0 // indirect
- 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-diff --git a/go.sum b/go.sum
-index 2ecdafafc..598416eeb 100644
---- a/go.sum
-+++ b/go.sum
-@@ -53,7 +53,6 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0
- github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
- github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
- github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
--github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
- github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
- github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
- github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8=
-@@ -144,8 +143,6 @@ github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCv
- github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
- github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
- github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
--github.com/felixge/fgprof v0.9.1 h1:E6FUJ2Mlv043ipLOCFqo8+cHo9MhQ203E2cdEK/isEs=
--github.com/felixge/fgprof v0.9.1/go.mod h1:7/HK6JFtFaARhIljgP2IV8rJLIoHDoOYoUphsnGvqxE=
- github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
- github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
- github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
-@@ -169,8 +166,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
- github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
- github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
- github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
--github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
--github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
- github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
- github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
- github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
-@@ -266,11 +261,10 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
- github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
- github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
- github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
--github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
--github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
--github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
--github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
--github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-+github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
-+github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
-+github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
-+github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
- github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
- github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
- github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-@@ -300,8 +294,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
- github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
- github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
- github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
--github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
--github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-+github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
-+github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
- github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU=
- github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
- github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-@@ -331,8 +325,6 @@ github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5
- github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
- github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
- github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
--github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
--github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
- github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
- github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
- github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-@@ -397,10 +389,6 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO
- github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
- github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
- github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
--github.com/pyroscope-io/dotnetdiag v1.2.1 h1:3XEMrfFJnZ87BiEhozyQKmCUAuMd/Spq7KChPuD2Cf0=
--github.com/pyroscope-io/dotnetdiag v1.2.1/go.mod h1:eFUEHCp4eD1TgcXMlJihC+R4MrqGf7nTRdWxNADbDHA=
--github.com/pyroscope-io/pyroscope v0.37.2 h1:MOgLU/oO7VfV6jWqb0xoFH/YPSVbWD5pGsX+tZVGh98=
--github.com/pyroscope-io/pyroscope v0.37.2/go.mod h1:r4wq4ajJvN7g1OeXGyNvmwzBfQ+Tm5alYvmxqEQSTsc=
- github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
- github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
- github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-@@ -414,13 +402,10 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
- github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
- github.com/sashabaranov/go-gpt3 v1.4.0 h1:UqHYdXgJNtNvTtbzDnnQgkQ9TgTnHtCXx966uFTYXvU=
- github.com/sashabaranov/go-gpt3 v1.4.0/go.mod h1:BIZdbwdzxZbCrcKGMGH6u2eyGe1xFuX9Anmh3tCP8lQ=
--github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
--github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
- github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
- github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
- github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
- github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
--github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
- github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
- github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
- github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-@@ -456,14 +441,8 @@ github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BG
- github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
- github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
- github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
--github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
--github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
--github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
--github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
- github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
- github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
--github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
--github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
- github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
- github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
- github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
-@@ -476,8 +455,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
- github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
- github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
--github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
--github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
- go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
- go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
- go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-@@ -629,7 +606,6 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
- golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go
-index 898344591..85ccc68ed 100644
---- a/pkg/server/http/server.go
-+++ b/pkg/server/http/server.go
-@@ -7,7 +7,7 @@ import (
- 	"net/http/pprof"
- 
- 	"github.com/prometheus/client_golang/prometheus/promhttp"
--	"github.com/pyroscope-io/pyroscope/pkg/agent/profiler"
-+	"github.com/grafana/pyroscope-go"
- 
- 	"github.com/aquasecurity/tracee/pkg/logger"
- )
-@@ -17,7 +17,7 @@ type Server struct {
- 	hs             *http.Server
- 	mux            *http.ServeMux // just an exposed copy of hs.Handler
- 	metricsEnabled bool
--	pyroProfiler   *profiler.Profiler
-+	pyroProfiler   *pyroscope.Profiler
- }
- 
- // New creates a new server
-@@ -90,8 +90,8 @@ func (s *Server) EnablePProfEndpoint() {
- // EnablePyroAgent enables pyroscope agent in golang push mode
- // TODO: make this configurable
- func (s *Server) EnablePyroAgent() error {
--	p, err := profiler.Start(
--		profiler.Config{
-+	p, err := pyroscope.Start(
-+		pyroscope.Config{
- 			ApplicationName: "tracee",
- 			ServerAddress:   "http://localhost:4040",
- 		},
diff --git a/pkgs/tools/security/tracee/use-our-libbpf.patch b/pkgs/tools/security/tracee/use-our-libbpf.patch
deleted file mode 100644
index 4f6dc5957a77..000000000000
--- a/pkgs/tools/security/tracee/use-our-libbpf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 29be1ae71..b88f31cba 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,6 +54,7 @@ CMD_CONTROLLER_GEN ?= controller-gen
- # libs
- #
- 
-+LIB_BPF ?= libbpf
- LIB_ELF ?= libelf
- LIB_ZLIB ?= zlib
- 
-@@ -299,8 +300,6 @@ OUTPUT_DIR = ./dist
- $(OUTPUT_DIR):
- #
- 	@$(CMD_MKDIR) -p $@
--	$(CMD_MKDIR) -p $@/libbpf
--	$(CMD_MKDIR) -p $@/libbpf/obj
- 
- #
- # embedded btfhub
-@@ -353,7 +352,6 @@ TRACEE_EBPF_OBJ_HEADERS = $(shell find pkg/ebpf/c -name *.h)
- bpf: $(OUTPUT_DIR)/tracee.bpf.o
- 
- $(OUTPUT_DIR)/tracee.bpf.o: \
--	$(OUTPUT_DIR)/libbpf/libbpf.a \
- 	$(TRACEE_EBPF_OBJ_SRC) \
- 	$(TRACEE_EBPF_OBJ_HEADERS)
- #
-@@ -391,8 +389,8 @@ endif
- TRACEE_SRC_DIRS = ./cmd/ ./pkg/ ./signatures/
- TRACEE_SRC = $(shell find $(TRACEE_SRC_DIRS) -type f -name '*.go' ! -name '*_test.go')
- 
--CUSTOM_CGO_CFLAGS = "-I$(abspath $(OUTPUT_DIR)/libbpf)"
--CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB))) $(abspath $(OUTPUT_DIR)/libbpf/libbpf.a)"
-+CUSTOM_CGO_CFLAGS = ""
-+CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_BPF))) $(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB)))"
- 
- GO_ENV_EBPF =
- GO_ENV_EBPF += GOOS=linux
-@@ -437,6 +435,7 @@ $(OUTPUT_DIR)/tracee: \
- 	$(OUTPUT_DIR)/tracee.bpf.o \
- 	$(TRACEE_SRC) \
- 	| .checkver_$(CMD_GO) \
-+	.checklib_$(LIB_BPF) \
- 	.checklib_$(LIB_ELF) \
- 	.checklib_$(LIB_ZLIB) \
- 	btfhub \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e37d2723b1e..11064a96bdd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4608,10 +4608,6 @@ with pkgs;
 
   kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
 
-  tracee = callPackage ../tools/security/tracee {
-    clang = clang_14;
-  };
-
   translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;

From d18d7c6bf8aea63ab66b0d5c67be168fe847b84a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 26 May 2025 22:58:11 +0200
Subject: [PATCH 0151/1497] solarus-quest-editor: 1.6.4 -> 2.0.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../tools/solarus-quest-editor/default.nix    | 44 +++++++++++++------
 .../solarus-quest-editor/qlementine-src.patch | 13 ++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/tools/solarus-quest-editor/qlementine-src.patch

diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 873314138265..315aedd47954 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,42 +1,59 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitLab,
+  fetchFromGitHub,
+  replaceVars,
   cmake,
+  ninja,
   luajit,
   SDL2,
   SDL2_image,
   SDL2_ttf,
   physfs,
-  fetchpatch,
   openal,
   libmodplug,
   libvorbis,
   solarus,
-  qtbase,
-  qttools,
   glm,
+  qt6Packages,
 }:
 
-mkDerivation rec {
+let
+  qlementine-src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qlementine";
+    tag = "v1.2.0";
+    hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk=";
+  };
+
+  inherit (qt6Packages)
+    qtbase
+    qttools
+    wrapQtAppsHook
+    ;
+in
+stdenv.mkDerivation rec {
   pname = "solarus-quest-editor";
-  version = "1.6.4";
+  version = "2.0.0";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn";
+    hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw=";
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/solarus-games/solarus-quest-editor/-/commit/81d5c7f1602cf355684d70a5e3449fefccfc44b8.patch";
-      sha256 = "tVUxkkDp2PcOHGy4dGvUcYj9gF7k4LN21VuxohCw9NE=";
-    })
+    (replaceVars ./qlementine-src.patch { inherit qlementine-src; })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qttools
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     luajit
@@ -49,13 +66,12 @@ mkDerivation rec {
     libvorbis
     solarus
     qtbase
-    qttools
     glm
   ];
 
   meta = with lib; {
     description = "Editor for the Zelda-like ARPG game engine, Solarus";
-    mainProgram = "solarus-quest-editor";
+    mainProgram = "solarus-editor";
     longDescription = ''
       Solarus is a game engine for Zelda-like ARPG games written in lua.
       Many full-fledged games have been writen for the engine.
diff --git a/pkgs/development/tools/solarus-quest-editor/qlementine-src.patch b/pkgs/development/tools/solarus-quest-editor/qlementine-src.patch
new file mode 100644
index 000000000000..a19cc2538f9d
--- /dev/null
+++ b/pkgs/development/tools/solarus-quest-editor/qlementine-src.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/AddDependencies.cmake b/cmake/AddDependencies.cmake
+index 8272d14..054c079 100644
+--- a/cmake/AddDependencies.cmake
++++ b/cmake/AddDependencies.cmake
+@@ -51,7 +51,6 @@ endif()
+ include(FetchContent)
+ FetchContent_Declare(
+   qlementine
+-  GIT_REPOSITORY https://github.com/oclero/qlementine.git
+-  GIT_TAG        v1.2.0
++  SOURCE_DIR "@qlementine-src@"
+ )
+ FetchContent_MakeAvailable(qlementine)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e3e59e68269..b945cd5a5a19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15291,7 +15291,7 @@ with pkgs;
 
   # solarus and solarus-quest-editor must use the same version of Qt.
   solarus = callPackage ../games/solarus { };
-  solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
+  solarus-quest-editor = callPackage ../development/tools/solarus-quest-editor { };
 
   # You still can override by passing more arguments.
   spring = callPackage ../games/spring { asciidoc = asciidoc-full; };

From f3422b9f78b6ec29a80d1fad3e7057af2f3f9a36 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 17:36:34 +0200
Subject: [PATCH 0152/1497] solarus: move to by-name

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../solarus/default.nix => by-name/so/solarus/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{games/solarus/default.nix => by-name/so/solarus/package.nix} (100%)

diff --git a/pkgs/games/solarus/default.nix b/pkgs/by-name/so/solarus/package.nix
similarity index 100%
rename from pkgs/games/solarus/default.nix
rename to pkgs/by-name/so/solarus/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b945cd5a5a19..9ced05d1b177 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15290,7 +15290,6 @@ with pkgs;
   };
 
   # solarus and solarus-quest-editor must use the same version of Qt.
-  solarus = callPackage ../games/solarus { };
   solarus-quest-editor = callPackage ../development/tools/solarus-quest-editor { };
 
   # You still can override by passing more arguments.

From c73bd2a75c664e39868200d5a999cbc6b9de213f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 17:37:17 +0200
Subject: [PATCH 0153/1497] solarus-quest-editor: move to by-name

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../so/solarus-quest-editor/package.nix}                       | 0
 .../so}/solarus-quest-editor/qlementine-src.patch              | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 3 files changed, 3 deletions(-)
 rename pkgs/{development/tools/solarus-quest-editor/default.nix => by-name/so/solarus-quest-editor/package.nix} (100%)
 rename pkgs/{development/tools => by-name/so}/solarus-quest-editor/qlementine-src.patch (100%)

diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
similarity index 100%
rename from pkgs/development/tools/solarus-quest-editor/default.nix
rename to pkgs/by-name/so/solarus-quest-editor/package.nix
diff --git a/pkgs/development/tools/solarus-quest-editor/qlementine-src.patch b/pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch
similarity index 100%
rename from pkgs/development/tools/solarus-quest-editor/qlementine-src.patch
rename to pkgs/by-name/so/solarus-quest-editor/qlementine-src.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ced05d1b177..ac3c9306bb3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15289,9 +15289,6 @@ with pkgs;
     lua = lua5_1;
   };
 
-  # solarus and solarus-quest-editor must use the same version of Qt.
-  solarus-quest-editor = callPackage ../development/tools/solarus-quest-editor { };
-
   # You still can override by passing more arguments.
   spring = callPackage ../games/spring { asciidoc = asciidoc-full; };
 

From 068806f7ab60c57a837dd8a479d8420ce890da52 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Wed, 28 May 2025 00:15:02 +0700
Subject: [PATCH 0154/1497] contour: remove shell integration scripts

These scripts can be generated using `contour generate integration`
command, and they are not shell completion.
---
 pkgs/by-name/co/contour/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index d26ce03f12da..5346ab80d3ff 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -85,19 +85,16 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir $out/Applications
-      installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish
       cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
       mv $out/contour.app $out/Applications
       ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
       mv $out/share/terminfo $terminfo/share/
-      installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh
-      installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish
     ''
     + ''
       echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+      rm -r $out/share/contour
     '';
 
   passthru.tests.test = nixosTests.terminal-emulators.contour;

From cac9b3f6b84f488884027f0e4ed10761cb410da0 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 27 May 2025 21:48:03 +0200
Subject: [PATCH 0155/1497] k3s: make update script work with all versions

Currently only the newest k3s version has a `git_version` script. Since
the update script wants to source the `git_version` script, it fails for
all other ver/sions. This commit lets k3s' `version` script source the
`git_version` script, if it is present. This fixes the update script so
that it works with all versions again.
---
 pkgs/applications/networking/cluster/k3s/update-script.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index 7339b2ec4e97..a2693b542e99 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -35,8 +35,7 @@ cd "$K3S_STORE_PATH"
 # Set the DRONE variables as they are expected to be set in version.sh
 DRONE_TAG="$LATEST_TAG_NAME"
 DRONE_COMMIT="$K3S_COMMIT"
-NO_DAPPER=1 # Skips git_version.sh execution in scripts/version.sh#L8
-source "${K3S_STORE_PATH}/scripts/git_version.sh"
+NO_DAPPER="" # Source git_version.sh in scripts/version.sh#L8
 source "${K3S_STORE_PATH}/scripts/version.sh"
 
 K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \

From 1e3dae0cce9cd9cf8e78dc619e3104333d48c661 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 28 May 2025 00:54:30 +0100
Subject: [PATCH 0156/1497] matrix-continuwuity: enable direct_tls build
 feature

---
 pkgs/by-name/ma/matrix-continuwuity/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 9e7f86cd936d..8ace6e4d0edf 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -71,6 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures =
     [
       "brotli_compression"
+      "direct_tls"
       "element_hacks"
       "gzip_compression"
       "media_thumbnail"

From 33a3784d5e37111b2e933cec41ce2532c8dca2b8 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 28 May 2025 02:17:44 +0200
Subject: [PATCH 0157/1497] siyuan: 3.1.28 -> 3.1.31

---
 pkgs/by-name/si/siyuan/package.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 2f731da1646f..1eee8fc15de6 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildGo123Module,
+  buildGoModule,
   replaceVars,
   pandoc,
   nodejs,
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.1.28";
+  version = "3.1.31";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-s36rtNmVAp17Okj71NE/jgIM/pEZNS+oOYZ8rnjv6Ow=";
+    hash = "sha256-l9FAGZzu8z5Q4gRoaZ8Z8tYkBEw9Yq9mfmWOKO39KLI=";
   };
 
-  kernel = buildGo123Module {
+  kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-i/hpP9S9vGS/jP3gKceDY00wgnBDkmsfYRZtsYQOjck=";
+    vendorHash = "sha256-uREgNsDGFLzkOBkO2D2/vbJJ8A2rfy0nK2Dx/OvWf9c=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -75,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
     tags = [ "fts5" ];
   };
 
+  # this should contain a 'packages' key, but it doesn't...
+  # we can remove it because it's not needed to build
+  postPatch = ''
+    rm pnpm-workspace.yaml
+  '';
+
   nativeBuildInputs = [
     nodejs
     pnpm.configHook
@@ -88,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
       version
       src
       sourceRoot
+      postPatch
       ;
-    hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo=";
+    hash = "sha256-U8n9FLwJqBq16CTmiIDSh0u4lguSn0rF4jUkU25iu98=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

From a5c7410e0ba82993edce6f747e65fe65f579cb5f Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 27 May 2025 21:02:55 -0400
Subject: [PATCH 0158/1497] nix-check-deps: init at 0-unstable-2025-04-09

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ni/nix-check-deps/package.nix | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/ni/nix-check-deps/package.nix

diff --git a/pkgs/by-name/ni/nix-check-deps/package.nix b/pkgs/by-name/ni/nix-check-deps/package.nix
new file mode 100644
index 000000000000..ac14368eeee6
--- /dev/null
+++ b/pkgs/by-name/ni/nix-check-deps/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "nix-check-deps";
+  version = "0-unstable-2025-04-09";
+
+  src = fetchFromGitHub {
+    owner = "LordGrimmauld";
+    repo = "nix-check-deps";
+    rev = "263701905ec40a19c52d23d0fdceb1126e20c99e";
+    hash = "sha256-RaPk8Cd5ovskxFFvFd0+auIopCo1YHyH+6199qK+d18=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-1fazKGz3PtyTvcIW+PY/LwYc6JlErSO9ZFisTUXJdhc=";
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Scan nix packages for unused buildInputs";
+    homepage = "https://github.com/LordGrimmauld/nix-check-deps";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    mainProgram = "nix-check-deps";
+    platforms = lib.platforms.unix;
+  };
+}

From 975b2c6d25c063a0b07b5b97c1b5fcf58d3fd840 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 27 May 2025 21:13:15 -0400
Subject: [PATCH 0159/1497] bitbucket-server-cli: drop

No updates since 2015, source code seems to no longer be available, and its
dependencies have vulnerabilities (e.g. CVE-2022-46648, CVE-2022-47318).
---
 .../bitbucket-server-cli/Gemfile              |  2 -
 .../bitbucket-server-cli/Gemfile.lock         | 27 --------
 .../bitbucket-server-cli/default.nix          | 30 ---------
 .../bitbucket-server-cli/gemset.nix           | 66 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 1 insertion(+), 127 deletions(-)
 delete mode 100644 pkgs/applications/version-management/bitbucket-server-cli/Gemfile
 delete mode 100644 pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock
 delete mode 100644 pkgs/applications/version-management/bitbucket-server-cli/default.nix
 delete mode 100644 pkgs/applications/version-management/bitbucket-server-cli/gemset.nix

diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile
deleted file mode 100644
index 8ed325154711..000000000000
--- a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'atlassian-stash'
diff --git a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock
deleted file mode 100644
index 27a6e2c8dd03..000000000000
--- a/pkgs/applications/version-management/bitbucket-server-cli/Gemfile.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    atlassian-stash (0.7.0)
-      commander (~> 4.1.2)
-      git (>= 1.2.5)
-      json (>= 1.7.5)
-      launchy (~> 2.4.2)
-    commander (4.1.6)
-      highline (~> 1.6.11)
-    git (1.3.0)
-    highline (1.6.21)
-    json (2.0.2)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    public_suffix (2.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  atlassian-stash
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/applications/version-management/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/bitbucket-server-cli/default.nix
deleted file mode 100644
index ae722fd47f4e..000000000000
--- a/pkgs/applications/version-management/bitbucket-server-cli/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  bundlerEnv,
-  ruby,
-  bundlerUpdateScript,
-}:
-
-bundlerEnv rec {
-  name = "bitbucket-server-cli-${version}";
-
-  version = (import ./gemset.nix).atlassian-stash.version;
-  inherit ruby;
-  gemdir = ./.;
-
-  pname = "atlassian-stash";
-
-  passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli";
-
-  meta = with lib; {
-    description = "Command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
-    homepage = "https://bitbucket.org/atlassian/bitbucket-server-cli";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      jgertm
-      nicknovitski
-    ];
-    mainProgram = "stash";
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix
deleted file mode 100644
index 0384c22326e6..000000000000
--- a/pkgs/applications/version-management/bitbucket-server-cli/gemset.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  addressable = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
-      type = "gem";
-    };
-    version = "2.5.0";
-  };
-  atlassian-stash = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1rsf9h5w5wiglwv0fqwp45fq06fxbg68cqkc3bpqvps1i1qm0p6i";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
-  commander = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0x9i8hf083wjlgj09nl1p9j8sr5g7amq0fdmxjqs4cxdbg3wpmsb";
-      type = "gem";
-    };
-    version = "4.1.6";
-  };
-  git = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-  highline = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
-      type = "gem";
-    };
-    version = "1.6.21";
-  };
-  json = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
-      type = "gem";
-    };
-    version = "2.0.2";
-  };
-  launchy = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-      type = "gem";
-    };
-    version = "2.4.3";
-  };
-  public_suffix = {
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
-      type = "gem";
-    };
-    version = "2.0.5";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 01437fbd1043..b0058207ea0a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -338,6 +338,7 @@ mapAliases {
   betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
+  bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27
   bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f275e9a295..46e23091bddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1261,8 +1261,6 @@ with pkgs;
     withpcre2 = false;
   };
 
-  bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };
-
   bump2version = with python3Packages; toPythonApplication bump2version;
 
   cgit = callPackage ../applications/version-management/cgit { };

From fbf104cef0379395f32ca6159fed629022a76a60 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 27 May 2025 23:14:50 -0400
Subject: [PATCH 0160/1497] licensed: 5.0.0 -> 5.0.4 Changelog:
 https://github.com/licensee/licensed/releases

Permalinks to changelogs:
* https://github.com/licensee/licensed/releases/tag/v5.0.1
* https://github.com/licensee/licensed/releases/tag/v5.0.2
* https://github.com/licensee/licensed/releases/tag/v5.0.3
* https://github.com/licensee/licensed/releases/tag/v5.0.4
---
 pkgs/by-name/li/licensed/Gemfile      |  14 +-
 pkgs/by-name/li/licensed/Gemfile.lock | 108 ++-----
 pkgs/by-name/li/licensed/gemset.nix   | 396 ++------------------------
 3 files changed, 49 insertions(+), 469 deletions(-)

diff --git a/pkgs/by-name/li/licensed/Gemfile b/pkgs/by-name/li/licensed/Gemfile
index 14a0974bd92b..2a33faf1813d 100644
--- a/pkgs/by-name/li/licensed/Gemfile
+++ b/pkgs/by-name/li/licensed/Gemfile
@@ -1,12 +1,2 @@
-# frozen_string_literal: true
-source "https://rubygems.org"
-
-gem 'licensed', '=5.0.0'
-
-gem 'csv' , '~> 3.0'
-gem 'byebug', '~> 11.1'
-gem 'minitest', '~> 5.17'
-gem 'minitest-hooks', '~> 1.5'
-gem 'mocha', '~> 2.0'
-gem 'rake', '~> 13.0'
-gem 'rubocop-github', '~> 0.20'
+source 'https://rubygems.org'
+gem 'licensed'
diff --git a/pkgs/by-name/li/licensed/Gemfile.lock b/pkgs/by-name/li/licensed/Gemfile.lock
index 29b91e0884dd..3de910892ef6 100644
--- a/pkgs/by-name/li/licensed/Gemfile.lock
+++ b/pkgs/by-name/li/licensed/Gemfile.lock
@@ -1,47 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.0)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.8)
-    byebug (11.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
-    csv (3.3.0)
-    dotenv (3.1.4)
-    drb (2.2.1)
-    faraday (2.12.1)
+    csv (3.3.4)
+    dotenv (3.1.8)
+    faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    i18n (1.14.6)
-      concurrent-ruby (~> 1.0)
-    json (2.8.2)
-    language_server-protocol (3.17.0.3)
-    licensed (5.0.0)
+    json (2.12.2)
+    licensed (5.0.4)
+      csv (~> 3.3)
       json (~> 2.6)
       licensee (~> 9.16)
       parallel (~> 1.22)
       pathname-common_prefix (~> 0.0.1)
-      reverse_markdown (~> 2.1)
+      reverse_markdown (>= 2.1, < 4.0)
       ruby-xxHash (~> 0.4.0)
       thor (~> 1.2)
       tomlrb (~> 2.0)
@@ -51,85 +28,36 @@ GEM
       reverse_markdown (>= 1, < 4)
       rugged (>= 0.24, < 2.0)
       thor (>= 0.19, < 2.0)
-    logger (1.6.1)
-    mini_portile2 (2.8.8)
-    minitest (5.25.2)
-    minitest-hooks (1.5.2)
-      minitest (> 5.3)
-    mocha (2.6.0)
-      ruby2_keywords (>= 0.0.5)
-    net-http (0.5.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    net-http (0.6.0)
       uri
-    nokogiri (1.16.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    parallel (1.26.3)
-    parser (3.3.6.0)
-      ast (~> 2.4.1)
-      racc
+    parallel (1.27.0)
     pathname-common_prefix (0.0.2)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.1.8)
-    rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.2)
-    reverse_markdown (2.1.1)
+    reverse_markdown (3.0.0)
       nokogiri
-    rubocop (1.68.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
-      parser (>= 3.3.1.0)
-    rubocop-github (0.20.0)
-      rubocop (>= 1.37)
-      rubocop-performance (>= 1.15)
-      rubocop-rails (>= 2.17)
-    rubocop-performance (1.23.0)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.27.0)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    ruby-progressbar (1.13.0)
     ruby-xxHash (0.4.0.2)
-    ruby2_keywords (0.0.5)
-    rugged (1.7.2)
+    rugged (1.9.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    securerandom (0.3.2)
     thor (1.3.2)
     tomlrb (2.0.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
-    uri (1.0.2)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug (~> 11.1)
-  csv (~> 3.0)
-  licensed (= 5.0.0)
-  minitest (~> 5.17)
-  minitest-hooks (~> 1.5)
-  mocha (~> 2.0)
-  rake (~> 13.0)
-  rubocop-github (~> 0.20)
+  licensed
 
 BUNDLED WITH
-   2.5.22
+   2.6.6
diff --git a/pkgs/by-name/li/licensed/gemset.nix b/pkgs/by-name/li/licensed/gemset.nix
index 32105af7674d..d7795e9ea2e6 100644
--- a/pkgs/by-name/li/licensed/gemset.nix
+++ b/pkgs/by-name/li/licensed/gemset.nix
@@ -1,28 +1,4 @@
 {
-  activesupport = {
-    dependencies = [
-      "base64"
-      "benchmark"
-      "bigdecimal"
-      "concurrent-ruby"
-      "connection_pool"
-      "drb"
-      "i18n"
-      "logger"
-      "minitest"
-      "securerandom"
-      "tzinfo"
-      "uri"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0pmcgdwl6pdhy570fldbafxqjpd3g0pcasbicljmn59zj95nqn9c";
-      type = "gem";
-    };
-    version = "8.0.0";
-  };
   addressable = {
     dependencies = [ "public_suffix" ];
     groups = [ "default" ];
@@ -34,105 +10,25 @@
     };
     version = "2.8.7";
   };
-  ast = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
-      type = "gem";
-    };
-    version = "2.4.2";
-  };
-  base64 = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  benchmark = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  bigdecimal = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
-      type = "gem";
-    };
-    version = "3.1.8";
-  };
-  byebug = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194";
-      type = "gem";
-    };
-    version = "11.1.3";
-  };
-  concurrent-ruby = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
-      type = "gem";
-    };
-    version = "1.3.4";
-  };
-  connection_pool = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
   csv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.4";
   };
   dotenv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0aanng90ad6vg9sm3qlq1223k456qw2xli9kcx13a3ga33kh5ibd";
+      sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
       type = "gem";
     };
-    version = "3.1.4";
-  };
-  drb = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
-      type = "gem";
-    };
-    version = "2.2.1";
+    version = "3.1.8";
   };
   faraday = {
     dependencies = [
@@ -144,10 +40,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3";
+      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
       type = "gem";
     };
-    version = "2.12.1";
+    version = "2.13.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -160,39 +56,19 @@
     };
     version = "3.4.0";
   };
-  i18n = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
-      type = "gem";
-    };
-    version = "1.14.6";
-  };
   json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kw68hs5jfii7p4pkhsd9nxzsmc9xmb6x8vfp1rczbhxr34sckyx";
+      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
       type = "gem";
     };
-    version = "2.8.2";
-  };
-  language_server-protocol = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
-      type = "gem";
-    };
-    version = "3.17.0.3";
+    version = "2.12.2";
   };
   licensed = {
     dependencies = [
+      "csv"
       "json"
       "licensee"
       "parallel"
@@ -206,10 +82,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zj99ky6cyj61sj1xj4xhpjgrrkxkdajdvk5w9rafqzfcsc9a1sm";
+      sha256 = "1hf1c8mn1l3qw28jrmkw7vzm3n0f03f5y2kmmrriiki3j12bb8f0";
       type = "gem";
     };
-    version = "5.0.0";
+    version = "5.0.4";
   };
   licensee = {
     dependencies = [
@@ -233,52 +109,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.0";
   };
   mini_portile2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
-  };
-  minitest = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1sw3kvajbs5fvlqf1cz2kd6641iibmrc8idm4y8ian007vb7kcsr";
-      type = "gem";
-    };
-    version = "5.25.2";
-  };
-  minitest-hooks = {
-    dependencies = [ "minitest" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "11jb31dl5kbpyl3kgxql0p7da9066r2aqw54y5q6cni9nmld3zf5";
-      type = "gem";
-    };
-    version = "1.5.2";
-  };
-  mocha = {
-    dependencies = [ "ruby2_keywords" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0f2nd90wlm96i4d9nyf3ibs9szlyf5zra6p60bk6pj6p093lzb3n";
-      type = "gem";
-    };
-    version = "2.6.0";
+    version = "2.8.9";
   };
   net-http = {
     dependencies = [ "uri" ];
@@ -286,10 +130,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1np1di3wnjmdnsf0h0yg5m902b0zv7g82jra2i9vy0zyb8h8hzzd";
+      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.6.0";
   };
   nokogiri = {
     dependencies = [
@@ -300,10 +144,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
+      sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c";
       type = "gem";
     };
-    version = "1.16.7";
+    version = "1.18.8";
   };
   octokit = {
     dependencies = [
@@ -324,24 +168,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
-  };
-  parser = {
-    dependencies = [
-      "ast"
-      "racc"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15";
-      type = "gem";
-    };
-    version = "3.3.6.0";
+    version = "1.27.0";
   };
   pathname-common_prefix = {
     groups = [ "default" ];
@@ -358,10 +188,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   racc = {
     groups = [ "default" ];
@@ -373,143 +203,16 @@
     };
     version = "1.8.1";
   };
-  rack = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk";
-      type = "gem";
-    };
-    version = "3.1.8";
-  };
-  rainbow = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
-      type = "gem";
-    };
-    version = "3.1.1";
-  };
-  rake = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
-      type = "gem";
-    };
-    version = "13.2.1";
-  };
-  regexp_parser = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss";
-      type = "gem";
-    };
-    version = "2.9.2";
-  };
   reverse_markdown = {
     dependencies = [ "nokogiri" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0087vhw5ik50lxvddicns01clkx800fk5v5qnrvi3b42nrk6885j";
+      sha256 = "195c7yra7amggqj7rir0yr09r4v29c2hgkbkb21mj0jsfs3868mb";
       type = "gem";
     };
-    version = "2.1.1";
-  };
-  rubocop = {
-    dependencies = [
-      "json"
-      "language_server-protocol"
-      "parallel"
-      "parser"
-      "rainbow"
-      "regexp_parser"
-      "rubocop-ast"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ay1lrz3ffrznjfr65c6xvkinb6m4l7h68cd9qbrf7nq0j2m1pq7";
-      type = "gem";
-    };
-    version = "1.68.0";
-  };
-  rubocop-ast = {
-    dependencies = [ "parser" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ybvb26ipc4pd4xixgi8l8rhkrwn0iia70flc4jw72qpaf4rmn0m";
-      type = "gem";
-    };
-    version = "1.36.1";
-  };
-  rubocop-github = {
-    dependencies = [
-      "rubocop"
-      "rubocop-performance"
-      "rubocop-rails"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "030b6szbmdcf3x5fccij27znmli0p35ciyzzmxl0vsfck8ghg3ii";
-      type = "gem";
-    };
-    version = "0.20.0";
-  };
-  rubocop-performance = {
-    dependencies = [
-      "rubocop"
-      "rubocop-ast"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0wcilipyh890k0vwx8mgkj5qpjy2xvvgk89l9ars1wf53g5pibil";
-      type = "gem";
-    };
-    version = "1.23.0";
-  };
-  rubocop-rails = {
-    dependencies = [
-      "activesupport"
-      "rack"
-      "rubocop"
-      "rubocop-ast"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1zplyab5n8gh7zzbwrrxrkzb2406afrjm6a3a3zdx72k17swx9n3";
-      type = "gem";
-    };
-    version = "2.27.0";
-  };
-  ruby-progressbar = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
-      type = "gem";
-    };
-    version = "1.13.0";
+    version = "3.0.0";
   };
   ruby-xxHash = {
     groups = [ "default" ];
@@ -521,25 +224,15 @@
     };
     version = "0.4.0.2";
   };
-  ruby2_keywords = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
   rugged = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch";
+      sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.9.0";
   };
   sawyer = {
     dependencies = [
@@ -555,16 +248,6 @@
     };
     version = "0.9.2";
   };
-  securerandom = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1h4xx97w353z1ygg667iwf9il8llzz7xvf5znipb5fyza6kgzcp8";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
   thor = {
     groups = [ "default" ];
     platforms = [ ];
@@ -585,35 +268,14 @@
     };
     version = "2.0.3";
   };
-  tzinfo = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
-  unicode-display_width = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
-      type = "gem";
-    };
-    version = "2.6.0";
-  };
   uri = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk";
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
 }

From 0e784416ad7efbe050d49b54b37a7b42f84de6a4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 28 May 2025 06:26:34 +0100
Subject: [PATCH 0161/1497] mdbook: 0.4.50 -> 0.4.51

Changes: https://github.com/rust-lang/mdBook/compare/v0.4.50...v0.4.51
---
 pkgs/by-name/md/mdbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index f7863c67f4a4..ded486367aec 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
 }:
 let
-  version = "0.4.50";
+  version = "0.4.51";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-ooXfYXqE12wTxrrHKF0IO8JNY7P4sPplrnhVJ6kEUyI=";
+    hash = "sha256-d211IEXtHiRhD+rXGUaDAbcDwKJZqr0fmkxTgN4RkC0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-kyk7fwuR5A0GEGUw+W81IjwDNsa3I2DT3SFnT75IvLs=";
+  cargoHash = "sha256-3VI9WZiFiyfQRQk7gZBLXA/RRfCuEBze/MWI7OUGBmc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3bd273723b24cbd8d9d42c330178b1122cd6f540 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 May 2025 07:42:26 +0000
Subject: [PATCH 0162/1497] fantomas: 7.0.1 -> 7.0.2

---
 pkgs/by-name/fa/fantomas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix
index 0872d65303a7..8c61867c601f 100644
--- a/pkgs/by-name/fa/fantomas/package.nix
+++ b/pkgs/by-name/fa/fantomas/package.nix
@@ -2,9 +2,9 @@
 
 buildDotnetGlobalTool {
   pname = "fantomas";
-  version = "7.0.1";
+  version = "7.0.2";
 
-  nugetHash = "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI=";
+  nugetHash = "sha256-BAaENIm/ksTiXrUImRgKoIXTGIlgsX7ch6ayoFjhJXA=";
 
   meta = with lib; {
     description = "F# source code formatter";

From 4cb3d98c05f111bc24c894252d19b83a9988a7d9 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 28 May 2025 15:52:46 +0800
Subject: [PATCH 0163/1497] v2rayn: 7.11.1 -> 7.12.5

Diff: https://github.com/2dust/v2rayN/compare/refs/tags/7.11.1...refs/tags/7.12.5
---
 pkgs/by-name/v2/v2rayn/deps.json   | 64 +++++++++++++++---------------
 pkgs/by-name/v2/v2rayn/package.nix | 22 ++++++----
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 6b28dfc1eb88..474e080ddbc7 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -11,8 +11,8 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.6",
-    "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI="
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -31,38 +31,38 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.6",
-    "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ="
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.6",
-    "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI="
+    "version": "11.3.0",
+    "hash": "sha256-McFggedX7zb9b0FytFeuh+3nPdFqoKm2JMl2VZDs/BQ="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.6",
-    "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24="
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.6",
-    "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ="
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.6",
-    "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ="
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.6",
-    "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw="
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.6",
-    "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU="
+    "version": "11.3.0",
+    "hash": "sha256-yY/xpe4Te6DLa1HZCWZgIGpdKeZqvknRtpkpBTrZhmU="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -76,28 +76,28 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.6",
-    "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ="
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.6",
-    "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c="
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.6",
-    "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA="
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.6",
-    "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY="
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.6",
-    "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw="
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
   },
   {
     "pname": "CliWrap",
@@ -196,13 +196,13 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.2.1.6",
-    "hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE="
+    "version": "11.2.1.7",
+    "hash": "sha256-LFlgdRcqNR+ZV9Hkyuw7LhaFWKwCuXWRWYM+9sQRBDU="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.6",
-    "hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo="
+    "version": "11.2.1.7",
+    "hash": "sha256-EWfzKeM5gMoJHx7L9+kAeGtaaY6HeG+NwAxv08rOv6E="
   },
   {
     "pname": "SkiaSharp",
@@ -336,8 +336,8 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
   },
   {
     "pname": "WebDav.Client",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 81c3828b9792..d0520467233f 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -1,18 +1,18 @@
 {
-  fetchFromGitHub,
+  lib,
+  stdenv,
   buildDotnetModule,
+  fetchFromGitHub,
   dotnetCorePackages,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
   icu,
   zlib,
-  stdenv,
-  lib,
   fontconfig,
-  autoPatchelfHook,
   openssl,
   lttng-ust_2_12,
   krb5,
-  makeDesktopItem,
-  copyDesktopItems,
   bash,
   xorg,
   xdg-utils,
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "v2rayn";
-  version = "7.11.1";
+  version = "7.12.5";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = version;
-    hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0=";
+    hash = "sha256-gXVriD9g4Coc0B0yN5AlfNre9C9l8V5wv4q3KgKRsF0=";
     fetchSubmodules = true;
   };
 
@@ -36,12 +36,18 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   postPatch = ''
+    chmod +x v2rayN/ServiceLib/Sample/proxy_set_linux_sh
+    patchShebangs v2rayN/ServiceLib/Sample/proxy_set_linux_sh
     substituteInPlace v2rayN/ServiceLib/Global.cs \
       --replace-fail "/bin/bash" "${bash}/bin/bash"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreAdminHandler.cs \
+      --replace-fail "/bin/sh" "${bash}/bin/bash"
     substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
       --replace-fail "Utils.GetExePath())" '"v2rayN")'
     substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
       --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
+    substituteInPlace v2rayN/ServiceLib/Handler/CoreHandler.cs \
+      --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
   '';
 
   dotnetBuildFlags = [ "-p:PublishReadyToRun=false" ];

From cb55e580f0d8f15b2280ab3d9ffa9af7f515de5d Mon Sep 17 00:00:00 2001
From: p0lyw0lf <p0lyw0lf@protonmail.com>
Date: Sat, 24 May 2025 10:05:14 -0400
Subject: [PATCH 0164/1497] python3Packages.sanic-ext: init at 24.12.0

---
 .../python-modules/sanic-ext/default.nix      | 75 +++++++++++++++++++
 .../python-modules/sanic/default.nix          |  5 +-
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/sanic-ext/default.nix

diff --git a/pkgs/development/python-modules/sanic-ext/default.nix b/pkgs/development/python-modules/sanic-ext/default.nix
new file mode 100644
index 000000000000..581b44962816
--- /dev/null
+++ b/pkgs/development/python-modules/sanic-ext/default.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # Build system
+  setuptools,
+
+  # Dependencies
+  pyyaml,
+
+  # Test dependencies
+  pytestCheckHook,
+
+  sanic-testing,
+  attrs,
+  coverage,
+  msgspec,
+  pydantic,
+  pytest,
+  pytest-cov,
+  pytest-asyncio,
+  tox,
+  jinja2,
+}:
+
+buildPythonPackage rec {
+  pname = "sanic-ext";
+  version = "24.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sanic-org";
+    repo = "sanic-ext";
+    tag = "v${version}";
+    hash = "sha256-H1tqiPQ4SwlNGj7GtB2h7noZpU+gbGXIbmRK1TSSqVA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+
+    sanic-testing
+    attrs
+    coverage
+    msgspec
+    pydantic
+    pytest
+    pytest-cov
+    pytest-asyncio
+    tox
+    jinja2
+  ];
+
+  disabledTests = [
+    "test_models[FooPydanticDataclass]" # KeyError: 'paths'
+    "test_pydantic_base_model[AlertResponsePydanticBaseModel-True]" # AssertionError: assert 'AlertPydanticBaseModel' in {'AlertResponsePydanticBaseModel': ... }
+    "test_pydantic_base_model[AlertResponsePydanticDataclass-True]" # AssertionError: assert 'AlertPydanticDataclass' in {'AlertResponsePydanticDataclass': ... }
+  ];
+
+  pythonImportsCheck = [ "sanic_ext" ];
+
+  meta = {
+    description = "Common, officially supported extension plugins for the Sanic web server framework";
+    homepage = "https://github.com/sanic-org/sanic-ext/";
+    changelog = "https://github.com/sanic-org/sanic-ext/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ p0lyw0lf ];
+  };
+}
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 01b697d154be..e83b467fa52a 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -13,6 +13,7 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  sanic-ext,
   sanic-routing,
   sanic-testing,
   setuptools,
@@ -54,9 +55,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    ext = [
-      # TODO: sanic-ext
-    ];
+    ext = [ sanic-ext ];
     http3 = [ aioquic ];
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fbd80431a5b1..dfcfa75cb13f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15515,6 +15515,8 @@ self: super: with self; {
 
   sanic-auth = callPackage ../development/python-modules/sanic-auth { };
 
+  sanic-ext = callPackage ../development/python-modules/sanic-ext { };
+
   sanic-routing = callPackage ../development/python-modules/sanic-routing { };
 
   sanic-testing = callPackage ../development/python-modules/sanic-testing { };

From 1566c47d297425152930dda276a4d98626675b2a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 24 Nov 2024 06:26:43 +0000
Subject: [PATCH 0165/1497] cctag: 1.0.3 -> 1.0.4

Includes fixes for Boost 1.86.
---
 pkgs/development/libraries/cctag/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix
index 557f88090405..d187d70152da 100644
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   cmake,
-  boost179,
+  boost,
   eigen,
   opencv,
   tbb,
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cctag";
-  version = "1.0.3";
+  version = "1.0.4";
 
   outputs = [
     "lib"
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "alicevision";
     repo = "CCTag";
     rev = "v${version}";
-    hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
+    hash = "sha256-M35KGTTmwGwXefsFWB2UKAKveUQyZBW7V8ejgOAJpXk=";
   };
 
   cmakeFlags = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    boost179
+    boost
     eigen
     opencv.cxxdev
   ];

From 4eea7ff42736d0fba240ce2fadb7ce00aeffbaca Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Wed, 28 May 2025 18:22:17 +0200
Subject: [PATCH 0166/1497] cctag: Fix Darwin build

Fix the Darwin build by removing the dependency on the math_c99
libraries which aren't required on Darwin.
Also re-enable tests on Darwin by fixing the linking issue.

Co-authored-by: Reno Dakota <paparodeo@proton.me>
---
 .../cctag/cmake-no-apple-rpath.patch          | 26 +++++++++++++++++++
 pkgs/development/libraries/cctag/default.nix  | 13 +++++++---
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch

diff --git a/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch b/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch
new file mode 100644
index 000000000000..5884e39ad651
--- /dev/null
+++ b/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d0e35b6..fc19477 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,20 +96,6 @@ endif()
+ # set the path where we can find the findXXX.cmake
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+ 
+-if(APPLE)
+-
+-  # avoid the cmake policy warning about @rpath in MacOSX
+-  cmake_policy(SET CMP0042 NEW)
+-
+-  SET(CMAKE_MACOSX_RPATH TRUE) # initialize the MACOSX_RPATH property on all targets
+-  SET(CMAKE_SKIP_BUILD_RPATH  FALSE) # don't skip the full RPATH for the build tree
+-  # SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # when building, don't use the install RPATH already
+-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # when building, use the install RPATH already
+-                                           # probably not needed
+-  # SET(CMAKE_INSTALL_RPATH "") # the RPATH to be used when installing
+-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # LC_RPATH for CUDA and OpenCV etc written into executable
+-endif(APPLE)
+-
+ # FIND BOOST
+ set(BOOST_REQUIRED_COMPONENTS "atomic;chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99")
+ if(WIN32)
+
diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix
index d187d70152da..28a8bb3c3dc9 100644
--- a/pkgs/development/libraries/cctag/default.nix
+++ b/pkgs/development/libraries/cctag/default.nix
@@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
   version = "1.0.4";
 
   outputs = [
-    "lib"
-    "dev"
     "out"
+    "dev"
   ];
 
   src = fetchFromGitHub {
@@ -41,8 +40,15 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./cmake-install-include-dir.patch
+    ./cmake-no-apple-rpath.patch
   ];
 
+  # darwin boost doesn't have math_c99 libraries
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt --replace-warn ";math_c99" ""
+    substituteInPlace src/CMakeLists.txt --replace-warn "Boost::math_c99" ""
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
@@ -57,8 +63,7 @@ stdenv.mkDerivation rec {
     opencv.cxxdev
   ];
 
-  # Tests are broken on Darwin (linking issue)
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  doCheck = true;
 
   meta = with lib; {
     description = "Detection of CCTag markers made up of concentric circles";

From 3fc5420e5f82b4a29c62f959a238e30863d33ddc Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 27 May 2025 01:24:58 +0900
Subject: [PATCH 0167/1497] mitmproxy: 12.0.1 -> 12.1.1

https://github.com/mitmproxy/mitmproxy/blob/v12.1.1/CHANGELOG.md

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/python-modules/mitmproxy/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index 68faebc6033b..8db9550256a3 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -15,7 +15,6 @@
   hypothesis,
   kaitaistruct,
   ldap3,
-  mitmproxy-linux,
   mitmproxy-rs,
   msgpack,
   passlib,
@@ -31,7 +30,6 @@
   ruamel-yaml,
   setuptools,
   sortedcontainers,
-  stdenv,
   tornado,
   urwid,
   wsproto,
@@ -40,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "12.0.1";
+  version = "12.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy";
     tag = "v${version}";
-    hash = "sha256-BKT/qBWlfShAveL1KY5XXgQjhxR3Vr4zoJwiRxtBJkE=";
+    hash = "sha256-RTHL5+lbR+AbkiE4+z4ZbxZSV2E4NGTmShbMIMRKJPA=";
   };
 
   pythonRelaxDeps = [
@@ -55,6 +53,7 @@ buildPythonPackage rec {
     "h2"
     "passlib"
     "typing-extensions" # https://github.com/NixOS/nixpkgs/pull/397082
+    "tornado"
   ];
 
   build-system = [ setuptools ];

From 7ca9f213611f4a2ee11baa55a1972336d25af6c0 Mon Sep 17 00:00:00 2001
From: eV <8796196+evq@users.noreply.github.com>
Date: Wed, 28 May 2025 18:15:13 +0000
Subject: [PATCH 0168/1497] nixos/wyoming-satellite: fix override to use
 dependencies

---
 nixos/modules/services/home-automation/wyoming/satellite.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/home-automation/wyoming/satellite.nix b/nixos/modules/services/home-automation/wyoming/satellite.nix
index b0064569cc32..532129dc7552 100644
--- a/nixos/modules/services/home-automation/wyoming/satellite.nix
+++ b/nixos/modules/services/home-automation/wyoming/satellite.nix
@@ -23,8 +23,8 @@ let
     ;
 
   finalPackage = cfg.package.overridePythonAttrs (oldAttrs: {
-    propagatedBuildInputs =
-      oldAttrs.propagatedBuildInputs
+    dependencies =
+      oldAttrs.dependencies
       # for audio enhancements like auto-gain, noise suppression
       ++ cfg.package.optional-dependencies.webrtc
       # vad is currently optional, because it is broken on aarch64-linux

From cda4a3550cf2501d5ee0033c8c6914fcb6327dba Mon Sep 17 00:00:00 2001
From: Solomon Victorino <git@solomonvictorino.com>
Date: Wed, 28 May 2025 13:57:30 -0600
Subject: [PATCH 0169/1497] oqs-provider: 0.8.0 -> 0.9.0

---
 pkgs/by-name/oq/oqs-provider/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix
index 09fd6c0444b3..9e20798b1b71 100644
--- a/pkgs/by-name/oq/oqs-provider/package.nix
+++ b/pkgs/by-name/oq/oqs-provider/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "oqs-provider";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "open-quantum-safe";
     repo = "oqs-provider";
     rev = finalAttrs.version;
-    hash = "sha256-P3UEiWYchHVQ5s3JXHOzaDaN09K62pMYjnrW/gS5x/I=";
+    hash = "sha256-R9rau/Q+KSkr0hNxpvc3ub9eLQqS1kIONoOEw8zFUBk=";
   };
 
   nativeBuildInputs = [

From 039addba0c9d22fa3446c98499d9844561b5d80a Mon Sep 17 00:00:00 2001
From: PopCat19 <atsuo11111@gmail.com>
Date: Wed, 28 May 2025 18:13:31 -0400
Subject: [PATCH 0170/1497] zrok: 0.4.46 -> 1.0.4

---
 pkgs/by-name/zr/zrok/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix
index 25a768202ccf..5e8c89cc9309 100644
--- a/pkgs/by-name/zr/zrok/package.nix
+++ b/pkgs/by-name/zr/zrok/package.nix
@@ -18,15 +18,15 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-3W6y79GXhBzy4YTafUuct6kWc6yvVdhJGL+Byg+AXog=";
-      aarch64-linux = "sha256-qhl+yT1lAf/xXhEoMZ7lkGZWKnwI0ANQrHO1BHcGrfo=";
-      armv7l-linux = "sha256-EYbvN+Z7KFVoJk1KNljgypjbBnJJ4dM+YFl8RQri5jw=";
+      x86_64-linux = "sha256-Ewez2QUsIAmxyjxR8wvt7UJpXVHjIb8s6gGF1YNgrec=";
+      aarch64-linux = "sha256-5hZaOqnTYWeUJXGObzUZMqE62ZgNvJ9Wi8shVng10l8=";
+      armv7l-linux = "sha256-MOM0OS2/mhYaxowsBVnZH0poR+wXsbjsJKldU/nAfjU=";
     }
     .${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zrok";
-  version = "0.4.46";
+  version = "1.0.4";
 
   src = fetchzip {
     url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz";

From c46498783a810d687d22d80198aa2512c16e4a4f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 08:05:47 +0800
Subject: [PATCH 0171/1497] animeko: fix

---
 pkgs/by-name/an/animeko/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 0998722307b0..51b328cd4f5e 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -207,6 +207,8 @@ stdenv.mkDerivation (finalAttrs: {
     "libdca.so.0"
     "liba52-0.7.4.so"
     "libFLAC.so.12"
+    "libtheoradec.so.1"
+    "libtheoraenc.so.1"
   ];
 
   dontWrapQtApps = true;

From ae1eeae643fc7cd01fc06664f6a278816b58203b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 04:12:12 +0000
Subject: [PATCH 0172/1497] meshcentral: 1.1.44 -> 1.1.45

---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |    7 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 1386 +++++++++++----------
 3 files changed, 713 insertions(+), 688 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 244dd0acd107..c6973aa2ceeb 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.44";
+  version = "1.1.45";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.44.tgz";
-    sha256 = "1rjn608czjn0f066wgakdzkz73wx0lrinrqs83j44h49qfqwxkl3";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.45.tgz";
+    sha256 = "1dwn0xaqa5f2wzlc3xygwww0pv9dkvxax8a5ysy08d9zsnpy61ra";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-WltJXI9hd2OIRuPrqjDoCsa6/zjRGydPYCeiVxZIcS8=";
+    hash = "sha256-mH8R2KMN1rSbRkKPUV5BhnL7VjAN8m8O5stg+s9Zye8=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 213cb7460e26..3cf6b60d8b29 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.44",
+  "version": "1.1.45",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -97,13 +97,12 @@
     "ldapauth-fork": "5.0.5",
     "ssh2": "1.16.0",
     "svg-captcha": "1.4.0",
-    "image-size": "1.1.1",
+    "image-size": "2.0.2",
     "acme-client": "4.2.5",
     "aedes": "0.39.0",
     "mysql2": "3.11.4",
     "@mysql/xdevapi": "8.0.33",
-    "mongodb": "4.13.0",
-    "saslprep": "1.0.3",
+    "mongodb": "4.17.2",
     "pg": "8.14.1",
     "mariadb": "3.4.0",
     "acebase": "1.29.5",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 11e7b0199e46..7ed1c9a76031 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -48,410 +48,411 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.796.0.tgz#8dcb4cb37789f887ed77e3fdcae8cfe1fff6cada"
-  integrity sha512-p8ZzHICnQaCL4oS16yHUCLH6/VkbmWP8p2P7vALncUYguHDE/oNcWNAARo56x3Qx0TbRCi0OD4KAwD6AhddMdg==
+"@aws-sdk/client-cognito-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.817.0.tgz#43b72aaf94ef1ab483dfc17548db509b8b063d42"
+  integrity sha512-MNGwOJDQU0jpvsLLPSuPQDhPtDzFTc/k7rLmiKoPrIlgb3Y8pSF4crpJ+ZH3+xod2NWyyOVMEMQeMaKFFdMaKw==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-node" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-node" "3.817.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.796.0.tgz#231fc98bd71c5e915e9060fba871a6d9d9ccb3d6"
-  integrity sha512-EJExg8mbwqP0VG+RNFV4ZPuUo7QsDsUfTnuFQY51V8iXrbOdV+PDLRr4psXj2fxvrLxc9AlGUMNqd/j4VZtQzA==
+"@aws-sdk/client-sso@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.817.0.tgz#eca663fb562095f7ff1c2d0af6f89cc1f04e12a4"
+  integrity sha512-fCh5rUHmWmWDvw70NNoWpE5+BRdtNi45kDnIoeoszqVg7UKF79SlG+qYooUT52HKCgDNHqgbWaXxMOSqd2I/OQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.796.0.tgz#6076b78772c1eb97ec6ea9064c85ce500e0aa889"
-  integrity sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A==
+"@aws-sdk/core@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.816.0.tgz#f310a2fd458534b13f42de5e10fdfd3dfc8d4982"
+  integrity sha512-Lx50wjtyarzKpMFV6V+gjbSZDgsA/71iyifbClGUSiNPoIQ4OCV0KVOmAAj7mQRVvGJqUMWKVM+WzK79CjbjWA==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/core" "^3.2.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/core" "^3.3.3"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/signature-v4" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/util-middleware" "^4.0.2"
     fast-xml-parser "4.4.1"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.796.0.tgz#c037d35d8a8284fc4cc658da9e7a2498f3703f1f"
-  integrity sha512-plvMsQNWW1Jq7YRs8S6xHEbdn+kO/F+vDjCBrPaT4LhcDMsXqO/jcDNRuYOnPRBQsqjp7n7MM3oMhyY4fupa6g==
+"@aws-sdk/credential-provider-cognito-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.817.0.tgz#846db6edb05df88e98b2c775f582832addc808d7"
+  integrity sha512-+dzgWGmdmMNDdeSF+VvONN+hwqoGKX5A6Z3+siMO4CIoKWN7u5nDOx/JLjTGdVQji3522pJjJ+o9veQJNWOMRg==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/client-cognito-identity" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.796.0.tgz#4ed6903814868b0f9daa8c8db449b1f1adcda041"
-  integrity sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw==
+"@aws-sdk/credential-provider-env@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.816.0.tgz#a5e1dd3a23403f6c8ea4cbdcbf06d7986bcd1e81"
+  integrity sha512-wUJZwRLe+SxPxRV9AENYBLrJZRrNIo+fva7ZzejsC83iz7hdfq6Rv6B/aHEdPwG/nQC4+q7UUvcRPlomyrpsBA==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.796.0.tgz#7f36074021b2605dba4b758b4b0ca98fb5b965ad"
-  integrity sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg==
+"@aws-sdk/credential-provider-http@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.816.0.tgz#35e5188e9c0143c48d02a9c7ca08f9e6e4821ed1"
+  integrity sha512-gcWGzMQ7yRIF+ljTkR8Vzp7727UY6cmeaPrFQrvcFB8PhOqWpf7g0JsgOf5BSaP8CkkSQcTQHc0C5ZYAzUFwPg==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/util-stream" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.796.0.tgz#6d5f260b93104b126e26919287a4e131d1cb8e75"
-  integrity sha512-qGWBDn9aO8avFfYU7daps7Sy6OglF1x0q0w48slt0KMXbHd2/LvKVIiYwyofYCXed0yzcEOF2IYm9FjXdcn+ug==
+"@aws-sdk/credential-provider-ini@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.817.0.tgz#eb0d2dab8fc861cc0871e1a01bac6ac3f84a3b8b"
+  integrity sha512-kyEwbQyuXE+phWVzloMdkFv6qM6NOon+asMXY5W0fhDKwBz9zQLObDRWBrvQX9lmqq8BbDL1sCfZjOh82Y+RFw==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/credential-provider-imds" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.796.0.tgz#aa621e4f15d7317b351c1dbb896bfcabbc21db0c"
-  integrity sha512-WeNK7OWPrsOvhO3DAgpUO0FtmVghMaZ/IpPJHJ4Y0nBIsWOBXLrbZ2Y1mdT8N2bGGUaM91tJaV8Yf8COc3gvmA==
+"@aws-sdk/credential-provider-node@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.817.0.tgz#ffa311d3917535a24a3319ff01f430c5ba4139e0"
+  integrity sha512-b5mz7av0Lhavs1Bz3Zb+jrs0Pki93+8XNctnVO0drBW98x1fM4AR38cWvGbM/w9F9Q0/WEH3TinkmrMPrP4T/w==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-ini" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-ini" "3.817.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/credential-provider-imds" "^4.0.4"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.796.0.tgz#d22d8adf73985fb218ff74365cd86b71bbd64513"
-  integrity sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw==
+"@aws-sdk/credential-provider-process@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.816.0.tgz#8fa3694b8d17d4e446de038e74d5a177d25d86f0"
+  integrity sha512-9Tm+AxMoV2Izvl5b9tyMQRbBwaex8JP06HN7ZeCXgC5sAsSN+o8dsThnEhf8jKN+uBpT6CLWKN1TXuUMrAmW1A==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.796.0.tgz#db9081637747162ed8c5b29c61a98b898eea3e99"
-  integrity sha512-RUYsQ1t6UdzkpZ7pocUt1l/9l9GCYCaopIhv0DU6CipA8rkWtoweKsLHKdv+8wE4p6gqDfDIHGam1ivswiCIzg==
+"@aws-sdk/credential-provider-sso@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.817.0.tgz#e23361a57f6aa72417847d568d7fb807a3c7ebfc"
+  integrity sha512-gFUAW3VmGvdnueK1bh6TOcRX+j99Xm0men1+gz3cA4RE+rZGNy1Qjj8YHlv0hPwI9OnTPZquvPzA5fkviGREWg==
   dependencies:
-    "@aws-sdk/client-sso" "3.796.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/token-providers" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/client-sso" "3.817.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/token-providers" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.796.0.tgz#8d19749fcf28f6603bb26a402f3f8e24797c35ba"
-  integrity sha512-dpmFJT4IyjT09vruvMu/rWQQjVreqdxAe8pLPpGhoeKyA1O6+PS73b+VNXKvD31rQT8e4g6dVpA6KMxNW63aag==
+"@aws-sdk/credential-provider-web-identity@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.817.0.tgz#7d3c9c5af5a5d17ea877feda57b92ba075df64a8"
+  integrity sha512-A2kgkS9g6NY0OMT2f2EdXHpL17Ym81NhbGnQ8bRXPqESIi7TFypFD2U6osB2VnsFv+MhwM+Ke4PKXSmLun22/A==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.796.0.tgz#60a9544366a08e6e6dc69625a668cfd12b6501d9"
-  integrity sha512-thZw44Bk3pS0PW81QmPfNSliX5XfXHDlWRjPYHBx+eTlPtidyD5klJkkfF5fkQlpHPeP2KNLuRnr6bRu+uMirg==
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.817.0.tgz#b8db526715d8ac61e7d4650e4f6bab669429d204"
+  integrity sha512-i6Q2MyktWHG4YG+EmLlnXTgNVjW9/yeNHSKzF55GTho5fjqfU+t9beJfuMWclanRCifamm3N5e5OCm52rVDdTQ==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.796.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.796.0"
-    "@aws-sdk/credential-provider-env" "3.796.0"
-    "@aws-sdk/credential-provider-http" "3.796.0"
-    "@aws-sdk/credential-provider-ini" "3.796.0"
-    "@aws-sdk/credential-provider-node" "3.796.0"
-    "@aws-sdk/credential-provider-process" "3.796.0"
-    "@aws-sdk/credential-provider-sso" "3.796.0"
-    "@aws-sdk/credential-provider-web-identity" "3.796.0"
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/client-cognito-identity" "3.817.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.817.0"
+    "@aws-sdk/credential-provider-env" "3.816.0"
+    "@aws-sdk/credential-provider-http" "3.816.0"
+    "@aws-sdk/credential-provider-ini" "3.817.0"
+    "@aws-sdk/credential-provider-node" "3.817.0"
+    "@aws-sdk/credential-provider-process" "3.816.0"
+    "@aws-sdk/credential-provider-sso" "3.817.0"
+    "@aws-sdk/credential-provider-web-identity" "3.817.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
+    "@smithy/credential-provider-imds" "^4.0.4"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.775.0.tgz#1bf8160b8f4f96ba30c19f9baa030a6c9bd5f94d"
-  integrity sha512-tkSegM0Z6WMXpLB8oPys/d+umYIocvO298mGvcMCncpRl77L9XkvSLJIFzaHes+o7djAgIduYw8wKIMStFss2w==
+"@aws-sdk/middleware-host-header@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.804.0.tgz#e4c2180cfc75f19c697974383324509fa104d7a3"
+  integrity sha512-bum1hLVBrn2lJCi423Z2fMUYtsbkGI2s4N+2RI2WSjvbaVyMSv/WcejIrjkqiiMR+2Y7m5exgoKeg4/TODLDPQ==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.775.0.tgz#df1909d441cd4bade8d6c7d24c41532808db0e81"
-  integrity sha512-FaxO1xom4MAoUJsldmR92nT1G6uZxTdNYOFYtdHfd6N2wcNaTuxgjIvqzg5y7QIH9kn58XX/dzf1iTjgqUStZw==
+"@aws-sdk/middleware-logger@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.804.0.tgz#9b7860d0193ec8647a1102aa6ffad070e3260513"
+  integrity sha512-w/qLwL3iq0KOPQNat0Kb7sKndl9BtceigINwBU7SpkYWX9L/Lem6f8NPEKrC9Tl4wDBht3Yztub4oRTy/horJA==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.775.0.tgz#36a40f467754d7c86424d12ef45c05e96ce3475b"
-  integrity sha512-GLCzC8D0A0YDG5u3F5U03Vb9j5tcOEFhr8oc6PDk0k0vm5VwtZOE6LvK7hcCSoAB4HXyOUM0sQuXrbaAh9OwXA==
+"@aws-sdk/middleware-recursion-detection@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.804.0.tgz#797bbe72c765e83a1d4c259db9799b77831e1fbb"
+  integrity sha512-zqHOrvLRdsUdN/ehYfZ9Tf8svhbiLLz5VaWUz22YndFv6m9qaAcijkpAOlKexsv3nLBMJdSdJ6GUTAeIy3BZzw==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.796.0.tgz#80149d7f9034d41d35de88d96a6b73c1cb06413b"
-  integrity sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw==
+"@aws-sdk/middleware-user-agent@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.816.0.tgz#6eb00bbcb44304ff9df53dbb53dc072638831760"
+  integrity sha512-bHRSlWZ0xDsFR8E2FwDb//0Ff6wMkVx4O+UKsfyNlAbtqCiiHRt5ANNfKPafr95cN2CCxLxiPvFTFVblQM5TsQ==
   dependencies:
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@smithy/core" "^3.3.3"
     "@smithy/protocol-http" "^5.1.0"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.796.0.tgz#f13f3bd87b923561348394ac6a9010d74334cb7c"
-  integrity sha512-jJ8a0ldWtXh/ice7nldUjTqja7KYlSYk1pwfIIvJLIqEn2SvQHK/pyCINTmmOmFAWXMKBQBeWUMxo1pPYNytzQ==
+"@aws-sdk/nested-clients@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.817.0.tgz#4df7ff486cb918fa567bd29581452eeac7c05055"
+  integrity sha512-vQ2E06A48STJFssueJQgxYD8lh1iGJoLJnHdshRDWOQb8gy1wVQR+a7MkPGhGR6lGoS0SCnF/Qp6CZhnwLsqsQ==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.796.0"
-    "@aws-sdk/middleware-host-header" "3.775.0"
-    "@aws-sdk/middleware-logger" "3.775.0"
-    "@aws-sdk/middleware-recursion-detection" "3.775.0"
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/region-config-resolver" "3.775.0"
-    "@aws-sdk/types" "3.775.0"
-    "@aws-sdk/util-endpoints" "3.787.0"
-    "@aws-sdk/util-user-agent-browser" "3.775.0"
-    "@aws-sdk/util-user-agent-node" "3.796.0"
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/core" "^3.2.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/middleware-host-header" "3.804.0"
+    "@aws-sdk/middleware-logger" "3.804.0"
+    "@aws-sdk/middleware-recursion-detection" "3.804.0"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/region-config-resolver" "3.808.0"
+    "@aws-sdk/types" "3.804.0"
+    "@aws-sdk/util-endpoints" "3.808.0"
+    "@aws-sdk/util-user-agent-browser" "3.804.0"
+    "@aws-sdk/util-user-agent-node" "3.816.0"
+    "@smithy/config-resolver" "^4.1.2"
+    "@smithy/core" "^3.3.3"
     "@smithy/fetch-http-handler" "^5.0.2"
     "@smithy/hash-node" "^4.0.2"
     "@smithy/invalid-dependency" "^4.0.2"
     "@smithy/middleware-content-length" "^4.0.2"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-retry" "^4.1.0"
-    "@smithy/middleware-serde" "^4.0.3"
+    "@smithy/middleware-endpoint" "^4.1.6"
+    "@smithy/middleware-retry" "^4.1.7"
+    "@smithy/middleware-serde" "^4.0.5"
     "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/node-http-handler" "^4.0.4"
     "@smithy/protocol-http" "^5.1.0"
-    "@smithy/smithy-client" "^4.2.0"
+    "@smithy/smithy-client" "^4.2.6"
     "@smithy/types" "^4.2.0"
     "@smithy/url-parser" "^4.0.2"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-body-length-browser" "^4.0.0"
     "@smithy/util-body-length-node" "^4.0.0"
-    "@smithy/util-defaults-mode-browser" "^4.0.8"
-    "@smithy/util-defaults-mode-node" "^4.0.8"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-defaults-mode-browser" "^4.0.14"
+    "@smithy/util-defaults-mode-node" "^4.0.14"
+    "@smithy/util-endpoints" "^3.0.4"
     "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/util-retry" "^4.0.3"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.775.0.tgz#592b52498e68501fe46480be3dfb185e949d1eab"
-  integrity sha512-40iH3LJjrQS3LKUJAl7Wj0bln7RFPEvUYKFxtP8a+oKFDO0F65F52xZxIJbPn6sHkxWDAnZlGgdjZXM3p2g5wQ==
+"@aws-sdk/region-config-resolver@3.808.0":
+  version "3.808.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.808.0.tgz#76b037215c39b01361b9c34b7205f0b52513607c"
+  integrity sha512-9x2QWfphkARZY5OGkl9dJxZlSlYM2l5inFeo2bKntGuwg4A4YUe5h7d5yJ6sZbam9h43eBrkOdumx03DAkQF9A==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/types" "^4.2.0"
     "@smithy/util-config-provider" "^4.0.0"
     "@smithy/util-middleware" "^4.0.2"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.796.0.tgz#c31f1d522a1df01ecf3780e72de67d2fc0c8787b"
-  integrity sha512-Sxr/EqJBxOwLsXHv8C91N/Aao8Rgjn5bcpzplrTZ7wrfDrzqQfSCvjh7apCxdLYMKPBV+an75blCAd7JD4/bAg==
+"@aws-sdk/token-providers@3.817.0":
+  version "3.817.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.817.0.tgz#138a0b4aac9ddbd16c7244a8a0618334804572c1"
+  integrity sha512-CYN4/UO0VaqyHf46ogZzNrVX7jI3/CfiuktwKlwtpKA6hjf2+ivfgHSKzPpgPBcSEfiibA/26EeLuMnB6cpSrQ==
   dependencies:
-    "@aws-sdk/nested-clients" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/core" "3.816.0"
+    "@aws-sdk/nested-clients" "3.817.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/property-provider" "^4.0.2"
     "@smithy/shared-ini-file-loader" "^4.0.2"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.775.0", "@aws-sdk/types@^3.222.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.775.0.tgz#09863a9e68c080947db7c3d226d1c56b8f0f5150"
-  integrity sha512-ZoGKwa4C9fC9Av6bdfqcW6Ix5ot05F/S4VxWR2nHuMv7hzfmAjTOcUiWT7UR4hM/U0whf84VhDtXN/DWAk52KA==
+"@aws-sdk/types@3.804.0", "@aws-sdk/types@^3.222.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.804.0.tgz#b70a734fa721450cf8a513cec0c276001a5d154f"
+  integrity sha512-A9qnsy9zQ8G89vrPPlNG9d1d8QcKRGqJKqwyGgS0dclJpwy6d1EWgQLIolKPl6vcFpLoe6avLOLxr+h8ur5wpg==
   dependencies:
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.787.0":
-  version "3.787.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.787.0.tgz#1398f0bd87f19e615ae920c73e16d9d5e5cb76d1"
-  integrity sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==
+"@aws-sdk/util-endpoints@3.808.0":
+  version "3.808.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.808.0.tgz#a3d269c4d5a6536d6387ba3cd66876f5b52ce913"
+  integrity sha512-N6Lic98uc4ADB7fLWlzx+1uVnq04VgVjngZvwHoujcRg9YDhIg9dUDiTzD5VZv13g1BrPYmvYP1HhsildpGV6w==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
-    "@smithy/util-endpoints" "^3.0.2"
+    "@smithy/util-endpoints" "^3.0.4"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
-  version "3.723.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz#174551bfdd2eb36d3c16e7023fd7e7ee96ad0fa9"
-  integrity sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.804.0.tgz#a2ee8dc5d9c98276986e8e1ba03c0c84d9afb0f5"
+  integrity sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.775.0":
-  version "3.775.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.775.0.tgz#b69a1a5548ccc6db1acb3ec115967593ece927a1"
-  integrity sha512-txw2wkiJmZKVdDbscK7VBK+u+TJnRtlUjRTLei+elZg2ADhpQxfVAQl436FUeIv6AhB/oRHW6/K/EAGXUSWi0A==
+"@aws-sdk/util-user-agent-browser@3.804.0":
+  version "3.804.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.804.0.tgz#0312fda0fd34958a1d89e7691c5b1cf41ad5549b"
+  integrity sha512-KfW6T6nQHHM/vZBBdGn6fMyG/MgX5lq82TDdX4HRQRRuHKLgBWGpKXqqvBwqIaCdXwWHgDrg2VQups6GqOWW2A==
   dependencies:
-    "@aws-sdk/types" "3.775.0"
+    "@aws-sdk/types" "3.804.0"
     "@smithy/types" "^4.2.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.796.0":
-  version "3.796.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.796.0.tgz#72c2ea1f32d2eb1200e111f48fd8a3c005f5202c"
-  integrity sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA==
+"@aws-sdk/util-user-agent-node@3.816.0":
+  version "3.816.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.816.0.tgz#c752f9bc37a973f82841c84b864e362f8ad28f68"
+  integrity sha512-Q6dxmuj4hL7pudhrneWEQ7yVHIQRBFr0wqKLF1opwOi1cIePuoEbPyJ2jkel6PDEv1YMfvsAKaRshp6eNA8VHg==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.796.0"
-    "@aws-sdk/types" "3.775.0"
-    "@smithy/node-config-provider" "^4.0.2"
+    "@aws-sdk/middleware-user-agent" "3.816.0"
+    "@aws-sdk/types" "3.804.0"
+    "@smithy/node-config-provider" "^4.1.1"
     "@smithy/types" "^4.2.0"
     tslib "^2.6.2"
 
 "@babel/cli@^7.16.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.27.0.tgz#076603b25fc7dd88298ea94ab249c8237c7e71cc"
-  integrity sha512-bZfxn8DRxwiVzDO5CEeV+7IqXeCkzI4yYnrQbpwjT76CUyossQc6RYE7n+xfm0/2k40lPaCpW0FhxYs7EBAetw==
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.27.2.tgz#d54560567a73a269b31d3201bedb70692ace8684"
+  integrity sha512-cfd7DnGlhH6OIyuPSSj3vcfIdnbXukhAyKY8NaZrFadC7pXyL9mOL5WgjcptiEJLi5k3j8aYvLIVCzezrWTaiA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     commander "^6.2.0"
@@ -464,156 +465,156 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.6.0"
 
-"@babel/code-frame@^7.26.2":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
-  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+"@babel/code-frame@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
+  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.27.1"
     js-tokens "^4.0.0"
-    picocolors "^1.0.0"
+    picocolors "^1.1.1"
 
-"@babel/compat-data@^7.26.8":
-  version "7.26.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367"
-  integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==
+"@babel/compat-data@^7.27.2":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.27.3.tgz#cc49c2ac222d69b889bf34c795f537c0c6311111"
+  integrity sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==
 
 "@babel/core@^7.16.5":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9"
-  integrity sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.3.tgz#d7d05502bccede3cab36373ed142e6a1df554c2f"
+  integrity sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.10"
-    "@babel/helper-compilation-targets" "^7.26.5"
-    "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.10"
-    "@babel/parser" "^7.26.10"
-    "@babel/template" "^7.26.9"
-    "@babel/traverse" "^7.26.10"
-    "@babel/types" "^7.26.10"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/helper-compilation-targets" "^7.27.2"
+    "@babel/helper-module-transforms" "^7.27.3"
+    "@babel/helpers" "^7.27.3"
+    "@babel/parser" "^7.27.3"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.27.3"
+    "@babel/types" "^7.27.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.26.10", "@babel/generator@^7.27.0", "@babel/generator@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.0.tgz#764382b5392e5b9aff93cadb190d0745866cbc2c"
-  integrity sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==
+"@babel/generator@^7.27.3", "@babel/generator@^7.4.0":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.3.tgz#ef1c0f7cfe3b5fc8cbb9f6cc69f93441a68edefc"
+  integrity sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==
   dependencies:
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/parser" "^7.27.3"
+    "@babel/types" "^7.27.3"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/helper-annotate-as-pure@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
-  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
+"@babel/helper-annotate-as-pure@^7.27.1":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
+  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
   dependencies:
-    "@babel/types" "^7.25.9"
+    "@babel/types" "^7.27.3"
 
-"@babel/helper-compilation-targets@^7.26.5":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz#de0c753b1cd1d9ab55d473c5a5cf7170f0a81880"
-  integrity sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==
+"@babel/helper-compilation-targets@^7.27.2":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz#46a0f6efab808d51d29ce96858dd10ce8732733d"
+  integrity sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==
   dependencies:
-    "@babel/compat-data" "^7.26.8"
-    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/compat-data" "^7.27.2"
+    "@babel/helper-validator-option" "^7.27.1"
     browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-module-imports@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
-  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
+"@babel/helper-module-imports@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz#7ef769a323e2655e126673bb6d2d6913bbead204"
+  integrity sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
-  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
+"@babel/helper-module-transforms@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
+  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
   dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.27.3"
 
-"@babel/helper-plugin-utils@^7.25.9":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
-  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+"@babel/helper-plugin-utils@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz#ddb2f876534ff8013e6c2b299bf4d39b3c51d44c"
+  integrity sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==
 
-"@babel/helper-string-parser@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
-  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+"@babel/helper-string-parser@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
+  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
-  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+"@babel/helper-validator-identifier@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
+  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
 
-"@babel/helper-validator-option@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
-  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+"@babel/helper-validator-option@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
+  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
-"@babel/helpers@^7.26.10":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.0.tgz#53d156098defa8243eab0f32fa17589075a1b808"
-  integrity sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==
+"@babel/helpers@^7.27.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.27.3.tgz#387d65d279290e22fe7a47a8ffcd2d0c0184edd0"
+  integrity sha512-h/eKy9agOya1IGuLaZ9tEUgz+uIRXcbtOhRtUyyMf8JFmn1iT13vnl/IGVWSkdOCG/pC57U4S1jnAabAavTMwg==
   dependencies:
-    "@babel/template" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
 
 "@babel/node@^7.16.5":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.26.0.tgz#4b126f4eb56a05a97990a650fae0a24ad9b0c583"
-  integrity sha512-5ASMjh42hbnqyCOK68Q5chh1jKAqn91IswFTN+niwt4FLABhEWCT1tEuuo6mlNQ4WG/oFQLvJ71PaHAKtWtJyA==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.27.1.tgz#6d213576428430368b2c3561e2659bc3991d5ce0"
+  integrity sha512-ef8ZrhxIku9LrphvyNywpiMf1UJsYQll7S4eKa228ivswPcwmObp98o5h5wL2n9FrSAuo1dsMwJ8cS1LEcBSog==
   dependencies:
-    "@babel/register" "^7.25.9"
+    "@babel/register" "^7.27.1"
     commander "^6.2.0"
     core-js "^3.30.2"
     node-environment-flags "^1.0.5"
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.26.10", "@babel/parser@^7.27.0", "@babel/parser@^7.4.3":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.0.tgz#3d7d6ee268e41d2600091cbd4e145ffee85a44ec"
-  integrity sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==
+"@babel/parser@^7.27.2", "@babel/parser@^7.27.3", "@babel/parser@^7.4.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.27.3.tgz#1b7533f0d908ad2ac545c4d05cbe2fb6dc8cfaaf"
+  integrity sha512-xyYxRj6+tLNDTWi0KCBcZ9V7yg3/lwL9DWh9Uwh/RIVlIfFidggcgxKX3GCXwCiswwcGRawBKbEg2LG/Y8eJhw==
   dependencies:
-    "@babel/types" "^7.27.0"
+    "@babel/types" "^7.27.3"
 
-"@babel/plugin-syntax-jsx@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290"
-  integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==
+"@babel/plugin-syntax-jsx@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz#2f9beb5eff30fa507c5532d107daac7b888fa34c"
+  integrity sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-transform-react-jsx@^7.16.5":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166"
-  integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
+  integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-syntax-jsx" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/register@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.25.9.tgz#1c465acf7dc983d70ccc318eb5b887ecb04f021b"
-  integrity sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==
+"@babel/register@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.27.1.tgz#ea4d701649d788d7cb8a064b7540fd21083147f1"
+  integrity sha512-K13lQpoV54LATKkzBpBAEu1GGSIRzxR9f4IN4V8DCDgiUMo2UDGagEZr3lPeVNJPLkWUi5JE4hCHKneVTwQlYQ==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -621,35 +622,35 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
-"@babel/template@^7.26.9", "@babel/template@^7.27.0", "@babel/template@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.0.tgz#b253e5406cc1df1c57dcd18f11760c2dbf40c0b4"
-  integrity sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==
+"@babel/template@^7.27.2", "@babel/template@^7.4.0":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/parser" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.10", "@babel/traverse@^7.4.3":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.0.tgz#11d7e644779e166c0442f9a07274d02cd91d4a70"
-  integrity sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.4.3":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.27.3.tgz#8b62a6c2d10f9d921ba7339c90074708509cffae"
+  integrity sha512-lId/IfN/Ye1CIu8xG7oKBHXd2iNb2aW1ilPszzGcJug6M8RCKfVNcYhpI5+bMvFYjK7lXIM0R+a+6r8xhHp2FQ==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.27.0"
-    "@babel/parser" "^7.27.0"
-    "@babel/template" "^7.27.0"
-    "@babel/types" "^7.27.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/parser" "^7.27.3"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.25.9", "@babel/types@^7.26.10", "@babel/types@^7.27.0", "@babel/types@^7.4.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559"
-  integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.4.0":
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.3.tgz#c0257bedf33aad6aad1f406d35c44758321eb3ec"
+  integrity sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==
   dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
 
 "@colors/colors@1.6.0", "@colors/colors@^1.6.0":
   version "1.6.0"
@@ -682,14 +683,14 @@
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.10.1.tgz#f30b5d74f8ebaae47c7c70eaf0f8df45eadf9f47"
-  integrity sha512-OWo1fY4ztL1/M/DUyRPShB4d/EzVfuUvPTRRHRIt/YxBrUYSz0a+JicD5F5zHFoNs2oTuWavxCOVFV1UljHTng==
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.2.tgz#b96185d05d22f9d6bde89aada2decf45a5c982ce"
+  integrity sha512-F1WTABdd8/R9D1icJzajC4IuLyyS8f3rTOz66JsSI3pKvpCAtsMBweu8cyNYsIyvcrKAVn9EPK+Psoymq+XC0A==
   dependencies:
-    "@discordjs/formatters" "^0.6.0"
+    "@discordjs/formatters" "^0.6.1"
     "@discordjs/util" "^1.1.1"
     "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.37.119"
+    discord-api-types "^0.38.1"
     fast-deep-equal "^3.1.3"
     ts-mixer "^6.0.4"
     tslib "^2.6.3"
@@ -699,12 +700,12 @@
   resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18"
   integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==
 
-"@discordjs/formatters@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.6.0.tgz#9a4ca075ab16a4823da9258bc5c39f06a2519235"
-  integrity sha512-YIruKw4UILt/ivO4uISmrGq2GdMY6EkoTtD0oS0GvkJFRZbTSdPhzYiUILbJ/QslsvC9H9nTgGgnarnIl4jMfw==
+"@discordjs/formatters@^0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.6.1.tgz#211bf3eb060d8fe7fa1f020b8be3c4adad00555a"
+  integrity sha512-5cnX+tASiPCqCWtFcFslxBVUaCetB0thvM/JyavhbXInP1HJIEU+Qv/zMrnuwSsX3yWH2lVXNJZeDK3EiP4HHg==
   dependencies:
-    discord-api-types "^0.37.114"
+    discord-api-types "^0.38.1"
 
 "@discordjs/rest@^1.3.0":
   version "1.7.1"
@@ -736,9 +737,9 @@
   integrity sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g==
 
 "@duosecurity/duo_universal@*":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.0.3.tgz#0da272976b807d4e1d0f147ae3eb081b0cf83fff"
-  integrity sha512-PboNVOzDABhPQcNimCHmHeod9XHz+YADUfBv7xSWhftwIZDidWoVpydbQLosom0V9dj3vlvMbSukXtfwK/brTQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz#05312e7bf7557625145e7e243a7ece2385853dcf"
+  integrity sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==
   dependencies:
     axios "^1.2.2"
     jsonwebtoken "^9.0.0"
@@ -829,9 +830,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.0.tgz#a8a2b61d5069ba23ff2a1b98eac78d15a904a40f"
-  integrity sha512-88uZ+jLsp1aVMj7gh3EKYH1aulTAMFAp8sH/v5a9w8q8iqSG27RiWLoxSAFr/XocZ9hGiWH1kEnBw+zl3xAgNA==
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.1.tgz#fbdb99f1e263889fc1c259986238404e7a480136"
+  integrity sha512-ZxOdH8Wr01hBDvKCQfMWqwUcfNcN3JY19k1LtS1fTFhEyorYPLsbWN+VxIRL46pOYGHTPkU3Or5HbT/SLQM5nA==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -879,9 +880,9 @@
     uuid "^8.0.0"
 
 "@grpc/grpc-js@^1.10.9":
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.3.tgz#6ad08d186c2a8651697085f790c5c68eaca45904"
-  integrity sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg==
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.13.4.tgz#922fbc496e229c5fa66802d2369bf181c1df1c5a"
+  integrity sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==
   dependencies:
     "@grpc/proto-loader" "^0.7.13"
     "@js-sdsl/ordered-map" "^4.4.2"
@@ -957,6 +958,13 @@
   resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
   integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
+"@mongodb-js/saslprep@^1.1.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.2.2.tgz#09506f29cc2a99d9d7b951caa7fffc87e522a6d3"
+  integrity sha512-EB0O3SCSNRUFk66iRCpI+cXzIjdswfCs7F6nOC3RAGJ7xr5YhaicvsRwJ9eyzYvYRlCSDUO/c7g4yNulxKC1WA==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@mysql/xdevapi@8.0.33":
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.33.tgz#966f71563a2e2a27cb5279fdf72fa9ee41538ec2"
@@ -1186,77 +1194,77 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.2.tgz#36a23e8cc65fc03cacb6afa35dfbfd319c560c6b"
-  integrity sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==
+"@smithy/abort-controller@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.0.3.tgz#53a53dabc5a46fec70857acb07653d658c79b916"
+  integrity sha512-AqXFf6DXnuRBXy4SoK/n1mfgHaKaq36bmkphmD1KO0nHq6xK/g9KHSW4HEsPQUBCGdIEfuJifGHwxFXPIFay9Q==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.0.tgz#de1043cbd75f05d99798b0fbcfdaf4b89b0f2f41"
-  integrity sha512-8smPlwhga22pwl23fM5ew4T9vfLUCeFXlcqNOCD5M5h8VmNPNUE9j6bQSuRXpDSV11L/E/SwEBQuW8hr6+nS1A==
+"@smithy/config-resolver@^4.1.2", "@smithy/config-resolver@^4.1.3":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.1.3.tgz#d883b2edaa05594cb7f002b2e1d4c5b495c1be42"
+  integrity sha512-N5e7ofiyYDmHxnPnqF8L4KtsbSDwyxFRfDK9bp1d9OyPO4ytRLd0/XxCqi5xVaaqB65v4woW8uey6jND6zxzxQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-config-provider" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/util-middleware" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/core@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.2.0.tgz#613b15f76eab9a6be396b1d5453b6bc8f22ba99c"
-  integrity sha512-k17bgQhVZ7YmUvA8at4af1TDpl0NDMBuBKJl8Yg0nrefwmValU+CnA5l/AriVdQNthU/33H3nK71HrLgqOPr1Q==
+"@smithy/core@^3.3.3", "@smithy/core@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.4.0.tgz#e8f4c93d138e68bfc76d43a63429b2b276987d19"
+  integrity sha512-dDYISQo7k0Ml/rXlFIjkTmTcQze/LxhtIRAEmZ6HJ/EI0inVxVEVnrUXJ7jPx6ZP0GHUhFm40iQcCgS5apXIXA==
   dependencies:
-    "@smithy/middleware-serde" "^4.0.3"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/middleware-serde" "^4.0.6"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-body-length-browser" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-stream" "^4.2.0"
+    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-stream" "^4.2.1"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.2.tgz#1ec34a04842fa69996b151a695b027f0486c69a8"
-  integrity sha512-32lVig6jCaWBHnY+OEQ6e6Vnt5vDHaLiydGrwYMW9tPqO688hPGTYRamYJ1EptxEC2rAwJrHWmPoKRBl4iTa8w==
+"@smithy/credential-provider-imds@^4.0.4", "@smithy/credential-provider-imds@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.5.tgz#d44989d783300af37b2be2fc4ec29cdb67540c32"
+  integrity sha512-saEAGwrIlkb9XxX/m5S5hOtzjoJPEK6Qw2f9pYTbIsMPOFyGSXBBTw95WbOyru8A1vIS2jVCCU1Qhz50QWG3IA==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/types" "^4.3.0"
+    "@smithy/url-parser" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.2.tgz#9d3cacf044aa9573ab933f445ab95cddb284813d"
-  integrity sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==
+"@smithy/fetch-http-handler@^5.0.2", "@smithy/fetch-http-handler@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.3.tgz#4db3296bbacd6ddfdc9f8b8b2a6fb52d201dace3"
+  integrity sha512-yBZwavI31roqTndNI7ONHqesfH01JmjJK6L3uUpZAhyAmr86LN5QiPzfyZGIxQmed8VEK2NRSQT3/JX5V1njfQ==
   dependencies:
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/querystring-builder" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/querystring-builder" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-base64" "^4.0.0"
     tslib "^2.6.2"
 
 "@smithy/hash-node@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.2.tgz#a34fe5a33b067d754ca63302b9791778f003e437"
-  integrity sha512-VnTpYPnRUE7yVhWozFdlxcYknv9UN7CeOqSrMH+V877v4oqtVYuoqhIhtSjmGPvYrYnAkaM61sLMKHvxL138yg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.0.3.tgz#262367c0cb80f9975bdb96e945067dd1f04cdef2"
+  integrity sha512-W5Uhy6v/aYrgtjh9y0YP332gIQcwccQ+EcfWhllL0B9rPae42JngTTUpb8W6wuxaNFzqps4xq5klHckSSOy5fw==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
 "@smithy/invalid-dependency@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.2.tgz#e9b1c5e407d795f10a03afba90e37bccdc3e38f7"
-  integrity sha512-GatB4+2DTpgWPday+mnUkoumP54u/MDM/5u44KF9hIu8jF0uafZtQLcdfIKkIcUNuF/fBojpLEHZS/56JqPeXQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.0.3.tgz#045edee05cc380c06ffdf8cc1a81d54005c1e134"
+  integrity sha512-1Bo8Ur1ZGqxvwTqBmv6DZEn0rXtwJGeqiiO2/JFcCtz3nBakOqeXbJBElXJMMzd0ghe8+eB6Dkw98nMYctgizg==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1274,169 +1282,170 @@
     tslib "^2.6.2"
 
 "@smithy/middleware-content-length@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.2.tgz#ff78658e8047ad7038f58478cf8713ee2f6ef647"
-  integrity sha512-hAfEXm1zU+ELvucxqQ7I8SszwQ4znWMbNv6PLMndN83JJN41EPuS93AIyh2N+gJ6x8QFhzSO6b7q2e6oClDI8A==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.0.3.tgz#6ca78cda6569e9c0a2b4f788729f874a461b8554"
+  integrity sha512-NE/Zph4BP5u16bzYq2csq9qD0T6UBLeg4AuNrwNJ7Gv9uLYaGEgelZUOdRndGdMGcUfSGvNlXGb2aA2hPCwJ6g==
   dependencies:
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.0.tgz#cbfe47c5632942c960dbcf71fb02fd0d9985444d"
-  integrity sha512-xhLimgNCbCzsUppRTGXWkZywksuTThxaIB0HwbpsVLY5sceac4e1TZ/WKYqufQLaUy+gUSJGNdwD2jo3cXL0iA==
+"@smithy/middleware-endpoint@^4.1.6", "@smithy/middleware-endpoint@^4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.7.tgz#7b15fc81171dc879c9d9c8f5297d4939d0f6a234"
+  integrity sha512-KDzM7Iajo6K7eIWNNtukykRT4eWwlHjCEsULZUaSfi/SRSBK8BPRqG5FsVfp58lUxcvre8GT8AIPIqndA0ERKw==
   dependencies:
-    "@smithy/core" "^3.2.0"
-    "@smithy/middleware-serde" "^4.0.3"
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
-    "@smithy/url-parser" "^4.0.2"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/core" "^3.4.0"
+    "@smithy/middleware-serde" "^4.0.6"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/shared-ini-file-loader" "^4.0.3"
+    "@smithy/types" "^4.3.0"
+    "@smithy/url-parser" "^4.0.3"
+    "@smithy/util-middleware" "^4.0.3"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.0.tgz#338ac1e025bbc6fd7b008152c4efa8bc0591acc9"
-  integrity sha512-2zAagd1s6hAaI/ap6SXi5T3dDwBOczOMCSkkYzktqN1+tzbk1GAsHNAdo/1uzxz3Ky02jvZQwbi/vmDA6z4Oyg==
+"@smithy/middleware-retry@^4.1.7":
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.8.tgz#1b6123ef5ad4ea9e55d6e4a0d1912c238d019e05"
+  integrity sha512-e2OtQgFzzlSG0uCjcJmi02QuFSRTrpT11Eh2EcqqDFy7DYriteHZJkkf+4AsxsrGDugAtPFcWBz1aq06sSX5fQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/service-error-classification" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-middleware" "^4.0.2"
-    "@smithy/util-retry" "^4.0.2"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/service-error-classification" "^4.0.4"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
+    "@smithy/util-middleware" "^4.0.3"
+    "@smithy/util-retry" "^4.0.4"
     tslib "^2.6.2"
     uuid "^9.0.1"
 
-"@smithy/middleware-serde@^4.0.3":
+"@smithy/middleware-serde@^4.0.5", "@smithy/middleware-serde@^4.0.6":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.6.tgz#76e8523b48f2402ccef97b6764d9cfe35e7df669"
+  integrity sha512-YECyl7uNII+jCr/9qEmCu8xYL79cU0fqjo0qxpcVIU18dAPHam/iYwcknAu4Jiyw1uN+sAx7/SMf/Kmef/Jjsg==
+  dependencies:
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.0.2", "@smithy/middleware-stack@^4.0.3":
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.0.3.tgz#b90ef1065ad9dc0b54c561fae73c8a5792d145e3"
-  integrity sha512-rfgDVrgLEVMmMn0BI8O+8OVr6vXzjV7HZj57l0QxslhzbvVfikZbVfBVthjLHqib4BW44QhcIgJpvebHlRaC9A==
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.3.tgz#4231f41e05f63d088644bc829b182850f5a9ee59"
+  integrity sha512-baeV7t4jQfQtFxBADFmnhmqBmqR38dNU5cvEgHcMK/Kp3D3bEI0CouoX2Sr/rGuntR+Eg0IjXdxnGGTc6SbIkw==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-stack@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.0.2.tgz#ca7bc3eedc7c1349e2cf94e0dc92a68d681bef18"
-  integrity sha512-eSPVcuJJGVYrFYu2hEq8g8WWdJav3sdrI4o2c6z/rjnYDd3xH9j9E7deZQCzFn4QvGPouLngH3dQ+QVTxv5bOQ==
+"@smithy/node-config-provider@^4.1.1", "@smithy/node-config-provider@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.1.2.tgz#6397998db6741ada1f9ee1bf6665190b02d68084"
+  integrity sha512-SUvNup8iU1v7fmM8XPk+27m36udmGCfSz+VZP5Gb0aJ3Ne0X28K/25gnsrg3X1rWlhcnhzNUUysKW/Ied46ivQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/shared-ini-file-loader" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-config-provider@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.0.2.tgz#017ba626828bced0fa588e795246e5468632f3ef"
-  integrity sha512-WgCkILRZfJwJ4Da92a6t3ozN/zcvYyJGUTmfGbgS/FkCcoCjl7G4FJaCDN1ySdvLvemnQeo25FdkyMSTSwulsw==
+"@smithy/node-http-handler@^4.0.4", "@smithy/node-http-handler@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.5.tgz#7d825f35d8e006a2662b7237eb7d369430883140"
+  integrity sha512-T7QglZC1vS7SPT44/1qSIAQEx5bFKb3LfO6zw/o4Xzt1eC5HNoH1TkS4lMYA9cWFbacUhx4hRl/blLun4EOCkg==
   dependencies:
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/shared-ini-file-loader" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/abort-controller" "^4.0.3"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/querystring-builder" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.4.tgz#aa583d201c1ee968170b65a07f06d633c214b7a1"
-  integrity sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==
+"@smithy/property-provider@^4.0.2", "@smithy/property-provider@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.3.tgz#cefeb7bc7a8baaeec9f68e82c3164141703a15d5"
+  integrity sha512-Wcn17QNdawJZcZZPBuMuzyBENVi1AXl4TdE0jvzo4vWX2x5df/oMlmr/9M5XAAC6+yae4kWZlOYIsNsgDrMU9A==
   dependencies:
-    "@smithy/abort-controller" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/querystring-builder" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/property-provider@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.0.2.tgz#4572c10415c9d4215f3df1530ba61b0319b17b55"
-  integrity sha512-wNRoQC1uISOuNc2s4hkOYwYllmiyrvVXWMtq+TysNRVQaHm4yoafYQyjN/goYZS+QbYlPIbb/QRjaUZMuzwQ7A==
+"@smithy/protocol-http@^5.1.0", "@smithy/protocol-http@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.1.tgz#95d998526cd806b7902b0440c3f25188945a2e2c"
+  integrity sha512-Vsay2mzq05DwNi9jK01yCFtfvu9HimmgC7a4HTs7lhX12Sx8aWsH0mfz6q/02yspSp+lOB+Q2HJwi4IV2GKz7A==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/protocol-http@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.1.0.tgz#ad34e336a95944785185234bebe2ec8dbe266936"
-  integrity sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==
+"@smithy/querystring-builder@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.3.tgz#056a17082e0a0ab10c817380d96321a8bba588fd"
+  integrity sha512-UUzIWMVfPmDZcOutk2/r1vURZqavvQW0OHvgsyNV0cKupChvqg+/NKPRMaMEe+i8tP96IthMFeZOZWpV+E4RAw==
   dependencies:
-    "@smithy/types" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.0.2.tgz#834cea95bf413ab417bf9c166d60fd80d2cb3016"
-  integrity sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==
-  dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-uri-escape" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.2.tgz#d80c5afb740e12ad8b4d4f58415e402c69712479"
-  integrity sha512-v6w8wnmZcVXjfVLjxw8qF7OwESD9wnpjp0Dqry/Pod0/5vcEA3qxCr+BhbOHlxS8O+29eLpT3aagxXGwIoEk7Q==
+"@smithy/querystring-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.0.3.tgz#ac8b26a23b7b9423734620cd025b5963bad764ae"
+  integrity sha512-K5M4ZJQpFCblOJ5Oyw7diICpFg1qhhR47m2/5Ef1PhGE19RaIZf50tjYFrxa6usqcuXyTiFPGo4d1geZdH4YcQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/service-error-classification@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.2.tgz#96740ed8be7ac5ad7d6f296d4ddf3f66444b8dcc"
-  integrity sha512-LA86xeFpTKn270Hbkixqs5n73S+LVM0/VZco8dqd+JT75Dyx3Lcw/MraL7ybjmz786+160K8rPOmhsq0SocoJQ==
+"@smithy/service-error-classification@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.0.4.tgz#63aef3b40db39ef7f04f4ffcca8bf4ef57ff5b23"
+  integrity sha512-W5ScbQ1bTzgH91kNEE2CvOzM4gXlDOqdow4m8vMFSIXCel2scbHwjflpVNnC60Y3F1m5i7w2gQg9lSnR+JsJAA==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
 
-"@smithy/shared-ini-file-loader@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.2.tgz#15043f0516fe09ff4b22982bc5f644dc701ebae5"
-  integrity sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==
+"@smithy/shared-ini-file-loader@^4.0.2", "@smithy/shared-ini-file-loader@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.3.tgz#23fab0e773630b0817846c52c54b435ac32a4dd0"
+  integrity sha512-vHwlrqhZGIoLwaH8vvIjpHnloShqdJ7SUPNM2EQtEox+yEDFTVQ7E+DLZ+6OhnYEgFUwPByJyz6UZaOu2tny6A==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/signature-v4@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.0.tgz#2c56e5b278482b04383d84ea2c07b7f0a8eb8f63"
-  integrity sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.1.1.tgz#c9f6522936a427c689dd78d7ebf2e69faf286206"
+  integrity sha512-zy8Repr5zvT0ja+Tf5wjV/Ba6vRrhdiDcp/ww6cvqYbSEudIkziDe3uppNRlFoCViyJXdPnLcwyZdDLA4CHzSg==
   dependencies:
     "@smithy/is-array-buffer" "^4.0.0"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-hex-encoding" "^4.0.0"
-    "@smithy/util-middleware" "^4.0.2"
+    "@smithy/util-middleware" "^4.0.3"
     "@smithy/util-uri-escape" "^4.0.0"
     "@smithy/util-utf8" "^4.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.2.0.tgz#0c64cae4fb5bb4f26386e9b2c33fc9a3c24c9df3"
-  integrity sha512-Qs65/w30pWV7LSFAez9DKy0Koaoh3iHhpcpCCJ4waj/iqwsuSzJna2+vYwq46yBaqO5ZbP9TjUsATUNxrKeBdw==
+"@smithy/smithy-client@^4.2.6", "@smithy/smithy-client@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.3.0.tgz#05d2fa958ffbb9256c777a11b380aeba199295b3"
+  integrity sha512-DNsRA38pN6tYHUjebmwD9e4KcgqTLldYQb2gC6K+oxXYdCTxPn6wV9+FvOa6wrU2FQEnGJoi+3GULzOTKck/tg==
   dependencies:
-    "@smithy/core" "^3.2.0"
-    "@smithy/middleware-endpoint" "^4.1.0"
-    "@smithy/middleware-stack" "^4.0.2"
-    "@smithy/protocol-http" "^5.1.0"
-    "@smithy/types" "^4.2.0"
-    "@smithy/util-stream" "^4.2.0"
+    "@smithy/core" "^3.4.0"
+    "@smithy/middleware-endpoint" "^4.1.7"
+    "@smithy/middleware-stack" "^4.0.3"
+    "@smithy/protocol-http" "^5.1.1"
+    "@smithy/types" "^4.3.0"
+    "@smithy/util-stream" "^4.2.1"
     tslib "^2.6.2"
 
-"@smithy/types@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.2.0.tgz#e7998984cc54b1acbc32e6d4cf982c712e3d26b6"
-  integrity sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==
+"@smithy/types@^4.2.0", "@smithy/types@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.3.0.tgz#80a0da5ac907cfe9e97e89814bc7502626451580"
+  integrity sha512-+1iaIQHthDh9yaLhRzaoQxRk+l9xlk+JjMFxGRhNLz+m9vKOkjNeU8QuB4w3xvzHyVR/BVlp/4AXDHjoRIkfgQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.2.tgz#a316f7d8593ffab796348bc5df96237833880713"
-  integrity sha512-Bm8n3j2ScqnT+kJaClSVCMeiSenK6jVAzZCNewsYWuZtnBehEz4r2qP0riZySZVfzB+03XZHJeqfmJDkeeSLiQ==
+"@smithy/url-parser@^4.0.2", "@smithy/url-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.0.3.tgz#ab0920cc98205f438a3064fb85161bc3c50625b4"
+  integrity sha512-n5/DnosDu/tweOqUUNtUbu7eRIR4J/Wz9nL7V5kFYQQVb8VYdj7a4G5NJHCw6o21ul7CvZoJkOpdTnsQDLT0tQ==
   dependencies:
-    "@smithy/querystring-parser" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/querystring-parser" "^4.0.3"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-base64@^4.0.0":
@@ -1485,37 +1494,37 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.8.tgz#77bc4590cdc928901b80f3482e79607a2cbcb150"
-  integrity sha512-ZTypzBra+lI/LfTYZeop9UjoJhhGRTg3pxrNpfSTQLd3AJ37r2z4AXTKpq1rFXiiUIJsYyFgNJdjWRGP/cbBaQ==
+"@smithy/util-defaults-mode-browser@^4.0.14":
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.15.tgz#4a76a59f2af347189bef0f49295004e0156667ac"
+  integrity sha512-bJJ/B8owQbHAflatSq92f9OcV8858DJBQF1Y3GRjB8psLyUjbISywszYPFw16beREHO/C3I3taW4VGH+tOuwrQ==
   dependencies:
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.0.8":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.8.tgz#123b517efe6434977139b341d1f64b5f1e743aac"
-  integrity sha512-Rgk0Jc/UDfRTzVthye/k2dDsz5Xxs9LZaKCNPgJTRyoyBoeiNCnHsYGOyu1PKN+sDyPnJzMOz22JbwxzBp9NNA==
+"@smithy/util-defaults-mode-node@^4.0.14":
+  version "4.0.15"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.15.tgz#60383794aa743776db1ac9e24d2e03aefae508d4"
+  integrity sha512-8CUrEW2Ni5q+NmYkj8wsgkfqoP7l4ZquptFbq92yQE66xevc4SxqP2zH6tMtN158kgBqBDsZ+qlrRwXWOjCR8A==
   dependencies:
-    "@smithy/config-resolver" "^4.1.0"
-    "@smithy/credential-provider-imds" "^4.0.2"
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/property-provider" "^4.0.2"
-    "@smithy/smithy-client" "^4.2.0"
-    "@smithy/types" "^4.2.0"
+    "@smithy/config-resolver" "^4.1.3"
+    "@smithy/credential-provider-imds" "^4.0.5"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/property-provider" "^4.0.3"
+    "@smithy/smithy-client" "^4.3.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.2.tgz#6933a0d6d4a349523ef71ca9540c9c0b222b559e"
-  integrity sha512-6QSutU5ZyrpNbnd51zRTL7goojlcnuOB55+F9VBD+j8JpRY50IGamsjlycrmpn8PQkmJucFW8A0LSfXj7jjtLQ==
+"@smithy/util-endpoints@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.0.5.tgz#92ce03a97c29f60b2e46df161797df88ec262f2d"
+  integrity sha512-PjDpqLk24/vAl340tmtCA++Q01GRRNH9cwL9qh46NspAX9S+IQVcK+GOzPt0GLJ6KYGyn8uOgo2kvJhiThclJw==
   dependencies:
-    "@smithy/node-config-provider" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/node-config-provider" "^4.1.2"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-hex-encoding@^4.0.0":
@@ -1525,31 +1534,31 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.2.tgz#272f1249664e27068ef0d5f967a233bf7b77962c"
-  integrity sha512-6GDamTGLuBQVAEuQ4yDQ+ti/YINf/MEmIegrEeg7DdB/sld8BX1lqt9RRuIcABOhAGTA50bRbPzErez7SlDtDQ==
+"@smithy/util-middleware@^4.0.2", "@smithy/util-middleware@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.0.3.tgz#bb4176241ce0df21623a3c402ce55f94903f8161"
+  integrity sha512-iIsC6qZXxkD7V3BzTw3b1uK8RVC1M8WvwNxK1PKrH9FnxntCd30CSunXjL/8iJBE8Z0J14r2P69njwIpRG4FBQ==
   dependencies:
-    "@smithy/types" "^4.2.0"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.2.tgz#9b64cf460d63555884e641721d19e3c0abff8ee6"
-  integrity sha512-Qryc+QG+7BCpvjloFLQrmlSd0RsVRHejRXd78jNO3+oREueCjwG1CCEH1vduw/ZkM1U9TztwIKVIi3+8MJScGg==
+"@smithy/util-retry@^4.0.3", "@smithy/util-retry@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.0.4.tgz#4e372f83aa83170eb95bc35a60be827555f90208"
+  integrity sha512-Aoqr9W2jDYGrI6OxljN8VmLDQIGO4VdMAUKMf9RGqLG8hn6or+K41NEy1Y5dtum9q8F7e0obYAuKl2mt/GnpZg==
   dependencies:
-    "@smithy/service-error-classification" "^4.0.2"
-    "@smithy/types" "^4.2.0"
+    "@smithy/service-error-classification" "^4.0.4"
+    "@smithy/types" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.0.tgz#85f85516b0042726162bf619caa3358332195652"
-  integrity sha512-Vj1TtwWnuWqdgQI6YTUF5hQ/0jmFiOYsc51CSMgj7QfyO+RF4EnT2HNjoviNlOOmgzgvf3f5yno+EiC4vrnaWQ==
+"@smithy/util-stream@^4.2.0", "@smithy/util-stream@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.1.tgz#bc5358c4e1d5027b11411333f3190b7d5c104316"
+  integrity sha512-W3IR0x5DY6iVtjj5p902oNhD+Bz7vs5S+p6tppbPa509rV9BdeXZjGuRSCtVEad9FA0Mba+tNUtUmtnSI1nwUw==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.0.2"
-    "@smithy/node-http-handler" "^4.0.4"
-    "@smithy/types" "^4.2.0"
+    "@smithy/fetch-http-handler" "^5.0.3"
+    "@smithy/node-http-handler" "^4.0.5"
+    "@smithy/types" "^4.3.0"
     "@smithy/util-base64" "^4.0.0"
     "@smithy/util-buffer-from" "^4.0.0"
     "@smithy/util-hex-encoding" "^4.0.0"
@@ -1625,9 +1634,9 @@
     "@types/send" "*"
 
 "@types/express@^4.17.20":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  version "4.17.22"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.22.tgz#14cfcf120f7eb56ebb8ca77b7fa9a14d21de7c96"
+  integrity sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
@@ -1675,9 +1684,9 @@
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
 "@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.15.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.0.tgz#5fcf430c079da64e96028b87cbffc218a02685db"
-  integrity sha512-99S8dWD2DkeE6PBaEDw+In3aar7hdoBvjyJMR6vaKBTzpvR0P00ClzJMOoVrj9D2+Sy/YCwACYHnBTpMhg1UCA==
+  version "22.15.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.24.tgz#3b31f1650571c0123388db29d95c12e6f6761744"
+  integrity sha512-w9CZGm9RDjzTh/D+hFwlBJ3ziUaVw7oufKA3vOFSOZlzmW9AkZnfjPb+DLnrV6qtgL/LNmP0/2zBNCFHL3F0ng==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1687,9 +1696,9 @@
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/qs@*":
-  version "6.9.18"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2"
-  integrity sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
+  integrity sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==
 
 "@types/range-parser@*":
   version "1.2.7"
@@ -2557,9 +2566,9 @@ bluebird@^3.5.0:
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bn.js@^4.0.0:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.1.tgz#215741fe3c9dba2d7e12c001d0cfdbae43975ba7"
-  integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
+  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
 
 body-parser@1.20.3:
   version "1.20.3"
@@ -2619,21 +2628,21 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.24.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
-  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+  version "4.25.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
+  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
   dependencies:
-    caniuse-lite "^1.0.30001688"
-    electron-to-chromium "^1.5.73"
+    caniuse-lite "^1.0.30001718"
+    electron-to-chromium "^1.5.160"
     node-releases "^2.0.19"
-    update-browserslist-db "^1.1.1"
+    update-browserslist-db "^1.1.3"
 
 bson@^1.1.4:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
   integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
 
-bson@^4.7.0:
+bson@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz#320f4ad0eaf5312dd9b45dc369cc48945e2a5f2e"
   integrity sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==
@@ -2650,7 +2659,7 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
-buffer-equal-constant-time@1.0.1:
+buffer-equal-constant-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
@@ -2784,10 +2793,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001688:
-  version "1.0.30001715"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz#bd325a37ad366e3fe90827d74062807a34fbaeb2"
-  integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==
+caniuse-lite@^1.0.30001718:
+  version "1.0.30001720"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz#c138cb6026d362be9d8d7b0e4bcd0183a850edfd"
+  integrity sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3096,9 +3105,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.41.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776"
-  integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==
+  version "3.42.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
+  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3282,9 +3291,9 @@ debug@3.2.7:
     ms "^2.1.1"
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
-  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
   dependencies:
     ms "^2.1.3"
 
@@ -3390,11 +3399,16 @@ detect-libc@^2.0.0:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8"
   integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==
 
-discord-api-types@^0.37.114, discord-api-types@^0.37.119, discord-api-types@^0.37.12, discord-api-types@^0.37.41:
+discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   version "0.37.120"
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
+discord-api-types@^0.38.1:
+  version "0.38.8"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.8.tgz#ad69f82c85a510c5778ca152dfa9a91b9e43d8a6"
+  integrity sha512-xuRXPD44FcbKHrQK15FS1HFlMRNJtsaZou/SVws18vQ7zHqmlxyDktMkZpyvD6gE2ctGOVYC/jUyoMMAyBWfcw==
+
 discord.js@14.6.0:
   version "14.6.0"
   resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-14.6.0.tgz#896f7540d4c6f190dffe91d2f3e9a9f7cbc8bd26"
@@ -3499,10 +3513,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.73:
-  version "1.5.142"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz#1de55d0d19b24b07768c4bfc90f41bd7f248d043"
-  integrity sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==
+electron-to-chromium@^1.5.160:
+  version "1.5.161"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz#650376bd3be7ff8e581031409fc2d4f150620b12"
+  integrity sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3576,26 +3590,26 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
-  version "1.23.9"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
-  integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
+  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
   dependencies:
     array-buffer-byte-length "^1.0.2"
     arraybuffer.prototype.slice "^1.0.4"
     available-typed-arrays "^1.0.7"
     call-bind "^1.0.8"
-    call-bound "^1.0.3"
+    call-bound "^1.0.4"
     data-view-buffer "^1.0.2"
     data-view-byte-length "^1.0.2"
     data-view-byte-offset "^1.0.1"
     es-define-property "^1.0.1"
     es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
+    es-object-atoms "^1.1.1"
     es-set-tostringtag "^2.1.0"
     es-to-primitive "^1.3.0"
     function.prototype.name "^1.1.8"
-    get-intrinsic "^1.2.7"
-    get-proto "^1.0.0"
+    get-intrinsic "^1.3.0"
+    get-proto "^1.0.1"
     get-symbol-description "^1.1.0"
     globalthis "^1.0.4"
     gopd "^1.2.0"
@@ -3607,21 +3621,24 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
     is-array-buffer "^3.0.5"
     is-callable "^1.2.7"
     is-data-view "^1.0.2"
+    is-negative-zero "^2.0.3"
     is-regex "^1.2.1"
+    is-set "^2.0.3"
     is-shared-array-buffer "^1.0.4"
     is-string "^1.1.1"
     is-typed-array "^1.1.15"
-    is-weakref "^1.1.0"
+    is-weakref "^1.1.1"
     math-intrinsics "^1.1.0"
-    object-inspect "^1.13.3"
+    object-inspect "^1.13.4"
     object-keys "^1.1.1"
     object.assign "^4.1.7"
     own-keys "^1.0.1"
-    regexp.prototype.flags "^1.5.3"
+    regexp.prototype.flags "^1.5.4"
     safe-array-concat "^1.1.3"
     safe-push-apply "^1.0.0"
     safe-regex-test "^1.1.0"
     set-proto "^1.0.0"
+    stop-iteration-iterator "^1.1.0"
     string.prototype.trim "^1.2.10"
     string.prototype.trimend "^1.0.9"
     string.prototype.trimstart "^1.0.8"
@@ -3630,7 +3647,7 @@ es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9:
     typed-array-byte-offset "^1.0.4"
     typed-array-length "^1.0.7"
     unbox-primitive "^1.1.0"
-    which-typed-array "^1.1.18"
+    which-typed-array "^1.1.19"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
@@ -4327,9 +4344,9 @@ google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6
     jws "^4.0.0"
 
 google-gax@^4.3.3:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.0.tgz#455c94496d80ecf0cba113b0451a883b7bcee0fd"
-  integrity sha512-zKKLeLfcYBVOzzM48Brtn4EQkKcTli9w6c1ilzFK2NbJvcd4ATD8/XqFExImvE/W5IwMlKKwa5qqVufji3ioNQ==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.1.tgz#57f8e3d893d4c708a71167cdcf47eb3afab95929"
+  integrity sha512-V6eky/xz2mcKfAd1Ioxyd6nmA61gao3n01C+YeuIwu3vzM9EDR6wcVzMSIbLMDXWeoi9SHYctXuKYC5uJUT3eQ==
   dependencies:
     "@grpc/grpc-js" "^1.10.9"
     "@grpc/proto-loader" "^0.7.13"
@@ -4573,9 +4590,9 @@ htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 http-cache-semantics@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
+  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
 
 http-errors@2.0.0:
   version "2.0.0"
@@ -4711,12 +4728,10 @@ ieee754@^1.1.13, ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-image-size@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac"
-  integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ==
-  dependencies:
-    queue "6.0.2"
+image-size@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
+  integrity sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -4975,6 +4990,11 @@ is-map@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
+
 is-number-object@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
@@ -5071,7 +5091,7 @@ is-weakmap@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
-is-weakref@^1.0.2, is-weakref@^1.1.0:
+is-weakref@^1.0.2, is-weakref@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
   integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
@@ -5322,20 +5342,20 @@ jsprim@^2.0.2:
     verror "1.10.0"
 
 jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
+  integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
   dependencies:
-    buffer-equal-constant-time "1.0.1"
+    buffer-equal-constant-time "^1.0.1"
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
 jwa@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.0.tgz#a7e9c3f29dae94027ebcaf49975c9345593410fc"
-  integrity sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
+  integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==
   dependencies:
-    buffer-equal-constant-time "1.0.1"
+    buffer-equal-constant-time "^1.0.1"
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
@@ -5890,7 +5910,7 @@ modern-syslog@1.2.0:
   dependencies:
     nan "^2.13.2"
 
-mongodb-connection-string-url@^2.5.4:
+mongodb-connection-string-url@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
   integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
@@ -5898,17 +5918,17 @@ mongodb-connection-string-url@^2.5.4:
     "@types/whatwg-url" "^8.2.1"
     whatwg-url "^11.0.0"
 
-mongodb@4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.13.0.tgz#2aa832b827e2891eb2e52e8235c201cbb4701ed2"
-  integrity sha512-+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw==
+mongodb@4.17.2:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.17.2.tgz#237c0534e36a3449bd74c6bf6d32f87a1ca7200c"
+  integrity sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==
   dependencies:
-    bson "^4.7.0"
-    mongodb-connection-string-url "^2.5.4"
+    bson "^4.7.2"
+    mongodb-connection-string-url "^2.6.0"
     socks "^2.7.1"
   optionalDependencies:
     "@aws-sdk/credential-providers" "^3.186.0"
-    saslprep "^1.0.3"
+    "@mongodb-js/saslprep" "^1.1.0"
 
 mongodb@^3.3.2:
   version "3.7.4"
@@ -6058,9 +6078,9 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 node-abi@^3.3.0:
-  version "3.74.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0"
-  integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==
+  version "3.75.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.75.0.tgz#2f929a91a90a0d02b325c43731314802357ed764"
+  integrity sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==
   dependencies:
     semver "^7.3.5"
 
@@ -6297,7 +6317,7 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.13.3:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
@@ -6678,9 +6698,9 @@ pg-cloudflare@^1.1.1:
   integrity sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==
 
 pg-connection-string@^2.7.0:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.8.5.tgz#82cefd0269cb64a09603342d9b69e8392e6eb6cd"
-  integrity sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.0.tgz#f75e06591fdd42ec7636fe2c6a03febeedbec9bf"
+  integrity sha512-P2DEBKuvh5RClafLngkAuGe9OUlFV7ebu8w1kmaaOgPcpJd1RIFh7otETfI6hAR8YupOLFTY7nuvvIn7PLciUQ==
 
 pg-int8@1.0.1:
   version "1.0.1"
@@ -6688,14 +6708,14 @@ pg-int8@1.0.1:
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
 pg-pool@^3.8.0:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.9.5.tgz#73ee76bacc51f4bef5f9928a107ff15c98275fae"
-  integrity sha512-DxyAlOgvUzRFpFAZjbCc8fUfG7BcETDHgepFPf724B0i08k9PAiZV1tkGGgQIL0jbMEuR9jW1YN7eX+WgXxCsQ==
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.0.tgz#134b0213755c5e7135152976488aa7cd7ee1268d"
+  integrity sha512-DzZ26On4sQ0KmqnO34muPcmKbhrjmyiO4lCCR0VwEd7MjmiKf5NTg/6+apUEu0NF7ESa37CGzFxH513CoUmWnA==
 
 pg-protocol@^1.8.0:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.9.5.tgz#e544eff37d6ab79c26281d7c0b59ac9be4862686"
-  integrity sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.0.tgz#a473afcbb1c6e5dc3ac24869ba3dd563f8a1ae1b"
+  integrity sha512-IpdytjudNuLv8nhlHs/UrVBhU0e78J0oIS/0AVdTbWxSOkFUVdsHC/NrorO6nXsQNDTT1kzDSOMJubBQviX18Q==
 
 pg-types@^2.1.0:
   version "2.2.0"
@@ -6728,7 +6748,7 @@ pgpass@1.x:
   dependencies:
     split2 "^4.1.0"
 
-picocolors@^1.0.0, picocolors@^1.1.1:
+picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -6894,9 +6914,9 @@ proto3-json-serializer@^2.0.2:
     protobufjs "^7.2.5"
 
 protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.0.tgz#a317ad80713e9db43c8e55afa8636a9aa76bb630"
-  integrity sha512-Z2E/kOY1QjoMlCytmexzYfDm/w5fKAiRwpSzGtdnXW1zC88Z2yXazHHrOtwCzn+7wSxyE8PYM4rvVcMphF9sOA==
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.3.tgz#13f95a9e3c84669995ec3652db2ac2fb00b89363"
+  integrity sha512-sildjKwVqOI2kmFDiXQ6aEB0fjYTafpEvIBs8tOR8qI4spuL9OPROLVu2qZqi/xgCfsHIwVqlaF8JBjWFHnKbw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -6998,13 +7018,6 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -7123,9 +7136,9 @@ readline2@^1.0.1:
     mute-stream "0.0.5"
 
 real-cancellable-promise@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.1.tgz#a6cc6c887597e44426c157534ca739ae148cbc30"
-  integrity sha512-JwhiWJTMMyzFYfpKsiSb8CyQktCi1MZ8ZBn3wXvq28qXDh8Y5dM7RYzgW3r6SV22JTEcof8pRsvDp4GxLmGIxg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.2.tgz#fef5dc64c99749d9640ab63fe6f32a37fc7b29b2"
+  integrity sha512-Qh1RvIGdekUCv/ZkK9IiAkah2/Q++p66KHe6TSgHnx4QSbr5vCo3qDoszqRO1TSH+6h6HI5aDVBVrQCQBGj44Q==
 
 reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
   version "1.0.10"
@@ -7151,7 +7164,7 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regexp.prototype.flags@^1.5.3:
+regexp.prototype.flags@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
   integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
@@ -7408,7 +7421,7 @@ saslmechanisms@^0.1.1:
   resolved "https://registry.yarnpkg.com/saslmechanisms/-/saslmechanisms-0.1.1.tgz#478be1429500fcfaa780be88b3343ced7d2a9182"
   integrity sha512-pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==
 
-saslprep@1.0.3, saslprep@^1.0.0, saslprep@^1.0.3:
+saslprep@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
   integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
@@ -7437,7 +7450,7 @@ scmp@^2.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@7.7.1, semver@^7.3.5, semver@^7.5.4:
+semver@7.7.1:
   version "7.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
   integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
@@ -7447,6 +7460,11 @@ semver@^6.0.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.3.5, semver@^7.5.4:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -7814,6 +7832,14 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+stop-iteration-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
+  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
+  dependencies:
+    es-errors "^1.3.0"
+    internal-slot "^1.1.0"
+
 store2@^2.13.0:
   version "2.14.4"
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242"
@@ -8054,9 +8080,9 @@ syslog@0.1.1-1:
   integrity sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg==
 
 tar-fs@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
-  integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
+  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
@@ -8475,7 +8501,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.1.1:
+update-browserslist-db@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
   integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
@@ -8799,7 +8825,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.16, which-typed-array@^1.1.18, which-typed-array@^1.1.2:
+which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
   integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
@@ -8946,9 +8972,9 @@ ws@^7.4.6:
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
-  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
+  version "8.18.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.2.tgz#42738b2be57ced85f46154320aabb51ab003705a"
+  integrity sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==
 
 xml-crypto@^2.1.3:
   version "2.1.6"

From 1d38981ba5264f5de1530d9762fcf2eb1dd8e128 Mon Sep 17 00:00:00 2001
From: Bryan Lai <bryanlais@gmail.com>
Date: Thu, 29 May 2025 15:43:00 +0800
Subject: [PATCH 0173/1497] wol: build on aarch64-darwin

---
 pkgs/by-name/wo/wol/macos-10_7-getline.patch | 64 ++++++++++++++++++++
 pkgs/by-name/wo/wol/package.nix              |  7 ++-
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/wo/wol/macos-10_7-getline.patch

diff --git a/pkgs/by-name/wo/wol/macos-10_7-getline.patch b/pkgs/by-name/wo/wol/macos-10_7-getline.patch
new file mode 100644
index 000000000000..07ff7ff26a09
--- /dev/null
+++ b/pkgs/by-name/wo/wol/macos-10_7-getline.patch
@@ -0,0 +1,64 @@
+From f78508f9803de42faf6e578d89ce08ea31a62b0d Mon Sep 17 00:00:00 2001
+From: Bryan Lai <bryanlais@gmail.com>
+Date: Thu, 29 May 2025 15:38:11 +0800
+Subject: [PATCH] fix: build for darwin (conflicting getline)
+
+Previously failing with:
+
+  In file included from getpass4.c:7:
+  ./getline.h:32:1: error: conflicting types for 'getline'
+     32 | getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+        | ^
+  /nix/store/w41ks2baj649algkjnbh9746cprrnr1k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:355:9: note: previous declaration is here
+    355 | ssize_t getline(char ** __restrict __linep, size_t * __restrict __linecapp, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+        |         ^
+  In file included from getpass4.c:7:
+  ./getline.h:35:1: error: conflicting types for 'getdelim'
+     35 | getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+        | ^
+  /nix/store/w41ks2baj649algkjnbh9746cprrnr1k-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:354:9: note: previous declaration is here
+    354 | ssize_t getdelim(char ** __restrict __linep, size_t * __restrict __linecapp, int __delimiter, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+        |         ^
+  4 warnings generated.
+  2 errors generated.
+---
+ configure.ac  | 2 +-
+ lib/getline.h | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 99dc73d..fd0b0dc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,7 +193,7 @@ gl_MD5 dnl for GNU md5
+ AM_FUNC_GETLINE dnl for GNU getline
+ AC_CHECK_FUNCS(usleep)
+ AC_CHECK_FUNCS(getopt_long) dnl for GNU getopt
+-AC_CHECK_FUNCS(getdelim)
++AC_CHECK_FUNCS([getline getdelim])
+ AC_CHECK_FUNC(inet_aton, [], [
+ 	dnl check libresolv for inet_aton() as seen on solaris
+ 	AC_CHECK_LIB(resolv, inet_aton,
+diff --git a/lib/getline.h b/lib/getline.h
+index 991184c..34a0247 100644
+--- a/lib/getline.h
++++ b/lib/getline.h
+@@ -28,11 +28,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+ # endif
+ 
+ # if __GLIBC__ < 2
++
++#include "config.h"
++#ifndef HAVE_GETLINE
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
++#endif
+ 
++#ifndef HAVE_GETDELIM
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
++#endif
++
+ # endif
+ 
+ #endif /* not GETLINE_H_ */
diff --git a/pkgs/by-name/wo/wol/package.nix b/pkgs/by-name/wo/wol/package.nix
index ffc0ff554326..5de294a59cbd 100644
--- a/pkgs/by-name/wo/wol/package.nix
+++ b/pkgs/by-name/wo/wol/package.nix
@@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270";
   };
 
-  patches = [ ./gcc-14.patch ];
+  patches = [
+    ./gcc-14.patch
+    ./macos-10_7-getline.patch
+  ];
 
   nativeBuildInputs = [
     perl # for pod2man in order to get a manpage
@@ -30,6 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ makefu ];
     mainProgram = "wol";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From f9ceab72671014391386997142704e425358a0dd Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 29 May 2025 04:08:13 -0600
Subject: [PATCH 0174/1497] shadps4: fix update script

---
 pkgs/by-name/sh/shadps4/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 43f46afa754a..88da965e9446 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -119,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.openorbis-example = nixosTests.shadps4;
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v\\.(.*)"
+      ];
+    };
   };
 
   meta = {

From 6f852f57aaaf893612bd066ccda957720af4a3d9 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 28 May 2025 20:35:19 +0000
Subject: [PATCH 0175/1497] protonplus: 0.4.30 -> 0.4.31

Diff: https://github.com/Vysp3r/ProtonPlus/compare/v0.4.30...v0.4.31

Changelog: https://github.com/Vysp3r/ProtonPlus/releases/tag/v0.4.31
---
 pkgs/by-name/pr/protonplus/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index 46146e95fe32..f77f888f9016 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.30";
+  version = "0.4.31";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-bI21042EHpNigS2wB0WdM06BF2GHdoXsVpNoHe7ZuLk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5UwgRvApKjMML5lx/UF7YHsXts4nQlg3GheAykN1f3E=";
   };
 
   nativeBuildInputs = [
@@ -53,13 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "com.vysp3r.ProtonPlus";
     description = "Simple Wine and Proton-based compatibility tools manager";
     homepage = "https://github.com/Vysp3r/ProtonPlus";
     changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ getchoo ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.linux;
   };
 })

From 1901d2b321f08a03551058de9d968f0ad5fd2b6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 12:42:09 +0000
Subject: [PATCH 0176/1497] haproxy: 3.1.7 -> 3.2.0

---
 pkgs/by-name/ha/haproxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 68b49fbc45e6..6f6064061d31 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.1.7";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-o5UmRO+TmzYmDZHYGjNWNqqbRFcrTLi2ABJy+IVFxmY=";
+    hash = "sha256-92KuMbyhtR/rieQ5Xjbhf4Z8JTcqEIU8cNKSw90Xt7A=";
   };
 
   buildInputs =

From 4196e2ce85413d7f21a7ac932bfcf0ad70d2ef01 Mon Sep 17 00:00:00 2001
From: Duck <36255460+Duckuk@users.noreply.github.com>
Date: Sun, 25 May 2025 14:53:34 +0930
Subject: [PATCH 0177/1497] vintagestory: 1.20.9 -> 1.20.11

---
 pkgs/by-name/vi/vintagestory/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 9babd3729e7f..f2ea4e54f62f 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.20.9";
+  version = "1.20.11";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-pia2Dv0FY28nkATOk60GqiAEnZmxgZvZfvkM8U/bZzU=";
+    hash = "sha256-IOreg6j/jLhOK8jm2AgSnYQrql5R6QxsshvPs8OUcQA=";
   };
 
   nativeBuildInputs = [

From 7f3855aee71de319b5b1157c6019fc9eadcb3ffa Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sun, 19 Jan 2025 07:11:16 -0500
Subject: [PATCH 0178/1497] srb2: 2.2.13 -> 2.2.15

---
 pkgs/by-name/sr/srb2/cmake.patch      | 52 ++-------------------------
 pkgs/by-name/sr/srb2/package.nix      | 17 +++------
 pkgs/by-name/sr/srb2/thirdparty.patch | 12 -------
 3 files changed, 7 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/by-name/sr/srb2/thirdparty.patch

diff --git a/pkgs/by-name/sr/srb2/cmake.patch b/pkgs/by-name/sr/srb2/cmake.patch
index 91af532e86fb..077bfb661253 100644
--- a/pkgs/by-name/sr/srb2/cmake.patch
+++ b/pkgs/by-name/sr/srb2/cmake.patch
@@ -1,56 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80a3bdcd6..380a1573a 100644
+index a4c631102..13b5743ca 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -61,7 +61,7 @@ option(
- 	"Link dependencies using CMake's find_package and do not use internal builds"
- 	${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT}
- )
--option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON)
-+option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF)
- # This option isn't recommended for distribution builds and probably won't work (yet).
- cmake_dependent_option(
- 	SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES
-@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
- option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
- set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
- 
--if(SRB2_CONFIG_ENABLE_TESTS)
--	# https://github.com/catchorg/Catch2
--	CPMAddPackage(
--		NAME Catch2
--		VERSION 3.4.0
--		GITHUB_REPOSITORY catchorg/Catch2
--		OPTIONS
--			"CATCH_INSTALL_DOCS OFF"
--	)
--	list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
--	include(CTest)
--	include(Catch)
--	add_executable(srb2tests)
--	# To add tests, use target_sources to add individual test files to the target in subdirs.
--	target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain)
--	target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17)
--	catch_discover_tests(srb2tests)
--endif()
--
- # Enable CCache
- # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
- if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
-@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
- 			message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
- 		endif()
- 	endif()
--else()
--	CPMAddPackage(
--		NAME Ccache.cmake
--		GITHUB_REPOSITORY TheLartians/Ccache.cmake
--		VERSION 1.2
--	)
- endif()
- 
- # Dependencies
-@@ -179,7 +154,7 @@ include(GitUtilities)
+@@ -141,7 +141,7 @@ include(GitUtilities)
  if("${SRB2_SDL2_EXE_NAME}" STREQUAL "")
  	# cause a reconfigure if the branch changes
  	get_git_dir(SRB2_GIT_DIR)
diff --git a/pkgs/by-name/sr/srb2/package.nix b/pkgs/by-name/sr/srb2/package.nix
index 208abc217571..bf082ee3a17d 100644
--- a/pkgs/by-name/sr/srb2/package.nix
+++ b/pkgs/by-name/sr/srb2/package.nix
@@ -7,8 +7,8 @@
   curl,
   nasm,
   libopenmpt,
+  miniupnpc,
   game-music-emu,
-  libGLU,
   libpng,
   SDL2,
   SDL2_mixer,
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "srb2";
-  version = "2.2.13";
+  version = "2.2.15";
 
   src = fetchFromGitHub {
     owner = "STJr";
     repo = "SRB2";
     rev = "SRB2_release_${finalAttrs.version}";
-    hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8=";
+    hash = "sha256-eJ0GYe3Rw6qQXj+jtyt8MkP87DaCiO9ffChg+SpQqaI=";
   };
 
   nativeBuildInputs = [
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     game-music-emu
     libpng
     libopenmpt
+    miniupnpc
     SDL2
     SDL2_mixer
     zlib
@@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     src = fetchgit {
       url = "https://git.do.srb2.org/STJr/srb2assets-public";
       rev = "SRB2_release_${finalAttrs.version}";
-      hash = "sha256-OXvO5ZlujIYmYevc62Dtx192dxoujQMNFUCrH5quBBg=";
+      hash = "sha256-1kwhWHzL2TbSx1rhFExbMhXqn0HMBRhR6LZiuoRx+iI=";
       fetchLFS = true;
     };
 
@@ -76,17 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Make the build work without internet connectivity
-    # See: https://build.opensuse.org/request/show/1109889
     ./cmake.patch
-    ./thirdparty.patch
   ];
 
-  postPatch = ''
-    substituteInPlace ./src/sdl/ogl_sdl.c \
-      --replace libGLU.so.1 ${libGLU}/lib/libGLU.so.1
-  '';
-
   desktopItems = [
     (makeDesktopItem rec {
       name = "Sonic Robo Blast 2";
diff --git a/pkgs/by-name/sr/srb2/thirdparty.patch b/pkgs/by-name/sr/srb2/thirdparty.patch
deleted file mode 100644
index bb550290d85d..000000000000
--- a/pkgs/by-name/sr/srb2/thirdparty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index f33b3bf3f..1214f179c 100644
---- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
- 	include("cpm-png.cmake")
- 	include("cpm-curl.cmake")
- 	include("cpm-openmpt.cmake")
-+	include("cpm-libgme.cmake")
- endif()
--
--include("cpm-libgme.cmake")

From 67b6b488e474b6a7700c0a0a55710bcb488ac6e1 Mon Sep 17 00:00:00 2001
From: HHR2020 <76608828+HHR2020@users.noreply.github.com>
Date: Fri, 30 May 2025 00:35:59 +0800
Subject: [PATCH 0179/1497] joplin-desktop: revert deletion of
 --enable-wayland-ime

fix input method when NIXOS_OZONE_WL is set

reverts #411104
---
 pkgs/by-name/jo/joplin-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
index 65415a7751b4..4adca9bc59c6 100644
--- a/pkgs/by-name/jo/joplin-desktop/package.nix
+++ b/pkgs/by-name/jo/joplin-desktop/package.nix
@@ -60,7 +60,7 @@ let
 
     extraInstallCommands = ''
       wrapProgram $out/bin/joplin-desktop \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
       install -Dm644 ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop
       install -Dm644 ${appimageContents}/joplin.png $out/share/pixmaps/joplin.png
       substituteInPlace $out/share/applications/joplin.desktop \

From 23c8861471c06100e5688bfa230deb91dbb1b65d Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Thu, 29 May 2025 18:11:18 +0200
Subject: [PATCH 0180/1497] hotspot: Add kgraphviewer and qcustomplot

hotspot uses them as optional dependencies for additional features.

QCustomPlot is used for the frequency tab, and KGraphViewer is used
for a call graph in the caller/callee tab.
---
 pkgs/development/tools/analysis/hotspot/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index 96a114698a64..357c593db83c 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -10,6 +10,7 @@
   fetchFromGitHub,
   kconfigwidgets,
   kddockwidgets,
+  kgraphviewer,
   ki18n,
   kio,
   kitemmodels,
@@ -19,6 +20,7 @@
   kwindowsystem,
   libelf,
   linuxPackages,
+  qcustomplot,
   qtbase,
   qtsvg,
   rustc-demangle,
@@ -51,6 +53,7 @@ stdenv.mkDerivation rec {
     (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
     kconfigwidgets
     kddockwidgets
+    kgraphviewer
     ki18n
     kio
     kitemmodels
@@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
     kparts
     kwindowsystem
     libelf
+    qcustomplot
     qtbase
     qtsvg
     rustc-demangle

From 43622917f3a0d78894d891b237e7a7e7eb23e452 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 29 May 2025 12:51:49 -0400
Subject: [PATCH 0181/1497] gitlab-triage: 1.23.1 -> 1.44.5

Changelog: https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/releases
---
 .../version-management/gitlab-triage/Gemfile  |   3 +
 .../gitlab-triage/Gemfile.lock                |  64 ++++---
 .../gitlab-triage/default.nix                 |   2 +-
 .../gitlab-triage/gemset.nix                  | 166 +++++++++++++++---
 4 files changed, 188 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile b/pkgs/applications/version-management/gitlab-triage/Gemfile
index 7549ada64050..0295bf3d4517 100644
--- a/pkgs/applications/version-management/gitlab-triage/Gemfile
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile
@@ -1,3 +1,6 @@
 source 'https://rubygems.org' do
   gem 'gitlab-triage'
+  # Extra dependencies
+  gem 'csv'
+  gem 'racc'
 end
diff --git a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
index 664080ccad8d..46aafd360a55 100644
--- a/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab-triage/Gemfile.lock
@@ -4,42 +4,66 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    concurrent-ruby (1.1.10)
-    gitlab-triage (1.23.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.2.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    csv (3.3.4)
+    drb (2.2.3)
+    gitlab-triage (1.44.5)
       activesupport (>= 5.1)
-      globalid (~> 0.4)
+      globalid (~> 1.0, >= 1.0.1)
+      graphql (< 2.1.0)
       graphql-client (~> 0.16)
-      httparty (~> 0.17)
-    globalid (0.6.0)
-      activesupport (>= 5.0)
-    graphql (2.0.11)
-    graphql-client (0.18.0)
+      httparty (~> 0.20.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    graphql (2.0.32)
+      base64
+    graphql-client (0.25.0)
       activesupport (>= 3.0)
-      graphql
+      graphql (>= 1.13.0)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.16.2)
-    multi_xml (0.6.0)
-    tzinfo (2.0.4)
+    logger (1.7.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0527)
+    minitest (5.25.5)
+    multi_xml (0.7.2)
+      bigdecimal (~> 3.1)
+    racc (1.8.1)
+    securerandom (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.3)
 
 PLATFORMS
   ruby
   x86_64-linux
 
 DEPENDENCIES
+  csv!
   gitlab-triage!
+  racc!
 
 BUNDLED WITH
-   2.3.9
+   2.6.6
diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix
index 4dbf52f83fba..e75a3b9d53f2 100644
--- a/pkgs/applications/version-management/gitlab-triage/default.nix
+++ b/pkgs/applications/version-management/gitlab-triage/default.nix
@@ -13,7 +13,7 @@ bundlerApp {
 
   meta = with lib; {
     description = "GitLab's issues and merge requests triage, automated!";
-    homepage = "https://gitlab.com/gitlab-org/gitlab-triage";
+    homepage = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage";
     license = licenses.mit;
     maintainers = [ ];
     mainProgram = "gitlab-triage";
diff --git a/pkgs/applications/version-management/gitlab-triage/gemset.nix b/pkgs/applications/version-management/gitlab-triage/gemset.nix
index fb41c8961a71..910b13fed95e 100644
--- a/pkgs/applications/version-management/gitlab-triage/gemset.nix
+++ b/pkgs/applications/version-management/gitlab-triage/gemset.nix
@@ -1,34 +1,103 @@
 {
   activesupport = {
     dependencies = [
+      "base64"
+      "benchmark"
+      "bigdecimal"
       "concurrent-ruby"
+      "connection_pool"
+      "drb"
       "i18n"
+      "logger"
       "minitest"
+      "securerandom"
       "tzinfo"
+      "uri"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
+      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
       type = "gem";
     };
-    version = "7.0.3";
+    version = "8.0.2";
+  };
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  bigdecimal = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qh7m151nyl3x3f467smrnpvkyinwjz96cdj5vh092yr0x7c687j";
+      type = "gem";
+    };
+    version = "3.2.0";
   };
   concurrent-ruby = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
       type = "gem";
     };
-    version = "1.1.10";
+    version = "1.3.5";
+  };
+  connection_pool = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
+      type = "gem";
+    };
+    version = "3.3.4";
+  };
+  drb = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
+      type = "gem";
+    };
+    version = "2.2.3";
   };
   gitlab-triage = {
     dependencies = [
       "activesupport"
       "globalid"
+      "graphql"
       "graphql-client"
       "httparty"
     ];
@@ -36,10 +105,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vs120wyqm12xy66nv0723cy3m66g5lhhdd37izbc9qwyq03m729";
+      sha256 = "0ya6ynljc05z4qzw6w8x9djf31ai4awp5w6xz1m9x4ks6qg1x8kw";
       type = "gem";
     };
-    version = "1.23.1";
+    version = "1.44.5";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -47,20 +116,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xk28839pi36yzlqgh7k5wqmiphz7wg2c2r2wzfvs2s7g63hy3nv";
+      sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "1.2.1";
   };
   graphql = {
+    dependencies = [ "base64" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18k3wh73mb7rs469wfn4m10d1rlg2v9chd89nf7vy8z3yjbf9nl4";
+      sha256 = "1m21l38fw11hq5ihns8pzydv7c584kdxh6s1rya98z2zzqrirshf";
       type = "gem";
     };
-    version = "2.0.11";
+    version = "2.0.32";
   };
   graphql-client = {
     dependencies = [
@@ -71,10 +141,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq";
+      sha256 = "1xajv9r03xdn0s382xnwiwnwpy4q443bigdx3l7kczdv95bc8rly";
       type = "gem";
     };
-    version = "0.18.0";
+    version = "0.25.0";
   };
   httparty = {
     dependencies = [
@@ -96,51 +166,85 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.14.7";
   };
-  mime-types = {
-    dependencies = [ "mime-types-data" ];
+  logger = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "1.7.0";
+  };
+  mime-types = {
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
+      type = "gem";
+    };
+    version = "3.7.0";
   };
   mime-types-data = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
+      sha256 = "00ks975j562zlcjg95g5qlzdc7mrc71byg8ln1fyl9yv1iw8v00i";
       type = "gem";
     };
-    version = "3.2022.0105";
+    version = "3.2025.0527";
   };
   minitest = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
       type = "gem";
     };
-    version = "5.16.2";
+    version = "5.25.5";
   };
   multi_xml = {
+    dependencies = [ "bigdecimal" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
+      sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.7.2";
+  };
+  racc = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  securerandom = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
+      type = "gem";
+    };
+    version = "0.4.1";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
@@ -148,9 +252,19 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
+      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "2.0.6";
+  };
+  uri = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      type = "gem";
+    };
+    version = "1.0.3";
   };
 }

From feef46cb80cc0fd17371a7c90042db0401a4b72f Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 18 Feb 2025 10:28:23 -0800
Subject: [PATCH 0182/1497] nix-your-shell: Add generate-config script

This lets users generate a shell configuration file from Nix, for use
with `home-manager` and similar:

    { config, pkgs, ... }: {
      home.file."${config.xdg.configHome}/nushell/nix-your-shell.nu".source =
        pkgs.nix-your-shell.generate-config "nu";
    }

See: https://github.com/MercuryTechnologies/nix-your-shell/issues/81
---
 pkgs/by-name/ni/nix-your-shell/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix
index bda305c30d35..a662a3b0b563 100644
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@@ -3,6 +3,8 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
+  runCommand,
+  nix-your-shell,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "nix-your-shell";
@@ -11,13 +13,22 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "nix-your-shell";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0=";
 
+  passthru = {
+    generate-config =
+      shell:
+      runCommand "nix-your-shell-config" { } ''
+        ${lib.getExe nix-your-shell} ${lib.escapeShellArg shell} >> "$out"
+      '';
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     mainProgram = "nix-your-shell";
     description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
@@ -26,6 +37,4 @@ rustPlatform.buildRustPackage rec {
     license = [ lib.licenses.mit ];
     maintainers = with lib.maintainers; [ _9999years ];
   };
-
-  passthru.updateScript = nix-update-script { };
 }

From 5125c5e5743a80b12c09f63532663fb6ee121b47 Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Thu, 29 May 2025 22:41:05 +0200
Subject: [PATCH 0183/1497] hotspot: Add maintainer tmarkus

---
 pkgs/development/tools/analysis/hotspot/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index 357c593db83c..65c09e9cc453 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -102,6 +102,9 @@ stdenv.mkDerivation rec {
       gpl3Only
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nh2 ];
+    maintainers = with maintainers; [
+      nh2
+      tmarkus
+    ];
   };
 }

From fae935a9f4f11194b8e6b9019e808f708898957b Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Thu, 29 May 2025 22:49:37 +0200
Subject: [PATCH 0184/1497] hotspot: use qt6

Port hotspot as well as kddockwidgets to use qt6.
As hotspot is the only reverse dependency of kddockwidgets,
kddockwidgets is simply moved to qt6 alongside hotspot.
Also prepare for by-name migration by taking top-level qt6 as an input.
---
 .../libraries/kddockwidgets/default.nix       | 16 ++--
 .../tools/analysis/hotspot/default.nix        | 77 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix
index a9c2e8cd44d5..6b3afa39ad12 100644
--- a/pkgs/development/libraries/kddockwidgets/default.nix
+++ b/pkgs/development/libraries/kddockwidgets/default.nix
@@ -3,10 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qtdeclarative,
-  qtquickcontrols2,
-  qtx11extras,
+  qt6,
   spdlog,
   fmt,
   nlohmann_json,
@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
     fmt
     nlohmann_json
   ];
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with qt6; [
     qtbase
     qtdeclarative
-    qtquickcontrols2
-    qtx11extras
   ];
 
+  cmakeFlags = [ (lib.strings.cmakeBool "KDDockWidgets_QT6" true) ];
+
   dontWrapQtApps = true;
 
   meta = with lib; {
@@ -45,6 +42,9 @@ stdenv.mkDerivation rec {
       gpl2Only
       gpl3Only
     ];
-    maintainers = with maintainers; [ _1000teslas ];
+    maintainers = with maintainers; [
+      _1000teslas
+      tmarkus
+    ];
   };
 }
diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix
index 65c09e9cc453..cf6c26885172 100644
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@@ -3,29 +3,16 @@
   stdenv,
   binutils,
   cmake,
-  extra-cmake-modules,
   patchelfUnstable,
-  wrapQtAppsHook,
   elfutils,
   fetchFromGitHub,
-  kconfigwidgets,
+  fetchpatch,
   kddockwidgets,
-  kgraphviewer,
-  ki18n,
-  kio,
-  kitemmodels,
-  kitemviews,
-  konsole,
-  kparts,
-  kwindowsystem,
+  kdePackages,
   libelf,
   linuxPackages,
-  qcustomplot,
-  qtbase,
-  qtsvg,
+  qt6,
   rustc-demangle,
-  syntax-highlighting,
-  threadweaver,
   zstd,
 }:
 
@@ -43,34 +30,48 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     # stable patchelf corrupts the binary
     patchelfUnstable
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
-    kconfigwidgets
-    kddockwidgets
-    kgraphviewer
-    ki18n
-    kio
-    kitemmodels
-    kitemviews
-    konsole
-    kparts
-    kwindowsystem
-    libelf
-    qcustomplot
-    qtbase
-    qtsvg
-    rustc-demangle
-    syntax-highlighting
-    threadweaver
-    zstd
+  patches = [
+    # Fix build issue with Qt 6.9, can be removed in next release
+    (fetchpatch {
+      url = "https://github.com/KDAB/hotspot/pull/694/commits/5ef04c1dd60846b0d1746132e7e63289ee25f259.patch";
+      hash = "sha256-WYMM1/CY05fztSiRNZQ2Q16n5erjY+AE6gSQgSlb3HA=";
+    })
   ];
 
+  cmakeFlags = [ (lib.strings.cmakeBool "QT6_BUILD" true) ];
+
+  buildInputs =
+    [
+      (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
+      kddockwidgets
+      libelf
+      qt6.qtbase
+      qt6.qtsvg
+      rustc-demangle
+      zstd
+    ]
+    ++ (with kdePackages; [
+      kconfig
+      kconfigwidgets
+      kgraphviewer
+      ki18n
+      kio
+      kitemmodels
+      kitemviews
+      konsole
+      kparts
+      kwindowsystem
+      qcustomplot
+      syntax-highlighting
+      threadweaver
+    ]);
+
   qtWrapperArgs = [
     "--suffix PATH : ${
       lib.makeBinPath [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acf278a13c50..d0383e111034 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3312,7 +3312,7 @@ with pkgs;
 
   hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
 
-  hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
+  hotspot = callPackage ../development/tools/analysis/hotspot { };
 
   hpccm = with python3Packages; toPythonApplication hpccm;
 
@@ -8602,7 +8602,7 @@ with pkgs;
 
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
-  kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
+  kddockwidgets = callPackage ../development/libraries/kddockwidgets { };
 
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;

From b15b952554a0311909622831d45044ff6b1f3f5c Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Thu, 29 May 2025 22:58:19 +0200
Subject: [PATCH 0185/1497] kddockwidgets: move to by-name

---
 .../default.nix => by-name/kd/kddockwidgets/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/kddockwidgets/default.nix => by-name/kd/kddockwidgets/package.nix} (100%)

diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/by-name/kd/kddockwidgets/package.nix
similarity index 100%
rename from pkgs/development/libraries/kddockwidgets/default.nix
rename to pkgs/by-name/kd/kddockwidgets/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0383e111034..38ba7bc76d1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8602,8 +8602,6 @@ with pkgs;
 
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
-  kddockwidgets = callPackage ../development/libraries/kddockwidgets { };
-
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
     lua = lua5_1;

From 0ed8766367c1b2da3b9444174d6ba7e9bf304d98 Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Thu, 29 May 2025 22:59:10 +0200
Subject: [PATCH 0186/1497] hotspot: move to by-name

---
 .../hotspot/default.nix => by-name/ho/hotspot/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/analysis/hotspot/default.nix => by-name/ho/hotspot/package.nix} (100%)

diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/by-name/ho/hotspot/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/hotspot/default.nix
rename to pkgs/by-name/ho/hotspot/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38ba7bc76d1e..270ba852460d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3312,8 +3312,6 @@ with pkgs;
 
   hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
 
-  hotspot = callPackage ../development/tools/analysis/hotspot { };
-
   hpccm = with python3Packages; toPythonApplication hpccm;
 
   hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };

From 21806777f2c18104f043bb229f29adf5358983f2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 29 May 2025 14:06:13 -0700
Subject: [PATCH 0187/1497] python3Packages.google-cloud-spanner: add optional
 dependencies for tracing

---
 .../google-cloud-spanner/default.nix          | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 66b18afb7c96..f1e6c1129008 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -19,14 +19,14 @@
 
   # optional dependencies
   libcst,
-
-  # testing
-  google-cloud-monitoring,
-  mmh3,
-  mock,
   opentelemetry-api,
   opentelemetry-sdk,
   opentelemetry-semantic-conventions,
+  google-cloud-monitoring,
+  mmh3,
+
+  # testing
+  mock,
   pytest-asyncio,
   pytestCheckHook,
 }:
@@ -54,10 +54,18 @@ buildPythonPackage rec {
     proto-plus
     protobuf
     sqlparse
-  ] ++ google-api-core.optional-dependencies.grpc;
+  ];
 
   optional-dependencies = {
     libcst = [ libcst ];
+    tracing = [
+      opentelemetry-api
+      opentelemetry-sdk
+      opentelemetry-semantic-conventions
+      # opentelemetry-resourcedetector-gcp # Not available in nixpkgs
+      google-cloud-monitoring
+      mmh3
+    ];
   };
 
   nativeCheckInputs = [
@@ -70,7 +78,7 @@ buildPythonPackage rec {
     opentelemetry-semantic-conventions
     pytest-asyncio
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   preCheck = ''
     # prevent google directory from shadowing google imports
@@ -117,7 +125,7 @@ buildPythonPackage rec {
   meta = {
     description = "Cloud Spanner API client library";
     homepage = "https://github.com/googleapis/python-spanner";
-    changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/python-spanner/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };

From 6c52e60f205ed8ebfc636bcaed8cf4fedcae45d6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 29 May 2025 14:13:06 -0700
Subject: [PATCH 0188/1497] python3Packages.google-cloud-spanner: 3.54.0 ->
 3.55.0

changelog: https://github.com/googleapis/python-spanner/releases/tag/v3.55.0

diff: https://github.com/googleapis/python-spanner/compare/v3.54.0...v3.55.0
---
 .../python-modules/google-cloud-spanner/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index f1e6c1129008..a580a84ded06 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.54.0";
+  version = "3.55.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-spanner";
     tag = "v${version}";
-    hash = "sha256-uJKUgY7fV+AK/2HQyjQRFypcL+mPZ/M5ZtAU+f73ezM=";
+    hash = "sha256-0+mTBqgy8SaHjoYhQjCaypipVsJTrN2DdhcfPY3PxSc=";
   };
 
   build-system = [ setuptools ];
@@ -92,6 +92,8 @@ buildPythonPackage rec {
     "test_list_instance"
     # can't import mmh3
     "test_generate_client_hash"
+    # Flaky, compares to execution time
+    "test_snapshot_read_concurrent"
   ];
 
   disabledTestPaths = [

From 7139b502d10f1f378360e46d77abf31b4010f1ab Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:20 +0200
Subject: [PATCH 0189/1497] freecad: unpin python311

---
 pkgs/by-name/fr/freecad/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 844285ba5bbc..42227a525e01 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -23,7 +23,7 @@
   opencascade-occt_7_6,
   opencascade-occt,
   pkg-config,
-  python311Packages,
+  python3Packages,
   spaceNavSupport ? stdenv.hostPlatform.isLinux,
   ifcSupport ? false,
   stdenv,
@@ -40,7 +40,7 @@
   nix-update-script,
 }:
 let
-  inherit (python311Packages)
+  inherit (python3Packages)
     boost
     gitpython
     ifcopenshell

From d9360309637b550e9d264982348a4b3c0cf948f5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 0190/1497] frescobaldi: unpin python311

---
 pkgs/by-name/fr/frescobaldi/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix
index d9a63a5fe2fc..3de32e28a752 100644
--- a/pkgs/by-name/fr/frescobaldi/package.nix
+++ b/pkgs/by-name/fr/frescobaldi/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python311Packages,
+  python3Packages,
   lilypond,
 }:
 
-python311Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "frescobaldi";
   version = "3.3.0";
 
@@ -17,7 +17,7 @@ python311Packages.buildPythonApplication rec {
     sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
   };
 
-  propagatedBuildInputs = with python311Packages; [
+  propagatedBuildInputs = with python3Packages; [
     qpageview
     lilypond
     pygame
@@ -28,7 +28,7 @@ python311Packages.buildPythonApplication rec {
     pyqtwebengine
   ];
 
-  nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ];
+  nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ];
 
   # Needed because source is fetched from git
   preBuild = ''

From b6dd19a100b1f8989f160a9365980e32bfbf8ac0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 0191/1497] gpodder: unpin python311

---
 pkgs/by-name/gp/gpodder/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gp/gpodder/package.nix b/pkgs/by-name/gp/gpodder/package.nix
index 738983a6322f..d1a3649e4981 100644
--- a/pkgs/by-name/gp/gpodder/package.nix
+++ b/pkgs/by-name/gp/gpodder/package.nix
@@ -6,12 +6,12 @@
   gobject-introspection,
   gtk3,
   intltool,
-  python311Packages,
+  python3Packages,
   wrapGAppsHook3,
   xdg-utils,
 }:
 
-python311Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gpodder";
   version = "3.11.4";
   format = "other";
@@ -35,6 +35,7 @@ python311Packages.buildPythonApplication rec {
     intltool
     wrapGAppsHook3
     gobject-introspection
+    python3Packages.distutils
   ];
 
   buildInputs = [
@@ -42,7 +43,7 @@ python311Packages.buildPythonApplication rec {
     adwaita-icon-theme
   ];
 
-  nativeCheckInputs = with python311Packages; [
+  nativeCheckInputs = with python3Packages; [
     minimock
     pytest
     pytest-httpserver
@@ -51,7 +52,7 @@ python311Packages.buildPythonApplication rec {
 
   doCheck = true;
 
-  propagatedBuildInputs = with python311Packages; [
+  propagatedBuildInputs = with python3Packages; [
     feedparser
     dbus-python
     mygpoclient

From 1fe7cd22a9c10d2d7a143a3ae39bde2a932bbe90 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:41:04 +0200
Subject: [PATCH 0192/1497] nixos/tests/thelounge: fix eval by disabling theme
 test

It seems we don't package thelounge themes anymore
---
 nixos/tests/thelounge.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/thelounge.nix b/nixos/tests/thelounge.nix
index 5214d10739ba..92b3fa848058 100644
--- a/nixos/tests/thelounge.nix
+++ b/nixos/tests/thelounge.nix
@@ -7,7 +7,8 @@ import ./make-test-python.nix {
       {
         services.thelounge = {
           enable = true;
-          plugins = [ pkgs.theLoungePlugins.themes.solarized ];
+          # nodePackages.thelounge-theme-* has been removed
+          # plugins = [ pkgs.theLoungePlugins.themes.solarized ];
         };
       };
 
@@ -28,7 +29,7 @@ import ./make-test-python.nix {
       machine.wait_for_unit("thelounge.service")
       machine.wait_for_open_port(9000)
 
-    private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized")
+    # private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized")
     private.wait_until_succeeds("journalctl -u thelounge.service | grep 'in private mode'")
     public.wait_until_succeeds("journalctl -u thelounge.service | grep 'in public mode'")
   '';

From 8487c267b5872b27ed7c3cb2ef56a69f029cc081 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Thu, 29 May 2025 19:43:42 -0400
Subject: [PATCH 0193/1497] grafana-image-renderer: 3.12.5 -> 3.12.6

Changelog: https://github.com/grafana/grafana-image-renderer/blob/fad0870550b74210ca58fe5112d41bbb91ecd1e6/CHANGELOG.md
---
 pkgs/by-name/gr/grafana-image-renderer/package.json | 10 +++++++++-
 pkgs/by-name/gr/grafana-image-renderer/package.nix  |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.json b/pkgs/by-name/gr/grafana-image-renderer/package.json
index 3c8f51add47c..07b8aeaa9292 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.json
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.json
@@ -28,22 +28,30 @@
     "@grpc/grpc-js": "^1.8.22",
     "@grpc/proto-loader": "^0.7.2",
     "@hapi/boom": "^10.0.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.49.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+    "@opentelemetry/resources": "^1.25.1",
+    "@opentelemetry/sdk-node": "^0.52.1",
+    "@opentelemetry/semantic-conventions": "^1.25.1",
     "@puppeteer/browsers": "^2.3.1",
     "chokidar": "^3.5.2",
     "dompurify": "^3.2.4",
     "express": "^4.21.1",
     "express-prom-bundle": "^6.5.0",
+    "ioredis": "^5.6.1",
     "jimp": "^0.22.12",
     "jsdom": "20.0.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.6",
     "morgan": "^1.9.0",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.0.0",
     "on-finished": "^2.3.0",
     "poolpeteer": "^0.24.0",
     "prom-client": "^14.1.0",
     "puppeteer": "^22.8.2",
     "puppeteer-cluster": "^0.24.0",
+    "rate-limiter-flexible": "^7.0.0",
     "unique-filename": "^2.0.1",
     "winston": "^3.8.2"
   },
diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
index 5bc87e3fa7f3..1859d7a75225 100644
--- a/pkgs/by-name/gr/grafana-image-renderer/package.nix
+++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix
@@ -14,18 +14,18 @@
 
 mkYarnPackage rec {
   pname = "grafana-image-renderer";
-  version = "3.12.5";
+  version = "3.12.6";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafana-image-renderer";
     rev = "v${version}";
-    hash = "sha256-dcWmMcvWwG4wGEEyFKa1R0jGGpK5x1F5Amr74JzJaLE=";
+    hash = "sha256-xParYkEeH/jH18SH0tTwN4a8NsO8D30Tcmc76Xy77Ew=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
-    hash = "sha256-BBu+vOO0UgX3L7Svj0HgVKHR2lSe4tD6c9HDgJZdhHU=";
+    hash = "sha256-lV+4r+5E55J4H1zl05SimxIhGVD/PvEkIr3j1yhZS4o=";
   };
 
   packageJSON = ./package.json;

From bec1f651b9374f55366c79d48d5736ba0033d35b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:21 +0200
Subject: [PATCH 0194/1497] pysolfc: unpin python311

---
 pkgs/by-name/py/pysolfc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/py/pysolfc/package.nix b/pkgs/by-name/py/pysolfc/package.nix
index 1c8d0b852663..6ba799867a66 100644
--- a/pkgs/by-name/py/pysolfc/package.nix
+++ b/pkgs/by-name/py/pysolfc/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  python311Packages,
+  python3Packages,
   desktop-file-utils,
   freecell-solver,
   black-hole-solver,
@@ -10,7 +10,7 @@
   gitUpdater,
 }:
 
-python311Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pysolfc";
   version = "3.2.0";
 
@@ -51,7 +51,7 @@ python311Packages.buildPythonApplication rec {
     '';
   };
 
-  propagatedBuildInputs = with python311Packages; [
+  propagatedBuildInputs = with python3Packages; [
     tkinter
     six
     random2

From 6fb8189cbc1264ef629cc606519afb33da84b490 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:22 +0200
Subject: [PATCH 0195/1497] renderdoc: unpin python311

---
 pkgs/by-name/re/renderdoc/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index dba59f5d201a..2755dc5a94ac 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -13,7 +13,7 @@
   nix-update-script,
   pcre,
   pkg-config,
-  python311Packages,
+  python3Packages,
   qt5,
   stdenv,
   vulkan-loader,
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
     [
       libXdmcp
       libpthreadstubs
-      python311Packages.pyside2
-      python311Packages.pyside2-tools
-      python311Packages.shiboken2
+      python3Packages.pyside2
+      python3Packages.pyside2-tools
+      python3Packages.shiboken2
       qt5.qtbase
       qt5.qtsvg
       vulkan-loader
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pcre
     pkg-config
-    python311Packages.python
+    python3Packages.python
     qt5.qtx11extras
     qt5.wrapQtAppsHook
   ];

From 26576db882c4fd5c5558744a8ec7617018aeea5e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:08:22 +0200
Subject: [PATCH 0196/1497] toolong: unpin python311

---
 pkgs/by-name/to/toolong/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix
index 43001174c7e8..43124204e9bf 100644
--- a/pkgs/by-name/to/toolong/package.nix
+++ b/pkgs/by-name/to/toolong/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
-  python311Packages,
+  python3Packages,
   fetchFromGitHub,
   testers,
   toolong,
 }:
 
-python311Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "toolong";
   version = "1.4.0";
   pyproject = true;
@@ -18,8 +18,8 @@ python311Packages.buildPythonApplication {
     hash = "sha256-HrmU7HxWKYrbV25Y5CHLw7/7tX8Y5mTsTL1aXGGTSIo=";
   };
 
-  build-system = [ python311Packages.poetry-core ];
-  dependencies = with python311Packages; [
+  build-system = [ python3Packages.poetry-core ];
+  dependencies = with python3Packages; [
     click
     textual
     typing-extensions

From 94ea5940baeb3818b132d1dd920d4e91d68fd9c9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 0197/1497] dooit-extras: unpin python311

---
 pkgs/by-name/do/dooit-extras/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/do/dooit-extras/package.nix b/pkgs/by-name/do/dooit-extras/package.nix
index ec68b74ba121..2d84146d45a6 100644
--- a/pkgs/by-name/do/dooit-extras/package.nix
+++ b/pkgs/by-name/do/dooit-extras/package.nix
@@ -1,13 +1,10 @@
 {
   lib,
   fetchFromGitHub,
-  python311,
+  python3,
   dooit,
   nix-update-script,
 }:
-let
-  python3 = python311;
-in
 python3.pkgs.buildPythonPackage rec {
   pname = "dooit-extras";
   version = "0.2.0";

From b191a71325d0073fd27e0e5562956a5c3c311ecb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 0198/1497] dooit: unpin python311

---
 pkgs/by-name/do/dooit/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index 0b8925b6bd16..8efebc048196 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -2,14 +2,11 @@
   lib,
   fetchFromGitHub,
   dooit,
-  python311,
+  python3,
   testers,
   nix-update-script,
   extraPackages ? [ ],
 }:
-let
-  python3 = python311;
-in
 python3.pkgs.buildPythonApplication rec {
   pname = "dooit";
   version = "3.2.2";

From ac08339ad2c68f27824e26f632af779c4e491b68 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:05 +0200
Subject: [PATCH 0199/1497] py3c: unpin python311

---
 pkgs/by-name/py/py3c/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix
index 8f42639a737c..7ddef7728128 100644
--- a/pkgs/by-name/py/py3c/package.nix
+++ b/pkgs/by-name/py/py3c/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python311,
+  python3,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   nativeCheckInputs = [
-    python311
+    python3
+    python3.pkgs.distutils
   ];
 
   checkTarget = "test-python";

From 167c2e876af02219ab31ab441a7b1bfa6b50843b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 0200/1497] smassh: unpin python311

---
 pkgs/by-name/sm/smassh/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix
index 89b42204c16f..4d2c1cecaa95 100644
--- a/pkgs/by-name/sm/smassh/package.nix
+++ b/pkgs/by-name/sm/smassh/package.nix
@@ -2,13 +2,10 @@
   lib,
   fetchFromGitHub,
   smassh,
-  python311,
+  python3,
   testers,
 }:
 
-let
-  python3 = python311;
-in
 python3.pkgs.buildPythonApplication rec {
   pname = "smassh";
   version = "3.1.6";

From 57bb5467500f96fb16fb1e3af3624d6e34480cd8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 0201/1497] thelounge: unpin python311

---
 pkgs/by-name/th/thelounge/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix
index 2c0114da11c1..3e54f1d3c27e 100644
--- a/pkgs/by-name/th/thelounge/package.nix
+++ b/pkgs/by-name/th/thelounge/package.nix
@@ -6,7 +6,7 @@
   nodejs,
   yarn,
   fixup-yarn-lock,
-  python311,
+  python3,
   npmHooks,
   cctools,
   sqlite,
@@ -39,13 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4=";
   };
 
-  # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding
-  # setuptools, but testing with that and 3.12 still fails.
   nativeBuildInputs = [
     nodejs
     yarn
     fixup-yarn-lock
-    python311
+    python3
+    python3.pkgs.distutils
     npmHooks.npmInstallHook
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
   buildInputs = [ sqlite ];

From 5a1f82be1bdccac0dc109170f541a281a5160612 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:31:06 +0200
Subject: [PATCH 0202/1497] volk_2: unpin python311

---
 pkgs/by-name/vo/volk_2/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
index 57b849fcc28b..fa32bf920a60 100644
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ b/pkgs/by-name/vo/volk_2/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  python311,
+  python3,
   enableModTool ? true,
   removeReferencesTo,
   fetchpatch,
@@ -49,10 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    # This version of the project wasn't updated to use Python 3.12 which
-    # doesn't include the deprecated distutils module.
-    python311
-    python311.pkgs.mako
+    python3
+    python3.pkgs.mako
+    python3.pkgs.distutils
     removeReferencesTo
   ];
 

From a84750bbb49e675b1b49278f49c95e66b6c2fd3f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 01:50:00 +0200
Subject: [PATCH 0203/1497] hyprshade: unpin python311

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f275e9a295..6293d5512544 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2253,7 +2253,7 @@ with pkgs;
     stdenv = gcc14Stdenv;
   };
 
-  hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
+  hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
 
   hyprlandPlugins = recurseIntoAttrs (
     callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }

From 3f133a589107302b0ac7798a5e2cecb519b05b53 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:22 +0200
Subject: [PATCH 0204/1497] manuskript: unping python311

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6293d5512544..c4a71c73c7ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12645,9 +12645,7 @@ with pkgs;
     }
   );
 
-  manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
-    python3Packages = python311Packages;
-  };
+  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
 
   minari = python3Packages.toPythonApplication python3Packages.minari;
 

From 75c00536edca19b51190fe18279660b4c5ec7bfa Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:36 +0200
Subject: [PATCH 0205/1497] steamback: unpin python311

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4a71c73c7ef..0c76cd2d1985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15297,7 +15297,7 @@ with pkgs;
 
   steam-run-free = steam-fhsenv-without-steam.run;
 
-  steamback = python311.pkgs.callPackage ../tools/games/steamback { };
+  steamback = python3.pkgs.callPackage ../tools/games/steamback { };
 
   protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
     steam-run = steam-run-free;

From 2a2b9ed586a74bf5aedb763dc721b2716ce3a006 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 02:06:50 +0200
Subject: [PATCH 0206/1497] deepsecrets: unpin python311

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c76cd2d1985..c99127205a82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15577,9 +15577,7 @@ with pkgs;
 
   deepdiff = with python3Packages; toPythonApplication deepdiff;
 
-  deepsecrets = callPackage ../tools/security/deepsecrets {
-    python3 = python311;
-  };
+  deepsecrets = callPackage ../tools/security/deepsecrets { };
 
   deep-translator = with python3Packages; toPythonApplication deep-translator;
 

From c8daad6b5932a969485dbde71f721906dadb6806 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Mon, 26 May 2025 11:16:06 -0700
Subject: [PATCH 0207/1497] python3Packages.monitorcontrol: 3.1.0 -> 4.1.1

---
 .../python-modules/monitorcontrol/default.nix | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/monitorcontrol/default.nix b/pkgs/development/python-modules/monitorcontrol/default.nix
index 0d1f27489291..cd40bac4b4e7 100644
--- a/pkgs/development/python-modules/monitorcontrol/default.nix
+++ b/pkgs/development/python-modules/monitorcontrol/default.nix
@@ -3,15 +3,14 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  poetry-core,
+  setuptools,
   pyudev,
   pytestCheckHook,
-  voluptuous,
 }:
 
 buildPythonPackage rec {
   pname = "monitorcontrol";
-  version = "3.1.0";
+  version = "4.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,27 +19,24 @@ buildPythonPackage rec {
     owner = "newAM";
     repo = "monitorcontrol";
     tag = version;
-    hash = "sha256-fu0Lm7Tcw7TCCBDXTTY20JBAM7oeesyeHQFFILeZxX0=";
+    hash = "sha256-4A7Cj2PWANZOmMSB9rH++TAf6SgyQd0OFULKa4JRu0s=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ pyudev ];
+  dependencies = [ pyudev ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    voluptuous
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ pname ];
 
-  meta = with lib; {
+  meta = {
     description = "Python monitor controls using DDC-CI";
     mainProgram = "monitorcontrol";
     homepage = "https://github.com/newAM/monitorcontrol";
-    changelog = "https://github.com/newAM/monitorcontrol/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ newam ];
+    changelog = "https://github.com/newAM/monitorcontrol/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ newam ];
   };
 }

From 6fe1b5b11010b2b5c4f3e5a20f3c702be92c1490 Mon Sep 17 00:00:00 2001
From: iwei20 <ivanw8288@gmail.com>
Date: Thu, 29 May 2025 20:27:02 -0700
Subject: [PATCH 0208/1497] Update and fix jextract for jdk23

---
 pkgs/by-name/je/jextract/copy_lib_clang.patch | 13 +++++++++++++
 pkgs/by-name/je/jextract/package.nix          | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/je/jextract/copy_lib_clang.patch

diff --git a/pkgs/by-name/je/jextract/copy_lib_clang.patch b/pkgs/by-name/je/jextract/copy_lib_clang.patch
new file mode 100644
index 000000000000..4b910ae275bd
--- /dev/null
+++ b/pkgs/by-name/je/jextract/copy_lib_clang.patch
@@ -0,0 +1,13 @@
+diff --git a/build.gradle b/build.gradle
+index 9ce544a..0c77609 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -79,7 +79,7 @@ task copyLibClang(type: Sync) {
+             "libclang.so.${clang_version}" : "*clang*"
+ 
+     from("${libclang_dir}") {
+-        include(clang_path_include)
++        include("libclang.so*")
+         include("libLLVM.*")
+         exclude("clang.exe")
+         into("libs")
diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 65c28acc2e4c..46ddcad2cf1c 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "jextract";
-  version = "unstable-2024-03-13";
+  version = "unstable-2025-05-08";
 
   src = fetchFromGitHub {
     owner = "openjdk";
     repo = "jextract";
-    rev = "b9ec8879cff052b463237fdd76382b3a5cd8ff2b";
-    hash = "sha256-+4AM8pzXPIO/CS3+Rd/jJf2xDvAo7K7FRyNE8rXvk5U=";
+    rev = "ab6b30fd189e33a52d366846202f2e9b9b280142";
+    hash = "sha256-cFXQo/DpjOuuW+HCP2G9HiOqdgVmmyPd3IXCB9X+w6M=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,11 @@ stdenv.mkDerivation {
 
   gradleFlags = [
     "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk22_home=${jdk23}"
+    "-Pjdk_home=${jdk23}"
+  ];
+
+  patches = [
+    ./copy_lib_clang.patch
   ];
 
   doCheck = true;
@@ -53,7 +57,5 @@ stdenv.mkDerivation {
       jlesquembre
       sharzy
     ];
-    # Not yet updated for JDK 23
-    broken = true;
   };
 }

From e4a171790d37a2f2b9d4a50bf7bf353a26aaafc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 04:55:15 +0000
Subject: [PATCH 0209/1497] ocenaudio: 3.14.11 -> 3.15

---
 pkgs/by-name/oc/ocenaudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/ocenaudio/package.nix b/pkgs/by-name/oc/ocenaudio/package.nix
index d75dde3ab0ba..63ca23d4e6e0 100644
--- a/pkgs/by-name/oc/ocenaudio/package.nix
+++ b/pkgs/by-name/oc/ocenaudio/package.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ocenaudio";
-  version = "3.14.11";
+  version = "3.15";
 
   src = fetchurl {
     name = "ocenaudio.deb";
     url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian12.deb?version=v${finalAttrs.version}";
-    hash = "sha256-+UQ4veSoqwNC6ENQVWmOFebiI6RQlV7rBL7n238xxyc=";
+    hash = "sha256-MZjgdCBE+3dG6Ov+wwDKa/0Y8XIihwM50Gc/cgEf2FQ=";
   };
 
   nativeBuildInputs = [

From 4f4d591cd4a54513aea45223bb6c8d35e10ba115 Mon Sep 17 00:00:00 2001
From: Diego <diego@strebel.com>
Date: Fri, 30 May 2025 12:51:23 +0200
Subject: [PATCH 0210/1497] bitbox: 4.47.2 -> 4.47.3

---
 pkgs/by-name/bi/bitbox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index 95924f254bbb..77f40c4bce9e 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.47.2";
+  version = "4.47.3";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-sRE+Nnb3oqiJEjqiyG+3/sZLp23nquw5+4VpbZVFCQ8=";
+    hash = "sha256-Rxlj9Xm78xI61ynOonokxii2jnemumWy6fX+82bDp+w=";
   };
 
   postPatch = ''

From e27f65376c49a45f8c2546c8b68cc0cc4b002b4b Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Fri, 30 May 2025 13:03:53 +0200
Subject: [PATCH 0211/1497] foonathan-memory: 0.7-3 -> 0.7-4

https://github.com/foonathan/memory/releases/tag/v0.7-4
---
 .../0001-Use-system-doctest.patch.patch       | 26 +++++++++++++++++++
 pkgs/by-name/fo/foonathan-memory/package.nix  | 18 ++++++-------
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch

diff --git a/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch b/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
new file mode 100644
index 000000000000..6c7934370722
--- /dev/null
+++ b/pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de>
+Date: Wed, 2 Dec 2020 15:59:22 +0100
+Subject: Use system doctest
+
+Forwarded: not-needed
+---
+ test/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 37359ea..f269cfb 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -8,11 +8,7 @@ target_link_libraries(foonathan_memory_profiling foonathan_memory)
+ target_include_directories(foonathan_memory_profiling PRIVATE
+                             ${FOONATHAN_MEMORY_SOURCE_DIR}/include/foonathan/memory)
+ 
+-# Fetch doctest.
+-message(STATUS "Fetching doctest")
+-include(FetchContent)
+-FetchContent_Declare(doctest URL https://github.com/doctest/doctest/archive/refs/tags/v2.4.12.zip)
+-FetchContent_MakeAvailable(doctest)
++find_package(doctest REQUIRED)
+ 
+ set(tests
+     test_allocator.hpp
diff --git a/pkgs/by-name/fo/foonathan-memory/package.nix b/pkgs/by-name/fo/foonathan-memory/package.nix
index ecfd1a226b8b..703ff9e464ec 100644
--- a/pkgs/by-name/fo/foonathan-memory/package.nix
+++ b/pkgs/by-name/fo/foonathan-memory/package.nix
@@ -2,28 +2,25 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   doctest,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "foonathan-memory";
-  version = "0.7-3";
+  version = "0.7-4";
 
   src = fetchFromGitHub {
     owner = "foonathan";
     repo = "memory";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nLBnxPbPKiLCFF2TJgD/eJKJJfzktVBW3SRW2m3WK/s=";
+    hash = "sha256-qGbI7SL6lDbJzn2hkqaYw35QAyvSPxcZTb0ltDkPUSo=";
   };
 
   patches = [
     # do not download doctest, use the system doctest instead
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch";
-      hash = "sha256-/MuDeeIh+7osz11VfsAsQzm9HMZuifff+MDU3bDDxRE=";
-    })
+    # originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch
+    ./0001-Use-system-doctest.patch.patch
   ];
 
   outputs = [
@@ -44,12 +41,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   # fix a circular dependency between "out" and "dev" outputs
   postInstall = ''
-    mkdir -p $dev/lib
-    mv $out/lib/foonathan_memory $dev/lib/
+    mkdir -p $out/lib/cmake
+    mv $out/lib/foonathan_memory/cmake $out/lib/cmake/foonathan_memory
+    rmdir $out/lib/foonathan_memory
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/foonathan/memory";
+    homepage = "https://memory.foonathan.net/";
     changelog = "https://github.com/foonathan/memory/releases/tag/${finalAttrs.src.rev}";
     description = "STL compatible C++ memory allocator library";
     mainProgram = "nodesize_dbg";

From 4520789b04bcb91f0da64b7e6ccfc734da989366 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Fri, 30 May 2025 07:37:10 -0500
Subject: [PATCH 0212/1497] game-devices-udev-rules: 0.23 -> 0.24

---
 pkgs/by-name/ga/game-devices-udev-rules/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/game-devices-udev-rules/package.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
index f4b50120ef20..0c56f3fb1041 100644
--- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix
+++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "game-devices-udev-rules";
-  version = "0.23";
+  version = "0.24";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "fabiscafe";
     repo = "game-devices-udev";
     rev = finalAttrs.version;
-    hash = "sha256-dWWo3qXnxdLP68NuFKM4/Cw5yE6uAsWzj0vZa9UTT0U=";
+    hash = "sha256-b2NBgGpRQ2pQZYQgiRSAt0loAxq1NEByRHVkQQRDOj0=";
   };
 
   postInstall = ''

From b67bacd756bdd21284a5e79eff1eee98379ae2ff Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Fri, 30 May 2025 07:37:48 -0500
Subject: [PATCH 0213/1497] game-devices-udev-rules: modernize

---
 pkgs/by-name/ga/game-devices-udev-rules/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ga/game-devices-udev-rules/package.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
index 0c56f3fb1041..fedae75f3c97 100644
--- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix
+++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "codeberg.org";
     owner = "fabiscafe";
     repo = "game-devices-udev";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-b2NBgGpRQ2pQZYQgiRSAt0loAxq1NEByRHVkQQRDOj0=";
   };
 
@@ -23,17 +23,17 @@ stdenv.mkDerivation (finalAttrs: {
     --replace-fail "/bin/sh" "${bash}/bin/bash"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Udev rules to make supported controllers available with user-grade permissions";
     homepage = "https://codeberg.org/fabiscafe/game-devices-udev";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     longDescription = ''
       These udev rules are intended to be used as a package under 'services.udev.packages'.
       They will not be activated if installed as 'environment.systemPackages' or 'users.user.<user>.packages'.
 
       Additionally, you may need to enable 'hardware.uinput'.
     '';
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ keenanweaver ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ keenanweaver ];
   };
 })

From a961dc9a4d27f9ed93ab9011e78df64044976672 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 30 May 2025 13:00:18 +0000
Subject: [PATCH 0214/1497] algol68g: 3.4.2 -> 3.5.14

---
 pkgs/by-name/al/algol68g/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix
index 9873c1a09a48..70c862e4e610 100644
--- a/pkgs/by-name/al/algol68g/package.nix
+++ b/pkgs/by-name/al/algol68g/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "algol68g";
-  version = "3.4.2";
+  version = "3.5.14";
 
   src = fetchurl {
     url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hKiRMU98sZhGgHhjgtwUNSIv2iPgb4T+dgYw58IGK8Q=";
+    hash = "sha256-uIy8rIhUjohiQJ/K5EprsIISXMAx1w27I3cGo/9H9Wk=";
   };
 
   outputs = [

From 606afc277267ec9b4b926bec6ca1c8d04fb7c6d2 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 30 May 2025 09:18:06 -0400
Subject: [PATCH 0215/1497] librewolf-unwrapped: 139.0-1 -> 139.0.1-1

Diff: https://codeberg.org/librewolf/source/compare/139.0-1...139.0.1-1

Changelog: https://codeberg.org/librewolf/source/releases/tag/139.0.1-1
---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 91f4e6e1e690..7c53666455cd 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "139.0-1",
+  "packageVersion": "139.0.1-1",
   "source": {
-    "rev": "139.0-1",
-    "hash": "sha256-dhi9hUgEoOFQj7IixFKz1J81zo43h4MkAMpr2OIgass="
+    "rev": "139.0.1-1",
+    "hash": "sha256-3qMMu33y4MCPSUsFCMNd7CDEJjZJsfLdjPSFRC/obQg="
   },
   "firefox": {
-    "version": "139.0",
-    "hash": "sha512-hKK0fy/3GqwiandKsKyauNmhb1YgoG96u2ZIcyIJ0CKu81qdSHPpHr1npPxJT8I4Uk4lw4+tgEbbJq/aBub5cA=="
+    "version": "139.0.1",
+    "hash": "sha512-eK4Q/BSQDrEnO3/3mKFZUE9oFmw5sfEu+eoEJD3rx4RywkSZ2gFkFZD+tdKyhHUTHS7JTW8o/U8vZEpyH39Aug=="
   }
 }

From ee06a3a7bfa7c58dc6b5e526cf1c611f64b017a0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 30 May 2025 13:33:34 +0000
Subject: [PATCH 0216/1497] altair: 8.2.3 -> 8.2.5

Diff: https://github.com/imolorhe/altair/compare/v8.2.3...v8.2.5
---
 pkgs/by-name/al/altair/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix
index 074b78c145c0..e36add0cc407 100644
--- a/pkgs/by-name/al/altair/package.nix
+++ b/pkgs/by-name/al/altair/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "altair";
-  version = "8.2.3";
+  version = "8.2.5";
 
   src = fetchurl {
     url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-oOtQbTKD9UY+aXPqphGHeaXWxMI0/+9q82QaiQSXvwA=";
+    sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 6464331b636183650c1bb72301bdc3a4a2ad9826 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Fri, 30 May 2025 16:51:59 +0300
Subject: [PATCH 0217/1497] gsl-lite: 0.43.0 -> 1.0.1

---
 pkgs/by-name/gs/gsl-lite/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix
index 250263fa1751..8a916de95881 100644
--- a/pkgs/by-name/gs/gsl-lite/package.nix
+++ b/pkgs/by-name/gs/gsl-lite/package.nix
@@ -4,18 +4,16 @@
   fetchFromGitHub,
   cmake,
   ninja,
-  installCompatHeader ? false,
-  installLegacyHeaders ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gsl-lite";
-  version = "0.43.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "gsl-lite";
     repo = "gsl-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9mvbD7zVTtfFRy2qIYJpU9XAlAW4ZLh5DE3WPEQpf38=";
+    hash = "sha256-QlAeXUKVzH0QYxbKgWPS64h1iL4nnsmJ10h/wzoxq78=";
   };
 
   nativeBuildInputs = [
@@ -25,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck)
-    (lib.cmakeBool "GSL_LITE_OPT_INSTALL_COMPAT_HEADER" installCompatHeader)
-    (lib.cmakeBool "GSL_LITE_OPT_INSTALL_LEGACY_HEADERS" installLegacyHeaders)
   ];
 
   # Building tests is broken on Darwin.

From 943cc6fc1d9e93de09c1b18d4a5680c51884cac3 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Fri, 30 May 2025 16:02:22 +0200
Subject: [PATCH 0218/1497] matrix-hookshot: 6.0.3 -> 7.0.0

https://github.com/matrix-org/matrix-hookshot/releases/tag/7.0.0
---
 pkgs/by-name/ma/matrix-hookshot/package.json | 22 +++++++++++---------
 pkgs/by-name/ma/matrix-hookshot/pin.json     |  8 +++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json
index 157be7de5f58..c954ca35e9bf 100644
--- a/pkgs/by-name/ma/matrix-hookshot/package.json
+++ b/pkgs/by-name/ma/matrix-hookshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "6.0.3",
+  "version": "7.0.0",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",
@@ -32,10 +32,11 @@
     "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",
     "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js",
     "test": "NODE_OPTIONS=--no-experimental-strip-types mocha -r ts-node/register tests/init.ts 'tests/*.ts'  'tests/**/*.ts'",
-    "test:e2e": "NODE_OPTIONS=--no-experimental-strip-types tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src  && yarn node --experimental-vm-modules $(yarn bin jest)",
+    "test:e2e": "vitest",
     "test:cover": "NODE_OPTIONS=--no-experimental-strip-types nyc --reporter=lcov --reporter=text yarn test",
     "lint": "yarn run lint:js && yarn run lint:rs",
-    "lint:js": "eslint",
+    "lint:js": "yarn prettier -c src tests spec web scripts docs && eslint",
+    "lint:js:apply": "yarn prettier -w src tests spec web scripts docs && eslint --fix",
     "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings",
     "lint:rs:apply": "cargo clippy --fix && cargo fmt --all",
     "generate-default-config": "ts-node src/config/Defaults.ts --config > config.sample.yml",
@@ -51,7 +52,7 @@
     "@vector-im/compound-design-tokens": "^2.0.1",
     "@vector-im/compound-web": "^7.3.0",
     "ajv": "^8.11.0",
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
     "clsx": "^2.1.1",
     "cors": "^2.8.5",
     "date-fns": "^4.1.0",
@@ -76,12 +77,14 @@
     "source-map-support": "^0.5.21",
     "string-argv": "^0.3.1",
     "tiny-typed-emitter": "^2.1.0",
+    "url-join": "^5.0.0",
     "vite-plugin-magical-svg": "^1.1.1",
     "winston": "^3.11.0",
     "xml2js": "^0.6.2",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
+    "@babel/core": "^7.26.9",
     "@codemirror/lang-javascript": "^6.0.2",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.15.0",
@@ -90,13 +93,13 @@
     "@octokit/webhooks-types": "^7.6.1",
     "@preact/preset-vite": "^2.9.1",
     "@rollup/plugin-alias": "^5.1.0",
+    "@testcontainers/redis": "^10.25.0",
     "@tsconfig/node22": "^22",
     "@types/ajv": "^1.0.0",
     "@types/busboy": "^1.5.4",
     "@types/chai": "^4.2.22",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",
-    "@types/jest": "^29.5.11",
     "@types/jira-client": "^7.1.0",
     "@types/markdown-it": "^13.0.7",
     "@types/micromatch": "^4.0.1",
@@ -105,25 +108,24 @@
     "@types/node": "^22",
     "@types/xml2js": "^0.4.11",
     "@uiw/react-codemirror": "^4.12.3",
-    "@babel/core": "^7.26.9",
-    "babel-jest": "^29.7.0",
     "busboy": "^1.6.0",
     "chai": "^4",
     "eslint": "^9.15.0",
     "eslint-plugin-chai-expect": "^3.1.0",
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-react": "^7.37.2",
-    "homerunner-client": "^1.1.0",
-    "jest": "^29.7.0",
     "mocha": "^10.8.2",
     "nyc": "^17.1.0",
     "preact": "^10.26.2",
+    "prettier": "^3.5.3",
     "rimraf": "6.0.1",
     "sass": "^1.81.0",
+    "testcontainers": "^10.25.0",
     "ts-node": "10.9.2",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.16.0",
-    "vite": "^5.4.12"
+    "vite": "^5.4.19",
+    "vitest": "^3.1.3"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json
index d7f4ae38ab69..bebd0a297af8 100644
--- a/pkgs/by-name/ma/matrix-hookshot/pin.json
+++ b/pkgs/by-name/ma/matrix-hookshot/pin.json
@@ -1,6 +1,6 @@
 {
-  "version": "6.0.3",
-  "srcHash": "sha256-r7CMHaLkb+YMHjBmItal1+Fa9GW7qwIcgUIY9DdfTgM=",
-  "yarnHash": "1mga0d81xsydqrr8wbwysm4d74xjw13dicw66x3zbqn94lpcsw6g",
-  "cargoHash": "sha256-4Ix5eqv3BMoTzfadayJqXICW+zZzSp2e6XJQrWraW60="
+  "version": "7.0.0",
+  "srcHash": "sha256-MBET/oRvCToCnkUsbSK/6BzE2nrg33BzVuKAuu2BnkQ=",
+  "yarnHash": "1lmakjgpflx8zcvl4ycn529dgkyp8yic9xhpwajdyj6dc56blpbb",
+  "cargoHash": "sha256-1eBiLZHGNJxXNCVavkKt0xckAD2cilOW2wNCtqJ8O4g="
 }

From 7063762d13524286c73085a3c986b2595ed5e10e Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Fri, 30 May 2025 16:23:32 +0200
Subject: [PATCH 0219/1497] lib/types: add doc warning to addCheck

---
 lib/types.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 715da842ac01..5ef16ef2a0a3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1455,8 +1455,14 @@ let
           nestedTypes.coercedType = coercedType;
           nestedTypes.finalType = finalType;
         };
+      /**
+        Augment the given type with an additional type check function.
 
-      # Augment the given type with an additional type check function.
+        :::{.warning}
+        This function has some broken behavior see: [#396021](https://github.com/NixOS/nixpkgs/issues/396021)
+        Fixing is not trivial, we appreciate any help!
+        :::
+      */
       addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
 
     };

From 7f030992944ff9bc51dc451bedc3a9ddb6d8f19d Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Thu, 29 May 2025 18:26:32 +0300
Subject: [PATCH 0220/1497] burpsuite: add updateScript

---
 pkgs/by-name/bu/burpsuite/package.nix |  2 ++
 pkgs/by-name/bu/burpsuite/update.sh   | 39 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100755 pkgs/by-name/bu/burpsuite/update.sh

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index b3d2fea710aa..17d84183b9f6 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -91,6 +91,8 @@ buildFHSEnv {
     cp -r ${desktopItem}/share/applications $out/share
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = with lib; {
     inherit description;
     longDescription = ''
diff --git a/pkgs/by-name/bu/burpsuite/update.sh b/pkgs/by-name/bu/burpsuite/update.sh
new file mode 100755
index 000000000000..7d0214045c50
--- /dev/null
+++ b/pkgs/by-name/bu/burpsuite/update.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq xxd gnused diffutils
+set -eu -o pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+curl -s 'https://portswigger.net/burp/releases/data' |
+  jq -r '
+      [[
+        .ResultSet.Results[]
+        | select(
+            (.categories | sort) == (["Professional","Community"] | sort)
+            and .releaseChannels == ["Early Adopter"]
+          )
+      ][0].builds[]
+      | select(.ProductPlatform == "Jar")
+    ]' >latest.json
+
+version=$(jq -r '.[0].Version' latest.json)
+
+comm_hex=$(jq -r '.[] | select(.ProductId=="community") .Sha256Checksum' latest.json)
+pro_hex=$(jq -r '.[] | select(.ProductId=="pro") .Sha256Checksum' latest.json)
+
+comm_sri="sha256-$(printf %s "$comm_hex" | xxd -r -p | base64 -w0)"
+pro_sri="sha256-$(printf %s "$pro_hex" | xxd -r -p | base64 -w0)"
+
+sed -i \
+  -e "s|^\(\s*version = \)\"[^\"]*\";|\1\"$version\";|" \
+  -e "/productName = \"community\"/,/hash =/ {
+        s|sha256-[^\"]*|$comm_sri|
+     }" \
+  -e "/productName = \"pro\"/,/hash =/ {
+        s|sha256-[^\"]*|$pro_sri|
+     }" \
+  $SCRIPT_DIR/package.nix
+
+echo "burpsuite → $version"
+echo "  community: $comm_sri"
+echo "  pro      : $pro_sri"

From 037c360635a2a548694a4411dafa95857cfff3f7 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Fri, 30 May 2025 18:15:43 +0200
Subject: [PATCH 0221/1497] victoriametrics: add update script for
 maintainers/scripts/update.nix

---
 pkgs/by-name/vi/victoriametrics/package.nix |  7 +++++--
 pkgs/by-name/vi/victoriametrics/update.sh   | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/vi/victoriametrics/update.sh

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 2cb333913c17..3bda816fd16f 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -78,8 +78,11 @@ buildGoModule (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  passthru.tests = {
-    inherit (nixosTests) victoriametrics;
+  passthru = {
+    tests = {
+      inherit (nixosTests) victoriametrics;
+    };
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/vi/victoriametrics/update.sh b/pkgs/by-name/vi/victoriametrics/update.sh
new file mode 100755
index 000000000000..84f2f275740e
--- /dev/null
+++ b/pkgs/by-name/vi/victoriametrics/update.sh
@@ -0,0 +1,13 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq nix-update
+
+set -ex
+
+curl_github() {
+    curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
+}
+
+latestRelease=$(curl_github https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr "$latestRelease" : 'v\(.*\)')"
+
+nix-update --version "$latestVersion" victoriametrics

From 02071f39e370bd5ade093278a7dbb0126f32d138 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Fri, 30 May 2025 18:16:02 +0200
Subject: [PATCH 0222/1497] victoriametrics: 1.117.1 -> 1.118.0

---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 3bda816fd16f..62fab4ed0ae6 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.117.1";
+  version = "1.118.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0=";
+    hash = "sha256-a84n9fuGdiG0o/1/9q3etTwoFbOL01y88ubTI/yIIBA=";
   };
 
   vendorHash = null;

From 5899008057fafda4c645ae234c4335cefe2b2844 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 17:23:23 +0000
Subject: [PATCH 0223/1497] python3Packages.types-s3transfer: 0.12.0 -> 0.13.0

---
 pkgs/development/python-modules/types-s3transfer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix
index ea5fbb47b4fc..33ed774c42f6 100644
--- a/pkgs/development/python-modules/types-s3transfer/default.nix
+++ b/pkgs/development/python-modules/types-s3transfer/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-s3transfer";
-  version = "0.12.0";
+  version = "0.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_s3transfer";
     inherit version;
-    hash = "sha256-+PWSAUgekENihzvwvjJn8lnWCtlG69/LhH0JKh+ib5g=";
+    hash = "sha256-ID2ty5hlwvaPtEvARA4dwFt5GXukpkHAl2wmya9171I=";
   };
 
   build-system = [ setuptools ];

From 8a9641f84e37a9d3626fb08b8e8aa0568c78ab8f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 20:15:03 +0200
Subject: [PATCH 0224/1497] python313Packages.opensfm: disable flaky test

---
 pkgs/development/python-modules/opensfm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix
index c7b8f3f7a368..58f6003d7c5a 100644
--- a/pkgs/development/python-modules/opensfm/default.nix
+++ b/pkgs/development/python-modules/opensfm/default.nix
@@ -125,6 +125,7 @@ buildPythonPackage rec {
   disabledTests =
     [
       "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build
+      "test_match_candidates_from_metadata_bow" # flaky
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "test_reconstruction_incremental"

From a31f77a520ceccfd558d28fd6858f6eb362e286d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 20:23:15 +0200
Subject: [PATCH 0225/1497] harper: 0.39.0 -> 0.40.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.40.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 89ab0226377f..ea6eca7fe723 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.39.0";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-SLAhjeZOjng+ATKXN32VBhThmaP+YQZd6l9HnbqlHjQ=";
+    hash = "sha256-QrIRfAehrKgJwAB3pWfSpIUnIwRLjuuRbTEgUpCe2LM=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-tp5WO1FfzkUG69XWnRMW0njCPxr1/A/8ZfQ49xAkpVs=";
+  cargoHash = "sha256-hkr7gNRwY+L45Efk6mWPrykj60n3ChryBKRFCC4W1Q0=";
 
   passthru.updateScript = nix-update-script { };
 

From 3c91dc3f90c7865e94a11bc4705d3b1f2bfd82d7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 30 May 2025 20:41:38 +0200
Subject: [PATCH 0226/1497] python313Packages.pygame-gui: 0613 -> 0614

---
 pkgs/development/python-modules/pygame-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 4b6132f16455..e045ccf5af53 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pygame-gui";
-  version = "0613";
+  version = "0614";
   pyproject = true;
   # nixpkgs-update: no auto update
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "MyreMylar";
     repo = "pygame_gui";
     tag = "v_${version}";
-    hash = "sha256-vLDl3VcrjjWpw4hLuKmomK6EykF1VK1CGLkEqjNUQ/Q=";
+    hash = "sha256-wLvWaJuXMXk7zOaSZfIpsXhQt+eCjOtlh8IRuKbR75o=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 6962d391678eba678a1e196280d48be9ea880fab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 19:44:08 +0000
Subject: [PATCH 0227/1497] openterface-qt: 0.3.12 -> 0.3.14

---
 pkgs/by-name/op/openterface-qt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index 543c192aa972..e80e78732f9e 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "openterface-qt";
-  version = "0.3.12";
+  version = "0.3.14";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
     rev = "${final.version}";
-    hash = "sha256-VB2DTfm6X5xY+bGQBq9VXe6boJJTDxBkPEdLvPbd71g=";
+    hash = "sha256-HHHLQwycnMme3Ch538ram6tkG3OYUcd4NFCUcL4vIjk=";
   };
   nativeBuildInputs = [
     copyDesktopItems

From 11291afcb3f633920281af8d9bc71091d1dd70ca Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Fri, 30 May 2025 07:18:02 +0800
Subject: [PATCH 0228/1497] testers.hasCmakeConfigModules: init

---
 doc/build-helpers/testers.chapter.md          | 20 +++++
 doc/redirects.json                            |  6 ++
 pkgs/build-support/testers/default.nix        |  2 +
 .../testers/hasCmakeConfigModules/tester.nix  | 86 +++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 pkgs/build-support/testers/hasCmakeConfigModules/tester.nix

diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index 9e46635c600c..7f7e6bd7d3e7 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -40,6 +40,26 @@ If the `moduleNames` argument is omitted, `hasPkgConfigModules` will use `meta.p
 
 :::
 
+## `hasCmakeConfigModules` {#tester-hasCmakeConfigModules}
+
+Checks whether a package exposes a given list of `*config.cmake` modules.
+Note the moduleNames used in cmake find_package are case sensitive.
+
+:::{.example #ex-hascmakeconfigmodules}
+
+# Check that `*config.cmake` modules are exposed using explicit module names
+
+```nix
+{
+  passthru.tests.cmake-config = testers.hasCmakeConfigModules {
+    package = finalAttrs.finalPackage;
+    moduleNames = [ "Foo" ];
+  };
+}
+```
+
+:::
+
 ## `lycheeLinkCheck` {#tester-lycheeLinkCheck}
 
 Check a packaged static site's links with the [`lychee` package](https://search.nixos.org/packages?show=lychee&type=packages&query=lychee).
diff --git a/doc/redirects.json b/doc/redirects.json
index 4c243c6cc852..b93961666a4b 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -1694,6 +1694,12 @@
   "ex-haspkgconfigmodules-explicitmodules": [
     "index.html#ex-haspkgconfigmodules-explicitmodules"
   ],
+  "tester-hasCmakeConfigModules": [
+    "index.html#tester-hasCmakeConfigModules"
+  ],
+  "ex-hascmakeconfigmodules": [
+    "index.html#ex-hascmakeconfigmodules"
+  ],
   "tester-lycheeLinkCheck": [
     "index.html#tester-lycheeLinkCheck"
   ],
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index b48320f7e270..3a2fcbfa4d1d 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -225,6 +225,8 @@
       );
   hasPkgConfigModules = callPackage ./hasPkgConfigModules/tester.nix { };
 
+  hasCmakeConfigModules = callPackage ./hasCmakeConfigModules/tester.nix { };
+
   testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { };
 
   shellcheck = callPackage ./shellcheck/tester.nix { };
diff --git a/pkgs/build-support/testers/hasCmakeConfigModules/tester.nix b/pkgs/build-support/testers/hasCmakeConfigModules/tester.nix
new file mode 100644
index 000000000000..85938ef3bf4f
--- /dev/null
+++ b/pkgs/build-support/testers/hasCmakeConfigModules/tester.nix
@@ -0,0 +1,86 @@
+# Static arguments
+{
+  lib,
+  runCommandCC,
+  cmake,
+}:
+
+# Tester arguments
+{
+  package,
+  moduleNames,
+  # Extra nativeBuildInputs needed to pass the cmake find_package test, e.g. pkg-config.
+  nativeBuildInputs ? [ ],
+  # buildInputs is used to help pass the cmake find_package test.
+  # The purpose of buildInputs here is to allow us to iteratively add
+  # any missing dependencies required by the *Config.cmake module
+  # during testing. This allows us to test and fix the CMake setup
+  # without rebuilding the finalPackage each time. Once all required
+  # packages are properly added to the finalPackage's propagateBuildInputs,
+  # this buildInputs should be set to an empty list [].
+  buildInputs ? [ ],
+  # Extra cmakeFlags needed to pass the cmake find_package test.
+  # Can be used to set verbose/debug flags.
+  cmakeFlags ? [ ],
+  testName ? "check-cmake-config-${package.pname or package.name}",
+  version ? package.version or null,
+  versionCheck ? false,
+}:
+
+runCommandCC testName
+  {
+    inherit moduleNames versionCheck cmakeFlags;
+    version = if versionCheck then version else null;
+    nativeBuildInputs = [
+      cmake
+    ] ++ nativeBuildInputs;
+    buildInputs = [ package ] ++ buildInputs;
+    meta =
+      {
+        description = "Test whether ${package.name} exposes cmake-config modules ${lib.concatStringsSep ", " moduleNames}";
+      }
+      # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org,
+      # as hydra can't check this meta info in dependencies.
+      # The test itself is just Nixpkgs, with MIT license.
+      // builtins.intersectAttrs {
+        available = throw "unused";
+        broken = throw "unused";
+        insecure = throw "unused";
+        license = throw "unused";
+        maintainers = throw "unused";
+        teams = throw "unused";
+        platforms = throw "unused";
+        unfree = throw "unused";
+        unsupported = throw "unused";
+      } package.meta;
+  }
+  ''
+    touch "$out"
+    notFound=0
+    for moduleName in $moduleNames; do
+      echo "checking cmake-config module $moduleName"
+
+      cat <<EOF > CMakeLists.txt
+    cmake_minimum_required(VERSION 3.14)
+    project(CheckCmakeModule)
+
+    find_package($moduleName $version EXACT NO_MODULE REQUIRED)
+    EOF
+
+      echoCmd 'cmake flags' $cmakeFlags
+      set +e
+      cmake . $cmakeFlags
+      r=$?
+      set -e
+      if [[ $r = 0 ]]; then
+        echo "✅ cmake-config module $moduleName exists"
+      else
+        echo "❌ cmake-config module $moduleName was not found"
+        ((notFound+=1))
+      fi
+    done
+
+    if [[ $notFound -ne 0 ]]; then
+      exit 1
+    fi
+  ''

From e4ab873cc1e63bbd704d580ac7cc2269839a5381 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Fri, 30 May 2025 17:58:58 +0800
Subject: [PATCH 0229/1497] testers.hasCmakeConfigModules: add self tests

---
 .../testers/hasCmakeConfigModules/tests.nix   | 73 +++++++++++++++++++
 pkgs/build-support/testers/test/default.nix   |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/build-support/testers/hasCmakeConfigModules/tests.nix

diff --git a/pkgs/build-support/testers/hasCmakeConfigModules/tests.nix b/pkgs/build-support/testers/hasCmakeConfigModules/tests.nix
new file mode 100644
index 000000000000..d691916db82f
--- /dev/null
+++ b/pkgs/build-support/testers/hasCmakeConfigModules/tests.nix
@@ -0,0 +1,73 @@
+# cd nixpkgs
+# nix-build -A tests.testers.hasCmakeConfigModules
+{
+  lib,
+  testers,
+  boost,
+  mpi,
+  eigen,
+  runCommand,
+}:
+
+lib.recurseIntoAttrs {
+
+  boost-versions-match = testers.hasCmakeConfigModules {
+    package = boost;
+    moduleNames = [
+      "Boost"
+      "boost_math"
+    ];
+    versionCheck = true;
+  };
+
+  boost-versions-mismatch = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = boost;
+      moduleNames = [
+        "Boost"
+        "boost_math"
+      ];
+      version = "1.2.3"; # Deliberately-incorrect version number
+      versionCheck = true;
+    }
+  );
+
+  boost-no-versionCheck = testers.hasCmakeConfigModules {
+    package = boost;
+    moduleNames = [
+      "Boost"
+      "boost_math"
+    ];
+    version = "1.2.3"; # Deliberately-incorrect version number
+    versionCheck = false;
+  };
+
+  boost-has-boost_mpi = testers.hasCmakeConfigModules {
+    package = boost.override { useMpi = true; };
+    moduleNames = [
+      "boost_mpi"
+    ];
+    buildInputs = [ mpi ];
+  };
+
+  boost_mpi-does-not-have-mpi = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = boost.override { useMpi = true; };
+      moduleNames = [
+        "boost_mpi"
+      ];
+    }
+  );
+
+  eigen-has-Eigen = testers.hasCmakeConfigModules {
+    package = eigen;
+    moduleNames = [ "Eigen3" ];
+  };
+
+  eigen-does-not-have-eigen = testers.testBuildFailure (
+    testers.hasCmakeConfigModules {
+      package = eigen;
+      moduleNames = [ "eigen3" ];
+    }
+  );
+}
diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix
index fbcf6c0cad7d..ec54b7044c28 100644
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@@ -37,6 +37,8 @@ lib.recurseIntoAttrs {
 
   hasPkgConfigModules = pkgs.callPackage ../hasPkgConfigModules/tests.nix { };
 
+  hasCmakeConfigModules = pkgs.callPackage ../hasCmakeConfigModules/tests.nix { };
+
   shellcheck = pkgs.callPackage ../shellcheck/tests.nix { };
 
   shfmt = pkgs.callPackages ../shfmt/tests.nix { };

From bb3d46c9943623f078d3fcd46a336b3c5d9346c0 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 24 May 2025 21:13:58 +0800
Subject: [PATCH 0230/1497] c-blosc2: add cmake-config and propagate
 buildInputs

---
 pkgs/by-name/ad/adios2/package.nix       |  6 ------
 pkgs/development/libraries/c-blosc/1.nix | 14 +++++++++-----
 pkgs/development/libraries/c-blosc/2.nix | 14 +++++++++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index 6dc9083f41dd..498e2246d258 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -11,7 +11,6 @@
   python3Packages,
   mpi,
   bzip2,
-  lz4,
   c-blosc2,
   hdf5-mpi,
   libfabric,
@@ -22,8 +21,6 @@
   zeromq,
   zfp,
   zlib,
-  zlib-ng,
-  zstd,
   ucx,
   yaml-cpp,
   nlohmann_json,
@@ -69,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     [
       mpi
       bzip2
-      lz4
       c-blosc2
       (hdf5-mpi.override { inherit mpi; })
       libfabric
@@ -80,8 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
       zeromq
       zfp
       zlib
-      zlib-ng # required by c-blocs2
-      zstd # required by c-blocs2
       yaml-cpp
       nlohmann_json
 
diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix
index 745521a686b7..6349063e3dd9 100644
--- a/pkgs/development/libraries/c-blosc/1.nix
+++ b/pkgs/development/libraries/c-blosc/1.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [
+  propagatedBuildInputs = [
     lz4
     zlib
     zstd
@@ -54,15 +54,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !static;
 
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "Blosc2" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
 
   meta = with lib; {
     description = "Blocking, shuffling and loss-less compression library";
     homepage = "https://www.blosc.org";
     changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [
-      "blosc"
-    ];
+    pkgConfigModules = [ "blosc2" ];
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ris ];
diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix
index 507c862c27f1..9c47d90f9849 100644
--- a/pkgs/development/libraries/c-blosc/2.nix
+++ b/pkgs/development/libraries/c-blosc/2.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [
+  propagatedBuildInputs = [
     lz4
     zlib-ng
     zstd
@@ -56,15 +56,19 @@ stdenv.mkDerivation (finalAttrs: {
   # possibly https://github.com/Blosc/c-blosc2/issues/432
   enableParallelChecking = false;
 
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "Blosc2" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
 
   meta = with lib; {
     description = "Fast, compressed, persistent binary data store library for C";
     homepage = "https://www.blosc.org";
     changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [
-      "blosc2"
-    ];
+    pkgConfigModules = [ "blosc2" ];
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ris ];

From fbd42376f9654be0625a798666064bd7b4190160 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 30 May 2025 22:27:27 +0200
Subject: [PATCH 0231/1497] nixos/jenkins: Make use of mkEnableOption

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../services/continuous-integration/jenkins/default.nix   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c76aac1fa7de..017608bbd1a6 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -11,13 +11,7 @@ in
 {
   options = {
     services.jenkins = {
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Whether to enable the jenkins continuous integration server.
-        '';
-      };
+      enable = lib.mkEnableOption "Jenkins, a continuous integration server";
 
       user = lib.mkOption {
         default = "jenkins";

From 131d83ea6a2459b24c93faaaad24d6613260e7ef Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 30 May 2025 22:37:11 +0200
Subject: [PATCH 0232/1497] nixos/jenkins: Introduce and make use of
 javaPackage option

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../services/continuous-integration/jenkins/default.nix       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 017608bbd1a6..f9bb85446784 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -83,6 +83,8 @@ in
 
       package = lib.mkPackageOption pkgs "jenkins" { };
 
+      javaPackage = lib.mkPackageOption pkgs "jdk17" { };
+
       packages = lib.mkOption {
         default = [
           pkgs.stdenv
@@ -233,7 +235,7 @@ in
 
       # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
       script = ''
-        ${pkgs.jdk17}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+        ${cfg.javaPackage}/bin/java ${lib.concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
                                                   -Djava.awt.headless=true \

From 46be72d31539780a988f60b3a5f46bc3726d9bad Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Fri, 30 May 2025 22:39:51 +0200
Subject: [PATCH 0233/1497] nixos/unitOption: remove unnecessary definition
 filtering

---
 nixos/lib/systemd-unit-options.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 0ddae4e20198..eff78fef265d 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -15,7 +15,6 @@ let
   inherit (lib)
     any
     concatMap
-    filterOverrides
     isList
     literalExpression
     mergeEqualOption
@@ -56,13 +55,10 @@ rec {
     name = "systemd option";
     merge =
       loc: defs:
-      let
-        defs' = filterOverrides defs;
-      in
-      if any (def: isList def.value) defs' then
-        concatMap (def: toList def.value) defs'
+      if any (def: isList def.value) defs then
+        concatMap (def: toList def.value) defs
       else
-        mergeEqualOption loc defs';
+        mergeEqualOption loc defs;
   };
 
   sharedOptions = {

From 6d8eca96ba0a8d55bbc4e4e1f21b7e1fa0d52e61 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Fri, 30 May 2025 22:45:46 +0200
Subject: [PATCH 0234/1497] sysctl: remove unnecessary definition filtering

---
 nixos/modules/config/sysctl.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 45f25180e07b..6489b406b2c7 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -9,7 +9,7 @@ let
         checkType = x: lib.isBool x || lib.isString x || lib.isInt x || x == null;
       in
       checkType val || (val._type or "" == "override" && checkType val.content);
-    merge = loc: defs: lib.mergeOneOption loc (lib.filterOverrides defs);
+    merge = loc: defs: lib.mergeOneOption loc defs;
   };
 
 in
@@ -22,9 +22,7 @@ in
       type =
         let
           highestValueType = lib.types.ints.unsigned // {
-            merge =
-              loc: defs:
-              lib.foldl (a: b: if b.value == null then null else lib.max a b.value) 0 (lib.filterOverrides defs);
+            merge = loc: defs: lib.foldl (a: b: if b.value == null then null else lib.max a b.value) 0 defs;
           };
         in
         lib.types.submodule {

From 3df624ee81ed176eaba0c7eccb50d4ac70744db1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 20:52:40 +0000
Subject: [PATCH 0235/1497] libvgm: 0-unstable-2025-05-03 ->
 0-unstable-2025-05-30

---
 pkgs/by-name/li/libvgm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index 33c0241dd862..6c95a800020e 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libvgm";
-  version = "0-unstable-2025-05-03";
+  version = "0-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "ValleyBell";
     repo = "libvgm";
-    rev = "47581c5cf51748c8c948cfc1a8473e563529e9bb";
-    hash = "sha256-BJBQ/qAOZ2ykU2+zZ+FaGK2gK0R4Bu3+u3WmJVnjgMw=";
+    rev = "82ba45d3906a0b54b6de2555468dd9e9598f617d";
+    hash = "sha256-+EMI8hGDE+oiOK4pHRfDJxmGAZ3SBecNhCoPhS95NAk=";
   };
 
   outputs = [

From 5ecd7ff46e93099ee85e05eb3c5bf38414a0b988 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Fri, 30 May 2025 22:53:22 +0200
Subject: [PATCH 0236/1497] pimsync: 0.4.1 -> 0.4.2

---
 pkgs/by-name/pi/pimsync/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix
index 0e3db37d2b31..c895512503de 100644
--- a/pkgs/by-name/pi/pimsync/package.nix
+++ b/pkgs/by-name/pi/pimsync/package.nix
@@ -4,31 +4,30 @@
   fetchFromSourcehut,
   pkg-config,
   sqlite,
-  scdoc,
   installShellFiles,
   makeWrapper,
+  versionCheckHook,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pimsync";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromSourcehut {
     owner = "~whynothugo";
     repo = "pimsync";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EHDGiyDGNr6cPj2N2cTV0f7I9vmM/WIZTsPR1f+HFIE=";
+    hash = "sha256-6oV9E6Q6FmCh24xT9+lsQ47GVs70sSujsn54dX6CPgY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/6YjyKB/xOCTNZlKewddEaZ1ZN2PC5dQoP0A5If67MA=";
+  cargoHash = "sha256-vnBk0uojWDM9PS8v5Qda2UflmIFZ09Qp9l25qTTWGMc=";
 
   PIMSYNC_VERSION = finalAttrs.version;
 
   nativeBuildInputs = [
     pkg-config
-    scdoc
     makeWrapper
     installShellFiles
   ];
@@ -37,13 +36,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     sqlite
   ];
 
-  postBuild = ''
-    make man
+  postInstall = ''
+    installManPage pimsync.1 pimsync.conf.5 pimsync-migration.7
   '';
 
-  postInstall = ''
-    installManPage target/pimsync.1 target/pimsync.conf.5 target/pimsync-migration.7
-  '';
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
 

From d1f0807db5ba3d1229917c338009ababb6463cac Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 30 May 2025 23:06:36 +0200
Subject: [PATCH 0237/1497] nixos/jenkins: Bump Java version to 21

Java 17 goes EOL in September 2026 and Jenkins already supports Java 21.
So bump the Java version to 21.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../services/continuous-integration/jenkins/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index f9bb85446784..96ded1e4c765 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -83,13 +83,13 @@ in
 
       package = lib.mkPackageOption pkgs "jenkins" { };
 
-      javaPackage = lib.mkPackageOption pkgs "jdk17" { };
+      javaPackage = lib.mkPackageOption pkgs "jdk21" { };
 
       packages = lib.mkOption {
         default = [
           pkgs.stdenv
           pkgs.git
-          pkgs.jdk17
+          pkgs.jdk21
           config.programs.ssh.package
           pkgs.nix
         ];

From 98da4519c9b8b3775c4d987dadc61ceaceeadfb2 Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Fri, 30 May 2025 16:08:46 -0600
Subject: [PATCH 0238/1497] linuxKernel.kernels.linux_zen: 6.14.7-zen1 ->
 6.14.9-zen1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 79d056d2cf91..7e789bed9399 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.14.7"; # zen
+      version = "6.14.9"; # zen
       suffix = "zen1"; # zen
-      sha256 = "04vcy71wjs6n1ahnva55i0czayn96w8qq0b0v0qymcq9lrbms2mr"; # zen
+      sha256 = "1v28cdv8dyn5181z242f63ns6b472jx8a7wmw77n5wijj8fv5ba1"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 4bf93b4e31eb2292f47f13131cd42bbafa589966 Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Fri, 30 May 2025 16:10:25 -0600
Subject: [PATCH 0239/1497] linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 ->
 6.14.9-lqx1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 7e789bed9399..852eacf43829 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -23,9 +23,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.14.7"; # lqx
+      version = "6.14.9"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "0in1ymvnac9kic974r5sqkk730fm71d49q0cgzk7lj1ykd9jzxpp"; # lqx
+      sha256 = "1f8sram3xabv119pznpixpm5igyxf33wkg4v8fm5nh9c9g91q19j"; # lqx
       isLqx = true;
     };
   };

From ea722c21ddea9a1ba2f221d560fc1022aa215ba3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 22:39:55 +0000
Subject: [PATCH 0240/1497] navidrome: 0.55.2 -> 0.56.1

---
 pkgs/by-name/na/navidrome/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix
index 39d1396f83bd..67292a0d7738 100644
--- a/pkgs/by-name/na/navidrome/package.nix
+++ b/pkgs/by-name/na/navidrome/package.nix
@@ -18,23 +18,23 @@
 
 buildGo124Module rec {
   pname = "navidrome";
-  version = "0.55.2";
+  version = "0.56.1";
 
   src = fetchFromGitHub {
     owner = "navidrome";
     repo = "navidrome";
     rev = "v${version}";
-    hash = "sha256-RJDWpaB0rdrwLSEjwLIZ7ymvYvFSX4/fIT3xFki3278=";
+    hash = "sha256-Vq8qfBqxF/PVRtYYTsFydnJ7z/IuoNUWRWTLy/RM6xg=";
   };
 
-  vendorHash = "sha256-stdYTvYwsu00l5sAW86nBlwnACOfyLbKi7Xn5gdM/7Y=";
+  vendorHash = "sha256-E7Q3wxUd5JAwERBKD2NZaVyj1kszOxvxeDY0s/fEDfY=";
 
   npmRoot = "ui";
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/ui";
-    hash = "sha256-lM8637tcKc9iSPjXJPDZXFCGj7pShOXTC6X2iketg90=";
+    hash = "sha256-tl6unHz0E0v0ObrfTiE0vZwVSyVFmrLggNM5QsUGsvI=";
   };
 
   nativeBuildInputs = [

From f9460c7b56e158f1f1d7b7487e6f0886257c2b9b Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 30 May 2025 16:16:53 -0700
Subject: [PATCH 0241/1497] llvmPackages_20: 20.1.5 -> 20.1.6

---
 .../compilers/llvm/common/llvm/default.nix           | 12 +-----------
 pkgs/development/compilers/llvm/default.nix          |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index e7d12650fa47..a605c17e492c 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -294,17 +294,7 @@ stdenv.mkDerivation (
       ++
         lib.optional (lib.versionAtLeast release_version "15")
           # Just like the `llvm-lit-cfg` patch, but for `polly`.
-          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
-      ++
-        lib.optional (lib.versions.major release_version == "20")
-          # https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
-          (
-            fetchpatch {
-              url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
-              stripLen = 1;
-              hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
-            }
-          );
+          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
 
     nativeBuildInputs =
       [
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0b04e572e881..60d249920833 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -31,7 +31,7 @@ let
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
-    "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
+    "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
       rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
       rev-version = "21.0.0-unstable-2025-05-25";

From 6617c167f75c5caf1707daff993f006c4e20b7dc Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sat, 31 May 2025 02:05:50 +0200
Subject: [PATCH 0242/1497] nixos/monero: use lib.getExe

---
 nixos/modules/services/networking/monero.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index 1ef0c696e2c8..f7351203b13d 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -225,7 +225,7 @@ in
       serviceConfig = {
         User = "monero";
         Group = "monero";
-        ExecStart = "${pkgs.monero-cli}/bin/monerod --config-file=${configFile} --non-interactive";
+        ExecStart = "${lib.getExe' pkgs.monero-cli "monerod"} --config-file=${configFile} --non-interactive";
         Restart = "always";
         SuccessExitStatus = [
           0

From 962525c1e7e72ba00cb68190c2259412a7899643 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sat, 3 May 2025 20:23:45 -0700
Subject: [PATCH 0243/1497] kodi: package build-time tools separately

Packaging buid-time tools internal to Kodi in separate derivations allow
for cross-compiling Kodi without mixing which dependencies are needed
for those build-time tools vs the Kodi runtime programs.
---
 pkgs/applications/video/kodi/unwrapped.nix | 589 +++++++++++----------
 1 file changed, 319 insertions(+), 270 deletions(-)

diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 4012b94eb450..937a2274548f 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -186,294 +186,343 @@ let
     lib.optional gbmSupport "gbm"
     ++ lib.optional waylandSupport "wayland"
     ++ lib.optional x11Support "x11";
-
 in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "kodi";
-  version = "21.2";
-  kodiReleaseName = "Omega";
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    texturePacker = buildPackages.callPackage (
+      {
+        cmake,
+        giflib,
+        libjpeg,
+        libpng,
+        lzo,
+        stdenv,
+        zlib,
+        pkg-config,
+      }:
+      stdenv.mkDerivation {
+        pname = finalAttrs.pname + "-build-tool-texture-packer";
+        inherit (finalAttrs) version src;
 
-  src = fetchFromGitHub {
-    owner = "xbmc";
-    repo = "xbmc";
-    rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
-    hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88=";
-  };
+        sourceRoot = "${finalAttrs.src.name}/tools/depends/native/TexturePacker/src";
 
-  patches = [
-    # Backport to fix build with Pipewire 1.4
-    # FIXME: remove in the next update
-    (fetchpatch {
-      url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch";
-      hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw=";
-    })
-  ];
+        nativeBuildInputs = [
+          pkg-config
+          cmake
+        ];
 
-  # make  derivations declared in the let binding available here, so
-  # they can be overridden
-  inherit
-    libdvdcss
-    libdvdnav
-    libdvdread
-    groovy
-    apache_commons_lang
-    apache_commons_text
-    ;
+        buildInputs = [
+          giflib
+          libjpeg
+          libpng
+          lzo
+          zlib
+        ];
 
-  buildInputs =
-    [
-      gnutls
-      libidn2
-      libtasn1
-      nasm
-      p11-kit
-      libxml2
-      python3Packages.python
-      boost
-      libmicrohttpd
-      gettext
-      pcre-cpp
-      yajl
-      fribidi
-      libva
-      libdrm
-      openssl
-      gperf
-      tinyxml2
-      tinyxml-2
-      taglib
-      libssh
-      gtest
-      ncurses
-      spdlog
-      alsa-lib
-      libGL
-      libGLU
-      fontconfig
-      freetype
-      ftgl
-      libjpeg
-      libpng
-      libtiff
-      libmpeg2
-      libsamplerate
-      libmad
-      libogg
-      libvorbis
-      flac
-      libxslt
-      systemd
-      lzo
-      libcdio
-      libmodplug
-      libass
-      libbluray
-      libudfread
-      sqlite
-      libmysqlclient
-      avahi
-      lame
-      curl
-      bzip2
-      zip
-      unzip
-      mesa-demos
-      libcec
-      libcec_platform
-      dcadec
-      libuuid
-      libxcrypt
-      libgcrypt
-      libgpg-error
-      libunistring
-      libcrossguid
-      libplist
-      bluez
-      giflib
-      glib
-      harfbuzz
-      lcms2
-      libpthreadstubs
-      ffmpeg
-      flatbuffers
-      fstrcmp
-      rapidjson
-      lirc
-      mesa-gl-headers
-    ]
-    ++ lib.optionals x11Support [
-      libX11
-      xorgproto
-      libXt
-      libXmu
-      libXext.dev
-      libXdmcp
-      libXinerama
-      libXrandr.dev
-      libXtst
-      libXfixes
-    ]
-    ++ lib.optional dbusSupport dbus
-    ++ lib.optional joystickSupport cwiid
-    ++ lib.optional nfsSupport libnfs
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional pipewireSupport pipewire
-    ++ lib.optional rtmpSupport rtmpdump
-    ++ lib.optional sambaSupport samba
-    ++ lib.optional udevSupport udev
-    ++ lib.optional usbSupport libusb-compat-0_1
-    ++ lib.optional vdpauSupport libvdpau
-    ++ lib.optionals waylandSupport [
-      wayland
-      waylandpp.dev
-      wayland-protocols
-      # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
-      libxkbcommon.dev
-    ]
-    ++ lib.optionals gbmSupport [
-      libxkbcommon.dev
-      libgbm
-      libinput.dev
-      libdisplay-info
+        env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isWindows) "-DTARGET_POSIX";
+
+        preConfigure = ''
+          cmakeFlagsArray+=(-DKODI_SOURCE_DIR=$src -DCMAKE_MODULE_PATH=$src/cmake/modules)
+        '';
+
+        meta.mainProgram = "TexturePacker";
+      }
+    ) { };
+
+    jsonSchemaBuilder = buildPackages.callPackage (
+      { stdenv, cmake }:
+      stdenv.mkDerivation {
+        pname = finalAttrs.pname + "-build-tool-json-schema-builder";
+        inherit (finalAttrs) version src;
+
+        sourceRoot = "${finalAttrs.src.name}/tools/depends/native/JsonSchemaBuilder/src";
+
+        nativeBuildInputs = [ cmake ];
+
+        meta.mainProgram = "JsonSchemaBuilder";
+      }
+    ) { };
+  in
+  {
+    pname = "kodi";
+    version = "21.2";
+    kodiReleaseName = "Omega";
+
+    src = fetchFromGitHub {
+      owner = "xbmc";
+      repo = "xbmc";
+      rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
+      hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88=";
+    };
+
+    patches = [
+      # Backport to fix build with Pipewire 1.4
+      # FIXME: remove in the next update
+      (fetchpatch {
+        url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch";
+        hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw=";
+      })
     ];
 
-  nativeBuildInputs =
-    [
-      cmake
-      doxygen
-      makeWrapper
-      which
-      pkg-config
-      autoconf
-      automake
-      libtool # still needed for some components. Check if that is the case with 19.0
-      jre_headless
-      yasm
-      gettext
-      python3Packages.python
-      flatbuffers
+    # make  derivations declared in the let binding available here, so
+    # they can be overridden
+    inherit
+      libdvdcss
+      libdvdnav
+      libdvdread
+      groovy
+      apache_commons_lang
+      apache_commons_text
+      ;
 
-      # for TexturePacker
-      giflib
-      zlib
-      libpng
-      libjpeg
-      lzo
-    ]
-    ++ lib.optionals waylandSupport [
-      wayland-protocols
-      waylandpp.bin
+    buildInputs =
+      [
+        gnutls
+        libidn2
+        libtasn1
+        nasm
+        p11-kit
+        libxml2
+        python3Packages.python
+        boost
+        libmicrohttpd
+        gettext
+        pcre-cpp
+        yajl
+        fribidi
+        libva
+        libdrm
+        openssl
+        gperf
+        tinyxml2
+        tinyxml-2
+        taglib
+        libssh
+        gtest
+        ncurses
+        spdlog
+        alsa-lib
+        libGL
+        libGLU
+        fontconfig
+        freetype
+        ftgl
+        libjpeg
+        libpng
+        libtiff
+        libmpeg2
+        libsamplerate
+        libmad
+        libogg
+        libvorbis
+        flac
+        libxslt
+        systemd
+        lzo
+        libcdio
+        libmodplug
+        libass
+        libbluray
+        libudfread
+        sqlite
+        libmysqlclient
+        avahi
+        lame
+        curl
+        bzip2
+        zip
+        unzip
+        mesa-demos
+        libcec
+        libcec_platform
+        dcadec
+        libuuid
+        libxcrypt
+        libgcrypt
+        libgpg-error
+        libunistring
+        libcrossguid
+        libplist
+        bluez
+        glib
+        harfbuzz
+        lcms2
+        libpthreadstubs
+        ffmpeg
+        flatbuffers
+        fstrcmp
+        rapidjson
+        lirc
+        mesa-gl-headers
+
+        # Deps needed by TexturePacker, which is built and installed in normal
+        # kodi build, however the one used during the build is not this one
+        # in order to support cross-compilation.
+        giflib
+        zlib
+      ]
+      ++ lib.optionals x11Support [
+        libX11
+        xorgproto
+        libXt
+        libXmu
+        libXext.dev
+        libXdmcp
+        libXinerama
+        libXrandr.dev
+        libXtst
+        libXfixes
+      ]
+      ++ lib.optional dbusSupport dbus
+      ++ lib.optional joystickSupport cwiid
+      ++ lib.optional nfsSupport libnfs
+      ++ lib.optional pulseSupport libpulseaudio
+      ++ lib.optional pipewireSupport pipewire
+      ++ lib.optional rtmpSupport rtmpdump
+      ++ lib.optional sambaSupport samba
+      ++ lib.optional udevSupport udev
+      ++ lib.optional usbSupport libusb-compat-0_1
+      ++ lib.optional vdpauSupport libvdpau
+      ++ lib.optionals waylandSupport [
+        wayland
+        waylandpp.dev
+        wayland-protocols
+        # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
+        libxkbcommon.dev
+      ]
+      ++ lib.optionals gbmSupport [
+        libxkbcommon.dev
+        libgbm
+        libinput.dev
+        libdisplay-info
+      ];
+
+    nativeBuildInputs =
+      [
+        cmake
+        doxygen
+        makeWrapper
+        which
+        pkg-config
+        autoconf
+        automake
+        libtool # still needed for some components. Check if that is the case with 19.0
+        jre_headless
+        yasm
+        gettext
+        python3Packages.python
+        flatbuffers
+      ]
+      ++ lib.optionals waylandSupport [
+        wayland-protocols
+        waylandpp.bin
+      ];
+
+    depsBuildBuild = [
+      buildPackages.stdenv.cc
     ];
 
-  depsBuildBuild = [
-    buildPackages.stdenv.cc
-  ];
+    cmakeFlags =
+      [
+        "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
+        "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
+        "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
+        "-Dlibdvdread_URL=${finalAttrs.libdvdread}"
+        "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
+        "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
+        "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
+        # Upstream derives this from the git HEADs hash and date.
+        # LibreElec (minimal distro for kodi) uses the equivalent to this.
+        "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
+        "-DENABLE_EVENTCLIENTS=ON"
+        "-DENABLE_INTERNAL_CROSSGUID=OFF"
+        "-DENABLE_INTERNAL_RapidJSON=OFF"
+        "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
+        "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
+        "-DLIRC_DEVICE=/run/lirc/lircd"
+        "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
+        "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
+        "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
+        "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
+        "-DWITH_JSONSCHEMABUILDER=${lib.getExe jsonSchemaBuilder}"
+        # When wrapped KODI_HOME will likely contain symlinks to static assets
+        # that Kodi's built in webserver will cautiously refuse to serve up
+        # (because their realpaths are outside of KODI_HOME and the other
+        # whitelisted directories). This adds the entire nix store to the Kodi
+        # webserver whitelist to avoid this problem.
+        "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"
+      ]
+      ++ lib.optionals waylandSupport [
+        "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+        "-DWITH_TEXTUREPACKER=${lib.getExe texturePacker}"
+      ];
 
-  cmakeFlags =
-    [
-      "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
-      "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
-      "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
-      "-Dlibdvdread_URL=${finalAttrs.libdvdread}"
-      "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
-      "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
-      "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
-      # Upstream derives this from the git HEADs hash and date.
-      # LibreElec (minimal distro for kodi) uses the equivalent to this.
-      "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
-      "-DENABLE_EVENTCLIENTS=ON"
-      "-DENABLE_INTERNAL_CROSSGUID=OFF"
-      "-DENABLE_INTERNAL_RapidJSON=OFF"
-      "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
-      "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
-      "-DLIRC_DEVICE=/run/lirc/lircd"
-      "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
-      "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
-      "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
-      "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
-      # When wrapped KODI_HOME will likely contain symlinks to static assets
-      # that Kodi's built in webserver will cautiously refuse to serve up
-      # (because their realpaths are outside of KODI_HOME and the other
-      # whitelisted directories). This adds the entire nix store to the Kodi
-      # webserver whitelist to avoid this problem.
-      "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"
-    ]
-    ++ lib.optionals waylandSupport [
-      "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
-    ];
+    # 14 tests fail but the biggest issue is that every test takes 30 seconds -
+    # I'm guessing there is a thing waiting to time out
+    doCheck = false;
 
-  # 14 tests fail but the biggest issue is that every test takes 30 seconds -
-  # I'm guessing there is a thing waiting to time out
-  doCheck = false;
-
-  preConfigure =
-    ''
+    preConfigure = ''
       cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      # Need these tools on the build system when cross compiling,
-      # hacky, but have found no other way.
-      CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
-      appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
-
-      CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
-      appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
     '';
 
-  postInstall = ''
-    # TODO: figure out which binaries should be wrapped this way and which shouldn't
-    for p in $(ls --ignore=kodi-send $out/bin/) ; do
-      wrapProgram $out/bin/$p \
-        --prefix PATH ":" "${
-          lib.makeBinPath (
-            [
-              python3Packages.python
-              mesa-demos
-            ]
-            ++ lib.optional x11Support xdpyinfo
-            ++ lib.optional sambaSupport samba
-          )
-        }" \
-        --prefix LD_LIBRARY_PATH ":" "${
-          lib.makeLibraryPath (
-            [
-              curl
-              systemd
-              libmad
-              libcec
-              libcec_platform
-              libass
-            ]
-            ++ lib.optional vdpauSupport libvdpau
-            ++ lib.optional nfsSupport libnfs
-            ++ lib.optional rtmpSupport rtmpdump
-          )
-        }"
-    done
+    postInstall = ''
+      # TODO: figure out which binaries should be wrapped this way and which shouldn't
+      for p in $(ls --ignore=kodi-send $out/bin/) ; do
+        wrapProgram $out/bin/$p \
+          --prefix PATH ":" "${
+            lib.makeBinPath (
+              [
+                python3Packages.python
+                mesa-demos
+              ]
+              ++ lib.optional x11Support xdpyinfo
+              ++ lib.optional sambaSupport samba
+            )
+          }" \
+          --prefix LD_LIBRARY_PATH ":" "${
+            lib.makeLibraryPath (
+              [
+                curl
+                systemd
+                libmad
+                libcec
+                libcec_platform
+                libass
+              ]
+              ++ lib.optional vdpauSupport libvdpau
+              ++ lib.optional nfsSupport libnfs
+              ++ lib.optional rtmpSupport rtmpdump
+            )
+          }"
+      done
 
-    wrapProgram $out/bin/kodi-send \
-      --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}
+      wrapProgram $out/bin/kodi-send \
+        --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}
 
-    substituteInPlace $out/share/xsessions/kodi.desktop \
-      --replace kodi-standalone $out/bin/kodi-standalone
-  '';
+      substituteInPlace $out/share/xsessions/kodi.desktop \
+        --replace kodi-standalone $out/bin/kodi-standalone
+    '';
 
-  doInstallCheck = true;
+    doInstallCheck = true;
 
-  installCheckPhase = "$out/bin/kodi --version";
+    installCheckPhase = "$out/bin/kodi --version";
 
-  passthru = {
-    pythonPackages = python3Packages;
-    ffmpeg = ffmpeg;
-    kodi = finalAttrs.finalPackage;
-  };
+    passthru = {
+      pythonPackages = python3Packages;
+      ffmpeg = ffmpeg;
+      kodi = finalAttrs.finalPackage;
+    };
 
-  meta = with lib; {
-    description = "Media center";
-    homepage = "https://kodi.tv/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.kodi ];
-    mainProgram = "kodi";
-  };
-})
+    meta = with lib; {
+      description = "Media center";
+      homepage = "https://kodi.tv/";
+      license = licenses.gpl2Plus;
+      platforms = platforms.linux;
+      teams = [ teams.kodi ];
+      mainProgram = "kodi";
+    };
+  }
+)

From 1907ea56d3a4419cbeb13f13b5221dfac6d152cf Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Fri, 30 May 2025 21:34:57 -0300
Subject: [PATCH 0244/1497] azahar: 2121.1 -> 2121.2

---
 pkgs/by-name/az/azahar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index ad726c07c86b..a107f48f4799 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "azahar";
-  version = "2121.1";
+  version = "2121.2";
 
   src = fetchzip {
     url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
-    hash = "sha256-jadQsuU1SfvUc5DO5XqZXTe53U9XGOHScDGx66Oh18Q=";
+    hash = "sha256-zXkLew7tErPjygYIXPnimfZnekFMCzY+95TlW1DNQRc=";
   };
 
   nativeBuildInputs = [

From fa7b5cc939db0aae1cf99bb49cea4f0b43d1c910 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 30 May 2025 20:40:27 -0400
Subject: [PATCH 0245/1497] librewolf-unwrapped: add owners

Since the bot does not seem to pick up maintainers for changes to e.g.
`src.json` and so manual review is needed. This should resolve that.
---
 ci/OWNERS                                                   | 1 +
 pkgs/applications/networking/browsers/librewolf/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 716dfd2df5b7..4706aa7cdd28 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -230,6 +230,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /nixos/tests/snapcast.nix @mweinelt
 
 # Browsers
+/pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz @LordGrimmauld
 /pkgs/applications/networking/browsers/firefox @mweinelt
 /pkgs/applications/networking/browsers/chromium @emilylange @networkException
 /nixos/tests/chromium.nix @emilylange @networkException
diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix
index 047af6d1bb6a..0afe9f91657a 100644
--- a/pkgs/applications/networking/browsers/librewolf/default.nix
+++ b/pkgs/applications/networking/browsers/librewolf/default.nix
@@ -29,6 +29,7 @@ in
     description = "Fork of Firefox, focused on privacy, security and freedom";
     homepage = "https://librewolf.net/";
     maintainers = with lib.maintainers; [
+      # Also update ci/OWNERS entry when changing maintainers
       squalus
       dwrege
       fpletz

From 0030927398148bcc6ded3fa0621dff5691535b31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 31 May 2025 03:01:19 +0200
Subject: [PATCH 0246/1497] firefox-unwrapped: drop lovesegfault from
 maintainers

No maintenance interaction since late 2022.
---
 .../networking/browsers/firefox/packages/firefox.nix         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index a40e941fa9b2..3ca9fefaab60 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -19,10 +19,7 @@ buildMozillaMach rec {
     changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
     description = "Web browser built from Firefox source tree";
     homepage = "http://www.mozilla.com/en-US/firefox/";
-    maintainers = with lib.maintainers; [
-      lovesegfault
-      hexa
-    ];
+    maintainers = with lib.maintainers; [ hexa ];
     platforms = lib.platforms.unix;
     broken = stdenv.buildPlatform.is32bit;
     # since Firefox 60, build on 32-bit platforms fails with "out of memory".

From 4aadd44044e291e0fdc529d97b46be152b1c3989 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 30 May 2025 18:12:26 -0700
Subject: [PATCH 0247/1497] zig: fix cc and bintools

---
 pkgs/development/compilers/zig/bintools.nix |  8 ++++++--
 pkgs/development/compilers/zig/cc.nix       | 10 ++++++----
 pkgs/development/compilers/zig/generic.nix  |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/zig/bintools.nix b/pkgs/development/compilers/zig/bintools.nix
index db5803ef1865..c14817cbb375 100644
--- a/pkgs/development/compilers/zig/bintools.nix
+++ b/pkgs/development/compilers/zig/bintools.nix
@@ -4,6 +4,7 @@
   zig,
   runCommand,
   makeWrapper,
+  coreutils,
 }:
 let
   targetPrefix = lib.optionalString (
@@ -26,9 +27,12 @@ runCommand "zig-bintools-${zig.version}"
   }
   ''
     mkdir -p $out/bin
-    for tool in ar objcopy ranlib; do
-      makeWrapper "$zig/bin/zig" "$out/bin/${targetPrefix}$tool" \
+    for tool in ar objcopy ranlib ld.lld; do
+      makeWrapper "$zig/bin/zig" "$out/bin/$tool" \
         --add-flags "$tool" \
+        --suffix PATH : "${lib.makeBinPath [ coreutils ]}" \
         --run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
     done
+
+    ln -s $out/bin/ld.lld $out/bin/ld
   ''
diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix
index 71d1211d89fa..bfbfb49de365 100644
--- a/pkgs/development/compilers/zig/cc.nix
+++ b/pkgs/development/compilers/zig/cc.nix
@@ -4,6 +4,7 @@
   zig,
   stdenv,
   makeWrapper,
+  coreutils,
 }:
 let
   targetPrefix = lib.optionalString (
@@ -27,12 +28,13 @@ runCommand "zig-cc-${zig.version}"
   ''
     mkdir -p $out/bin
     for tool in cc c++ ld.lld; do
-      makeWrapper "$zig/bin/zig" "$out/bin/${targetPrefix}$tool" \
+      makeWrapper "$zig/bin/zig" "$out/bin/$tool" \
         --add-flags "$tool" \
+        --suffix PATH : "${lib.makeBinPath [ coreutils ]}" \
         --run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
     done
 
-    mv $out/bin/${targetPrefix}c++ $out/bin/${targetPrefix}clang++
-    mv $out/bin/${targetPrefix}cc $out/bin/${targetPrefix}clang
-    mv $out/bin/${targetPrefix}ld.lld $out/bin/${targetPrefix}ld
+    ln -s $out/bin/c++ $out/bin/clang++
+    ln -s $out/bin/cc $out/bin/clang
+    ln -s $out/bin/ld.lld $out/bin/ld
   ''
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 8e0f8317f619..725aae552a25 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -155,10 +155,11 @@ stdenv.mkDerivation (finalAttrs: {
     cc = wrapCCWith {
       cc = finalAttrs.finalPackage.cc-unwrapped;
       bintools = finalAttrs.finalPackage.bintools;
+      extraPackages = [ ];
       nixSupport.cc-cflags =
         [
           "-target"
-          "${stdenv.targetPlatform.config}"
+          "${stdenv.targetPlatform.system}-${stdenv.targetPlatform.parsed.abi.name}"
         ]
         ++ lib.optional (
           stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.isStatic or false)

From 63f12ff91b6dd00645b096eabb4c7b95fc40801c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 31 May 2025 04:13:42 +0200
Subject: [PATCH 0248/1497] python313Packages.validator-collection: remove
 unused inputs

just wow
---
 .../validator-collection/default.nix          | 107 ++----------------
 1 file changed, 7 insertions(+), 100 deletions(-)

diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix
index 19ed6d8df010..f21a13bc81de 100644
--- a/pkgs/development/python-modules/validator-collection/default.nix
+++ b/pkgs/development/python-modules/validator-collection/default.nix
@@ -3,58 +3,10 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  alabaster,
-  attrs,
-  babel,
-  certifi,
-  cffi,
-  chardet,
-  colorama,
-  coverage,
-  docutils,
-  filelock,
-  html5lib,
-  idna,
-  imagesize,
-  isort,
-  jinja2,
+  simplejson,
   jsonschema,
-  lazy-object-proxy,
-  markupsafe,
-  mccabe,
-  more-itertools,
-  packaging,
-  pkginfo,
-  pluggy,
-  py,
-  py-cpuinfo,
-  pycparser,
   pyfakefs,
-  pygments,
-  pyparsing,
-  pytest,
-  pytest-benchmark,
-  pytest-cov-stub,
-  pytz,
-  readme-renderer,
-  requests,
-  requests-toolbelt,
-  restview,
-  six,
-  snowballstemmer,
-  sphinx,
-  sphinx-rtd-theme,
-  sphinx-tabs,
-  sphinxcontrib-websupport,
-  toml,
   pytestCheckHook,
-  tox,
-  tqdm,
-  twine,
-  urllib3,
-  virtualenv,
-  webencodings,
-  wrapt,
   pythonOlder,
 }:
 
@@ -74,61 +26,16 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  # listed in setup.py, the requirements.txt is _full_ of dev junk
   dependencies = [
-    alabaster
-    attrs
-    babel
-    certifi
-    cffi
-    chardet
-    colorama
-    coverage
-    docutils
-    filelock
-    html5lib
-    idna
-    imagesize
-    isort
-    jinja2
     jsonschema
-    lazy-object-proxy
-    markupsafe
-    mccabe
-    more-itertools
-    packaging
-    pkginfo
-    pluggy
-    py
-    py-cpuinfo
-    pycparser
-    pyfakefs
-    pygments
-    pyparsing
-    pytest
-    pytest-benchmark
-    pytest-cov-stub
-    pytz
-    readme-renderer
-    requests
-    requests-toolbelt
-    restview
-    six
-    snowballstemmer
-    sphinx
-    sphinx-rtd-theme
-    sphinx-tabs
-    sphinxcontrib-websupport
-    toml
-    tox
-    tqdm
-    twine
-    urllib3
-    virtualenv
-    webencodings
-    wrapt
+    simplejson # optional but preferred
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyfakefs
+  ];
 
   pythonImportsCheck = [ "validator_collection" ];
 

From c328554512a87466d746bc7180ed65897e024c30 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 31 May 2025 06:44:31 +0200
Subject: [PATCH 0249/1497] albert: 0.27.8 -> 0.28.0

---
 pkgs/by-name/al/albert/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index c474a0bcc86c..e7f04a96aa5f 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  kdePackages,
   qt6,
   cmake,
   libqalculate,
@@ -14,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.27.8";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UZJS61YeieA68PUNgudpjn1iWHCTvhXpt3uXJAkJtCg=";
+    hash = "sha256-ciqCNQD5S7qv9Ph6AgUpFB5Sphv6Eb1LR3Ap3bTd1EE=";
     fetchSubmodules = true;
   };
 
@@ -32,17 +33,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
+      kdePackages.qtkeychain
       libqalculate
       libarchive
       muparser
-      qt6.qtbase
-      qt6.qtscxml
-      qt6.qtsvg
-      qt6.qtdeclarative
-      qt6.qtwayland
-      qt6.qt5compat
-      qt6.qttools
     ]
+    ++ (with qt6; [
+      qt5compat
+      qtbase
+      qtdeclarative
+      qtscxml
+      qtsvg
+      qttools
+      qtwayland
+    ])
     ++ (with python3Packages; [
       python
       pybind11

From 1a031647f73275cc2357864a8bdb580fcf8f1131 Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Mon, 26 May 2025 18:36:21 +0200
Subject: [PATCH 0250/1497] high-tide: 0-unstable-2025-05-01 -> 0.1.5

---
 pkgs/by-name/hi/high-tide/package.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index 439e050cecf2..7e87e49f879b 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python3Packages,
+  python313Packages,
   fetchFromGitHub,
   wrapGAppsHook4,
   meson,
@@ -11,18 +11,20 @@
   libadwaita,
   gst_all_1,
   libsecret,
+  libportal,
+  nix-update-script,
 }:
 
-python3Packages.buildPythonApplication {
+python313Packages.buildPythonApplication rec {
   pname = "high-tide";
-  version = "0-unstable-2025-05-01";
+  version = "0.1.5";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "high-tide";
-    rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc";
-    hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ=";
+    tag = "v${version}";
+    hash = "sha256-HoPyqsLPLfqyQbrhoPzr3n81yX1MHZVUVmq5RKDN5pI=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +37,10 @@ python3Packages.buildPythonApplication {
   ];
 
   buildInputs =
-    [ libadwaita ]
+    [
+      libadwaita
+      libportal
+    ]
     ++ (with gst_all_1; [
       gstreamer
       gst-plugins-base
@@ -45,7 +50,7 @@ python3Packages.buildPythonApplication {
       libsecret
     ]);
 
-  dependencies = with python3Packages; [
+  dependencies = with python313Packages; [
     pygobject3
     tidalapi
     requests
@@ -56,11 +61,13 @@ python3Packages.buildPythonApplication {
 
   makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Libadwaita TIDAL client for Linux";
     homepage = "https://github.com/Nokse22/high-tide";
     license = with lib.licenses; [ gpl3Plus ];
-    mainProgram = "HighTide";
+    mainProgram = "high-tide";
     maintainers = with lib.maintainers; [
       nilathedragon
       nyabinary

From e894c5eae53d01f42aa48e7e9182f8a8867f94d0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 31 May 2025 06:56:20 +0100
Subject: [PATCH 0251/1497] vte: 0.80.1 -> 0.80.2

Changes: https://gitlab.gnome.org/GNOME/vte/-/compare/0.80.1...0.80.2?from_project_id=1893
---
 pkgs/by-name/vt/vte/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index d8a5c60284ca..6d14b4d789d3 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.80.1";
+  version = "0.80.2";
 
   outputs = [
     "out"
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DNvQ6YOv2dIuBl4yOnQxYAcr9ktFPgCxXtvm8tzdpGw=";
+    hash = "sha256-siW+vQQ2M71JHy6hcTdNDz+d5i3+wHZTBTvAjE+s5G8=";
   };
 
   patches = [

From b398c5a391fd9a5438f9d5471098f760f4b10873 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sat, 10 May 2025 14:46:19 +0200
Subject: [PATCH 0252/1497] python3Packages.labgrid: 24.0.2 -> 25.0

Release notes: https://github.com/labgrid-project/labgrid/releases/tag/v25.0
---
 .../python-modules/labgrid/default.nix        | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index 1ae59e870c67..27c7f542572c 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -1,9 +1,12 @@
 {
   ansicolors,
   attrs,
-  autobahn,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
+  grpcio,
+  grpcio-tools,
+  grpcio-reflection,
   jinja2,
   lib,
   mock,
@@ -12,6 +15,7 @@
   psutil,
   pyserial,
   pytestCheckHook,
+  pytest-benchmark,
   pytest-dependency,
   pytest-mock,
   pyudev,
@@ -25,16 +29,32 @@
 
 buildPythonPackage rec {
   pname = "labgrid";
-  version = "24.0.2";
+  version = "25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "labgrid-project";
     repo = "labgrid";
     tag = "v${version}";
-    hash = "sha256-rW9peT4zoPzVR6Kl/E8G4qBig/x/lvxpCtvNtwIIL+U=";
+    hash = "sha256-Czq8Wx8ThKLcR8GjdlRND+Y1nY1PTl6wDkz9ml83DBk=";
   };
 
+  # Remove after package bump
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Emantor/labgrid/commit/4a66b43882811d50600e37aa39b24ec40398d184.patch";
+      sha256 = "sha256-eJMB1qFWiDzQXEB4dYOHYMQqCPHXEWCwWjNNY0yTC2s=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Emantor/labgrid/commit/d9933b3ec444c35d98fd41685481ecae8ff28bf4.patch";
+      sha256 = "sha256-Zx5j+CD6Q89dLmTl5QSKI9M1IcZ97OCjEWtEbG+CKWE=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Emantor/labgrid/commit/f0b672afe1e8976c257f0adff9bf6e7ee9760d6f.patch";
+      sha256 = "sha256-M7rg+W9SjWDdViWyWe3ERzbUowxzf09c4w1yG3jQGak=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
@@ -43,8 +63,10 @@ buildPythonPackage rec {
   dependencies = [
     ansicolors
     attrs
-    autobahn
     jinja2
+    grpcio
+    grpcio-tools
+    grpcio-reflection
     pexpect
     pyserial
     pyudev
@@ -63,6 +85,7 @@ buildPythonPackage rec {
     openssh
     psutil
     pytestCheckHook
+    pytest-benchmark
     pytest-mock
     pytest-dependency
   ];
@@ -72,6 +95,8 @@ buildPythonPackage rec {
     "test_timing"
   ];
 
+  pytestFlagsArray = [ "--benchmark-disable" ];
+
   meta = with lib; {
     description = "Embedded control & testing library";
     homepage = "https://github.com/labgrid-project/labgrid";

From 5133c60c2f558ea065b2ff6ed822fb29a7ad4fc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 07:56:08 +0000
Subject: [PATCH 0253/1497] waagent: 2.13.1.1 -> 2.14.0.0

---
 pkgs/by-name/wa/waagent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix
index 67d87e8125c2..19d6c5aceecd 100644
--- a/pkgs/by-name/wa/waagent/package.nix
+++ b/pkgs/by-name/wa/waagent/package.nix
@@ -14,12 +14,12 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "waagent";
-  version = "2.13.1.1";
+  version = "2.14.0.0";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "WALinuxAgent";
-    tag = "v${version}";
-    hash = "sha256-W2NXxQOxRhJD/D/w58xknA9X8YYnQxwIhhjXzlCVVWA=";
+    tag = "pre-v${version}";
+    hash = "sha256-nJZXyqdsSQgW+nGqyTS9XSW4z5mGRHtCYsDHKDw/eiM=";
   };
   patches = [
     # Suppress the following error when waagent tries to configure sshd:

From 282c93a98bb2cbcd6b26507215750ea0f99da771 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 31 May 2025 11:06:10 +0200
Subject: [PATCH 0254/1497] lomiri.lomiri-download-manager: 0.1.3 -> 0.2.1

---
 ...treewide-Switch-to-glog-CMake-module.patch | 154 ------------------
 .../lomiri-download-manager/default.nix       |  41 ++---
 2 files changed, 18 insertions(+), 177 deletions(-)
 delete mode 100644 pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch

diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch b/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch
deleted file mode 100644
index c3ca4f4b13b8..000000000000
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/1001-treewide-Switch-to-glog-CMake-module.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From a487908c22fe0a37669bbe5a8bdcd945b05b2f33 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Mon, 20 Jan 2025 19:06:54 +0100
-Subject: [PATCH] treewide: Switch to glog CMake module
-
----
- CMakeLists.txt                           | 2 +-
- src/common/priv/CMakeLists.txt           | 2 +-
- src/common/public/CMakeLists.txt         | 2 +-
- src/downloads/daemon/CMakeLists.txt      | 2 +-
- src/downloads/priv/CMakeLists.txt        | 2 +-
- src/downloads/qml/CMakeLists.txt         | 2 +-
- src/downloads/test-daemon/CMakeLists.txt | 2 +-
- src/extractor/CMakeLists.txt             | 2 +-
- src/uploads/daemon/CMakeLists.txt        | 2 +-
- src/uploads/priv/CMakeLists.txt          | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c4750a2..e44d09ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,10 +50,10 @@ set(CMAKE_AUTOMOC ON)
- 
- find_package(Qt5 COMPONENTS Core DBus Network Sql Test REQUIRED)
- find_package(Boost COMPONENTS log program_options REQUIRED)
-+find_package(glog REQUIRED)
- 
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(DBUS REQUIRED dbus-1)
--pkg_check_modules(GLOG REQUIRED libglog)
- pkg_check_modules(LOMIRI_API REQUIRED liblomiri-api)
- 
- if(USE_SYSTEMD)
-diff --git a/src/common/priv/CMakeLists.txt b/src/common/priv/CMakeLists.txt
-index e7723f3d..105ec5d2 100644
---- a/src/common/priv/CMakeLists.txt
-+++ b/src/common/priv/CMakeLists.txt
-@@ -75,7 +75,7 @@ set_target_properties(
- 
- target_link_libraries(${TARGET}
- 	${LOMIRI_API_LDFLAGS}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Network
- 	Qt5::Sql
- 	Qt5::Core
-diff --git a/src/common/public/CMakeLists.txt b/src/common/public/CMakeLists.txt
-index 4b1e8660..eeeeab13 100644
---- a/src/common/public/CMakeLists.txt
-+++ b/src/common/public/CMakeLists.txt
-@@ -50,7 +50,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Network
- )
-diff --git a/src/downloads/daemon/CMakeLists.txt b/src/downloads/daemon/CMakeLists.txt
-index cdc9f83b..24e2334c 100644
---- a/src/downloads/daemon/CMakeLists.txt
-+++ b/src/downloads/daemon/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	ldm-common
- 	ldm-priv-common
-diff --git a/src/downloads/priv/CMakeLists.txt b/src/downloads/priv/CMakeLists.txt
-index 9eaf3092..c453a7a1 100644
---- a/src/downloads/priv/CMakeLists.txt
-+++ b/src/downloads/priv/CMakeLists.txt
-@@ -65,7 +65,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Sql
- 	ldm-common
-diff --git a/src/downloads/qml/CMakeLists.txt b/src/downloads/qml/CMakeLists.txt
-index 7e2d9285..49d68f1c 100644
---- a/src/downloads/qml/CMakeLists.txt
-+++ b/src/downloads/qml/CMakeLists.txt
-@@ -34,7 +34,7 @@ find_package(Qt5 COMPONENTS Core Qml Quick REQUIRED)
- target_link_libraries(${TARGET} Qt5::Core Qt5::Qml Qt5::Quick)
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	ldm-common
- 	lomiri-download-manager-common
- 	lomiri-download-manager-client
-diff --git a/src/downloads/test-daemon/CMakeLists.txt b/src/downloads/test-daemon/CMakeLists.txt
-index d12207a1..6734e65d 100644
---- a/src/downloads/test-daemon/CMakeLists.txt
-+++ b/src/downloads/test-daemon/CMakeLists.txt
-@@ -30,7 +30,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	Qt5::DBus
- 	Qt5::Network
-diff --git a/src/extractor/CMakeLists.txt b/src/extractor/CMakeLists.txt
-index 8c40b9b5..3615d5c7 100644
---- a/src/extractor/CMakeLists.txt
-+++ b/src/extractor/CMakeLists.txt
-@@ -23,7 +23,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	${Boost_LIBRARIES}
- 	ldm-priv-common
-diff --git a/src/uploads/daemon/CMakeLists.txt b/src/uploads/daemon/CMakeLists.txt
-index 157c6fd6..3692d3c9 100644
---- a/src/uploads/daemon/CMakeLists.txt
-+++ b/src/uploads/daemon/CMakeLists.txt
-@@ -16,7 +16,7 @@ add_executable(${TARGET}
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::Core
- 	ldm-common
- 	ldm-priv-common
-diff --git a/src/uploads/priv/CMakeLists.txt b/src/uploads/priv/CMakeLists.txt
-index dff67e35..672e49ef 100644
---- a/src/uploads/priv/CMakeLists.txt
-+++ b/src/uploads/priv/CMakeLists.txt
-@@ -47,7 +47,7 @@ set_target_properties(
- )
- 
- target_link_libraries(${TARGET}
--	${GLOG_LIBRARIES}
-+	glog::glog
- 	Qt5::DBus
- 	Qt5::Sql
- 	ldm-common
--- 
-2.47.1
-
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 5a1db5b4dd6b..81dcef5d8914 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -15,6 +15,7 @@
   glog,
   graphviz,
   gtest,
+  libapparmor,
   lomiri-api,
   pkg-config,
   python3,
@@ -28,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.1.3";
+  version = "0.2.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
-    rev = finalAttrs.version;
-    hash = "sha256-LhhO/zZ4wNiRd235NB2b08SQcCZt1awN/flcsLs2m8U=";
+    tag = finalAttrs.version;
+    hash = "sha256-dVyel4NL5LFORNTQzOyeTFkt9Wn23+4uwHsKcj+/0rk=";
   };
 
   outputs = [
@@ -43,31 +44,23 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals withDocumentation [ "doc" ];
 
   patches = [
-    # This change seems incomplete, potentially breaks things on systems that don't use AppArmor mediation
-    # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/24#note_1746801673
+    # Remove when version > 0.2.1
     (fetchpatch {
-      name = "0001-lomiri-download-manager-Revert-Drop-GetConnectionAppArmorSecurityContext.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/2367f3dff852b69457b1a65a487cb032c210569f.patch";
-      revert = true;
-      hash = "sha256-xS0Wz6d+bZWj/kDGK2WhOduzyP4Rgz3n9n2XY1Zu5hE=";
+      name = "0001-lomiri-download-manager-treewide-Make-pkg-config-includedir-values-reasonable.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/230aa1965917f90d235f55477a257eca1f5eaf46.patch";
+      hash = "sha256-Kdmu4U98Yc213pHS0o4DjpG8T5p50Q5hijRgdvscA/c=";
     })
-
-    # Fix compatibility with glog 0.7.x
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-download-manager/-/merge_requests/29 merged & in release (vendored patch was manually backported)
-    ./1001-treewide-Switch-to-glog-CMake-module.patch
   ];
 
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \
       --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
-      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+      --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
 
-    # For our automatic pkg-config output patcher to work, prefix must be used here
-    substituteInPlace src/{common/public,downloads/client,downloads/common,uploads/common}/*.pc.in \
-      --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}'
-    substituteInPlace src/downloads/client/lomiri-download-manager-client.pc.in \
-      --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}'
+    # Upstream code is to work around a bug, but it only seems to cause config issues for us
+    substituteInPlace tests/common/CMakeLists.txt \
+      --replace-fail 'add_dependencies(''${TARGET} GMock)' '# add_dependencies(''${TARGET} GMock)'
   '';
 
   strictDeps = true;
@@ -89,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     cmake-extras
     glog
+    libapparmor
     lomiri-api
     qtbase
     qtdeclarative
@@ -104,10 +98,9 @@ stdenv.mkDerivation (finalAttrs: {
   checkInputs = [ gtest ];
 
   cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
     (lib.cmakeBool "ENABLE_DOC" withDocumentation)
-    # Deprecation warnings on Qt 5.15
-    # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/issues/1
-    (lib.cmakeBool "ENABLE_WERROR" false)
+    (lib.cmakeBool "ENABLE_WERROR" true)
   ];
 
   makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
@@ -130,7 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Performs uploads and downloads from a centralized location";
     homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";
-    changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.lgpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;

From 3d47a13894580b09a94d34bf4bf0d3bbc46bcff2 Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Sat, 31 May 2025 11:42:45 +0800
Subject: [PATCH 0255/1497] ieda: 0-unstable-2025-04-14 ->
 0-unstable-2025-05-30

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 pkgs/by-name/ie/ieda/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index e87b5aa8247c..889f015aabfa 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -35,11 +35,11 @@ let
   });
   rootSrc = stdenv.mkDerivation {
     pname = "iEDA-src";
-    version = "2025-04-14";
+    version = "2025-05-30";
     src = fetchgit {
       url = "https://gitee.com/oscc-project/iEDA";
-      rev = "51d198884cde2ecda643071a1a6cb4ec0e09d881";
-      sha256 = "sha256-kDVEAttSqa8l7qcRs7MQiBgPbAKBExEQvIE8tc7PLpM=";
+      rev = "3096147fcea491c381da2928be6fb5a12c2d97b7";
+      sha256 = "sha256-rPkcE+QFMlEuwwJ/QBgyLTXP5lWLQPj5SOlZysJ6WTI=";
     };
 
     patches = [
@@ -59,6 +59,11 @@ let
       })
     ];
 
+    postPatch = ''
+      # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
+      sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt
+    '';
+
     dontBuild = true;
     dontFixup = true;
     installPhase = ''
@@ -71,7 +76,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "iEDA";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-05-30";
 
   src = rootSrc;
 

From ffb4c8cb1152302ff62fe17ddb554541754ccb3f Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 31 May 2025 11:46:33 +0200
Subject: [PATCH 0256/1497] hackneyed: 0.9.1 -> 0.9.3
 https://gitlab.com/Enthymeme/hackneyed-x11-cursors/-/blob/master/CHANGELOG\#L1

---
 pkgs/by-name/ha/hackneyed/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hackneyed/package.nix b/pkgs/by-name/ha/hackneyed/package.nix
index 6e63869b6077..886f68e6ccf6 100644
--- a/pkgs/by-name/ha/hackneyed/package.nix
+++ b/pkgs/by-name/ha/hackneyed/package.nix
@@ -4,23 +4,25 @@
   fetchFromGitLab,
   imagemagick,
   inkscape,
+  jq,
   xcursorgen,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "hackneyed";
-  version = "0.9.1";
+  version = "0.9.3";
 
   src = fetchFromGitLab {
     owner = "Enthymeme";
     repo = "hackneyed-x11-cursors";
     rev = version;
-    hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g=";
+    hash = "sha256-gq+qBYm15satH/XXK1QYDVu2L2DvZ+2aYg/wDqncwmA=";
   };
 
   nativeBuildInputs = [
     imagemagick
     inkscape
+    jq
     xcursorgen
   ];
 
@@ -33,6 +35,7 @@ stdenvNoCC.mkDerivation rec {
   makeFlags = [
     "INKSCAPE=inkscape"
     "INSTALL=install"
+    "JQ=jq"
     "PREFIX=$(out)"
     "VERBOSE=1"
     "XCURSORGEN=xcursorgen"

From e111280e04ed6639dbd712e2da967d4f26280af6 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 31 May 2025 11:47:00 +0200
Subject: [PATCH 0257/1497] hackneyed: remove usages of with lib;

---
 pkgs/by-name/ha/hackneyed/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ha/hackneyed/package.nix b/pkgs/by-name/ha/hackneyed/package.nix
index 886f68e6ccf6..d52b123f6480 100644
--- a/pkgs/by-name/ha/hackneyed/package.nix
+++ b/pkgs/by-name/ha/hackneyed/package.nix
@@ -53,11 +53,11 @@ stdenvNoCC.mkDerivation rec {
         --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:'
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors";
     description = "Scalable cursor theme that resembles Windows 3.x/NT 3.x cursors";
-    platforms = platforms.all;
-    license = licenses.mit;
-    maintainers = with maintainers; [ somasis ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ somasis ];
   };
 }

From 1502da49ba62c3a3830db3075c2da260184d9eda Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Sat, 31 May 2025 19:41:30 +0900
Subject: [PATCH 0258/1497] nwg-panel: 0.10.2 -> 0.10.4

Diff: https://github.com/nwg-piotr/nwg-panel/compare/v0.10.2...v0.10.4

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/nw/nwg-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index cb77ab815cd7..371fdf825d0a 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,13 +23,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.10.2";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     tag = "v${version}";
-    hash = "sha256-Wml9FXktLjTtYWTE/yoYDwFcPXeL1zhY3VgzrMW8DzE=";
+    hash = "sha256-yONNXCKKUH2P0Bhq2lRh3zNWZGvZG4LUi/ONUozTYmI=";
   };
 
   # No tests

From d02513e21651d950e0446ae1cd907016e5b320ce Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 17 May 2025 06:26:41 +0100
Subject: [PATCH 0259/1497] diffoscope: 295 -> 297

Changes:
- https://diffoscope.org/news/diffoscope-296-released/
- https://diffoscope.org/news/diffoscope-297-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index f6227f3edea0..c44c10b68fd9 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,11 +106,11 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "295";
+  version = "297";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-BxyE14vXS7lGFwWsruDAcdXMRsoETFwXPQxfMpSh1+E=";
+    hash = "sha256-3dEZb7XZluTi+sUTgSqwLzCdNMJwekt1Em0XEDSAY/E=";
   };
 
   outputs = [

From 1ffc904284479f89de42cb79f279400086113d45 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sat, 31 May 2025 13:02:50 +0200
Subject: [PATCH 0260/1497] nixos/monero: add an option to use ip ban-list

---
 nixos/modules/services/networking/monero.nix | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index f7351203b13d..9b73fc9be0fa 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -32,6 +32,10 @@ let
         restricted-rpc=1
       ''}
 
+      ${lib.optionalString (banlist != null) ''
+        ban-list=${banlist}
+      ''}
+
       limit-rate-up=${toString limits.upload}
       limit-rate-down=${toString limits.download}
       max-concurrency=${toString limits.threads}
@@ -64,6 +68,23 @@ in
         '';
       };
 
+      banlist = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        description = ''
+          Path to a text file containing IPs to block.
+          Useful to prevent DDoS/deanonymization attacks.
+
+          https://github.com/monero-project/meta/issues/1124
+        '';
+        example = lib.literalExpression ''
+          builtins.fetchurl {
+            url = "https://raw.githubusercontent.com/rblaine95/monero-banlist/c6eb9413ddc777e7072d822f49923df0b2a94d88/block.txt";
+            hash = "";
+          };
+        '';
+      };
+
       mining.enable = lib.mkOption {
         type = lib.types.bool;
         default = false;

From b782b7e8451be4755b520fdb34d3f552ca5f915d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 12:00:56 +0000
Subject: [PATCH 0261/1497] duplicity: 3.0.4 -> 3.0.4.1

---
 pkgs/by-name/du/duplicity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 682137beb903..b8d2d4f6392d 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -22,13 +22,13 @@
 let
   self = python3.pkgs.buildPythonApplication rec {
     pname = "duplicity";
-    version = "3.0.4";
+    version = "3.0.4.1";
 
     src = fetchFromGitLab {
       owner = "duplicity";
       repo = "duplicity";
       rev = "rel.${version}";
-      hash = "sha256-FoaKuB0mo2RFksMHnIUx984+h/U0tdvk+bvsuYt3r5g=";
+      hash = "sha256-cVzGdn3a9/Kvu/QYWaTXJ1llkPRvj0g8qb7TUjennws=";
     };
 
     patches = [

From 6a01ad2ec64b96c7d176181ade076b9423b2a688 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 31 May 2025 14:31:31 +0200
Subject: [PATCH 0262/1497] corrscope: 0.10.1 -> 0.11.0, migrate to Qt6

---
 pkgs/by-name/co/corrscope/package.nix | 66 +++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix
index a4a2ddd9523e..5c2d087fa2a3 100644
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -1,45 +1,40 @@
 {
   stdenv,
   lib,
-  python3Packages,
   fetchFromGitHub,
   ffmpeg,
-  libsForQt5,
+  python3Packages,
+  qt6Packages,
   testers,
   corrscope,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "corrscope";
-  version = "0.10.1";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corrscope";
     repo = "corrscope";
     tag = version;
-    hash = "sha256-WSv65jEu/w6iNrL/f5PN147FBjmR0j30H1D39dd+KN8=";
+    hash = "sha256-76qa4jOSncK1eDly/uXJzpWWdsEz7Hg3DyFb7rmrQBc=";
   };
 
-  pythonRelaxDeps = [
-    "attrs"
-    "ruamel.yaml"
+  nativeBuildInputs = with qt6Packages; [
+    wrapQtAppsHook
   ];
 
-  nativeBuildInputs =
-    (with libsForQt5; [
-      wrapQtAppsHook
-    ])
-    ++ (with python3Packages; [
-      poetry-core
-    ]);
+  build-system = with python3Packages; [
+    hatchling
+  ];
 
   buildInputs =
     [
       ffmpeg
     ]
     ++ (
-      with libsForQt5;
+      with qt6Packages;
       [
         qtbase
       ]
@@ -48,20 +43,24 @@ python3Packages.buildPythonApplication rec {
       ]
     );
 
-  propagatedBuildInputs = with python3Packages; [
-    appdirs
-    appnope
-    atomicwrites
-    attrs
-    click
-    matplotlib
-    numpy
-    packaging
-    qtpy
-    pyqt5
-    ruamel-yaml
-    colorspacious
-  ];
+  dependencies = (
+    with python3Packages;
+    [
+      appdirs
+      atomicwrites
+      attrs
+      click
+      colorspacious
+      matplotlib
+      numpy
+      qtpy
+      pyqt6
+      ruamel-yaml
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      appnope
+    ]
+  );
 
   dontWrapQtApps = true;
 
@@ -80,7 +79,7 @@ python3Packages.buildPythonApplication rec {
     command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm";
     longDescription = ''
       Corrscope renders oscilloscope views of WAV files recorded from chiptune (game music from
@@ -90,9 +89,10 @@ python3Packages.buildPythonApplication rec {
       Genesis/FM synthesis) which jump around on other oscilloscope programs.
     '';
     homepage = "https://github.com/corrscope/corrscope";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    changelog = "https://github.com/corrscope/corrscope/releases/tag/${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
     mainProgram = "corr";
   };
 }

From 20f73ae6571b393a4689a64bf2bdb5ba43cb1427 Mon Sep 17 00:00:00 2001
From: Darragh Elliott <me@delliott.xyz>
Date: Sat, 31 May 2025 14:36:25 +0100
Subject: [PATCH 0263/1497] gokapi: 1.9.6 -> 2.0.0 Drop unneeded patches, and
 add new build steps

---
 pkgs/by-name/go/gokapi/go-1.24.patch | 13 -------------
 pkgs/by-name/go/gokapi/package.nix   | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/go/gokapi/go-1.24.patch

diff --git a/pkgs/by-name/go/gokapi/go-1.24.patch b/pkgs/by-name/go/gokapi/go-1.24.patch
deleted file mode 100644
index 02df74a7fe63..000000000000
--- a/pkgs/by-name/go/gokapi/go-1.24.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go
-index 9f8a049..de21bdd 100644
---- a/build/go-generate/copyStaticFiles.go
-+++ b/build/go-generate/copyStaticFiles.go
-@@ -10,7 +10,7 @@ import (
- )
- 
- func main() {
--	copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
-+	copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
- 	copyFile("../../go.mod", "../../build/go.mod")
- 	copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json")
- }
diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix
index aa92501900fb..cca70f9f1748 100644
--- a/pkgs/by-name/go/gokapi/package.nix
+++ b/pkgs/by-name/go/gokapi/package.nix
@@ -9,30 +9,33 @@
 
 buildGoModule rec {
   pname = "gokapi";
-  version = "1.9.6";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "Forceu";
     repo = "Gokapi";
     tag = "v${version}";
-    hash = "sha256-RDEvKh3tUun7wt1nhtCim95wEN9V9RlztZ9zcw9nS1o=";
+    hash = "sha256-YhUHi1tR2bCFskBbAlFekuFzfZ2ER9G+TNCcfh5loS4=";
   };
 
-  vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ=";
+  vendorHash = "sha256-GeS+lfFw7jUuXX1qQPiu9eKjz6nswpRtbZXjqu4DnHg=";
 
-  patches = [
-    ./go-1.24.patch
-  ];
+  patches = [ ];
 
   # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work.
   preBuild = ''
+    # Some steps expect GOROOT to be set.
+    export GOROOT="$(go env GOROOT)"
+    # Go generate runs from this working dir upstream
     cd ./cmd/gokapi/
     go run ../../build/go-generate/updateVersionNumbers.go
-    # Tries to download "golang.org/x/exp/slices"
+    # Tries to download "golang.org/x/exp/slices", and fails
     # go run ../../build/go-generate/updateProtectedUrls.go
     go run ../../build/go-generate/buildWasm.go
-    # Must be specify go root to import wasm_exec.js
-    GOROOT="$(go env GOROOT)" go run "../../build/go-generate/copyStaticFiles.go"
+    go run ../../build/go-generate/copyStaticFiles.go
+    # Attempts to download program to minify content, and fails
+    # go run ../../build/go-generate/minifyStaticContent.go
+    go run ../../build/go-generate/updateApiRouting.go
     cd ../..
   '';
 

From 74be6ce921c16b52aac0460b0735bbb9f948c4ed Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Sat, 31 May 2025 16:58:04 +0200
Subject: [PATCH 0264/1497] pmbootstrap: 3.4.0 -> 3.4.2

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.4.1

https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags/3.4.2
---
 pkgs/by-name/pm/pmbootstrap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix
index 42230293293d..0b71d0e307e9 100644
--- a/pkgs/by-name/pm/pmbootstrap/package.nix
+++ b/pkgs/by-name/pm/pmbootstrap/package.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pmbootstrap";
-  version = "3.4.0";
+  version = "3.4.2";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "postmarketOS";
     repo = "pmbootstrap";
     tag = version;
-    hash = "sha256-vNa0MMU5NHO8RjgfKxNjhQDKQ2Rd/ZGU0HndOD2Sypo=";
+    hash = "sha256-5N8yAd/1gSzHP2wXpqZb+LpylQ/LYspJ+YaY2YaWCSs=";
     domain = "gitlab.postmarketos.org";
   };
 
@@ -80,7 +80,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Sophisticated chroot/build/flash tool to develop and install postmarketOS";
-    homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
+    homepage = "https://gitlab.postmarketos.org/postmarketOS/pmbootstrap";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       onny

From b98e7bb95a1e66d951a9c517cadb151694358bad Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 30 May 2025 18:55:46 +0200
Subject: [PATCH 0265/1497] OWNERS: simplify workflow/ci owners

The current setup causes the Security team and the other owners of
.github/workflows to **not** be pinged for the
check-format/codeowners-v2/nixpkgs-vet workflows. This was highly likely
unintended when adding those additional rules, so removing them.

Also, we have some owners looking after `workflows/`, but not `ci/` -
and some the other way around. This doesn't make much sense to me, since
both parts depend on each other very much.
---
 ci/OWNERS | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 716dfd2df5b7..937c8d8af2d7 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -15,12 +15,9 @@
 
 # CI
 /.github/*_TEMPLATE*                    @SigmaSquadron
-/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
-/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther
-/.github/workflows/check-format.yml     @infinisil @wolfgangwalther
-/.github/workflows/codeowners-v2.yml    @infinisil @wolfgangwalther
-/.github/workflows/nixpkgs-vet.yml      @infinisil @philiptaron @wolfgangwalther
-/ci                                     @infinisil @philiptaron @NixOS/Security @wolfgangwalther
+/.github/actions                        @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
+/ci                                     @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther @philiptaron
 /ci/OWNERS                              @infinisil @philiptaron
 
 # Development support

From 5446ad302b58605f3a4e9c3fe588f8c3c082faf6 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 31 May 2025 23:38:29 +0800
Subject: [PATCH 0266/1497] xwayland-satellite: 0.5.1 -> 0.6

Diff: https://github.com/Supreeeme/xwayland-satellite/compare/v0.5.1...v0.6
Changelog: https://github.com/Supreeeme/xwayland-satellite/releases/tag/v0.6
---
 pkgs/by-name/xw/xwayland-satellite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index c63af00aec55..58cb0297b115 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xwayland-satellite";
-  version = "0.5.1";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xwayland-satellite";
     tag = "v${version}";
-    hash = "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=";
+    hash = "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=";
   };
 
   postPatch = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1tt7YNornw9U9FRdsRkdWx3Al3FZtvtCBXn9Pln+gk4=";
+  cargoHash = "sha256-R3xXyXpHQw/Vh5Y4vFUl7n7jwBEEqwUCIZGAf9+SY1M=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From c0962292fb8899f1ff0746fe61a431f0df02fe37 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Fri, 23 May 2025 13:28:37 +0200
Subject: [PATCH 0267/1497] librenms: use php instead of php82

---
 pkgs/by-name/li/librenms/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 5d7ea073b901..283375f60e15 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   unixtools,
-  php82,
+  php,
   python3,
   makeWrapper,
   nixosTests,
@@ -23,7 +23,7 @@
 }:
 
 let
-  phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]);
+  phpPackage = php.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]);
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";

From 6f390b2412263d48a6fed1e70632bb19925331c2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 31 May 2025 23:21:24 +0800
Subject: [PATCH 0268/1497] xfce.xfce4-screenshooter: 1.11.1 -> 1.11.2

https://gitlab.xfce.org/apps/xfce4-screenshooter/-/compare/xfce4-screenshooter-1.11.1...xfce4-screenshooter-1.11.2
---
 .../xfce4-screenshooter/default.nix           | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index f5391fbfaf5e..ac6d913e2590 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -1,7 +1,14 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  glib,
+  meson,
+  ninja,
+  pkg-config,
   wayland-scanner,
+  wrapGAppsHook3,
   exo,
   gtk3,
   libX11,
@@ -18,18 +25,35 @@
   zenity,
   jq,
   xclip,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-screenshooter";
-  version = "1.11.1";
-  odd-unstable = false;
+  version = "1.11.2";
 
-  sha256 = "sha256-/N79YK233k9rVg5fGr27b8AZD9bCXllNQvrN4ghir/M=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfce4-screenshooter";
+    tag = "xfce4-screenshooter-${finalAttrs.version}";
+    hash = "sha256-LELPY3SU25e3Dk9/OljWMLIbZYrDiQD1h6dMq+jRaH8=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
 
   nativeBuildInputs = [
+    gettext
+    glib # glib-compile-resources
+    meson
+    ninja
+    pkg-config
     wayland-scanner
+    wrapGAppsHook3
   ];
 
   buildInputs = [
@@ -62,9 +86,14 @@ mkXfceDerivation {
     )
   '';
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-screenshooter-"; };
+
+  meta = {
     description = "Screenshot utility for the Xfce desktop";
+    homepage = "https://gitlab.xfce.org/apps/xfce4-screenshooter";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "xfce4-screenshooter";
-    teams = [ teams.xfce ];
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 53cfda6c64474cfa6390b6f1de6b831cd30ce361 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 31 May 2025 23:24:42 +0800
Subject: [PATCH 0269/1497] xfce.xfce4-taskmanager: 1.5.8 -> 1.6.0

https://gitlab.xfce.org/apps/xfce4-taskmanager/-/compare/xfce4-taskmanager-1.5.8...xfce4-taskmanager-1.6.0
---
 .../xfce4-taskmanager/default.nix             | 46 ++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index 8c2f33e687be..f6e5273c7282 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -1,41 +1,65 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
-  exo,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
   glib,
   gtk3,
   libxfce4ui,
+  libxfce4util,
   xfconf,
   libwnck,
   libX11,
   libXmu,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-taskmanager";
-  version = "1.5.8";
-  odd-unstable = false;
+  version = "1.6.0";
 
-  sha256 = "sha256-A2L41YdIpFnbAjQOp+/sJu1oUX9V7jxLsWY7b21frjY=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfce4-taskmanager";
+    tag = "xfce4-taskmanager-${finalAttrs.version}";
+    hash = "sha256-HQsZ7SmOX8Z5yuQUe+AvQFx+HVWNRRHEO7dE5DnfT/8=";
+  };
+
+  strictDeps = true;
 
   nativeBuildInputs = [
-    exo
+    gettext
+    glib # glib-compile-resources
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     glib
     gtk3
     libxfce4ui
+    libxfce4util
     xfconf
     libwnck
     libX11
     libXmu
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-taskmanager-"; };
+
+  meta = {
     description = "Easy to use task manager for Xfce";
+    homepage = "https://gitlab.xfce.org/apps/xfce4-taskmanager";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "xfce4-taskmanager";
-    teams = [ teams.xfce ];
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From eed59a53436d7956a8a7bf6468875ea1a9003655 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 31 May 2025 23:30:08 +0800
Subject: [PATCH 0270/1497] xfce.xfce4-volumed-pulse: 0.2.5 -> 0.3.0

https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/compare/xfce4-volumed-pulse-0.2.5...xfce4-volumed-pulse-0.3.0
---
 .../xfce4-volumed-pulse/default.nix           | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index e661ab07edb6..425a3b73a68a 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
@@ -1,19 +1,41 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
   gtk3,
   libnotify,
   libpulseaudio,
   keybinder3,
   xfconf,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-volumed-pulse";
-  version = "0.2.5";
+  version = "0.3.0";
 
-  sha256 = "sha256-A7PM4zHL4hkhsZjYEPuEiujP1ofP7V/QVqDNgGoGIm8=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfce4-volumed-pulse";
+    tag = "xfce4-volumed-pulse-${finalAttrs.version}";
+    hash = "sha256-TdvqvlpNDs9i7IzegqGYTdvy2OVMdQUFvuENNmpkqAY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs = [
     gtk3
@@ -23,11 +45,15 @@ mkXfceDerivation {
     xfconf
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "xfce4-volumed-pulse-"; };
+
+  meta = {
     description = "Volume keys control daemon for Xfce using pulseaudio";
+    homepage = "https://gitlab.xfce.org/apps/xfce4-volumed-pulse";
     mainProgram = "xfce4-volumed-pulse";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ abbradar ];
-    teams = [ teams.xfce ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ abbradar ];
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 9e6bd241b241ab0b7f4ccaa61293588d51311a0c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 31 May 2025 23:56:08 +0800
Subject: [PATCH 0271/1497] xfce.xfmpc: 0.3.2 -> 0.4.0

https://gitlab.xfce.org/apps/xfmpc/-/compare/xfmpc-0.3.2...xfmpc-0.4.0
---
 .../xfce/applications/xfmpc/default.nix       | 42 +++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfmpc/default.nix b/pkgs/desktops/xfce/applications/xfmpc/default.nix
index 4d8bf6bee25d..697ae6453a50 100644
--- a/pkgs/desktops/xfce/applications/xfmpc/default.nix
+++ b/pkgs/desktops/xfce/applications/xfmpc/default.nix
@@ -1,39 +1,67 @@
 {
+  stdenv,
   lib,
-  mkXfceDerivation,
+  fetchFromGitLab,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
   vala,
+  wrapGAppsHook3,
   libxfce4util,
   libxfce4ui,
   gtk3,
   glib,
   libmpd,
+  gitUpdater,
 }:
 
-mkXfceDerivation rec {
-  category = "apps";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfmpc";
-  version = "0.3.2";
-  sha256 = "sha256-V5YHvhcWv6IUPe8W1VtuPagj3uU3s+ikgu3ZnRF48O4=";
+  version = "0.4.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "apps";
+    repo = "xfmpc";
+    tag = "xfmpc-${finalAttrs.version}";
+    hash = "sha256-fYK8JbWFnkzFpgfmSHa6usnlke4G7pxmdSm7kEQsL5M=";
+  };
+
+  strictDeps = true;
 
   nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    pkg-config
     vala
-    libxfce4util
+    wrapGAppsHook3
     # Needed both here and in buildInputs for cross compilation to work
+    # as they failed to find native vapigen and thus not building the
+    # *.vapi files (this should be fixed when these libraries are built
+    # with meson).
     libxfce4ui
+    libxfce4util
   ];
+
   buildInputs = [
     gtk3
     glib
     libxfce4ui
+    libxfce4util
     libmpd
   ];
 
+  passthru.updateScript = gitUpdater { rev-prefix = "xfmpc-"; };
+
   meta = with lib; {
     description = "MPD client written in GTK";
     homepage = "https://docs.xfce.org/apps/xfmpc/start";
     changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/xfmpc-${version}/NEWS";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ doronbehar ];
     teams = [ teams.xfce ];
     mainProgram = "xfmpc";
   };
-}
+})

From 66b72c81b35b32b8b8bb5eec06e711e7bad0e1df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 16:20:26 +0000
Subject: [PATCH 0272/1497] python3Packages.aioairq: 0.4.4 -> 0.4.6

---
 pkgs/development/python-modules/aioairq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix
index ce74245ccd42..585f29d14f13 100644
--- a/pkgs/development/python-modules/aioairq/default.nix
+++ b/pkgs/development/python-modules/aioairq/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aioairq";
-  version = "0.4.4";
+  version = "0.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "CorantGmbH";
     repo = "aioairq";
     tag = "v${version}";
-    hash = "sha256-RwkqhPAKbNZ/RrVxJchtqGDpbmS9eusv1X/B3NseAFk=";
+    hash = "sha256-XlOVCDWbcdh8VjNxlEcVNttRN3mw19AXlIIQJ1II144=";
   };
 
   build-system = [ setuptools ];

From 39fe05dec00a81a87b5826e0f82421909d9038eb Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Sat, 31 May 2025 17:04:16 +0000
Subject: [PATCH 0273/1497] nixos/lasuite-docs: fix media proxying

---
 nixos/modules/services/web-apps/lasuite-docs.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix
index eb1c44c2e87b..b18ba8a1abf6 100644
--- a/nixos/modules/services/web-apps/lasuite-docs.nix
+++ b/nixos/modules/services/web-apps/lasuite-docs.nix
@@ -9,6 +9,7 @@ let
   inherit (lib)
     getExe
     mapAttrs
+    match
     mkEnableOption
     mkIf
     mkPackageOption
@@ -32,6 +33,8 @@ let
       toString value
   ) cfg.settings;
 
+  proxySuffix = if match "unix:.*" cfg.bind != null then ":" else "";
+
   commonServiceConfig = {
     RuntimeDirectory = "lasuite-docs";
     StateDirectory = "lasuite-docs";
@@ -476,10 +479,9 @@ in
         };
 
         locations."/media-auth" = {
-          proxyPass = "http://${cfg.bind}";
+          proxyPass = "http://${cfg.bind}${proxySuffix}/api/v1.0/documents/media-auth/";
           recommendedProxySettings = true;
           extraConfig = ''
-            rewrite $/(.*)^ /api/v1.0/documents/$1 break;
             proxy_set_header X-Original-URL $request_uri;
             proxy_pass_request_body off;
             proxy_set_header Content-Length "";
@@ -489,7 +491,6 @@ in
 
         locations."/media/" = {
           proxyPass = cfg.s3Url;
-          recommendedProxySettings = true;
           extraConfig = ''
             auth_request /media-auth;
             auth_request_set $authHeader $upstream_http_authorization;

From e9d282cf7face7c82f2292d0c943fa4fdca0cb05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 18:56:16 +0000
Subject: [PATCH 0274/1497] pdfarranger: 1.11.1 -> 1.12.0

---
 pkgs/by-name/pd/pdfarranger/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 2a8045abeaa4..d9a0f67ea140 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdfarranger";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdfarranger";
     repo = "pdfarranger";
     tag = version;
-    hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
+    hash = "sha256-//JjIPDeyI+JZoFT2GU+wCP+tkKCchgS9ftMT5rUEOM=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
@@ -64,6 +64,6 @@ python3Packages.buildPythonApplication rec {
       endle
     ];
     license = lib.licenses.gpl3Plus;
-    changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}";
+    changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${src.tag}";
   };
 }

From 9bca3187758b4459d9404943d69bf1196a1a38da Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 17:05:20 +0200
Subject: [PATCH 0275/1497] nixos/murmur: Use lib.mkEnableOption where possible

While on it, replace occurrences of "Murmur" with "Mumble server" of
touched options.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 29 +++-----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index aa205d1f60b4..2142d656bfa5 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -60,19 +60,9 @@ in
 
   options = {
     services.murmur = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If enabled, start the Murmur Mumble server.";
-      };
+      enable = lib.mkEnableOption "Mumble server";
 
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open ports in the firewall for the Murmur Mumble server.
-        '';
-      };
+      openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server";
 
       user = mkOption {
         type = types.str;
@@ -203,14 +193,7 @@ in
         '';
       };
 
-      bonjour = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable Bonjour auto-discovery, which allows clients over
-          your LAN to automatically discover Murmur servers.
-        '';
-      };
+      bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers";
 
       sendVersion = mkOption {
         type = types.bool;
@@ -255,11 +238,7 @@ in
         '';
       };
 
-      clientCertRequired = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Require clients to authenticate via certificates.";
-      };
+      clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
 
       sslCert = mkOption {
         type = types.str;

From f13ada1223f8d8af00c1204463ea59a21f53afb0 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 17:19:56 +0200
Subject: [PATCH 0276/1497] nixos/murmur: Get rid global lib expansion

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 196 +++++++++----------
 1 file changed, 97 insertions(+), 99 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 2142d656bfa5..fa9ea4710c94 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -5,8 +5,6 @@
   ...
 }:
 
-with lib;
-
 let
   cfg = config.services.murmur;
   forking = cfg.logFile != null;
@@ -14,48 +12,48 @@ let
     database=${cfg.stateDir}/murmur.sqlite
     dbDriver=QSQLITE
 
-    autobanAttempts=${toString cfg.autobanAttempts}
-    autobanTimeframe=${toString cfg.autobanTimeframe}
-    autobanTime=${toString cfg.autobanTime}
+    autobanAttempts=${lib.toString cfg.autobanAttempts}
+    autobanTimeframe=${lib.toString cfg.autobanTimeframe}
+    autobanTime=${lib.toString cfg.autobanTime}
 
-    logfile=${optionalString (cfg.logFile != null) cfg.logFile}
-    ${optionalString forking "pidfile=/run/murmur/murmurd.pid"}
+    logfile=${lib.optionalString (cfg.logFile != null) cfg.logFile}
+    ${lib.optionalString forking "pidfile=/run/murmur/murmurd.pid"}
 
     welcometext="${cfg.welcometext}"
-    port=${toString cfg.port}
+    port=${lib.toString cfg.port}
 
-    ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
-    ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
+    ${lib.optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
+    ${lib.optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
 
-    bandwidth=${toString cfg.bandwidth}
-    users=${toString cfg.users}
+    bandwidth=${lib.toString cfg.bandwidth}
+    users=${lib.toString cfg.users}
 
-    textmessagelength=${toString cfg.textMsgLength}
-    imagemessagelength=${toString cfg.imgMsgLength}
-    allowhtml=${boolToString cfg.allowHtml}
-    logdays=${toString cfg.logDays}
-    bonjour=${boolToString cfg.bonjour}
-    sendversion=${boolToString cfg.sendVersion}
+    textmessagelength=${lib.toString cfg.textMsgLength}
+    imagemessagelength=${lib.toString cfg.imgMsgLength}
+    allowhtml=${lib.boolToString cfg.allowHtml}
+    logdays=${lib.toString cfg.logDays}
+    bonjour=${lib.boolToString cfg.bonjour}
+    sendversion=${lib.boolToString cfg.sendVersion}
 
-    ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
-    ${optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
-    ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
-    ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
+    ${lib.optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
+    ${lib.optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
+    ${lib.optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
+    ${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
 
-    certrequired=${boolToString cfg.clientCertRequired}
-    ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
-    ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
-    ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
+    certrequired=${lib.boolToString cfg.clientCertRequired}
+    ${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
+    ${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
+    ${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
 
-    ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
+    ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
 
     ${cfg.extraConfig}
   '';
 in
 {
   imports = [
-    (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
-    (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
+    (lib.mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
+    (lib.mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
   ];
 
   options = {
@@ -64,8 +62,8 @@ in
 
       openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server";
 
-      user = mkOption {
-        type = types.str;
+      user = lib.mkOption {
+        type = lib.types.str;
         default = "murmur";
         description = ''
           The name of an existing user to use to run the service.
@@ -73,8 +71,8 @@ in
         '';
       };
 
-      group = mkOption {
-        type = types.str;
+      group = lib.mkOption {
+        type = lib.types.str;
         default = "murmur";
         description = ''
           The name of an existing group to use to run the service.
@@ -82,16 +80,16 @@ in
         '';
       };
 
-      stateDir = mkOption {
-        type = types.path;
+      stateDir = lib.mkOption {
+        type = lib.types.path;
         default = "/var/lib/murmur";
         description = ''
           Directory to store data for the server.
         '';
       };
 
-      autobanAttempts = mkOption {
-        type = types.int;
+      autobanAttempts = lib.mkOption {
+        type = lib.types.int;
         default = 10;
         description = ''
           Number of attempts a client is allowed to make in
@@ -100,8 +98,8 @@ in
         '';
       };
 
-      autobanTimeframe = mkOption {
-        type = types.int;
+      autobanTimeframe = lib.mkOption {
+        type = lib.types.int;
         default = 120;
         description = ''
           Timeframe in which a client can connect without being banned
@@ -109,47 +107,47 @@ in
         '';
       };
 
-      autobanTime = mkOption {
-        type = types.int;
+      autobanTime = lib.mkOption {
+        type = lib.types.int;
         default = 300;
         description = "The amount of time an IP ban lasts (in seconds).";
       };
 
-      logFile = mkOption {
-        type = types.nullOr types.path;
+      logFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         example = "/var/log/murmur/murmurd.log";
         description = "Path to the log file for Murmur daemon. Empty means log to journald.";
       };
 
-      welcometext = mkOption {
-        type = types.str;
+      welcometext = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Welcome message for connected clients.";
       };
 
-      port = mkOption {
-        type = types.port;
+      port = lib.mkOption {
+        type = lib.types.port;
         default = 64738;
         description = "Ports to bind to (UDP and TCP).";
       };
 
-      hostName = mkOption {
-        type = types.str;
+      hostName = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Host to bind to. Defaults binding on all addresses.";
       };
 
-      package = mkPackageOption pkgs "murmur" { };
+      package = lib.mkPackageOption pkgs "murmur" { };
 
-      password = mkOption {
-        type = types.str;
+      password = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Required password to join server, if specified.";
       };
 
-      bandwidth = mkOption {
-        type = types.int;
+      bandwidth = lib.mkOption {
+        type = lib.types.int;
         default = 72000;
         description = ''
           Maximum bandwidth (in bits per second) that clients may send
@@ -157,26 +155,26 @@ in
         '';
       };
 
-      users = mkOption {
-        type = types.int;
+      users = lib.mkOption {
+        type = lib.types.int;
         default = 100;
         description = "Maximum number of concurrent clients allowed.";
       };
 
-      textMsgLength = mkOption {
-        type = types.int;
+      textMsgLength = lib.mkOption {
+        type = lib.types.int;
         default = 5000;
         description = "Max length of text messages. Set 0 for no limit.";
       };
 
-      imgMsgLength = mkOption {
-        type = types.int;
+      imgMsgLength = lib.mkOption {
+        type = lib.types.int;
         default = 131072;
         description = "Max length of image messages. Set 0 for no limit.";
       };
 
-      allowHtml = mkOption {
-        type = types.bool;
+      allowHtml = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Allow HTML in client messages, comments, and channel
@@ -184,8 +182,8 @@ in
         '';
       };
 
-      logDays = mkOption {
-        type = types.int;
+      logDays = lib.mkOption {
+        type = lib.types.int;
         default = 31;
         description = ''
           How long to store RPC logs for in the database. Set 0 to
@@ -195,14 +193,14 @@ in
 
       bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers";
 
-      sendVersion = mkOption {
-        type = types.bool;
+      sendVersion = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Send Murmur version in UDP response.";
       };
 
-      registerName = mkOption {
-        type = types.str;
+      registerName = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Public server registration name, and also the name of the
@@ -211,8 +209,8 @@ in
         '';
       };
 
-      registerPassword = mkOption {
-        type = types.str;
+      registerPassword = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Public server registry password, used authenticate your
@@ -221,14 +219,14 @@ in
         '';
       };
 
-      registerUrl = mkOption {
-        type = types.str;
+      registerUrl = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "URL website for your server.";
       };
 
-      registerHostname = mkOption {
-        type = types.str;
+      registerHostname = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           DNS hostname where your server can be reached. This is only
@@ -240,34 +238,34 @@ in
 
       clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
 
-      sslCert = mkOption {
-        type = types.str;
+      sslCert = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL certificate.";
       };
 
-      sslKey = mkOption {
-        type = types.str;
+      sslKey = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL key.";
       };
 
-      sslCa = mkOption {
-        type = types.str;
+      sslCa = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL CA certificate.";
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Extra configuration to put into murmur.ini.";
       };
 
-      environmentFile = mkOption {
-        type = types.nullOr types.path;
+      environmentFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
-        example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
+        example = lib.literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
         description = ''
           Environment file as defined in {manpage}`systemd.exec(5)`.
 
@@ -290,8 +288,8 @@ in
         '';
       };
 
-      dbus = mkOption {
-        type = types.enum [
+      dbus = lib.mkOption {
+        type = lib.types.enum [
           null
           "session"
           "system"
@@ -302,19 +300,19 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    users.users.murmur = mkIf (cfg.user == "murmur") {
+  config = lib.mkIf cfg.enable {
+    users.users.murmur = lib.mkIf (cfg.user == "murmur") {
       description = "Murmur Service user";
       home = cfg.stateDir;
       createHome = true;
       uid = config.ids.uids.murmur;
       group = cfg.group;
     };
-    users.groups.murmur = mkIf (cfg.group == "murmur") {
+    users.groups.murmur = lib.mkIf (cfg.group == "murmur") {
       gid = config.ids.gids.murmur;
     };
 
-    networking.firewall = mkIf cfg.openFirewall {
+    networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
       allowedUDPPorts = [ cfg.port ];
     };
@@ -332,8 +330,8 @@ in
       serviceConfig = {
         # murmurd doesn't fork when logging to the console.
         Type = if forking then "forking" else "simple";
-        PIDFile = mkIf forking "/run/murmur/murmurd.pid";
-        EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
+        PIDFile = lib.mkIf forking "/run/murmur/murmurd.pid";
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
         ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini";
         Restart = "always";
         RuntimeDirectory = "murmur";
@@ -369,7 +367,7 @@ in
 
     # currently not included in upstream package, addition requested at
     # https://github.com/mumble-voip/mumble/issues/6078
-    services.dbus.packages = mkIf (cfg.dbus == "system") [
+    services.dbus.packages = lib.mkIf (cfg.dbus == "system") [
       (pkgs.writeTextFile {
         name = "murmur-dbus-policy";
         text = ''
@@ -411,19 +409,19 @@ in
           r /run/murmur/murmurd.ini,
           r ${configFile},
       ''
-      + optionalString (cfg.logFile != null) ''
+      + lib.optionalString (cfg.logFile != null) ''
         rw ${cfg.logFile},
       ''
-      + optionalString (cfg.sslCert != "") ''
+      + lib.optionalString (cfg.sslCert != "") ''
         r ${cfg.sslCert},
       ''
-      + optionalString (cfg.sslKey != "") ''
+      + lib.optionalString (cfg.sslKey != "") ''
         r ${cfg.sslKey},
       ''
-      + optionalString (cfg.sslCa != "") ''
+      + lib.optionalString (cfg.sslCa != "") ''
         r ${cfg.sslCa},
       ''
-      + optionalString (cfg.dbus != null) ''
+      + lib.optionalString (cfg.dbus != null) ''
         dbus bus=${cfg.dbus}
       ''
       + ''

From 7c7c839a26215b2585c685c4be87103a0e9198fa Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 18:14:15 +0200
Subject: [PATCH 0277/1497] nixos/murmur: Drop warnings regarding
 renamed/removed options

These warnings were added around 5 years ago. That's long enough. So
drop them.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index fa9ea4710c94..8ff4c8110638 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -51,11 +51,6 @@ let
   '';
 in
 {
-  imports = [
-    (lib.mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
-    (lib.mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
-  ];
-
   options = {
     services.murmur = {
       enable = lib.mkEnableOption "Mumble server";

From c27ca7e237f647c70fdb3bbe2b7a51feaa1b8f8c Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Sun, 1 Jun 2025 00:02:35 +0200
Subject: [PATCH 0278/1497] hyprswitch: rename to hyprshell

---
 pkgs/by-name/hy/{hyprswitch => hyprshell}/package.nix | 4 ++--
 pkgs/top-level/aliases.nix                            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/by-name/hy/{hyprswitch => hyprshell}/package.nix (93%)

diff --git a/pkgs/by-name/hy/hyprswitch/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
similarity index 93%
rename from pkgs/by-name/hy/hyprswitch/package.nix
rename to pkgs/by-name/hy/hyprshell/package.nix
index 0eb1b46fc724..aa5737abee5c 100644
--- a/pkgs/by-name/hy/hyprswitch/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -8,7 +8,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "hyprswitch";
+  pname = "hyprshell";
   version = "3.3.2";
 
   src = fetchFromGitHub {
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "CLI/GUI that allows switching between windows in Hyprland";
-    mainProgram = "hyprswitch";
+    mainProgram = "hyprshell";
     homepage = "https://github.com/H3rmt/hyprswitch";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 761f9ec1c342..3b8f878aef6f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -881,6 +881,7 @@ mapAliases {
   hyenae = throw "hyenae has been removed because it fails to build and was unmaintained for 15 years"; # Added 2025-04-04
   hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27
   hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
+  hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
   hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
 
   ### I ###

From 1b242d7ba56ed93cf30941c5fdffeef30166542b Mon Sep 17 00:00:00 2001
From: Aaron VerDow <aaron@verdow.com>
Date: Sat, 31 May 2025 18:24:33 -0500
Subject: [PATCH 0279/1497] numworks-epsilon: do not package build dependencies

---
 pkgs/by-name/nu/numworks-epsilon/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix
index 4280eb9ab4f8..ffb92658150c 100644
--- a/pkgs/by-name/nu/numworks-epsilon/package.nix
+++ b/pkgs/by-name/nu/numworks-epsilon/package.nix
@@ -49,9 +49,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mv ./output/release/simulator/linux/{epsilon.bin,epsilon}
     mkdir -p $out/bin
-    cp -r ./output/release/simulator/linux/* $out/bin/
+    cp ./output/release/simulator/linux/epsilon.bin $out/bin/epsilon
 
     # Build the logo
     assets="$src/ion/src/simulator/assets"

From 3d13b2705a1565aebdd8ee9615cf52e171c405f9 Mon Sep 17 00:00:00 2001
From: Ezri Zhu <me@ezrizhu.com>
Date: Sat, 31 May 2025 20:02:19 -0400
Subject: [PATCH 0280/1497] gvisor: 20240401.0 -> 20250512.0

---
 pkgs/by-name/gv/gvisor/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix
index 3350afc8048b..33c183c9b52c 100644
--- a/pkgs/by-name/gv/gvisor/package.nix
+++ b/pkgs/by-name/gv/gvisor/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "gvisor";
-  version = "20240401.0";
+  version = "20250512.0";
 
   # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
   # that can be used to build gvisor without bazel.
@@ -21,8 +21,8 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gvisor";
-    rev = "9d995324d058812a5476f8c06b20167012511e9c";
-    hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A=";
+    rev = "2a7b5c7dece9218a44afb8c56e28f2aae8038f6b";
+    hash = "sha256-u2YMFesrtQX+eE0aKYiOr+4/khPtsH2P2EQWfvHs8nI=";
   };
 
   # Replace the placeholder with the actual path to ldconfig
@@ -31,7 +31,7 @@ buildGoModule {
       --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"'
   '';
 
-  vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4=";
+  vendorHash = "sha256-3fKFr8viabGEwIHYxg9vjhKMVOxCjji3PDgs8wBBZzY=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From d35936c994db57ea95edfda3f8da00fecf2dcfec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 00:02:28 +0000
Subject: [PATCH 0281/1497] karmor: 1.3.4 -> 1.4.1

---
 pkgs/by-name/ka/karmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix
index 20737002e2af..972884bf1bac 100644
--- a/pkgs/by-name/ka/karmor/package.nix
+++ b/pkgs/by-name/ka/karmor/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "karmor";
-  version = "1.3.4";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "kubearmor";
     repo = "kubearmor-client";
     rev = "v${version}";
-    hash = "sha256-3WPelRhvK/9LY+TFDExcltszE1wVRr1MMY9Xjijj0so=";
+    hash = "sha256-gFcv2VxKTozEAJvcncOc6X1Pn7HWomHgemCfyddZSJs=";
   };
 
-  vendorHash = "sha256-HH3U1reZXG9w7uwnXbY33hsKlPCxbVb2yvw4KmBfOa0=";
+  vendorHash = "sha256-4F/q6vYOGtLef+rrJXKhLwjM71NMNI4es4dKe1pohZU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 03d860ac2bfa6ae89ce032012a7b8c94b7b74e91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 00:31:13 +0000
Subject: [PATCH 0282/1497] tomcat-native: 2.0.8 -> 2.0.9

---
 pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix
index e2d621e9cdc6..43cb08c137ba 100644
--- a/pkgs/servers/http/tomcat/tomcat-native.nix
+++ b/pkgs/servers/http/tomcat/tomcat-native.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tomcat-native";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
-    hash = "sha256-x8U4L8taZHpc5v7QuWch6UGY+i9XJc9RJPW2URsF3+8=";
+    hash = "sha256-iu0N70FNf0m2iOgmeXUT6VGC7L17b4tvAl5Se4UGXAI=";
   };
 
   sourceRoot = "${pname}-${version}-src/native";

From c89beaa4a32d080a240abb822817c97474cb7b1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 00:38:45 +0000
Subject: [PATCH 0283/1497] slurm: 24.11.5.1 -> 25.05.0.1

---
 pkgs/by-name/sl/slurm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index ee53bf310446..74320b74435a 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation rec {
   pname = "slurm";
-  version = "24.11.5.1";
+  version = "25.05.0.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}";
-    hash = "sha256-0c8b+quLeWpCyuCOcp/B8Yd0dxr90UtSV/tgeTi7tbk=";
+    hash = "sha256-C1euW/twT3AhwtNUmUDtmFjMUi5B4I7r488YcT+N/zM=";
   };
 
   outputs = [

From 586abb0c0703820bf711ac3993662e0e7ff8a331 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 12 May 2025 22:13:33 +0000
Subject: [PATCH 0284/1497] xarchiver: build with strictDeps=true

---
 pkgs/by-name/xa/xarchiver/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix
index a2cf7b39fa38..33d725d5a8d4 100644
--- a/pkgs/by-name/xa/xarchiver/package.nix
+++ b/pkgs/by-name/xa/xarchiver/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  bash,
   fetchFromGitHub,
   gtk3,
   pkg-config,
@@ -32,13 +33,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     intltool
-    pkg-config
+    libxslt
     makeWrapper
+    pkg-config
     wrapGAppsHook3
   ];
   buildInputs = [
     gtk3
-    libxslt
+    bash # so patchShebangs can patch #!/bin/sh in xarchiver.tap
   ];
 
   postFixup = ''
@@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
     }
   '';
 
+  strictDeps = true;
+
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";

From f134697b8417b4fc5318f0a7c6eb7ed6c10c3973 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 01:03:54 +0000
Subject: [PATCH 0285/1497] petsc: 3.23.2 -> 3.23.3

---
 pkgs/by-name/pe/petsc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 7d067f7566fa..450d7abff32e 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -111,11 +111,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.23.2";
+  version = "3.23.3";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-I/vxSo0CVvkcEPmbSahPog1MiyyG4IyNorrZUAPSTYw=";
+    hash = "sha256-1ycMyER09PIN5JyT5nQxUe3GnaVC6WFUUiuug9aXyKc=";
   };
 
   strictDeps = true;

From 2ee0f9a8b209bad9794be919bcf613ad84bb3e90 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 18:31:43 -0400
Subject: [PATCH 0286/1497] ne: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ne/ne/package.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ne/ne/package.nix b/pkgs/by-name/ne/ne/package.nix
index b3290e7184e2..5d253ac43900 100644
--- a/pkgs/by-name/ne/ne/package.nix
+++ b/pkgs/by-name/ne/ne/package.nix
@@ -9,22 +9,24 @@
   ghostscript,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ne";
   version = "3.3.4";
 
   src = fetchFromGitHub {
     owner = "vigna";
     repo = "ne";
-    rev = version;
-    sha256 = "sha256-n8PERQD9G4jmW4avQjbFofrSapyRoSbQ2k1LzVt0i1o=";
+    tag = finalAttrs.version;
+    hash = "sha256-n8PERQD9G4jmW4avQjbFofrSapyRoSbQ2k1LzVt0i1o=";
   };
 
   postPatch = ''
-    substituteInPlace makefile --replace "./version.pl" "perl version.pl"
-    substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
+    substituteInPlace makefile --replace-fail "./version.pl" "perl version.pl"
+    substituteInPlace src/makefile --replace-fail "-lcurses" "-lncurses"
   '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     texliveMedium
     texinfo6
@@ -35,18 +37,20 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Nice editor";
     homepage = "https://ne.di.unimi.it/";
+    changelog = "https://github.com/vigna/ne/releases/tag/${finalAttrs.version}";
+    downloadPage = "https://github.com/vigna/ne";
     longDescription = ''
       ne is a free (GPL'd) text editor based on the POSIX standard that runs
       (we hope) on almost any UN*X machine.  ne is easy to use for the beginner,
       but powerful and fully configurable for the wizard, and most sparing in its
       resource usage.  See the manual for some highlights of ne's features.
     '';
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ geri1701 ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ geri1701 ];
     mainProgram = "ne";
   };
-}
+})

From 48746c5692e8a3f3eb5d130296bed89a1011ba7c Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 31 May 2025 19:11:44 -0700
Subject: [PATCH 0287/1497] maintainers: update numinit's keys

Adding another key that travels with me instead of staying put.
Touch authentication is enabled on both keys.

The fingerprint is: C48F 475F 30A9 B192 3213  D5D5 C6E2 4809 77B2 F2F4

This commit is signed by the new key, which is signed by my main key,
which is already listed:

New:  https://keyserver.ubuntu.com/pks/lookup?op=vindex&search=0xc6e2480977b2f2f4
Main: https://keyserver.ubuntu.com/pks/lookup?op=vindex&search=0x5c3eb94d198f1491
---
 maintainers/maintainer-list.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6f36850b0e60..6568e2fa915a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18094,8 +18094,10 @@
     github = "numinit";
     githubId = 369111;
     keys = [
-      # >=2025
+      # >=2025, stays in one place
       { fingerprint = "FD28 F9C9 81C5 D78E 56E8  8311 5C3E B94D 198F 1491"; }
+      # >=2025, travels with me
+      { fingerprint = "C48F 475F 30A9 B192 3213  D5D5 C6E2 4809 77B2 F2F4"; }
       # <=2024
       { fingerprint = "190B DA97 F616 DE35 6899  ED17 F819 F1AF 2FC1 C1FF"; }
     ];

From 7137985c3993817bc82838174ec0b4d92155557c Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 16:31:18 -0700
Subject: [PATCH 0288/1497] llm: move to by-name

---
 pkgs/by-name/ll/llm/package.nix | 3 +++
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ll/llm/package.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
new file mode 100644
index 000000000000..0898381b470b
--- /dev/null
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.llm
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ebdcccdb165..8aa00063f483 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3519,8 +3519,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  llm = with python3Packages; toPythonApplication llm;
-
   loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
 
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {

From 98756a6482a81e624f9815a547cbc9309170adae Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 16:46:11 -0700
Subject: [PATCH 0289/1497] llm: add enable-llm-anthropic override

---
 pkgs/by-name/ll/llm/package.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 0898381b470b..e6f75b05e21d 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -1,3 +1,17 @@
-{ python3Packages }:
+{
+  lib,
+  python3Packages,
+  enable-llm-anthropic ? false,
+}:
 
-python3Packages.toPythonApplication python3Packages.llm
+let
+  inherit (python3Packages) toPythonApplication llm llm-anthropic;
+in
+
+toPythonApplication (
+  llm.overrideAttrs (finalAttrs: {
+    propagatedBuildInputs =
+      (finalAttrs.propagatedBuildInputs or [])
+      ++ lib.optionals enable-llm-anthropic [ llm-anthropic ];
+  })
+)

From b8a7b821f7b011381126ebc84a1abc834041263d Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 17:00:40 -0700
Subject: [PATCH 0290/1497] llm: add enable-llm-cmd override

---
 pkgs/by-name/ll/llm/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index e6f75b05e21d..6b2e8d0ab4b4 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -2,16 +2,23 @@
   lib,
   python3Packages,
   enable-llm-anthropic ? false,
+  enable-llm-cmd ? false,
 }:
 
 let
-  inherit (python3Packages) toPythonApplication llm llm-anthropic;
+  inherit (python3Packages)
+    toPythonApplication
+    llm
+    llm-anthropic
+    llm-cmd
+    ;
 in
 
 toPythonApplication (
   llm.overrideAttrs (finalAttrs: {
     propagatedBuildInputs =
-      (finalAttrs.propagatedBuildInputs or [])
-      ++ lib.optionals enable-llm-anthropic [ llm-anthropic ];
+      (finalAttrs.propagatedBuildInputs or [ ])
+      ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
+      ++ lib.optionals enable-llm-cmd [ llm-cmd ];
   })
 )

From ab5c974d2ed8f556b9aca522a7a3105dcc8eef4a Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 17:07:36 -0700
Subject: [PATCH 0291/1497] llm: add enable-llm-gemini override

---
 pkgs/by-name/ll/llm/package.nix                        | 5 ++++-
 pkgs/development/python-modules/llm-gemini/default.nix | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 6b2e8d0ab4b4..449547b3c152 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -3,6 +3,7 @@
   python3Packages,
   enable-llm-anthropic ? false,
   enable-llm-cmd ? false,
+  enable-llm-gemini ? false,
 }:
 
 let
@@ -11,6 +12,7 @@ let
     llm
     llm-anthropic
     llm-cmd
+    llm-gemini
     ;
 in
 
@@ -19,6 +21,7 @@ toPythonApplication (
     propagatedBuildInputs =
       (finalAttrs.propagatedBuildInputs or [ ])
       ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
-      ++ lib.optionals enable-llm-cmd [ llm-cmd ];
+      ++ lib.optionals enable-llm-cmd [ llm-cmd ]
+      ++ lib.optionals enable-llm-gemini [ llm-gemini ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index 0d0c33a4c446..7fa90627c6b7 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -27,10 +27,10 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
+    llm
   ];
 
   dependencies = [
-    llm
     httpx
     ijson
   ];

From 85868f71a08ae0a2e29f7c121179dbdbef754cce Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 17:13:00 -0700
Subject: [PATCH 0292/1497] llm: add enable-llm-gguf override

---
 pkgs/by-name/ll/llm/package.nix                      | 5 ++++-
 pkgs/development/python-modules/llm-gguf/default.nix | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 449547b3c152..b9d2b60e6370 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -4,6 +4,7 @@
   enable-llm-anthropic ? false,
   enable-llm-cmd ? false,
   enable-llm-gemini ? false,
+  enable-llm-gguf ? false,
 }:
 
 let
@@ -13,6 +14,7 @@ let
     llm-anthropic
     llm-cmd
     llm-gemini
+    llm-gguf
     ;
 in
 
@@ -22,6 +24,7 @@ toPythonApplication (
       (finalAttrs.propagatedBuildInputs or [ ])
       ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
-      ++ lib.optionals enable-llm-gemini [ llm-gemini ];
+      ++ lib.optionals enable-llm-gemini [ llm-gemini ]
+      ++ lib.optionals enable-llm-gguf [ llm-gguf ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-gguf/default.nix b/pkgs/development/python-modules/llm-gguf/default.nix
index 76a01159b2b8..386c0c11b392 100644
--- a/pkgs/development/python-modules/llm-gguf/default.nix
+++ b/pkgs/development/python-modules/llm-gguf/default.nix
@@ -27,12 +27,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
+    llm
   ];
 
   dependencies = [
     httpx
     llama-cpp-python
-    llm
   ];
 
   pythonImportsCheck = [ "llm_gguf" ];

From cf62949f31624f22dfa8ed76a8fc370358d3e0fb Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 7 May 2025 17:19:55 -0700
Subject: [PATCH 0293/1497] llm: add enable-llm-jq override

---
 pkgs/by-name/ll/llm/package.nix                    | 5 ++++-
 pkgs/development/python-modules/llm-jq/default.nix | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index b9d2b60e6370..0118f0764182 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -5,6 +5,7 @@
   enable-llm-cmd ? false,
   enable-llm-gemini ? false,
   enable-llm-gguf ? false,
+  enable-llm-jq ? false,
 }:
 
 let
@@ -15,6 +16,7 @@ let
     llm-cmd
     llm-gemini
     llm-gguf
+    llm-jq
     ;
 in
 
@@ -25,6 +27,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
-      ++ lib.optionals enable-llm-gguf [ llm-gguf ];
+      ++ lib.optionals enable-llm-gguf [ llm-gguf ]
+      ++ lib.optionals enable-llm-jq [ llm-jq ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-jq/default.nix b/pkgs/development/python-modules/llm-jq/default.nix
index 14ab4046712e..dab2b6727c9e 100644
--- a/pkgs/development/python-modules/llm-jq/default.nix
+++ b/pkgs/development/python-modules/llm-jq/default.nix
@@ -21,12 +21,11 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-  ];
-
-  dependencies = [
     llm
   ];
 
+  dependencies = [ ];
+
   pythonImportsCheck = [ "llm_jq" ];
 
   passthru.tests = {

From 96bde7a7d37aa6809ad20c7a1378ea02901b95ff Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 08:54:02 -0700
Subject: [PATCH 0294/1497] llm: add enable-llm-ollama override

---
 pkgs/by-name/ll/llm/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 0118f0764182..1da85212037c 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -6,6 +6,7 @@
   enable-llm-gemini ? false,
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
+  enable-llm-ollama ? false,
 }:
 
 let
@@ -17,6 +18,7 @@ let
     llm-gemini
     llm-gguf
     llm-jq
+    llm-ollama
     ;
 in
 
@@ -28,6 +30,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
-      ++ lib.optionals enable-llm-jq [ llm-jq ];
+      ++ lib.optionals enable-llm-jq [ llm-jq ]
+      ++ lib.optionals enable-llm-ollama [ llm-ollama ];
   })
 )

From c48e583dd99b50446138ff72f8cbed7e8903a966 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 08:58:19 -0700
Subject: [PATCH 0295/1497] llm: add enable-llm-openai-plugin override

---
 pkgs/by-name/ll/llm/package.nix                              | 5 ++++-
 .../development/python-modules/llm-openai-plugin/default.nix | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 1da85212037c..f3d5fce75228 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -7,6 +7,7 @@
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
   enable-llm-ollama ? false,
+  enable-llm-openai-plugin ? false,
 }:
 
 let
@@ -19,6 +20,7 @@ let
     llm-gguf
     llm-jq
     llm-ollama
+    llm-openai-plugin
     ;
 in
 
@@ -31,6 +33,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
-      ++ lib.optionals enable-llm-ollama [ llm-ollama ];
+      ++ lib.optionals enable-llm-ollama [ llm-ollama ]
+      ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-openai-plugin/default.nix b/pkgs/development/python-modules/llm-openai-plugin/default.nix
index 76f13696a877..d978142bd1c7 100644
--- a/pkgs/development/python-modules/llm-openai-plugin/default.nix
+++ b/pkgs/development/python-modules/llm-openai-plugin/default.nix
@@ -27,10 +27,10 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
+    llm
   ];
 
   dependencies = [
-    llm
     openai
   ];
 

From 31c73863a7187894251f4ba2a724bf5d4a114565 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 09:47:08 -0700
Subject: [PATCH 0296/1497] python3Packages.llm-mistral: init at 0.12

---
 pkgs/by-name/ll/llm/package.nix               |  3 +
 .../python-modules/llm-mistral/default.nix    | 58 +++++++++++++++++++
 .../llm-mistral/tests/llm-plugin.nix          | 22 +++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-mistral/default.nix
 create mode 100644 pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index f3d5fce75228..ec00b824c335 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -6,6 +6,7 @@
   enable-llm-gemini ? false,
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
+  enable-llm-mistral ? false,
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
 }:
@@ -19,6 +20,7 @@ let
     llm-gemini
     llm-gguf
     llm-jq
+    llm-mistral
     llm-ollama
     llm-openai-plugin
     ;
@@ -33,6 +35,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
+      ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ];
   })
diff --git a/pkgs/development/python-modules/llm-mistral/default.nix b/pkgs/development/python-modules/llm-mistral/default.nix
new file mode 100644
index 000000000000..25af109cc023
--- /dev/null
+++ b/pkgs/development/python-modules/llm-mistral/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  httpx,
+  httpx-sse,
+  llm,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-httpx,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-mistral";
+  version = "0.12";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-mistral";
+    tag = version;
+    hash = "sha256-oNA5NFI4BZMG/V+eSHfuF/JKBX2Xr/L8EK+mf7KjPD0=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [
+    httpx
+    httpx-sse
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-httpx
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_mistral" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin providing access to Mistral models using the Mistral API";
+    homepage = "https://github.com/simonw/llm-mistral";
+    changelog = "https://github.com/simonw/llm-mistral/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix
new file mode 100644
index 000000000000..23077de3b85e
--- /dev/null
+++ b/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-mistral
+  ]);
+in
+runCommand "llm-mistral-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-mistral")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4c9004ae04d..16103e129f42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8304,6 +8304,8 @@ self: super: with self; {
 
   llm-jq = callPackage ../development/python-modules/llm-jq { };
 
+  llm-mistral = callPackage ../development/python-modules/llm-mistral { };
+
   llm-ollama = callPackage ../development/python-modules/llm-ollama { };
 
   llm-openai-plugin = callPackage ../development/python-modules/llm-openai-plugin { };

From 12bcd7aa10ed3475f8bde0ffb72e05969e2c7937 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 10:02:32 -0700
Subject: [PATCH 0297/1497] python3Packages.llm-command-r: init at 0.3.1

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../python-modules/llm-command-r/default.nix  | 52 +++++++++++++++++++
 .../llm-command-r/tests/llm-plugin.nix        | 22 ++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 79 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-command-r/default.nix
 create mode 100644 pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index ec00b824c335..42c2b14ede81 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -3,6 +3,7 @@
   python3Packages,
   enable-llm-anthropic ? false,
   enable-llm-cmd ? false,
+  enable-llm-command-r ? false,
   enable-llm-gemini ? false,
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
@@ -17,6 +18,7 @@ let
     llm
     llm-anthropic
     llm-cmd
+    llm-command-r
     llm-gemini
     llm-gguf
     llm-jq
@@ -32,6 +34,7 @@ toPythonApplication (
       (finalAttrs.propagatedBuildInputs or [ ])
       ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
+      ++ lib.optionals enable-llm-cmd [ llm-command-r ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
diff --git a/pkgs/development/python-modules/llm-command-r/default.nix b/pkgs/development/python-modules/llm-command-r/default.nix
new file mode 100644
index 000000000000..c6d894cfc39b
--- /dev/null
+++ b/pkgs/development/python-modules/llm-command-r/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  cohere,
+  pytestCheckHook,
+  pytest-recording,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-command-r";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-command-r";
+    tag = version;
+    hash = "sha256-PxICRds9NJQP64HwoL7Oxd39yaIrMdAyQEbhaumJCgo=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ cohere ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-recording
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_command_r" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "Access the Cohere Command R family of models";
+    homepage = "https://github.com/simonw/llm-command-r";
+    changelog = "https://github.com/simonw/llm-command-r/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix
new file mode 100644
index 000000000000..a57802a8ad08
--- /dev/null
+++ b/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-anthropic
+  ]);
+in
+runCommand "llm-anthropic-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-anthropic")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16103e129f42..6249fa645fd5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8298,6 +8298,8 @@ self: super: with self; {
 
   llm-cmd = callPackage ../development/python-modules/llm-cmd { };
 
+  llm-command-r = callPackage ../development/python-modules/llm-command-r { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From 41ca780911b4422bd2b41518fc8815d09a4ee58c Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 12:08:19 -0700
Subject: [PATCH 0298/1497] python3Packages.llm-grok: init at 1.0.1

---
 pkgs/by-name/ll/llm/package.nix               |  3 +
 .../python-modules/llm-grok/default.nix       | 58 +++++++++++++++++++
 .../llm-grok/tests/llm-plugin.nix             | 22 +++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-grok/default.nix
 create mode 100644 pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 42c2b14ede81..dd44a626b350 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -5,6 +5,7 @@
   enable-llm-cmd ? false,
   enable-llm-command-r ? false,
   enable-llm-gemini ? false,
+  enable-llm-grok ? false,
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
   enable-llm-mistral ? false,
@@ -21,6 +22,7 @@ let
     llm-command-r
     llm-gemini
     llm-gguf
+    llm-grok
     llm-jq
     llm-mistral
     llm-ollama
@@ -37,6 +39,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-cmd [ llm-command-r ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
+      ++ lib.optionals enable-llm-grok [ llm-grok ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
       ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
diff --git a/pkgs/development/python-modules/llm-grok/default.nix b/pkgs/development/python-modules/llm-grok/default.nix
new file mode 100644
index 000000000000..f326866798a0
--- /dev/null
+++ b/pkgs/development/python-modules/llm-grok/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  httpx,
+  httpx-sse,
+  rich,
+  pytestCheckHook,
+  pytest-httpx,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-grok";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Hiepler";
+    repo = "llm-grok";
+    tag = "v${version}";
+    hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [
+    httpx
+    httpx-sse
+    rich
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-httpx
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_grok" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin providing access to Grok models using the xAI API";
+    homepage = "https://github.com/Hiepler/llm-grok";
+    changelog = "https://github.com/Hiepler/llm-grok/releases/tag/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix
new file mode 100644
index 000000000000..5ea012b0de7f
--- /dev/null
+++ b/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-grok
+  ]);
+in
+runCommand "llm-grok-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-grok")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6249fa645fd5..c60ff6aa2173 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8304,6 +8304,8 @@ self: super: with self; {
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };
 
+  llm-grok = callPackage ../development/python-modules/llm-grok { };
+
   llm-jq = callPackage ../development/python-modules/llm-jq { };
 
   llm-mistral = callPackage ../development/python-modules/llm-mistral { };

From 97b709d4da41e48ce5772e2ef741fb2682c58135 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 12:17:08 -0700
Subject: [PATCH 0299/1497] python3Packages.llm-groq: init at 0.8

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../python-modules/llm-groq/default.nix       | 43 +++++++++++++++++++
 .../llm-groq/tests/llm-plugin.nix             | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-groq/default.nix
 create mode 100644 pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index dd44a626b350..6eb16f997dfc 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -6,6 +6,7 @@
   enable-llm-command-r ? false,
   enable-llm-gemini ? false,
   enable-llm-grok ? false,
+  enable-llm-groq ? false,
   enable-llm-gguf ? false,
   enable-llm-jq ? false,
   enable-llm-mistral ? false,
@@ -23,6 +24,7 @@ let
     llm-gemini
     llm-gguf
     llm-grok
+    llm-groq
     llm-jq
     llm-mistral
     llm-ollama
@@ -40,6 +42,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-grok [ llm-grok ]
+      ++ lib.optionals enable-llm-groq [ llm-groq ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
       ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
diff --git a/pkgs/development/python-modules/llm-groq/default.nix b/pkgs/development/python-modules/llm-groq/default.nix
new file mode 100644
index 000000000000..a3f02f2e0b8a
--- /dev/null
+++ b/pkgs/development/python-modules/llm-groq/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  groq,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-groq";
+  version = "0.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "angerman";
+    repo = "llm-groq";
+    tag = "v${version}";
+    hash = "sha256-sZ5d9w43NvypaPrebwZ5BLgRaCHAhd7gBU6uHEdUaF4=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ groq ];
+
+  pythonImportsCheck = [ "llm_groq" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin providing access to Groqcloud models.";
+    homepage = "https://github.com/angerman/llm-groq";
+    changelog = "https://github.com/angerman/llm-groq/releases/tag/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix
new file mode 100644
index 000000000000..5d0ce63e91db
--- /dev/null
+++ b/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-groq
+  ]);
+in
+runCommand "llm-groq-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-groq")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c60ff6aa2173..d55248fa3536 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8306,6 +8306,8 @@ self: super: with self; {
 
   llm-grok = callPackage ../development/python-modules/llm-grok { };
 
+  llm-groq = callPackage ../development/python-modules/llm-groq { };
+
   llm-jq = callPackage ../development/python-modules/llm-jq { };
 
   llm-mistral = callPackage ../development/python-modules/llm-mistral { };

From 31d4b6f6cd1f5d8434b7b70fc6054ac146e04687 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 13:29:24 -0700
Subject: [PATCH 0300/1497] python3Packages.llm-openrouter: init at 0.4.1

---
 pkgs/by-name/ll/llm/package.nix               |  5 +-
 .../python-modules/llm-openrouter/default.nix | 58 +++++++++++++++++++
 .../llm-openrouter/tests/llm-plugin.nix       | 22 +++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/llm-openrouter/default.nix
 create mode 100644 pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 6eb16f997dfc..19fb8dbf934c 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -12,6 +12,7 @@
   enable-llm-mistral ? false,
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
+  enable-llm-openrouter ? false,
 }:
 
 let
@@ -29,6 +30,7 @@ let
     llm-mistral
     llm-ollama
     llm-openai-plugin
+    llm-openrouter
     ;
 in
 
@@ -46,6 +48,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-jq [ llm-jq ]
       ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
-      ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ];
+      ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
+      ++ lib.optionals enable-llm-openrouter [ llm-openrouter ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-openrouter/default.nix b/pkgs/development/python-modules/llm-openrouter/default.nix
new file mode 100644
index 000000000000..bb6913547872
--- /dev/null
+++ b/pkgs/development/python-modules/llm-openrouter/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  httpx,
+  openai,
+  pytestCheckHook,
+  inline-snapshot,
+  pytest-recording,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "openrouter";
+  version = "0.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-openrouter";
+    tag = version;
+    hash = "sha256-ojBkyXqEaqTcOv7mzTWL5Ihhb50zeVzeQZNA6DySuVg=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [
+    httpx
+    openai
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    inline-snapshot
+    pytest-recording
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_openrouter" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin for models hosted by OpenRouter";
+    homepage = "https://github.com/simonw/llm-openrouter";
+    changelog = "https://github.com/simonw/llm-openrouter/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix
new file mode 100644
index 000000000000..30e9fc6d5511
--- /dev/null
+++ b/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-openrouter
+  ]);
+in
+runCommand "llm-openrouter-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-openrouter")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d55248fa3536..de9cd0b6d90e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8316,6 +8316,8 @@ self: super: with self; {
 
   llm-openai-plugin = callPackage ../development/python-modules/llm-openai-plugin { };
 
+  llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
+
   llmx = callPackage ../development/python-modules/llmx { };
 
   llvmlite = callPackage ../development/python-modules/llvmlite {

From d8b57ca3c280de1098e2165ea6beb48213675a5d Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 13:44:23 -0700
Subject: [PATCH 0301/1497] python3Packages.llm-deepseek: init at 0.1.6

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../python-modules/llm-deepseek/default.nix   | 43 +++++++++++++++++++
 .../llm-deepseek/tests/llm-plugin.nix         | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-deepseek/default.nix
 create mode 100644 pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 19fb8dbf934c..5010ccf21837 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -4,6 +4,7 @@
   enable-llm-anthropic ? false,
   enable-llm-cmd ? false,
   enable-llm-command-r ? false,
+  enable-llm-deepseek ? false,
   enable-llm-gemini ? false,
   enable-llm-grok ? false,
   enable-llm-groq ? false,
@@ -22,6 +23,7 @@ let
     llm-anthropic
     llm-cmd
     llm-command-r
+    llm-deepseek
     llm-gemini
     llm-gguf
     llm-grok
@@ -41,6 +43,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
       ++ lib.optionals enable-llm-cmd [ llm-command-r ]
+      ++ lib.optionals enable-llm-deepseek [ llm-deepseek ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-grok [ llm-grok ]
diff --git a/pkgs/development/python-modules/llm-deepseek/default.nix b/pkgs/development/python-modules/llm-deepseek/default.nix
new file mode 100644
index 000000000000..a7a5333c682a
--- /dev/null
+++ b/pkgs/development/python-modules/llm-deepseek/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  groq,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-deepseek";
+  version = "0.1.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "abrasumente233";
+    repo = "llm-deepseek";
+    tag = version;
+    hash = "sha256-yrNvIGnU9Q/0H786DsM0wGEwfxZYIk8IXhqC4mWaQAA=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_deepseek" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin providing access to Deepseek models.";
+    homepage = "https://github.com/abrasumente233/llm-deepseek";
+    changelog = "https://github.com/abrasumente233/llm-deepseek/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix
new file mode 100644
index 000000000000..f7a9ac60837c
--- /dev/null
+++ b/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-deepseek
+  ]);
+in
+runCommand "llm-deepseek-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-deepseek")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de9cd0b6d90e..19405f0d393f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8300,6 +8300,8 @@ self: super: with self; {
 
   llm-command-r = callPackage ../development/python-modules/llm-command-r { };
 
+  llm-deepseek = callPackage ../development/python-modules/llm-deepseek { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From b271e2cad2323d7b777a17eb8efdf77401f5122f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 13:52:49 -0700
Subject: [PATCH 0302/1497] python3Packages.llm-venice: init at 0.6.0

---
 pkgs/by-name/ll/llm/package.nix               |  5 ++-
 .../python-modules/llm-venice/default.nix     | 45 +++++++++++++++++++
 .../llm-venice/tests/llm-plugin.nix           | 22 +++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/llm-venice/default.nix
 create mode 100644 pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 5010ccf21837..1e918f81356d 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -14,6 +14,7 @@
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
   enable-llm-openrouter ? false,
+  enable-llm-venice ? false,
 }:
 
 let
@@ -33,6 +34,7 @@ let
     llm-ollama
     llm-openai-plugin
     llm-openrouter
+    llm-venice
     ;
 in
 
@@ -52,6 +54,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
-      ++ lib.optionals enable-llm-openrouter [ llm-openrouter ];
+      ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
+      ++ lib.optionals enable-llm-venice [ llm-venice ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix
new file mode 100644
index 000000000000..a7e4ad7264ac
--- /dev/null
+++ b/pkgs/development/python-modules/llm-venice/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-venice";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ar-jan";
+    repo = "llm-venice";
+    tag = version;
+    hash = "sha256-fHCAERIFhuovo1f+jTG6L4C/Rql8tdHZG/7p5fBLkH0=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ ];
+
+  # Reaches out to the real API
+  doCheck = false;
+
+  pythonImportsCheck = [ "llm_venice" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin to access models available via the Venice API";
+    homepage = "https://github.com/ar-jan/llm-venice";
+    changelog = "https://github.com/ar-jan/llm-venice/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix
new file mode 100644
index 000000000000..5648d9a45703
--- /dev/null
+++ b/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-venice
+  ]);
+in
+runCommand "llm-venice-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-venice")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19405f0d393f..06d1b4c68179 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8320,6 +8320,8 @@ self: super: with self; {
 
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
 
+  llm-venice = callPackage ../development/python-modules/llm-venice { };
+
   llmx = callPackage ../development/python-modules/llmx { };
 
   llvmlite = callPackage ../development/python-modules/llvmlite {

From 9c246b23edbfe8eafcab3d05fcd08584e5d5b3f4 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:11:12 -0700
Subject: [PATCH 0303/1497] python3Packages.llm-video-frames: init at 0.1

---
 pkgs/by-name/ll/llm/package.nix               |  5 ++-
 .../llm-video-frames/default.nix              | 41 +++++++++++++++++++
 .../llm-video-frames/tests/llm-plugin.nix     | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/llm-video-frames/default.nix
 create mode 100644 pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 1e918f81356d..03e745890117 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -15,6 +15,7 @@
   enable-llm-openai-plugin ? false,
   enable-llm-openrouter ? false,
   enable-llm-venice ? false,
+  enable-llm-video-frames ? false,
 }:
 
 let
@@ -35,6 +36,7 @@ let
     llm-openai-plugin
     llm-openrouter
     llm-venice
+    llm-video-frames
     ;
 in
 
@@ -55,6 +57,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
       ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
-      ++ lib.optionals enable-llm-venice [ llm-venice ];
+      ++ lib.optionals enable-llm-venice [ llm-venice ]
+      ++ lib.optionals enable-llm-video-frames [ llm-video-frames ];
   })
 )
diff --git a/pkgs/development/python-modules/llm-video-frames/default.nix b/pkgs/development/python-modules/llm-video-frames/default.nix
new file mode 100644
index 000000000000..5572eaad4ab6
--- /dev/null
+++ b/pkgs/development/python-modules/llm-video-frames/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-video-frames";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-video-frames";
+    tag = version;
+    hash = "sha256-brTyBymoFuvSQzsD/4aWzFGCrh3yEmWbpsUNGKT9dcU=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_video_frames" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin to turn a video into individual frames";
+    homepage = "https://github.com/simonw/llm-video-frames";
+    changelog = "https://github.com/simonw/llm-video-frames/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix
new file mode 100644
index 000000000000..0d72352fe75d
--- /dev/null
+++ b/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-video-frames
+  ]);
+in
+runCommand "llm-video-frames-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-video-frames")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06d1b4c68179..3934fc840e47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8322,6 +8322,8 @@ self: super: with self; {
 
   llm-venice = callPackage ../development/python-modules/llm-venice { };
 
+  llm-video-frames = callPackage ../development/python-modules/llm-video-frames { };
+
   llmx = callPackage ../development/python-modules/llmx { };
 
   llvmlite = callPackage ../development/python-modules/llvmlite {

From d5a30a5a482e8ffcfb7ed58045c293ca8d6fb37b Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:23:48 -0700
Subject: [PATCH 0304/1497] python3Packages.llm-templates-github: init at 0.1

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../llm-templates-github/default.nix          | 41 +++++++++++++++++++
 .../llm-templates-github/tests/llm-plugin.nix | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-templates-github/default.nix
 create mode 100644 pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 03e745890117..1038d798f2b3 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -14,6 +14,7 @@
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
   enable-llm-openrouter ? false,
+  enable-llm-templates-github ? false,
   enable-llm-venice ? false,
   enable-llm-video-frames ? false,
 }:
@@ -35,6 +36,7 @@ let
     llm-ollama
     llm-openai-plugin
     llm-openrouter
+    llm-templates-github
     llm-venice
     llm-video-frames
     ;
@@ -57,6 +59,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
       ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
+      ++ lib.optionals enable-llm-templates-github [ llm-templates-github ]
       ++ lib.optionals enable-llm-venice [ llm-venice ]
       ++ lib.optionals enable-llm-video-frames [ llm-video-frames ];
   })
diff --git a/pkgs/development/python-modules/llm-templates-github/default.nix b/pkgs/development/python-modules/llm-templates-github/default.nix
new file mode 100644
index 000000000000..f5e7d66b0f01
--- /dev/null
+++ b/pkgs/development/python-modules/llm-templates-github/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-templates-github";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-templates-github";
+    tag = version;
+    hash = "sha256-SFXrvpKrvfIP0JmXQt6OZ52kne4AEtiggbshyac9XQc=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_templates_github" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "Load LLM templates from GitHub repositories";
+    homepage = "https://github.com/simonw/llm-templates-github";
+    changelog = "https://github.com/simonw/llm-templates-github/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix
new file mode 100644
index 000000000000..a9569f069638
--- /dev/null
+++ b/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-templates-github
+  ]);
+in
+runCommand "llm-templates-github-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-templates-github")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3934fc840e47..b4b89e9cb297 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8320,6 +8320,8 @@ self: super: with self; {
 
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
 
+  llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };
+
   llm-venice = callPackage ../development/python-modules/llm-venice { };
 
   llm-video-frames = callPackage ../development/python-modules/llm-video-frames { };

From 56df419440c70d8af8ec2a1349d8bf509b0690ff Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:27:46 -0700
Subject: [PATCH 0305/1497] python3Packages.llm-templates-fabric: init at 0.2

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../llm-templates-fabric/default.nix          | 41 +++++++++++++++++++
 .../llm-templates-fabric/tests/llm-plugin.nix | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-templates-fabric/default.nix
 create mode 100644 pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 1038d798f2b3..dadb591f64c5 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -14,6 +14,7 @@
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
   enable-llm-openrouter ? false,
+  enable-llm-templates-fabric ? false,
   enable-llm-templates-github ? false,
   enable-llm-venice ? false,
   enable-llm-video-frames ? false,
@@ -36,6 +37,7 @@ let
     llm-ollama
     llm-openai-plugin
     llm-openrouter
+    llm-templates-fabric
     llm-templates-github
     llm-venice
     llm-video-frames
@@ -59,6 +61,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
       ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
+      ++ lib.optionals enable-llm-templates-fabric [ llm-templates-fabric ]
       ++ lib.optionals enable-llm-templates-github [ llm-templates-github ]
       ++ lib.optionals enable-llm-venice [ llm-venice ]
       ++ lib.optionals enable-llm-video-frames [ llm-video-frames ];
diff --git a/pkgs/development/python-modules/llm-templates-fabric/default.nix b/pkgs/development/python-modules/llm-templates-fabric/default.nix
new file mode 100644
index 000000000000..0bbc11af790a
--- /dev/null
+++ b/pkgs/development/python-modules/llm-templates-fabric/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-templates-fabric";
+  version = "0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-templates-fabric";
+    tag = version;
+    hash = "sha256-tfkSjeT9WstUsNCtVr3fMzqELFCtfYphqf3xFGvHaV0=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_templates_fabric" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "Load LLM templates from Fabric";
+    homepage = "https://github.com/simonw/llm-templates-fabric";
+    changelog = "https://github.com/simonw/llm-templates-fabric/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix
new file mode 100644
index 000000000000..b00bdfbcaa9e
--- /dev/null
+++ b/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-templates-fabric
+  ]);
+in
+runCommand "llm-templates-fabric-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-templates-fabric")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4b89e9cb297..defa383199f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8320,6 +8320,8 @@ self: super: with self; {
 
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
 
+  llm-templates-fabric = callPackage ../development/python-modules/llm-templates-fabric { };
+
   llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };
 
   llm-venice = callPackage ../development/python-modules/llm-venice { };

From b0f2c846c9a7790b722901459abd8acb537b6185 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:33:03 -0700
Subject: [PATCH 0306/1497] python3Packages.llm-hacker-news: init at 0.1.1

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../llm-hacker-news/default.nix               | 41 +++++++++++++++++++
 .../llm-hacker-news/tests/llm-plugin.nix      | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-hacker-news/default.nix
 create mode 100644 pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index dadb591f64c5..82af6c90a114 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -9,6 +9,7 @@
   enable-llm-grok ? false,
   enable-llm-groq ? false,
   enable-llm-gguf ? false,
+  enable-llm-hacker-news ? false,
   enable-llm-jq ? false,
   enable-llm-mistral ? false,
   enable-llm-ollama ? false,
@@ -32,6 +33,7 @@ let
     llm-gguf
     llm-grok
     llm-groq
+    llm-hacker-news
     llm-jq
     llm-mistral
     llm-ollama
@@ -56,6 +58,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-grok [ llm-grok ]
       ++ lib.optionals enable-llm-groq [ llm-groq ]
+      ++ lib.optionals enable-llm-hacker-news [ llm-hacker-news ]
       ++ lib.optionals enable-llm-jq [ llm-jq ]
       ++ lib.optionals enable-llm-mistral [ llm-mistral ]
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
diff --git a/pkgs/development/python-modules/llm-hacker-news/default.nix b/pkgs/development/python-modules/llm-hacker-news/default.nix
new file mode 100644
index 000000000000..86e390b73303
--- /dev/null
+++ b/pkgs/development/python-modules/llm-hacker-news/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-hacker-news";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-hacker-news";
+    tag = version;
+    hash = "sha256-pywx9TAN/mnGR6Vv6YsPhLO4R5Geagw/bcydQjvTH5s=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_hacker_news" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin for pulling content from Hacker News";
+    homepage = "https://github.com/simonw/llm-hacker-news";
+    changelog = "https://github.com/simonw/llm-hacker-news/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix
new file mode 100644
index 000000000000..85311225866a
--- /dev/null
+++ b/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-hacker-news
+  ]);
+in
+runCommand "llm-hacker-news-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-hacker-news")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index defa383199f3..cef6c0f043c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8310,6 +8310,8 @@ self: super: with self; {
 
   llm-groq = callPackage ../development/python-modules/llm-groq { };
 
+  llm-hacker-news = callPackage ../development/python-modules/llm-hacker-news { };
+
   llm-jq = callPackage ../development/python-modules/llm-jq { };
 
   llm-mistral = callPackage ../development/python-modules/llm-mistral { };

From 68ec32a1bb776d0fbc08556c769785c57326ba53 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:41:14 -0700
Subject: [PATCH 0307/1497] python3Packages.llm-fragments-github: init at 0.3

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../llm-fragments-github/default.nix          | 41 +++++++++++++++++++
 .../llm-fragments-github/tests/llm-plugin.nix | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-fragments-github/default.nix
 create mode 100644 pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 82af6c90a114..4e67480d7d64 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -5,6 +5,7 @@
   enable-llm-cmd ? false,
   enable-llm-command-r ? false,
   enable-llm-deepseek ? false,
+  enable-llm-fragments-github ? false,
   enable-llm-gemini ? false,
   enable-llm-grok ? false,
   enable-llm-groq ? false,
@@ -29,6 +30,7 @@ let
     llm-cmd
     llm-command-r
     llm-deepseek
+    llm-fragments-github
     llm-gemini
     llm-gguf
     llm-grok
@@ -54,6 +56,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-cmd [ llm-cmd ]
       ++ lib.optionals enable-llm-cmd [ llm-command-r ]
       ++ lib.optionals enable-llm-deepseek [ llm-deepseek ]
+      ++ lib.optionals enable-llm-fragments-github [ llm-fragments-github ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-grok [ llm-grok ]
diff --git a/pkgs/development/python-modules/llm-fragments-github/default.nix b/pkgs/development/python-modules/llm-fragments-github/default.nix
new file mode 100644
index 000000000000..67af612c7a55
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-github/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-fragments-github";
+  version = "0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-fragments-github";
+    tag = version;
+    hash = "sha256-+MNFj7auB/dUSIBDXOBaKjIYIW18GLDB55l66S37U1A=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+  dependencies = [ ];
+
+  pythonImportsCheck = [ "llm_fragments_github" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "Load GitHub repository contents as LLM fragments";
+    homepage = "https://github.com/simonw/llm-fragments-github";
+    changelog = "https://github.com/simonw/llm-fragments-github/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix
new file mode 100644
index 000000000000..293494665727
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-fragments-github
+  ]);
+in
+runCommand "llm-fragments-github-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-fragments-github")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cef6c0f043c6..84c80e42193d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8302,6 +8302,8 @@ self: super: with self; {
 
   llm-deepseek = callPackage ../development/python-modules/llm-deepseek { };
 
+  llm-fragments-github = callPackage ../development/python-modules/llm-fragments-github { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From c83f08dd2b33af7d09fb5492c842815e07a2e07e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 14:50:54 -0700
Subject: [PATCH 0308/1497] python3Packages.llm-fragments-pypi: init at 0.1.1

---
 pkgs/by-name/ll/llm/package.nix               |  3 ++
 .../llm-fragments-pypi/default.nix            | 42 +++++++++++++++++++
 .../llm-fragments-pypi/tests/llm-plugin.nix   | 22 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-fragments-pypi/default.nix
 create mode 100644 pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 4e67480d7d64..6f57ce6bbda3 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -6,6 +6,7 @@
   enable-llm-command-r ? false,
   enable-llm-deepseek ? false,
   enable-llm-fragments-github ? false,
+  enable-llm-fragments-pypi ? false,
   enable-llm-gemini ? false,
   enable-llm-grok ? false,
   enable-llm-groq ? false,
@@ -31,6 +32,7 @@ let
     llm-command-r
     llm-deepseek
     llm-fragments-github
+    llm-fragments-pypi
     llm-gemini
     llm-gguf
     llm-grok
@@ -57,6 +59,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-cmd [ llm-command-r ]
       ++ lib.optionals enable-llm-deepseek [ llm-deepseek ]
       ++ lib.optionals enable-llm-fragments-github [ llm-fragments-github ]
+      ++ lib.optionals enable-llm-fragments-pypi [ llm-fragments-pypi ]
       ++ lib.optionals enable-llm-gemini [ llm-gemini ]
       ++ lib.optionals enable-llm-gguf [ llm-gguf ]
       ++ lib.optionals enable-llm-grok [ llm-grok ]
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/default.nix b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
new file mode 100644
index 000000000000..8c7dc9f9168a
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  llm,
+  httpx,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-fragments-pypi";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "samueldg";
+    repo = "llm-fragments-pypi";
+    tag = version;
+    hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8=";
+  };
+
+  build-system = [
+    hatchling
+    llm
+  ];
+  dependencies = [ httpx ];
+
+  pythonImportsCheck = [ "llm_fragments_pypi" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM fragments plugin for PyPI packages metadata";
+    homepage = "https://github.com/samueldg/llm-fragments-pypi";
+    changelog = "https://github.com/samueldg/llm-fragments-pypi/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix
new file mode 100644
index 000000000000..96329d01bf6b
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-fragments-pypi
+  ]);
+in
+runCommand "llm-fragments-pypi-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-fragments-pypi")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84c80e42193d..f50ae4b7cd99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8304,6 +8304,8 @@ self: super: with self; {
 
   llm-fragments-github = callPackage ../development/python-modules/llm-fragments-github { };
 
+  llm-fragments-pypi = callPackage ../development/python-modules/llm-fragments-pypi { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From 5471027b2c9a4fd9c654fe76ff6beeeb1e168388 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 15:13:56 -0700
Subject: [PATCH 0309/1497] python3Packages.llm-sentence-transformers: init at
 0.3.2

---
 pkgs/by-name/ll/llm/package.nix               |  3 +
 .../llm-sentence-transformers/default.nix     | 60 +++++++++++++++++++
 .../tests/llm-plugin.nix                      | 22 +++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 87 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-sentence-transformers/default.nix
 create mode 100644 pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index 6f57ce6bbda3..d98edfd4c9cb 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -17,6 +17,7 @@
   enable-llm-ollama ? false,
   enable-llm-openai-plugin ? false,
   enable-llm-openrouter ? false,
+  enable-llm-sentence-transformers ? false,
   enable-llm-templates-fabric ? false,
   enable-llm-templates-github ? false,
   enable-llm-venice ? false,
@@ -43,6 +44,7 @@ let
     llm-ollama
     llm-openai-plugin
     llm-openrouter
+    llm-sentence-transformers
     llm-templates-fabric
     llm-templates-github
     llm-venice
@@ -70,6 +72,7 @@ toPythonApplication (
       ++ lib.optionals enable-llm-ollama [ llm-ollama ]
       ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
       ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
+      ++ lib.optionals enable-llm-sentence-transformers [ llm-sentence-transformers ]
       ++ lib.optionals enable-llm-templates-fabric [ llm-templates-fabric ]
       ++ lib.optionals enable-llm-templates-github [ llm-templates-github ]
       ++ lib.optionals enable-llm-venice [ llm-venice ]
diff --git a/pkgs/development/python-modules/llm-sentence-transformers/default.nix b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
new file mode 100644
index 000000000000..6eec7d0d5b7b
--- /dev/null
+++ b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  callPackage,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  einops,
+  sentence-transformers,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-sentence-transformers";
+  version = "0.3.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-sentence-transformers";
+    tag = version;
+    hash = "sha256-FDDMItKFEYEptiL3EHKgKVxClqRU9RaM3uD3xP0F4OM=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [
+    einops
+    sentence-transformers
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  # Disabled because they access the network
+  disabledTests = [
+    "test_run_embedding"
+    "test_embed_multi_with_generator"
+  ];
+
+  pythonImportsCheck = [ "llm_sentence_transformers" ];
+
+  passthru.tests = {
+    llm-plugin = callPackage ./tests/llm-plugin.nix { };
+  };
+
+  meta = {
+    description = "LLM plugin for embeddings using sentence-transformers";
+    homepage = "https://github.com/simonw/llm-sentence-transformers";
+    changelog = "https://github.com/simonw/llm-sentence-transformers/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix
new file mode 100644
index 000000000000..5ccaea86b403
--- /dev/null
+++ b/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix
@@ -0,0 +1,22 @@
+{
+  runCommand,
+  python,
+  yq,
+}:
+let
+  venv = python.withPackages (ps: [
+    ps.llm
+    ps.llm-sentence-transformers
+  ]);
+in
+runCommand "llm-sentence-transformers-test-llm-plugin"
+  {
+    nativeBuildInputs = [
+      venv
+      yq
+    ];
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "llm-sentence-transformers")'
+    touch "$out"
+  ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f50ae4b7cd99..8bded0dc781f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8326,6 +8326,8 @@ self: super: with self; {
 
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
 
+  llm-sentence-transformers = callPackage ../development/python-modules/llm-sentence-transformers { };
+
   llm-templates-fabric = callPackage ../development/python-modules/llm-templates-fabric { };
 
   llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };

From 794f8c04b063b49a49118800112e63d9e4d35327 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 8 May 2025 16:27:03 -0700
Subject: [PATCH 0310/1497] python3Packages.llm: introduce mkPluginTest and use
 it

Since there's no fixpoint function support for `buildPythonPackage` yet,
each of the llm modules imports itself for its tests. Works!
---
 .../python-modules/llm-anthropic/default.nix  |  7 +++--
 .../llm-anthropic/tests/llm-plugin.nix        | 22 ---------------
 .../python-modules/llm-cmd/default.nix        |  6 ++---
 .../llm-cmd/tests/llm-plugin.nix              | 22 ---------------
 .../python-modules/llm-command-r/default.nix  |  6 ++---
 .../llm-command-r/tests/llm-plugin.nix        | 22 ---------------
 .../python-modules/llm-deepseek/default.nix   |  7 ++---
 .../llm-deepseek/tests/llm-plugin.nix         | 22 ---------------
 .../llm-fragments-github/default.nix          |  6 ++---
 .../llm-fragments-github/tests/llm-plugin.nix | 22 ---------------
 .../llm-fragments-pypi/default.nix            |  6 ++---
 .../llm-fragments-pypi/tests/llm-plugin.nix   | 22 ---------------
 .../python-modules/llm-gemini/default.nix     |  6 ++---
 .../llm-gemini/tests/llm-plugin.nix           | 22 ---------------
 .../python-modules/llm-gguf/default.nix       |  6 ++---
 .../llm-gguf/tests/llm-plugin.nix             | 22 ---------------
 .../python-modules/llm-grok/default.nix       |  6 ++---
 .../llm-grok/tests/llm-plugin.nix             | 22 ---------------
 .../python-modules/llm-groq/default.nix       |  6 ++---
 .../llm-groq/tests/llm-plugin.nix             | 22 ---------------
 .../llm-hacker-news/default.nix               |  6 ++---
 .../llm-hacker-news/tests/llm-plugin.nix      | 22 ---------------
 .../python-modules/llm-jq/default.nix         |  7 ++---
 .../llm-jq/tests/llm-plugin.nix               | 23 ----------------
 .../python-modules/llm-mistral/default.nix    |  6 ++---
 .../llm-mistral/tests/llm-plugin.nix          | 22 ---------------
 .../python-modules/llm-ollama/default.nix     |  6 ++---
 .../llm-ollama/tests/llm-plugin.nix           | 24 -----------------
 .../llm-openai-plugin/default.nix             |  6 ++---
 .../llm-openai-plugin/tests/llm-plugin.nix    | 22 ---------------
 .../python-modules/llm-openrouter/default.nix |  8 +++---
 .../llm-openrouter/tests/llm-plugin.nix       | 22 ---------------
 .../llm-sentence-transformers/default.nix     |  6 ++---
 .../tests/llm-plugin.nix                      | 22 ---------------
 .../llm-templates-fabric/default.nix          |  7 +++--
 .../llm-templates-fabric/tests/llm-plugin.nix | 22 ---------------
 .../llm-templates-github/default.nix          |  7 +++--
 .../llm-templates-github/tests/llm-plugin.nix | 22 ---------------
 .../python-modules/llm-venice/default.nix     |  6 ++---
 .../llm-venice/tests/llm-plugin.nix           | 22 ---------------
 .../llm-video-frames/default.nix              |  7 +++--
 .../llm-video-frames/tests/llm-plugin.nix     | 22 ---------------
 .../python-modules/llm/default.nix            |  4 +++
 .../python-modules/llm/mk-plugin-test.nix     | 27 +++++++++++++++++++
 44 files changed, 78 insertions(+), 552 deletions(-)
 delete mode 100644 pkgs/development/python-modules/llm-anthropic/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-cmd/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-gemini/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-gguf/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-jq/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-ollama/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-openai-plugin/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix
 delete mode 100644 pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix
 create mode 100644 pkgs/development/python-modules/llm/mk-plugin-test.nix

diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix
index a7377833ff54..6418ddc8c2cf 100644
--- a/pkgs/development/python-modules/llm-anthropic/default.nix
+++ b/pkgs/development/python-modules/llm-anthropic/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-anthropic,
   anthropic,
   pytestCheckHook,
   pytest-asyncio,
@@ -28,6 +28,7 @@ buildPythonPackage rec {
     setuptools
     llm
   ];
+
   dependencies = [ anthropic ];
 
   nativeCheckInputs = [
@@ -39,9 +40,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_anthropic" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-anthropic;
 
   meta = {
     description = "LLM access to models by Anthropic, including the Claude series";
diff --git a/pkgs/development/python-modules/llm-anthropic/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-anthropic/tests/llm-plugin.nix
deleted file mode 100644
index a57802a8ad08..000000000000
--- a/pkgs/development/python-modules/llm-anthropic/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-anthropic
-  ]);
-in
-runCommand "llm-anthropic-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-anthropic")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-cmd/default.nix b/pkgs/development/python-modules/llm-cmd/default.nix
index 9fca11cad544..e883cb87ecbc 100644
--- a/pkgs/development/python-modules/llm-cmd/default.nix
+++ b/pkgs/development/python-modules/llm-cmd/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   # build-system
@@ -11,6 +10,7 @@
   pygments,
   # tests
   pytestCheckHook,
+  llm-cmd,
 }:
 
 buildPythonPackage rec {
@@ -46,9 +46,7 @@ buildPythonPackage rec {
     "llm_cmd"
   ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-cmd;
 
   meta = {
     description = "Use LLM to generate and execute commands in your shell";
diff --git a/pkgs/development/python-modules/llm-cmd/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-cmd/tests/llm-plugin.nix
deleted file mode 100644
index 1707195abbc7..000000000000
--- a/pkgs/development/python-modules/llm-cmd/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-cmd
-  ]);
-in
-runCommand "llm-cmd-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-cmd")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-command-r/default.nix b/pkgs/development/python-modules/llm-command-r/default.nix
index c6d894cfc39b..af96a7e8d057 100644
--- a/pkgs/development/python-modules/llm-command-r/default.nix
+++ b/pkgs/development/python-modules/llm-command-r/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-command-r,
   cohere,
   pytestCheckHook,
   pytest-recording,
@@ -38,9 +38,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_command_r" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-command-r;
 
   meta = {
     description = "Access the Cohere Command R family of models";
diff --git a/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix
deleted file mode 100644
index a57802a8ad08..000000000000
--- a/pkgs/development/python-modules/llm-command-r/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-anthropic
-  ]);
-in
-runCommand "llm-anthropic-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-anthropic")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-deepseek/default.nix b/pkgs/development/python-modules/llm-deepseek/default.nix
index a7a5333c682a..8ff63bd96064 100644
--- a/pkgs/development/python-modules/llm-deepseek/default.nix
+++ b/pkgs/development/python-modules/llm-deepseek/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
-  groq,
+  llm-deepseek,
 }:
 
 buildPythonPackage rec {
@@ -29,9 +28,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_deepseek" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-deepseek;
 
   meta = {
     description = "LLM plugin providing access to Deepseek models.";
diff --git a/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix
deleted file mode 100644
index f7a9ac60837c..000000000000
--- a/pkgs/development/python-modules/llm-deepseek/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-deepseek
-  ]);
-in
-runCommand "llm-deepseek-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-deepseek")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-fragments-github/default.nix b/pkgs/development/python-modules/llm-fragments-github/default.nix
index 67af612c7a55..dbadab8094de 100644
--- a/pkgs/development/python-modules/llm-fragments-github/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-github/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-fragments-github,
 }:
 
 buildPythonPackage rec {
@@ -27,9 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_fragments_github" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-fragments-github;
 
   meta = {
     description = "Load GitHub repository contents as LLM fragments";
diff --git a/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix
deleted file mode 100644
index 293494665727..000000000000
--- a/pkgs/development/python-modules/llm-fragments-github/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-fragments-github
-  ]);
-in
-runCommand "llm-fragments-github-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-fragments-github")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/default.nix b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
index 8c7dc9f9168a..d30135b5378d 100644
--- a/pkgs/development/python-modules/llm-fragments-pypi/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
   llm,
+  llm-fragments-pypi,
   httpx,
 }:
 
@@ -28,9 +28,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_fragments_pypi" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-fragments-pypi;
 
   meta = {
     description = "LLM fragments plugin for PyPI packages metadata";
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix
deleted file mode 100644
index 96329d01bf6b..000000000000
--- a/pkgs/development/python-modules/llm-fragments-pypi/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-fragments-pypi
-  ]);
-in
-runCommand "llm-fragments-pypi-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-fragments-pypi")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index 7fa90627c6b7..e14f77bc63fe 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-gemini,
   httpx,
   ijson,
   pytestCheckHook,
@@ -45,9 +45,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_gemini" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-gemini;
 
   meta = {
     description = "LLM plugin to access Google's Gemini family of models";
diff --git a/pkgs/development/python-modules/llm-gemini/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-gemini/tests/llm-plugin.nix
deleted file mode 100644
index d1f2f6ffbe67..000000000000
--- a/pkgs/development/python-modules/llm-gemini/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-gemini
-  ]);
-in
-runCommand "llm-gemini-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-gemini")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-gguf/default.nix b/pkgs/development/python-modules/llm-gguf/default.nix
index 386c0c11b392..6d72228e943a 100644
--- a/pkgs/development/python-modules/llm-gguf/default.nix
+++ b/pkgs/development/python-modules/llm-gguf/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -11,6 +10,7 @@
   httpx,
   llama-cpp-python,
   llm,
+  llm-gguf,
 }:
 
 buildPythonPackage rec {
@@ -40,9 +40,7 @@ buildPythonPackage rec {
   # Tests require internet access (downloading models)
   doCheck = false;
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-gguf;
 
   meta = {
     description = "Run models distributed as GGUF files using LLM";
diff --git a/pkgs/development/python-modules/llm-gguf/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-gguf/tests/llm-plugin.nix
deleted file mode 100644
index 97e1f51d6c26..000000000000
--- a/pkgs/development/python-modules/llm-gguf/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-gguf
-  ]);
-in
-runCommand "llm-gguf-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-gguf")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-grok/default.nix b/pkgs/development/python-modules/llm-grok/default.nix
index f326866798a0..6c8baca68f7f 100644
--- a/pkgs/development/python-modules/llm-grok/default.nix
+++ b/pkgs/development/python-modules/llm-grok/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-grok,
   httpx,
   httpx-sse,
   rich,
@@ -44,9 +44,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_grok" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-grok;
 
   meta = {
     description = "LLM plugin providing access to Grok models using the xAI API";
diff --git a/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix
deleted file mode 100644
index 5ea012b0de7f..000000000000
--- a/pkgs/development/python-modules/llm-grok/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-grok
-  ]);
-in
-runCommand "llm-grok-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-grok")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-groq/default.nix b/pkgs/development/python-modules/llm-groq/default.nix
index a3f02f2e0b8a..8f2a04aa4f72 100644
--- a/pkgs/development/python-modules/llm-groq/default.nix
+++ b/pkgs/development/python-modules/llm-groq/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-groq,
   groq,
 }:
 
@@ -29,9 +29,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_groq" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-groq;
 
   meta = {
     description = "LLM plugin providing access to Groqcloud models.";
diff --git a/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix
deleted file mode 100644
index 5d0ce63e91db..000000000000
--- a/pkgs/development/python-modules/llm-groq/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-groq
-  ]);
-in
-runCommand "llm-groq-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-groq")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-hacker-news/default.nix b/pkgs/development/python-modules/llm-hacker-news/default.nix
index 86e390b73303..3029de613c74 100644
--- a/pkgs/development/python-modules/llm-hacker-news/default.nix
+++ b/pkgs/development/python-modules/llm-hacker-news/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-hacker-news,
 }:
 
 buildPythonPackage rec {
@@ -27,9 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_hacker_news" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-hacker-news;
 
   meta = {
     description = "LLM plugin for pulling content from Hacker News";
diff --git a/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix
deleted file mode 100644
index 85311225866a..000000000000
--- a/pkgs/development/python-modules/llm-hacker-news/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-hacker-news
-  ]);
-in
-runCommand "llm-hacker-news-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-hacker-news")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-jq/default.nix b/pkgs/development/python-modules/llm-jq/default.nix
index dab2b6727c9e..64c3149e8b96 100644
--- a/pkgs/development/python-modules/llm-jq/default.nix
+++ b/pkgs/development/python-modules/llm-jq/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
-  nix-update-script,
+  llm-jq,
 }:
 buildPythonPackage rec {
   pname = "llm-jq";
@@ -28,9 +27,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_jq" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-jq;
 
   meta = {
     description = "Write and execute jq programs with the help of LLM";
diff --git a/pkgs/development/python-modules/llm-jq/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-jq/tests/llm-plugin.nix
deleted file mode 100644
index d659a2d52198..000000000000
--- a/pkgs/development/python-modules/llm-jq/tests/llm-plugin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-jq
-  ]);
-in
-runCommand "llm-jq-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-jq")'
-    llm jq --help
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-mistral/default.nix b/pkgs/development/python-modules/llm-mistral/default.nix
index 25af109cc023..016ca52b1c19 100644
--- a/pkgs/development/python-modules/llm-mistral/default.nix
+++ b/pkgs/development/python-modules/llm-mistral/default.nix
@@ -1,12 +1,12 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   httpx,
   httpx-sse,
   llm,
+  llm-mistral,
   pytestCheckHook,
   pytest-asyncio,
   pytest-httpx,
@@ -44,9 +44,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_mistral" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-mistral;
 
   meta = {
     description = "LLM plugin providing access to Mistral models using the Mistral API";
diff --git a/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix
deleted file mode 100644
index 23077de3b85e..000000000000
--- a/pkgs/development/python-modules/llm-mistral/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-mistral
-  ]);
-in
-runCommand "llm-mistral-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-mistral")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index e8d13d4926c6..f0938ccf36b3 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -18,6 +17,7 @@
   pytest-asyncio,
   pytest-mock,
   writableTmpDirAsHomeHook,
+  llm-ollama,
 }:
 
 buildPythonPackage rec {
@@ -55,9 +55,7 @@ buildPythonPackage rec {
     "llm_ollama"
   ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-ollama;
 
   meta = {
     description = "LLM plugin providing access to Ollama models using HTTP API";
diff --git a/pkgs/development/python-modules/llm-ollama/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-ollama/tests/llm-plugin.nix
deleted file mode 100644
index c601b393ac62..000000000000
--- a/pkgs/development/python-modules/llm-ollama/tests/llm-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-  cacert,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-ollama
-  ]);
-in
-runCommand "llm-ollama-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-    env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-ollama")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-openai-plugin/default.nix b/pkgs/development/python-modules/llm-openai-plugin/default.nix
index d978142bd1c7..7543a341f3c1 100644
--- a/pkgs/development/python-modules/llm-openai-plugin/default.nix
+++ b/pkgs/development/python-modules/llm-openai-plugin/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-openai-plugin,
   openai,
   pytestCheckHook,
   pytest-asyncio,
@@ -45,9 +45,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_openai" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-openai-plugin;
 
   meta = {
     description = "OpenAI plugin for LLM";
diff --git a/pkgs/development/python-modules/llm-openai-plugin/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-openai-plugin/tests/llm-plugin.nix
deleted file mode 100644
index 8092b15a5c90..000000000000
--- a/pkgs/development/python-modules/llm-openai-plugin/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-openai-plugin
-  ]);
-in
-runCommand "llm-openai-plugin-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-openai-plugin")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-openrouter/default.nix b/pkgs/development/python-modules/llm-openrouter/default.nix
index bb6913547872..9c576d88e536 100644
--- a/pkgs/development/python-modules/llm-openrouter/default.nix
+++ b/pkgs/development/python-modules/llm-openrouter/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-openrouter,
   httpx,
   openai,
   pytestCheckHook,
@@ -14,7 +14,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "openrouter";
+  pname = "llm-openrouter";
   version = "0.4.1";
   pyproject = true;
 
@@ -44,9 +44,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_openrouter" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-openrouter;
 
   meta = {
     description = "LLM plugin for models hosted by OpenRouter";
diff --git a/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix
deleted file mode 100644
index 30e9fc6d5511..000000000000
--- a/pkgs/development/python-modules/llm-openrouter/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-openrouter
-  ]);
-in
-runCommand "llm-openrouter-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-openrouter")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-sentence-transformers/default.nix b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
index 6eec7d0d5b7b..a9a702d0fa07 100644
--- a/pkgs/development/python-modules/llm-sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-sentence-transformers,
   einops,
   sentence-transformers,
   pytestCheckHook,
@@ -46,9 +46,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_sentence_transformers" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-sentence-transformers;
 
   meta = {
     description = "LLM plugin for embeddings using sentence-transformers";
diff --git a/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix
deleted file mode 100644
index 5ccaea86b403..000000000000
--- a/pkgs/development/python-modules/llm-sentence-transformers/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-sentence-transformers
-  ]);
-in
-runCommand "llm-sentence-transformers-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-sentence-transformers")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-templates-fabric/default.nix b/pkgs/development/python-modules/llm-templates-fabric/default.nix
index 0bbc11af790a..979f9f8bae0f 100644
--- a/pkgs/development/python-modules/llm-templates-fabric/default.nix
+++ b/pkgs/development/python-modules/llm-templates-fabric/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-templates-fabric,
 }:
 
 buildPythonPackage rec {
@@ -23,13 +23,12 @@ buildPythonPackage rec {
     setuptools
     llm
   ];
+
   dependencies = [ ];
 
   pythonImportsCheck = [ "llm_templates_fabric" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-templates-fabric;
 
   meta = {
     description = "Load LLM templates from Fabric";
diff --git a/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix
deleted file mode 100644
index b00bdfbcaa9e..000000000000
--- a/pkgs/development/python-modules/llm-templates-fabric/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-templates-fabric
-  ]);
-in
-runCommand "llm-templates-fabric-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-templates-fabric")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-templates-github/default.nix b/pkgs/development/python-modules/llm-templates-github/default.nix
index f5e7d66b0f01..58a78512959d 100644
--- a/pkgs/development/python-modules/llm-templates-github/default.nix
+++ b/pkgs/development/python-modules/llm-templates-github/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-templates-github,
 }:
 
 buildPythonPackage rec {
@@ -23,13 +23,12 @@ buildPythonPackage rec {
     setuptools
     llm
   ];
+
   dependencies = [ ];
 
   pythonImportsCheck = [ "llm_templates_github" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-templates-github;
 
   meta = {
     description = "Load LLM templates from GitHub repositories";
diff --git a/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix
deleted file mode 100644
index a9569f069638..000000000000
--- a/pkgs/development/python-modules/llm-templates-github/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-templates-github
-  ]);
-in
-runCommand "llm-templates-github-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-templates-github")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix
index a7e4ad7264ac..460d814f1514 100644
--- a/pkgs/development/python-modules/llm-venice/default.nix
+++ b/pkgs/development/python-modules/llm-venice/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-venice,
 }:
 
 buildPythonPackage rec {
@@ -31,9 +31,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "llm_venice" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-venice;
 
   meta = {
     description = "LLM plugin to access models available via the Venice API";
diff --git a/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix
deleted file mode 100644
index 5648d9a45703..000000000000
--- a/pkgs/development/python-modules/llm-venice/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-venice
-  ]);
-in
-runCommand "llm-venice-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-venice")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm-video-frames/default.nix b/pkgs/development/python-modules/llm-video-frames/default.nix
index 5572eaad4ab6..b519b37bcb24 100644
--- a/pkgs/development/python-modules/llm-video-frames/default.nix
+++ b/pkgs/development/python-modules/llm-video-frames/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
   llm,
+  llm-video-frames,
 }:
 
 buildPythonPackage rec {
@@ -23,13 +23,12 @@ buildPythonPackage rec {
     setuptools
     llm
   ];
+
   dependencies = [ ];
 
   pythonImportsCheck = [ "llm_video_frames" ];
 
-  passthru.tests = {
-    llm-plugin = callPackage ./tests/llm-plugin.nix { };
-  };
+  passthru.tests = llm.mkPluginTest llm-video-frames;
 
   meta = {
     description = "LLM plugin to turn a video into individual frames";
diff --git a/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix b/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix
deleted file mode 100644
index 0d72352fe75d..000000000000
--- a/pkgs/development/python-modules/llm-video-frames/tests/llm-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  runCommand,
-  python,
-  yq,
-}:
-let
-  venv = python.withPackages (ps: [
-    ps.llm
-    ps.llm-video-frames
-  ]);
-in
-runCommand "llm-video-frames-test-llm-plugin"
-  {
-    nativeBuildInputs = [
-      venv
-      yq
-    ];
-  }
-  ''
-    llm plugins | yq --exit-status 'any(.name == "llm-video-frames")'
-    touch "$out"
-  ''
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index aa2515f19c73..477dd2dc48c4 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
@@ -75,6 +76,9 @@ let
 
     passthru = {
       inherit withPlugins;
+      mkPluginTest = plugin: {
+        ${plugin.pname} = callPackage ./mk-plugin-test.nix { inherit llm plugin; };
+      };
     };
 
     meta = with lib; {
diff --git a/pkgs/development/python-modules/llm/mk-plugin-test.nix b/pkgs/development/python-modules/llm/mk-plugin-test.nix
new file mode 100644
index 000000000000..01a53ab28348
--- /dev/null
+++ b/pkgs/development/python-modules/llm/mk-plugin-test.nix
@@ -0,0 +1,27 @@
+{
+  cacert,
+  runCommand,
+  writableTmpDirAsHomeHook,
+  yq,
+  llm,
+  plugin,
+}:
+let
+  venv = llm.pythonModule.withPackages (_: [
+    llm
+    plugin
+  ]);
+in
+runCommand "${plugin.pname}-test"
+  {
+    nativeBuildInputs = [
+      venv
+      writableTmpDirAsHomeHook
+      yq
+    ];
+    env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  }
+  ''
+    llm plugins | yq --exit-status 'any(.name == "${plugin.pname}")'
+    touch "$out"
+  ''

From 0d50348b5199eacca771098fe221b16a35e5893e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 9 May 2025 14:04:33 -0700
Subject: [PATCH 0311/1497] llm: reintroduce withPlugins

This was removed in #340510, as the previous implementation didn't work well.

However, it's still the method that's recommended in the patch for the
`llm install` command (`001-disable-install-uninstall-commands.patch`)
and with the additions to `enable` overrides on the top-level `llm`
derivation, there's a need for a place where the LLM plugin "directory"
is specified.

So, I've reintroduced the method with a completely new implementation.
I've also given it some protections against the list of names getting
out of date.

This might be a little too clever, but I think the user-facing interface
for this function is now quite nice.
---
 pkgs/by-name/ll/llm/package.nix               | 119 +++++++-----------
 .../python-modules/llm/default.nix            | 109 ++++++++++++++--
 2 files changed, 143 insertions(+), 85 deletions(-)

diff --git a/pkgs/by-name/ll/llm/package.nix b/pkgs/by-name/ll/llm/package.nix
index d98edfd4c9cb..f2bb127d32aa 100644
--- a/pkgs/by-name/ll/llm/package.nix
+++ b/pkgs/by-name/ll/llm/package.nix
@@ -1,81 +1,46 @@
-{
-  lib,
-  python3Packages,
-  enable-llm-anthropic ? false,
-  enable-llm-cmd ? false,
-  enable-llm-command-r ? false,
-  enable-llm-deepseek ? false,
-  enable-llm-fragments-github ? false,
-  enable-llm-fragments-pypi ? false,
-  enable-llm-gemini ? false,
-  enable-llm-grok ? false,
-  enable-llm-groq ? false,
-  enable-llm-gguf ? false,
-  enable-llm-hacker-news ? false,
-  enable-llm-jq ? false,
-  enable-llm-mistral ? false,
-  enable-llm-ollama ? false,
-  enable-llm-openai-plugin ? false,
-  enable-llm-openrouter ? false,
-  enable-llm-sentence-transformers ? false,
-  enable-llm-templates-fabric ? false,
-  enable-llm-templates-github ? false,
-  enable-llm-venice ? false,
-  enable-llm-video-frames ? false,
-}:
+# The `...` allows this derivation to be overridden with `enable-<llm-plugin>`.
+#
+# Example:
+#
+# ```nix
+# llm.override {
+#    enable-llm-anthropic = true;
+#    enable-llm-gemini = true;
+#    enable-llm-cmd = true;
+#    enable-llm-templates-github = true;
+# }
+# ```
+#
+# Whatever names are accepted by `llm.withPlugins` are accepted with an added `enable-` prefix as
+# an override of this derivation. The user can also do `llm.withPlugins { llm-anthropic = true; }`.
+{ lib, python3Packages, ... }@args:
 
 let
-  inherit (python3Packages)
-    toPythonApplication
-    llm
-    llm-anthropic
-    llm-cmd
-    llm-command-r
-    llm-deepseek
-    llm-fragments-github
-    llm-fragments-pypi
-    llm-gemini
-    llm-gguf
-    llm-grok
-    llm-groq
-    llm-hacker-news
-    llm-jq
-    llm-mistral
-    llm-ollama
-    llm-openai-plugin
-    llm-openrouter
-    llm-sentence-transformers
-    llm-templates-fabric
-    llm-templates-github
-    llm-venice
-    llm-video-frames
-    ;
+  inherit (python3Packages) llm;
+
+  hasEnablePrefix = lib.hasPrefix "enable-";
+  addEnablePrefix = name: "enable-${name}";
+  removeEnablePrefix = lib.removePrefix "enable-";
+
+  # Filter to just the attributes which are named "enable-<plugin-name>"
+  enableArgs = lib.filterAttrs (name: value: hasEnablePrefix name) args;
+  pluginArgs = lib.mapAttrs' (
+    name: value: lib.nameValuePair (removeEnablePrefix name) value
+  ) enableArgs;
+
+  # Provide some diagnostics for the plugin names
+  pluginNames = lib.attrNames (lib.functionArgs llm.withPlugins);
+  enableNames = lib.map addEnablePrefix pluginNames;
+  unknownPluginNames = lib.removeAttrs pluginArgs pluginNames;
+  unknownNames = lib.map addEnablePrefix (lib.attrNames unknownPluginNames);
+  unknownNamesDiagnostic = ''
+    Unknown plugins specified in override: ${lib.concatStringsSep ", " unknownNames}
+
+    Valid overrides:
+      - ${lib.concatStringsSep "\n  - " enableNames}
+  '';
 in
 
-toPythonApplication (
-  llm.overrideAttrs (finalAttrs: {
-    propagatedBuildInputs =
-      (finalAttrs.propagatedBuildInputs or [ ])
-      ++ lib.optionals enable-llm-anthropic [ llm-anthropic ]
-      ++ lib.optionals enable-llm-cmd [ llm-cmd ]
-      ++ lib.optionals enable-llm-cmd [ llm-command-r ]
-      ++ lib.optionals enable-llm-deepseek [ llm-deepseek ]
-      ++ lib.optionals enable-llm-fragments-github [ llm-fragments-github ]
-      ++ lib.optionals enable-llm-fragments-pypi [ llm-fragments-pypi ]
-      ++ lib.optionals enable-llm-gemini [ llm-gemini ]
-      ++ lib.optionals enable-llm-gguf [ llm-gguf ]
-      ++ lib.optionals enable-llm-grok [ llm-grok ]
-      ++ lib.optionals enable-llm-groq [ llm-groq ]
-      ++ lib.optionals enable-llm-hacker-news [ llm-hacker-news ]
-      ++ lib.optionals enable-llm-jq [ llm-jq ]
-      ++ lib.optionals enable-llm-mistral [ llm-mistral ]
-      ++ lib.optionals enable-llm-ollama [ llm-ollama ]
-      ++ lib.optionals enable-llm-openai-plugin [ llm-openai-plugin ]
-      ++ lib.optionals enable-llm-openrouter [ llm-openrouter ]
-      ++ lib.optionals enable-llm-sentence-transformers [ llm-sentence-transformers ]
-      ++ lib.optionals enable-llm-templates-fabric [ llm-templates-fabric ]
-      ++ lib.optionals enable-llm-templates-github [ llm-templates-github ]
-      ++ lib.optionals enable-llm-venice [ llm-venice ]
-      ++ lib.optionals enable-llm-video-frames [ llm-video-frames ];
-  })
-)
+assert lib.assertMsg (lib.length unknownNames == 0) unknownNamesDiagnostic;
+
+llm.withPlugins pluginArgs
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 477dd2dc48c4..8f13f25783b8 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  runCommand,
   callPackage,
   buildPythonPackage,
   fetchFromGitHub,
@@ -14,6 +15,7 @@
   pluggy,
   puremagic,
   pydantic,
+  python,
   python-ulid,
   pyyaml,
   sqlite-migrate,
@@ -23,6 +25,103 @@
   sqlite-utils,
 }:
 let
+  # The function signature of `withPlugins` is the list of all the plugins `llm` knows about.
+  # The plugin directory is at <https://llm.datasette.io/en/stable/plugins/directory.html>
+  withPluginsArgNames = lib.functionArgs withPlugins;
+
+  /**
+    Make a derivation for `llm` that contains `llm` plus the relevant plugins.
+
+    # Type
+
+    ```
+    withPlugins ::
+      {
+        llm-anthropic :: bool,
+        llm-gemini :: bool,
+        ...
+      }
+      -> derivation
+    ```
+
+    See `lib.attrNames (lib.functionArgs llm.withPlugins)` for the total list of plugins supported.
+
+    # Examples
+    :::{.example}
+    ## `llm.withPlugins` usage example
+
+    ```nix
+    llm.withPlugins { llm-gemini = true; llm-groq = true; }
+    => «derivation /nix/store/<hash>-python3-3.12.10-llm-with-llm-gemini-llm-groq.drv»
+    ```
+
+    :::
+  */
+  withPlugins =
+    # Keep this list up to date with the plugins in python3Packages!
+    {
+      llm-anthropic ? false,
+      llm-cmd ? false,
+      llm-command-r ? false,
+      llm-deepseek ? false,
+      llm-fragments-github ? false,
+      llm-fragments-pypi ? false,
+      llm-gemini ? false,
+      llm-gguf ? false,
+      llm-grok ? false,
+      llm-groq ? false,
+      llm-hacker-news ? false,
+      llm-jq ? false,
+      llm-mistral ? false,
+      llm-ollama ? false,
+      llm-openai-plugin ? false,
+      llm-openrouter ? false,
+      llm-sentence-transformers ? false,
+      llm-templates-fabric ? false,
+      llm-templates-github ? false,
+      llm-venice ? false,
+      llm-video-frames ? false,
+    }@args:
+    let
+      # Filter to just the attributes which are set to a true value.
+      setArgs = lib.filterAttrs (name: lib.id) args;
+
+      # Make a string with those names separated with a dash.
+      setArgsStr = lib.concatStringsSep "-" (lib.attrNames setArgs);
+
+      # Make the derivation name reflect what's inside it.
+      drvName = if lib.stringLength setArgsStr == 0 then "llm" else "llm-with-${setArgsStr}";
+
+      # Make a python environment with just those plugins.
+      python-environment = python.withPackages (
+        ps:
+        let
+          # Throw a diagnostic if this list gets out of sync with the names in python3Packages
+          allPluginsPresent = pluginNames == (lib.attrNames withPluginsArgNames);
+          pluginNames = lib.attrNames (lib.intersectAttrs ps withPluginsArgNames);
+          missingNamesList = lib.attrNames (lib.removeAttrs withPluginsArgNames pluginNames);
+          missingNames = lib.concatStringsSep ", " missingNamesList;
+
+          # The relevant plugins are the ones the user asked for.
+          plugins = lib.intersectAttrs setArgs ps;
+        in
+        assert lib.assertMsg allPluginsPresent "Missing these plugins: ${missingNames}";
+        ([ ps.llm ] ++ lib.attrValues plugins)
+      );
+
+    in
+    # That Python environment produced above contains too many irrelevant binaries, due to how
+    # Python needs to use propagatedBuildInputs. Let's make one with just what's needed: `llm`.
+    # Since we include the `passthru` and `meta` information, it's as good as the original
+    # derivation.
+    runCommand "${python.name}-${drvName}" { inherit (llm) passthru meta; } ''
+      mkdir -p $out/bin
+      ln -s ${python-environment}/bin/llm $out/bin/llm
+    '';
+
+  # Uses the `withPlugins` names to make a Python environment with everything.
+  withAllPlugins = withPlugins (lib.genAttrs (lib.attrNames withPluginsArgNames) (name: true));
+
   llm = buildPythonPackage rec {
     pname = "llm";
     version = "0.25";
@@ -75,7 +174,8 @@ let
     pythonImportsCheck = [ "llm" ];
 
     passthru = {
-      inherit withPlugins;
+      inherit withPlugins withAllPlugins;
+
       mkPluginTest = plugin: {
         ${plugin.pname} = callPackage ./mk-plugin-test.nix { inherit llm plugin; };
       };
@@ -93,12 +193,5 @@ let
       ];
     };
   };
-
-  withPlugins = throw ''
-    llm.withPlugins was confusing to use and has been removed.
-    Please migrate to using python3.withPackages(ps: [ ps.llm ]) instead.
-
-    See https://nixos.org/manual/nixpkgs/stable/#python.withpackages-function for more usage examples.
-  '';
 in
 llm

From b06e408d0dd51270606513d48b936774799f1c0f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Sat, 10 May 2025 14:55:55 -0700
Subject: [PATCH 0312/1497] llm: customize the message on `llm install` and
 `llm uninstall` with the list of plugins possible

This way, users know what they can specify as far as plugins go. It serves as a plugin directory.
---
 ...1-disable-install-uninstall-commands.patch | 38 +++++++++++++++----
 .../python-modules/llm/default.nix            | 37 ++++++++++++++----
 2 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
index cef7fba13343..4d6280349358 100644
--- a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
+++ b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
@@ -1,8 +1,8 @@
-diff --git a/llm/cli.py b/llm/cli.py
-index af37feb..18b078a 100644
---- a/llm/cli.py
-+++ b/llm/cli.py
-@@ -1014,18 +1014,7 @@ def templates_path():
+diff --git i/llm/cli.py w/llm/cli.py
+index 09e4e2d..8424a5e 100644
+--- i/llm/cli.py
++++ w/llm/cli.py
+@@ -2383,18 +2383,18 @@ def display_truncated(text):
  )
  def install(packages, upgrade, editable, force_reinstall, no_cache_dir):
      """Install packages from PyPI into the same environment as LLM"""
@@ -18,17 +18,39 @@ index af37feb..18b078a 100644
 -    args += list(packages)
 -    sys.argv = args
 -    run_module("pip", run_name="__main__")
-+    click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.")
++    click.echo(
++"""Install command has been disabled for Nix. To install extra `llm` plugins, use the `llm.withPlugins` function.
++
++Example:
++
++```nix
++llm.withPlugins {
++  @listOfPackagedPlugins@
++}
++```
++"""
++    )
  
  
  @cli.command()
-@@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir):
+@@ -2402,8 +2402,18 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir):
  @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation")
  def uninstall(packages, yes):
      """Uninstall Python packages from the LLM environment"""
 -    sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else [])
 -    run_module("pip", run_name="__main__")
-+    click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.")
++    click.echo(
++"""Uninstall command has been disabled for Nix. To remove `llm` plugins, use the `llm.withPlugins` function with the desired set of plugins specified.
++
++Example:
++
++```nix
++llm.withPlugins {
++  @listOfPackagedPlugins@
++}
++```
++"""
++    )
  
  
  @cli.command()
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 8f13f25783b8..743e7c902801 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
+  replaceVars,
   setuptools,
   click-default-group,
   condense-json,
@@ -25,12 +26,10 @@
   sqlite-utils,
 }:
 let
-  # The function signature of `withPlugins` is the list of all the plugins `llm` knows about.
-  # The plugin directory is at <https://llm.datasette.io/en/stable/plugins/directory.html>
-  withPluginsArgNames = lib.functionArgs withPlugins;
-
   /**
     Make a derivation for `llm` that contains `llm` plus the relevant plugins.
+    The function signature of `withPlugins` is the list of all the plugins `llm` knows about.
+    Adding a parameter here requires that it be in `python3Packages` attrset.
 
     # Type
 
@@ -81,6 +80,7 @@ let
       llm-templates-github ? false,
       llm-venice ? false,
       llm-video-frames ? false,
+      ...
     }@args:
     let
       # Filter to just the attributes which are set to a true value.
@@ -97,9 +97,9 @@ let
         ps:
         let
           # Throw a diagnostic if this list gets out of sync with the names in python3Packages
-          allPluginsPresent = pluginNames == (lib.attrNames withPluginsArgNames);
-          pluginNames = lib.attrNames (lib.intersectAttrs ps withPluginsArgNames);
-          missingNamesList = lib.attrNames (lib.removeAttrs withPluginsArgNames pluginNames);
+          allPluginsPresent = pluginNames == withPluginsArgNames;
+          pluginNames = lib.attrNames (lib.intersectAttrs ps withPluginsArgs);
+          missingNamesList = lib.attrNames (lib.removeAttrs withPluginsArgs pluginNames);
           missingNames = lib.concatStringsSep ", " missingNamesList;
 
           # The relevant plugins are the ones the user asked for.
@@ -120,7 +120,24 @@ let
     '';
 
   # Uses the `withPlugins` names to make a Python environment with everything.
-  withAllPlugins = withPlugins (lib.genAttrs (lib.attrNames withPluginsArgNames) (name: true));
+  withAllPlugins = withPlugins (lib.genAttrs withPluginsArgNames (name: true));
+
+  # The function signature of `withPlugins` is the list of all the plugins `llm` knows about.
+  # The plugin directory is at <https://llm.datasette.io/en/stable/plugins/directory.html>
+  withPluginsArgs = lib.functionArgs withPlugins;
+  withPluginsArgNames = lib.attrNames withPluginsArgs;
+
+  # In order to help with usability, we patch `llm install` and `llm uninstall` to tell users how to
+  # customize `llm` with plugins in Nix, including the name of the plugin, its description, and
+  # where it's coming from.
+  listOfPackagedPlugins = builtins.toFile "plugins.txt" (
+    lib.concatStringsSep "\n  " (
+      map (name: ''
+        # ${python.pkgs.${name}.meta.description} <${python.pkgs.${name}.meta.homepage}>
+          ${name} = true;
+      '') withPluginsArgNames
+    )
+  );
 
   llm = buildPythonPackage rec {
     pname = "llm";
@@ -140,6 +157,10 @@ let
 
     patches = [ ./001-disable-install-uninstall-commands.patch ];
 
+    postPatch = ''
+      substituteInPlace llm/cli.py --replace-fail "@listOfPackagedPlugins@" "$(< ${listOfPackagedPlugins})"
+    '';
+
     dependencies = [
       click-default-group
       condense-json

From 81b35cd59bc06990d7f610291f22666ac347a97a Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:13:36 -0700
Subject: [PATCH 0313/1497] llm: add philiptaron to maintainers

---
 pkgs/development/python-modules/llm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 743e7c902801..c1f71fa10e16 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -202,15 +202,16 @@ let
       };
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/simonw/llm";
       description = "Access large language models from the command-line";
       changelog = "https://github.com/simonw/llm/releases/tag/${src.tag}";
-      license = licenses.asl20;
+      license = lib.licenses.asl20;
       mainProgram = "llm";
-      maintainers = with maintainers; [
+      maintainers = with lib.maintainers; [
         aldoborrero
         mccartykim
+        philiptaron
       ];
     };
   };

From a8e9182cd86827dcd5bb23c97a1b550cd04b86cd Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:17:19 -0700
Subject: [PATCH 0314/1497] python3Packages.llm-anthropic: 0.15.1 -> 0.16a2

Diff: https://github.com/simonw/llm-anthropic/compare/refs/tags/0.15.1...refs/tags/0.16a2

Changelog: https://github.com/simonw/llm-anthropic/releases/tag/0.16a2/CHANGELOG.md
---
 pkgs/development/python-modules/llm-anthropic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix
index 6418ddc8c2cf..c0ba9772382f 100644
--- a/pkgs/development/python-modules/llm-anthropic/default.nix
+++ b/pkgs/development/python-modules/llm-anthropic/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "llm-anthropic";
-  version = "0.15.1";
+  version = "0.16a2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-anthropic";
     tag = version;
-    hash = "sha256-8bVs3MJteOTCiw7n/4pMf+oXMhsQbCSzUFVQqm2ezcE=";
+    hash = "sha256-jb1QetMxvDu45wX/AieBUKEk1KSKUt0heCNEYyOGj6w=";
   };
 
   build-system = [

From 1927529a05eefe6e62db1b99e81e8ccebfd6954b Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:17:23 -0700
Subject: [PATCH 0315/1497] python3Packages.llm-fragments-github: 0.3 -> 0.4

Diff: https://github.com/simonw/llm-fragments-github/compare/refs/tags/0.3...refs/tags/0.4

Changelog: https://github.com/simonw/llm-fragments-github/releases/tag/0.4/CHANGELOG.md
---
 .../python-modules/llm-fragments-github/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-fragments-github/default.nix b/pkgs/development/python-modules/llm-fragments-github/default.nix
index dbadab8094de..9b8c3d3c5a72 100644
--- a/pkgs/development/python-modules/llm-fragments-github/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-github/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "llm-fragments-github";
-  version = "0.3";
+  version = "0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-fragments-github";
     tag = version;
-    hash = "sha256-+MNFj7auB/dUSIBDXOBaKjIYIW18GLDB55l66S37U1A=";
+    hash = "sha256-7i1WRix5AAEG5EXJqtaU+QY56aL0SePdqz84z+C+iYM=";
   };
 
   build-system = [

From 264bef7edb35e4c70f510a99e6a8b50c2a20ed3a Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:17:29 -0700
Subject: [PATCH 0316/1497] python3Packages.llm-mistral: 0.12 -> 0.13

Diff: https://github.com/simonw/llm-mistral/compare/refs/tags/0.12...refs/tags/0.13

Changelog: https://github.com/simonw/llm-mistral/releases/tag/0.13/CHANGELOG.md
---
 pkgs/development/python-modules/llm-mistral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-mistral/default.nix b/pkgs/development/python-modules/llm-mistral/default.nix
index 016ca52b1c19..f65ed893d367 100644
--- a/pkgs/development/python-modules/llm-mistral/default.nix
+++ b/pkgs/development/python-modules/llm-mistral/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "llm-mistral";
-  version = "0.12";
+  version = "0.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-mistral";
     tag = version;
-    hash = "sha256-oNA5NFI4BZMG/V+eSHfuF/JKBX2Xr/L8EK+mf7KjPD0=";
+    hash = "sha256-u7Q+WJEtetapNo8WtdbnPKLZK3Q8YBjQcpZgGrK29Ic=";
   };
 
   build-system = [

From 9e07fc75645d6af362a71c746325a5976e14dbfc Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:17:30 -0700
Subject: [PATCH 0317/1497] python3Packages.llm-ollama: 0.10.0 -> 0.11a0

Diff: https://github.com/taketwo/llm-ollama/compare/refs/tags/0.10.0...refs/tags/0.11a0

Changelog: https://github.com/taketwo/llm-ollama/releases/tag/0.11a0
---
 pkgs/development/python-modules/llm-ollama/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index f0938ccf36b3..1a2b9de133b3 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "llm-ollama";
-  version = "0.10.0";
+  version = "0.11a0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "taketwo";
     repo = "llm-ollama";
     tag = version;
-    hash = "sha256-IA9Tb82XB+Gr6YwMVqzsw1dPtT3GWK2W/ZtuDVznF1A";
+    hash = "sha256-Bmv7+mkX5kMnIv3jenXw/OFB63xEPZD19ZRPlyJEbkY=";
   };
 
   build-system = [

From cc134a91d32c5464f0340eddd5639e788cc5a450 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 27 May 2025 06:17:35 -0700
Subject: [PATCH 0318/1497] python3Packages.llm-venice: 0.6.0 -> 0.7.0

Diff: https://github.com/ar-jan/llm-venice/compare/refs/tags/0.6.0...refs/tags/0.7.0

Changelog: https://github.com/ar-jan/llm-venice/releases/tag/0.7.0/CHANGELOG.md
---
 pkgs/development/python-modules/llm-venice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix
index 460d814f1514..8885b55595ee 100644
--- a/pkgs/development/python-modules/llm-venice/default.nix
+++ b/pkgs/development/python-modules/llm-venice/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "llm-venice";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ar-jan";
     repo = "llm-venice";
     tag = version;
-    hash = "sha256-fHCAERIFhuovo1f+jTG6L4C/Rql8tdHZG/7p5fBLkH0=";
+    hash = "sha256-vsb3oXGr+2FDJnTwYomICfald1ptben28hAJ8ypKiBI=";
   };
 
   build-system = [

From e8237dfe32991a25134f45c0399f8e7f29a09d89 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:35:43 -0700
Subject: [PATCH 0319/1497] python3Packages.llm-echo: init at 0.2

---
 .../python-modules/llm-echo/default.nix       | 45 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-echo/default.nix

diff --git a/pkgs/development/python-modules/llm-echo/default.nix b/pkgs/development/python-modules/llm-echo/default.nix
new file mode 100644
index 000000000000..3347f5280145
--- /dev/null
+++ b/pkgs/development/python-modules/llm-echo/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-echo,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-echo";
+  version = "0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-echo";
+    tag = version;
+    hash = "sha256-KtdsvXJQRJ3EEJ25i6ccbVxMsWlDsxa+HJ7bFzyYGNI=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_echo" ];
+
+  passthru.tests = llm.mkPluginTest llm-echo;
+
+  meta = {
+    description = "Debug plugin for LLM";
+    homepage = "https://github.com/simonw/llm-echo";
+    changelog = "https://github.com/simonw/llm-echo/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index c1f71fa10e16..80bed4ff6c2e 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -63,6 +63,7 @@ let
       llm-cmd ? false,
       llm-command-r ? false,
       llm-deepseek ? false,
+      llm-echo ? false,
       llm-fragments-github ? false,
       llm-fragments-pypi ? false,
       llm-gemini ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bded0dc781f..ea594d439326 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8302,6 +8302,8 @@ self: super: with self; {
 
   llm-deepseek = callPackage ../development/python-modules/llm-deepseek { };
 
+  llm-echo = callPackage ../development/python-modules/llm-echo { };
+
   llm-fragments-github = callPackage ../development/python-modules/llm-fragments-github { };
 
   llm-fragments-pypi = callPackage ../development/python-modules/llm-fragments-pypi { };

From 36e9a7ddb91e5649e089d66d1caf6c1a50f19263 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:36:25 -0700
Subject: [PATCH 0320/1497] python3Packages.llm: 0.25 -> 0.26

Diff: https://github.com/simonw/llm/compare/refs/tags/0.25...refs/tags/0.26

Changelog: https://github.com/simonw/llm/releases/tag/0.26

We also need to update llm-echo to a pre-release build to make the tests pass.
---
 .../python-modules/llm-echo/default.nix       |  4 +-
 ...1-disable-install-uninstall-commands.patch | 38 +++++++++++--------
 .../python-modules/llm/default.nix            | 15 +++++++-
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/llm-echo/default.nix b/pkgs/development/python-modules/llm-echo/default.nix
index 3347f5280145..756c4a743b46 100644
--- a/pkgs/development/python-modules/llm-echo/default.nix
+++ b/pkgs/development/python-modules/llm-echo/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "llm-echo";
-  version = "0.3";
+  version = "0.3a3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-echo";
     tag = version;
-    hash = "sha256-KtdsvXJQRJ3EEJ25i6ccbVxMsWlDsxa+HJ7bFzyYGNI=";
+    hash = "sha256-4345UIyaQx+mYYBAFD5AaX5YbjbnJQt8bKMD5Vl8VJc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
index 4d6280349358..a9012c98f3b5 100644
--- a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
+++ b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch
@@ -1,11 +1,12 @@
-diff --git i/llm/cli.py w/llm/cli.py
-index 09e4e2d..8424a5e 100644
---- i/llm/cli.py
-+++ w/llm/cli.py
-@@ -2383,18 +2383,18 @@ def display_truncated(text):
+diff --git a/llm/cli.py b/llm/cli.py
+index 5d53e74..c2b4707 100644
+--- a/llm/cli.py
++++ b/llm/cli.py
+@@ -2895,30 +2895,38 @@ def display_truncated(text):
+     help="Include pre-release and development versions",
  )
- def install(packages, upgrade, editable, force_reinstall, no_cache_dir):
-     """Install packages from PyPI into the same environment as LLM"""
+ def install(packages, upgrade, editable, force_reinstall, no_cache_dir, pre):
+-    """Install packages from PyPI into the same environment as LLM"""
 -    args = ["pip", "install"]
 -    if upgrade:
 -        args += ["--upgrade"]
@@ -15,10 +16,13 @@ index 09e4e2d..8424a5e 100644
 -        args += ["--force-reinstall"]
 -    if no_cache_dir:
 -        args += ["--no-cache-dir"]
+-    if pre:
+-        args += ["--pre"]
 -    args += list(packages)
 -    sys.argv = args
 -    run_module("pip", run_name="__main__")
-+    click.echo(
++    """Install packages from PyPI into the same environment as LLM. Disabled for nixpkgs."""
++    raise click.ClickException(
 +"""Install command has been disabled for Nix. To install extra `llm` plugins, use the `llm.withPlugins` function.
 +
 +Example:
@@ -30,16 +34,17 @@ index 09e4e2d..8424a5e 100644
 +```
 +"""
 +    )
- 
- 
+
+
  @cli.command()
-@@ -2402,8 +2402,18 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir):
+ @click.argument("packages", nargs=-1, required=True)
  @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation")
  def uninstall(packages, yes):
-     """Uninstall Python packages from the LLM environment"""
+-    """Uninstall Python packages from the LLM environment"""
 -    sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else [])
 -    run_module("pip", run_name="__main__")
-+    click.echo(
++    """Uninstall Python packages from the LLM environment. Disabled for nixpkgs."""
++    raise click.ClickException(
 +"""Uninstall command has been disabled for Nix. To remove `llm` plugins, use the `llm.withPlugins` function with the desired set of plugins specified.
 +
 +Example:
@@ -51,6 +56,9 @@ index 09e4e2d..8424a5e 100644
 +```
 +"""
 +    )
- 
- 
+
+
  @cli.command()
+--
+2.49.0
+
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 80bed4ff6c2e..e6d693165763 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -23,7 +23,10 @@
   cogapp,
   pytest-asyncio,
   pytest-httpx,
+  pytest-recording,
   sqlite-utils,
+  syrupy,
+  llm-echo,
 }:
 let
   /**
@@ -142,7 +145,7 @@ let
 
   llm = buildPythonPackage rec {
     pname = "llm";
-    version = "0.25";
+    version = "0.26";
     pyproject = true;
 
     build-system = [ setuptools ];
@@ -153,7 +156,7 @@ let
       owner = "simonw";
       repo = "llm";
       tag = version;
-      hash = "sha256-iH1P0VdpwIItY1In7vlM0Sn44Db23TqFp8GZ79/GMJs=";
+      hash = "sha256-KTlNajuZrR0kBX3LatepsNM3PfRVsQn+evEfXTu6juE=";
     };
 
     patches = [ ./001-disable-install-uninstall-commands.patch ];
@@ -183,11 +186,19 @@ let
       numpy
       pytest-asyncio
       pytest-httpx
+      pytest-recording
+      syrupy
       pytestCheckHook
     ];
 
     doCheck = true;
 
+    # The tests make use of `llm_echo` but that would be a circular dependency.
+    # So we make a local copy in this derivation, as it's a super-simple package of one file.
+    preCheck = ''
+      cp ${llm-echo.src}/llm_echo.py llm_echo.py
+    '';
+
     pytestFlagsArray = [
       "-svv"
       "tests/"

From 518d9a98567f9fe13fda9213e719ae02fa4c7e49 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:36:27 -0700
Subject: [PATCH 0321/1497] python3Packages.llm-anthropic: 0.16a2 -> 0.17

Diff: https://github.com/simonw/llm-anthropic/compare/refs/tags/0.16a2...refs/tags/0.17

Changelog: https://github.com/simonw/llm-anthropic/releases/tag/0.17/CHANGELOG.md
---
 pkgs/development/python-modules/llm-anthropic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix
index c0ba9772382f..f78daf8b73ed 100644
--- a/pkgs/development/python-modules/llm-anthropic/default.nix
+++ b/pkgs/development/python-modules/llm-anthropic/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "llm-anthropic";
-  version = "0.16a2";
+  version = "0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-anthropic";
     tag = version;
-    hash = "sha256-jb1QetMxvDu45wX/AieBUKEk1KSKUt0heCNEYyOGj6w=";
+    hash = "sha256-2fatBKZMttC5flzfC7MWCpduc3m6IOVWZiW1K2dYqis=";
   };
 
   build-system = [

From c80dc765ca26c26510d679ed5968e590166f0f5f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:36:33 -0700
Subject: [PATCH 0322/1497] python3Packages.llm-gemini: 0.20 -> 0.21

Diff: https://github.com/simonw/llm-gemini/compare/refs/tags/0.20...refs/tags/0.21

Changelog: https://github.com/simonw/llm-gemini/releases/tag/0.21
---
 pkgs/development/python-modules/llm-gemini/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index e14f77bc63fe..4b746366fbdb 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -15,14 +15,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-gemini";
-  version = "0.20";
+  version = "0.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-gemini";
     tag = version;
-    hash = "sha256-haaJtJ9RqV5/n/j8PNXPS7zc332W+gU20x0wGPRdzOQ=";
+    hash = "sha256-aCP0YjcghzpgceuZRKGTN15wm7OIPCwcJAJJBxh78f4=";
   };
 
   build-system = [

From 414b770ca537b8e1d66c1f3b10300c694e1379c5 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:36:38 -0700
Subject: [PATCH 0323/1497] python3Packages.llm-mistral: 0.13 -> 0.14

Diff: https://github.com/simonw/llm-mistral/compare/refs/tags/0.13...refs/tags/0.14

Changelog: https://github.com/simonw/llm-mistral/releases/tag/0.14/CHANGELOG.md
---
 pkgs/development/python-modules/llm-mistral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-mistral/default.nix b/pkgs/development/python-modules/llm-mistral/default.nix
index f65ed893d367..1aa42abacc6e 100644
--- a/pkgs/development/python-modules/llm-mistral/default.nix
+++ b/pkgs/development/python-modules/llm-mistral/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "llm-mistral";
-  version = "0.13";
+  version = "0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-mistral";
     tag = version;
-    hash = "sha256-u7Q+WJEtetapNo8WtdbnPKLZK3Q8YBjQcpZgGrK29Ic=";
+    hash = "sha256-NuiqRA/SCjGq0hJsnHJ/vgdncIKu3oE9WqWGht7QRMc=";
   };
 
   build-system = [

From 89950d8ecb3e5a973b2cd9ac760ceaca4c4941b0 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 11:36:40 -0700
Subject: [PATCH 0324/1497] python3Packages.llm-ollama: 0.11a0 -> 0.11.0

Diff: https://github.com/taketwo/llm-ollama/compare/refs/tags/0.11a0...refs/tags/0.11.0

Changelog: https://github.com/taketwo/llm-ollama/releases/tag/0.11.0
---
 pkgs/development/python-modules/llm-ollama/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index 1a2b9de133b3..fa7de12f294c 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "llm-ollama";
-  version = "0.11a0";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "taketwo";
     repo = "llm-ollama";
     tag = version;
-    hash = "sha256-Bmv7+mkX5kMnIv3jenXw/OFB63xEPZD19ZRPlyJEbkY=";
+    hash = "sha256-iwrDqrPt/zwXypBwD7zDAcen4fQq6PXl7Xj5VUL2KWA=";
   };
 
   build-system = [

From 2074fa159b50bb41ac326d85e256d6fec30bfe5e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 13:30:26 -0700
Subject: [PATCH 0325/1497] python3Packages.quickjs: init at 1.19.4

Due to the new quickjs release on 2025-04-26, there's a minor patch needed to fix things up.
---
 ...pdate-for-QuickJS-2025-04-26-release.patch | 66 +++++++++++++++++++
 .../python-modules/quickjs/default.nix        | 58 ++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 126 insertions(+)
 create mode 100644 pkgs/development/python-modules/quickjs/0001-Update-for-QuickJS-2025-04-26-release.patch
 create mode 100644 pkgs/development/python-modules/quickjs/default.nix

diff --git a/pkgs/development/python-modules/quickjs/0001-Update-for-QuickJS-2025-04-26-release.patch b/pkgs/development/python-modules/quickjs/0001-Update-for-QuickJS-2025-04-26-release.patch
new file mode 100644
index 000000000000..05501f6a220c
--- /dev/null
+++ b/pkgs/development/python-modules/quickjs/0001-Update-for-QuickJS-2025-04-26-release.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Philip Taron <philip.taron@gmail.com>
+Date: Thu, 29 May 2025 17:16:43 -0700
+Subject: [PATCH] Update for QuickJS 2025-04-26 release
+
+Signed-off-by: Philip Taron <philip.taron@gmail.com>
+---
+ setup.py        | 6 +++---
+ test_quickjs.py | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9d17af357dcadc40478789ef9c82ac82632967d3..d0b4ff2bd7f3450f6f055ee9e2eda6b591d70689 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ if sys.platform == "win32":
+     #    system PATH when compiling.
+     # 3. The code below will moneky-patch distutils to work.
+     import distutils.cygwinccompiler
+-    distutils.cygwinccompiler.get_msvcr = lambda: [] 
++    distutils.cygwinccompiler.get_msvcr = lambda: []
+     # Make sure that pthreads is linked statically, otherwise we run into problems
+     # on computers where it is not installed.
+     extra_link_args = ["-static"]
+@@ -26,7 +26,7 @@ def get_c_sources(include_headers=False):
+     sources = [
+         "module.c",
+         "upstream-quickjs/cutils.c",
+-        "upstream-quickjs/libbf.c",
++        "upstream-quickjs/dtoa.c",
+         "upstream-quickjs/libregexp.c",
+         "upstream-quickjs/libunicode.c",
+         "upstream-quickjs/quickjs.c",
+@@ -34,7 +34,7 @@ def get_c_sources(include_headers=False):
+     if include_headers:
+         sources += [
+             "upstream-quickjs/cutils.h",
+-            "upstream-quickjs/libbf.h",
++            "upstream-quickjs/dtoa.h",
+             "upstream-quickjs/libregexp-opcode.h",
+             "upstream-quickjs/libregexp.h",
+             "upstream-quickjs/libunicode-table.h",
+diff --git a/test_quickjs.py b/test_quickjs.py
+index 1f6dec7ccd15092e98e80a9139ae2acff359b010..9444234655fba9d932ce92c82b9d8da8fe83ad5b 100644
+--- a/test_quickjs.py
++++ b/test_quickjs.py
+@@ -105,8 +105,8 @@ class Context(unittest.TestCase):
+         else:
+             self.fail("Expected exception.")
+ 
+-        self.assertIn("at funcA (<input>:3)\n", msg)
+-        self.assertIn("at funcB (<input>:6)\n", msg)
++        self.assertIn("at funcA (<input>:3:24)\n", msg)
++        self.assertIn("at funcB (<input>:6:26)\n", msg)
+ 
+     def test_memory_limit(self):
+         code = """
+@@ -508,7 +508,7 @@ class FunctionTest(unittest.TestCase):
+         """)
+ 
+         self.assertEqual(f(100), 100)
+-        limit = 500
++        limit = 1500
+         with self.assertRaises(quickjs.StackOverflow):
+             f(limit)
+         f.set_max_stack_size(2000 * limit)
diff --git a/pkgs/development/python-modules/quickjs/default.nix b/pkgs/development/python-modules/quickjs/default.nix
new file mode 100644
index 000000000000..1d5726bee259
--- /dev/null
+++ b/pkgs/development/python-modules/quickjs/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  poetry-core,
+  pytestCheckHook,
+  pkgs,
+}:
+
+let
+  inherit (pkgs) quickjs srcOnly;
+in
+
+buildPythonPackage rec {
+  pname = "quickjs";
+  version = "1.19.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "PetterS";
+    repo = "quickjs";
+    tag = version;
+    hash = "sha256-nLloXJWOuaK/enZfwXJI94IcsAMYrkBtG4i3gmxuhfw=";
+  };
+
+  patches = [ ./0001-Update-for-QuickJS-2025-04-26-release.patch ];
+
+  # Upstream uses Git submodules; let's de-vendor and use Nix, so that we gain security fixes like
+  # https://github.com/NixOS/nixpkgs/pull/407469
+  prePatch = ''
+    rmdir upstream-quickjs
+    ln -s ${srcOnly quickjs} upstream-quickjs
+  '';
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail poetry>=1.5.0 poetry \
+      --replace-fail poetry poetry-core \
+      --replace-fail 'version = "0"' 'version = "${version}"'
+  '';
+
+  build-system = [
+    poetry-core
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "quickjs" ];
+
+  meta = {
+    description = "Python wrapper around the quickjs C library";
+    homepage = "https://github.com/PetterS/quickjs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea594d439326..08ce80666cde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14898,6 +14898,8 @@ self: super: with self; {
 
   queuelib = callPackage ../development/python-modules/queuelib { };
 
+  quickjs = callPackage ../development/python-modules/quickjs { };
+
   quil = callPackage ../development/python-modules/quil { };
 
   quixote = callPackage ../development/python-modules/quixote { };

From 7438a10a796b646295d7d804bf79f8dc55fd003e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 13:42:18 -0700
Subject: [PATCH 0326/1497] python3Packages.llm-tools-quickjs: init at 0.1

---
 .../llm-tools-quickjs/default.nix             | 50 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  4 +-
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/llm-tools-quickjs/default.nix

diff --git a/pkgs/development/python-modules/llm-tools-quickjs/default.nix b/pkgs/development/python-modules/llm-tools-quickjs/default.nix
new file mode 100644
index 000000000000..b8f934c5a5b6
--- /dev/null
+++ b/pkgs/development/python-modules/llm-tools-quickjs/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  quickjs,
+  llm,
+  llm-tools-quickjs,
+  llm-echo,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-tools-quickjs";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-tools-quickjs";
+    tag = version;
+    hash = "sha256-Si3VcHnRUj8Q/N8pRhltPOM6K64TX9DBH/u4WQxQJjQ=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ quickjs ];
+
+  nativeCheckInputs = [
+    llm-echo
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_tools_quickjs" ];
+
+  passthru.tests = llm.mkPluginTest llm-tools-quickjs;
+
+  meta = {
+    description = "JavaScript execution as a tool for LLM";
+    homepage = "https://github.com/simonw/llm-tools-quickjs";
+    changelog = "https://github.com/simonw/llm-tools-quickjs/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index e6d693165763..826a502de7f8 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -82,6 +82,7 @@ let
       llm-sentence-transformers ? false,
       llm-templates-fabric ? false,
       llm-templates-github ? false,
+      llm-tools-quickjs ? false,
       llm-venice ? false,
       llm-video-frames ? false,
       ...
@@ -162,7 +163,8 @@ let
     patches = [ ./001-disable-install-uninstall-commands.patch ];
 
     postPatch = ''
-      substituteInPlace llm/cli.py --replace-fail "@listOfPackagedPlugins@" "$(< ${listOfPackagedPlugins})"
+      substituteInPlace llm/cli.py \
+        --replace-fail "@listOfPackagedPlugins@" "$(< ${listOfPackagedPlugins})"
     '';
 
     dependencies = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08ce80666cde..8bdcd385da26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8334,6 +8334,8 @@ self: super: with self; {
 
   llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };
 
+  llm-tools-quickjs = callPackage ../development/python-modules/llm-tools-quickjs { };
+
   llm-venice = callPackage ../development/python-modules/llm-venice { };
 
   llm-video-frames = callPackage ../development/python-modules/llm-video-frames { };

From d935c30c3d2bcee3819437ae7ee4e28befd63735 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 13:54:01 -0700
Subject: [PATCH 0327/1497] python3Packages.llm-tools-sqlite: init at 0.1

---
 .../llm-tools-sqlite/default.nix              | 47 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-tools-sqlite/default.nix

diff --git a/pkgs/development/python-modules/llm-tools-sqlite/default.nix b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
new file mode 100644
index 000000000000..283084b8efc0
--- /dev/null
+++ b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-tools-sqlite,
+  llm-echo,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-tools-sqlite";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-tools-sqlite";
+    tag = version;
+    hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  nativeCheckInputs = [
+    llm-echo
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_tools_sqlite" ];
+
+  passthru.tests = llm.mkPluginTest llm-tools-sqlite;
+
+  meta = {
+    description = "LLM tools for running queries against SQLite";
+    homepage = "https://github.com/simonw/llm-tools-sqlite";
+    changelog = "https://github.com/simonw/llm-tools-sqlite/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 826a502de7f8..a1b128be406a 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -83,6 +83,7 @@ let
       llm-templates-fabric ? false,
       llm-templates-github ? false,
       llm-tools-quickjs ? false,
+      llm-tools-sqlite ? false,
       llm-venice ? false,
       llm-video-frames ? false,
       ...
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bdcd385da26..210d61727d55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8336,6 +8336,8 @@ self: super: with self; {
 
   llm-tools-quickjs = callPackage ../development/python-modules/llm-tools-quickjs { };
 
+  llm-tools-sqlite = callPackage ../development/python-modules/llm-tools-sqlite { };
+
   llm-venice = callPackage ../development/python-modules/llm-venice { };
 
   llm-video-frames = callPackage ../development/python-modules/llm-video-frames { };

From 550a2409216c8318dfe1a71fe4daf040080f6793 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 13:58:30 -0700
Subject: [PATCH 0328/1497] python3Packages.llm-tools-datasette: init at 0.1

---
 .../llm-tools-datasette/default.nix           | 49 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-tools-datasette/default.nix

diff --git a/pkgs/development/python-modules/llm-tools-datasette/default.nix b/pkgs/development/python-modules/llm-tools-datasette/default.nix
new file mode 100644
index 000000000000..5229c71bb6ea
--- /dev/null
+++ b/pkgs/development/python-modules/llm-tools-datasette/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-tools-datasette,
+  llm-echo,
+  pytestCheckHook,
+  pytest-httpx,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-tools-datasette";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-tools-datasette";
+    tag = version;
+    hash = "sha256-Us9bPk2qpTlgJqQ0Cl9QdeqW+h8j+pmnkriM0WXEyyA=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  nativeCheckInputs = [
+    llm-echo
+    pytestCheckHook
+    pytest-httpx
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_tools_datasette" ];
+
+  passthru.tests = llm.mkPluginTest llm-tools-datasette;
+
+  meta = {
+    description = "Expose Datasette instances to LLM as a tool";
+    homepage = "https://github.com/simonw/llm-tools-datasette";
+    changelog = "https://github.com/simonw/llm-tools-datasette/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index a1b128be406a..d17063c115fa 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -82,6 +82,7 @@ let
       llm-sentence-transformers ? false,
       llm-templates-fabric ? false,
       llm-templates-github ? false,
+      llm-tools-datasette ? false,
       llm-tools-quickjs ? false,
       llm-tools-sqlite ? false,
       llm-venice ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 210d61727d55..24cbe8744992 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8334,6 +8334,8 @@ self: super: with self; {
 
   llm-templates-github = callPackage ../development/python-modules/llm-templates-github { };
 
+  llm-tools-datasette = callPackage ../development/python-modules/llm-tools-datasette { };
+
   llm-tools-quickjs = callPackage ../development/python-modules/llm-tools-quickjs { };
 
   llm-tools-sqlite = callPackage ../development/python-modules/llm-tools-sqlite { };

From 4397592022cbabe3b7a09f22db08de56164e2b76 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:02:21 -0700
Subject: [PATCH 0329/1497] python3Packages.llm-llama-server: init at 0.2

---
 .../llm-llama-server/default.nix              | 47 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-llama-server/default.nix

diff --git a/pkgs/development/python-modules/llm-llama-server/default.nix b/pkgs/development/python-modules/llm-llama-server/default.nix
new file mode 100644
index 000000000000..e6fcb5b3498c
--- /dev/null
+++ b/pkgs/development/python-modules/llm-llama-server/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-llama-server,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-llama-server";
+  version = "0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-llama-server";
+    tag = version;
+    hash = "sha256-jtFSfGu3JhNUfTsspY+OFLTMt9jQrh6R05sK9KBOKTE=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_llama_server" ];
+
+  passthru.tests = llm.mkPluginTest llm-llama-server;
+
+  meta = {
+    description = "LLM plugin providing access to Mistral models using the Mistral API";
+    homepage = "Interact with llama-server models";
+    changelog = "https://github.com/simonw/llm-llama-server/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index d17063c115fa..b05e1de0eeda 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -75,6 +75,7 @@ let
       llm-groq ? false,
       llm-hacker-news ? false,
       llm-jq ? false,
+      llm-llama-server ? false,
       llm-mistral ? false,
       llm-ollama ? false,
       llm-openai-plugin ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 24cbe8744992..31744332843a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8320,6 +8320,8 @@ self: super: with self; {
 
   llm-jq = callPackage ../development/python-modules/llm-jq { };
 
+  llm-llama-server = callPackage ../development/python-modules/llm-llama-server { };
+
   llm-mistral = callPackage ../development/python-modules/llm-mistral { };
 
   llm-ollama = callPackage ../development/python-modules/llm-ollama { };

From 2ee7c8ea88ed8e327b6af64ae90a4178a1612dc4 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:09:24 -0700
Subject: [PATCH 0330/1497] python3Packages.llm-tools-simpleeval: init at 0.1.1

---
 .../llm-tools-simpleeval/default.nix          | 50 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-tools-simpleeval/default.nix

diff --git a/pkgs/development/python-modules/llm-tools-simpleeval/default.nix b/pkgs/development/python-modules/llm-tools-simpleeval/default.nix
new file mode 100644
index 000000000000..50a9a3f9ba24
--- /dev/null
+++ b/pkgs/development/python-modules/llm-tools-simpleeval/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-tools-simpleeval,
+  llm-echo,
+  pytestCheckHook,
+  simpleeval,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-tools-simpleeval";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-tools-simpleeval";
+    tag = version;
+    hash = "sha256-IOmYu7zoim7Co/xIm5VLaGkCPI0o+2Nb2Pu3U2fH0BU=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ simpleeval ];
+
+  nativeCheckInputs = [
+    llm-echo
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_tools_simpleeval" ];
+
+  passthru.tests = llm.mkPluginTest llm-tools-simpleeval;
+
+  meta = {
+    description = "Make simple_eval available as an LLM tool";
+    homepage = "https://github.com/simonw/llm-tools-simpleeval";
+    changelog = "https://github.com/simonw/llm-tools-simpleeval/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index b05e1de0eeda..4cfc7e21ef7a 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -85,6 +85,7 @@ let
       llm-templates-github ? false,
       llm-tools-datasette ? false,
       llm-tools-quickjs ? false,
+      llm-tools-simpleeval ? false,
       llm-tools-sqlite ? false,
       llm-venice ? false,
       llm-video-frames ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31744332843a..91a2b06a722e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8340,6 +8340,8 @@ self: super: with self; {
 
   llm-tools-quickjs = callPackage ../development/python-modules/llm-tools-quickjs { };
 
+  llm-tools-simpleeval = callPackage ../development/python-modules/llm-tools-simpleeval { };
+
   llm-tools-sqlite = callPackage ../development/python-modules/llm-tools-sqlite { };
 
   llm-venice = callPackage ../development/python-modules/llm-venice { };

From 3d646501ff9c68746a85dac2413d72bbbf1c15ca Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:21:39 -0700
Subject: [PATCH 0331/1497] python3Packages.llm-fragments-reader: init at 0.1

---
 .../llm-fragments-reader/default.nix          | 50 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-fragments-reader/default.nix

diff --git a/pkgs/development/python-modules/llm-fragments-reader/default.nix b/pkgs/development/python-modules/llm-fragments-reader/default.nix
new file mode 100644
index 000000000000..72aa5aaea539
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-reader/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  httpx,
+  httpx-sse,
+  llm,
+  llm-fragments-reader,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-httpx,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-fragments-reader";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-fragments-reader";
+    tag = version;
+    hash = "sha256-2xdvOpMGsTtnerrlGiVSHoJrM+GQ7Zgv+zn2SAwYAL4=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-httpx
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_fragments_reader" ];
+
+  passthru.tests = llm.mkPluginTest llm-fragments-reader;
+
+  meta = {
+    description = "Run URLs through the Jina Reader API";
+    homepage = "https://github.com/simonw/llm-fragments-reader";
+    changelog = "https://github.com/simonw/llm-fragments-reader/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 4cfc7e21ef7a..3089cdb53746 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -69,6 +69,7 @@ let
       llm-echo ? false,
       llm-fragments-github ? false,
       llm-fragments-pypi ? false,
+      llm-fragments-reader ? false,
       llm-gemini ? false,
       llm-gguf ? false,
       llm-grok ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91a2b06a722e..eb077daabfdc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8308,6 +8308,8 @@ self: super: with self; {
 
   llm-fragments-pypi = callPackage ../development/python-modules/llm-fragments-pypi { };
 
+  llm-fragments-reader = callPackage ../development/python-modules/llm-fragments-reader { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From 8d872ce25063db13f18278b8885c501f8f5f469b Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:25:51 -0700
Subject: [PATCH 0332/1497] python3Packages.llm-docs: init at 0.2.1

---
 .../python-modules/llm-docs/default.nix       | 38 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-docs/default.nix

diff --git a/pkgs/development/python-modules/llm-docs/default.nix b/pkgs/development/python-modules/llm-docs/default.nix
new file mode 100644
index 000000000000..8ed974571607
--- /dev/null
+++ b/pkgs/development/python-modules/llm-docs/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  llm,
+  llm-docs,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-docs";
+  version = "0.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-docs";
+    tag = version;
+    hash = "sha256-+Ha6L2h8p/yA073MfO2Uvd6E4bKA2xAvaBWtvjqglOw=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  pythonImportsCheck = [ "llm_docs" ];
+
+  passthru.tests = llm.mkPluginTest llm-docs;
+
+  meta = {
+    description = "Ask questions of LLM documentation using LLM";
+    homepage = "https://github.com/simonw/llm-docs";
+    changelog = "https://github.com/simonw/llm-docs/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 3089cdb53746..3724793c45d2 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -66,6 +66,7 @@ let
       llm-cmd ? false,
       llm-command-r ? false,
       llm-deepseek ? false,
+      llm-docs ? false,
       llm-echo ? false,
       llm-fragments-github ? false,
       llm-fragments-pypi ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb077daabfdc..dfdcd352fe26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8302,6 +8302,8 @@ self: super: with self; {
 
   llm-deepseek = callPackage ../development/python-modules/llm-deepseek { };
 
+  llm-docs = callPackage ../development/python-modules/llm-docs { };
+
   llm-echo = callPackage ../development/python-modules/llm-echo { };
 
   llm-fragments-github = callPackage ../development/python-modules/llm-fragments-github { };

From e2e0a82a49c0c90f555e06e44733466af418bd8e Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:58:44 -0700
Subject: [PATCH 0333/1497] python3Packages.icudiff: init at 2.0.7

This was added as a by-name package but it's actually also a library.

I've turned the tests off on Darwin; there's an odd utf-8 error and a
permissions error, and both look related to the Nix sandboxing.
---
 pkgs/by-name/ic/icdiff/package.nix            | 42 +------------
 .../0001-Don-t-test-black-or-flake8.patch     | 35 +++++++++++
 .../python-modules/icdiff/default.nix         | 61 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 100 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/python-modules/icdiff/0001-Don-t-test-black-or-flake8.patch
 create mode 100644 pkgs/development/python-modules/icdiff/default.nix

diff --git a/pkgs/by-name/ic/icdiff/package.nix b/pkgs/by-name/ic/icdiff/package.nix
index d34b976f068e..98144d145cd0 100644
--- a/pkgs/by-name/ic/icdiff/package.nix
+++ b/pkgs/by-name/ic/icdiff/package.nix
@@ -1,41 +1,3 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-  bash,
-  git,
-  less,
-}:
+{ python3Packages }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "icdiff";
-  version = "2.0.7";
-
-  src = fetchFromGitHub {
-    owner = "jeffkaufman";
-    repo = "icdiff";
-    tag = "release-${version}";
-    hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
-  };
-
-  # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
-  doCheck = false;
-
-  nativeCheckInputs = [
-    bash
-    git
-    less
-  ];
-
-  checkPhase = ''
-    patchShebangs test.sh
-    ./test.sh ${python3Packages.python.interpreter}
-  '';
-
-  meta = {
-    homepage = "https://www.jefftk.com/icdiff";
-    description = "Side-by-side highlighted command line diffs";
-    maintainers = [ ];
-    license = lib.licenses.psfl;
-  };
-}
+python3Packages.toPythonApplication python3Packages.icdiff
diff --git a/pkgs/development/python-modules/icdiff/0001-Don-t-test-black-or-flake8.patch b/pkgs/development/python-modules/icdiff/0001-Don-t-test-black-or-flake8.patch
new file mode 100644
index 000000000000..3e8a067c7841
--- /dev/null
+++ b/pkgs/development/python-modules/icdiff/0001-Don-t-test-black-or-flake8.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Philip Taron <philip.taron@gmail.com>
+Date: Thu, 29 May 2025 14:47:58 -0700
+Subject: [PATCH] Don't test black or flake8
+
+Signed-off-by: Philip Taron <philip.taron@gmail.com>
+---
+ test.sh | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 1dd6c4be579e8a61d2d284b042c54cd2a1e0ff77..dc9ecab4a9097878a0a65c45df38a4fa25eb9fa2 100755
+--- a/test.sh
++++ b/test.sh
+@@ -210,20 +210,6 @@ function ensure_installed() {
+   fi
+ }
+ 
+-ensure_installed "black"
+-echo 'Running black formatter...'
+-if ! black icdiff --quiet --line-length 79 --check; then
+-  echo ""
+-  echo 'Consider running `black icdiff --line-length 79`'
+-  fail
+-fi
+-
+-ensure_installed "flake8"
+-echo 'Running flake8 linter...'
+-if ! flake8 icdiff; then
+-  fail
+-fi
+-
+ if ! $REGOLD; then
+   echo PASS
+ fi
diff --git a/pkgs/development/python-modules/icdiff/default.nix b/pkgs/development/python-modules/icdiff/default.nix
new file mode 100644
index 000000000000..b1bd7addd69b
--- /dev/null
+++ b/pkgs/development/python-modules/icdiff/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  pkgs,
+}:
+let
+  inherit (pkgs) bash git less;
+in
+
+buildPythonPackage rec {
+  pname = "icdiff";
+  version = "2.0.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jeffkaufman";
+    repo = "icdiff";
+    tag = "release-${version}";
+    hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
+    leaveDotGit = true;
+  };
+
+  patches = [ ./0001-Don-t-test-black-or-flake8.patch ];
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "icdiff" ];
+
+  nativeCheckInputs = [
+    bash
+    git
+    less
+    writableTmpDirAsHomeHook
+  ];
+
+  # Odd behavior in the sandbox
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  checkPhase = ''
+    runHook preCheck
+
+    patchShebangs test.sh
+    ./test.sh ${python.interpreter}
+
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Improved colorized diff";
+    homepage = "https://github.com/jeffkaufman/icdiff";
+    changelog = "https://github.com/jeffkaufman/icdiff/releases/tag/release-${version}/CHANGELOG.md";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dfdcd352fe26..9ac94ee07768 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6650,6 +6650,8 @@ self: super: with self; {
 
   icalevents = callPackage ../development/python-modules/icalevents { };
 
+  icdiff = callPackage ../development/python-modules/icdiff { };
+
   icecream = callPackage ../development/python-modules/icecream { };
 
   iceportal = callPackage ../development/python-modules/iceportal { };

From 8ef5aeead23e5e15fbb82b4bdb2d4c266995ebdc Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 15:26:10 -0700
Subject: [PATCH 0334/1497] python3Packages.pytest-icudiff: init at
 0.5-unstable-2024-09-04

---
 .../python-modules/pytest-icdiff/default.nix  | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-icdiff/default.nix

diff --git a/pkgs/development/python-modules/pytest-icdiff/default.nix b/pkgs/development/python-modules/pytest-icdiff/default.nix
new file mode 100644
index 000000000000..6b0ba2adfd42
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-icdiff/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  icdiff,
+  pprintpp,
+  pytest,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-icdiff";
+  version = "0.5-unstable-2024-09-04";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hjwp";
+    repo = "pytest-icdiff";
+    rev = "6e2fb8de35e37428a9f7a268c8abb57e9ee285e5";
+    hash = "sha256-kSeGz5IExldgi955XOEkQnc8uqxkbyvuDOdz9y3AFIY=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytest
+    icdiff
+    pprintpp
+  ];
+
+  # These are failing on the main branch; disable for now
+  disabledTests = [
+    "test_long_dict"
+    "test_mutliline_strings_have_no_escaped_newlines"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "pytest_icdiff" ];
+
+  meta = {
+    description = "Better error messages in pytest assertions using icdiff";
+    homepage = "https://github.com/hjwp/pytest-icdiff";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ac94ee07768..b4acb2367c0a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13865,6 +13865,8 @@ self: super: with self; {
 
   pytest-httpx = callPackage ../development/python-modules/pytest-httpx { };
 
+  pytest-icdiff = callPackage ../development/python-modules/pytest-icdiff { };
+
   pytest-image-diff = callPackage ../development/python-modules/pytest-image-diff { };
 
   pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };

From 6a92dd13019cd592515b073f57dc8411d5e48040 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 15:28:03 -0700
Subject: [PATCH 0335/1497] python3Packages.symbex: init at 2.0

---
 .../python-modules/symbex/default.nix         | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/symbex/default.nix

diff --git a/pkgs/development/python-modules/symbex/default.nix b/pkgs/development/python-modules/symbex/default.nix
new file mode 100644
index 000000000000..7790641ab4fc
--- /dev/null
+++ b/pkgs/development/python-modules/symbex/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  click,
+  pytestCheckHook,
+  pyyaml,
+  pytest-icdiff,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "symbex";
+  version = "2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "symbex";
+    tag = version;
+    hash = "sha256-swg98z4DpQJ5rq7tdsd3FofbYF7O5S+9ZR0weoM2DoI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
+
+  pythonImportsCheck = [ "symbex" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+    pytest-icdiff
+    writableTmpDirAsHomeHook
+  ];
+
+  meta = {
+    description = "Ask questions of LLM documentation using LLM";
+    homepage = "https://github.com/simonw/llm-docs";
+    changelog = "https://github.com/simonw/llm-docs/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4acb2367c0a..954728996dbe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17075,6 +17075,8 @@ self: super: with self; {
 
   sybil = callPackage ../development/python-modules/sybil { };
 
+  symbex = callPackage ../development/python-modules/symbex { };
+
   symbolic = callPackage ../development/python-modules/symbolic { };
 
   symengine = callPackage ../development/python-modules/symengine { inherit (pkgs) symengine; };

From 2db9fe2fd0a179a69cf50136000e8dae94f6d623 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 15:34:51 -0700
Subject: [PATCH 0336/1497] python3Packages.llm-fragments-symbex: init at 0.1

---
 .../llm-fragments-symbex/default.nix          | 48 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-fragments-symbex/default.nix

diff --git a/pkgs/development/python-modules/llm-fragments-symbex/default.nix b/pkgs/development/python-modules/llm-fragments-symbex/default.nix
new file mode 100644
index 000000000000..2c1611ab2e27
--- /dev/null
+++ b/pkgs/development/python-modules/llm-fragments-symbex/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  symbex,
+  llm,
+  llm-fragments-symbex,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-fragments-symbex";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-fragments-symbex";
+    tag = version;
+    hash = "sha256-LECMHv4tGMCY60JU68y2Sfxp97Px7T/RJVhYVDSFCy4=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ symbex ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_fragments_symbex" ];
+
+  passthru.tests = llm.mkPluginTest llm-fragments-symbex;
+
+  meta = {
+    description = "LLM fragment loader for Python symbols";
+    homepage = "https://github.com/simonw/llm-fragments-symbex";
+    changelog = "https://github.com/simonw/llm-fragments-symbex/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 3724793c45d2..7a87bd3c121f 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -71,6 +71,7 @@ let
       llm-fragments-github ? false,
       llm-fragments-pypi ? false,
       llm-fragments-reader ? false,
+      llm-fragments-symbex ? false,
       llm-gemini ? false,
       llm-gguf ? false,
       llm-grok ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 954728996dbe..df094c7711b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8314,6 +8314,8 @@ self: super: with self; {
 
   llm-fragments-reader = callPackage ../development/python-modules/llm-fragments-reader { };
 
+  llm-fragments-symbex = callPackage ../development/python-modules/llm-fragments-symbex { };
+
   llm-gemini = callPackage ../development/python-modules/llm-gemini { };
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };

From cedea09b469f909744058e12ad260630e54cc980 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 15:42:40 -0700
Subject: [PATCH 0337/1497] python3Packages.files-to-prompt: init at 0.6

It was previously packaged in `pkgs/by-name`, but is also a Python package in addition to an application.
---
 pkgs/by-name/fi/files-to-prompt/package.nix   | 44 +-----------------
 .../files-to-prompt/default.nix               | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 49 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/development/python-modules/files-to-prompt/default.nix

diff --git a/pkgs/by-name/fi/files-to-prompt/package.nix b/pkgs/by-name/fi/files-to-prompt/package.nix
index b671e52e9504..bba3859edb6b 100644
--- a/pkgs/by-name/fi/files-to-prompt/package.nix
+++ b/pkgs/by-name/fi/files-to-prompt/package.nix
@@ -1,43 +1,3 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-  versionCheckHook,
-}:
+{ python3Packages }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "files-to-prompt";
-  version = "0.6";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "simonw";
-    repo = "files-to-prompt";
-    tag = version;
-    hash = "sha256-LWp/DNP3bsh7/goQGkpi4x2N11tRuhLVh2J8H6AUH0w=";
-  };
-
-  build-system = with python3Packages; [
-    setuptools
-  ];
-
-  dependencies = with python3Packages; [
-    click
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-    versionCheckHook
-  ];
-
-  versionCheckProgramArg = "--version";
-
-  meta = {
-    description = "Concatenate a directory full of files into a single prompt for use with LLMs";
-    homepage = "https://github.com/simonw/files-to-prompt/";
-    changelog = "https://github.com/simonw/files-to-prompt/releases/tag/${src.tag}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ erethon ];
-    mainProgram = "files-to-prompt";
-  };
-}
+python3Packages.toPythonApplication python3Packages.files-to-prompt
diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix
new file mode 100644
index 000000000000..f4392672429a
--- /dev/null
+++ b/pkgs/development/python-modules/files-to-prompt/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  click,
+  setuptools,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytestCheckHook,
+  versionCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "files-to-prompt";
+  version = "0.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "files-to-prompt";
+    tag = version;
+    hash = "sha256-LWp/DNP3bsh7/goQGkpi4x2N11tRuhLVh2J8H6AUH0w=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ click ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    mainProgram = "files-to-prompt";
+    description = "Concatenate a directory full of files into a single prompt for use with LLMs";
+    homepage = "https://github.com/simonw/files-to-prompt";
+    changelog = "https://github.com/simonw/files-to-prompt/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      erethon
+      philiptaron
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df094c7711b4..9043f37f599f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4967,6 +4967,8 @@ self: super: with self; {
 
   filelock = callPackage ../development/python-modules/filelock { };
 
+  files-to-prompt = callPackage ../development/python-modules/files-to-prompt { };
+
   filetype = callPackage ../development/python-modules/filetype { };
 
   filterpy = callPackage ../development/python-modules/filterpy { };

From 5aed3c68318cc13423e70a3c5f9ba3add173d212 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 15:59:15 -0700
Subject: [PATCH 0338/1497] python3Packages.llm-git: init at 0.2.2

---
 .../python-modules/llm-git/default.nix        | 62 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-git/default.nix

diff --git a/pkgs/development/python-modules/llm-git/default.nix b/pkgs/development/python-modules/llm-git/default.nix
new file mode 100644
index 000000000000..39c66027c601
--- /dev/null
+++ b/pkgs/development/python-modules/llm-git/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  click,
+  deepmerge,
+  pyyaml,
+  rich,
+  pygments,
+  llm,
+  llm-git,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pytest-asyncio,
+  pytest-httpx,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-git";
+  version = "0.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "OttoAllmendinger";
+    repo = "llm-git";
+    tag = "v${version}";
+    hash = "sha256-LcIsJPQgZ4gj2t7sSa0Wu35WHWYyquZZTS/UxojH+XU=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [
+    click
+    deepmerge
+    pyyaml
+    rich
+    pygments
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_git" ];
+
+  passthru.tests = llm.mkPluginTest llm-git;
+
+  meta = {
+    description = "AI-powered Git commands for the LLM CLI tool";
+    homepage = "https://github.com/OttoAllmendinger/llm-git";
+    changelog = "https://github.com/OttoAllmendinger/llm-git/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 7a87bd3c121f..feaf4006c6a2 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -74,6 +74,7 @@ let
       llm-fragments-symbex ? false,
       llm-gemini ? false,
       llm-gguf ? false,
+      llm-git ? false,
       llm-grok ? false,
       llm-groq ? false,
       llm-hacker-news ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9043f37f599f..5e7d1c43ff59 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8322,6 +8322,8 @@ self: super: with self; {
 
   llm-gguf = callPackage ../development/python-modules/llm-gguf { };
 
+  llm-git = callPackage ../development/python-modules/llm-git { };
+
   llm-grok = callPackage ../development/python-modules/llm-grok { };
 
   llm-groq = callPackage ../development/python-modules/llm-groq { };

From 727e10522cfba95c6935fc0ceee774376d8c83ba Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 16:06:40 -0700
Subject: [PATCH 0339/1497] llm: cap the derivation name to something sensible

---
 .../development/python-modules/llm/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index feaf4006c6a2..2be447500aac 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -99,11 +99,19 @@ let
       # Filter to just the attributes which are set to a true value.
       setArgs = lib.filterAttrs (name: lib.id) args;
 
-      # Make a string with those names separated with a dash.
-      setArgsStr = lib.concatStringsSep "-" (lib.attrNames setArgs);
-
-      # Make the derivation name reflect what's inside it.
-      drvName = if lib.stringLength setArgsStr == 0 then "llm" else "llm-with-${setArgsStr}";
+      # Make the derivation name reflect what's inside it, up to a certain limit.
+      setArgNames = lib.attrNames setArgs;
+      drvName =
+        let
+          len = builtins.length setArgNames;
+        in
+        if len == 0 then
+          "llm-${llm.version}"
+        else if len > 20 then
+          "llm-${llm.version}-with-${toString len}-plugins"
+        else
+          # Make a string with those names separated with a dash.
+          "llm-${llm.version}-with-${lib.concatStringsSep "-" setArgNames}";
 
       # Make a python environment with just those plugins.
       python-environment = python.withPackages (

From 6fba136127cd770810372af0894b603d8d1041c1 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:17:08 -0700
Subject: [PATCH 0340/1497] python3Packages.llm-pdf-to-images: init at 0.1

---
 .../llm-pdf-to-images/default.nix             | 49 +++++++++++++++++++
 .../python-modules/llm/default.nix            |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/llm-pdf-to-images/default.nix

diff --git a/pkgs/development/python-modules/llm-pdf-to-images/default.nix b/pkgs/development/python-modules/llm-pdf-to-images/default.nix
new file mode 100644
index 000000000000..bdf5d4ae785f
--- /dev/null
+++ b/pkgs/development/python-modules/llm-pdf-to-images/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pymupdf,
+  llm,
+  llm-pdf-to-images,
+  pytestCheckHook,
+  pytest-asyncio,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "llm-pdf-to-images";
+  version = "0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "llm-pdf-to-images";
+    tag = version;
+    hash = "sha256-UWtCPdKrGE93NNjCroct5fPhq1pWIkngXXtRb+BHm8k=";
+  };
+
+  build-system = [
+    setuptools
+    llm
+  ];
+
+  dependencies = [ pymupdf ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  pythonImportsCheck = [ "llm_pdf_to_images" ];
+
+  passthru.tests = llm.mkPluginTest llm-pdf-to-images;
+
+  meta = {
+    description = "LLM fragment plugin to load a PDF as a sequence of images";
+    homepage = "https://github.com/simonw/llm-pdf-to-images";
+    changelog = "https://github.com/simonw/llm-pdf-to-images/releases/tag/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 2be447500aac..f237f3fbbecc 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -84,6 +84,7 @@ let
       llm-ollama ? false,
       llm-openai-plugin ? false,
       llm-openrouter ? false,
+      llm-pdf-to-images ? false,
       llm-sentence-transformers ? false,
       llm-templates-fabric ? false,
       llm-templates-github ? false,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e7d1c43ff59..086a295a8ed1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8342,6 +8342,8 @@ self: super: with self; {
 
   llm-openrouter = callPackage ../development/python-modules/llm-openrouter { };
 
+  llm-pdf-to-images = callPackage ../development/python-modules/llm-pdf-to-images { };
+
   llm-sentence-transformers = callPackage ../development/python-modules/llm-sentence-transformers { };
 
   llm-templates-fabric = callPackage ../development/python-modules/llm-templates-fabric { };

From 42fa505cf79a73532642eb2bda4b009e7bac87ee Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 30 May 2025 17:13:35 -0700
Subject: [PATCH 0341/1497] python3Packages.llm-*: use llm in the dependencies

There's no circular dependency problems anymore.
---
 .../python-modules/llm-anthropic/default.nix        |  6 ++++--
 pkgs/development/python-modules/llm-cmd/default.nix | 13 +++++++------
 .../python-modules/llm-command-r/default.nix        |  8 ++++----
 .../python-modules/llm-deepseek/default.nix         |  7 ++-----
 .../development/python-modules/llm-docs/default.nix |  7 +++----
 .../development/python-modules/llm-echo/default.nix |  7 +++----
 .../python-modules/llm-fragments-github/default.nix |  8 +++-----
 .../python-modules/llm-fragments-pypi/default.nix   |  7 ++++---
 .../python-modules/llm-fragments-reader/default.nix |  7 +++----
 .../python-modules/llm-fragments-symbex/default.nix | 10 +++++-----
 .../python-modules/llm-gemini/default.nix           |  6 ++----
 .../development/python-modules/llm-gguf/default.nix |  6 ++----
 pkgs/development/python-modules/llm-git/default.nix |  2 +-
 .../development/python-modules/llm-grok/default.nix |  6 ++----
 .../development/python-modules/llm-groq/default.nix |  6 ++++--
 .../python-modules/llm-hacker-news/default.nix      |  8 +++-----
 pkgs/development/python-modules/llm-jq/default.nix  |  7 ++-----
 .../python-modules/llm-llama-server/default.nix     |  9 +++------
 .../python-modules/llm-mistral/default.nix          |  2 +-
 .../python-modules/llm-ollama/default.nix           |  7 ++-----
 .../python-modules/llm-openai-plugin/default.nix    |  6 ++----
 .../python-modules/llm-openrouter/default.nix       |  2 +-
 .../python-modules/llm-pdf-to-images/default.nix    | 10 +++++-----
 .../llm-sentence-transformers/default.nix           |  6 ++----
 .../python-modules/llm-templates-fabric/default.nix |  7 ++-----
 .../python-modules/llm-templates-github/default.nix |  7 ++-----
 .../python-modules/llm-tools-datasette/default.nix  |  7 +++----
 .../python-modules/llm-tools-quickjs/default.nix    | 10 +++++-----
 .../python-modules/llm-tools-simpleeval/default.nix | 10 +++++-----
 .../python-modules/llm-tools-sqlite/default.nix     |  7 +++----
 .../python-modules/llm-venice/default.nix           |  7 ++-----
 .../python-modules/llm-video-frames/default.nix     |  7 ++-----
 pkgs/development/python-modules/symbex/default.nix  |  6 +++---
 33 files changed, 97 insertions(+), 134 deletions(-)

diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix
index f78daf8b73ed..41bc86f10a15 100644
--- a/pkgs/development/python-modules/llm-anthropic/default.nix
+++ b/pkgs/development/python-modules/llm-anthropic/default.nix
@@ -26,10 +26,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    llm
   ];
 
-  dependencies = [ anthropic ];
+  dependencies = [
+    anthropic
+    llm
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/llm-cmd/default.nix b/pkgs/development/python-modules/llm-cmd/default.nix
index e883cb87ecbc..30b1cd22250c 100644
--- a/pkgs/development/python-modules/llm-cmd/default.nix
+++ b/pkgs/development/python-modules/llm-cmd/default.nix
@@ -27,13 +27,11 @@ buildPythonPackage rec {
 
   # Only needed until https://github.com/simonw/llm-cmd/pull/18 is merged and released
   patches = [ ./fix-test.patch ];
-  build-system = [
-    setuptools
-    # Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
-    llm
-  ];
+
+  build-system = [ setuptools ];
 
   dependencies = [
+    llm
     prompt-toolkit
     pygments
   ];
@@ -53,6 +51,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/simonw/llm-cmd";
     changelog = "https://github.com/simonw/llm-cmd/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ erethon ];
+    maintainers = with lib.maintainers; [
+      erethon
+      philiptaron
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/llm-command-r/default.nix b/pkgs/development/python-modules/llm-command-r/default.nix
index af96a7e8d057..386973b2df4a 100644
--- a/pkgs/development/python-modules/llm-command-r/default.nix
+++ b/pkgs/development/python-modules/llm-command-r/default.nix
@@ -23,13 +23,13 @@ buildPythonPackage rec {
     hash = "sha256-PxICRds9NJQP64HwoL7Oxd39yaIrMdAyQEbhaumJCgo=";
   };
 
-  build-system = [
-    setuptools
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cohere
     llm
   ];
 
-  dependencies = [ cohere ];
-
   nativeCheckInputs = [
     pytestCheckHook
     pytest-recording
diff --git a/pkgs/development/python-modules/llm-deepseek/default.nix b/pkgs/development/python-modules/llm-deepseek/default.nix
index 8ff63bd96064..c0cb3668dc7f 100644
--- a/pkgs/development/python-modules/llm-deepseek/default.nix
+++ b/pkgs/development/python-modules/llm-deepseek/default.nix
@@ -19,12 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-yrNvIGnU9Q/0H786DsM0wGEwfxZYIk8IXhqC4mWaQAA=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_deepseek" ];
 
diff --git a/pkgs/development/python-modules/llm-docs/default.nix b/pkgs/development/python-modules/llm-docs/default.nix
index 8ed974571607..c1d07f8b1c49 100644
--- a/pkgs/development/python-modules/llm-docs/default.nix
+++ b/pkgs/development/python-modules/llm-docs/default.nix
@@ -19,10 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-+Ha6L2h8p/yA073MfO2Uvd6E4bKA2xAvaBWtvjqglOw=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_docs" ];
 
diff --git a/pkgs/development/python-modules/llm-echo/default.nix b/pkgs/development/python-modules/llm-echo/default.nix
index 756c4a743b46..588b6f64909d 100644
--- a/pkgs/development/python-modules/llm-echo/default.nix
+++ b/pkgs/development/python-modules/llm-echo/default.nix
@@ -21,10 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-4345UIyaQx+mYYBAFD5AaX5YbjbnJQt8bKMD5Vl8VJc=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/llm-fragments-github/default.nix b/pkgs/development/python-modules/llm-fragments-github/default.nix
index 9b8c3d3c5a72..cf4874805c79 100644
--- a/pkgs/development/python-modules/llm-fragments-github/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-github/default.nix
@@ -19,11 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-7i1WRix5AAEG5EXJqtaU+QY56aL0SePdqz84z+C+iYM=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
-  dependencies = [ ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_fragments_github" ];
 
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/default.nix b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
index d30135b5378d..c07f2cbc4f01 100644
--- a/pkgs/development/python-modules/llm-fragments-pypi/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
@@ -20,11 +20,12 @@ buildPythonPackage rec {
     hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8=";
   };
 
-  build-system = [
-    hatchling
+  build-system = [ hatchling ];
+
+  dependencies = [
+    httpx
     llm
   ];
-  dependencies = [ httpx ];
 
   pythonImportsCheck = [ "llm_fragments_pypi" ];
 
diff --git a/pkgs/development/python-modules/llm-fragments-reader/default.nix b/pkgs/development/python-modules/llm-fragments-reader/default.nix
index 72aa5aaea539..b3b5aa4ad9ce 100644
--- a/pkgs/development/python-modules/llm-fragments-reader/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-reader/default.nix
@@ -25,10 +25,9 @@ buildPythonPackage rec {
     hash = "sha256-2xdvOpMGsTtnerrlGiVSHoJrM+GQ7Zgv+zn2SAwYAL4=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/llm-fragments-symbex/default.nix b/pkgs/development/python-modules/llm-fragments-symbex/default.nix
index 2c1611ab2e27..c476c6a9ec6e 100644
--- a/pkgs/development/python-modules/llm-fragments-symbex/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-symbex/default.nix
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-LECMHv4tGMCY60JU68y2Sfxp97Px7T/RJVhYVDSFCy4=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ symbex ];
+  dependencies = [
+    llm
+    symbex
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix
index 4b746366fbdb..ab0976f2a97b 100644
--- a/pkgs/development/python-modules/llm-gemini/default.nix
+++ b/pkgs/development/python-modules/llm-gemini/default.nix
@@ -25,14 +25,12 @@ buildPythonPackage rec {
     hash = "sha256-aCP0YjcghzpgceuZRKGTN15wm7OIPCwcJAJJBxh78f4=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     httpx
     ijson
+    llm
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/llm-gguf/default.nix b/pkgs/development/python-modules/llm-gguf/default.nix
index 6d72228e943a..1a399f3861e6 100644
--- a/pkgs/development/python-modules/llm-gguf/default.nix
+++ b/pkgs/development/python-modules/llm-gguf/default.nix
@@ -25,13 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-ihMOiQnTfgZKICVDoQHLOMahrd+GiB+HwWFBMyIcs0A=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     httpx
+    llm
     llama-cpp-python
   ];
 
diff --git a/pkgs/development/python-modules/llm-git/default.nix b/pkgs/development/python-modules/llm-git/default.nix
index 39c66027c601..957a54581de6 100644
--- a/pkgs/development/python-modules/llm-git/default.nix
+++ b/pkgs/development/python-modules/llm-git/default.nix
@@ -31,12 +31,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    llm
   ];
 
   dependencies = [
     click
     deepmerge
+    llm
     pyyaml
     rich
     pygments
diff --git a/pkgs/development/python-modules/llm-grok/default.nix b/pkgs/development/python-modules/llm-grok/default.nix
index 6c8baca68f7f..a2c5ac03adc3 100644
--- a/pkgs/development/python-modules/llm-grok/default.nix
+++ b/pkgs/development/python-modules/llm-grok/default.nix
@@ -25,12 +25,10 @@ buildPythonPackage rec {
     hash = "sha256-OeeU/53XKucLCtGvnl5RWc/QqF0TprB/SO8pnnK5fdw=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
+    llm
     httpx
     httpx-sse
     rich
diff --git a/pkgs/development/python-modules/llm-groq/default.nix b/pkgs/development/python-modules/llm-groq/default.nix
index 8f2a04aa4f72..55364db0921b 100644
--- a/pkgs/development/python-modules/llm-groq/default.nix
+++ b/pkgs/development/python-modules/llm-groq/default.nix
@@ -22,10 +22,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    llm
   ];
 
-  dependencies = [ groq ];
+  dependencies = [
+    groq
+    llm
+  ];
 
   pythonImportsCheck = [ "llm_groq" ];
 
diff --git a/pkgs/development/python-modules/llm-hacker-news/default.nix b/pkgs/development/python-modules/llm-hacker-news/default.nix
index 3029de613c74..6c481e0212b6 100644
--- a/pkgs/development/python-modules/llm-hacker-news/default.nix
+++ b/pkgs/development/python-modules/llm-hacker-news/default.nix
@@ -19,11 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-pywx9TAN/mnGR6Vv6YsPhLO4R5Geagw/bcydQjvTH5s=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
-  dependencies = [ ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_hacker_news" ];
 
diff --git a/pkgs/development/python-modules/llm-jq/default.nix b/pkgs/development/python-modules/llm-jq/default.nix
index 64c3149e8b96..f88e6ae566f4 100644
--- a/pkgs/development/python-modules/llm-jq/default.nix
+++ b/pkgs/development/python-modules/llm-jq/default.nix
@@ -18,12 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-Mf/tbB9+UdmSRpulqv5Wagr8wjDcRrNs2741DNQZhO4=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_jq" ];
 
diff --git a/pkgs/development/python-modules/llm-llama-server/default.nix b/pkgs/development/python-modules/llm-llama-server/default.nix
index e6fcb5b3498c..cb0887020d41 100644
--- a/pkgs/development/python-modules/llm-llama-server/default.nix
+++ b/pkgs/development/python-modules/llm-llama-server/default.nix
@@ -21,12 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-jtFSfGu3JhNUfTsspY+OFLTMt9jQrh6R05sK9KBOKTE=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -39,7 +36,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "LLM plugin providing access to Mistral models using the Mistral API";
-    homepage = "Interact with llama-server models";
+    homepage = "https://github.com/simonw/llm-llama-server";
     changelog = "https://github.com/simonw/llm-llama-server/releases/tag/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ philiptaron ];
diff --git a/pkgs/development/python-modules/llm-mistral/default.nix b/pkgs/development/python-modules/llm-mistral/default.nix
index 1aa42abacc6e..773868d5a875 100644
--- a/pkgs/development/python-modules/llm-mistral/default.nix
+++ b/pkgs/development/python-modules/llm-mistral/default.nix
@@ -27,12 +27,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    llm
   ];
 
   dependencies = [
     httpx
     httpx-sse
+    llm
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index fa7de12f294c..0df527ee0241 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -32,14 +32,11 @@ buildPythonPackage rec {
     hash = "sha256-iwrDqrPt/zwXypBwD7zDAcen4fQq6PXl7Xj5VUL2KWA=";
   };
 
-  build-system = [
-    setuptools
-    # Follows the reasoning from https://github.com/NixOS/nixpkgs/pull/327800#discussion_r1681586659 about including llm in build-system
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     click
+    llm
     ollama
     pydantic
   ];
diff --git a/pkgs/development/python-modules/llm-openai-plugin/default.nix b/pkgs/development/python-modules/llm-openai-plugin/default.nix
index 7543a341f3c1..49fd64c6acd2 100644
--- a/pkgs/development/python-modules/llm-openai-plugin/default.nix
+++ b/pkgs/development/python-modules/llm-openai-plugin/default.nix
@@ -25,12 +25,10 @@ buildPythonPackage rec {
     hash = "sha256-UoUxCwR+qOUufHuS0gw6A5Q7sB77VO4HYuMjFGN7mhA=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
+    llm
     openai
   ];
 
diff --git a/pkgs/development/python-modules/llm-openrouter/default.nix b/pkgs/development/python-modules/llm-openrouter/default.nix
index 9c576d88e536..ada713681c69 100644
--- a/pkgs/development/python-modules/llm-openrouter/default.nix
+++ b/pkgs/development/python-modules/llm-openrouter/default.nix
@@ -27,11 +27,11 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    llm
   ];
 
   dependencies = [
     httpx
+    llm
     openai
   ];
 
diff --git a/pkgs/development/python-modules/llm-pdf-to-images/default.nix b/pkgs/development/python-modules/llm-pdf-to-images/default.nix
index bdf5d4ae785f..fd39db4914dd 100644
--- a/pkgs/development/python-modules/llm-pdf-to-images/default.nix
+++ b/pkgs/development/python-modules/llm-pdf-to-images/default.nix
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     hash = "sha256-UWtCPdKrGE93NNjCroct5fPhq1pWIkngXXtRb+BHm8k=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ pymupdf ];
+  dependencies = [
+    llm
+    pymupdf
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/llm-sentence-transformers/default.nix b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
index a9a702d0fa07..db7439998e87 100644
--- a/pkgs/development/python-modules/llm-sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/llm-sentence-transformers/default.nix
@@ -23,13 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-FDDMItKFEYEptiL3EHKgKVxClqRU9RaM3uD3xP0F4OM=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     einops
+    llm
     sentence-transformers
   ];
 
diff --git a/pkgs/development/python-modules/llm-templates-fabric/default.nix b/pkgs/development/python-modules/llm-templates-fabric/default.nix
index 979f9f8bae0f..c966d21915ea 100644
--- a/pkgs/development/python-modules/llm-templates-fabric/default.nix
+++ b/pkgs/development/python-modules/llm-templates-fabric/default.nix
@@ -19,12 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-tfkSjeT9WstUsNCtVr3fMzqELFCtfYphqf3xFGvHaV0=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_templates_fabric" ];
 
diff --git a/pkgs/development/python-modules/llm-templates-github/default.nix b/pkgs/development/python-modules/llm-templates-github/default.nix
index 58a78512959d..ccf0d937f05d 100644
--- a/pkgs/development/python-modules/llm-templates-github/default.nix
+++ b/pkgs/development/python-modules/llm-templates-github/default.nix
@@ -19,12 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-SFXrvpKrvfIP0JmXQt6OZ52kne4AEtiggbshyac9XQc=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_templates_github" ];
 
diff --git a/pkgs/development/python-modules/llm-tools-datasette/default.nix b/pkgs/development/python-modules/llm-tools-datasette/default.nix
index 5229c71bb6ea..4320fa797a1e 100644
--- a/pkgs/development/python-modules/llm-tools-datasette/default.nix
+++ b/pkgs/development/python-modules/llm-tools-datasette/default.nix
@@ -23,10 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-Us9bPk2qpTlgJqQ0Cl9QdeqW+h8j+pmnkriM0WXEyyA=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     llm-echo
diff --git a/pkgs/development/python-modules/llm-tools-quickjs/default.nix b/pkgs/development/python-modules/llm-tools-quickjs/default.nix
index b8f934c5a5b6..ad447a01ade1 100644
--- a/pkgs/development/python-modules/llm-tools-quickjs/default.nix
+++ b/pkgs/development/python-modules/llm-tools-quickjs/default.nix
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     hash = "sha256-Si3VcHnRUj8Q/N8pRhltPOM6K64TX9DBH/u4WQxQJjQ=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ quickjs ];
+  dependencies = [
+    llm
+    quickjs
+  ];
 
   nativeCheckInputs = [
     llm-echo
diff --git a/pkgs/development/python-modules/llm-tools-simpleeval/default.nix b/pkgs/development/python-modules/llm-tools-simpleeval/default.nix
index 50a9a3f9ba24..06b5a31f8ea5 100644
--- a/pkgs/development/python-modules/llm-tools-simpleeval/default.nix
+++ b/pkgs/development/python-modules/llm-tools-simpleeval/default.nix
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     hash = "sha256-IOmYu7zoim7Co/xIm5VLaGkCPI0o+2Nb2Pu3U2fH0BU=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ simpleeval ];
+  dependencies = [
+    llm
+    simpleeval
+  ];
 
   nativeCheckInputs = [
     llm-echo
diff --git a/pkgs/development/python-modules/llm-tools-sqlite/default.nix b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
index 283084b8efc0..494c4c5994e5 100644
--- a/pkgs/development/python-modules/llm-tools-sqlite/default.nix
+++ b/pkgs/development/python-modules/llm-tools-sqlite/default.nix
@@ -22,10 +22,9 @@ buildPythonPackage rec {
     hash = "sha256-VAmK4cXzZWTWCU92TwMdhNJPvYPZ88t5BZe8vo60SZY=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ llm ];
 
   nativeCheckInputs = [
     llm-echo
diff --git a/pkgs/development/python-modules/llm-venice/default.nix b/pkgs/development/python-modules/llm-venice/default.nix
index 8885b55595ee..df24b6a20967 100644
--- a/pkgs/development/python-modules/llm-venice/default.nix
+++ b/pkgs/development/python-modules/llm-venice/default.nix
@@ -19,12 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-vsb3oXGr+2FDJnTwYomICfald1ptben28hAJ8ypKiBI=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   # Reaches out to the real API
   doCheck = false;
diff --git a/pkgs/development/python-modules/llm-video-frames/default.nix b/pkgs/development/python-modules/llm-video-frames/default.nix
index b519b37bcb24..1591ead64395 100644
--- a/pkgs/development/python-modules/llm-video-frames/default.nix
+++ b/pkgs/development/python-modules/llm-video-frames/default.nix
@@ -19,12 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-brTyBymoFuvSQzsD/4aWzFGCrh3yEmWbpsUNGKT9dcU=";
   };
 
-  build-system = [
-    setuptools
-    llm
-  ];
+  build-system = [ setuptools ];
 
-  dependencies = [ ];
+  dependencies = [ llm ];
 
   pythonImportsCheck = [ "llm_video_frames" ];
 
diff --git a/pkgs/development/python-modules/symbex/default.nix b/pkgs/development/python-modules/symbex/default.nix
index 7790641ab4fc..47405f4b8223 100644
--- a/pkgs/development/python-modules/symbex/default.nix
+++ b/pkgs/development/python-modules/symbex/default.nix
@@ -36,9 +36,9 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "Ask questions of LLM documentation using LLM";
-    homepage = "https://github.com/simonw/llm-docs";
-    changelog = "https://github.com/simonw/llm-docs/releases/tag/${version}/CHANGELOG.md";
+    description = "Find the Python code for specified symbols";
+    homepage = "https://github.com/simonw/symbex";
+    changelog = "https://github.com/simonw/symbex/releases/tag/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ philiptaron ];
   };

From 837cff79ca793c40db34781fcbd27c81949dbf8c Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 30 May 2025 17:24:34 -0700
Subject: [PATCH 0342/1497] llm: include the tests for all plugins as part of
 passthru.tests

---
 pkgs/development/python-modules/llm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index f237f3fbbecc..70d606ec556b 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -231,6 +231,9 @@ let
       mkPluginTest = plugin: {
         ${plugin.pname} = callPackage ./mk-plugin-test.nix { inherit llm plugin; };
       };
+
+      # include tests for all the plugins
+      tests = lib.mergeAttrsList (map (name: python.pkgs.${name}.tests) withPluginsArgNames);
     };
 
     meta = {

From 2b4d3ea2ddd4dcc6dd82e9d222e4c23dab732d9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 05:31:06 +0000
Subject: [PATCH 0343/1497] sysdig-cli-scanner: 1.22.1 -> 1.22.2

---
 .../sysdig-cli-scanner.versions.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index 979f7616ab4a..520c3728fbce 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
 {
-  version = "1.22.1";
+  version = "1.22.2";
 
   x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-ogQ7NhpU0KZkcZXWSBX4VaTWwXz5WWMXhqZ9abHX6+Y=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.2/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-YQxTMOqwtqEXfjRsEfpFGaFJIHox/CSNTUJ5YuFTMvk=";
   };
 
   aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-apj4GqN7sdZSzpk+FvqcYJLgh+UlcJgPUdXhhurFENQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.2/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-pz31MLVFn8Pv94wAGujuQK7b0AMjIQn+hTrTFpR5DeM=";
   };
 
   x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-o5AYd3/8Ot7+EtQ2SXaV72JbR/hI/5Pu7g2jdHZYepo=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.2/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-Op8Z06UZIDOnjB6Vv4/TKMcRbseA/b+Z96sAbINSB04=";
   };
 
   aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-FDkqWstWMTtF0QLWk+iadJr7aRHRnpiatqAeoHftVDk=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.2/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-hink42tCUHCa7vHJzfLgMseofp+YaBdVX2HO7T8NFJo=";
   };
 }

From 6e62f90071e4906dc1efb5502f1cf9f6d3f23f16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 06:53:24 +0000
Subject: [PATCH 0344/1497] python3Packages.coiled: 1.96.1 -> 1.100.0

---
 pkgs/development/python-modules/coiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index e26e6255e1f0..18daf72ce8f7 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.96.1";
+  version = "1.100.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iyjZGg7RNaguHVZFMSS65OiO0HC3bqZL7yeOaSGr+IE=";
+    hash = "sha256-kB5kWIFQPxTcozVqfjMt58b9tAx9upTga4NdfplbbtI=";
   };
 
   build-system = [

From 14abe2ce8f6d4aaa74b2f23eb6a0ea85622a6c2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 08:33:00 +0000
Subject: [PATCH 0345/1497] zam-plugins: 4.3 -> 4.4

---
 pkgs/by-name/za/zam-plugins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index 4dde2a42bf9e..70cafc45cf4b 100644
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zam-plugins";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchFromGitHub {
     owner = "zamaudio";
     repo = "zam-plugins";
     rev = version;
-    hash = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
+    hash = "sha256-pjnhDavKnyQjPF4nUO+j1J+Qtw8yIYMY9A5zBMb4zFU=";
     fetchSubmodules = true;
   };
 

From 9b336fcc61a970432022f9abfbcb5c3e21bd045b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sun, 1 Jun 2025 09:53:46 +0200
Subject: [PATCH 0346/1497] signal-desktop: 7.54.0 -> 7.56.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../dont-strip-absolute-paths.patch           | 14 ++++++++++++++
 .../si/signal-desktop/libsignal-node.nix      | 19 ++++++++++---------
 pkgs/by-name/si/signal-desktop/package.nix    | 16 ++++++++--------
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |  6 +++---
 .../si/signal-desktop/signal-sqlcipher.nix    |  4 ++--
 .../si/signal-desktop/webrtc-sources.json     |  4 ++--
 6 files changed, 39 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch

diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
new file mode 100644
index 000000000000..103ee8af45b6
--- /dev/null
+++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
@@ -0,0 +1,14 @@
+diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
+index c983fc3..2ab06dc 100755
+--- a/node/build_node_bridge.py
++++ b/node/build_node_bridge.py
+@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:
+     cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'
+     # Enable ARMv8 cryptography acceleration when available
+     cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'
+-    # Strip absolute paths
+-    for path in build_helpers.rust_paths_to_remap():
+-        cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='
+ 
+     # If set (below), will post-process the build library using this instead of just `cp`-ing it.
+     objcopy = None
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 00bfe375f805..3d2aee9a4498 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.70.0";
+  version = "0.72.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44=";
+    hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs=";
+  cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-djk+YGZ/eUq6MXjUEE47bgKnQlUSuaoUPx8hUMtjvyQ=";
+    hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E=";
   };
 
   nativeBuildInputs = [
@@ -56,9 +56,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
-  patchPhase = ''
-    runHook prePatch
-
+  patches = [
+    # This is used to strip absolute paths of dependencies to avoid leaking info about build machine. Nix builders
+    # already solve this problem by chrooting os this is not needed.
+    ./dont-strip-absolute-paths.patch
+  ];
+  postPatch = ''
     substituteInPlace node/binding.gyp \
       --replace-fail "'--out-dir', '<(PRODUCT_DIR)/'," \
                      "'--out-dir', '$out/lib/<(NODE_OS_NAME)-<(target_arch)/'," \
@@ -68,8 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     substituteInPlace node/build_node_bridge.py \
       --replace-fail "dst_base = 'libsignal_client_%s_%s' % (node_os_name, node_arch)" \
                      "dst_base = '@signalapp+libsignal-client'"
-
-    runHook postPatch
   '';
 
   buildPhase = ''
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 8cbe760f89e5..10c160447c3e 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -3,7 +3,7 @@
   lib,
   nodejs_22,
   pnpm_10,
-  electron_35,
+  electron_36,
   python3,
   makeWrapper,
   callPackage,
@@ -19,7 +19,7 @@
 let
   nodejs = nodejs_22;
   pnpm = pnpm_10.override { inherit nodejs; };
-  electron = electron_35;
+  electron = electron_36;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
   signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -48,13 +48,13 @@ let
     '';
   });
 
-  version = "7.54.0";
+  version = "7.56.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-dv1Yi7gSd7kY3MSrsPjcaf2hAEq6Y+XoWtlBfvd86ac=";
+    hash = "sha256-BrgBlDEgb08oX7Mh/P4nuoM+dkSDpB45zOtDNMYeZr0=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ let
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
-      hash = "sha256-TuPyRVNFIlR0A4YHMpQsQ6m+lm2fsp79FzQ1P5qqjIc=";
+      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
     };
 
     strictDeps = true;
@@ -116,15 +116,15 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     hash =
       if withAppleEmojis then
-        "sha256-Kdg0+kLEDFobWEEhJgKuaou/pYwn1dTugye7OcMYfEQ="
+        "sha256-RP3d1t4bbvehdCDSL3bHrlJEnn65TDViI5jVjSiuJw8="
       else
-        "sha256-cit/Hn7L6qmfIJCDF2wlx/4aKygRYy+zvBQGX6Mg+og=";
+        "sha256-KJvc+kVcwRKsUVW3lK7fPXUSqDQlJFPbYAzQjhFtfoU=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1747170390;
+    SOURCE_DATE_EPOCH = 1748456277;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 782c518ea443..ee08a2da289c 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.51.0";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PLrGLW6pDoCNpbWASxAqockAJRoeBrkBdxNOHYrQu4s=";
+    hash = "sha256-Ao1mFJYPnV3lfg4SERwq4dGnBhOVI9pwsqPAsUtV/iY=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-u38VOV2xdNG1WFox+SWT9ejJD1TjK0yAI6lCB9r75iY=";
+  cargoHash = "sha256-mO9t4ZDDM5Y9cMkmdrYrdGYukN1xfGogPSNq+S1t4Us=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
index 225876e18e7c..6f53f67100ca 100644
--- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
+++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "node-sqlcipher";
-  version = "2.0.1";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "node-sqlcipher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-15t2HuEYdCxShK703/z3bb1VCgSNpziaK5+wM3TqSHg=";
+    hash = "sha256-H5/+XcXnINRL5BWItWx6YaPP46+k1xTbyfDqHPCRDXk=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 4e94f9df5248..7207ea4e2d9d 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,10 +1,10 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-yomovlwRmrzsN+dvmUgOM6pzBTH41QuHQXnEJBhQglY=",
+            "hash": "sha256-AFMJmIo7O4fYrVWABciQphTxHQSj4CdfhluIIPpPWAw=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "6998b"
+            "tag": "6998c"
         },
         "fetcher": "fetchFromGitHub"
     },

From 96895658f5e91a29b8f300b329d0e1cbafc0ead9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 09:27:52 +0000
Subject: [PATCH 0347/1497] checkstyle: 10.24.0 -> 10.25.0

---
 pkgs/by-name/ch/checkstyle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index 30360005a572..6093c9d00b87 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.24.0";
+  version = "10.25.0";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-sREZA1/H9S3rXXW6qjyVwpLY75JQCqBooMEATUssvYM=";
+    sha256 = "sha256-CnzGj5jVQIzv5BZ5h0cDLJZrB0DgdRXWIYdKbzWtOA0=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 14918d8f887b0135a6af32ac3c09bc6e6f3f2ae8 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Sun, 25 May 2025 20:25:11 +0400
Subject: [PATCH 0348/1497] libusb-package: init at 1.0.26.3

This is a helper library for usb access from python scripts. It is added
here in support of the cflib (crazyflie library) used to controll the
small crazyflie nano drones.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 .../python-modules/libusb-package/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/libusb-package/default.nix

diff --git a/pkgs/development/python-modules/libusb-package/default.nix b/pkgs/development/python-modules/libusb-package/default.nix
new file mode 100644
index 000000000000..7cc3d6602712
--- /dev/null
+++ b/pkgs/development/python-modules/libusb-package/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  tomli,
+  importlib-resources,
+  libusb1,
+}:
+
+buildPythonPackage rec {
+  pname = "libusb-package";
+  version = "1.0.26.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pyocd";
+    repo = "libusb-package";
+    tag = "v${version}";
+    hash = "sha256-4zTyaidpSlledTcEztWzRgwj43oNV7xWrhMXCE9Qz3k=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    tomli
+  ];
+
+  dependencies = [
+    importlib-resources
+    libusb1
+  ];
+
+  meta = {
+    description = "Python package for simplified libusb distribution and usage with pyOCD";
+    homepage = "https://github.com/pyocd/libusb-package";
+    changelog = "https://github.com/pyocd/libusb-package/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.brianmcgillion ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4c9004ae04d..a7a1e6b8d340 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8041,6 +8041,10 @@ self: super: with self; {
   libtorrent-rasterbar =
     (toPythonModule (pkgs.libtorrent-rasterbar.override { python3 = python; })).python;
 
+  libusb-package = callPackage ../development/python-modules/libusb-package {
+    inherit (pkgs) libusb1;
+  };
+
   libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };
 
   libusbsio = callPackage ../development/python-modules/libusbsio { inherit (pkgs) libusbsio; };

From db1bfc2878f2b5628bfc11cf27f52b349975fd25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 09:50:08 +0000
Subject: [PATCH 0349/1497] hoppscotch: 25.4.2-0 -> 25.5.1-0

---
 pkgs/by-name/ho/hoppscotch/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index 11fed297344e..1f6767fca16b 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -8,22 +8,22 @@
 
 let
   pname = "hoppscotch";
-  version = "25.4.2-0";
+  version = "25.5.1-0";
 
   src =
     fetchurl
       {
         aarch64-darwin = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
-          hash = "sha256-f3Ar5QUm1MJ/kfLRsjxAU1mudpJhU63uxEdu17Y2rmo=";
+          hash = "sha256-03WSc4/udaShc9te7Xv09gCgMv9i2/WvK55mpj4AK5k=";
         };
         x86_64-darwin = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
-          hash = "sha256-Q21XD+LWx6b/2e4qUabDpjxaJ7h1yz2T4ZbyIDWAljE=";
+          hash = "sha256-1D/ZW+KxbmJtt62uQOdZZwiKk+6r1hhviwe7CZxaXns=";
         };
         x86_64-linux = {
           url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
-          hash = "sha256-Y+zvpTfsVwvM8clyTeE8bFCJfsOTJkkGOWzzVQtZrYI=";
+          hash = "sha256-REj9VtAggS6PcGSh3K+GByxhUk6elKoHsSck42U9IdA=";
         };
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From f33280111dd32764307177b63595b130cf238f50 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sun, 25 May 2025 20:41:33 +0200
Subject: [PATCH 0350/1497] firefly-iii: 6.2.10 -> 6.2.16

---
 pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 0e080d5510ea..770653eaf4ed 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.2.10";
+  version = "6.2.16";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3XXUhls4Oi/0PGuunMLk6Wvla18fvHHI78qKsweFTE=";
+    hash = "sha256-SFl2uGHunF/IjhO5XoDCh1bJ5eIWRosv7HFDMXyknvI=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-pYnBiuzuTPP+7KSHUOj9mt+TTzgH85KeavXUfMN1ctI=";
+    vendorHash = "sha256-C7lsSon9y286DoAppteZ3fY0qaWVTe66nyFckyrnylk=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-BX8YYnewcnnOQa788DPSIID5Drqw7XhYGHcevPy0JrA=";
+    hash = "sha256-qymMgMXjKll3awXFL/Lo8DloPyqAaxoS2Lw8HBaar9g=";
   };
 
   preInstall = ''

From ae49c563ac95a731c2ac95e14adb0bddf1b34d0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 11:15:58 +0000
Subject: [PATCH 0351/1497] balena-cli: 21.1.14 -> 22.0.5

---
 pkgs/by-name/ba/balena-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 075467650e1a..65305271b53c 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "21.1.14";
+  version = "22.0.5";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-6KiH7hgyltvWv/ZALnYZ9LkkTEp5aJ6X/3fNwcj0qck=";
+    hash = "sha256-CJZY7mcWKYzB3+ifsm8/g+XcKPaIc7ca2Za7Qb/GbBE=";
   };
 
-  npmDepsHash = "sha256-jBxF179wdnH5j6cZLzuFm2XKd2n0iEjc+W1X+HGdJPg=";
+  npmDepsHash = "sha256-x9pQqX/nLL4rykA6jgL4f0tHKWEJmR2QUeg3Lfy78D0=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 198bdbc88819d2d5f8e8fde923ce2ec6b5f09b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 11:40:38 +0000
Subject: [PATCH 0352/1497] mapproxy: 4.1.1 -> 4.1.2

---
 pkgs/by-name/ma/mapproxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 1afe2d500365..c59573b4bb09 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mapproxy";
-  version = "4.1.1";
+  version = "4.1.2";
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mapproxy";
     repo = "mapproxy";
     tag = version;
-    hash = "sha256-rsravNSmvx1/291VvfRm0Yx1eg32UJd+egeG4S2SNnk=";
+    hash = "sha256-sh0kViv1Ax/2YPL2ON+X03d5Moa2oPWhb4Rp6Ni5AAY=";
   };
 
   prePatch = ''

From 1462abddeaf142100f396b244020fec5eb7ec2d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 11:45:40 +0000
Subject: [PATCH 0353/1497] vscode-extensions.sourcery.sourcery: 1.36.0 ->
 1.37.0

---
 .../editors/vscode/extensions/sourcery.sourcery/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
index 0a1efe2ea845..93a8d164f8c5 100644
--- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "sourcery";
     publisher = "sourcery";
-    version = "1.36.0";
-    hash = "sha256-HbOPoDu0R47US+UtK7i2BLiYgUhnNMD1i6Ibo8h3Auk=";
+    version = "1.37.0";
+    hash = "sha256-ovCxcr1m3GmRu45hr5DG781xkQdANbQYLvV2gFhG4eQ=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

From d893a789d48801374f0d1b20a3c9393e387765e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 12:43:20 +0000
Subject: [PATCH 0354/1497] python3Packages.corallium: 0.3.3 -> 2.1.1

---
 pkgs/development/python-modules/corallium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix
index ca85cdde1f6f..42681e446060 100644
--- a/pkgs/development/python-modules/corallium/default.nix
+++ b/pkgs/development/python-modules/corallium/default.nix
@@ -11,14 +11,14 @@
 }:
 buildPythonPackage rec {
   pname = "corallium";
-  version = "0.3.3";
+  version = "2.1.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "KyleKing";
     repo = pname;
-    rev = version;
-    hash = "sha256-fZzm3o8EwegNG+sYn8lbPz60NMyA/OzGFUf/J/lbGbI=";
+    tag = version;
+    hash = "sha256-0P8qmX+1zigL4jaA4TTuqAzFkyhQUfdGmPLxkFnT0qE=";
   };
 
   build-system = [

From c65ce3613cdd21a3cf421c22060124764a4b2001 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 24 May 2025 17:05:35 +0300
Subject: [PATCH 0355/1497] arc-browser: 1.91.2-62278 -> 1.97.0-63507

---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 957c24aafd49..4b99df96fc20 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.91.2-62278";
+  version = "1.97.0-63507";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-8ry7FomJem6rMv3q6w0LffWl3bDHSdyxlWzDf58oNnc=";
+    hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";
   };
 
   nativeBuildInputs = [ undmg ];

From 19c0c5cb3218c4d35e7ae0fdc10a15f7986ff961 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 12:55:49 +0000
Subject: [PATCH 0356/1497] roundcube: 1.6.10 -> 1.6.11

---
 pkgs/servers/roundcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index b88ba3a60819..b10167d270bb 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.6.10";
+  version = "1.6.11";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "sha256-A8+sL0lN2Zwlw177CtTTM/JI4y8l9CBPvI8nMb+68OQ=";
+    sha256 = "sha256-ojDkMgZVVb+ie+o/z0rGcvI1nvKK2E9ZReo8z3AudGY=";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

From 7bc1aa3262a8c0c38ac768396d922801cccb6ceb Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sun, 1 Jun 2025 04:21:40 +0200
Subject: [PATCH 0357/1497] offrss: drop due to age and lack of maintainer

---
 doc/release-notes/rl-2511.section.md |  2 +-
 pkgs/by-name/of/offrss/package.nix   | 58 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/of/offrss/package.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index dc12ad11a466..8672b0c2ec61 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -13,7 +13,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
diff --git a/pkgs/by-name/of/offrss/package.nix b/pkgs/by-name/of/offrss/package.nix
deleted file mode 100644
index 0d60b2d6e3c7..000000000000
--- a/pkgs/by-name/of/offrss/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  curl,
-  libmrss,
-  podofo,
-  libiconv,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "offrss";
-  version = "1.3";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp offrss $out/bin
-  '';
-
-  buildInputs =
-    [
-      curl
-      libmrss
-    ]
-    ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
-    ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv;
-
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path';
-  #     offrss.o:offrss.h:75: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-function-declaration";
-
-  configurePhase =
-    ''
-      substituteInPlace Makefile \
-        --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isLinux) ''
-      sed 's/#EXTRA/EXTRA/' -i Makefile
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      sed 's/^PDF/#PDF/' -i Makefile
-    '';
-
-  src = fetchurl {
-    url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5oIiDLdFrnEfPfSiwCv3inIcxK+bbgbMT1VISVAPfKo=";
-  };
-
-  meta = {
-    homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
-    description = "Offline RSS/Atom reader";
-    license = lib.licenses.agpl3Plus;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-    mainProgram = "offrss";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1b2cc27a6519..6c4ebfde14c3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1390,6 +1390,7 @@ mapAliases {
   oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
   ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
   odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
+  offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13

From 1074fecf390435d036474f482414a6ff7732efbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 13:27:33 +0000
Subject: [PATCH 0358/1497] logdy: 0.16.0 -> 0.17.0

---
 pkgs/by-name/lo/logdy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/logdy/package.nix b/pkgs/by-name/lo/logdy/package.nix
index 443331aa8dae..7489359941a9 100644
--- a/pkgs/by-name/lo/logdy/package.nix
+++ b/pkgs/by-name/lo/logdy/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "logdy";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "logdyhq";
     repo = "logdy-core";
     tag = "v${version}";
-    hash = "sha256-OpG9jgm/A++PBDQH5IYY6PyXx87QvihyZqnwhdBWZGg=";
+    hash = "sha256-779ZO9WhE3IKbHJLchCfrIepMH+GOrlQJALLpoNZvbc=";
   };
 
   vendorHash = "sha256-kFhcbBMymzlJ+2zw7l09LJfCdps26Id+VzOehqrLDWU=";

From 24f99aa552007a3ae0748f80bf51c37e21ec9d3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 13:37:49 +0000
Subject: [PATCH 0359/1497] ente-auth: 4.3.5 -> 4.3.6

---
 pkgs/by-name/en/ente-auth/git-hashes.json   |   1 -
 pkgs/by-name/en/ente-auth/package.nix       |   4 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 111 ++++++++++----------
 3 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index ff429e3de18f..00eb4fd6c67e 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,6 +1,5 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
-  "flutter_secure_storage_linux": "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=",
   "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index f5531a2fedbd..844fa3b17676 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -18,14 +18,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.3.5";
+  version = "4.3.6";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-kM1y3Q5Z8J84qHhki9A+I/uY7xYQNMlfh2ZhxzpUBHM=";
+    hash = "sha256-6S0sgxiPrakqtQ/KoEKR10yWxOk6Rs5MOHjFZXkAbcg=";
   };
 
   sourceRoot = "${src.name}/auth";
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 7656e78bcddf..05c9729383a4 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,17 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
+      "version": "76.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.2"
+      "version": "0.3.3"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -30,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "6.11.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -110,11 +110,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.12.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -160,11 +160,11 @@
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
@@ -250,11 +250,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -290,11 +290,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -310,11 +310,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "confetti": {
       "dependency": "direct main",
@@ -541,11 +541,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     "ffi": {
       "dependency": "direct main",
@@ -841,15 +841,14 @@
       "version": "9.2.2"
     },
     "flutter_secure_storage_linux": {
-      "dependency": "direct overridden",
+      "dependency": "transitive",
       "description": {
-        "path": "flutter_secure_storage_linux",
-        "ref": "develop",
-        "resolved-ref": "5a5692b609b3886cdd49b2ed06b9c079ecdff996",
-        "url": "https://github.com/mogol/flutter_secure_storage.git"
+        "name": "flutter_secure_storage_linux",
+        "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.1"
+      "source": "hosted",
+      "version": "1.2.3"
     },
     "flutter_secure_storage_macos": {
       "dependency": "transitive",
@@ -1177,21 +1176,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.8"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1277,21 +1276,21 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.2-main.4"
+      "version": "0.1.3-main.0"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1317,11 +1316,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1457,11 +1456,11 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_drawing": {
       "dependency": "transitive",
@@ -1697,21 +1696,21 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry",
-        "sha256": "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd",
+        "sha256": "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.14.2"
     },
     "sentry_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a",
+        "sha256": "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.0"
+      "version": "8.14.2"
     },
     "share_plus": {
       "dependency": "direct main",
@@ -1837,7 +1836,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1883,11 +1882,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1944,11 +1943,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1974,11 +1973,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
@@ -1994,11 +1993,11 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -2024,21 +2023,21 @@
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2244,11 +2243,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.5"
+      "version": "14.3.1"
     },
     "watcher": {
       "dependency": "transitive",
@@ -2362,7 +2361,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
+    "dart": ">=3.7.0-0 <4.0.0",
     "flutter": ">=3.24.0"
   }
 }

From ff11f6aec001a6a7acb9aace4591767e53393e94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 13:54:14 +0000
Subject: [PATCH 0360/1497] nak: 0.14.1 -> 0.14.2

---
 pkgs/by-name/na/nak/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 98d44998f805..ca3017ba9983 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nak";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = "nak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uPsZV29xjVUeq0vKsTPf/hRtjsCnjaShiabnKXm5kPY=";
+    hash = "sha256-+91warH+uvQ5jkPIxkJxsS9R83cZ1u+FKMy3xgjHIAQ=";
   };
 
-  vendorHash = "sha256-q6jdczZ8K+aJJHfN2OtW0mP4OpMbKAB16Bws2wFb6Zg=";
+  vendorHash = "sha256-HGZwcg8C9UuYu0+oPfJG4LEXIHqt+IRrDQdXtIjg0Hg=";
 
   ldflags = [
     "-s"

From 962db8079611bf6c3282197436b37af3ddbb4718 Mon Sep 17 00:00:00 2001
From: Markus Wamser <github-dev@mail2013.wamser.eu>
Date: Sun, 1 Jun 2025 15:52:47 +0200
Subject: [PATCH 0361/1497] nixosTests.ngingx-http3: fix race condition

make the client wait for its network to come up before starting test

without the wait, the client might try to access the network before its
own network stack is up, as evidenced in
https://hydra.nixos.org/build/299048133/nixlog/9/tail
---
 nixos/tests/nginx-http3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix
index 1d6cd56294be..1c0326d0f0f6 100644
--- a/nixos/tests/nginx-http3.nix
+++ b/nixos/tests/nginx-http3.nix
@@ -90,6 +90,7 @@ builtins.listToAttrs (
 
           server.wait_for_unit("nginx")
           server.wait_for_open_port(443)
+          client.wait_for_unit("network-online.target")
 
           # Check http connections
           client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")

From a86c9f454da9aa125288f0cd692e3040b5a8fb89 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 1 Jun 2025 09:08:08 -0500
Subject: [PATCH 0362/1497] act: 0.2.77 -> 0.2.78

Changelog: https://github.com/nektos/act/releases/tag/v0.2.78
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ac/act/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
index 121ad3a60415..2e181bf370f6 100644
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "0.2.77";
+  version = "0.2.78";
 in
 buildGoModule {
   pname = "act";
@@ -18,7 +18,7 @@ buildGoModule {
     owner = "nektos";
     repo = "act";
     tag = "v${version}";
-    hash = "sha256-bcqHj40lySE2xXGuUbXbH5cjQ5NoJCvjE/uX8HaKVho=";
+    hash = "sha256-S4Ev7MszuvlsUstnjOltYnZTuhzeqP/GDqMEWsFLe5Y=";
   };
 
   vendorHash = "sha256-YH5SIZ73VYqg7+sSJpvqkIlBUy1rs3uNEWiEBDRdkQw=";

From 1e76f45c065ed2216014aed09d71c86e93ac78a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 14:40:15 +0000
Subject: [PATCH 0363/1497] python3Packages.xdis: 6.1.3 -> 6.1.4

---
 pkgs/development/python-modules/xdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 88b3815bc0ee..ae87c83a9f6e 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "6.1.3";
+  version = "6.1.4";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rocky";
     repo = "python-xdis";
     tag = version;
-    hash = "sha256-fdLZg3MFMS9EIPC5EPE8DAT6K5a6l780msCfzTiZwoo=";
+    hash = "sha256-thgHaxEEXmkrJlkl9kF6ocKRrnWOuESTxQrdtM+uH1o=";
   };
 
   build-system = [

From f0bef342fb99aa347f02241ddaff862da7d1ff6a Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sat, 31 May 2025 15:39:21 +0300
Subject: [PATCH 0364/1497] git-jump: init at 0.3.1

---
 pkgs/by-name/gi/git-jump/package.nix | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/gi/git-jump/package.nix

diff --git a/pkgs/by-name/gi/git-jump/package.nix b/pkgs/by-name/gi/git-jump/package.nix
new file mode 100644
index 000000000000..f62d865f8573
--- /dev/null
+++ b/pkgs/by-name/gi/git-jump/package.nix
@@ -0,0 +1,34 @@
+{
+  fetchFromGitHub,
+  lib,
+  buildNpmPackage,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "git-jump";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "mykolaharmash";
+    repo = "git-jump";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0jX7IiYWLgzjZDEc4lXylqkHqawgnOKI4I9ShzlC+8U=";
+  };
+
+  npmDepsHash = "sha256-9f3Ws2V6li+u6qVMD3J6IHSNvG5TGvj0XfAZArgIi1w=";
+
+  postInstall = ''
+    installManPage git-jump.1
+  '';
+
+  preFixup = ''
+    rm $out/lib/node_modules/git-jump/node_modules/.bin/{tsc,tsserver}
+  '';
+
+  meta = {
+    description = "Improved navigation between Git branches";
+    homepage = "https://github.com/mykolaharmash/git-jump";
+    license = lib.licenses.mit;
+    mainProgram = "git-jump";
+    maintainers = with lib.maintainers; [ juliusfreudenberger ];
+  };
+})

From ab95fc17177a620f13baaab609c3d5687abcf82e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 23:04:57 +0000
Subject: [PATCH 0365/1497] animeko: 4.10.1 -> 4.11.1

---
 pkgs/by-name/an/animeko/deps.json   | 1813 +++++++++++++++------------
 pkgs/by-name/an/animeko/package.nix |    4 +-
 2 files changed, 1002 insertions(+), 815 deletions(-)

diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json
index 4e2cb0c59590..1b0b7a189c81 100644
--- a/pkgs/by-name/an/animeko/deps.json
+++ b/pkgs/by-name/an/animeko/deps.json
@@ -13,7 +13,6 @@
    "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E="
   },
   "androidx/annotation#annotation-jvm/1.8.1": {
-   "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=",
    "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=",
    "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ="
   },
@@ -57,35 +56,34 @@
    "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=",
    "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY="
   },
-  "androidx/collection#collection-jvm/1.5.0-beta01": {
+  "androidx/collection#collection-jvm/1.5.0": {
    "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=",
+   "module": "sha256-3eheKSUJIxtUcbsJG1dQmdT0MWHrKB6HOFA4oBYQcuY=",
+   "pom": "sha256-EcQVhk00AvYdQm5nIQFY3OGwRoBBJSaplPGCPs08s4g="
+  },
+  "androidx/collection#collection-jvm/1.5.0-beta01": {
    "module": "sha256-m9Z90440sDcxxzEBAPpp2VYEY7WO82jiTplq39WylHk=",
    "pom": "sha256-/TNZM8LOdQe4YcQsRrKMlLKMFVxsFh69V8vgrcZjE+Q="
   },
-  "androidx/collection#collection-jvm/1.5.0-beta02": {
-   "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=",
-   "module": "sha256-yWJG1TMsMZqFSrXS9FSuxp7B+OxCE8y9w8Jveoqq4Rg=",
-   "pom": "sha256-DHhItMroK4NUQVzDv8UOSBU38sDsOHLDdyi2AJNawAw="
-  },
   "androidx/collection#collection/1.4.5": {
    "module": "sha256-I34e/Faj4lqOpM7sJlWMKZhEv8U6rQb/P1PKHINeKMg=",
    "pom": "sha256-DA39zlfaULfpyifTsZv/vjuY8x3cfgPNWEz3eAmns0k="
   },
+  "androidx/collection#collection/1.5.0": {
+   "module": "sha256-v+t72E8/fdp71ztnCdSh9h9aN/hDcouuCKBn49+aCu8=",
+   "pom": "sha256-LWXI0LNtS0+q3ESv+breI9hx1xWe7fKz8C2AKzS3elc="
+  },
   "androidx/collection#collection/1.5.0-beta01": {
    "module": "sha256-zTV6fk5naCWsI4CaFLSw0HOExeNoUc58UVC3JnqLbxs=",
    "pom": "sha256-ZpkVL++tCxICWB6bwx1hXuVwby1ukelKc84D/MZuNHw="
   },
-  "androidx/collection#collection/1.5.0-beta02": {
-   "module": "sha256-XRtuakhubfGGt+zxG0YZ9qnNJjWzMoP+7vVCC7jK4lc=",
-   "pom": "sha256-dYjYKThPGuEmvP8qMD3kIZH43XcHuMyNv/NHNyGhC+A="
-  },
-  "androidx/databinding#databinding-common/8.6.1": {
+  "androidx/databinding#databinding-common/8.9.2": {
    "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=",
-   "pom": "sha256-HVKzfmoakn9cRdrzpUt3qvP+ghuVaBfYMgrZeM9HObI="
+   "pom": "sha256-73R0N4INYwD/f7BCNPJ9/EOkkxt28cYect0GvXsPrW8="
   },
-  "androidx/databinding#databinding-compiler-common/8.6.1": {
-   "jar": "sha256-9ht4WRdSaUuWDV/o+X/eSaL7ORFkf/q9bX1Wkjf8c2I=",
-   "pom": "sha256-0KpDvv3NKTdFk5QCJ0aw0l0Hq5S4njiMxd51jjbZsxs="
+  "androidx/databinding#databinding-compiler-common/8.9.2": {
+   "jar": "sha256-Gg5WpebKaOJSXYmtDJB84nhjJR5ttLmcwqIlz5WFDAU=",
+   "pom": "sha256-SiuhKeVFJWnubBpIh2qjnLiohRqbbQ5lyC8NPI0EoBo="
   },
   "androidx/datastore#datastore-core-jvm/1.1.3": {
    "jar": "sha256-Niy60fE4dKIsc2ChjrmVylKjYDeboOpa8bHPDfAxmi8=",
@@ -133,32 +131,50 @@
    "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=",
    "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic="
   },
-  "androidx/lifecycle#lifecycle-common-jvm/2.9.0-alpha08": {
-   "jar": "sha256-rLRTlzoTYO0Y2EBYDm+Ncdyr+lJ6oehZvtSE20xTNbE=",
-   "module": "sha256-9Xd8ppZxVmGZ3jhyrBFGQCR4uHe+k6CWCncnL4Y0dI4=",
-   "pom": "sha256-UJ/gyGH21JJu5935B3V2mExTRb7B/6tMBAEs5agCgGY="
+  "androidx/lifecycle#lifecycle-common-jvm/2.8.5": {
+   "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=",
+   "module": "sha256-BWg9kQ3FQdBsTJekmSs+KXGueMK1zDX2vx2OB94Olw4=",
+   "pom": "sha256-q5cbvWNFWm6QTCC8Ub19oVOMDAglIx5SvDA94KsenuA="
   },
-  "androidx/lifecycle#lifecycle-common/2.9.0-alpha08": {
-   "module": "sha256-awUTjQm0RClnOOsshSgBycz8ZB3jUWX8wIZRw9/BlvY=",
-   "pom": "sha256-gTBpAMV+VZ2TFs75W3MFH2ek74p8vxSjsLTWuN46WX4="
+  "androidx/lifecycle#lifecycle-common-jvm/2.9.0-beta01": {
+   "jar": "sha256-N9ibIQHwdKxsJgkX2rsYVgdkXuIAqjAYx8W95w7c8YQ=",
+   "module": "sha256-kirziYbvAsOhMw91T/ZSvgJm1DQI5TvUOWtp9xuknyA=",
+   "pom": "sha256-YCk+UL9I6rsOpBjfzu8CQBJtJR0EARD2FHs+UP1Gpbw="
   },
-  "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-alpha08": {
-   "jar": "sha256-c54I5HdGbNhxhLvRfEkLPrgdBN0X/otowLVJpFnlg+o=",
-   "module": "sha256-/U2AQwWz+ccQ3pZgTDaaWJzpBWzvPBLXLfCvxgBooCQ=",
-   "pom": "sha256-/uDg3D+qBrx2tDRs5B5sGGSdgxib5STv7oEbrnlJfOk="
+  "androidx/lifecycle#lifecycle-common/2.8.5": {
+   "module": "sha256-AwuN8Z5JeKwb6WnCopoBv8LMVihPUSY5oK00wi2mxPE=",
+   "pom": "sha256-KCYLDQ/KghpeL0Ug1DKLt94SYCGz3c1Hgt1WQRLsn2E="
   },
-  "androidx/lifecycle#lifecycle-runtime/2.9.0-alpha08": {
-   "module": "sha256-ihhLC+ff0o4yvI11d31N1fezUgOgWY3BEiNJTpvDmE4=",
-   "pom": "sha256-K1NQSadO4zEFGDp3frk/K8Pc4eZyLVPtU1tzT2qwgLY="
+  "androidx/lifecycle#lifecycle-common/2.9.0-beta01": {
+   "module": "sha256-qga0PKCIqzWdZ5Gk1JGQlGyOSic2WyT7NA0/8YGRsLg=",
+   "pom": "sha256-RPmLIhBroE0Rk5VcIsnUL5xUj53JN6ako0feStjkt0c="
   },
-  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-alpha08": {
-   "jar": "sha256-XRIKJZL12D4c15kar6/dlGq9d4aM0i52mqmmAn60sjA=",
-   "module": "sha256-+eIYGqxXK8p0PmLn4PpC11zD/T0OvROUZ2gB8BcBxcs=",
-   "pom": "sha256-RSaPE7q3ZjmOeYOGRqUY4NwFic6bUlajze30+d7Wais="
+  "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-beta01": {
+   "jar": "sha256-zdh7lJZK950FTH6iti2JGGVAfTMV2Z+oOoXQm6k4XOs=",
+   "module": "sha256-AWDUDY2iOTkAGknrwZTyt+Ao7KR+5wkKqfwJMUGYp/U=",
+   "pom": "sha256-0JT1QYT6YyqFioyicSlPxqbaF4+ICpSk51zPVUx1mh8="
   },
-  "androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha08": {
-   "module": "sha256-xq8B7ZVLEyTGUB6TGRvOuBgPI4kabPhV6LwOcoZ4n7s=",
-   "pom": "sha256-Id6ZA7OFAESafBIVSnPS9KZUS8A9rKsH9sv61IdDlSg="
+  "androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": {
+   "module": "sha256-O2BoUD9hEgLJXxx1nV+wbUaVxmcnLZpffTeU7q8RBkE=",
+   "pom": "sha256-BjbpF3E7BXG5NmO9Ju0+9SYv0X6uJP/SMBGbt/U0q5Y="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-beta01": {
+   "jar": "sha256-PnnbKgO/W0qQ2O0kHxXp4jEdkQ55oVF8XDFCAiKCHmI=",
+   "module": "sha256-3TV5B8sJeZNkfmQBWojivFLkkMtR5IJmFjtyVF+yhAY=",
+   "pom": "sha256-yb8bvSW+Ou7xB2KO76QrWjl6k13Fnn+XXC/3oxM8jng="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-beta01": {
+   "jar": "sha256-H5fTzXwqsci5VcD631kpVMatL3rnZnox/j7hF2mXagY=",
+   "module": "sha256-LlU5G6xEJ9ZiKb5Y+/maP5bvKS4xXXPiQoJjHPGkg+o=",
+   "pom": "sha256-vuCLJmcQWN5gFwAX3/XgswxUOnZfqwhwjSLlwS+8BMo="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": {
+   "module": "sha256-hJXtyNsN75ECpGeymNFuvdI5uT3MDE2mCR7qNW29brU=",
+   "pom": "sha256-PAVrjm1zIJqR1Vx3QcRnj/33CvitbGkogUCUjrIib8o="
+  },
+  "androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": {
+   "module": "sha256-Q8vXSiVzDlkAL2njOJPxF6y93bVDKAml6QHo4kwFc5A=",
+   "pom": "sha256-UldouzIXu78J0hXqprnFo6sKgWZjAEnhJ3TxYh6+1QQ="
   },
   "androidx/paging#paging-common-jvm/3.3.6": {
    "jar": "sha256-m6OQ1JxJCDe+xyT+9mBGVJWnMY3oG2kdRjNOvk2Dqio=",
@@ -169,73 +185,73 @@
    "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=",
    "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A="
   },
-  "androidx/performance#performance-annotation-jvm/1.0.0-alpha01": {
-   "jar": "sha256-jQDt0rDtNUMQF6pZlzl+HdFA1FR/VUYs0YoMYsgX6Ec=",
-   "module": "sha256-lUXtqn9grdo4UabgVusT23S30C7mkk/Ec9cYtcTlSvI=",
-   "pom": "sha256-OUJQciGu1ry4UH6wtx4t4AbCapD6Pwz1Xvk/c5/OQAQ="
+  "androidx/room#androidx.room.gradle.plugin/2.7.1": {
+   "pom": "sha256-VQn08ZPaGZgSM1HuAUHq85m0iIgcFefRauWMZKUo6l8="
   },
-  "androidx/performance#performance-annotation/1.0.0-alpha01": {
-   "module": "sha256-p+/urPLRetxNBttusv/ZkRf/UllUPqjH1vLzbWLawTw=",
-   "pom": "sha256-2iS/vOWDd2juWR/jxTs3X9GFbeXMYPX9OTDffLANuWM="
-  },
-  "androidx/room#androidx.room.gradle.plugin/2.7.0": {
-   "pom": "sha256-jO03tXX2KgGYh6AvgkEd9plwN+69ODbdJRNCh6kjpZw="
-  },
-  "androidx/room#room-common-jvm/2.7.0": {
+  "androidx/room#room-common-jvm/2.7.1": {
    "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=",
-   "module": "sha256-spo0zB4zdf2SApU2qych9SCnOxwAAAc5935I684GnrM=",
-   "pom": "sha256-jqAbXXin7uVpeXWrXQ71uKrR+VZtyRWxgHhY9rknC+g="
+   "module": "sha256-jM7UOynWvF0IWZxT1/R9hK3HV3oRc0m4/epGID2IhHk=",
+   "pom": "sha256-u8cvVVmRlceXcXKp3fGZ/d5OwxslhQITrCnutUMm4dw="
   },
-  "androidx/room#room-common/2.7.0": {
-   "module": "sha256-7HbDv4WtRYn9CMNSIAGv+niXDrd3IQfLXgbvYON6dOs=",
-   "pom": "sha256-/NHMaEUFNJFmGFvnQAFSeTMc+tb8gbp6Dwqc5bHYvjM="
+  "androidx/room#room-common/2.7.1": {
+   "module": "sha256-VYuFMAMujgA+oIldJ5ISHmdrGp46DDOu5GDQD5J1eNk=",
+   "pom": "sha256-Fv46v9l2e++3L1HU28+xWAMYpu1z8OMYQCoCP26KFQI="
   },
-  "androidx/room#room-compiler-processing/2.7.0": {
+  "androidx/room#room-compiler-processing/2.7.1": {
    "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=",
-   "module": "sha256-r+YNX3hAYJyB8/eNj+iJmkdUfZbSh4S9Don0d3WIM3U=",
-   "pom": "sha256-re9BpiiLw/dND2YQ/kaZzO8QCpCk85Xbcm6kke6mDRI="
+   "module": "sha256-z8zl8HUBhDKr5WCdT/b0B1c+iSdgwnToVpUqVvPy2Ok=",
+   "pom": "sha256-IPQQ8ZNy2BVuzo7k8hdyEPw1dMTA1wkbXlBGY6uH6zk="
   },
-  "androidx/room#room-compiler/2.7.0": {
+  "androidx/room#room-compiler/2.7.1": {
    "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=",
-   "module": "sha256-GdNDFFyug3uwErJLIjLamd/3c/3txYWIpofScOA6HWM=",
-   "pom": "sha256-I0WACHZFgR4KU5COgKdbp5rRq+SHuAx2LfUAv59sCis="
+   "module": "sha256-Q0Sz/PIKLq41DDfhDzHybhQodcbhZLT28NIHkPTo88M=",
+   "pom": "sha256-RM4J0BIcbgHYt0txvFuv4xT93SZzmBKeapCbby3P3ec="
   },
-  "androidx/room#room-external-antlr/2.7.0": {
+  "androidx/room#room-external-antlr/2.7.1": {
    "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=",
-   "module": "sha256-MWfDNMTvWzrm9Hz/Xc1gFBGoeZwNkF/go7ajUoxhfSE=",
-   "pom": "sha256-32NsPDSZkkgDFp8ogHawWP1sDwcFsIdXYvu5K9FtTkA="
+   "module": "sha256-t4QQjwQnT3Xuxx+dfcOKDEHxC1sX74/JfMgcFEeFB4M=",
+   "pom": "sha256-rl3F23kBLamXUURQJ1bU3f3qAm8umTQk9JT6kickIfw="
   },
-  "androidx/room#room-gradle-plugin/2.7.0": {
+  "androidx/room#room-gradle-plugin/2.7.1": {
    "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=",
-   "module": "sha256-SJ6pyGRF5MjsvLSN6d/pU07e2ssp07IkuDg6+PvfDb4=",
-   "pom": "sha256-gtTxMUDD52vJq3mo+8RpY24RGCLZL+T+dA3WjZSoYkQ="
+   "module": "sha256-leIK2JvhtWRv3fLW4V61lJ0AzMoxOvH2Nt/mh68xoj4=",
+   "pom": "sha256-PGqFy/xKroEXHosM8L4ynEMnXUV5aka5P1Tt6BKLBRc="
   },
-  "androidx/room#room-migration-jvm/2.7.0": {
+  "androidx/room#room-migration-jvm/2.7.1": {
    "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=",
-   "module": "sha256-I8rhKFYmQ1YmBrTgdWsM3JJWSyp7tYQvf9BOsJsQgcA=",
-   "pom": "sha256-BxT33w6jjXRHmxSpQr/08kYsR8jxixPJZa8VX8+rmic="
+   "module": "sha256-HFixuNcIlfhh/ZExlI25r3T7ia22gpQFEjxLC/CWjyQ=",
+   "pom": "sha256-xvpy82Dlfp3a5HdNs3QcZoazY/21DjXyY8c8ZVAgKdc="
   },
-  "androidx/room#room-migration/2.7.0": {
-   "module": "sha256-DE8cr5FSvrgFxHMbHsKc+0kdPlA881uSPR1S1XSmjUg=",
-   "pom": "sha256-9p246bQJHRqqYz8+kT5YNiBL2n34v3kFZH527U8g2C8="
+  "androidx/room#room-migration/2.7.1": {
+   "module": "sha256-mZtTP3SbkiCaIsyUMkR8IKPPJj/VAfyzoxoCAWohSwA=",
+   "pom": "sha256-mGi65DJz9Y/GgzxrhmvkTt7VpSGRFFqiGIxABeV0F80="
   },
-  "androidx/room#room-paging-jvm/2.7.0": {
+  "androidx/room#room-paging-jvm/2.7.1": {
    "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=",
-   "module": "sha256-rEo8iiqO6QHutUnCYUydLpFEqb4MBDcdYn3ENOv5nek=",
-   "pom": "sha256-2TdAJljNPTJti6QlulPwX+gQcqZsH+NbKmvXCHth3fA="
+   "module": "sha256-HSMuv2r2H+FV6Yo+fdbkTXgmRwiYB0GGOHvrlsaY/hE=",
+   "pom": "sha256-u28aknn8NEaXKJL6/rV+i11nw9hsFbhCfEGd6l8t5ZQ="
   },
-  "androidx/room#room-paging/2.7.0": {
-   "module": "sha256-rtb2GsbL168Mo1ojygUDCrc9S04ezPXWrp03gLHRkf0=",
-   "pom": "sha256-G7J547FpfmE4KmYFc34hvstU0xDHClTpuPaqd0ZkhQ0="
+  "androidx/room#room-paging/2.7.1": {
+   "module": "sha256-dwHhMiNJjty0jIZ9SksJ0MzVARbv4g8OIapIxLRQn20=",
+   "pom": "sha256-18mRHcU5+4Ot0Z/u7EaPs4F8qtvnwnxSbnHItGY/xb4="
   },
-  "androidx/room#room-runtime-jvm/2.7.0": {
-   "jar": "sha256-REhdvgDmROk7ZMVw7zuAhOJqJezyPTBUcglZlN0SOCw=",
-   "module": "sha256-nEzKxPSjcjzMYYFO6b33cDuWDXx9QFbLIkI0TZhqnVc=",
-   "pom": "sha256-inWvKB1RJ5Er9JyRUbHG8V/HhI8+kvO4U2Q9/itqJKY="
+  "androidx/room#room-runtime-jvm/2.7.1": {
+   "jar": "sha256-y9E2e9/UC8Gauq5kjIoAu2pK/d4GMFa0uoK6F4g3r88=",
+   "module": "sha256-qh6r3l9Y25ZFggqcPXWhSV+B1XaEJfm9L3upeV3+BBI=",
+   "pom": "sha256-7lg8DP2n9J7QGed4pcViPUGRfra5tTZaCTIqPkkTlo0="
   },
-  "androidx/room#room-runtime/2.7.0": {
-   "module": "sha256-hFvOPtZrDS3j59zXLIWeCw7+KV7+DStX6f4ptheteWQ=",
-   "pom": "sha256-n/HDkKw80IGMI6ARZ2ubg+Pi3b0bZKRXYfBdABPxGvA="
+  "androidx/room#room-runtime/2.7.1": {
+   "module": "sha256-t22KSPR2jqefWMhPLgIFjGzsgYFTjujHcswd7zpwWzA=",
+   "pom": "sha256-O/BknKjAsoPd3Z4glG8Cr8IZWoUkW31AdCC3ADhztrE="
+  },
+  "androidx/savedstate#savedstate-desktop/1.3.0-beta01": {
+   "jar": "sha256-5420fy2C4PnfkNyagjo3Y2hKS4dpsw18U2Wtz1w36I8=",
+   "module": "sha256-XLg7G6NxNU+NSGiSNRsYbbDcQ1DoEVnMmT0OO3YrfMI=",
+   "pom": "sha256-c9NNJVYsYyHaYBcVizfLwQGM3KQi/cT4SrnfwWt5OeU="
+  },
+  "androidx/savedstate#savedstate/1.3.0-beta01": {
+   "module": "sha256-cSXarKYzWh7ecm8TpMkpqTdKar88PLgUMk3/kBomPuM=",
+   "pom": "sha256-Ef9nMkmCADvCHHui44422EwMWI1R2wF3VjQvOL5G3gk="
   },
   "androidx/sqlite#sqlite-bundled-jvm/2.5.0": {
    "jar": "sha256-vXvOYFl1Dj/2KpKNi7z3y2Jwqu8eI5V6reZXcH4a22M=",
@@ -255,120 +271,120 @@
    "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=",
    "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8="
   },
-  "com/android#signflinger/8.6.1": {
+  "com/android#signflinger/8.9.2": {
    "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=",
-   "pom": "sha256-HxZNAt/iuj4BXQLj8kgg3iRlktkX8eAPkaGnaTYa+Z0="
+   "pom": "sha256-YDBz00i1K7CgQ9HI9pStLNP6xryJJlciTJ534ZYK3ck="
   },
-  "com/android#zipflinger/8.6.1": {
-   "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=",
-   "pom": "sha256-5R3NgXBmVPdF4UHUUxw3lY3xrEfunNdWISvWGndYx0U="
+  "com/android#zipflinger/8.9.2": {
+   "jar": "sha256-uh8yqiVavk2rZlcd2RlTBdMCfyYfn09GWJizDN/9CbM=",
+   "pom": "sha256-PPYmubFe7pb+fqzI9ZsEFqwKZHzRT2uaC9bAHRH643I="
   },
-  "com/android/application#com.android.application.gradle.plugin/8.6.1": {
-   "pom": "sha256-NnATbXn6gs8BrM3gQBObBgLTl+nwo3RVm6lvLtWW2Ws="
+  "com/android/application#com.android.application.gradle.plugin/8.9.2": {
+   "pom": "sha256-0If9g+lc06ETaKo39Me3+Liw/EjNxRyErjZlcWRjAQw="
   },
-  "com/android/databinding#baseLibrary/8.6.1": {
+  "com/android/databinding#baseLibrary/8.9.2": {
    "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",
-   "pom": "sha256-Lek/tvpLtdFPC53HpfcM+MJxM7aJ31tHyf5K+ZcC/sI="
+   "pom": "sha256-UaC2oKbIY06J9g11nEhTmIQPGP0fh5Jz3MGgUr/AsQo="
   },
-  "com/android/library#com.android.library.gradle.plugin/8.6.1": {
-   "pom": "sha256-bfpZ48HmjapL4RvLUNueWbh1ikieqUa38d3FscST17o="
+  "com/android/library#com.android.library.gradle.plugin/8.9.2": {
+   "pom": "sha256-Po1T0r5IrxZq4zoD2JUHZqiagK13cHzHNDMUT2M5AdY="
   },
-  "com/android/tools#annotations/31.6.1": {
+  "com/android/tools#annotations/31.9.2": {
    "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=",
-   "pom": "sha256-IWRj0T6tv+FyrXle/98/hWYWFLvK0xWyIBs4z9h8650="
+   "pom": "sha256-onUUfoStHjVjh0Qrt5pp8z6YuyTx2o0y+P5sYb3is0c="
   },
-  "com/android/tools#common/31.6.1": {
-   "jar": "sha256-SSGmYQvyjwKRHrfW4bpJjbmIhOXyM+VScmGaCEG9THk=",
-   "pom": "sha256-bc+djIuiKoCXnRZ3UceVp790AgJ5J+DQAVS2SVQGcY4="
+  "com/android/tools#common/31.9.2": {
+   "jar": "sha256-Krr2/FWQVA3lmHGcRwe/GuBM5/7wsYDEpOc3jOXugyQ=",
+   "pom": "sha256-pYPoeaqmTv06BsYG+a7/RJcEfby67krwbGTvL+13msg="
   },
-  "com/android/tools#dvlib/31.6.1": {
-   "jar": "sha256-XMxJAlggKFBjDFnuy50ppshJuxfxD0ypAX22SfcuSB8=",
-   "pom": "sha256-za6RmOnCv5LJRoOwCdaq2DENFPYlB+XtUrWPkzaaFdA="
+  "com/android/tools#dvlib/31.9.2": {
+   "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=",
+   "pom": "sha256-JMVv4BDhcjGTX8gbnp94PahptlXUh4wQhyZ8/C5jHBU="
   },
-  "com/android/tools#repository/31.6.1": {
-   "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=",
-   "pom": "sha256-Wy1SZioiTKSQkY2NBO11pwKijjKk3M059fQHjDuAvmc="
+  "com/android/tools#repository/31.9.2": {
+   "jar": "sha256-7nMxExttgNyD6n14+2YAhHMAcz8pZNGIYXCcTSMHXgg=",
+   "pom": "sha256-sIKbRfpt3NhN33+AKlXCPuLfvSfeOEkF2q7WABn0+Ww="
   },
-  "com/android/tools#sdk-common/31.6.1": {
-   "jar": "sha256-rWbuxoXuvi5q5DA+cMifcjF/p9jMKznjb9+oZFoiYP0=",
-   "pom": "sha256-jGPiQ8FUZMUpy8d0RExbQLCvEBhvI6wLYJxdH5LxU5k="
+  "com/android/tools#sdk-common/31.9.2": {
+   "jar": "sha256-iUOli2esf7GgMh56Uqh8+q7CSNORJTbD1yio3Acf/yQ=",
+   "pom": "sha256-rF33kRmIa8ypyJOxB01tfS40q79eJ/lLSmRpjsM24Y4="
   },
-  "com/android/tools#sdklib/31.6.1": {
-   "jar": "sha256-MaLhQQus1+ikZH45fM+RS2hrMjIpbkIpEo47rZZwbiQ=",
-   "pom": "sha256-t811xH6Y3EkY4FmdmhQgL2ymw1jQwhRTL7syF2cVBGg="
+  "com/android/tools#sdklib/31.9.2": {
+   "jar": "sha256-7p2BGH2rl5AGQMQeKuMMDrr0Vy3Van1+NER8k9eUwv0=",
+   "pom": "sha256-thqvhTgkAS5UphseDLVdNpSl94gyPLj0xu2gLAINo3A="
   },
-  "com/android/tools/analytics-library#crash/31.6.1": {
-   "jar": "sha256-LFwmQglnZ1wHS8cUCDH+O/9burx/u8CLop/cPq3MlRA=",
-   "pom": "sha256-NvqCjh3SQRZx/J6x0GEMMnsuvnMEkHDq4TTa/B6Es+Y="
+  "com/android/tools/analytics-library#crash/31.9.2": {
+   "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=",
+   "pom": "sha256-y9YGOtZEHJ+tkwRxs1sMONvx6Q4/6s14r5ssoMep2VY="
   },
-  "com/android/tools/analytics-library#protos/31.6.1": {
-   "jar": "sha256-DNE93twi3+NTWkxq3FZNH8OA9pXdH9dM8CEwxRDPtXM=",
-   "pom": "sha256-+Yz/nvLEIr1Qwd8C/LAqFpUrZSpq5dyxKUTM71DBwLA="
+  "com/android/tools/analytics-library#protos/31.9.2": {
+   "jar": "sha256-3SDU5HyokLfDUvb3PIfCLxTCGAg/Hl662cAT6Lp+SvA=",
+   "pom": "sha256-lX+kPaYmjfl+W0pfe20R9VWi8cYp4f1fu28YKq7+430="
   },
-  "com/android/tools/analytics-library#shared/31.6.1": {
-   "jar": "sha256-GI7Dy4ge1lXfkxHMWHAdyzKZc2UAToqmhUrPtg9uNeE=",
-   "pom": "sha256-jSxpFb90fFudanGXtCcFXXnMACySZqkOvMLeIyt8F64="
+  "com/android/tools/analytics-library#shared/31.9.2": {
+   "jar": "sha256-ONP9oaxMsPiXSkho2hNhoDz6uTDlLlcp2Zut5AOCRZw=",
+   "pom": "sha256-RMCeR+YqYU0h3rLdzbVUzck07LR0zi9mwhfu4eo6pSg="
   },
-  "com/android/tools/analytics-library#tracker/31.6.1": {
-   "jar": "sha256-fo9FqtqL7accKXbBXxoxbqoA/UqWgyITEc7SvbwCZAg=",
-   "pom": "sha256-ZG+eNf6Hg+tmaOcON9/3yNQWLu0ZGXzeLKQZXyp32f0="
+  "com/android/tools/analytics-library#tracker/31.9.2": {
+   "jar": "sha256-D8VeTSFfSwIdiBFyrO+CRkBh2WLf67EToFQNxwRZKOU=",
+   "pom": "sha256-ataFwxA9RS72RDWL5tuN7Rxo6XOAf1Q27nVbqnrFyI0="
   },
-  "com/android/tools/build#aapt2-proto/8.6.1-11315950": {
-   "jar": "sha256-95NZqIrRc08kmq3KiGgHshXyYFVUnCLzTc6pojE9FOo=",
-   "module": "sha256-lJIZIVzqn+pESWzhbsPEczrj8Wp5dT7swK3SSxG8i0M=",
-   "pom": "sha256-1CRPdNhw+GpIBkVdAW+5IVtIKJH4omliEBG908ttgyU="
+  "com/android/tools/build#aapt2-proto/8.9.2-12782657": {
+   "jar": "sha256-z7r7m17Us65mbPCFldT8tXhP9bLzEtmCyjeLfw5Hva8=",
+   "module": "sha256-CWtyT8l42WZnqecMu6+VS3+w1UZJ4MmujBbDqE5ZRaI=",
+   "pom": "sha256-+MizTLAiuLMMs161PV7d8dOLhNQqNWKEy3hTy+zYIZ4="
   },
-  "com/android/tools/build#aaptcompiler/8.6.1": {
-   "jar": "sha256-fhn/PUfDvZs5JZbXFSKvckBT7ypf/iazn1sw6B6Ig6E=",
-   "module": "sha256-0iUxrbUzYh8DC4UMxyzgGBbF4qEcKfEPr0hiFwFLOO0=",
-   "pom": "sha256-Dt08VAlDjvWKPt31D6OygjTLLLdat/ththA2I3qdhhY="
+  "com/android/tools/build#aaptcompiler/8.9.2": {
+   "jar": "sha256-ILh6uQSK6T/V7rhRVjMzvGEt/JqBm4HGsRaL1gDV4WA=",
+   "module": "sha256-EOk1LZ5TvpiHfkYLt0jY9i2OXa6dGzPqbYuwp9qw5a0=",
+   "pom": "sha256-UOP2bTQp0q4aHyKnXPW2vZVCmPFgHHXEtDvS6u1iZqY="
   },
-  "com/android/tools/build#apksig/8.6.1": {
+  "com/android/tools/build#apksig/8.9.2": {
    "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=",
-   "pom": "sha256-Y2IgqwyxLrjpsO9Y9Hje/wQ6+1rI+pwOfjCIxaNFtzc="
+   "pom": "sha256-vtJW6u3CA6srY0zwpIxMnc/x/br5n6hfUfgYrEqN+/M="
   },
-  "com/android/tools/build#apkzlib/8.6.1": {
+  "com/android/tools/build#apkzlib/8.9.2": {
    "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=",
-   "pom": "sha256-+A/Fp631hgvcxti+aqP1Wk+HkwmZGFYN02l6sWjxbTY="
+   "pom": "sha256-FesZP5vGCf2/co4u81Sgo0wKBEOSwy6YMNcpA/s5xdw="
   },
-  "com/android/tools/build#builder-model/8.6.1": {
-   "jar": "sha256-UW4P83gUFTJoP7OxbLDnFRe/izU4jCeXb6kGhyiahFg=",
-   "module": "sha256-oeBqW8yyM+dvrU838ONRwEtvnOs+PRiNwMWSaYJBtOo=",
-   "pom": "sha256-CwbNfNpMYeDszj94IZgV1bdHSb3fVnab/yNFAim9Fa8="
+  "com/android/tools/build#builder-model/8.9.2": {
+   "jar": "sha256-TJ0UyS4ltee/Ikhb+86zD/Fdhf4x/um3727TmhcieZ0=",
+   "module": "sha256-Q4lzbHT5LI8gt2MdP2ufxrB/4PhkzhXrFNnTS6plftU=",
+   "pom": "sha256-vXDdwEm3RxsMtfhXf7LdZEi5xuM/zeOdKqF2W/erZRw="
   },
-  "com/android/tools/build#builder-test-api/8.6.1": {
-   "jar": "sha256-joChV9NorfAWKfWjBseP7R+x3M7uYcRXla4gfZG9q0w=",
-   "module": "sha256-dCvKxrVZ0bXunzxiNmtEJXoFDMd/OSUrh1769zww9ks=",
-   "pom": "sha256-PaWDrQnaoX+K8N90eIrkO7FBfEAqAKELcjEbsIEWs58="
+  "com/android/tools/build#builder-test-api/8.9.2": {
+   "jar": "sha256-zIsDponVnA3MmYxRauZicM86V3f0QdcbjFJyxyCQc2M=",
+   "module": "sha256-Fi6Q4O3VBMMozoCNOV1S2ClmEsxNvmqP2kaYoul7JFI=",
+   "pom": "sha256-chAmm1dmJm9eCxwdPFrszeddDT/vZGki4feYnusfjvM="
   },
-  "com/android/tools/build#builder/8.6.1": {
-   "jar": "sha256-vE7pSfTulTgcg1SH67axlkiJ1hBLAyOXln2ItPIG5I0=",
-   "module": "sha256-RYhYJQ9RO//baGrO0ACo2s3vkSvQkXlbQF13TpuZSfo=",
-   "pom": "sha256-Q5TYmYx2pslZaYSNasSzBOaunYwdy6dJ+wuiODezZFQ="
+  "com/android/tools/build#builder/8.9.2": {
+   "jar": "sha256-fcHTbRLugTAMWxZyqq4zbRw8/pCnsmsrVROJYEFQ5Ts=",
+   "module": "sha256-scTasNhSK8A0SjE+s1xq8WTjGsjDyP1H8AvezL/8Lq4=",
+   "pom": "sha256-fGit2zzfoN0kcpa1sM29GvD9PqtXdahpl3aEXUk9Ssg="
   },
-  "com/android/tools/build#bundletool/1.16.0": {
-   "jar": "sha256-HqK/UnS7rHo7tWGFIdL6EfsE6QDjOopkYCnsYzL8CMg=",
-   "pom": "sha256-8uiq1EVaQjckYtXhiiaXPWdXEXmmdX84JfIn6Rry8ts="
+  "com/android/tools/build#bundletool/1.17.2": {
+   "jar": "sha256-FmhVy4HhDyMoopMQBvSAH0Itj03l1xfsD38W/CBJoIk=",
+   "pom": "sha256-80LQa1GA5uq6B2oqGKjn/Waum18EiWSvtu9CoCP6N1I="
   },
-  "com/android/tools/build#gradle-api/8.6.1": {
-   "jar": "sha256-B/dr8vj3svN2zIbqvU+KgnkYK2Vw9EDnhD0GbwLF9VY=",
-   "module": "sha256-KZXYqt4hXuoOQg5PM9v2RKC4pHxkaT5AfCzFdFra7LM=",
-   "pom": "sha256-GdPcq6tb3TEhEcywDXVL8U0rtG+5xe34fuEor8awjuY="
+  "com/android/tools/build#gradle-api/8.9.2": {
+   "jar": "sha256-tjYiEQ8jmwLJFVoyxnqnv3x6/lSVfvLJYeOjJ3xNso8=",
+   "module": "sha256-im+ZKdf1J1f8KP89GXNZ8zn5F8wY0rFehzCzc0C3M54=",
+   "pom": "sha256-ZPReltmRGhJLeaUYErLVS0L8PYTS4+JikmVBpxjygTI="
   },
-  "com/android/tools/build#gradle-settings-api/8.6.1": {
-   "jar": "sha256-fKfb0L6RIEeJkOJfuDzwg6P8ebypZE4kfMVUY1jOKYI=",
-   "module": "sha256-qzNDgysjM4ATShFTOlRaKo+3GLboSDxtkmMEETNZB74=",
-   "pom": "sha256-NOp/ZQ+mdHYwCvsxWAIFF4fOfztRDY082faDycpqc8I="
+  "com/android/tools/build#gradle-settings-api/8.9.2": {
+   "jar": "sha256-qUVLXR2xngBJB6FtJsCCt39XfK3Dyof9PkP2g0tngqU=",
+   "module": "sha256-0OHNJ4mu+7ee3amVXnrm3bMcBHEIdPlidGpRbk5kv2s=",
+   "pom": "sha256-a4JTPPiCxXGWT53cN4b9Lid3ZDF13zTeayOvPwhMzlM="
   },
-  "com/android/tools/build#gradle/8.6.1": {
-   "jar": "sha256-lpdzOiFfLtQuWy/EBTSE7IMuqylYTrztlNkskQkAUcE=",
-   "module": "sha256-KYi7+h3QeXxNVkLISB5RMAMNuTKahKacPoVKmpmUBQU=",
-   "pom": "sha256-N4nZdy0Ai/FRwZ9rgaRCwv/NZUpXq0k/n664frPY0Eg="
+  "com/android/tools/build#gradle/8.9.2": {
+   "jar": "sha256-bDE9JNB6w5PPx9tdY8UCnn0gsnh4HEKy0irfm8x9ujA=",
+   "module": "sha256-BI8yjPHVbx5S1xvn0BFcXJqQCt1QyTkCnIYnXgvKOLk=",
+   "pom": "sha256-l3GRhK76k9PF6ClsOYYFMiJ7iAGjTHM3bA2dDbeqVYA="
   },
-  "com/android/tools/build#manifest-merger/31.6.1": {
-   "jar": "sha256-qpY9SvRasDHFcHg86ShtIRHusLjDvfROSMqQcUzMt1Q=",
-   "module": "sha256-WrgUxcYq6ApgHpOLUxOcEPFKicMKVWPFCsRSeHNxsPY=",
-   "pom": "sha256-yTK9b/FjMsbpwsLtTK/2+/aUBxhTCpByB/t4KV38qLo="
+  "com/android/tools/build#manifest-merger/31.9.2": {
+   "jar": "sha256-ZmN0mzQYIyfBX6XYiPhotGd2XRlzBil4n+3T/4xARJI=",
+   "module": "sha256-Cd90HLOZJYfhT/DPqU29/XIYneLO9747iYlhj04TUgo=",
+   "pom": "sha256-kzqfKUVx5T8XTgVqHfO458CthwZIIHKRDwHhebl48yY="
   },
   "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": {
    "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=",
@@ -380,61 +396,65 @@
    "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=",
    "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI="
   },
-  "com/android/tools/ddms#ddmlib/31.6.1": {
-   "jar": "sha256-xXHAIk/j5+ZgcZbZXMMUL9wZ8BPo8VEPaMe0pobFOAk=",
-   "pom": "sha256-NhGKNIRO8zU7wHiko/RwiEI0KK1q0ejNStAVV6Ka6Ok="
+  "com/android/tools/ddms#ddmlib/31.9.2": {
+   "jar": "sha256-nNyiBuCPvB8B2qGg1k6tKmK4zMWUFWn1GB4n5Kb1+6A=",
+   "pom": "sha256-ehSXY9SGGg8ZQJxxS54S6xv52CiKtkIMghTs8WAnNzk="
   },
-  "com/android/tools/layoutlib#layoutlib-api/31.6.1": {
-   "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=",
-   "pom": "sha256-7NQxU4aAO6nUO2e4+myS8EkERQHgRdMvQmDZP5yaajA="
+  "com/android/tools/layoutlib#layoutlib-api/31.9.2": {
+   "jar": "sha256-KSMuYAdiW1aegnmNLY9VnYlB7OYw/iduhCzYGOv5Sxc=",
+   "pom": "sha256-atABzvfVis+rA851PdRal8KGwwdcCf1D39RCXh5m/uQ="
   },
-  "com/android/tools/lint#lint-model/31.6.1": {
-   "jar": "sha256-O7YYb3ddznoQY5HiS8w8jScLzN8vVRuSFhxq3AvC7N4=",
-   "pom": "sha256-1YuNHgi4YrbKf3M/pbGQszNZViI+ZGV9SoxCw1PRVdY="
+  "com/android/tools/lint#lint-model/31.9.2": {
+   "jar": "sha256-/Vx9Zgnqot9h3uIN/tRkByg44G0vsugvQ0qOC5eGM3Q=",
+   "pom": "sha256-iVi1l72YliYSm40EHp3DXtRI5EnIjAbQXzOjsEhJVH8="
   },
-  "com/android/tools/lint#lint-typedef-remover/31.6.1": {
-   "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=",
-   "pom": "sha256-dk7anwlKi4/gldYIdZl6hhwiekbfspnUdJ9ook3e4MM="
+  "com/android/tools/lint#lint-typedef-remover/31.9.2": {
+   "jar": "sha256-Sjujur/Xnm/Ge872R/tOz+r1m0gbEI98LrpNHFxt6o4=",
+   "pom": "sha256-cIoYgUcGxofG2pG4g5n4uwF1fT456+3onsAbcLjJOCM="
   },
-  "com/android/tools/utp#android-device-provider-ddmlib-proto/31.6.1": {
-   "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=",
-   "pom": "sha256-eOOwDF+DPBf3rKWULwBsorkVu9lg9k1TSo1AoDm62aI="
+  "com/android/tools/utp#android-device-provider-ddmlib-proto/31.9.2": {
+   "jar": "sha256-BHrs3WbhBhN/d6UsRC8bg9t9boSWiZgAJR8gbH853mU=",
+   "pom": "sha256-YjaKOSTVNIuMTMsPcWPRJKxNz31PpCJeTlFRi/ziYG0="
   },
-  "com/android/tools/utp#android-device-provider-gradle-proto/31.6.1": {
-   "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=",
-   "pom": "sha256-da7iacXcaVBY4hK/6bQGXlNPfbVdb+IprrQ62VFU51o="
+  "com/android/tools/utp#android-device-provider-gradle-proto/31.9.2": {
+   "jar": "sha256-ZagpFgS/3h9vdcqFMqOBQ57IH9lY8yeCqwBH+2HZp6E=",
+   "pom": "sha256-5yyONF6PV/scLXhH8O29O0aLUsaGE9Ullb7XyWyjoEI="
   },
-  "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.6.1": {
-   "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=",
-   "pom": "sha256-cP+V6yxSgoI6jJjvssM+5tLyGWS4he9IXxkhF0ODIMY="
+  "com/android/tools/utp#android-device-provider-profile-proto/31.9.2": {
+   "jar": "sha256-PnsJj24+yuMbb3kJw0O07AmqGNion0G/kgd7pLBW9FM=",
+   "pom": "sha256-Brw2CcYYGzLOmC0HU7Oe25ziGxZZVAspJ5Z842Vadho="
   },
-  "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.6.1": {
-   "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=",
-   "pom": "sha256-771HKHgCPhXZzZNlIth03F/Um+MUIScA9rF6BYFxF8E="
+  "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.9.2": {
+   "jar": "sha256-a6fmrCII10wbtfHRRkq6/GpF2HELIEVaLcAq34cmvIM=",
+   "pom": "sha256-NgKKzEuuabgX/PsJTYQUL8IRWgTK+ZUroUKs5Kx03OI="
   },
-  "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.6.1": {
-   "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=",
-   "pom": "sha256-orxwsWG8GzB3crqSXOMlRKR1Of3gSnCbMgiFYKvpvtY="
+  "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.9.2": {
+   "jar": "sha256-RXBdYbIQBuhTPmz4q3lYp95t7KzmjtbAnbit4SFthZw=",
+   "pom": "sha256-AkcBSZOYuYAd6UznOdyr6bwoRVWGmCnsPYyj9zdl35M="
   },
-  "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.6.1": {
-   "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=",
-   "pom": "sha256-tApCizomm6Ik+1p6DQ0swY5TEgFVDuR1Wx1wR4k6mQs="
+  "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.9.2": {
+   "jar": "sha256-+oZxmj3F3kZffgwCMYRBTCf4/VOjT9VXKJwL9t80AkQ=",
+   "pom": "sha256-TM43f6I9hQgO9mSaATpgjYVKU5Psj5C2CzGQ0vY0XbA="
   },
-  "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.6.1": {
-   "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=",
-   "pom": "sha256-OysKImsUosDlrWKdEGL7sppvGVQsXxT+D4mP/wEh5Io="
+  "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.9.2": {
+   "jar": "sha256-pPNKrg+f+gJtv3FRQ23XrlO+y3JiK0DyxHnKyJQ9kxk=",
+   "pom": "sha256-SikflqCvaRCs1vt3LJLZffVnk3+qW8pNmJSSofS1uUw="
   },
-  "com/android/tools/utp#android-test-plugin-host-retention-proto/31.6.1": {
-   "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=",
-   "pom": "sha256-ZnblwB6LjiWcJJEqrXEx6rC+D+/kBeUZzs6o4+kBoMg="
+  "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.9.2": {
+   "jar": "sha256-wfbrus2tVZtu/k6qKVYVUrMxVjlfBpzZcD/aCcRi3qY=",
+   "pom": "sha256-mxv94aFi9Ni9/RWLVUPHDAGp9V8GakPWtaiutlsn0As="
   },
-  "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.6.1": {
-   "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=",
-   "pom": "sha256-j1FzWv7i9yDS70ZCGHoppH7u2uTuNVyS/X3R9K526rQ="
+  "com/android/tools/utp#android-test-plugin-host-retention-proto/31.9.2": {
+   "jar": "sha256-CPGvlhFbK9As1LaE4ZT1xcJ2PwHI9Z4BHZrsyz/vGGM=",
+   "pom": "sha256-vG8p1Uz5KQGatASJx1yygpyNkVgp/uRlgrMpyaE1IsQ="
   },
-  "com/google/testing/platform#core-proto/0.0.9-alpha02": {
-   "jar": "sha256-bYqJBndBUPQ6j60IymTiXGBww5vYpvwTslk/KJJC/pU=",
-   "pom": "sha256-J855WUJ6L/7kjQ/rRRKKPzbMQX7YqCKvoigiyPWliyU="
+  "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.9.2": {
+   "jar": "sha256-1Cm5MS3/oFAzgdHuGxipmb2QHnRWYSsvtIxqXVosr4g=",
+   "pom": "sha256-YJFSnIGoI/3PHZ8PwWMQxdf37wYGQNdaYHBGduWJN5U="
+  },
+  "com/google/testing/platform#core-proto/0.0.9-alpha03": {
+   "jar": "sha256-0AHrDMu/yMueqhk6NY5jcSl0Y5d1ZHvpSasjLCsptAc=",
+   "pom": "sha256-O7RSgN8d0clrmgFySmFFZrfWDTNFP81SwsdB+ZmcOk4="
   }
  },
  "https://plugins.gradle.org/m2": {
@@ -595,23 +615,23 @@
    "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
    "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
   },
-  "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.20-1.0.31": {
-   "pom": "sha256-lrP34a55nJ9OmB1DIOe/SzsXFWRF1s2MvXXH1/1Cv/s="
+  "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.21-2.0.1": {
+   "pom": "sha256-uhlRo9qxiovCyTnXojCw2VO8auNi3VIKR3zfXLFHGOE="
   },
-  "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": {
-   "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=",
-   "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=",
-   "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo="
+  "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": {
+   "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=",
+   "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=",
+   "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE="
   },
-  "com/google/devtools/ksp#symbol-processing-common-deps/2.1.20-1.0.31": {
-   "jar": "sha256-qiyLzpH11PQt9VjLY6CXZMYHmKIcyvsue2Iwjdzc2TY=",
-   "module": "sha256-lSn8quFQ0UpsBgHuv2mBUEnzv2asHlnOaO57fU2XnUE=",
-   "pom": "sha256-eeve5b/kHDHPi1u83bvZftu8JhyYbuv+DeZf1WEQ7q4="
+  "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": {
+   "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=",
+   "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=",
+   "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0="
   },
-  "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.20-1.0.31": {
-   "jar": "sha256-2ewkT6M+FXQk8eA2jNAWxKI4adwsUftrk6+aUuxIIVI=",
-   "module": "sha256-7q8aYoisLJi7sZRlqpfuLHWSSv1dK+/KO3w7hQP+P/w=",
-   "pom": "sha256-nQnbav/D80/FQo57fXmATVEROP3h0WIeKtEc9mQhXbY="
+  "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.21-2.0.1": {
+   "jar": "sha256-nkVMuS/UrcL/6tWaCaiDH+Bmpk3Z5IPaVdjRrzAHGCE=",
+   "module": "sha256-Ilxdo/6zKViDaPfOQs89ZeXfInXx79tucXTQNv/lZyk=",
+   "pom": "sha256-werAp7M/MlLNFpH01DQo2PFDUVsisahkBqTFaJOSFjg="
   },
   "com/google/errorprone#error_prone_annotations/2.21.1": {
    "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=",
@@ -698,13 +718,13 @@
    "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=",
    "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78="
   },
-  "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.11.0": {
-   "jar": "sha256-oF79yaoh0yoN/JzCh34jdSMHhBQ1HAhvng6H/WnigfA=",
-   "module": "sha256-BAVFTRMLVMv0d3rlOiVcJRDpnjGMhw5hwD+xYCxhDGk=",
-   "pom": "sha256-lsnWBhj/V6ICwjZdCW1tN5C5jhcTTzEMfPySFO/dius="
+  "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.12.0": {
+   "jar": "sha256-fNWyQ/wl4q5Yu2Z5949zRNSKFn2bwkPY62K6/gohNfc=",
+   "module": "sha256-2SanANsKdiFM/8djX4XR4cKignE1dYiR61vaHTRCNLc=",
+   "pom": "sha256-hMx9AcxMCi+9wW3PuhojMcosp5tvk01+G8FYTR95fCo="
   },
-  "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.11.0": {
-   "pom": "sha256-Wx8+RUj2DLyVZUVk+Xk+cbuU1STNcmfaPjL5xTFExP4="
+  "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.12.0": {
+   "pom": "sha256-dWlEf6xFV/F5LqZfMmDGp/HXhYB66H+rGHOLYjr+nkA="
   },
   "io/swagger#swagger-annotations/1.6.14": {
    "jar": "sha256-J22F3CEgy8MLCL40t7rlQYRnymmDgUsNHgcYKeu1xQA=",
@@ -992,9 +1012,9 @@
    "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
    "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": {
-   "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=",
-   "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo="
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": {
+   "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=",
+   "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM="
   },
   "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
    "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
@@ -1016,9 +1036,9 @@
    "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=",
    "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": {
-   "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=",
-   "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": {
+   "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=",
+   "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": {
    "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=",
@@ -1028,12 +1048,12 @@
   "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": {
    "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": {
-   "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=",
-   "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": {
+   "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=",
+   "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": {
+   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": {
    "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=",
@@ -1060,9 +1080,9 @@
    "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=",
    "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": {
-   "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=",
-   "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE="
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": {
+   "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=",
+   "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI="
   },
   "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": {
    "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=",
@@ -1072,9 +1092,9 @@
    "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
    "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": {
-   "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=",
-   "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y="
+  "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": {
+   "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=",
+   "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk="
   },
   "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": {
    "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=",
@@ -1083,12 +1103,12 @@
   "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": {
    "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.20": {
-   "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=",
-   "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I="
+  "org/jetbrains/kotlin#kotlin-serialization/2.1.21": {
+   "module": "sha256-slOwL1BlFSW4AeKUXZr9RVUrRCC/FPzhxQDKX4lHyc8=",
+   "pom": "sha256-+oVjLbzKF7IlJM0ldKyFsgzE+u5oLIGeWDe+0Sncy4w="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": {
-   "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI="
+  "org/jetbrains/kotlin#kotlin-serialization/2.1.21/gradle85": {
+   "jar": "sha256-G6Oulwq5Idk694SifQQ4wPjeXTIxqKX8lo7V+INk5d4="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.25": {
    "jar": "sha256-+1Nz3XYbTpPj9TjF6FO7o4pxFDoYFTbo8ZPtbk7ds7g=",
@@ -1107,24 +1127,24 @@
    "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
    "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
   },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": {
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
    "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY="
+   "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA="
   },
   "org/jetbrains/kotlin#kotlin-util-io/2.0.21": {
    "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=",
    "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA="
   },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.20": {
-   "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=",
-   "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM="
+  "org/jetbrains/kotlin#kotlin-util-io/2.1.21": {
+   "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=",
+   "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4="
   },
   "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": {
    "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=",
    "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU="
   },
-  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": {
-   "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y="
+  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.21": {
+   "pom": "sha256-X5lVwimv4qtP70Bnu1qdZdRHStTwBcqDk481HfSPCTY="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
    "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
@@ -1402,26 +1422,32 @@
    "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=",
    "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA="
   },
+  "com/google/devtools/ksp#symbol-processing-aa-embeddable/2.1.21-2.0.1": {
+   "jar": "sha256-SpNovAbJIUydH8EqHYQre1d9usBKuvFN53j7V1Gv/CM=",
+   "pom": "sha256-OtZIlhwvEESzL19qR/Jt8NSucbykDwD1zG12aJU8F8M="
+  },
   "com/google/devtools/ksp#symbol-processing-api/2.0.10-1.0.24": {
    "jar": "sha256-3X3eBwvlTeZse91N4ExD+0KeDGK7EypkSM+jNlOvsik=",
    "module": "sha256-v8OiFHE2oHw5IP2mGeugc8uTgcVlf++xYc/ViZSPmVI=",
    "pom": "sha256-RSj+eY/v7sCVpz6GHBIG+oJUlqDntlInL0D/yWCBTmI="
   },
-  "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": {
-   "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=",
-   "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=",
-   "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo="
+  "com/google/devtools/ksp#symbol-processing-api/2.1.21-2.0.1": {
+   "jar": "sha256-ayE0FIw7yenPnPI51FAxohzXiZVqIVktGjIx/orjCa8=",
+   "module": "sha256-FOy0d2qAcehhKYMzGUMTmbKmnm6b/tyymSU4vaymz8A=",
+   "pom": "sha256-ITlIj5MwvlkbT6pX4bgdH7qDaWi1HwBx8JRJ4+0J8sE="
   },
-  "com/google/devtools/ksp#symbol-processing/2.1.20-1.0.31": {
-   "jar": "sha256-Ur1VHTVEWTntuCsPTlKCLHVH+Qa8gellmZ5nqSHlQp4=",
-   "pom": "sha256-hMXtNZ96txDxZjUS7NMqc3khjyaZA05mT9lLc/XJV4E="
+  "com/google/devtools/ksp#symbol-processing-common-deps/2.1.21-2.0.1": {
+   "jar": "sha256-Ac31K1nT4gaqT6YngdFQWly9mHQ8BbBy+cjLnmqi4AM=",
+   "module": "sha256-m2jwFBX8A9ZB+C4uSzfemenf30pYX7gltGAbtyyqWUw=",
+   "pom": "sha256-342+OK5yUR4F6fUuqhYaBU/Q01S1SfVI4AiPL8cp1j0="
+  },
+  "com/google/devtools/ksp#symbol-processing/2.1.21-2.0.1": {
+   "jar": "sha256-nCAksg9sUsk+NoUfHHcKMg0EEsrqzu83wo1A5uP8KZA=",
+   "pom": "sha256-Xj39efqTlcfwIhJfrW4QJM7Nqsq/p65ecgAn3+hpHZ0="
   },
   "com/google/errorprone#error_prone_annotations/2.11.0": {
    "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg="
   },
-  "com/google/errorprone#error_prone_annotations/2.18.0": {
-   "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
-  },
   "com/google/errorprone#error_prone_annotations/2.26.1": {
    "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=",
    "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8="
@@ -1440,9 +1466,6 @@
   "com/google/errorprone#error_prone_parent/2.11.0": {
    "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
   },
-  "com/google/errorprone#error_prone_parent/2.18.0": {
-   "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
-  },
   "com/google/errorprone#error_prone_parent/2.26.1": {
    "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0="
   },
@@ -1514,17 +1537,26 @@
   "com/google/protobuf#protobuf-bom/3.22.3": {
    "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU="
   },
+  "com/google/protobuf#protobuf-bom/3.24.4": {
+   "pom": "sha256-BOz9UsUN8Hp1VR+bCeDvMGMO5CN9CRyg7KceW/t4zOU="
+  },
   "com/google/protobuf#protobuf-java-util/3.22.3": {
    "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=",
    "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY="
   },
   "com/google/protobuf#protobuf-java/3.22.3": {
-   "jar": "sha256-WdOI6motLXaujv/3/U0MYMbw9GTD06ub6OWt0JKXVwg=",
    "pom": "sha256-GG6nlBUPW0Kup+xgQd83PR2KioMWJPWKVd67YEPscxI="
   },
+  "com/google/protobuf#protobuf-java/3.24.4": {
+   "jar": "sha256-5WVVIr4apcwfLwkqoDawRFFX8pSSju3xMyrJOMe2loY=",
+   "pom": "sha256-OUEiHKZXgZ3evZX+i3QPRwr3q/MEYLE+ocmrefEPq5E="
+  },
   "com/google/protobuf#protobuf-parent/3.22.3": {
    "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk="
   },
+  "com/google/protobuf#protobuf-parent/3.24.4": {
+   "pom": "sha256-+37AUFh2/bnseVEKztLR6wTDuM/GkLWJBJdXypgcrbM="
+  },
   "com/google/truth#truth-parent/1.0.1": {
    "pom": "sha256-HH/IY4Mu2YCOQ9jBdpH/Fn0xPxETTvx1Yf9R0UIZbX4="
   },
@@ -1540,20 +1572,20 @@
    "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=",
    "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs="
   },
-  "com/guardsquare#proguard-base/7.6.1": {
-   "jar": "sha256-wmUOZmw0Q3gdxenq7l3ochWT8AvkTp2HzsdhQGNXx3A=",
-   "module": "sha256-JdmBh6U8Iv9cCQfhdTWgK0Q4Wk3FSISxJ5uhKQg6Zys=",
-   "pom": "sha256-O3Fie597ZAogi4a7LLfEgUItx6e3izXZny0Y50dSH/0="
+  "com/guardsquare#proguard-base/7.7.0": {
+   "jar": "sha256-Qt/52lNIJaXmlHUjWOAre41dqTm+m50H+Zh0SEkubnk=",
+   "module": "sha256-mfDPLg56BcGCyaRwa4WU/Xp60uP7EvIs0ScMyphKspM=",
+   "pom": "sha256-fRxMbEcM4UY59Ls3tn+l+EeffxVn85pETtBHhLS4544="
   },
-  "com/guardsquare#proguard-core/9.1.7": {
-   "jar": "sha256-2wb6n2tDu304ZCD4VPQapVoRAj3ja61o4EPDrD8zuNU=",
-   "module": "sha256-CUllErGoVDVOUdGan6XEEjVKLTlZYczHasOIL5WlTgs=",
-   "pom": "sha256-m+fvKU0pm6gP/ZzKEa0wl+N+QTcbZGSYElqADUqO0qg="
+  "com/guardsquare#proguard-core/9.1.10": {
+   "jar": "sha256-5v9XISTgrysj0kM8W3JVfx+QXmgMthl5NCy5Fe6TgZg=",
+   "module": "sha256-ejuRDXtS4yOBDnAaJrxJ/nycq3jxOtW1i43GAeJ84oE=",
+   "pom": "sha256-m3dB6tjNAZt47jNV6D9ECJy56Xt6EhBdXLWMzgTUoM0="
   },
-  "com/guardsquare#proguard-gradle/7.6.1": {
-   "jar": "sha256-ScjoQGfRVpIV8WK59EEiVEIvX4A5eu04C8yyBZeH7xk=",
-   "module": "sha256-fND7x+oT+8EkO9lAeq2kpBe8HuLXEHcCTcmwn2SsGAc=",
-   "pom": "sha256-q/PvEB1bM2lv5Ytjm4FzrVAOqQf72Yp4JZV5+s+kkng="
+  "com/guardsquare#proguard-gradle/7.7.0": {
+   "jar": "sha256-DM48bBo11BqFqyWZXB7PUELuwUibNjwM/cjgvNhebUA=",
+   "module": "sha256-yzzOVMh0LhKMfokR8CU4cnxUtI2QqvxIMPTlyeBMdss=",
+   "pom": "sha256-TFcJ7uYXjL1kpw5T0Lpp55qim7wB+r7hkHQ8v2qkjgM="
   },
   "com/intellij#annotations/12.0": {
    "jar": "sha256-+KsTsUvggP4vYX+Q5VWZdg5KG03u6lxZXfY9DWN17W0=",
@@ -1679,9 +1711,6 @@
   "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": {
    "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro="
   },
-  "commons-codec#commons-codec/1.10": {
-   "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs="
-  },
   "commons-codec#commons-codec/1.11": {
    "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=",
    "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA="
@@ -1690,9 +1719,9 @@
    "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
    "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
   },
-  "commons-io#commons-io/2.13.0": {
-   "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=",
-   "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk="
+  "commons-io#commons-io/2.16.1": {
+   "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
+   "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
   },
   "commons-logging#commons-logging/1.2": {
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
@@ -1786,34 +1815,46 @@
    "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=",
    "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY="
   },
-  "io/grpc#grpc-api/1.57.0": {
-   "jar": "sha256-jSw4Qpn4Tuiqf2cPAOfLJrh+IxzzCRR0MHsyt2kQ9xw=",
-   "pom": "sha256-w/BUp8iGFkfQpVglsKlJ9E/PycZPR5CD2WgTgUxQJhI="
+  "io/grpc#grpc-api/1.57.2": {
+   "jar": "sha256-QrcuZXLAhAVaw84D5u/kM+sF72ILPa9RNqQ1n8csw+E=",
+   "pom": "sha256-x99FUaZPAoKnZugJUU1COEUKdCkFX5x3GIgdFqMQoCY="
   },
-  "io/grpc#grpc-context/1.57.0": {
-   "jar": "sha256-lT/KzYL1MeabduODT1gwutTCKuhBROBY1x3ICnQwJ10=",
-   "pom": "sha256-qyZOgr+2q4lfYBavizzERJWryB52nDD6WprgrRa+bMY="
+  "io/grpc#grpc-context/1.57.2": {
+   "jar": "sha256-m4rIjZzvKBna/+1729LyJoAjfUgsbGcf4C022j8IzwA=",
+   "pom": "sha256-iSf3fWOB4kSHaCcIGWpspyg2i4/XzrsQT9kyS2sSSRc="
   },
   "io/grpc#grpc-core/1.57.0": {
-   "jar": "sha256-O+5IxzvExbVb7Xm+DkhK3ya6Vr675XmN2/NHFO8eHOo=",
    "pom": "sha256-gYQEX1eR4Azyzbz16IRq/Uj1z35aTzj7W4MDx7Lv5Vs="
   },
+  "io/grpc#grpc-core/1.57.2": {
+   "jar": "sha256-WhAHCr/rSWbsTVgJYdzE5/afqDqyUkL5LBdl77B7hgY=",
+   "pom": "sha256-CpcgGv4Xh08DX4ol/7lwZ45Jqt8pksfZfG/5+x1dohE="
+  },
   "io/grpc#grpc-netty/1.57.0": {
-   "jar": "sha256-gdQ/LU7Rj6NBvYQKNzXxQDpwB0oEbhV+J/Z5tyG0ya0=",
    "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs="
   },
-  "io/grpc#grpc-protobuf-lite/1.57.0": {
-   "jar": "sha256-LFB8AtmBuEohdj1E4Jr08nmIHdPiW+MID2NhJYYH8Zg=",
-   "pom": "sha256-sCO+cAiElIn2Uu7/df0P4aqckF9nHTROFtqv3fkhgZ0="
+  "io/grpc#grpc-netty/1.57.2": {
+   "jar": "sha256-mAnUwQyU0R57KUbN61sohL4goJUQKJVE83Vp8CyHeiE=",
+   "pom": "sha256-ixIWHPKqz785j7Wvw7DXOiGvIGulDD2Pe/T2xLN16/g="
+  },
+  "io/grpc#grpc-protobuf-lite/1.57.2": {
+   "jar": "sha256-/EkX3F1BmsgQ+z8nUjwU514f5QNyFU+rKTJCFe5qlVo=",
+   "pom": "sha256-YHeMHqQHo7oKfw8J3wmegnInjoq8KYIsnPUOGgUvG3U="
   },
   "io/grpc#grpc-protobuf/1.57.0": {
-   "jar": "sha256-SfmG1OqxJhD9ukpokPylLV62U1mJFv24Y6Nm1eKO7Pc=",
    "pom": "sha256-wNy4xn/QHapjJW8Pi2jTcHzrfKhc2qt6PGw/9GDhPdE="
   },
+  "io/grpc#grpc-protobuf/1.57.2": {
+   "jar": "sha256-MWMNip6fCKlZhiAV4wpIY5CL42gMOmhvTB8I0v/q9wY=",
+   "pom": "sha256-xeIpKAIFOXfwRhCxcEhKmh6mrxVBwUSyfRiECsVE+p0="
+  },
   "io/grpc#grpc-stub/1.57.0": {
-   "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=",
    "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0="
   },
+  "io/grpc#grpc-stub/1.57.2": {
+   "jar": "sha256-hNKvEnGRaPdjdfKv39brUTOoZe26kkTUDmuWjjrd4dM=",
+   "pom": "sha256-IVnmFKh5R3XrmOLhyFg0q05ZEb4cSnXHFjqZPpyJK6w="
+  },
   "io/insert-koin#koin-core-jvm/3.5.6": {
    "jar": "sha256-gjubMViP+QIVwfzq4w36FB0lKOPU5CwoQ+pAyDUr32k=",
    "module": "sha256-IiurmbCubv5NKYHgt8fLYFRc6AGHTBVZkVBlZgYm6yE=",
@@ -2044,19 +2085,19 @@
    "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=",
    "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto="
   },
-  "io/sentry#sentry-kotlin-multiplatform-jvm/0.11.0": {
-   "jar": "sha256-EMJ6bRCkZK7LXZhhvjqlcnl6Cx/nipa87zUg4F4vZ1A=",
-   "module": "sha256-jf0/tfj/kN+g0T8Yr1K5nwYCY4Q3kMHHSIVNvpYY74Y=",
-   "pom": "sha256-XCpFSbIjGBj6v/vivnBZ2k2TC5yb+bsfyPG3rh/owz0="
+  "io/sentry#sentry-kotlin-multiplatform-jvm/0.12.0": {
+   "jar": "sha256-O/z/1CG6XIIYrvjz/x+KBMBa3kaTt+8Yc7zWp8wOl8Y=",
+   "module": "sha256-uqQCJ82hcAuab1EtwgrXBDB7lVnptXtvu24CWL2W1jg=",
+   "pom": "sha256-/hEp7FMvE2lCHQnAWQtgdU8cUy3ycmFEfyfmxYNmSas="
   },
-  "io/sentry#sentry-kotlin-multiplatform/0.11.0": {
-   "module": "sha256-4dzObB02wWfDljIlMAzF9qTVRHotFmHEuFoIF18YpgM=",
-   "pom": "sha256-9WZj83fjsVpNX5RQeEAzvJxGVzf665CSme6Ohp/LEDU="
+  "io/sentry#sentry-kotlin-multiplatform/0.12.0": {
+   "module": "sha256-N+fdfmhXBDIGLklwjxmDvWN8TOiyW1Gga8V6Tfwguss=",
+   "pom": "sha256-wkjtJf07NMXNPuk1ELsVVhgCcD+rjBZ+Chn0NBmttko="
   },
-  "io/sentry#sentry/7.18.1": {
-   "jar": "sha256-npO59Q7db27VOBDSXewyg6CNnS3TEnwq9JMLsqh5qQM=",
-   "module": "sha256-bgQgjWchfoLi85Wn4N1t18viJc/iIn/RDwaTjOMsQuw=",
-   "pom": "sha256-DCOMY/KBAE6hfzTIUhqEETJFWFO4JGnUhj9wLY0wvuA="
+  "io/sentry#sentry/8.8.0": {
+   "jar": "sha256-FP6T2JRlBMFXy+haPC5QY77c7Jvq04TJP3mlFxTC0TI=",
+   "module": "sha256-upAHAYOH8B8RjPHCy0xgN+FKx1FR2sb7nSfG0akrwZw=",
+   "pom": "sha256-n5H3T5E9NMhWuml/lZ5cerZa2W7AjW1TY0688Irn4pc="
   },
   "jakarta/activation#jakarta.activation-api/1.2.1": {
    "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=",
@@ -2153,9 +2194,6 @@
   "org/apache#apache/13": {
    "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "org/apache#apache/15": {
-   "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ="
-  },
   "org/apache#apache/18": {
    "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
   },
@@ -2168,8 +2206,8 @@
   "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
-  "org/apache#apache/29": {
-   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
@@ -2181,17 +2219,14 @@
   "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
   },
-  "org/apache/commons#commons-parent/35": {
-   "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo="
-  },
   "org/apache/commons#commons-parent/42": {
    "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw="
   },
   "org/apache/commons#commons-parent/52": {
    "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
   },
-  "org/apache/commons#commons-parent/58": {
-   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
   },
   "org/apache/groovy#groovy-bom/4.0.22": {
    "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
@@ -2266,17 +2301,17 @@
    "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=",
    "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI="
   },
-  "org/bouncycastle#bcpkix-jdk18on/1.77": {
-   "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=",
-   "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0="
+  "org/bouncycastle#bcpkix-jdk18on/1.79": {
+   "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=",
+   "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.77": {
-   "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=",
-   "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM="
+  "org/bouncycastle#bcprov-jdk18on/1.79": {
+   "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=",
+   "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.77": {
-   "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=",
-   "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug="
+  "org/bouncycastle#bcutil-jdk18on/1.79": {
+   "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=",
+   "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI="
   },
   "org/checkerframework#checker-compat-qual/2.5.5": {
    "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=",
@@ -2375,84 +2410,91 @@
    "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=",
    "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-alpha04": {
-   "module": "sha256-aqFPy1x7azOaQkXjSCA2jWL2o4Wahb9eU4e0Vf1VTK0=",
-   "pom": "sha256-y0+U9WGyH0BMf7zIZeF5+hHKJTf4sZjQ0IRnNrajdnA="
+  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.4": {
+   "module": "sha256-o7yb3i/+/IFT1Sr8WAQms4rWV2yuE0a7jIPbzFBvAPQ=",
+   "pom": "sha256-BjXG8hQBtELWxoStOF6vEfzeJDv7dZbGk62+tZPwobM="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-alpha04": {
-   "jar": "sha256-0oShPRDCm4/pPqXDlBPLjXQGUyug8Tdg98XOOq6Xe4Q=",
-   "module": "sha256-esWuBXS3RpwQThCsq1fLSNIWLv+HqKzXVnssnlboViU=",
-   "pom": "sha256-uegv/vs3HDMYEeBv/sb9ZXxGU4NJllBoU6tYlfZaXpE="
+  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-beta01": {
+   "module": "sha256-ZLmuzdwnt+qpRzolk2c1cBBXIl221XogCWuc/eAhlLU=",
+   "pom": "sha256-uBHnNujra8qzTsj56rfJ7y5OBRja+mYilPuwNXcciOs="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-alpha04": {
-   "module": "sha256-zKUN2P4iFsvYiFY9EYeH/MIsJdtDK75DUTVCXEblUhw=",
-   "pom": "sha256-5Hd36RAmo6FWG6DQRaXA4qAP3U27+vSG6sSV5k4lfHY="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-beta01": {
+   "jar": "sha256-Un+IWVJCklMxmsMPiwfrDB6xFhJxUB7hMz/9D63aSFE=",
+   "module": "sha256-GJbs9dXwXbm/8wBLirLq+eop3Qrq2mrs8068ocnWFtI=",
+   "pom": "sha256-ZmiocEG8g/WJusRxx80s4j8TL/lwv52WBAq6mQDzr4s="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-alpha04": {
-   "module": "sha256-bknNPW5DPJhx0PwTQb6lYTv/qA6zDdl3a1t8zFJHuas=",
-   "pom": "sha256-IbBAlrekoKrDY3mx/9kntqdMo2p7qnXpVeKDCDGooEo="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-beta01": {
+   "module": "sha256-jcpLfTCKtF4FOzjXWyuVHFXXnLrVy1Tnr4IFdJkonhU=",
+   "pom": "sha256-k8WMxAtltXEj6RRb8Us/qmxpUh6o4+GzWtXVKCvrPVk="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-alpha04": {
-   "jar": "sha256-3f7rkmLQZaY8VAvnMqDmILZ3rHrvLCE6WEViehKSmSE=",
-   "module": "sha256-GexRNKE1HoJkB7/BdOirRTKG1eeQD116YiGwmDpnb7g=",
-   "pom": "sha256-48MWNEKfaaHQJ26ICLbpl7QDjCbfXVWTGeMTqe3DYLI="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.4": {
+   "module": "sha256-t/5oq5S4ncDF1wWltk3LDDyDpITimPNfA2x5cRZgHqQ=",
+   "pom": "sha256-DQ7wsV76yiXtdgT6FB0OjT+6iU0wl511DVBpZrZg0Dk="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-alpha04": {
-   "module": "sha256-+9ayBiK9qNkZRCxpdHOYde6oLKsJaLOnPge4W1IGQ1Q=",
-   "pom": "sha256-fbPEU9dzg315i1FjOYEM8BJVysWTiBWNFgR+c5Be2gs="
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-beta01": {
+   "module": "sha256-cWwsA/MF++hhSDQ9JohKhimsBFyoIFN/0Z1YPCvzjQs=",
+   "pom": "sha256-fo5B0Yi/cBXNVb0JAe6dLsR/az7eAVivtzi9tqpdO2c="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-alpha04": {
-   "jar": "sha256-FvZbSHgaFMaUIlbxNBVMBUBTKqpCF3t3++WbI+jRs9Y=",
-   "module": "sha256-sNV0hf7suQu9XH6cEl3m4MjMoggyRlZXUvruc0FviWU=",
-   "pom": "sha256-HwUIvK17WzGQ0hUOFF4uWjNOnngubx7+0xj7ROm6dwQ="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-beta01": {
+   "jar": "sha256-vkeGqLdCblmyj1KvZPQ6diQpTVnLFYoM4t6DCxz5w2U=",
+   "module": "sha256-2bf33ULscIs0ipCZGIJiPPe/KtcdV1M9VD9Qy6z4Un4=",
+   "pom": "sha256-DAKhJosUOQC7IgGUe8TA+7IyhS0JWIibP85vNaiXLrA="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-alpha04": {
-   "module": "sha256-gKcAIcYGY/cR5VNPT0yjp00OJRlAeBuYhTF2bK4UQzs=",
-   "pom": "sha256-y/uF18Nt6BJq+dMSSopge12enEwOhoG+TbsYGpIkYTQ="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-beta01": {
+   "module": "sha256-yhsjvflcvr4hVzAqxK9OU82+C8GlBDrl4QDYKbBU4b4=",
+   "pom": "sha256-eBfT+NqhT4JXqMeIAvFVBjd0Cabo1NsnjQgXKvusjQ4="
   },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha04": {
-   "module": "sha256-CFQVo5KYYbwCv5xCBLcAn3nq0287BA6wYGECflIfyjQ=",
-   "pom": "sha256-giBGHdXfQbn0Sf4U+c2i9eoSI2gGbsx9HHa+gbNj+Tg="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-beta01": {
+   "module": "sha256-Ei5ZUR0skw5pCrgzu0jeiz91FuhtdXzpiWXOhzZQpos=",
+   "pom": "sha256-BTgUyvfv+6KNCy96AUXNUceYJunaXQt5vd+OQO7SG9I="
   },
-  "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-alpha14": {
-   "jar": "sha256-lQvnQVnErCjzcuGoNdn43Na7/PwhRDXZZXYYknvbKWw=",
-   "module": "sha256-iv67qHpYcLSEfCMAzWy4v9MN1UsyuyYAMDtos6DAcqY=",
-   "pom": "sha256-5MbcH3rekEXjNnczStuluQxWGjJi5PZoDcPe/E9F1DA="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.4": {
+   "module": "sha256-YdkxJsnivTyFp0+XrYFbxhi5A52bFIOz9OXp6Ayc+Bw=",
+   "pom": "sha256-7VnmgyoqJ4xsYcgDMqFxWJmewWE90Cvir6DZ/PMbvfY="
   },
-  "org/jetbrains/androidx/navigation#navigation-common/2.9.0-alpha14": {
-   "module": "sha256-P+Epqwk2Z3VEJoKGM1A+rthoAaK8U3Rkt1zEehv+wzI=",
-   "pom": "sha256-nTK4Sfn/CvXOS8vbr73cVQQL+xYqQdkRGO7HrOyc8JQ="
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-beta01": {
+   "module": "sha256-oM/i3heZ/iUMbO41knhWaBMeqoEuUGCsNhHnajXveSY=",
+   "pom": "sha256-lLcArsaFKLT/q+cNW1YprbF30z5jNz5GOnjYXLtxMK4="
   },
-  "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-alpha14": {
-   "jar": "sha256-2fTNWGnlYiKAiO847s/4e1zSUVxXSSA4B/vYO+pTwq0=",
-   "module": "sha256-XDYB5RxltcvX+zXaQNBYf6Q60lTVaGV/xCZPvmI65Ls=",
-   "pom": "sha256-RwX+glV/+QAjKDxQ85PncaqNInRtAflZiST+zQz1b3E="
+  "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-beta01": {
+   "jar": "sha256-M6NE+IJwz9Ytz+bRC5qJoANQZYbFMRPrYz1BjCTzw80=",
+   "module": "sha256-X+daTls+i55kOG0szFMtoI/J5FkL8P3JQdjKQ4URLQw=",
+   "pom": "sha256-iPweKXKC5wfVzv+1k7KA6rCojzoi2WZI+Dx+vunpJFE="
   },
-  "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-alpha14": {
-   "module": "sha256-qcO91XvDZpKz2kv1/bk70d8fstKt3fl3i9+u4gGOSVs=",
-   "pom": "sha256-mapb841feXzWuyMYMnGi5qzLMVaIP0cNcwREmMsHufw="
+  "org/jetbrains/androidx/navigation#navigation-common/2.9.0-beta01": {
+   "module": "sha256-JDoBviunsq1nl6VJkFcTz82ZNMCWbryalCA+giPGdz4=",
+   "pom": "sha256-WzOCSOVSKoWZhU5s6lXvz+TYjVQLTZJLEKpJSGJNj8E="
   },
-  "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-alpha14": {
-   "jar": "sha256-kcV34HYpS8w/d/Uak8aHcTsWHp/UEi4JQ93kL748wY8=",
-   "module": "sha256-ctyeUp5q13fCG0tGGMFR9xlhxGBXFHLCTiqzc40KzTg=",
-   "pom": "sha256-rwYCidS9nQbH6aSqZIQ81jvGQJc4R6DGEjtJnuYWVcA="
+  "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-beta01": {
+   "jar": "sha256-5ZvQ507b/2dzjfBaL3kXVriiaQmnj1S4ZFtYzp5wJk8=",
+   "module": "sha256-+qRZvNZG42K7i46x5TU3Po2ITmHSP/BKkoO22YqmGPo=",
+   "pom": "sha256-eVmIq3RgJXNxZQmzZHe224A+qCBtcf/PyieLc39iwGI="
   },
-  "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-alpha14": {
-   "module": "sha256-2UTxuyQaMEQPaM1yLJkSv06Sp36qL44OBuq2dxC+7mA=",
-   "pom": "sha256-kTzW+l0TI2YOAzxJJwoqOybSBomTbqKu82RMxU5oSmw="
+  "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-beta01": {
+   "module": "sha256-CkQSpwXQnd9xRDhKArbbkC+fci7Et9j/AH3UR1kfYbI=",
+   "pom": "sha256-RyQ9KSwd00rDTBrqeECqFiSRlOddqcr/7A59oTfv3zw="
   },
-  "org/jetbrains/androidx/performance#performance-annotation/1.0.0-alpha02": {
-   "module": "sha256-y892B/wsGu+lmgMT6hWE6gEIdc8Xnnu0TEYPVZnNc+I=",
-   "pom": "sha256-tFBttAnpLok73PB36S16gG1UTSN/7gb6JIPrjCFdBcM="
+  "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-beta01": {
+   "jar": "sha256-GN5zqUv5TtVZjrvmJeB93vbOD9f71piowakS8hQGVDU=",
+   "module": "sha256-edcCcy0prYG8Zot21OSGBFuqGFkxFMfSw4FU2SImzoc=",
+   "pom": "sha256-BSpQlfGIeaiC+tUpphjqwEJEf5hyu/ZGfRQNZu+fiow="
   },
-  "org/jetbrains/androidx/savedstate#savedstate-desktop/1.3.0-alpha04": {
-   "jar": "sha256-41987aa7a73hycDhjM16ps4bdeNGCfgH6ihIBgrY4bc=",
-   "module": "sha256-rqMsjfibFAKUunDY5cM6DD4s8DH2IEJjJQ312mzVU0A=",
-   "pom": "sha256-cYUyHCtb5DXgXMQpVT47ML5BykjpBjpALGaPv9S+iWY="
+  "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-beta01": {
+   "module": "sha256-Z4Dp9626PvGI68qPOQptNVw9dXChFEm/X8QoX5JwCKc=",
+   "pom": "sha256-dupghtMADJIHyQjzNvNF24RXU3vFULTSLoAEGp7beg8="
   },
-  "org/jetbrains/androidx/savedstate#savedstate/1.3.0-alpha04": {
-   "module": "sha256-i2FTZNeMO3Ki3XPl5dLnqG9H2K1/dP+1TjERVYhN2Eo=",
-   "pom": "sha256-ncPtVEigP556xWa9fJkp+RdYrNclUtttMuTum55Ox/4="
+  "org/jetbrains/androidx/savedstate#savedstate-compose-desktop/1.3.0-beta01": {
+   "jar": "sha256-zd0rFznOPGXKigQft74f78XDnWvbNXy6Th4Jd7ZNHuE=",
+   "module": "sha256-kIPisn4nLZItcz1y0S8OMF5rOY4Rfet3xwV2NTUXfyE=",
+   "pom": "sha256-P5zq2UQ6VpFHvz/iLg3xBBk0kLCH/q3rymtr+OdG95g="
+  },
+  "org/jetbrains/androidx/savedstate#savedstate-compose/1.3.0-beta01": {
+   "module": "sha256-kZ23fpxTkmCqzRq4eOsOTfpxSjLsUInkzt9/IrG7TXg=",
+   "pom": "sha256-ypq0MP7e4nrSX1zhOv8UmAFpxeyTjqjPyE2ls8fU0m0="
+  },
+  "org/jetbrains/androidx/savedstate#savedstate/1.3.0-beta01": {
+   "module": "sha256-M9qSImBQ1pVYZUg9UskDPhkxqPe6NuUJBrOjLlT6cG8=",
+   "pom": "sha256-3Gkal5kYzQqtfztZhD5qDsZXHOG0CdvGkBxqs0gnQrI="
   },
   "org/jetbrains/androidx/window#window-core-desktop/1.4.0-alpha03": {
    "jar": "sha256-TxK74lqFammMZ5aUQvQZcu3/qS0QfscnRSqs3FV1tg4=",
@@ -2463,99 +2505,132 @@
    "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=",
    "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y="
   },
-  "org/jetbrains/compose#compose-gradle-plugin/1.8.0-alpha04": {
-   "jar": "sha256-2WBK5Um8q507w3WtQW2ji06xPpYvX5Hb7TIoofXWgxg=",
-   "module": "sha256-Gth21E1Ko0iLdc4WCDX9MNfJ5zjtIQzUQhYLtpOI9WM=",
-   "pom": "sha256-u9FEofPKM25kpi+2F1lo1yhlCmIzgzQoJBZqvrZbQf8="
+  "org/jetbrains/compose#compose-gradle-plugin/1.8.0": {
+   "jar": "sha256-aSL7ZWSnNrgXACCREU6pe6qV1xt/cBySFn4ye7yKw80=",
+   "module": "sha256-LULcWegTIYH/ViDJeXjDz6gPSGnSWFbDwSOcHKZYKlI=",
+   "pom": "sha256-+N2AXpOZFg2IR76ZbTLqq/E3QHJH56C6BumhPnd9J8s="
   },
-  "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0-alpha04": {
-   "jar": "sha256-P5gb/7uA9FJx5DwcSTBKZkaPA111MCkA2Km70SPPUM0=",
-   "module": "sha256-btmw3t87doChrQ5ax3+br5laTF0TQjXEAyiEFrpSxq4=",
-   "pom": "sha256-vozzwcRUa5YqICnukSMGH951SdvXNmil91k2CQ68Vos="
+  "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0": {
+   "jar": "sha256-rLxhCUpV2YYgKWT2/THl2BGAiy0hoQpg3Adklf7DHoY=",
+   "module": "sha256-4LIRGuHu7TDa8hjvh3JuAA5snMC8Pz5IOPOWplK0SwE=",
+   "pom": "sha256-dg/9F9wiphxCGeRGUN0ps8Fbs0CHb20XZJVhOaRHWbA="
   },
-  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0-alpha04": {
-   "pom": "sha256-LloUKySgGL+p98Vv1ABrhlOUxEvzHVDCOfQRT3hLxQc="
+  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0": {
+   "pom": "sha256-x93pQCg2ArLRTHCEbLIVTQxyzwsHFWY/wzkqjM/h/BY="
   },
-  "org/jetbrains/compose/animation#animation-core-desktop/1.8.0-alpha04": {
-   "jar": "sha256-KRrqHKb+qzsKwxzBZG7i5jQVLigruiY2/dfht+DFtQw=",
-   "module": "sha256-S/W/S2PMtco+xOpNtVE0LB7OUdiMvrhbsZHph6T5Xyk=",
-   "pom": "sha256-Pi27qd9WDdTiM94hqVBN0NwjcHgwDLxFc4QEHtTecCg="
+  "org/jetbrains/compose/animation#animation-core-desktop/1.7.1": {
+   "jar": "sha256-KzR6v2xIYmFToCtw7va74dPJUnUV1vn37OrqPDmFM7s=",
+   "module": "sha256-c7rYgJkZ/IbsKE5mCKv603DsBjPtbHWV9ptYNh9SAD8=",
+   "pom": "sha256-xqopawWzH+UZ3cIswgrd989vsdtV+anMYJ1TL/h/81w="
   },
-  "org/jetbrains/compose/animation#animation-core/1.8.0-alpha04": {
-   "module": "sha256-fDflvEiuq6jUGjBXSWbJ6DS3k9Exhq+gWWCiRYZzhnM=",
-   "pom": "sha256-Gx5oYdORxl/GM/eKaNj8oxGjE84p2LfslxlHCy286UY="
+  "org/jetbrains/compose/animation#animation-core-desktop/1.8.0": {
+   "jar": "sha256-2j8nJnMX+ofR1II8nBJXHsfkVDtPylQ+RTXgDQ159pY=",
+   "module": "sha256-hFifYJt6D2LfyxkTnDmBKEshWe0VAFP3LfM1lSDjVlY=",
+   "pom": "sha256-RchxHspESqUreP+bwhucfANFJlSMPQVlV5JxzfIF3JM="
   },
-  "org/jetbrains/compose/animation#animation-desktop/1.8.0-alpha04": {
-   "jar": "sha256-cunpgaebbblw+8dwFjiSt3PinbG33L8Khlxew07T+aw=",
-   "module": "sha256-0oaNiCNmM4ZFs6s1u7vO3g6DzCNYVzn1P/tB9yjVS74=",
-   "pom": "sha256-EXEmubeGcJmLLT77p77E7PYB93degR1AaVqTgoHzfGM="
+  "org/jetbrains/compose/animation#animation-core/1.7.1": {
+   "module": "sha256-v4u73LKXNY9tN9inJOif8+kLp+VkA26ZA5X3OwxEjMo=",
+   "pom": "sha256-VdE9LN1WVa+tasG8Ou5rMU2ILf6Nj/UVVmsHj4AuKbw="
   },
-  "org/jetbrains/compose/animation#animation/1.8.0-alpha04": {
-   "module": "sha256-CKEQLW2XTTeC9vPTqP2xxwabAfvt+xOoPrJQvpuj2iA=",
-   "pom": "sha256-xj9AG9d+sLiw6+6JyJAlHBmR48lyHHfzaG0db6ADX6I="
+  "org/jetbrains/compose/animation#animation-core/1.8.0": {
+   "module": "sha256-wnbpIfCcOS/H5HKfAMsjkbWhHAikGqQyGjd+4HKfHGM=",
+   "pom": "sha256-cbxoH0utJETNmIRasmldO+0TossumHOz5dUkXxZpGWs="
+  },
+  "org/jetbrains/compose/animation#animation-desktop/1.7.1": {
+   "jar": "sha256-R05r0qasI2Ll2r14D5O4UnaGQKoWQDsPxQXaiBd/l7M=",
+   "module": "sha256-kw0qlickr+L6z9eYIQfYCmkGh4hHCl1VrcDZj3ijuwY=",
+   "pom": "sha256-j1SyEA/7lX0HPry7gxTwvEne5FWIH9eLvhKnBHnjFwU="
+  },
+  "org/jetbrains/compose/animation#animation-desktop/1.8.0": {
+   "jar": "sha256-d+pgLVlMokOK62MF5PMmZBBXHr2ATbw9ITD1kvVmLiQ=",
+   "module": "sha256-lxLKBCKOJdVu1mJViL2NC7BsOqwbl4kcZNZqrEMvq10=",
+   "pom": "sha256-IBL/4ngEVK5s++GbOhuhVUFtxQeQBxLrQl6C/QiQV/g="
+  },
+  "org/jetbrains/compose/animation#animation/1.7.1": {
+   "module": "sha256-leqNJuQAkoHcPo60WyBfj2ZrQmZmtRisSaapUwKiicM=",
+   "pom": "sha256-Q9zVYfPQZrMbAQsujbu8xvzr5dF61PBt1NR93+hF3SU="
+  },
+  "org/jetbrains/compose/animation#animation/1.8.0": {
+   "module": "sha256-nIi46Jjj4U/ezOhqAc++Yt+2kl4c9QfZS5gABy61ZhY=",
+   "pom": "sha256-bVTqkvkFLAPOI8hUuxgwQv2tGAfI9sfnPJaYpPXjs8E="
   },
   "org/jetbrains/compose/annotation-internal#annotation/1.7.1": {
    "module": "sha256-OBY3qiWg10JF0HpLhxPDjcUBtU+yWvnWHdwzMR9AFhk=",
    "pom": "sha256-exANVYBe1I3wrGACFGbx1YcGM0wXJ9DQhRrNt302Ptk="
   },
-  "org/jetbrains/compose/annotation-internal#annotation/1.8.0-alpha04": {
-   "module": "sha256-IPD+KWwOHKwUt3lpz+YNjrqOhgRFq/pJaP6G8zW1Kmk=",
-   "pom": "sha256-y+VVh6dkRxbLCSwF7tnKzkcDmzzWqMvbBcDT2kOfKx8="
+  "org/jetbrains/compose/annotation-internal#annotation/1.8.0": {
+   "module": "sha256-JVyVeH8E7aWagHjrCzbuD/vxTBOcqD9wLSfkV8tBp3Y=",
+   "pom": "sha256-gfC88mZWJitqfVKp9wf0iJICL88O489YW7XCx+HJ5Qs="
   },
-  "org/jetbrains/compose/collection-internal#collection/1.8.0-alpha04": {
-   "module": "sha256-vaFu6aIimSDvb3uPClwDQpd/ULoPX9c26t0Ex/cVS6c=",
-   "pom": "sha256-tdLR02XqaOZqtCrrGsKIOlEEhXKyCQr8Wtj4vciX4vU="
+  "org/jetbrains/compose/collection-internal#collection/1.8.0": {
+   "module": "sha256-ywOV+BE1yWpiJ7Tqvd3TZ1F+JXiu9F+7AOlRtFkToCs=",
+   "pom": "sha256-Cx4ZY/TpVLIx3/lNnvdpkUsDRcjPLZbQ3tOEMENlNWE="
   },
-  "org/jetbrains/compose/components#components-resources-desktop/1.8.0-alpha04": {
-   "jar": "sha256-G1jfMsZ/+08PPbwV/am5WeLsP0PgvFbdsIi+NRI3uaA=",
-   "module": "sha256-eBTk/GIdZEvVU2yX0kEX5zj7ca1PX9K0gwvkDzRyST4=",
-   "pom": "sha256-nNjAAz37WdYh2qf3/uMGjmX6WxXFzOQjhUc1ZRf6pZs="
+  "org/jetbrains/compose/components#components-resources-desktop/1.8.0": {
+   "jar": "sha256-yzw74W1057pEfF4MXve7piZKmkF47jw3L486T/cIbPo=",
+   "module": "sha256-HZLCYddlCxManhDnWdHvFKg0P9qaiO86I7TeuHHHHM0=",
+   "pom": "sha256-dhsFXT1M9jqDqB9+rswsjz3qJJzBJ5Khzi544XaAb+g="
   },
-  "org/jetbrains/compose/components#components-resources/1.8.0-alpha04": {
-   "module": "sha256-QaapFBtuLRStUe2FSWfscImfxAxlzgr9py7+VOqUviM=",
-   "pom": "sha256-4YEBL4X+jda6rRYB1/ADf4bL168vEtcu7AXg5ucLwuY="
+  "org/jetbrains/compose/components#components-resources/1.8.0": {
+   "module": "sha256-z2Znv/bNeF/ih9cNRhCFrP5GLDVbi3ght4NYOlnKIM8=",
+   "pom": "sha256-AjY8sK/YwwTYkbCYiWhIpGXjxu/JGSbdrU6gJ45Lgrk="
   },
-  "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0-alpha04": {
+  "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0": {
    "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=",
-   "module": "sha256-5ZNliGoYZ4baEJQFRAwiybLJ7i8j0aqcyiVYfydyY/k=",
-   "pom": "sha256-JpKpRqmhhwNK+etHaGNO8mfl2XM9cDL84YJ9qN3sdRo="
+   "module": "sha256-vksrZ9lzXKJFvB1F+0N/jgvvIaf5OlD5/RLn7xM88tc=",
+   "pom": "sha256-iMEszobdK8hdFv0zIMzMIUJ1xjSN72yFabOjHCrtnl4="
   },
-  "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0-alpha04": {
-   "module": "sha256-4AO3yPVIehqTsA0DnKEAKIUiMYgTWk/jG6/wZkTyKpE=",
-   "pom": "sha256-biX6hgQI0jdlIhg5rrl7pEkRh0Ac3kdAGKgCnfbdeOc="
+  "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0": {
+   "module": "sha256-vl8m7Z2We4Iw/WkBUIIiUfWiEA4jDMnBIJTlyyEEZXI=",
+   "pom": "sha256-g0jJHAR0fsxpJXxAcqCjUJTDBW7oQ+nWOTG2spghkXw="
   },
-  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0-alpha04": {
-   "pom": "sha256-dIPgJCP4kd0RMgMVhp4Buyyrg3GKAbOyg3zWdIYb8iM="
+  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0": {
+   "pom": "sha256-EMmZuRJK6U9YNfb3cygd0h2PCbywt2mMjX7dn1B5CLs="
   },
-  "org/jetbrains/compose/desktop#desktop-jvm-macos-x64/1.7.1": {
-   "pom": "sha256-wmVpVQhvtQIR33ifcfL5M44Tqr+tbRPC8C0Qu4iPmic="
+  "org/jetbrains/compose/desktop#desktop-jvm/1.8.0": {
+   "jar": "sha256-Wm8xHTJrwA6Tvgr79cp7lZCzSDeOc7whAzRlZPSAc48=",
+   "module": "sha256-CtP/+k+q2WVEHOCsUonmBq0FKbjfgJFic72NjgvaQUk=",
+   "pom": "sha256-jpo8rUlmfB4gGXKtjTSkTUV0LWIxTAVctQjsffpGiH8="
   },
-  "org/jetbrains/compose/desktop#desktop-jvm/1.8.0-alpha04": {
-   "jar": "sha256-IZE7EA1GFlcHsrZW7Vs4vI7aD2Bj9VMnh+nRv3+UPv4=",
-   "module": "sha256-px3tHKJpOpZPpS18KyGDEaJqeL8iAzkBnkHYFdZGYU8=",
-   "pom": "sha256-gsz84p4fqrIpVYptzzg9R3aFi2aud5LPxIgrR79+knc="
+  "org/jetbrains/compose/desktop#desktop/1.8.0": {
+   "module": "sha256-yzAkUD1V7sJb9YUnIRq9Cv4weMjOs+0ygDdr/3vjERk=",
+   "pom": "sha256-6y0XbrT2FJJjy85gfdj5W9Q0Td2eUElILcqzz3sUiJI="
   },
-  "org/jetbrains/compose/desktop#desktop/1.8.0-alpha04": {
-   "module": "sha256-bsLHN/jwn0KVOFMJFeOZJxXRmQQX1cmAYt2XH+G5CwQ=",
-   "pom": "sha256-A5sexl6DYuM28keotN4oELcIKFKvMNjz8OxFBvpWZQ0="
+  "org/jetbrains/compose/foundation#foundation-desktop/1.7.1": {
+   "jar": "sha256-UN84WzKKCtekeeaQz+WT+84IrTntV5FnR5MpVt7gfws=",
+   "module": "sha256-e0RnxpVJc6cG2nTOLI7Te4RlXSxSGWWXHWgCb5iBTJI=",
+   "pom": "sha256-aAvQ++JHgzK+3kUTK1VmVNpsK063CPiqVp0bvV3AZ9A="
   },
-  "org/jetbrains/compose/foundation#foundation-desktop/1.8.0-alpha04": {
-   "jar": "sha256-UsZBh9YVrTi/PfQQaLKgGA2BiND4dfeaRpOPMHP9r7s=",
-   "module": "sha256-okLMq8ahtwADXCyTAFnyKsMC13Cz1KWk8sTEJncsGgM=",
-   "pom": "sha256-Jla3YP+wk7QTcc08ppcQM7lGAw6X1Ti4ux0z6YLfeM8="
+  "org/jetbrains/compose/foundation#foundation-desktop/1.8.0": {
+   "jar": "sha256-+J3Onwy/VBxH3dYWzDIpNR4GNMYFUbZSv+m5I0xNfJw=",
+   "module": "sha256-bD/+rRaCdURwqxjq4sObxR1yTtS+QF5u6a4hz844Ds8=",
+   "pom": "sha256-eSZSXsbAjXxqgEFi0fwnSsUySVd8/3wrjjKs3EfCeUE="
   },
-  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0-alpha04": {
-   "jar": "sha256-OCl8mANYZ4ojg1m10ru5DhE2tJuADGsvAnboR1q+SMI=",
-   "module": "sha256-HHEXynrYkcMxjqbl2Yi5xJHJipaCJDOFCOcGrhi2X9U=",
-   "pom": "sha256-K4qgsUplVMBjD8rpIjDAQae2np2tNs15ILqj66+ZtrE="
+  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.1": {
+   "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=",
+   "module": "sha256-aeRUgNLR3M8Hdzyq5gwdkvTu9PxF3K7luOg2KFlzsBc=",
+   "pom": "sha256-G8KiSCB1lID95NL6BswigNBCOpXAohpoUdjOfoaxnN4="
   },
-  "org/jetbrains/compose/foundation#foundation-layout/1.8.0-alpha04": {
-   "module": "sha256-3j0zb44v6qd5Brs7Mt3WQN8W3Ci5+SAKcSZDtKT0mU4=",
-   "pom": "sha256-8F0/i7DVy4p5OtG8OD7D0IElawLjdAPCxanSqncqoEY="
+  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0": {
+   "jar": "sha256-Cb8kfmXy0+KuMJB6AdRtyRqKahQS0aXrYQlYE876Q9Q=",
+   "module": "sha256-e/WLBp5H0rT8HF5jQP+/B6xv49JpsfDMfZZgglgtAsk=",
+   "pom": "sha256-VbDLQsqY32XlYQw3NXM0Ril7rKaoURtsJzI4AD/t/xk="
   },
-  "org/jetbrains/compose/foundation#foundation/1.8.0-alpha04": {
-   "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=",
-   "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU="
+  "org/jetbrains/compose/foundation#foundation-layout/1.7.1": {
+   "module": "sha256-U7+p+nvaWJ4NsTtyjjpWFPKMLJ5fvw8I862PKxT1hNE=",
+   "pom": "sha256-9+spSlpczBUbO2H9ot/tBcOpmErsNK3xp1VUS/2BN6s="
+  },
+  "org/jetbrains/compose/foundation#foundation-layout/1.8.0": {
+   "module": "sha256-kZ2+V0N3+oPDT+EarskULhuFLkvKSKGUgo45RHSE+U4=",
+   "pom": "sha256-TIKvGCN5+0QxtdSGXwBGCAW2UKZ5mASgGWJxAWWME20="
+  },
+  "org/jetbrains/compose/foundation#foundation/1.7.1": {
+   "module": "sha256-TudcyFcJEkmZZlCgo+Ag0MOoaHZtnB5ZdqySFMioscI=",
+   "pom": "sha256-js5Yc65fY4YFqEdPVZITMFGSkOcohMk6yJXSIN7/34Y="
+  },
+  "org/jetbrains/compose/foundation#foundation/1.8.0": {
+   "module": "sha256-oB7rvq5HQlt2qf87ag6zygwXijA/BbnTQ0Vf3L0TWMs=",
+   "pom": "sha256-eUpLO7pJFPEzY+j0dJRoV3Va4PHJg7ctweuu5y0pyeo="
   },
   "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha05": {
    "jar": "sha256-+2p7PMWZNC8rUApqQ17M8vue1B2pcsfUgCzbSn4DFGI=",
@@ -2571,10 +2646,15 @@
    "module": "sha256-LBG1MeaMgYj7+H0QTIumK3trdF5wPNaCvqLcdiG8YXg=",
    "pom": "sha256-Qx1LGtWuX0mxy0TAYzZR6WmPpzDjcKR/iziowomZt1Q="
   },
-  "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": {
-   "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=",
-   "module": "sha256-R096AAjrxZC/DOA6pAcxDy6Qep2M9ZWOpfZnZbZ4Ftk=",
-   "pom": "sha256-AaGiVgwez3+fFyDjdjKGa+OiMDTs9LWGhVKWsVpuC6Q="
+  "org/jetbrains/compose/material#material-desktop/1.8.0": {
+   "jar": "sha256-ktEOLNLJUFGKUWVSWH0ri+cDBrP724Sa8ajhCppAhiA=",
+   "module": "sha256-vgNb8TfUbWNZ9WplSP/x0ILkpzEd5uuN0zKFkqi/Rqs=",
+   "pom": "sha256-wU1/lp3yeY5RGillUC1TwUI44EI6+womYfiAOheMCDk="
+  },
+  "org/jetbrains/compose/material#material-icons-core-desktop/1.7.1": {
+   "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=",
+   "module": "sha256-dpqLgvJ7j5oIElPV7o/UittRBgrNnC6HsozvYMG28kQ=",
+   "pom": "sha256-AzQzIbHALCbkTVxBLTW1r1hIapEJ/YiUheHWf6+cdIc="
   },
   "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": {
    "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=",
@@ -2585,211 +2665,314 @@
    "module": "sha256-VcHqxOfrTOt14Cav0FTk+LgZBVPgJ2zuvR/HdXisYcE=",
    "pom": "sha256-964wavWzWSCtqddmkygHpwQ7vFLBD8DBVp+BohfGoV0="
   },
+  "org/jetbrains/compose/material#material-icons-core/1.7.1": {
+   "module": "sha256-B5vF4xG7NUubyRRi8TaEinU/3LQaox8NqNsYl657rOE=",
+   "pom": "sha256-4Y+gqZINr+qVp9YsZKGcgSLS1Bo9+JitPVSsMds9aqg="
+  },
   "org/jetbrains/compose/material#material-icons-core/1.7.3": {
    "module": "sha256-bzMObQpiopITWjDBxT6lGWrXrrBIZ5r2Hk/JKmYukHY=",
    "pom": "sha256-wDviSkFlDR3YN/+tAA7Mf8y+y2EAoOj0gDmEcMQqhGo="
   },
+  "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.1": {
+   "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=",
+   "module": "sha256-ysKEishpAGbgJfbrPNMsDWqjBVLL8KTedb6NFo7TGY0=",
+   "pom": "sha256-Oncw3anS5QyIDaNSeoXSu/UZTjl52gtZakxq4BUWxCY="
+  },
   "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.3": {
    "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=",
    "module": "sha256-PYIoDQjwjMPjN58f/jiHBUovuDfknStj1JIumjf6ecU=",
    "pom": "sha256-cD/QmE10zp88WXPXTsyyxD26VBml9VT91Ux0URHkfzY="
   },
+  "org/jetbrains/compose/material#material-icons-extended/1.7.1": {
+   "module": "sha256-3kM5Kc+XUZJrJ72xEbkNs2X4ZWozURLx0Tn5+sU+vyg=",
+   "pom": "sha256-fBBibxuyLO7dQpV6fheDlD4uYEIfWUTOJrnNCq6wYBg="
+  },
   "org/jetbrains/compose/material#material-icons-extended/1.7.3": {
    "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=",
    "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw="
   },
+  "org/jetbrains/compose/material#material-ripple-desktop/1.7.1": {
+   "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=",
+   "module": "sha256-476a8k7pZ20fYnKKt4BhaTS0Rqe4Z9wVVKqBaGpQE8g=",
+   "pom": "sha256-J3joa5k5b8ZfhR1C/BJ5Ku0hWYw4i8PCFlAIpRlOpfU="
+  },
+  "org/jetbrains/compose/material#material-ripple-desktop/1.8.0": {
+   "jar": "sha256-VRZAECR5rIOkGqSp6X2aMtbS9G5xvXvBG9VdIZVNqv0=",
+   "module": "sha256-Q2Cggw5aZXar80BtGFiHL/lUAZOMKiCKuX5jXGYz5qs=",
+   "pom": "sha256-WMcEcfjk/p863JAHkHaT5ahQpjSZ/Df6Y1d/J5FurAE="
+  },
   "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha03": {
    "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=",
    "module": "sha256-EtHZWUpaT43b+JNnLr0UNH+46uVvUsDso09uxw205gM=",
    "pom": "sha256-0bQRtiT+S+VGZx57wM/MON424kPVd6XK7jGg5DhVDp4="
   },
-  "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha04": {
-   "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=",
-   "module": "sha256-oM3vSNacD0JZtYIvq4B2Z4QIYiHfaFioE2o3SpNdA34=",
-   "pom": "sha256-nLydR64foEZCAi/Z8Rkt4ozRgPFZ2k2SZj6cshQIiHo="
+  "org/jetbrains/compose/material#material-ripple/1.7.1": {
+   "module": "sha256-0a8hV2+VfuVB6qCEckE116Sr0nNXTBJFUpWsXCFntBU=",
+   "pom": "sha256-8WQUEqPikyViaWeNGM41NQFS1fRNm4S0Dl64W/TvSdA="
+  },
+  "org/jetbrains/compose/material#material-ripple/1.8.0": {
+   "module": "sha256-93ghI7Ew1ukpYGyR9PQjJjCo37cAn8FKR0rv4msrllk=",
+   "pom": "sha256-9DNlRyFU6GzD6NwoPycABB1BFQdC1NS2euHTfvniC0Q="
   },
   "org/jetbrains/compose/material#material-ripple/1.8.0-alpha03": {
    "module": "sha256-RsSmhJ+KpLqDYBhJAqEx9A6kNmzAa/7eHwLOozoq88I=",
    "pom": "sha256-dfywyKynZatgupUyaZC2o3BaMTs7JMefGvPEGfsLAjg="
   },
-  "org/jetbrains/compose/material#material-ripple/1.8.0-alpha04": {
-   "module": "sha256-iTZr4vBCDfaIQuwAb7nKj2FbhbQzXgSOplOAHXazhho=",
-   "pom": "sha256-HDkzxtQw3cr4HRaHNZF5Xi2EL1bI6LK3+Bn9rhaFmoo="
+  "org/jetbrains/compose/material#material/1.8.0": {
+   "module": "sha256-lnnDZXWONebllUyL0aHBmyjiHdOOWzkjdEFwyAGFVx8=",
+   "pom": "sha256-Ux86K/vY/Xr39bzXF+vLxaIT8XFPefcpm667fjg0d2M="
   },
-  "org/jetbrains/compose/material#material/1.8.0-alpha04": {
-   "module": "sha256-Nw5J10UtSt7rZIbZyjV0xEIBoMfBbEbe7VyLW7xHWus=",
-   "pom": "sha256-FcN5SQtW5NvA/ziosiKCm00iyQJj5J41CPaiRqdwkbY="
+  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0": {
+   "jar": "sha256-E1debVxaFkCwB301AFZ5aB0BfypHFgaLCwMTjqWfWwI=",
+   "module": "sha256-L80XCd220VjiaqC0ggndmjeX0DYrQyrCj+oOV8HPTbM=",
+   "pom": "sha256-h+LOAWqiS/f6FP5Tyicy9PQnBmofe4LzLmrnDMUZOno="
   },
-  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0-alpha04": {
-   "jar": "sha256-9Uj8r2rhipDxUf74oa4gtk3ajY6pXEtRmkKriHx+lBg=",
-   "module": "sha256-02VF4O1EUxBsJWEDq0s//c1ITJvBIQXp2/CGDZEqe+s=",
-   "pom": "sha256-lfSxzo6ZXZ8nO85Wj9aTZcb45iJE4JDbAuXngeaOaXE="
+  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0": {
+   "module": "sha256-mTzhPkO51y5NLorojIrnN4ZR1z105kvWSY6cPaR+hNM=",
+   "pom": "sha256-8MfR4F0vSIhNeMU5SLjy9dkmQq4ObBkSIpBosI2X5i4="
   },
-  "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0-alpha04": {
-   "module": "sha256-ZKQWCdUc8i6K/Qt9+ECWl0O7PeWnB29ESj8rOzGOv5g=",
-   "pom": "sha256-5kU73LVJ/0daXUsa3zSy1KN/529FESSUwdngxXrvg/U="
+  "org/jetbrains/compose/material3#material3-desktop/1.7.1": {
+   "jar": "sha256-dkJDTX15vxSIby8NFzngouRCjv+opp5XyCsVQMGazhI=",
+   "module": "sha256-D7pIndXI/3UzMZZyGeKsH4smH3OQSr2MbxPS8la0yR4=",
+   "pom": "sha256-arivxNupMK+rpxWYkiOWE6LFoXelWo4oWCEn6Nv1mGk="
   },
   "org/jetbrains/compose/material3#material3-desktop/1.8.0-alpha03": {
    "jar": "sha256-JURxLAyB9oXJh91EBvN4VambiTVbXP2R+c9V15F94Vc=",
    "module": "sha256-fLSR87OVtlX5bqGfSRT6nQJV4aeIE9xXmCUx0a8O0Is=",
    "pom": "sha256-Gs17XElZ84eFPvucYiPDkD66znWSRH55vnwKqkNV9K0="
   },
+  "org/jetbrains/compose/material3#material3/1.7.1": {
+   "module": "sha256-qvFQNGGrB7ehjYXFXdQEaSsRKu3l1XgOwYyDsPYNXUQ=",
+   "pom": "sha256-7I2Sz9gexvi8u5VGZiuphrZ5x1EwUjkCI4x1IVFfOBw="
+  },
   "org/jetbrains/compose/material3#material3/1.8.0-alpha03": {
    "module": "sha256-/AykMQ/v1zUjdyjas194djHfq2fW59SyJ5Ti5ngAb8o=",
    "pom": "sha256-mkJqqoq807D8Ab0Gn5jBGs5Dzu5T3W6zmKaBmGccqIE="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0-alpha04": {
-   "jar": "sha256-faTVrekedntUkmvz+K6IqQUUq6HFgAtgFoE2GOe/Bxk=",
-   "module": "sha256-9ZsRYQmNkBDivhHHAhUGb/KrEm4S8AjpjnwtFZA5oWc=",
-   "pom": "sha256-RijD+D95uC1ctRTiSfuJngonVjxnzjyXl5ovI+9H78M="
+  "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0": {
+   "jar": "sha256-w31A75QUyqau5AfIrhE19yd2Riy4Y/rbfH40I3TBhos=",
+   "module": "sha256-b4LGOwHi8DxcPlW+Xe3U2g+RlalRUgf3XxYAjJMcSrU=",
+   "pom": "sha256-Q/Vsgi+P9KzlfabIifsVs3Ng3RbIIDmAuYUNQaw/iZ4="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0-alpha04": {
-   "jar": "sha256-MUflmNxPziKVzbNQh7P9LwVRYwOoK53PftAr6Rva+1I=",
-   "module": "sha256-SKnOGlvVTbdsdJ+si7fQ6kg2uFurgGGX8OCuk+yHQN0=",
-   "pom": "sha256-quacszVe3boTYfiNrvs0fy1sFRmM8RUsnQqL5/nNumA="
+  "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0": {
+   "jar": "sha256-2Jmnz9e72H6V1lFB4L9n379S3pyI4jvbUclfLB3biQE=",
+   "module": "sha256-vONgsyh5BqiR81rgp2xQtnnWjqIT0AnXeY89khLhix4=",
+   "pom": "sha256-PwnsftztMVa/DXluTMLV4yZfUoGwLq33wIi6M517rl4="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0-alpha04": {
-   "module": "sha256-jIaOoEfIH3Q1gcc4e2rE708ZepvtLfGrp0er3ndroyg=",
-   "pom": "sha256-lWqjI6SbV9FQocBVgJ/4Y1PYt4VAYEi087exf5JwKmM="
+  "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0": {
+   "module": "sha256-iFYuJcWE5Ep7aPuITuJqhrsS+6uFLYJlllHtCMxScCU=",
+   "pom": "sha256-8k0eRAFpo1g8lRA6wj5KgJDcgIAG54W9TK/RukHwoks="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0-alpha04": {
-   "jar": "sha256-GLbT0U/iQwJoWJAT7cLu8c+VkF7HZY4vcmBSlFroEc4=",
-   "module": "sha256-Gj73jQ5kwX/WoMHEdPOkUuy2yyH0WvfDxkJIis5RTus=",
-   "pom": "sha256-zTTtJpfBL7bdrZ3z9DQRl8EH3Fx2aSbZB8NCDu4BGzw="
+  "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0": {
+   "jar": "sha256-dGQ1hMjmRRByar4g4eOI6cK7A5vKgZR049OOvtknOAc=",
+   "module": "sha256-AVQBfw7P+gpKjttiF6EMq8LxKgUULcHf+OvX0AfxbYo=",
+   "pom": "sha256-S5xXPuHSaln7nchmXGBrFZl8I4UUWvdm5EEYPfUDfsk="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0-alpha04": {
-   "module": "sha256-VHtOiubu1uUUPILo7b8QVrxejL81ho2TzJFkYJJ5PQw=",
-   "pom": "sha256-U/JpeqLcjSltxij3HQAOpIJKQeiKE3jYInkNJWCjNos="
+  "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0": {
+   "module": "sha256-aGVHRihDaRF9EP2xVJFmQfLNHLFT2x8mqMt4yYFkcMQ=",
+   "pom": "sha256-AXEI1KstsiW6SkRRZqSEVn5Wx3J2DaBe3pNMnEuM+eU="
   },
-  "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0-alpha04": {
-   "module": "sha256-Vc4jWNA93TUofKnlRJcPlY+nHA9bJjP2htfZci32s8Y=",
-   "pom": "sha256-DwakDtwakDR3JatlKtuWyGoRzBdJ/thKi3FWMptr6js="
+  "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0": {
+   "module": "sha256-p0sWSpGXOY3qeSeA8+pse06Q5ndNsToGsjVDCGRL+Bw=",
+   "pom": "sha256-oK00sMpKpxquGVgSUj0azKnJZ8geY7QLTdarvUAOU2s="
   },
-  "org/jetbrains/compose/runtime#runtime-desktop/1.8.0-alpha04": {
-   "jar": "sha256-dYqLRtj3TT3WoY7PUNssBl2hcU1Tker6jPwNSuAFYyc=",
-   "module": "sha256-7mwXTJw3AUDwHL8cuOXAbD1j0sK5OcFbgwUuySJtVPc=",
-   "pom": "sha256-2iWE6NCe5JBcpmt6axdlodHESV7suZzNu9dpE5Yyykw="
+  "org/jetbrains/compose/runtime#runtime-desktop/1.7.1": {
+   "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=",
+   "module": "sha256-My6v5fATPpwP8mn+rhAMeJX+IkYo0FUZRYgfzKBhFsE=",
+   "pom": "sha256-01d42i+5MOce1u1rym8//gdcZOF24fuB1mMH1HHEseU="
   },
-  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0-alpha04": {
-   "jar": "sha256-M5d4mfkEp+5caZLXkWOvWdIUzYmLCvPTfglOw32O9Zs=",
-   "module": "sha256-9AfZmTsolCClY7HzhsBtLEMoyeSs5BQe0QdOEvBqL/U=",
-   "pom": "sha256-A9rVWm5bnC5fR7+lYsyrTFPBbF1H9+lUrYVxUpptCJU="
+  "org/jetbrains/compose/runtime#runtime-desktop/1.8.0": {
+   "jar": "sha256-koj4pOb5UWioNkj+cn8y266w74BtGDAm3KhTcljlZeg=",
+   "module": "sha256-RZddB+4Yr6W6JcbK8tAEL2i6DSoKUOKzpxSv72vI42A=",
+   "pom": "sha256-FFtNhLs7RXpNuAjHr/vwkP8m0ZPlXt0j4YCtUo49knQ="
   },
-  "org/jetbrains/compose/runtime#runtime-saveable/1.8.0-alpha04": {
-   "module": "sha256-QEvySeBkdYZXuELg6Y3C45n5VMs+2Uc+c9iANW5FVLM=",
-   "pom": "sha256-L3/5oiP1pQLRj25jhd0032jKDPuBZoGO0+iLX5DUOYk="
+  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.1": {
+   "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=",
+   "module": "sha256-lbODl+J/sf4du5MfHL5qCZZReoWTQzLNRLT7OQ+PXLk=",
+   "pom": "sha256-YPjvLYLG1V2/Pn4LqLb41II06TEMpm8d+b9voLHoyLw="
   },
-  "org/jetbrains/compose/runtime#runtime/1.8.0-alpha04": {
-   "module": "sha256-Ke4vccjmeAhP1xXn6TGv8ODjUAKICzdLy91O4IVO5pk=",
-   "pom": "sha256-2+tAHC7YOJC8P+S9gbOVRhT+IlcbpCA3NadhlFXROx0="
+  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0": {
+   "jar": "sha256-IR6bMX3jLuu70pPqhkjbEKVYafc74lj+WfX704u2X1o=",
+   "module": "sha256-JxvoF9OJol4mLqc3zFuZroKN8uf7bvrmZxEcF++lSxs=",
+   "pom": "sha256-Punve01+HfuOWQesPyhjbGjMhLfBX+bpK2jOeCgGIkI="
   },
-  "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0-alpha04": {
-   "jar": "sha256-2TtvBgXT16ftfFyheCy/yRlMpKB0zoz75bYBhhgEXvs=",
-   "module": "sha256-EYbwhN8UwlowXz6W70caow2VZsnKHL6iVU+lPbLlscM=",
-   "pom": "sha256-BaEAFwP5tXZnw+UKaNMLr+gs4r3q33KyTf2Tsk6rn44="
+  "org/jetbrains/compose/runtime#runtime-saveable/1.7.1": {
+   "module": "sha256-yDUM3lAXvSoW+gL6d/sNpV0RcUyDqhGGy6NWcmrjq20=",
+   "pom": "sha256-to73YWrUYT9AYAPPCia71isXBq6XZ3uhM60QN9YGiyM="
   },
-  "org/jetbrains/compose/ui#ui-backhandler/1.8.0-alpha04": {
-   "module": "sha256-TBDY0Hn3KGaXliBWYe8TZabnDmpDGKn1QFyWQnxpbxc=",
-   "pom": "sha256-feZmFnksgkPDl9/stOR/3Dpq8QAOC1EVTxusUEsV7ZQ="
+  "org/jetbrains/compose/runtime#runtime-saveable/1.8.0": {
+   "module": "sha256-2bJV+Fu0qqWkqjhLznkN9XtOF+0vFDvPdUXN1icYajY=",
+   "pom": "sha256-FjOQ5pFgMv/ZLkGszznBvYIje+lc6e3SjYsrdoQVbrk="
   },
-  "org/jetbrains/compose/ui#ui-desktop/1.8.0-alpha04": {
-   "jar": "sha256-Job8jQ7qgLdf+L7mQ4wW59jYwINBvNTVdIw4nGdJL7k=",
-   "module": "sha256-Ff5YZ+Jq4s4GcEPEBC+zYPXDXHX/KNruZft5gCHwfEs=",
-   "pom": "sha256-UeXawNBzLJWDDnmg+CNyua/P1UbA9ieLV/HDVgAjVZk="
+  "org/jetbrains/compose/runtime#runtime/1.7.1": {
+   "module": "sha256-xSKUczzpqMZYOfVWCw4APbgWK37T2MqN6b+mLPAzTk8=",
+   "pom": "sha256-SBR/02A24kzaP9JYsYNJVAMA8ipOHXTeA9hWpMEakm4="
   },
-  "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0-alpha04": {
-   "jar": "sha256-wi1EyFpdVX9holthBwT3BQfHrU/RYa9xK+Ot9cZhRCk=",
-   "module": "sha256-L68iLOl2A2eWUu7zXtBOjUKJVOq/2VrkpTTmAVzmtv0=",
-   "pom": "sha256-QD9xIa1KSkSVA70YjcW8WCZpbWDAFz+iv88dBbmmHps="
+  "org/jetbrains/compose/runtime#runtime/1.8.0": {
+   "module": "sha256-OwaEIcIxC6e2I6AMXWwsn6jWVjmouhclvy6+BF4ugVE=",
+   "pom": "sha256-ty8WUzuta+9sJutSksxGTvuUPZPfQJpQU/EzFcwHvIA="
   },
-  "org/jetbrains/compose/ui#ui-geometry/1.8.0-alpha04": {
-   "module": "sha256-iLjBZ8Ca8KHrRhwwCAeGyIykpkXz4IRDoYerbEmmaho=",
-   "pom": "sha256-a8eClm810GAi2FmaPhBF61JjLWtxeZUIHh0eHES/Wbc="
+  "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0": {
+   "jar": "sha256-4rwc2e7jbHLYv+ko7TKWA+957AAKoTaIjvfNgAgWkqY=",
+   "module": "sha256-kJ8mS4FdZ8nm853dTOLcg5Ua+J8Dmu6Z3y1Iok8BjII=",
+   "pom": "sha256-3lSMlllWFP4ekOG1dbxRPnAk5y+6RCa/tgq8w3p/2qc="
   },
-  "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0-alpha04": {
-   "jar": "sha256-dgUyDYIUnaO3j7g+l6AGw2zuQcnm32vs6eZ6njvSeCc=",
-   "module": "sha256-RWpENQKtypekjfWFEN2BrpU1GDn7eidYbdEQmls2m9M=",
-   "pom": "sha256-1Ejf64hTl7MM5v3kHeTMAxM8tuzCyNI1vNrgOt7+has="
+  "org/jetbrains/compose/ui#ui-backhandler/1.8.0": {
+   "module": "sha256-6i80cJJiHuklI1d3SVgcgErTHT6l3mv6w8+ox30y5uQ=",
+   "pom": "sha256-rlpGWdjbdTYdf2vNIDUd/KpMmFfETp9In86lfIHEKno="
   },
-  "org/jetbrains/compose/ui#ui-graphics/1.8.0-alpha04": {
-   "module": "sha256-dgasC7Sv2UrXEFPfZfZmndoWJQLAac0DbYWGlQIpR3o=",
-   "pom": "sha256-8r5b6KfndcPCq3x3x0oztRK6VQJSnVGUn3UCpVoOY1g="
+  "org/jetbrains/compose/ui#ui-desktop/1.7.1": {
+   "jar": "sha256-QHKbljfqyR/Zup0QxM0usyi7MRb4CXpbnT8HGXHOoCI=",
+   "module": "sha256-pCdx2/0i3G4BxGwkWo4ZU0YwV7/tm2xzefgmcdxE/FQ=",
+   "pom": "sha256-/ZOsNR7uXLtUTfcLf3D+y1RhR2CW1uJG1gNklcXRiWE="
   },
-  "org/jetbrains/compose/ui#ui-test-desktop/1.8.0-alpha04": {
-   "jar": "sha256-8gwMPdg/+P73LRMdnYbd29Qyqg8TPFaq9Uh4MgKnwPM=",
-   "module": "sha256-R0xVp9dK9/nca2YPVz53s2biaHPwQh8YTzdMUh4mCSI=",
-   "pom": "sha256-/5DjfJFuZ9MYZEbybZJDJB6C/umgKs2Qk9h8otDrqbU="
+  "org/jetbrains/compose/ui#ui-desktop/1.8.0": {
+   "jar": "sha256-BFJFqgdPrz++lWPEVXHDiVaXT0yckhPSkBBSUcRUQwM=",
+   "module": "sha256-DbXEiqaZF1Z9XElTPwAjaQt3oF/fUC+DBUd2VS/ZJv8=",
+   "pom": "sha256-VjAlgYpJZ/2Lg7kkiF1MJndmBH8oz+Ev+LH7ymCiF0s="
   },
-  "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0-alpha04": {
-   "jar": "sha256-3KpvbErFEDM8mZGRUaXaN+xZWZBWNBQ8410jLV30Mqg=",
-   "module": "sha256-4mfNKVC5Nrr+2dieyE9yLu2wlvwsyYcYNTouIO4yM4g=",
-   "pom": "sha256-xOPEs9/VKdwlCqHQzKmdZaNE1jL+Vq6WEEgxTBybseo="
+  "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.1": {
+   "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=",
+   "module": "sha256-rxTJcKcEtuCHAB9jnE1r7dvuad5+FXKlunNjGV5e2+I=",
+   "pom": "sha256-3iEzIvQwizn+X73RZMCg+ApylT0E/AozXNqjsygGS84="
   },
-  "org/jetbrains/compose/ui#ui-test-junit4/1.8.0-alpha04": {
-   "module": "sha256-9BnCIqNd12DsgLydKk5BPHJNLsV7LicVSNR8bBUbEAI=",
-   "pom": "sha256-Dvgz+9We2mi46oNrGpp3zQLMrkCt6FUQu41TLa8uOg8="
+  "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0": {
+   "jar": "sha256-Wq+LeL7W5Wt07okxcszi4xaBO2HYoizdwFh6Unxcqic=",
+   "module": "sha256-R371HP2IozSYUcQiJx+WEP5kJJBs+GOe37OC5sTkgE4=",
+   "pom": "sha256-Oe5obv6MiqCGsK4HnThWaE+EUNnDO6YyCZhUgdNhYdw="
   },
-  "org/jetbrains/compose/ui#ui-test/1.8.0-alpha04": {
-   "module": "sha256-W2m3RxNmKdS5oYN0lMtnkm1aqNz2dSh8ECxUVSwvNTY=",
-   "pom": "sha256-Dzod4EqSklAgLdCF8GRcNWQqri+ZXDYsRvYKhEiv3Tk="
+  "org/jetbrains/compose/ui#ui-geometry/1.7.1": {
+   "module": "sha256-mkt+df1LWaMy2SRUTWUB9eDaVbIDwsxhs4fg14yTXJU=",
+   "pom": "sha256-93UQwBXgPlnocFWPdBdPZSRo9vhJOJaKxTjBKiGO3I8="
   },
-  "org/jetbrains/compose/ui#ui-text-desktop/1.8.0-alpha04": {
-   "jar": "sha256-647zK5XWCZCYBUzUlLAPHJ492qSeFkwpbdA4ZscbxF0=",
-   "module": "sha256-HGLf8eMvWtn0jXhqzIAqjLsomvK8DGCQaH/qoykTm6U=",
-   "pom": "sha256-RxihxZRXxaJjOirKneQzRgjf7bodUJYF6B9KQfi5BmA="
+  "org/jetbrains/compose/ui#ui-geometry/1.8.0": {
+   "module": "sha256-rR9Lou1GECrXXF94pe1Ku+oPXVI5Xb3dtkxaHGJ9EEI=",
+   "pom": "sha256-qhofotjSE0Y9Yr5tlomTV/N5ZPwYCIoZVtShaCc2VPY="
   },
-  "org/jetbrains/compose/ui#ui-text/1.8.0-alpha04": {
-   "module": "sha256-xWcKB6ER/XjY6lXCrrEX5cB9mxHyOGwKYmFIhuz2TuM=",
-   "pom": "sha256-hlzfNRHDmpaFFYFgzyTOpd5MZpL2XlQl5Zj8PUH5Fk8="
+  "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.1": {
+   "jar": "sha256-kQnXfMJi+QQIFpscoLotFRNbYDTjd6gLvz7AI0lU6FI=",
+   "module": "sha256-DPP8FuwoupMp0UfnR54Rmyvbjr+lLyMn4yDlGQEUapE=",
+   "pom": "sha256-cIA44a4DMFFG1A/NcUNHlHGQ/yd8ZpysiH836iQ/M+Y="
   },
-  "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0-alpha04": {
-   "jar": "sha256-SXgjEEYpWRoL9Au5lUam/EP84Ku7O/ysdGdI1g6NuoA=",
-   "module": "sha256-JsNUPNwLW1E66x5Sf2RjGBGUoSXJpuyIMFHa4Ztuym8=",
-   "pom": "sha256-Fcvhcf1/dQcU/T1Y3w6aL3SuB9axqtArgXWLsVS7Zls="
+  "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0": {
+   "jar": "sha256-sxoU+OAbhlO/N3iKkwCM04/9bYcZIVBj6mGmWm/Zdr8=",
+   "module": "sha256-vjPfV/XWmU5uqTauUdC3ChQyC0MUKs4dW5BJnAWtNNM=",
+   "pom": "sha256-Vew5To2ooD7esv2QvNPp7MpFFHGo96vI73yooXVGStI="
   },
-  "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0-alpha04": {
-   "module": "sha256-MC3ACIOclhJmen+O2UquZf4Oh3sFSihf9qV4RFmoZbs=",
-   "pom": "sha256-+lu0KDtKzkAq41dHCKlXcgcw2Bm9bS5DOR7IhzBCHjU="
+  "org/jetbrains/compose/ui#ui-graphics/1.7.1": {
+   "module": "sha256-Bpgc3L5OyqzDVxnptAOykEHl54Rps8L1zcfMUHX8DXs=",
+   "pom": "sha256-Sj2MCO2FYVWHeAGrzgWU3BxpiOVq7H0kSsfGwxpqX9I="
   },
-  "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0-alpha04": {
-   "jar": "sha256-UFp3/NVE2OFY461bhSre/Nlh64+9NB/rjiGmk5UtuQY=",
-   "module": "sha256-0bxWb7mqdrA9KB4EzxNvi8Khs3BDLyVGeHYovegjr1s=",
-   "pom": "sha256-ljirfotctywtFIZ9A7V1MtIdIf6tjArzi5RCzcP7b/g="
+  "org/jetbrains/compose/ui#ui-graphics/1.8.0": {
+   "module": "sha256-txgPMy3enTXaqmW+iY/B/YNvQ6lTRqaPGmJQsBOu778=",
+   "pom": "sha256-/DNzmQiWbbCBLQvUSP15u/b2mmGVQSyZ6RDVSArDPhI="
   },
-  "org/jetbrains/compose/ui#ui-unit/1.8.0-alpha04": {
-   "module": "sha256-pApTFo4xoFjFBPVZPjwrg1D/bA4w+CQ4wl3ukRuWPcc=",
-   "pom": "sha256-jBPwgwt41ln/tQHBHTNh8E3BelJzimXhJznwxXRLj7w="
+  "org/jetbrains/compose/ui#ui-test-desktop/1.8.0": {
+   "jar": "sha256-CdthtR9ovXwtxZbdCe2+vfnxPoBRe+oANG+qJ5hkg+0=",
+   "module": "sha256-hMtcU01/ex171Jp8gFH+Tv0caBB5T2bI7uCRtz3AS40=",
+   "pom": "sha256-gaZC9Wi3tlhi78zSnROwCbd73/JE/QyeRc0NaP5XXfU="
   },
-  "org/jetbrains/compose/ui#ui-util-desktop/1.8.0-alpha04": {
-   "jar": "sha256-zdnzOHJxDBTfdVDa2/yR1VrZo7cTRDHCr460L3V+F68=",
-   "module": "sha256-6iji9UjrDLhJ9cMEfL07jA8ThL7zN75zei3Y93rWMJ8=",
-   "pom": "sha256-8pQJk9w30k59Y44xX2ItT0kS1Ob8gOkQ+oqQe5z21eA="
+  "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0": {
+   "jar": "sha256-8n2pyADiUb+hnaqSCmim1ZUa/Hr7aSBKMG2WdYv17Lc=",
+   "module": "sha256-ka3xlCSSb82/+xwq5oL2Tpr4WYviLEJmNKuhzZXF3YU=",
+   "pom": "sha256-Y+vNJMaYGvzVh81zOv79gMGhbuiaN16Rz/y0r5nk5d0="
   },
-  "org/jetbrains/compose/ui#ui-util/1.8.0-alpha04": {
-   "module": "sha256-38CfOmAhhkWdmFrU8dCngZjXKMatWV44uimDAHZ+prY=",
-   "pom": "sha256-B2zeSirC6CxianbCa2ob+PmrGCHve//5qbpbPTxAxl0="
+  "org/jetbrains/compose/ui#ui-test-junit4/1.8.0": {
+   "module": "sha256-GZTUW/XSGzpwNKvHkCL6qoVS7I9VbEz4PQoYemo+PhU=",
+   "pom": "sha256-G5cVUGdWqK+IrBZHxBuDo2YeAPVzbylwjZqZO5aO/Gs="
   },
-  "org/jetbrains/compose/ui#ui/1.8.0-alpha04": {
-   "module": "sha256-k/S+3me2wuxyXAXSPgvXBXmlp9NLMla+L6taIH5LnOg=",
-   "pom": "sha256-2sOUh4F9TSH5g7gA7c+GLhHghZP++mLLqwxgdksIedY="
+  "org/jetbrains/compose/ui#ui-test/1.8.0": {
+   "module": "sha256-7dc+BTZZj9I8Uv/iYVqwuJ91K3mnnMQi3HJf4ymnP2w=",
+   "pom": "sha256-JJEExV3asWlR8qj4W1Ja9RZrYyrgCdt438gU+Nr/g6U="
+  },
+  "org/jetbrains/compose/ui#ui-text-desktop/1.7.1": {
+   "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=",
+   "module": "sha256-PR7CKTU76v2v0awhS/VEkPv2nojwZ7/LgBaB07K2bqU=",
+   "pom": "sha256-UiwW5ZbJMrHloPPN+xqTRADodlj42JjBzery0Bgphoo="
+  },
+  "org/jetbrains/compose/ui#ui-text-desktop/1.8.0": {
+   "jar": "sha256-W2TgVApMqu6zwTXV0T9B/s0v9DxB6QN07UIv74q9kp0=",
+   "module": "sha256-2JZjyhzb2wsiONN6VPSYSe2owLPPWub2PkCzCKeX324=",
+   "pom": "sha256-RD7cJpDXb1YgkUzPFmJvoQIjPlRzUBWoiDG4ADfT7qc="
+  },
+  "org/jetbrains/compose/ui#ui-text/1.7.1": {
+   "module": "sha256-nYij0rkMF+a4Hs///a6dfEzsVMfWVXWYJbpJZ90vyGM=",
+   "pom": "sha256-huwdGGauW1x/4AUsJqB/8aphkz9Vf41PuePda2L8Jb4="
+  },
+  "org/jetbrains/compose/ui#ui-text/1.8.0": {
+   "module": "sha256-u6ko+CsxtaQ/HJr7/67JcHYLC8459K/YKKGgIsWuIC8=",
+   "pom": "sha256-A84HC7srEsZveTlCWXR20E9p97CxVAls46EA7NzUiMk="
+  },
+  "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0": {
+   "jar": "sha256-eohirZEZhP91HQSZwyI+agxxqCG8t1qZ9mlk7tqmfXg=",
+   "module": "sha256-N/3cLF26/SPzQTUGICee0H8VNd6AGnm3D9geU3rpxMY=",
+   "pom": "sha256-Dms0B4lXGS+pNYcHbbpSTGu2Q2xgxKmg8iB/fM1PR30="
+  },
+  "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0": {
+   "module": "sha256-QliJHsyIWeC8fSdh6lDAx5Ol2Vp1JskthlDsa0/cCZk=",
+   "pom": "sha256-I0sBM8CU3DoL9htZcy3igJ+0gyJEiQlROexuDpzhMZw="
+  },
+  "org/jetbrains/compose/ui#ui-unit-desktop/1.7.1": {
+   "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=",
+   "module": "sha256-BacNXRO5Fhrn9YUkbrk97ly6K1XD8Ilf1mRekKPCPaU=",
+   "pom": "sha256-9R34TA7eKtHgHgf6R+9tSLoSy3ShfoXK6Nblz/Kc0Fk="
+  },
+  "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0": {
+   "jar": "sha256-KW0j3qp4tQjPldFM9b2lik861bQthfzIvs9uEv+9A34=",
+   "module": "sha256-qj02WHAtKOOYudU/JN1K9XD7JN4ZY9YTSaOC3Bo08vA=",
+   "pom": "sha256-3OLKuYaq6wf0VaTKVzPnP3UWntEuJwee+4x/IJyMyUo="
+  },
+  "org/jetbrains/compose/ui#ui-unit/1.7.1": {
+   "module": "sha256-kDxEm48iI7uggivMWUuZLiqCv6rlwE/FCNKNq4hxfaA=",
+   "pom": "sha256-tq8XC59ySXOr8jPPEJFoqJIGqbFF1whpFbxlQOpdaHI="
+  },
+  "org/jetbrains/compose/ui#ui-unit/1.8.0": {
+   "module": "sha256-cZYqeI5O/64E6eZjz5kgHps6sm1iUPdPB17qaE7ClgY=",
+   "pom": "sha256-qK28UifDne3Sphw2x/iMLJuWVpMV+J69TzxRvr9TLEE="
+  },
+  "org/jetbrains/compose/ui#ui-util-desktop/1.7.1": {
+   "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=",
+   "module": "sha256-35JU30uqHS7Q+ctR/BxgrUlqNqzEiYEUPF1PqHRpEXs=",
+   "pom": "sha256-AeJZ6hTRKWyvCAmzP5dAcXRDNJvrCJ7ketEOaEBYDvQ="
+  },
+  "org/jetbrains/compose/ui#ui-util-desktop/1.8.0": {
+   "jar": "sha256-47HEObTqgChb6Q6u2OcFZDf2cc+v5LGKOpy1OHyAvko=",
+   "module": "sha256-kUQZhBnePBaJUtO2bhxzGjA/E0Eo/8kmz2VkfVbDYaQ=",
+   "pom": "sha256-FsnlfquLuBCBR4vcwhar80saQF2+cPmhVHkX0SILkYU="
+  },
+  "org/jetbrains/compose/ui#ui-util/1.7.1": {
+   "module": "sha256-razSdpfzafjF00aNb8ZySDHTP95e+5tvg9hdw6AXCw8=",
+   "pom": "sha256-7bcYbOSnYd3l8xMC3BRdWLw7/j5OT7x4YiiCP4zVSMw="
+  },
+  "org/jetbrains/compose/ui#ui-util/1.8.0": {
+   "module": "sha256-tfE3oBS4Z0aULDoy56i5BdXsXwWXw8Bq69YrIoJ6U6w=",
+   "pom": "sha256-v9ly8eQXV6lfYS9lAxCvJAicu3Uz2X0RlGG/TTdhEhE="
+  },
+  "org/jetbrains/compose/ui#ui/1.7.1": {
+   "module": "sha256-LpKRDBxZrLBjrmhWz5VWwlH9qMCtRsg6Tka/flenza4=",
+   "pom": "sha256-RWT33DQr7tal9G+RaxkLMe0rEgcK/ZfXXmNjSkQt9lc="
+  },
+  "org/jetbrains/compose/ui#ui/1.8.0": {
+   "module": "sha256-FOM6PYxigEyzFHWZ7gpjSmTA9xsN7i4hRUm+j9eCk0U=",
+   "pom": "sha256-pkQCj9i//MRRv+3nDZDPZhTFVIVvaKjiQZu5UvM+fGM="
   },
   "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
    "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
    "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
   },
-  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20": {
-   "module": "sha256-LBPSZp00NWUMcd8t8VDbTl8QAZKj6B6XnnUrTeCVcxA=",
-   "pom": "sha256-AudGCweKYIs9brqmIBbZi5cSPtITgU7QorGL2r2+UzU="
+  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21": {
+   "module": "sha256-sYdQC4zfyNLBw6F7lhzEO3tOGFQS/NsEsDvrkPEz+70=",
+   "pom": "sha256-zBwgchGRVLwYQXGzQmk/99LF+dwhLR5aTMCZOGL81ec="
   },
-  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20/gradle85": {
-   "jar": "sha256-CpCRRspmOsVVe9Gcwyum7Cbk6Wf11fDpU8iImxe3n3g="
+  "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.21/gradle85": {
+   "jar": "sha256-uGEv2xhdzZiXGlG8H0K+k2e8vK7lE+NywkoU9O2xm4Y="
   },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": {
-   "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=",
-   "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21": {
+   "module": "sha256-dqMj2vtYjg+u6OMUi5EPtuw+tCL8EGQBBr5bfwapx/M=",
+   "pom": "sha256-v7ZAATVL2BgCx0mRTMLPWOWsXQWtnB9JrEZbdxbQUiU="
   },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": {
-   "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.21/gradle85": {
+   "jar": "sha256-/AkFgQMJpa0+oV37vhKaR+kNsRIVIyNkhBtyBEEk57A="
   },
   "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": {
    "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=",
@@ -2799,106 +2982,102 @@
    "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=",
    "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0="
   },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": {
-   "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=",
-   "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM="
+  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.21": {
+   "jar": "sha256-OnYsHlWFWUR9r0IX/eK5grJQh1brECplcRlPEt1BrPo=",
+   "pom": "sha256-HSDrHKwGm5iFdxccNOBABfpcbmk1mR1ve6mGKl6uGng="
   },
   "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
    "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
    "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": {
-   "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=",
-   "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo="
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.21": {
+   "jar": "sha256-BrtrNnHUvDunTA4O+rvc1VXMwtTMLvZ80wnFc4yNHlQ=",
+   "pom": "sha256-U5ag0mBsMOA66ZSnl8b5FoTG47LZ6aRf1pLl6T7sDJM="
   },
   "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": {
    "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=",
    "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": {
-   "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=",
-   "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro="
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.21": {
+   "jar": "sha256-5sfxijIo9WypFAClTdrSHh14mp+aByY7VgyMlTR8Y80=",
+   "pom": "sha256-Wtkc/mCCSH5t8hdVjUcnCDB4vHVjy0zZBEt6e00sBY4="
   },
   "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
    "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
    "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": {
-   "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=",
-   "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8="
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.21": {
+   "jar": "sha256-Z6LjZzdl8JdyVgjMfIQ7DY/dlL2a9BMnIRNhYUqlfUk=",
+   "pom": "sha256-27+KwlUNWxripifyBPKLFvknHjbETYmUqjsTnL9w5Fo="
   },
   "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
    "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
    "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": {
-   "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=",
-   "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU="
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.21": {
+   "jar": "sha256-cKiXK7e+GyuwmMml2nC+wd1EyxBNTaGqbjPcVRAo1Jo=",
+   "pom": "sha256-/BmETtKRd+x6tsN5jR0DnaRroncb+HEuKcLyRFncW44="
   },
-  "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.20": {
-   "jar": "sha256-z4dQOryWkU8WnJ7WHTCgl1eMJrDaJmb90XLsfP8vrF0=",
-   "pom": "sha256-9CTFzFuaSpzOgM4GY2kMA4jf9yPI8fQ4vdk0q2F5JYA="
+  "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.21": {
+   "jar": "sha256-ZxnS3XYgroz9FRtW0tPAyuV+ZC0ucosnKg6G0YQjJ28=",
+   "pom": "sha256-qeKk6p5W0S7L/pXHZPq2q+hg/eEN7c/LvT5X9W2qNng="
   },
   "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
    "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
    "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": {
-   "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=",
-   "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI="
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.1.21": {
+   "jar": "sha256-MHDdA1nv5KE0jAzpuVsDJHmXZVmLt7aHbxVJq1NH6U8=",
+   "pom": "sha256-TVeT9Xm3mUDoeCxYvWgbnxZL2yvvAbcq2b5pqR6uq+4="
   },
   "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
    "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
    "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": {
-   "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=",
-   "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik="
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.21": {
+   "jar": "sha256-lAHv/YLehgbfMokwiidcwdNXN2hmXKXt0J3DGccXFfQ=",
+   "pom": "sha256-GbJjDusajsrIz3ClF2JBCiAXUvAxHrG2+RwB1B350dw="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": {
-   "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=",
-   "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.21": {
+   "jar": "sha256-eEu/b4g00ez2XsUf57RLQW8zBS6CGWKlm55/dOCU9pY=",
+   "pom": "sha256-QxApK3Qc26Bu6iaC8YU5U4i+OvPLATzIo+gei5NokQA="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=",
-   "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=",
-   "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21": {
+   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw=",
+   "module": "sha256-q9fHAOmpTF3zzNlek9LuqwwZJkXXB+rZXFzqR+gcwns=",
+   "pom": "sha256-QG8P2ImjHfVX+txkaouXADreDCRrX7N6YTYZFWMgUfc="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": {
-   "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.21/gradle85": {
+   "jar": "sha256-VY+KMrr1qH6WlMi7OVVwqeduCuqrqmg/msH83oujqsw="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": {
-   "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=",
-   "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.21": {
+   "jar": "sha256-BYO5l57dTI9f78CNWRGCHpw7Bakbg5+hqgcPkm7ny6A=",
+   "pom": "sha256-FLbl3/I/lNzTMmw9JXv2JeRVsVCVJiBcILNAtCw1f6M="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": {
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.21": {
    "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=",
-   "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=",
-   "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA="
+   "module": "sha256-gIWGw896zkzfCLEYX7yv0PVcUhNIUPNmUlr7rlC7xTo=",
+   "pom": "sha256-N0agkbc65RnLtbszwftDNKYyR8W/kOgidFL9wgZ9+k8="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": {
-   "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=",
-   "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=",
-   "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.21": {
+   "jar": "sha256-aATNXwXXf6lUrHt6kw57V/rgjK8CTiKRiAo8KKSfwHU=",
+   "module": "sha256-Ifoqg7FTeAa7x+1lVrmVIqXhbziR6CiKG8/ozf0mQrg=",
+   "pom": "sha256-G8Rcq/W6A2rdAmkEVCOxH0pXv0tPylnjGzxCspFmAcI="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": {
-   "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=",
-   "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21": {
+   "module": "sha256-fhIOTfygjt1IkK/gtou6WqifJ/uhHY/mj2ttoLISk1g=",
+   "pom": "sha256-wMnxGQvSSKV9G3U26ahPw/6d8YCwJMPlblGi7iwLz80="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": {
-   "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.21/gradle85": {
+   "jar": "sha256-6sBIdsGrZgNvYBb9kIM/IEsCNsJ2R1nK0GknbgLLQ+Y="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": {
-   "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=",
-   "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE="
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.21": {
+   "module": "sha256-avSUrGVuckg0HOukOePWJhFtARfJ+9+Xq+5lcOEaCHc=",
+   "pom": "sha256-eTmPhH1rfKipak5GOf+iLhaRJIr+tOgQGeEdG9C7IFI="
   },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": {
-   "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=",
-   "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs="
-  },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.0.0": {
-   "jar": "sha256-rY8cfbxaxG9cvS0uXeOcVsnbZd195xaoTgHOIIdYruY=",
-   "pom": "sha256-PyOxTvYPHkQ9bUHzmYPiOKpkiVjOHYmLarOcx8kYIGY="
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.21": {
+   "jar": "sha256-Q+CkDB33nDOjBJkUvJ5mbkT7yyDwfUVo7qBZXpcqLHE=",
+   "pom": "sha256-3F+A6RGCz54qBN/XKdcOfTFOHt+NZGJLFm5o90lSw9Q="
   },
   "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.0": {
    "jar": "sha256-uNOpJXS6HfxJvfIFJW0e3gZkFIyxUKti+qhyteG7RjI=",
@@ -2908,18 +3087,14 @@
    "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=",
    "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": {
-   "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=",
-   "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y="
+  "org/jetbrains/kotlin#kotlin-native-utils/2.1.21": {
+   "jar": "sha256-3ECUhclc04pfMNWHjr6ai/Lm5vJUtv6eRcygmZkF4HA=",
+   "pom": "sha256-2RW7ZEMRhfvbhlxNKxLmuniqaME0fFnfrieaMqIyhPk="
   },
   "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
    "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
    "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
   },
-  "org/jetbrains/kotlin#kotlin-reflect/1.9.20": {
-   "jar": "sha256-SbZvmonVD9KVTC6K6sgOT0iLCgkyKiXvrWJhV2cT3A8=",
-   "pom": "sha256-lCtehgLTF+wTZS8cAiIFK7kIF/KM9v6dRxEvCbPo5n0="
-  },
   "org/jetbrains/kotlin#kotlin-reflect/1.9.24": {
    "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=",
    "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk="
@@ -2928,6 +3103,10 @@
    "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
    "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
   },
+  "org/jetbrains/kotlin#kotlin-reflect/2.1.0": {
+   "jar": "sha256-tfYI7fqYqM+iNyzBLRitqXS+HFbBCT7/BswGH0/AiLI=",
+   "pom": "sha256-nNhLPU9xfJYjXkujtydolcz/1V3kEcfOCz97q1Yu/kI="
+  },
   "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": {
    "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=",
    "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE="
@@ -2936,45 +3115,45 @@
    "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
    "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
   },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": {
-   "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=",
-   "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y="
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.21": {
+   "jar": "sha256-2CIfRFhU8wrJLCSNVDYJ4Oy12Fu1ujTAQ2hLATy1uJc=",
+   "pom": "sha256-/RCT8ncp9uYMG6xjkFYkDMXvP16zQUT/LqgahFeBFJQ="
   },
   "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": {
    "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=",
    "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": {
-   "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=",
-   "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s="
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.1.21": {
+   "jar": "sha256-RYLip8B/lTOptKZAijKl9Xll37FF1kaGCthn1GMIQ/E=",
+   "pom": "sha256-O04w8DuW7euw0ThjDCIwSN5w6MQILJDQaUPsok1B7tU="
   },
   "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": {
    "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=",
    "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": {
-   "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=",
-   "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.21": {
+   "jar": "sha256-tbHg9AYvkc/iFtcGF+ivl3S1KI/YGeDOX2BQ+Nhukvo=",
+   "pom": "sha256-SCLW9orULZzZRP1zUpClvbXN8Psd1dpszG6F/AjtXfk="
   },
   "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": {
    "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=",
    "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": {
-   "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=",
-   "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.21": {
+   "jar": "sha256-oSlfKCsHDAzv25aGFPb2SqcfG9vnRvHt9jUnQH1dlrE=",
+   "pom": "sha256-WM84eKRG1G8/YECYa5wrU9f3pNneB+0mQzNdWAuDdgQ="
   },
   "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": {
    "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=",
    "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": {
-   "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=",
-   "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0="
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.21": {
+   "jar": "sha256-s/4fcumtSC1yb4nhOfRcSv57P4Ct/kzckdzAoiY3l40=",
+   "pom": "sha256-ghqPEByspjga2jbyM7nJH8wIhrNYT16qXPMESEm6tqI="
   },
-  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": {
-   "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=",
-   "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU="
+  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.21": {
+   "jar": "sha256-0hSA7OwU4CLaICr7xAkWfFPGT/ZAv7IZAiMP7cYoXeE=",
+   "pom": "sha256-chwbOMaiiJdBO7rhel3WMPRMBPlGiXNgTP4fYy42Z4s="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
    "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
@@ -2987,9 +3166,9 @@
    "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=",
    "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": {
-   "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=",
-   "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs="
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.21": {
+   "module": "sha256-pNj8FM7bN3mEOkf7zlIv0XPph1CRlk26wbjdeIT2wfk=",
+   "pom": "sha256-kk6Exb2AM5n2nFspYmsTKpSwBAL1X53lugGNyBHfo5M="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
    "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=",
@@ -2999,14 +3178,14 @@
    "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
    "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": {
-   "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=",
-   "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": {
    "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=",
    "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.0": {
+   "jar": "sha256-/epsQgNyT0Lo5kvvLwv3kSnM0d8e3xzP/cIt599JjHY=",
+   "pom": "sha256-BvvBTssUoK9HtaP400dj9JM9XLpaPSRQRb/i8r25Gx4="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.10": {
    "jar": "sha256-L4dvs1tz2YBuyFAHAyZavL1ap8PIH0GiylSoVahkmzQ=",
    "pom": "sha256-6yvOL/52LUQE2Or+lYF3XLxbkLsfl/0xZLpyJRfTvsY="
@@ -3019,26 +3198,18 @@
    "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
    "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": {
-   "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=",
-   "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": {
    "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=",
    "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU="
   },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.0": {
+   "jar": "sha256-I408fkkvEZtQ2hwiVG3XYkYuVfIkCWEfXlPdd2Jc1UQ=",
+   "pom": "sha256-52K4xFaQropqNd9YT1S+nJ2mWIXmGpBUJq6vylk34c4="
+  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.10": {
    "jar": "sha256-sJJg6kgo3Gz8Z9JhJ9rOOK4ru+ilZdLQKXJegcLSWOw=",
    "pom": "sha256-YGyBfFx/1hFnDVWVK1dz+lxo8OPNJyelXe07GzzKLYc="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/1.9.20": {
-   "module": "sha256-3Mql0xVHD6s5IFAohru4Xy2myGECxl2cBEEFRO7bIBk=",
-   "pom": "sha256-43IWpzLI6Bqf0FtN2JLDDKwMrXtOP9ovlmP0jogHQcA="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": {
-   "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=",
-   "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
    "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
    "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
@@ -3054,29 +3225,29 @@
    "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
    "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": {
-   "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=",
-   "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=",
-   "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": {
+   "jar": "sha256-JjvcZ54fYgEtt7CReWJ5ttcc829Hl6mP8azgWDXyAcg=",
+   "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=",
+   "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg="
   },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": {
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.21": {
    "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=",
-   "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY="
+   "pom": "sha256-RdzNNvsgz0B28XOMmbzt98rdd3Xti8cWopgr0VzpaDA="
   },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.20": {
-   "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=",
-   "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM="
+  "org/jetbrains/kotlin#kotlin-util-io/2.1.21": {
+   "jar": "sha256-43JJKisFVtYv0Djj7fxFMbVQZUhs4o0E9HBj0rwDDBw=",
+   "pom": "sha256-XzfSWuJDprEFAHoH18j0Wd4zep84fMiz63VPmNZCoA4="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": {
-   "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=",
-   "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc="
+  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.21": {
+   "jar": "sha256-lMf8tAQF9WSCQAuqI1yW6BAQweBDv/YwC3CzTl6o2bs=",
+   "pom": "sha256-eoezrWbdJ6gKAzWv3R9Hij3SrldqmpQ7sfN2ORv435E="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": {
-   "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=",
-   "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA="
+  "org/jetbrains/kotlin#kotlin-util-klib/2.1.21": {
+   "jar": "sha256-pSSDHpeV0+dW1N5Uy9WyEN6Al9rXxHiryVeuP2DgpxY=",
+   "pom": "sha256-CzeIoSSkcVMm+oZ3iFz7KYkf73jLKxbOBhP/JBCZ9Rg="
   },
-  "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.20": {
-   "pom": "sha256-Ud4AgMpY7sAcC9faZsz6yM6cDwasE2UJDIAuZ1j9hTg="
+  "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.21": {
+   "pom": "sha256-W3YfMyOOHJGrslM/z1sgHbSWwYmGNFs55wlJAvid+JA="
   },
   "org/jetbrains/kotlinx#atomicfu-gradle-plugin/0.27.0": {
    "jar": "sha256-Ol911FKwg/txpx9fTjcvZH5kIguP1fXyk4pBDj4ESXc=",
@@ -3109,6 +3280,9 @@
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": {
    "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
+   "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
    "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
   },
@@ -3120,6 +3294,11 @@
    "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=",
    "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": {
+   "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=",
+   "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=",
+   "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
    "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
    "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
@@ -3134,6 +3313,10 @@
    "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=",
    "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU="
   },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": {
+   "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=",
+   "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw="
+  },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": {
    "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=",
    "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE="
@@ -3143,24 +3326,29 @@
    "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=",
    "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": {
-   "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=",
-   "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=",
-   "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.2": {
+   "jar": "sha256-1l3uPK+m97+u/ttJP8aLXGOr51BzT7ivkvrHoNMQFFc=",
+   "module": "sha256-B7xJACLGWAQpQfUrFxwPXOBkvWxjUikEMDmS5BegRbs=",
+   "pom": "sha256-xHdj+siNuwlDhJ0W4RucBdReYDhMfNExBe5xD7TdX7M="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.1": {
-   "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=",
-   "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=",
-   "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.2": {
+   "jar": "sha256-Ar24XyDsCABEKav2iH6NDkDzq2N9dGL4F/D4q759HrU=",
+   "module": "sha256-kFK7SUS5FqUGX2GNfUb+EqTAxonQIbyYQ1v4l3WIsWQ=",
+   "pom": "sha256-zt+0Miu5cVkXrmmCCeoS3ziKuliVy7rRxWcith6EQ8A="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.2": {
+   "jar": "sha256-WQpUn4wdtZDJ2YqKIEJKH1gaNBYqNp5qa9iEzn0209c=",
+   "module": "sha256-VrIIF8xRrYi9tZwBIWsJiXzU+mmNUXu0d9kqlyp6Gq8=",
+   "pom": "sha256-Y96yqGiry+JIjrzrqnXnMbLvIQQQO4FzjnY3/JolpfM="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.8.0": {
    "jar": "sha256-FTXMH0MjXYVm+NW8bRwR8HBBF+TlY/Ls5+aqPmhpXyA=",
    "module": "sha256-HS0Zc6L0GowMEmPmCyXneS9ji4xV18ocbQZztkvlfac=",
    "pom": "sha256-BtHlPqNm5to7FxkwV1+RYnzxnkUqTnqfDeMNLwQdZFE="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.1": {
-   "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=",
-   "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.2": {
+   "module": "sha256-QiByzuO2n2jVsVA7tmUb54lGsEw5KEocwCbM6L3x+AY=",
+   "pom": "sha256-vyXI3w7J8+rHu+5Tm2AbYBm36Z9fPzAR4ugXixQHUNs="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.8.0": {
    "module": "sha256-DsPHX/2ZpqLfto8wfy8vcxQckz5Yt3sQTxyMrDr9U5Q=",
@@ -3217,6 +3405,9 @@
   "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": {
    "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.1": {
+   "pom": "sha256-APNVWudiSFHGfbEsMIvJziauMnzw1yR2akAeW6AGCMc="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": {
    "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=",
    "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=",
@@ -3227,6 +3418,11 @@
    "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=",
    "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.1": {
+   "jar": "sha256-NWW21NeJv3BoPEVWaUQof8HY3HXCPZi9h9AQWcx28rM=",
+   "module": "sha256-++GdWIrX1fZGZmaCA0/0Tglo0iBx/mzPn5ngPHpe+lc=",
+   "pom": "sha256-RGZV6NQ4KL+7OHzp0VGpNxowkrSLkJ6AYGtT/FiXnig="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": {
    "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=",
    "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4="
@@ -3235,24 +3431,36 @@
    "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=",
    "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.1": {
+   "module": "sha256-eL3oMFSUrxs445ZrUleskINAFkk/i60hm4iGx/vbJdU=",
+   "pom": "sha256-Rz8Ko+Sheqt4YNykkNxC6rthJPHSlT5qmVoIcX5QxxQ="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.0": {
-   "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=",
    "module": "sha256-/pQ5hti3/I7HoytonItHbDDM9KNbcKLEWxtffZ00BkM=",
    "pom": "sha256-PbZlvwY1l3Inc9mKLQpqSps0FpeEFOnTYfICjTUc0yg="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.1": {
+   "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=",
+   "module": "sha256-vz47hoSxN/py0pZVZ1/c4xRGewh5JikYMm2vedE+Afo=",
+   "pom": "sha256-27ETuPvVUEVZjiTmATIGrrzKkSr+Vjnr2VJjC579kjw="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.0": {
    "module": "sha256-+3LQaky980DBOnBPywfUsWJ66NnDCtZnEwb6x1UnB7Q=",
    "pom": "sha256-xgC76woBPRA7cbGCa+t0Sbnv/5x4Knl0JKoOdV+Cw0Q="
   },
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.1": {
+   "module": "sha256-WTtZ8otvvbjsNRD4+ZQksTTlv8Qe2GS82LAiDv4APnM=",
+   "pom": "sha256-2e2KSEKd687/Z05u1OdgPR1K5Ao3lWT9BlPQ3V9gJb8="
+  },
   "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": {
    "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=",
    "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=",
    "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": {
-   "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=",
-   "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=",
-   "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q="
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.1": {
+   "jar": "sha256-h2nlZHVX43AJGcMtUI9cXa1TxdgjTNEIRjVPvP8UqiQ=",
+   "module": "sha256-uZHLSTQAwdlgut+oYhcVjGN+XsqIgbIM0BJbtOz8+DE=",
+   "pom": "sha256-1mXWtB/gWPZmpvOGrS5JzBAe+P0u7+/vy8ER6R7oJDY="
   },
   "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": {
    "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=",
@@ -3262,31 +3470,40 @@
    "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
    "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": {
-   "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=",
-   "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=",
-   "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0="
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": {
+   "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=",
+   "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": {
-   "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=",
-   "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA="
+  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.1": {
+   "jar": "sha256-+9F09y6oI2S6oRIGny17NhdY9raL2B0qxRsCxmpI6SQ=",
+   "module": "sha256-klXX5uXZzp3bV2f6KNPGmShYhGZ+kaph4bE12YjuCJM=",
+   "pom": "sha256-pYV9XmD4gWHKeEQUai/jfyiV+B5SMJCbFRtKPY7AMpw="
   },
-  "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.2": {
-   "jar": "sha256-1bqEsjiWPQTCXG6mfgbqhfjxIPY38iI7Jx/xmyCHago=",
-   "pom": "sha256-dgQjvLzTxvtYTM38ZmbILq0cjCePzc0hBw3drAh0WMg="
+  "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.1": {
+   "module": "sha256-LZ+TjZbK4twphqfvbyy9Fnan+HVLLVH8vk04Y92rfD0=",
+   "pom": "sha256-YTuFlIYGTe0T+YpQCtBJ284ZpY/DO/d3ajgSx9Cg/RA="
   },
-  "org/jetbrains/skiko#skiko-awt-runtime-macos-x64/0.8.18": {
-   "jar": "sha256-czu+FuSlNbp4+zYYaaM20jfZXipSidJWnSlZudWeeGE=",
-   "pom": "sha256-yyEZbtoYT2eJZvn/23cBJe0POPoqYIBS7ObM+fLDjtw="
+  "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.4": {
+   "jar": "sha256-K/JrgqV/rbUG6YHu97n9OESGzce5P8hBo+cvTD//q48=",
+   "pom": "sha256-x87oAckGYo48fc3MdHyDBENGgG4SkFuK3U0vwkIXpec="
   },
-  "org/jetbrains/skiko#skiko-awt/0.9.2": {
-   "jar": "sha256-4fgV9E9dr88S9nPNozVa5Zw5dUv5nzsR9tAP1wAVYUg=",
-   "module": "sha256-cRS/M68lkIkGDdO3c/8ew/0ZhGFmN1AXDR+ArDc7/D0=",
-   "pom": "sha256-u/8yFQDlUOusYZRHz8OFwTW3aYV6Jy+Wh8rdXnyBuXk="
+  "org/jetbrains/skiko#skiko-awt/0.8.18": {
+   "jar": "sha256-Y39d4aII8TaKxRtaKGpIJ87IKM1i3aMy3DQAuFQ+JD0=",
+   "module": "sha256-x9JON+j/js4Y7OdEg0Fxcnor1L7z6/hZBlN1in0Bbmo=",
+   "pom": "sha256-yrIp0lDLlzYK12MgQfCHFksKR+d75huz9VRaLWtAlJ8="
   },
-  "org/jetbrains/skiko#skiko/0.9.2": {
-   "module": "sha256-9bO/I9+wmkJel8IVGQUAdw5PvNU3BMSVHJQzhkibmYc=",
-   "pom": "sha256-gDnIMi9XqGWuacIkOKLhw8qTahFfCuPbLJYYoK79bxs="
+  "org/jetbrains/skiko#skiko-awt/0.9.4": {
+   "jar": "sha256-jiarGudfZXhva5c6ZuiaKDbRmaVWHEwu28Hz9nrSGX8=",
+   "module": "sha256-6WvCmRgCYinm3hVXvLdC77ge6ocR/8thzINEmp6h/FY=",
+   "pom": "sha256-lQozgiK9sdX7ttlxbC2l9UtB05NgMwp3eJcaukCK/CE="
+  },
+  "org/jetbrains/skiko#skiko/0.8.18": {
+   "module": "sha256-qbGDSU+EVPtX7B//+UyyqL7u3aG3PSjbbrS4+NwKU8s=",
+   "pom": "sha256-ac1xXT+/dr0QV571/D69q1RfiwxFm6iWzcbeoMETzAw="
+  },
+  "org/jetbrains/skiko#skiko/0.9.4": {
+   "module": "sha256-XHG00ajc2rFNpgCC5BSxKvXw+y40aDkBn3+kG+eGW0c=",
+   "pom": "sha256-jGpkAr2GskEIWA/3Ho3wKSmhzCad6arvccqVNxfQC68="
   },
   "org/json#json/20231013": {
    "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=",
@@ -3301,6 +3518,10 @@
    "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
    "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
   },
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
   "org/junit#junit-bom/5.10.3": {
    "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
    "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
@@ -3313,10 +3534,6 @@
    "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
    "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
   },
-  "org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
-  },
   "org/jvnet/staxex#stax-ex/1.8.1": {
    "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=",
    "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY="
@@ -3357,85 +3574,55 @@
    "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=",
    "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk="
   },
-  "org/openani/mediamp#catalog/0.0.26": {
-   "module": "sha256-I16xb6VSWCPEXR00K6Pqe+1Ord4hoVegIdFJCjiw70I=",
-   "pom": "sha256-itzCsDj32fyeFUTVTKskJnG7J9I1ketiWnzmCOCjNfc="
+  "org/openani/mediamp#catalog/0.0.29": {
+   "module": "sha256-s6r4l6CUxAxXNrk0x4papHn7CT9Agn+VGhA5gde45/8=",
+   "pom": "sha256-E5GiqnTrK4imwFM7QBmAAhhxDKijBAIi/mwyH3FUuk4="
   },
-  "org/openani/mediamp#mediamp-api-desktop/0.0.26": {
-   "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=",
-   "module": "sha256-Robr2Hjhc9Mucq0MlPX9uDbPTGU37OM+EQMyCuyGCFM=",
-   "pom": "sha256-rYSUUSwrno45hElP5s65pi+HpfySFdniNZAgLsxFs5Y="
+  "org/openani/mediamp#mediamp-api-desktop/0.0.29": {
+   "jar": "sha256-k4Qsb20oECKLw2ZQ+QH7rCuKl9W3kM9nfJRWF0cTAlE=",
+   "module": "sha256-InxhvamLA6cAcu7JPORsd+NoK+eeTjlmg+kXHgUL8J8=",
+   "pom": "sha256-4yVSYeA9sIcF7x0W9IOSNEtURY10iC9gvsC00JZ6GmU="
   },
-  "org/openani/mediamp#mediamp-api/0.0.26": {
-   "module": "sha256-67z9qC1RG4iuQ4LkN3hZX8nU/RlqJdB5kgR4WZfdAV4=",
-   "pom": "sha256-/YHwjj6d4vOu5v9yr9ctEAV7J7aIQPtF+Nc5Zy5Z7MI="
+  "org/openani/mediamp#mediamp-api/0.0.29": {
+   "module": "sha256-5BiLU2hqMh9twBjyMkZymeltSP5Lvhqm+Ebram4FJxk=",
+   "pom": "sha256-bxPAiiGEC3XucMnl+KwnQfP1Q96RlQBpHw459rTU9os="
   },
-  "org/openani/mediamp#mediamp-compose-desktop/0.0.26": {
-   "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=",
-   "module": "sha256-KUPXp03ZHWwJoFW9Yv3G7qZ6KVnzu9kXaHko0sCwa1M=",
-   "pom": "sha256-gCRVtSffFrskMft9QoPlP00xAkx5fO0RufLK6F+XDPQ="
-  },
-  "org/openani/mediamp#mediamp-compose/0.0.26": {
-   "module": "sha256-GourAD3L6fbG/2vk6sAcWFbAixi8JMT8VS4hLM5vKGg=",
-   "pom": "sha256-kDFj3l1wpEcOGnBM5+auo4ir1muIHfb9NW9PaZ8exG8="
-  },
-  "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.26": {
+  "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.29": {
    "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=",
-   "module": "sha256-5IKmn1mlfajGIvv66eSr8SBOU+V5dcndh+FlU8gf5nw=",
-   "pom": "sha256-rWfE+eWilDOkDWU2xLzA+qv2x8/dF+Qwhet7lGVTnd0="
+   "module": "sha256-3ZMls4s+OGQgPoXLFBqB7WbyE1Qn2f84XoXw0pOdtUQ=",
+   "pom": "sha256-nN9HUn/RfKtPCOSNiD2URA+IBpkSwWWt0HZO8CZjtEE="
   },
-  "org/openani/mediamp#mediamp-source-ktxio/0.0.26": {
-   "module": "sha256-YT7EHwxB69StjLsu3EmPYhb4MWHJLxLfJ7CSy+X7INk=",
-   "pom": "sha256-Fd7cpjCUJnGnofv2uq3DqePrH00ahYT+f96hVi3Grlc="
+  "org/openani/mediamp#mediamp-source-ktxio/0.0.29": {
+   "module": "sha256-As/GVZGSN4hAfby3KRxBzyMMUpuNmy24wVPlSQ4ABww=",
+   "pom": "sha256-Zd+xibJweb9/tUsvBKtkQm8REPIRs9JI/q6D4uGBDag="
   },
-  "org/openani/mediamp#mediamp-vlc-compose/0.0.26": {
-   "jar": "sha256-FpRyBToA2qz5SNOQPmTDKr+RO/AZuco60pGvUHueTLQ=",
-   "module": "sha256-0RYTOM3zHsvu9VY9GIaIUYXyZhIWJGh+qVbt/QuSoLY=",
-   "pom": "sha256-i1WxsUV+u/uKjTURro7eR08gU55kI2G+v31g48BCTpc="
+  "org/openani/mediamp#mediamp-vlc/0.0.29": {
+   "jar": "sha256-IipT5VaRSsRsF0+DOLb4ZEAVSVIVuSVMbydWzTgjN6I=",
+   "module": "sha256-3iXzV+GUgG26i6JGs+KuifxMAqw6n91hvFBnY4PhGH0=",
+   "pom": "sha256-hyzw9+4O0IBKsOBpmMYXFbYOFfhxlAXtvx5Zb2I2bU4="
   },
-  "org/openani/mediamp#mediamp-vlc/0.0.26": {
-   "jar": "sha256-6kpP5IZcVMPP+YlO5zSgYaMhi0LpbLGSarofI17Qviw=",
-   "module": "sha256-19aWYPuBD+jGAxH+vYjlUUmqGnl+XGs+jguNlO3724M=",
-   "pom": "sha256-gO7O6O/LGGPEvgOCoQzgcrqAdSWesJqc223ZVlC2yXg="
-  },
-  "org/openani/mediamp/catalog/0.0.26/catalog-0.0.26": {
-   "toml": "sha256-OuAXWWvPwKdSS1Xx4zrv4tcOkzYl5BpsbwQb5+gX88g="
+  "org/openani/mediamp/catalog/0.0.29/catalog-0.0.29": {
+   "toml": "sha256-wNPEmb14ugDo4NPEcf8lY0hRcCOGDFmsDGcHJqUSq5E="
   },
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-analysis/9.6": {
-   "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA="
-  },
   "org/ow2/asm#asm-analysis/9.7": {
    "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=",
    "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98="
   },
-  "org/ow2/asm#asm-commons/9.6": {
-   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
-  },
   "org/ow2/asm#asm-commons/9.7": {
    "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=",
    "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ="
   },
-  "org/ow2/asm#asm-tree/9.6": {
-   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
-  },
   "org/ow2/asm#asm-tree/9.7": {
    "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=",
    "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw="
   },
-  "org/ow2/asm#asm-util/9.6": {
-   "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4="
-  },
   "org/ow2/asm#asm-util/9.7": {
    "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=",
    "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI="
   },
-  "org/ow2/asm#asm/9.6": {
-   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
-   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
-  },
   "org/ow2/asm#asm/9.7": {
    "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
    "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
@@ -3480,9 +3667,9 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/tensorflow#tensorflow-lite-metadata/0.1.0-rc2": {
-   "jar": "sha256-LComT4QkmMNtNNKnuRNCSQ2alihiyFuqwazVTsL8ptk=",
-   "pom": "sha256-mk9eVnQ2bBVskDkWYvA+18WXHWqmODLfdKJx2m/4LpY="
+  "org/tensorflow#tensorflow-lite-metadata/0.2.0": {
+   "jar": "sha256-6fGLikHwF+kDPLDthciiuiMHKSzf4l6uNlkj56MdKnA=",
+   "pom": "sha256-D+MTJug7diLLzZx11GeykfAf/jzG4+dmUawFocHHo2A="
   },
   "org/xerial#sqlite-jdbc/3.41.2.2": {
    "jar": "sha256-DNq0EJR+BLZ0Pfmc8VQyZ93RBzV9b3aUjRRb5ZD9SX0=",
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 51b328cd4f5e..6e82bdb631b8 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -79,13 +79,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "animeko";
-  version = "4.10.1";
+  version = "4.11.1";
 
   src = fetchFromGitHub {
     owner = "open-ani";
     repo = "animeko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sFEq6tJfADH5x8+wdQ9T89awT7/Qx2RV5r+cND3J0iw=";
+    hash = "sha256-JLOwWJvBfwqvAfaFn5qr8lsHL7/u97qYjZsckBjAu6I=";
     fetchSubmodules = true;
   };
 

From 0b95d24dabddd50d7c12de449372e241e085cfa6 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Sun, 25 May 2025 20:28:42 +0400
Subject: [PATCH 0366/1497] cflib: init at 0.1.28

Python library to communicate with and control the crazyflie micro
quadcopters.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 .../python-modules/cflib/default.nix          | 90 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 92 insertions(+)
 create mode 100644 pkgs/development/python-modules/cflib/default.nix

diff --git a/pkgs/development/python-modules/cflib/default.nix b/pkgs/development/python-modules/cflib/default.nix
new file mode 100644
index 000000000000..a76c9568643d
--- /dev/null
+++ b/pkgs/development/python-modules/cflib/default.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  libusb-package,
+  numpy,
+  packaging,
+  pyserial,
+  pyusb,
+  scipy,
+  pytestCheckHook,
+  pyyaml,
+  udevCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "cflib";
+  version = "0.1.28";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bitcraze";
+    repo = "crazyflie-lib-python";
+    tag = version;
+    hash = "sha256-vGqwQVD80NcFJosVAmqj66uxYNoVtAqzVhVQiuWP5yM=";
+  };
+
+  strictDeps = true;
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "numpy" ];
+
+  dependencies = [
+    libusb-package
+    numpy
+    packaging
+    pyserial
+    pyusb
+    scipy
+  ];
+
+  disabledTestPaths = [
+    # exception: Cannot find a Crazyradio Dongle (HW required)
+    "sys_test/single_cf_grounded/"
+    "sys_test/swarm_test_rig/"
+  ];
+
+  pythonImportsCheck = [ "cflib" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+  ];
+
+  # The udevCheckHook is used to verify udev rules
+  # requires diInstallCheck to be enabled, which is default for pythonPackages
+  nativeInstallCheckInputs = [
+    udevCheckHook
+  ];
+
+  # Install udev rules as defined
+  # https://www.bitcraze.io/documentation/repository/crazyflie-lib-python/master/installation/usb_permissions/
+  postInstall = ''
+    # Install udev rules
+    mkdir -p $out/etc/udev/rules.d
+
+    cat <<EOF > $out/etc/udev/rules.d/99-bitcraze.rules
+    # Crazyradio (normal operation)
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="1915", ATTRS{idProduct}=="7777", MODE="0664", GROUP="plugdev"
+    # Bootloader
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="1915", ATTRS{idProduct}=="0101", MODE="0664", GROUP="plugdev"
+    # Crazyflie (over USB)
+    SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", MODE="0664", GROUP="plugdev"
+    EOF
+  '';
+
+  meta = {
+    description = "Python library for the Crazyflie quadcopter by Bitcraze";
+    homepage = "https://github.com/bitcraze/crazyflie-lib-python";
+    changelog = "https://github.com/bitcraze/crazyflie-lib-python/releases/tag/${version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.brianmcgillion ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7a1e6b8d340..751cece0fb41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2366,6 +2366,8 @@ self: super: with self; {
 
   cfgv = callPackage ../development/python-modules/cfgv { };
 
+  cflib = callPackage ../development/python-modules/cflib { };
+
   cfn-flip = callPackage ../development/python-modules/cfn-flip { };
 
   cfn-lint = callPackage ../development/python-modules/cfn-lint { };

From b6529db3f2d9c2b4c415baed15711c6967cd052f Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Sun, 25 May 2025 20:34:43 +0400
Subject: [PATCH 0367/1497] cfclient: init at 2025.2

The Crazyflie PC client enables flashing and controlling the Crazyflie.
It implements the user interface and high-level control (for example
gamepad handling). The communication with Crazyflie and the
implementation of the CRTP protocol to control the Crazyflie is handled
by the cflib project.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 pkgs/by-name/cf/cfclient/package.nix | 79 ++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 pkgs/by-name/cf/cfclient/package.nix

diff --git a/pkgs/by-name/cf/cfclient/package.nix b/pkgs/by-name/cf/cfclient/package.nix
new file mode 100644
index 000000000000..d744757fe5d5
--- /dev/null
+++ b/pkgs/by-name/cf/cfclient/package.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  qt6,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "cfclient";
+  version = "2025.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bitcraze";
+    repo = "crazyflie-clients-python";
+    tag = version;
+    hash = "sha256-LCGTMLIfGH59KFwQACyuEQTh/zkGgzXd3e6MkFTgKhA=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+  ];
+
+  dontWrapQtApps = true;
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+    "pyqt6"
+    "vispy"
+  ];
+
+  dependencies = with python3Packages; [
+    appdirs
+    cflib
+    numpy
+    pyopengl
+    pyserial
+    pysdl2
+    pyqtgraph
+    pyqt6
+    pyqt6-sip
+    pyyaml
+    pyzmq
+    scipy
+    setuptools
+    vispy
+  ];
+
+  # No tests
+  doCheck = false;
+
+  # Use wrapQtApp for Python scripts as the manual mentions that wrapQtAppsHook only applies to binaries
+  postFixup = ''
+    wrapQtApp "$out/bin/cfclient" \
+      --set QT_QPA_PLATFORM "wayland" \
+      --set XDG_CURRENT_DESKTOP "Wayland" \
+      ''${qtWrapperArgs[@]}
+  '';
+
+  meta = {
+    description = "Host applications and library for Crazyflie drones written in Python";
+    homepage = "https://github.com/bitcraze/crazyflie-clients-python";
+    changelog = "https://github.com/bitcraze/crazyflie-clients-python/releases/tag/${version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.brianmcgillion ];
+    platforms = lib.platforms.linux;
+  };
+}

From 8a7602273eaba7c142f4109f9d97b5bdceb772af Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 1 Jun 2025 16:56:33 +0200
Subject: [PATCH 0368/1497] git-metrics: init at 0.2.6

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/gi/git-metrics/package.nix | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/gi/git-metrics/package.nix

diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix
new file mode 100644
index 000000000000..2feb6130a082
--- /dev/null
+++ b/pkgs/by-name/gi/git-metrics/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  gitMinimal,
+  rustPlatform,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "git-metrics";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "jdrouet";
+    repo = "git-metrics";
+    tag = "v${version}";
+    hash = "sha256-SdA/FpdrbC36Ny7aBpTUvFldbYXyajSqWGheaDPHYoE=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-e4CdpwoFl8leV5HJWkWBpvPrVrk+7vq49yTPkpeQ2Ng=";
+
+  buildInputs = [
+    openssl
+  ];
+
+  nativeCheckInputs = [
+    pkg-config
+    gitMinimal
+  ];
+
+  checkFlags = [
+    # requires git author information to be detectable
+    "--skip=tests::check_budget::execute::with_command_backend"
+    "--skip=tests::check_budget::execute::with_git2_backend"
+    "--skip=tests::conflict_different::execute::with_command_backend"
+    "--skip=tests::conflict_different::execute::with_git2_backend"
+    "--skip=tests::display_diff::execute"
+    "--skip=tests::simple_use_case::execute::with_command_backend"
+    "--skip=tests::simple_use_case::execute::with_git2_backend"
+  ];
+
+  meta = {
+    homepage = "https://github.com/jdrouet/git-metrics";
+    description = "Git extension to be able to track metrics about your project, within the git repository";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+    ];
+    mainProgram = "git-metrics";
+  };
+}

From e9d0806e31dfdfd91e93ade8595f96fae7f74ff4 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:24:33 +0800
Subject: [PATCH 0369/1497] dart.rhttp: add 0.12.0

---
 .../compilers/dart/package-source-builders/rhttp/default.nix     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
index 0be6f3f9f761..5bf7e2eb4497 100644
--- a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix
@@ -35,6 +35,7 @@ let
         _0_9_8 = "sha256-cwb1wYVXOE5YABlMxUDt+OMlDpIlipqeNI7ZFAGHCqo=";
         _0_10_0 = "sha256-2SpAj53XvZXKRpMzFXJGcx7E2TlMUD+ooHkFwg/9fe4=";
         _0_11_0 = "sha256-sngh5k9GoCZhnIFTpnAVHZjxTcOv+Ui6pJ2cFyriL84=";
+        _0_12_0 = "sha256-W2DcBy1n73nR2oZIQcFt6A+NElQWtfEtKB1YIweQUVo=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'rhttp': '${version}'

From 4b0eefd26b545fde3feb93ccf19476c994bc8eef Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:24:50 +0800
Subject: [PATCH 0370/1497] venera: 1.4.3 -> 1.4.4

---
 pkgs/by-name/ve/venera/package.nix       | 10 +++----
 pkgs/by-name/ve/venera/pubspec.lock.json | 34 ++++++++++++------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index 6bb715a9110d..383332425944 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
+  flutter332,
   fetchFromGitHub,
-  flutter329,
   webkitgtk_4_1,
   copyDesktopItems,
   makeDesktopItem,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-flutter329.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
   pname = "venera";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "venera-app";
     repo = "venera";
     tag = "v${version}";
-    hash = "sha256-hhKfHJRZyNsQcGhbgBdBvy2KjKOxg4+0yi+ynX3qMw4=";
+    hash = "sha256-ZJ5TMoBamXHU/pU790/6HHJwNqVsXpZ1OttPR/JSydY=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -38,6 +38,7 @@ flutter329.buildFlutterApplication rec {
       scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA=";
       webdav_client = "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=";
       flutter_saf = "sha256-zmRZ82aJPYX/N/lOUcOoT8UAHEDoUk0FTFSqB4gKR+U=";
+      rhttp = "sha256-6AH7A+CJg60Vk0ph3cJwj29GkmJEezI/VuZvRqqmOYs=";
       flutter_inappwebview = flutter_inappwebview-hash;
       flutter_inappwebview_android = flutter_inappwebview-hash;
       flutter_inappwebview_ios = flutter_inappwebview-hash;
@@ -45,7 +46,6 @@ flutter329.buildFlutterApplication rec {
       flutter_inappwebview_web = flutter_inappwebview-hash;
       flutter_inappwebview_windows = flutter_inappwebview-hash;
       flutter_inappwebview_platform_interface = flutter_inappwebview-hash;
-      rhttp = "sha256-odYLLj9Vd0+UQVXtYgGzMDKLD7SbTqrqHI1jAXVr5XU=";
     };
 
   nativeBuildInputs = [ copyDesktopItems ];
diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json
index 5451f4281526..e0af10885f82 100644
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@@ -54,11 +54,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "battery_plus": {
       "dependency": "direct main",
@@ -235,11 +235,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
@@ -536,11 +536,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611",
+        "sha256": "b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.0"
+      "version": "2.10.0"
     },
     "flutter_saf": {
       "dependency": "direct main",
@@ -649,11 +649,11 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
@@ -679,11 +679,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -951,12 +951,12 @@
       "dependency": "direct main",
       "description": {
         "path": "rhttp",
-        "ref": "e7dca15ca543b5df49f3ada06016e874b79bce36",
-        "resolved-ref": "e7dca15ca543b5df49f3ada06016e874b79bce36",
+        "ref": "1f0ff50336062c5f809c256726dc55cd30b9ce59",
+        "resolved-ref": "1f0ff50336062c5f809c256726dc55cd30b9ce59",
         "url": "https://github.com/wgh136/rhttp"
       },
       "source": "git",
-      "version": "0.11.0"
+      "version": "0.12.0"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1289,11 +1289,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "web": {
       "dependency": "transitive",
@@ -1378,7 +1378,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.29.3"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.32.0"
   }
 }

From 571d64322458c3e474cb0c01d431d1c1afd1d6e4 Mon Sep 17 00:00:00 2001
From: Thomas Schafer <thomasschafer97@gmail.com>
Date: Sun, 1 Jun 2025 16:26:08 +0100
Subject: [PATCH 0371/1497] scooter: 0.5.0 -> 0.5.2

---
 pkgs/by-name/sc/scooter/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index 12244728a826..0b9f4eeea61e 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -6,23 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scooter";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
     rev = "v${version}";
-    hash = "sha256-+l2XkG6xUOkfSPe20oXjUKdmBYB7GX0xZuqddC8w/lc=";
+    hash = "sha256-GlqGAzOkW6Jy7qGblfkMfCtzNwjOY/ZmGktqU4uUe90=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+KvHeTa8x77cMbZNbSeMcr66lAqWSBmfkn1rY+PfqHs=";
+  cargoHash = "sha256-mh4FoFZ012yXbCr9Ts57crc+1JrcA2cdnZzqjKUspq8=";
 
-  checkFlags = [
-    # failed only for buildRustPackage
-    # might be related to https://ryantm.github.io/nixpkgs/languages-frameworks/rust/#tests-relying-on-the-structure-of-the-target-directory
-    "--skip=test_search_current_dir"
-  ];
+  # Many tests require filesystem writes which fail in Nix sandbox
+  doCheck = false;
 
   meta = {
     description = "Interactive find and replace in the terminal";

From 6e451ef75a176847a68ab2c129d83418a2d61f9e Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 20 May 2025 05:21:00 +0800
Subject: [PATCH 0372/1497] elmerfem: unstable-2023-09-18 ->
 9.0-unstable-2025-05-25

---
 pkgs/by-name/el/elmerfem/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix
index 69f74962be25..2c3f018cf645 100644
--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@@ -14,19 +14,20 @@
   libsForQt5,
   tbb,
   vtkWithQt5,
+  llvmPackages,
 }:
 let
   opencascade-occt = opencascade-occt_7_6;
 in
 stdenv.mkDerivation rec {
   pname = "elmerfem";
-  version = "unstable-2023-09-18";
+  version = "9.0-unstable-2025-05-25";
 
   src = fetchFromGitHub {
     owner = "elmercsc";
     repo = "elmerfem";
-    rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c";
-    hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc=";
+    rev = "2f7360ddf491c34f19fea9a723f340cca0fbe1d4";
+    hash = "sha256-2vzIFGh8+YrMxb5px6+aQyTerOAJmHOh2I7eterY6zI=";
   };
 
   hardeningDisable = [ "format" ];
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
     opencascade-occt
     tbb
     vtkWithQt5
-  ];
+  ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
   preConfigure = ''
     patchShebangs ./
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND"
+    "-DUSE_MACOS_PACKAGE_MANAGER=False"
   ];
 
   meta = with lib; {

From 7a875d8aa53f8dbe7907a2b8a040822617e2a0ff Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Wed, 7 May 2025 15:00:15 +0300
Subject: [PATCH 0373/1497] gimx: fix build

---
 pkgs/by-name/gi/gimx/conf.patch  | 37 ++++++++++++++++++++++++++------
 pkgs/by-name/gi/gimx/gcc14.patch | 26 ----------------------
 pkgs/by-name/gi/gimx/package.nix | 13 +++++------
 3 files changed, 36 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/gi/gimx/gcc14.patch

diff --git a/pkgs/by-name/gi/gimx/conf.patch b/pkgs/by-name/gi/gimx/conf.patch
index 1040a6192f38..c690a33805e3 100644
--- a/pkgs/by-name/gi/gimx/conf.patch
+++ b/pkgs/by-name/gi/gimx/conf.patch
@@ -1,8 +1,15 @@
-diff --git a/core/config_reader.c b/core/config_reader.c
-index 451fc48..ed45f4d 100644
 --- a/core/config_reader.c
 +++ b/core/config_reader.c
-@@ -1355,7 +1355,7 @@ int read_config_file(const char* file)
+@@ -17,7 +17,7 @@
+ #include "../directories.h"
+ #include "macros.h"
+ #include <errno.h>
+-
++#include <stdlib.h>
+ /*
+  * These variables are used to read the configuration.
+  */
+@@ -1355,7 +1355,7 @@
    char file_path[PATH_MAX];
  
    snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);
@@ -11,11 +18,18 @@ index 451fc48..ed45f4d 100644
    if(read_file(file_path) == -1)
    {
      gerror("read_file failed\n");
-diff --git a/core/gimx.c b/core/gimx.c
-index 700cae9..9143d8b 100755
 --- a/core/gimx.c
 +++ b/core/gimx.c
-@@ -192,7 +192,7 @@ void show_config()
+@@ -8,7 +8,7 @@
+ #include <errno.h> //to print errors
+ #include <string.h> //to print errors
+ #include <limits.h> //PATH_MAX
+-
++#include <stdlib.h>
+ #ifndef WIN32
+ #include <termios.h> //to disable/enable echo
+ #include <unistd.h>
+@@ -192,7 +192,7 @@
    char file_path[PATH_MAX];
  
    snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);
@@ -24,3 +38,14 @@ index 700cae9..9143d8b 100755
    FILE * fp = gfile_fopen(file_path, "r");
    if (fp == NULL)
    {
+--- a/core/connectors/bluetooth/linux/bt_mgmt.c
++++ b/core/connectors/bluetooth/linux/bt_mgmt.c
+@@ -322,7 +322,7 @@ static int read_link_keys(uint16_t index, uint16_t nb_keys, bdaddr_t bdaddrs[nb_
+   bdaddr_t ba;
+   char dongle_bdaddr[18];
+ 
+-  if(bt_device_abs_get(bt_abs_value)->get_bdaddr(index, &ba) < 0)
++  if(bt_device_abs_get()->get_bdaddr(index, &ba) < 0)
+   {
+     fprintf(stderr, "can't read device bdaddr\n");
+     return -1;
diff --git a/pkgs/by-name/gi/gimx/gcc14.patch b/pkgs/by-name/gi/gimx/gcc14.patch
deleted file mode 100644
index b736891f07ea..000000000000
--- a/pkgs/by-name/gi/gimx/gcc14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/core/config_reader.c b/core/config_reader.c
-index 451fc48..737d27c 100644
---- a/core/config_reader.c
-+++ b/core/config_reader.c
-@@ -17,7 +17,7 @@
- #include "../directories.h"
- #include "macros.h"
- #include <errno.h>
--
-+#include <stdlib.h>
- /*
-  * These variables are used to read the configuration.
-  */
-diff --git a/core/gimx.c b/core/gimx.c
-index 700cae9..693f72f 100755
---- a/core/gimx.c
-+++ b/core/gimx.c
-@@ -8,7 +8,7 @@
- #include <errno.h> //to print errors
- #include <string.h> //to print errors
- #include <limits.h> //PATH_MAX
--
-+#include <stdlib.h>
- #ifndef WIN32
- #include <termios.h> //to disable/enable echo
- #include <unistd.h>
diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix
index b2e1372fc35f..ed6a382e0298 100644
--- a/pkgs/by-name/gi/gimx/package.nix
+++ b/pkgs/by-name/gi/gimx/package.nix
@@ -34,10 +34,8 @@ stdenv.mkDerivation rec {
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
-  patches = [
-    ./conf.patch
-    ./gcc14.patch
-  ];
+  patches = [ ./conf.patch ];
+  makeFlags = [ "build-core" ];
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
@@ -50,7 +48,6 @@ stdenv.mkDerivation rec {
     xorg.libX11
     xorg.libXi
   ];
-  makeFlags = [ "build-core" ];
 
   installPhase = ''
     runHook preInstall
@@ -70,10 +67,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/matlo/GIMX";
     description = "Game Input Multiplexer";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
   };
 }

From 68b26525cf0f93a32aa4215b007bc10d70535779 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 16:59:25 +0000
Subject: [PATCH 0374/1497] python3Packages.fontparts: 0.12.5 -> 0.12.7

---
 pkgs/development/python-modules/fontparts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix
index efcdcad0f044..a2d3525343b3 100644
--- a/pkgs/development/python-modules/fontparts/default.nix
+++ b/pkgs/development/python-modules/fontparts/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "fontparts";
-  version = "0.12.5";
+  version = "0.12.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cD7ppaYLnKOLyBMlSlF+ham74yid8MBunxgVkyE3I0I=";
+    hash = "sha256-zg8QkiHh4UhhXdTRhDKulB+Q2E6GZyD0fnPIm6fWZGc=";
     extension = "zip";
   };
 

From decd2f9b55fa0e800fe229f71145786a9bf20588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 1 Jun 2025 10:06:20 -0700
Subject: [PATCH 0375/1497] python3Packages.py-sucks: 0.9.10 -> 0.9.11

Diff: https://github.com/mib1185/py-sucks/compare/refs/tags/v0.9.10...refs/tags/v0.9.11

Changelog: https://github.com/mib1185/py-sucks/releases/tag/v0.9.11
---
 .../python-modules/py-sucks/default.nix         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/py-sucks/default.nix b/pkgs/development/python-modules/py-sucks/default.nix
index 281228398f7e..efff0337b295 100644
--- a/pkgs/development/python-modules/py-sucks/default.nix
+++ b/pkgs/development/python-modules/py-sucks/default.nix
@@ -14,32 +14,37 @@
 
 buildPythonPackage rec {
   pname = "py-sucks";
-  version = "0.9.10";
+  version = "0.9.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "py-sucks";
     tag = "v${version}";
-    hash = "sha256-MjlE5HdxChAgV/O7cD3foqkmKie7FgRRxvOcW+NAtfA=";
+    hash = "sha256-srj/3x04R9KgbdC6IgbQdgUz+srAx0OttB6Ndb2+Nh4=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    click
-    pycountry-convert
     pycryptodome
     requests
     sleekxmppfs
   ];
 
+  optional-dependencies = {
+    cli = [
+      click
+      pycountry-convert
+    ];
+  };
+
   pythonImportsCheck = [ "sucks" ];
 
   nativeCheckInputs = [
     requests-mock
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # assumes $HOME is at a specific place
@@ -47,7 +52,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/mib1185/py-sucks/releases/tag/v${version}";
+    changelog = "https://github.com/mib1185/py-sucks/releases/tag/${src.tag}";
     description = "Library for controlling certain robot vacuums";
     homepage = "https://github.com/mib1185/py-sucks";
     license = lib.licenses.gpl3Only;

From 256b7b3e6a449fd859fb36531dbab7601b5558f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 17:18:02 +0000
Subject: [PATCH 0376/1497] markdownlint-cli2: 0.17.2 -> 0.18.1

---
 pkgs/by-name/ma/markdownlint-cli2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/markdownlint-cli2/package.nix b/pkgs/by-name/ma/markdownlint-cli2/package.nix
index d500727d99f3..65c38b5ec9d9 100644
--- a/pkgs/by-name/ma/markdownlint-cli2/package.nix
+++ b/pkgs/by-name/ma/markdownlint-cli2/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "markdownlint-cli2";
-  version = "0.17.2";
+  version = "0.18.1";
 
   # upstream is not interested in including package-lock.json in the source
   # https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   # so use the tarball from the archlinux mirror
   src = fetchurl {
     url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst";
-    hash = "sha256-TuiLFP/XItJh5VQWdwCvXRQCVzmqst4Sxna0eLobEQ4=";
+    hash = "sha256-M7qmhRDJGm2MhgS2oMfRrkLAst1Ye/rPCwP78UBbyyY=";
   };
 
   nativeBuildInputs = [

From 7270abb90fc3d8d9bf00553220aa64341d7b73a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 18:08:26 +0000
Subject: [PATCH 0377/1497] python3Packages.numpy-groupies: 0.11.2 -> 0.11.3

---
 pkgs/development/python-modules/numpy-groupies/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix
index 92f93774817c..36d3a343565f 100644
--- a/pkgs/development/python-modules/numpy-groupies/default.nix
+++ b/pkgs/development/python-modules/numpy-groupies/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "numpy-groupies";
-  version = "0.11.2";
+  version = "0.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ml31415";
     repo = "numpy-groupies";
     tag = "v${version}";
-    hash = "sha256-Eu+5SR28jIasKe1p7rvbq2yo3PGZRQWWdG3A5vGhnyM=";
+    hash = "sha256-pg9hOtIgS8pB/Y9Xqto9Omsdg8TxaA5ZGE1Qh1DCceU=";
   };
 
   build-system = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://github.com/ml31415/numpy-groupies";
-    changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}";
+    changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/${src.tag}";
     description = "Optimised tools for group-indexing operations: aggregated sum and more";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ berquist ];

From 7738f63454eaf8dd47a336c617ea38ff55a29e5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 18:10:46 +0000
Subject: [PATCH 0378/1497] python3Packages.pytubefix: 9.0.1 -> 9.1.1

---
 pkgs/development/python-modules/pytubefix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix
index 4091e62307de..cf1e8abd0334 100644
--- a/pkgs/development/python-modules/pytubefix/default.nix
+++ b/pkgs/development/python-modules/pytubefix/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pytubefix";
-  version = "9.0.1";
+  version = "9.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JuanBindez";
     repo = "pytubefix";
     tag = "v${version}";
-    hash = "sha256-TIrt20FAQumtDisscY9jcJY+Cuh1zA92hU3HVmwr4Bk=";
+    hash = "sha256-OKOP1kDPYXMQkVOITSxYqMYQvtVom8VCaLnCBYEhgR8=";
   };
 
   build-system = [ setuptools ];

From 6f34b4ec6ef323f80041569d5a375b9b6fbef7c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 18:12:39 +0000
Subject: [PATCH 0379/1497] terraform-providers.dnsimple: 1.9.0 -> 1.9.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 3bf400979d8f..371e0c09667b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -390,13 +390,13 @@
     "vendorHash": "sha256-xu5t7VaLvbwo/Q7Xb4mkNt7UjU+hzfk7NgfFlxwbIhU="
   },
   "dnsimple": {
-    "hash": "sha256-CkfgHBNtYCFZIMoXpX0ivkm1dyIs4mKSrHaiQ3qt/+w=",
+    "hash": "sha256-7o8shnWECaCLTCvmXrJ2eYloxtln2A2No8OK8Ig36qE=",
     "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
     "owner": "dnsimple",
     "repo": "terraform-provider-dnsimple",
-    "rev": "v1.9.0",
+    "rev": "v1.9.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw="
+    "vendorHash": "sha256-0axKIqF1t4AW1PPi+fHfsFQLRrjhpsloQIZ9clR+8Gc="
   },
   "docker": {
     "hash": "sha256-vpgvEDcmUpumCNvahijb7lkkEQUeaHH0a+CSzPspIyM=",

From d1869c611ef27bbf7011853f825044b6dfbb3c7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 18:41:03 +0000
Subject: [PATCH 0380/1497] chirp: 0.4.0-unstable-2025-05-14 ->
 0.4.0-unstable-2025-05-29

---
 pkgs/by-name/ch/chirp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 79e99aa733d9..6600099b3e2f 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-05-14";
+  version = "0.4.0-unstable-2025-05-29";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "eb4e4547b517c3d10ede760bcd31eeb448c455dc";
-    hash = "sha256-e10WFYpIy6JnPAqUcapli9Q6R0GxNwb1YjnE4cu+xfk=";
+    rev = "db838b0c1ae9b0964efcd625c415a76ff9fbea4a";
+    hash = "sha256-C8sicZ4krALpsRFbX8Ls5GZc7FUimg2Ix6WsQP2oMvw=";
   };
 
   nativeBuildInputs = [

From 6eb9bb33f5c7100555a171f09b57ea2002f21e85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 18:43:30 +0000
Subject: [PATCH 0381/1497] yandex-music: 5.51.1 -> 5.52.0

---
 pkgs/by-name/ya/yandex-music/package.nix  | 4 ++--
 pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index 4830d8c30667..a67c69c6f56b 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -29,13 +29,13 @@ assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be with
 assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0";
 stdenvNoCC.mkDerivation rec {
   pname = "yandex-music";
-  version = "5.51.1";
+  version = "5.52.0";
 
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
     rev = "v${version}";
-    hash = "sha256-jk/u0a6rnLDANHebtJ9yTAeFSIPg/CEIqm0oZnGdD0k=";
+    hash = "sha256-39aVY2D8fM243Uhr4i3d9OdBKRqb4MNnkSjKOH3tF4s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json
index 4013bff5e2c5..12055ba97473 100644
--- a/pkgs/by-name/ya/yandex-music/ym_info.json
+++ b/pkgs/by-name/ya/yandex-music/ym_info.json
@@ -1,6 +1,6 @@
 {
-  "version": "5.51.1",
-  "exe_name": "Yandex_Music_x64_5.51.1.exe",
-  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.51.1.exe",
-  "exe_hash": "sha256-iu7DqcFs9/4aw46eIgWKIYyZ6fIzoW6XkiqdpERup/M="
+  "version": "5.52.0",
+  "exe_name": "Yandex_Music_x64_5.53.1.exe",
+  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.53.1.exe",
+  "exe_hash": "sha256-aTl3sF8n0v17TeAyQwjrXUDKK/MaCtoHQ34IHDEeme8="
 }

From 55963bf96c43917538418ce53ee25214677b4142 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 May 2025 08:12:04 -0500
Subject: [PATCH 0382/1497] python3Packages.atlassian-python-api: modernize

---
 .../development/python-modules/atlassian-python-api/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index c9bc2f65a692..a59a996f52ee 100644
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     deprecated
     jmespath

From 75d912f07c956617fb9e31dc3484f45e1c77259f Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 May 2025 08:12:21 -0500
Subject: [PATCH 0383/1497] python3Packages.atlassian-python-api: 3.41.21 ->
 4.0.4

---
 .../python-modules/atlassian-python-api/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index a59a996f52ee..5f1192f21c1a 100644
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -11,13 +11,14 @@
   requests-kerberos,
   requests-oauthlib,
   six,
+  typing-extensions,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
-  version = "3.41.21";
+  version = "4.0.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
     owner = "atlassian-api";
     repo = "atlassian-python-api";
     tag = version;
-    hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII=";
+    hash = "sha256-iF4gjF/5QbdjJKCWMdElc+gdIy2+D7TV6gpoPZsTv14=";
   };
 
   dependencies = [
@@ -39,6 +40,7 @@ buildPythonPackage rec {
     requests-kerberos
     requests-oauthlib
     six
+    typing-extensions
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 9e7489622bde7abd10927289b81fe990262c8ee1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 19:10:41 +0000
Subject: [PATCH 0384/1497] cargo-nextest: 0.9.95 -> 0.9.97

---
 pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index e9576697c014..54907e8f61b8 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.95";
+  version = "0.9.97";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-OtCFehXzcdE8kBUkDg8y5ygTOtH2eP5aMzTpugDSg/E=";
+    hash = "sha256-5UhmWewLj3bjtvqyb6FcC1qZQbAutRPXnBi7e/lyArM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-nrRq5ET++jplx5argN04Ax+HTE6VqvBhnSsS/ZFNYr8=";
+  cargoHash = "sha256-mTKcQ76A++LK+54ChmCUF/7dsubdz7GZpOZUp+afqfQ=";
 
   cargoBuildFlags = [
     "-p"

From f35e7f8b6dea3694e62b32fc93a239598c983f19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 19:14:16 +0000
Subject: [PATCH 0385/1497] openimageio: 3.0.6.1 -> 3.0.7.0

---
 pkgs/by-name/op/openimageio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index 884b9d61b331..103343b9d5fb 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.0.6.1";
+  version = "3.0.7.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ymg7uSnPBKotnV6/FaVBIndsz6oEP5gfZ1+poMIdR4I=";
+    hash = "sha256-eVX7X0wqTasEBRz4i98av1PzwdUVycBmtPjWS+31yIE=";
   };
 
   outputs = [

From 129e9e7f692f93fc4ce629ed539d09262e99d81b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 19:20:36 +0000
Subject: [PATCH 0386/1497] ecapture: 1.0.2 -> 1.1.0

---
 pkgs/by-name/ec/ecapture/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index f785d9816fde..e58685562df4 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -22,13 +22,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     tag = "v${version}";
-    hash = "sha256-JqFb58JAepyNuxR3YVUX0tB+V66JrLVPUIVrnZn1aHw=";
+    hash = "sha256-mYnAa4zh7MqTTS2iU97YOhRbrCLd8C7D5furHNSO0F8=";
     fetchSubmodules = true;
   };
 
@@ -113,7 +113,7 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  vendorHash = "sha256-KRW5Gf9LYwo5AZ9bYPht+4staiYVyWGkbX/sXDNDppc=";
+  vendorHash = "sha256-B2Jq6v1PibZ1P9OylFsVp/ULZa/ne5T+vCsBWWrjW/4=";
 
   passthru.updateScript = nix-update-script { };
 

From 3e5e1cf05e4ebeb2280f33088c7221bcb42508a5 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Sun, 1 Jun 2025 21:40:00 +0200
Subject: [PATCH 0387/1497] qownnotes: 25.5.10 -> 25.6.0

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 pkgs/by-name/qo/qownnotes/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 65b07547a583..1ebe81f1ca28 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -5,7 +5,7 @@
   qt6Packages,
   cmake,
   makeWrapper,
-  botan2,
+  botan3,
   pkg-config,
   nixosTests,
   installShellFiles,
@@ -17,11 +17,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.5.10";
+  version = "25.6.0";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-P8vBLDnkBjTU/x47ka0Ps3nR+Wi4C6Gx+d0sP8lF/xM=";
+    hash = "sha256-RUW8fWPJxTq7Ya+uZ6xGg7URHc+ojuBs9g++UXrK9I0=";
   };
 
   nativeBuildInputs =
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtdeclarative
     qt6Packages.qtsvg
     qt6Packages.qtwebsockets
-    botan2
+    botan3
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
   cmakeFlags = [

From a5bbc5046bdb5be452c7d9e0b844a012468a6291 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Wed, 21 May 2025 20:41:53 +0200
Subject: [PATCH 0388/1497] doc/haskell: Add GHC deprecation policy

---
 doc/languages-frameworks/haskell.section.md | 21 +++++++++++++++++++++
 doc/redirects.json                          |  9 +++++++++
 2 files changed, 30 insertions(+)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 0e0d44114971..7da9580e2045 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -161,6 +161,27 @@ completely incompatible with packages from `haskellPackages`.
 
 <!-- TODO(@maralorn) Link to package set generation docs in the contributors guide below. -->
 
+### GHC Deprecation Policy {#ghc-deprecation-policy}
+
+We remove GHC versions according to the following policy:
+
+#### Major GHC versions {#major-ghc-deprecation}
+
+We keep the following GHC major versions:
+1. The current Stackage LTS as the default and all later major versions.
+2. The two latest major versions older than our default.
+3. The currently recommended GHCup version and all later major versions.
+
+Older GHC versions might be kept longer, if there are in-tree consumers. We will coordinate with the maintainers of those dependencies to find a way forward.
+
+#### Minor GHC versions {#minor-ghc-deprecation}
+
+Every major version has a default minor version. The default minor version will be updated as soon as viable without breakage.
+
+Older minor versions for a supported major version will only be kept, if they are the last supported version of a major Stackage LTS release.
+
+<!-- Policy introduced here: https://discourse.nixos.org/t/nixpkgs-ghc-deprecation-policy-user-feedback-necessary/64153 -->
+
 ## `haskellPackages.mkDerivation` {#haskell-mkderivation}
 
 Every haskell package set has its own haskell-aware `mkDerivation` which is used
diff --git a/doc/redirects.json b/doc/redirects.json
index 1bcf2a8bf52c..9d413d0da65c 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -40,9 +40,18 @@
   "ex-testEqualArrayOrMap-test-function-add-cowbell": [
     "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell"
   ],
+  "ghc-deprecation-policy": [
+    "index.html#ghc-deprecation-policy"
+  ],
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
+  "major-ghc-deprecation": [
+    "index.html#major-ghc-deprecation"
+  ],
+  "minor-ghc-deprecation": [
+    "index.html#minor-ghc-deprecation"
+  ],
   "neovim": [
     "index.html#neovim"
   ],

From a0127a902ddc6d7ffb5c2e78f9c68a3cf1daf2d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 20:29:16 +0000
Subject: [PATCH 0389/1497] helm-ls: 0.2.2 -> 0.3.0

---
 pkgs/by-name/he/helm-ls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix
index 055fcfdb2d40..9664e81c5c44 100644
--- a/pkgs/by-name/he/helm-ls/package.nix
+++ b/pkgs/by-name/he/helm-ls/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "helm-ls";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "mrjosh";
     repo = "helm-ls";
     rev = "v${version}";
-    hash = "sha256-NI9qtbt0Ci300DhDR+yjFThTGLXKrbsc1wuLPpC1l9o=";
+    hash = "sha256-OxrPqDa2g5jmm+XtLE0YCnVhkvVK60xxrO49Gl8VT60=";
   };
 
-  vendorHash = "sha256-1BO/0Ous4mclainPV+nqk5K+tHKgRnaxMtsI4xAhZF4=";
+  vendorHash = "sha256-w/BWPbpSYum0SU8PJj76XiLUjTWO4zNQY+khuLRK0O8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 42bf3489df2e207b04f5b36242780b843440b282 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 20:30:58 +0000
Subject: [PATCH 0390/1497] vscode-extensions.ms-azuretools.vscode-docker:
 1.29.6 -> 2.0.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b7fb23904f74..0d50764aa761 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3279,8 +3279,8 @@ let
         mktplcRef = {
           publisher = "ms-azuretools";
           name = "vscode-docker";
-          version = "1.29.6";
-          hash = "sha256-kHQuS6wxp3Gu5WSjWRXXMLwSrv7LBSsnsNu7VY4H/J0=";
+          version = "2.0.0";
+          hash = "sha256-Yxysekp9nC91g7M5oXppOF+Rf4Jf/PD+X3inmdVfVmo=";
         };
         meta = {
           description = "Docker Extension for Visual Studio Code";

From eac0b8db576e5de5bb702c5b627342a07ff6b6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Ahlstr=C3=B6m?= <kalle.ahlstrom@nitor.com>
Date: Mon, 2 Jun 2025 00:18:11 +0300
Subject: [PATCH 0391/1497] intune-portal: fix openssl version mismatch

---
 pkgs/by-name/in/intune-portal/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index f5342ec6aedc..139593535c3e 100644
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@@ -6,7 +6,7 @@
   libuuid,
   xorg,
   curlMinimal,
-  openssl,
+  openssl_3,
   libsecret,
   webkitgtk_4_0,
   libsoup_2_4,
@@ -22,6 +22,11 @@
   dbus,
   nixosTests,
 }:
+let
+  curlMinimal_openssl_3 = curlMinimal.override {
+    openssl = openssl_3;
+  };
+in
 stdenv.mkDerivation rec {
   pname = "intune-portal";
   version = "1.2405.17-jammy";
@@ -40,8 +45,8 @@ stdenv.mkDerivation rec {
           stdenv.cc.cc
           libuuid
           xorg.libX11
-          curlMinimal
-          openssl
+          curlMinimal_openssl_3
+          openssl_3
           libsecret
           webkitgtk_4_0
           libsoup_2_4

From a665e7a601f55e39e107bc7727742277e60ea8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Ahlstr=C3=B6m?= <kalle.ahlstrom@nitor.com>
Date: Mon, 2 Jun 2025 00:19:43 +0300
Subject: [PATCH 0392/1497] intune-portal: 1.2405.17-jammy -> 1.2503.10-noble

---
 pkgs/by-name/in/intune-portal/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix
index 139593535c3e..c3bce48295b4 100644
--- a/pkgs/by-name/in/intune-portal/package.nix
+++ b/pkgs/by-name/in/intune-portal/package.nix
@@ -8,8 +8,8 @@
   curlMinimal,
   openssl_3,
   libsecret,
-  webkitgtk_4_0,
-  libsoup_2_4,
+  webkitgtk_4_1,
+  libsoup_3,
   gtk3,
   atk,
   pango,
@@ -19,6 +19,7 @@
   systemd,
   msalsdk-dbusclient,
   pam,
+  p11-kit,
   dbus,
   nixosTests,
 }:
@@ -29,11 +30,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "intune-portal";
-  version = "1.2405.17-jammy";
+  version = "1.2503.10-noble";
 
   src = fetchurl {
-    url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
-    hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk=";
+    url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
+    hash = "sha256-NlJ8m7V1yLErOntprHs3EagPtwSzYWd7NBH0jc72+i4=";
   };
 
   nativeBuildInputs = [ dpkg ];
@@ -48,12 +49,13 @@ stdenv.mkDerivation rec {
           curlMinimal_openssl_3
           openssl_3
           libsecret
-          webkitgtk_4_0
-          libsoup_2_4
+          webkitgtk_4_1
+          libsoup_3
           gtk3
           atk
           glib
           pango
+          p11-kit
           sqlite
           zlib
           systemd

From be43dfa9dc531bcec480892eff9441d8c03fd878 Mon Sep 17 00:00:00 2001
From: Callan Bryant <callan.bryant@gmail.com>
Date: Sun, 1 Jun 2025 22:30:24 +0100
Subject: [PATCH 0393/1497] maintainers: add naggie

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 52c741b7c370..bb2563c7d9ac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16928,6 +16928,12 @@
     githubId = 1131571;
     name = "naelstrof";
   };
+  naggie = {
+    name = "Cal Bryant";
+    email = "callan.bryant@gmail.com";
+    github = "naggie";
+    githubId = 208440;
+  };
   nagisa = {
     name = "Simonas Kazlauskas";
     email = "nixpkgs@kazlauskas.me";

From edbaf6d08076c9abf36419ae4d2f95bcb8c45b97 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 1 Jun 2025 23:37:27 +0200
Subject: [PATCH 0394/1497] ollama: 0.7.1 -> 0.9.0

---
 pkgs/by-name/ol/ollama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index f972d5af23e3..0a5c925c77bd 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -117,13 +117,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.7.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ee2MkvdVDQaSFJDDuXEwedqOB2DUl3MIfp5tRxqbL8A=";
+    hash = "sha256-+8UHE9M2JWUARuuIRdKwNkn1hoxtuitVH7do5V5uEg0=";
     fetchSubmodules = true;
   };
 

From fa15f5c9a586fcd70f0d573d0a755cb077c78c2f Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:37:57 +0200
Subject: [PATCH 0395/1497] swayimg: 4.0 -> 4.1

---
 pkgs/by-name/sw/swayimg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix
index 0290529a4ead..a0ccdea5021a 100644
--- a/pkgs/by-name/sw/swayimg/package.nix
+++ b/pkgs/by-name/sw/swayimg/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swayimg";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "artemsen";
     repo = "swayimg";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2UmaU60+5NNj2CVJt4oJXyBPjVeA0zBfEqZOOSI2vvk=";
+    hash = "sha256-xwhEt+FhHPgfXJL1zTPsMD8ia5s+rr/eIJLlAlG8QzY=";
   };
 
   strictDeps = true;

From ca5c28577c3afc08e676370c66273b1f93648da7 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 1 Jun 2025 23:38:09 +0200
Subject: [PATCH 0396/1497] zizmor: 1.8.0 -> 1.9.0

https://github.com/zizmorcore/zizmor/releases/tag/v1.9.0
---
 pkgs/by-name/zi/zizmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 4a41f7e0b07c..8ea79dc39004 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-llxIuWgaRNJsl/piQ1BMqvE2MKnSnR5qxjLFqZ5z13I=";
+    hash = "sha256-nBeoPbabqE5aCccvioZJo0IosdMN+iKqgaFu0krzRA8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OVGaHLA/VzF8wGrWrHaKpYDcp4ZeR9mf2s5I+u5ddcs=";
+  cargoHash = "sha256-PQ3ij90raSV6o1EEvf2sw3lmMfX3t/ni8RmUAwo8epk=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

From 4126720e3873a60b4684b617dddda5b79a400ce6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 21:45:17 +0000
Subject: [PATCH 0397/1497] timoni: 0.24.0 -> 0.25.0

---
 pkgs/applications/networking/cluster/timoni/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix
index 75977b38cdaa..a9c2f1dd153b 100644
--- a/pkgs/applications/networking/cluster/timoni/default.nix
+++ b/pkgs/applications/networking/cluster/timoni/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "timoni";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "stefanprodan";
     repo = "timoni";
     rev = "v${version}";
-    hash = "sha256-nI0yy/zhsJUvisHo+C+/uNRF96ZQ1Ve8VWpE8ZvUeJc=";
+    hash = "sha256-Obx8I8n2UY6sTHKQ0qFNQ50XI+ajrbQtjQ7PCVwrSTI=";
   };
 
-  vendorHash = "sha256-YpwESaR+X2eOyaPdR+I3mURD7yvwzmpPmgPoSPrXjH8=";
+  vendorHash = "sha256-hCvFe27DdX/pAeyfSEDx5oiLEZjhldOVDz6ElsUPjJs=";
 
   subPackages = [ "cmd/timoni" ];
   nativeBuildInputs = [ installShellFiles ];

From 6d7e0c086f4634900e9b9d49fcef421c54f8b220 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Sun, 1 Jun 2025 14:47:20 -0700
Subject: [PATCH 0398/1497] Fix build error with current Qt6

---
 pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch | 11 +++++++++++
 pkgs/by-name/im/imgbrd-grabber/package.nix       |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch

diff --git a/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch b/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch
new file mode 100644
index 000000000000..b2a9e3542e4d
--- /dev/null
+++ b/pkgs/by-name/im/imgbrd-grabber/fix-for-qt6.patch
@@ -0,0 +1,11 @@
+diffsrc/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp b/src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp
+index 0742cac1..da820e94 100644
+--- src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp
++++ src/cli/vendor/qcommandlinecommandparser/qcommandlinecommandparser.cpp
+@@ -1,5 +1,6 @@
+ #include "qcommandlinecommandparser.h"
+ #include <QString>
++#include <QDebug>
+ #include "vendor.h"
+
+ Q_CORE_EXPORT void qt_call_post_routines();
diff --git a/pkgs/by-name/im/imgbrd-grabber/package.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix
index 6e4646c1afc7..4848228f2c95 100644
--- a/pkgs/by-name/im/imgbrd-grabber/package.nix
+++ b/pkgs/by-name/im/imgbrd-grabber/package.nix
@@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs ../scripts/package.sh
   '';
 
+  patches = [
+    ./fix-for-qt6.patch
+  ];
+
   postPatch = ''
 
     # ensure the script uses the rsync package from nixpkgs

From d262e402bb510fdbf94f6824f06baf230e9bbd34 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 1 Jun 2025 17:55:09 -0400
Subject: [PATCH 0399/1497] windowmaker: enable for darwin

It builds fine and I am able to run it through XQuartz server.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/by-name/wi/windowmaker/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/windowmaker/package.nix b/pkgs/by-name/wi/windowmaker/package.nix
index 3d65bf94c43c..f5eef14cdf0e 100644
--- a/pkgs/by-name/wi/windowmaker/package.nix
+++ b/pkgs/by-name/wi/windowmaker/package.nix
@@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "wmaker";
     maintainers = [ ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 })

From f7d27be69bd3341888ad383804744c3f92edd56d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 21:57:48 +0000
Subject: [PATCH 0400/1497] terraform-providers.buildkite: 1.18.0 -> 1.19.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..445bb504b8c8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -216,11 +216,11 @@
     "vendorHash": "sha256-arLGaa/o9X0MYg/qIl6qhpBqcduu5Bu06FteR5KGSPw="
   },
   "buildkite": {
-    "hash": "sha256-+9gxJjLVExnpWtcF1NRQoKPg0jn1zGNSkmim5YFgs4w=",
+    "hash": "sha256-u2BkD6h12drlz6MQIjoi/EFSj7l1dBWBjHVSmL+hB4g=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
     "owner": "buildkite",
     "repo": "terraform-provider-buildkite",
-    "rev": "v1.18.0",
+    "rev": "v1.19.0",
     "spdx": "MIT",
     "vendorHash": "sha256-bhPpFPn1hdpSJYTvO1HWTrFRBvcm8gIDmMEGOaFjM6c="
   },

From 7f6f0decc06093d403e935a0b7ffc4a6635178c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 1 Jun 2025 15:06:10 -0700
Subject: [PATCH 0401/1497] python3Packages.ical: 9.2.5 -> 10.0.0

Diff: https://github.com/allenporter/ical/compare/refs/tags/9.2.5...refs/tags/10.0.0

Changelog: https://github.com/allenporter/ical/releases/tag/10.0.0
---
 pkgs/development/python-modules/ical/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 9eabfdd0a426..4ae8f0d97060 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "ical";
-  version = "9.2.5";
+  version = "10.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "ical";
     tag = version;
-    hash = "sha256-db7xwNN7xAoeqPngZNJxQNM2wLVcr7VpuG2IWswLCEE=";
+    hash = "sha256-vEVhZ7UBftXsB5xq1LhwitV2Gl6kcR5P0ReJ+71SQFY=";
   };
 
   build-system = [ setuptools ];

From b166fb2c12a4adfea358899a2bf74905192447e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 1 Jun 2025 15:14:07 -0700
Subject: [PATCH 0402/1497] python3Packages.caldav: 1.5.0 -> 1.6.0

Diff: https://github.com/python-caldav/caldav/compare/refs/tags/v1.5.0...refs/tags/v1.6.0

Changelog: https://github.com/python-caldav/caldav/blob/v1.6.0/CHANGELOG.md
---
 pkgs/development/python-modules/caldav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 1343bae47695..99a18e14a498 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "caldav";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-caldav";
     repo = "caldav";
     tag = "v${version}";
-    hash = "sha256-SYjfQG4muuBcnVeu9cl00Zb2fGUhw157LLxA5/N5EJ0=";
+    hash = "sha256-SWecaXiXp8DSOLVWzgPsbL7UGCtTBfNXYmuDQGdyqbQ=";
   };
 
   build-system = [

From 78415f13c1e0084cc9c3626f5e5d64da261a41c0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 00:16:46 +0200
Subject: [PATCH 0403/1497] manifold: 3.1.0 -> 3.1.1

Diff: https://github.com/elalish/manifold/compare/v3.1.0...v3.1.1
---
 pkgs/by-name/ma/manifold/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 4a0edc05a35e..296953af1209 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "manifold";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
+    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
   };
 
   nativeBuildInputs = [ cmake ];

From c9dc80f3c97bd860885268a414ae2be2e7c8ff19 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 00:16:58 +0200
Subject: [PATCH 0404/1497] python313Packages.manifold3d: 3.1.0 -> 3.1.1

Changelog: https://github.com/elalish/manifold/releases/tag/v3.1.1
---
 pkgs/development/python-modules/manifold3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix
index 6b089117fcdb..805d35f1d78e 100644
--- a/pkgs/development/python-modules/manifold3d/default.nix
+++ b/pkgs/development/python-modules/manifold3d/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "manifold3d";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elalish";
     repo = "manifold";
     tag = "v${version}";
-    hash = "sha256-GymlaLs6LIG/252suYnFrgeT1jwrYeIXMo++LCjFHD4=";
+    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";
   };
 
   dontUseCmakeConfigure = true;

From fe501c44ad6daa2276ca8fa454ef597d927adc9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 22:22:27 +0000
Subject: [PATCH 0405/1497] 
 vscode-extensions.illixion.vscode-vibrancy-continued: 1.1.52 -> 1.1.53

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b7fb23904f74..06251d23154c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2449,8 +2449,8 @@ let
         mktplcRef = {
           name = "vscode-vibrancy-continued";
           publisher = "illixion";
-          version = "1.1.52";
-          hash = "sha256-biSWnICmVPTf/zounQd6IfIPBMVDQzXjcCTgp5J00nA=";
+          version = "1.1.53";
+          hash = "sha256-6yhyGMX1U9clMNkcQRjNfa+HpLvWVI1WvhTUyn4g3ZY=";
         };
         meta = {
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";

From d2cb4c3126c0df92a618b6d3083f10a47dee5050 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 22:42:48 +0000
Subject: [PATCH 0406/1497] clouddrive2: 0.8.19 -> 0.8.20

---
 pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 8c94416ecd4b..e3b8f72ee830 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.8.19";
+  version = "0.8.20";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-pLimn6OfqByOyFIDYq0VD4yQ0BpL+st5VwYBKP5zSug=";
-        aarch64-linux = "sha256-Xr3locwzuCg0LRPvNBphhleHFZOnXLi9Md8R17k4vWU=";
-        x86_64-darwin = "sha256-klwicOa/jbjsGL09HR6v2CTA+vhHd1EjCbblAmEPqWQ=";
-        aarch64-darwin = "sha256-47AbC8SHDb1hRlePF6CszHqf2gpwIxsOhJK4+PMCHbQ=";
+        x86_64-linux = "sha256-pDZmrPLIppMMj8KqNGQLUM4ue43vSwVyEKCYrN0G2LM=";
+        aarch64-linux = "sha256-GraqtexpHN+bpArA1HQDYC7DG2QHK1P7o9QDXyFEir4=";
+        x86_64-darwin = "sha256-X/Gf4OipbUM8FwAYfA1+yMBVbsZK5UYz4HFiOYYaTdA=";
+        aarch64-darwin = "sha256-jmsj1VPpxTgly0xIB5pxl79NBZe1zp9rqAYePScMe80=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From 55859b9a21deff22bdfa7105a947de8e83685dd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 22:49:06 +0000
Subject: [PATCH 0407/1497] python3Packages.langfuse: 2.60.5 -> 2.60.7

---
 pkgs/development/python-modules/langfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index c5783e92994c..11447656a919 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "2.60.5";
+  version = "2.60.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     tag = "v${version}";
-    hash = "sha256-DpfbebbONJ8+7mVouvULRbGs9t1cGjOZHhk3KvaY+gM=";
+    hash = "sha256-8IlqHO46Kzz+ifmIu2y5SxshNv/lpZO74b1KTE2Opk4=";
   };
 
   build-system = [ poetry-core ];

From 78a0e4dfadce7a5687f33d7d9ec930ca19856ca4 Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Mon, 26 May 2025 13:15:19 +0300
Subject: [PATCH 0408/1497] pencil2d: added ffmpeg dependency; fixed build

Patched qmake files and source repository to correctly acquire Git information
Added ffmpeg dependency
---
 pkgs/by-name/pe/pencil2d/git-inherit.patch | 13 +++++++++
 pkgs/by-name/pe/pencil2d/package.nix       | 32 ++++++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/pe/pencil2d/git-inherit.patch

diff --git a/pkgs/by-name/pe/pencil2d/git-inherit.patch b/pkgs/by-name/pe/pencil2d/git-inherit.patch
new file mode 100644
index 000000000000..fae2a4a8376b
--- /dev/null
+++ b/pkgs/by-name/pe/pencil2d/git-inherit.patch
@@ -0,0 +1,13 @@
+--- a/app/app.pro    
++++ b/app/app.pro
+@@ -208,8 +208,8 @@
+
+ GIT {
+     DEFINES += GIT_EXISTS \
+-    "GIT_CURRENT_SHA1=$$system(git --git-dir=.git --work-tree=. -C $$_PRO_FILE_PWD_/../ rev-parse HEAD)" \
+-    "GIT_TIMESTAMP=$$system(git --git-dir=.git --work-tree=. -C $$_PRO_FILE_PWD_/../ log -n 1 --pretty=format:"%cd" --date=format:"%Y-%m-%d_%H:%M:%S")"
++    "GIT_CURRENT_SHA1=$$cat($$_PRO_FILE_PWD_/../COMMIT)" \
++    "GIT_TIMESTAMP=$$cat($$_PRO_FILE_PWD_/../SOURCE_TIMESTAMP_EPOCH)"
+ }
+
+ macx {
diff --git a/pkgs/by-name/pe/pencil2d/package.nix b/pkgs/by-name/pe/pencil2d/package.nix
index 0cb6cbd4a433..653f2e21ca47 100644
--- a/pkgs/by-name/pe/pencil2d/package.nix
+++ b/pkgs/by-name/pe/pencil2d/package.nix
@@ -3,30 +3,56 @@
   stdenv,
   fetchFromGitHub,
   qt5,
+  git,
+  ffmpeg_6,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation (FinalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pencil2d";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "pencil2d";
     repo = "pencil";
-    tag = "v${FinalAttrs.version}";
-    hash = "sha256-OuZpKgX2BgfuQdnjk/RTBww/blO1CIrYWr7KytqcIbQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l+iW0k3WdNXDwXtt958JJWSe3zNhQVul4FUcPPMrVxE=";
+    leaveDotGit = true;
+    postFetch = ''
+      # Obtain the last commit ID and its timestamp, then zap .git for reproducibility
+      cd $out
+      git rev-parse HEAD > $out/COMMIT
+      # 0000-00-00T00:00:00Z
+      date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%d_%H:%M:%S" > $out/SOURCE_TIMESTAMP_EPOCH
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
   };
 
+  patches = [ ./git-inherit.patch ];
+
   nativeBuildInputs = with qt5; [
     qmake
     wrapQtAppsHook
     qttools
+    git
   ];
 
+  qmakeFlags = [
+    "pencil2d.pro"
+    "CONFIG+=release"
+    "CONFIG+=PENCIL2D_RELEASE"
+    "CONFIG+=GIT"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
   buildInputs = with qt5; [
     qtbase
     qtmultimedia
     qtsvg
     qtwayland
+    ffmpeg_6
   ];
 
   meta = {

From 589ca366c7c901ffd7c9ec8b690f9bd81b979b26 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 07:19:46 +0800
Subject: [PATCH 0409/1497] protoc-gen-dart: 21.1.2 -> 22.1.0

---
 pkgs/by-name/mu/multipass/pubspec.lock.json   |   2 +-
 pkgs/by-name/pr/protoc-gen-dart/package.nix   |   6 +-
 .../pr/protoc-gen-dart/pubspec.lock.json      | 145 ++++++++++--------
 pkgs/by-name/pr/protoc-gen-dart/update.sh     |   1 +
 4 files changed, 89 insertions(+), 65 deletions(-)

diff --git a/pkgs/by-name/mu/multipass/pubspec.lock.json b/pkgs/by-name/mu/multipass/pubspec.lock.json
index a6afc3de0299..fe53a9242864 100644
--- a/pkgs/by-name/mu/multipass/pubspec.lock.json
+++ b/pkgs/by-name/mu/multipass/pubspec.lock.json
@@ -1 +1 @@
-{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d","url":"https://pub.dev"},"source":"hosted","version":"3.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}}
+{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6","url":"https://pub.dev"},"source":"hosted","version":"4.0.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}}
diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix
index 4eb95f412bbb..b0bc5075a723 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix
@@ -1,18 +1,18 @@
 {
   lib,
-  fetchFromGitHub,
   buildDartApplication,
+  fetchFromGitHub,
 }:
 
 buildDartApplication rec {
   pname = "protoc-gen-dart";
-  version = "21.1.2";
+  version = "22.1.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf.dart";
     tag = "protoc_plugin-v${version}";
-    hash = "sha256-luptbRgOtOBapWmyIJ35GqOClpcmDuKSPu3QoDfp2FU=";
+    hash = "sha256-GQw40xyZ5a42Vq9g4u+6pUEmkB6zPGpBVofyo5Qgdc0=";
   };
 
   sourceRoot = "${src.name}/protoc_plugin";
diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
index 05723b64b240..edc868fb233e 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
+++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
@@ -4,47 +4,41 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "73.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.2"
+      "version": "82.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a",
+        "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.8.0"
+      "version": "7.4.5"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -56,8 +50,28 @@
       "source": "hosted",
       "version": "2.1.2"
     },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "collection": {
-      "dependency": "direct dev",
+      "dependency": "direct main",
       "description": {
         "name": "collection",
         "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
@@ -80,11 +94,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
+        "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.14.0"
     },
     "crypto": {
       "dependency": "transitive",
@@ -140,11 +154,11 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -180,11 +194,21 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.1"
+      "version": "0.7.2"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.9.0"
     },
     "lints": {
       "dependency": "transitive",
@@ -206,16 +230,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2-main.4"
-    },
     "matcher": {
       "dependency": "direct dev",
       "description": {
@@ -230,11 +244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -260,11 +274,11 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "direct main",
@@ -289,22 +303,31 @@
     "protobuf": {
       "dependency": "direct main",
       "description": {
-        "name": "protobuf",
-        "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
-        "url": "https://pub.dev"
+        "path": "../protobuf",
+        "relative": true
       },
-      "source": "hosted",
-      "version": "3.1.0"
+      "source": "path",
+      "version": "4.0.1-wip"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
+    },
+    "pubspec_parse": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
     },
     "shelf": {
       "dependency": "transitive",
@@ -340,11 +363,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
     },
     "source_map_stack_trace": {
       "dependency": "transitive",
@@ -390,11 +413,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "string_scanner": {
       "dependency": "transitive",
@@ -420,31 +443,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.25.14"
+      "version": "1.26.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.8"
+      "version": "0.6.11"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -460,11 +483,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.1"
     },
     "watcher": {
       "dependency": "transitive",
@@ -480,31 +503,31 @@
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "webkit_inspection_protocol": {
       "dependency": "transitive",
@@ -528,6 +551,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0"
+    "dart": ">=3.7.0-0 <4.0.0"
   }
 }
diff --git a/pkgs/by-name/pr/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh
index 888315460c49..81ca066de57c 100755
--- a/pkgs/by-name/pr/protoc-gen-dart/update.sh
+++ b/pkgs/by-name/pr/protoc-gen-dart/update.sh
@@ -25,6 +25,7 @@ src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin"
 cp $src/pubspec.* .
 
 if ! test -f pubspec.lock; then
+  sed -i '/resolution: workspace/d' pubspec.yaml
   dart pub update
 fi
 

From c71e84ac6d7783393fa488a4e9b3d1ed1c59882e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 23:21:47 +0000
Subject: [PATCH 0410/1497] python3Packages.redshift-connector: 2.1.6 -> 2.1.7

---
 .../development/python-modules/redshift-connector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix
index 59b509aa942d..dda175d64495 100644
--- a/pkgs/development/python-modules/redshift-connector/default.nix
+++ b/pkgs/development/python-modules/redshift-connector/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "redshift-connector";
-  version = "2.1.6";
+  version = "2.1.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "amazon-redshift-python-driver";
     tag = "v${version}";
-    hash = "sha256-+tZMg0AmfmAFOqUQhOl+vHQVF1DApZbVNjGV4BkGRTg=";
+    hash = "sha256-OMi8788F2qjMOVDLuJLVReqNv7c/DpXTy1UpqoKRmnQ=";
   };
 
   # remove addops as they add test directory and coverage parameters to pytest

From 8ad45dfec6a77b6124d49fd41f1c47c0d6cb414c Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 1 Jun 2025 23:28:52 +0000
Subject: [PATCH 0411/1497] containerlab: use finalAttrs

---
 pkgs/by-name/co/containerlab/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index 74ac889dda8a..ea89c97789f3 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -6,26 +6,29 @@
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "containerlab";
   version = "0.68.0";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-x6QDwduAMCD+Trj0awQXW0Tdleb2U6YBi/7mdMB6V/8=";
   };
 
   vendorHash = "sha256-XRgKfRw6VGg+lkbtPWUVNfAk5a7ZdFwVmhjtM7uSwHs=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/srl-labs/containerlab/cmd/version.Version=${version}"
-    "-X github.com/srl-labs/containerlab/cmd/version.commit=${src.rev}"
+    "-X github.com/srl-labs/containerlab/cmd/version.Version=${finalAttrs.version}"
+    "-X github.com/srl-labs/containerlab/cmd/version.commit=${finalAttrs.src.rev}"
     "-X github.com/srl-labs/containerlab/cmd/version.date=1970-01-01T00:00:00Z"
   ];
 
@@ -42,19 +45,16 @@ buildGoModule rec {
       --zsh <($out/bin/containerlab completion zsh)
   '';
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
   doInstallCheck = true;
   versionCheckProgramArg = "version";
 
   meta = {
     description = "Container-based networking lab";
     homepage = "https://containerlab.dev/";
-    changelog = "https://github.com/srl-labs/containerlab/releases/tag/${src.rev}";
+    changelog = "https://github.com/srl-labs/containerlab/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "containerlab";
   };
-}
+})

From 99824f302393c0eb3543415c18c3b267c263d0a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 23:35:31 +0000
Subject: [PATCH 0412/1497] tigerbeetle: 0.16.41 -> 0.16.42

---
 pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 17f0d4c970d4..2b8bdffb4de9 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-RSP9nJ2dmLGci4v2iPRzE//QzAY1m7ZdzCkN43k3w8A=";
-    "x86_64-linux" = "sha256-Xy3kGShqaTbuf9BLx4fUahZrrby2r04+nmuHwDxENMo=";
-    "aarch64-linux" = "sha256-98BAH7yb6I1kG7j/zJyoFEwS1jBjF3oEM/YKk32bbZY=";
+    "universal-macos" = "sha256-1U24bdd4tvkzZmsRrrc4AUwxm9IhxHNAcPtxxX5ZO2w=";
+    "x86_64-linux" = "sha256-DCEqAePHkNj0bfgW5l83DyZG5+bre6C6C7AMbhxwytQ=";
+    "aarch64-linux" = "sha256-jKpt7hqCbgcBv9npR7IhryaCgrdOlX40Icq9T10/Af0=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.41";
+  version = "0.16.42";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From 68c76b145720fc6ed7a688c31ee52a1000a1ad46 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 2 Jun 2025 07:39:20 +0800
Subject: [PATCH 0413/1497] pb: use finalAttrs

---
 pkgs/by-name/pb/pb/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pb/pb/package.nix b/pkgs/by-name/pb/pb/package.nix
index d9508ef6cb33..db8e599965c8 100644
--- a/pkgs/by-name/pb/pb/package.nix
+++ b/pkgs/by-name/pb/pb/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "pb";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "parseablehq";
     repo = "pb";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM=";
   };
 
@@ -20,7 +20,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.Version=${version}"
+    "-X main.Version=${finalAttrs.version}"
   ];
 
   tags = [ "kqueue" ];
@@ -29,10 +29,10 @@ buildGoModule rec {
 
   meta = {
     homepage = "https://github.com/parseablehq/pb";
-    changelog = "https://github.com/parseablehq/pb/releases/tag/v${version}";
+    changelog = "https://github.com/parseablehq/pb/releases/tag/v${finalAttrs.version}";
     description = "CLI client for Parseable server";
     license = lib.licenses.agpl3Plus;
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "pb";
   };
-}
+})

From c6fd64bf7375aec046abf3c3949f6d97e193e8e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 23:47:52 +0000
Subject: [PATCH 0414/1497] mmctl: 10.5.6 -> 10.5.7

---
 pkgs/by-name/ma/mattermost/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index a964e3e33573..3610ed26134e 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,8 +19,8 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.6";
-    srcHash = "sha256-etHEJ3EBTolXZr/2Kd39Jdtf1qBMuVO5zRkuM6k4F3w=";
+    version = "10.5.7";
+    srcHash = "sha256-HPQmN6GXDTEmloIcU0k+sYx/Qeh1j6T2yCT/W1/aWz4=";
     vendorHash = "sha256-9Jl+lxvSoxUReziTqkDRyeNrijGWcBDbqoywJRIeD2k=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''

From 564f0a5629223decdfed13b9b1d66ce50b6c9b95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Jun 2025 23:51:33 +0000
Subject: [PATCH 0415/1497] terraform-providers.google: 6.36.1 -> 6.37.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..cb69afb88fee 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -516,13 +516,13 @@
     "vendorHash": "sha256-X0vbtUIKYzCeRD/BbMj3VPVAwx6d7gkbHV8j9JXlaFM="
   },
   "google": {
-    "hash": "sha256-q/BFHpA3ig0QfB0mhJGqr/uQYs/SH5YX8QgWCyjcSio=",
+    "hash": "sha256-TSDkXXYkneTsY10WV5cSFzOX04kFdFVHJPgpKt5hBSE=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v6.36.1",
+    "rev": "v6.37.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rGpnPH8ebHXasvelGoJEUU4YbeGJY4adFBbgAHJ8vSs="
+    "vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM="
   },
   "google-beta": {
     "hash": "sha256-VpfIfzIG1h5qnvEqogCK359LLLSgdgxg0DtRGvdZtLU=",

From bc45e0df13f36e7878164cf19c6de275e91663f6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 02:05:17 +0200
Subject: [PATCH 0416/1497] maintainers: add b-m-f

Became maintainer of nixos/jupyter in https://github.com/NixOS/nixpkgs/pull/367106.
This error was not caught since meta.maintainer in nixos modules are not at the time of writing evaluated
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d2f8aa0900da..66b8a51551ba 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2644,6 +2644,12 @@
     githubId = 9315;
     name = "Zhong Jianxin";
   };
+  b-m-f = {
+    email = "maximilian@sodawa.com";
+    github = "b-m-f";
+    githubId = 2843450;
+    name = "Maximilian Ehlers";
+  };
   b-rodrigues = {
     email = "bruno@brodrigues.co";
     github = "b-rodrigues";

From a340f97e3a1ef2bff9dcf68080b7ce00e0b30860 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:07:52 +0000
Subject: [PATCH 0417/1497] dracula-theme: 4.0.0-unstable-2025-04-27 ->
 4.0.0-unstable-2025-05-24

---
 pkgs/by-name/dr/dracula-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix
index a6daf5216f2e..c07748267027 100644
--- a/pkgs/by-name/dr/dracula-theme/package.nix
+++ b/pkgs/by-name/dr/dracula-theme/package.nix
@@ -8,7 +8,7 @@
 
 let
   themeName = "Dracula";
-  version = "4.0.0-unstable-2025-04-27";
+  version = "4.0.0-unstable-2025-05-24";
 in
 stdenvNoCC.mkDerivation {
   pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "dracula";
     repo = "gtk";
-    rev = "3834a1bac175b226cff6b1c94faac9aba2819bd5";
-    hash = "sha256-T0X0h4Bz3sy5jqtB1PkpjFnB8jO3CehOxgRwPPG54Ds=";
+    rev = "74255b110e7e5f50a07f500f739bc59c2cbee472";
+    hash = "sha256-0NA/MTmcgRlR6JEOFz1+SgyoRwRygygEWAQDrpznA5w=";
   };
 
   propagatedUserEnvPkgs = [

From f233f68df50dea01b86f7f7b101163af375d1751 Mon Sep 17 00:00:00 2001
From: Uriel <imurx@proton.me>
Date: Sun, 1 Jun 2025 20:10:56 -0400
Subject: [PATCH 0418/1497] slimevr: 0.14.1 -> 0.15.0

---
 pkgs/by-name/sl/slimevr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix
index a9e94ebf6d51..21c6ac44c3b7 100644
--- a/pkgs/by-name/sl/slimevr/package.nix
+++ b/pkgs/by-name/sl/slimevr/package.nix
@@ -21,13 +21,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slimevr";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "SlimeVR";
     repo = "SlimeVR-Server";
     rev = "v${version}";
-    hash = "sha256-7b2IlMYpOVvthOUNr63PUsZyr2JH37O2DVWH9N6M8Xg=";
+    hash = "sha256-Sc51fGUXc9FCTO7wVy9hkZiOe0RYefVasp+jCeWl844=";
     # solarxr
     fetchSubmodules = true;
   };
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   pnpmDeps = pnpm_9.fetchDeps {
     pname = "${pname}-pnpm-deps";
     inherit version src;
-    hash = "sha256-IoLY3ByDQGfbkWjxlEHHTiKiE3+tpwCrYLUDE8zPkeQ=";
+    hash = "sha256-xCID9JOFEswsTbE5Dh6ZAkhhyy4eMuqkme54IdWfcks=";
   };
 
   nativeBuildInputs = [

From 299190d5107cd59fc2a4211602bc0b356490d3c0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 30 May 2025 14:52:50 -0700
Subject: [PATCH 0419/1497] python3Packages.spacy: cleanup, add maintainer

---
 pkgs/development/python-modules/spacy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 019b4f4fa41d..3f483ee89e33 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -129,7 +129,7 @@ buildPythonPackage rec {
         ]
       }
 
-      nix-update python3Packages.spacy
+      nix-update python3Packages.spacy --version-regex 'release-v([0-9.]+)'
 
       # update spacy models as well
       echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy-models.en_core_web_sm

From 41239e15c43605d83a5e44739cf6b3ef9cda58ba Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 30 May 2025 15:00:22 -0700
Subject: [PATCH 0420/1497] python3Packages.spacy: 3.8.6 -> 3.8.7

Adds python 3.13 support

changelog: https://github.com/explosion/spaCy/releases/tag/release-v3.8.7

diff: https://github.com/explosion/spaCy/compare/release-v3.8.6...release-v3.8.7
---
 pkgs/development/python-modules/spacy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 3f483ee89e33..47ca112287ca 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -6,7 +6,7 @@
 
   # build-system
   cymem,
-  cython_0,
+  cython,
   murmurhash,
   numpy,
   preshed,
@@ -47,19 +47,19 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.8.6";
+  version = "3.8.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "spaCy";
     tag = "release-v${version}";
-    hash = "sha256-Zy2RLib/B9fLtcqO24ltvn1PUD68l9Rf7nHH4XuT6to=";
+    hash = "sha256-mRra5/4W3DFVI/KbReTg2Ey9mOC6eQQ31/QDt7Pw0fU=";
   };
 
   build-system = [
     cymem
-    cython_0
+    cython
     murmurhash
     numpy
     preshed

From 7b1ab108a81810b5ee14c820aa47d0e35d761014 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:28:02 +0000
Subject: [PATCH 0421/1497] phpExtensions.blackfire: 1.92.36 -> 1.92.37

---
 pkgs/by-name/bl/blackfire/php-probe.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index aa133ac2653f..d319d6574404 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,50 +16,50 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.36";
+  version = "1.92.37";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-Fn+6aZi8UuyF0f94t09SwhUwvHqjvN6m2HBq2mbr/CA=";
-        "8.2" = "sha256-b8YyT9P+KQonwHqXSn17EDRTdTw9CuvIX0PzjvGlmCo=";
-        "8.3" = "sha256-YLQi530JkoQfAx/ZBR9w2dthK6IsDSyqq3U+rGugUPw=";
-        "8.4" = "sha256-zpXYElris1fjMlwpTwuRDkCdO3MNHCLp3D24x5X/S88=";
+        "8.1" = "sha256-NuWxVeVueKz64jDIE1KPzLEco+MoUyuc/9/hsTaRrAI=";
+        "8.2" = "sha256-NJlrEwSY55INO7q5GAvPojnLdkAYJ4eCIjxFH55Pdmg=";
+        "8.3" = "sha256-KGpNPp2bOAmY/GUPnUxTJ4z6X8AdvZAG6YC3pLTjbGI=";
+        "8.4" = "sha256-3HrbezGcdVMtdPrfRpLEhY/1AXlGUIMraeie7LEmiC8=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-3mNgyfrkgiZBkLE8ppans7R72lOeXFup2nwLoP6Gve0=";
-        "8.2" = "sha256-PT7virnfH8Ujkol/fK84TmVTc4jK4xGfaDL1kb9bj/4=";
-        "8.3" = "sha256-h4Gf4YR2I+R9dMDiFpAN1WB2o6BNP3C80fX7vKEN6Gs=";
-        "8.4" = "sha256-lRunm8coAkwiLvPELWquAsoNQEZv0LvL13Hdg+9dOfA=";
+        "8.1" = "sha256-Z9D6yoDSTdvzAQw+LhCk37J+LPMLEthUzbB1YQdr7AY=";
+        "8.2" = "sha256-ES2Y2RewFSP0R5wuYF2sm7NAVlCRvRPSpfPt7X2uYqs=";
+        "8.3" = "sha256-jqcS97JcHU/LzdU08MwNXDepH7OzIa4Fo7s3hg+x6hA=";
+        "8.4" = "sha256-xel7bbb4S16YddLuw0sDINbKQ0zoJeeRSI4g+tpqYz0=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-DDco6F8cD/D4J3KM1B111bjcJkRxd++CLR+x0azcR0g=";
-        "8.2" = "sha256-AQPQQM5Q5wlhvkXOnVNgPLcQpZ5xda/CYFqvm5J7e0c=";
-        "8.3" = "sha256-Yae7UVRrIdShIVZDSza9IrukYHgfX5CrVIpuH4rEAek=";
-        "8.4" = "sha256-l0+DN5zEqGJLg8Ig5U4PvZGms1O0eZ/PqjXgSw4bCA4=";
+        "8.1" = "sha256-l3mz8n1PjBUTcLN4Kyjg573Ip20dFV85yNT2krYq6Z0=";
+        "8.2" = "sha256-EyxrVMitvupQzAwhFDwMO56PUhyLb35aqWgJeH+211E=";
+        "8.3" = "sha256-T6UkTtQl1Ce95tA4/J9mSk/pBWAZJJz0pHb3xMIGYvc=";
+        "8.4" = "sha256-udvqUMbbVcFOocu1F0rSgi0+bg5VPq2Qw2LrRqNRQHw=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-xb28nloEKKfJfddrDShBFuLHPOIyBo74erHWB9H5im4=";
-        "8.2" = "sha256-vmjjmGem7SdEkBWIjDfxgLQhmO9B/x1gIP5GSlAPPDs=";
-        "8.3" = "sha256-l6XrHQIigav6gMpgg7HEwm+2PeuU76AX3je8UVrcPEQ=";
+        "8.1" = "sha256-PoXihk7e+xT6fat48dnD/3lZqQKpgBHs4Eao08J4dMs=";
+        "8.2" = "sha256-lLham3VjXvszjOU8NvxZsjz5vfEK58QG1tE4X06luzQ=";
+        "8.3" = "sha256-rAsJ71P+yM939JqhhwDbxfL0EwB4q7SNqvSdN0n6ES0=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-xY/5UQuLM/UrdDvA1WUF117m+Coj3ElEgV3cbelfKvM=";
-        "8.2" = "sha256-bGpijGg++VJNZFHN9K6Gx1R+jBn3o+Qeh/RpmPC8NPE=";
-        "8.3" = "sha256-3uiTuEmEsp3sKOOR0WxH72pVPCs5ogR1yi3VQ7+/fw8=";
+        "8.1" = "sha256-6RoANqMjuyaLcMzg5R0unhTwOSbsQhEXCkjQ2kjnnCg=";
+        "8.2" = "sha256-PjvLjRsnhHgXOEj7J7ekWM0fFuaOuiYJhXbINClaFtU=";
+        "8.3" = "sha256-NoY788iBgeVMrQp3tm6vbAnwBZB7yMjCVmH7jr32HWU=";
       };
     };
   };

From 1aa9a9b385329ae1d2ccf4a7eaf15a2d73783f67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:28:07 +0000
Subject: [PATCH 0422/1497] xdg-terminal-exec: 0.12.3 -> 0.12.4

---
 pkgs/by-name/xd/xdg-terminal-exec/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix
index 276840d57dbd..d6bdaab1e3b0 100644
--- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix
+++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "xdg-terminal-exec";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "xdg-terminal-exec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mA/azPl4pB7vW1dB+Are5WbIf/eLmU91iwjC/V0+Xh8=";
+    hash = "sha256-PA0ttRtFmNVITBidxZsZFMfMaGi2X6296ve5y6Mqlm0=";
   };
 
   nativeBuildInputs = [ scdoc ];

From 9781093779fea7d33600747de99351bb9ca719ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:36:13 +0000
Subject: [PATCH 0423/1497] changie: 1.21.1 -> 1.22.0

---
 pkgs/by-name/ch/changie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index 7be69fdfbdf4..dee815b93261 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "changie";
-  version = "1.21.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "miniscruff";
     repo = "changie";
     rev = "v${version}";
-    hash = "sha256-zLRMH5TxEz/fspMOPAMTEqO19fj9PZsRh6zddbTqSXM=";
+    hash = "sha256-tq29L9YlzhjbHkUfE0ZZhSrH+rcAwgYjcEAUjP/lHm8=";
   };
 
-  vendorHash = "sha256-LWf10MM9SBU9sHb59c6ILlsHs8E8ETYAR34296aeHlI=";
+  vendorHash = "sha256-nAwBVa+UssbfFbcOWFcsWUllBTeW89xPcgS+ofXDPf0=";
 
   nativeBuildInputs = [
     installShellFiles

From 9d4c03db015dacac22fb4b40c76608aa4e4653f1 Mon Sep 17 00:00:00 2001
From: Hannes <h@nnes.dev>
Date: Wed, 5 Mar 2025 19:09:00 +0800
Subject: [PATCH 0424/1497] =?UTF-8?q?sqruff:=200.20.2=20=E2=86=92=200.25.2?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sq/sqruff/disable-templaters-test.diff    | 15 +++++++++++
 .../sq/sqruff/disable-ui_with_dbt-test.diff   | 15 +++++++++++
 .../sq/sqruff/disable-ui_with_jinja-test.diff | 15 +++++++++++
 .../sqruff/disable-ui_with_python-test.diff   | 15 +++++++++++
 pkgs/by-name/sq/sqruff/package.nix            | 27 +++++++++++++++----
 5 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/sq/sqruff/disable-templaters-test.diff
 create mode 100644 pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff
 create mode 100644 pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff
 create mode 100644 pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff

diff --git a/pkgs/by-name/sq/sqruff/disable-templaters-test.diff b/pkgs/by-name/sq/sqruff/disable-templaters-test.diff
new file mode 100644
index 000000000000..1da2192fedf1
--- /dev/null
+++ b/pkgs/by-name/sq/sqruff/disable-templaters-test.diff
@@ -0,0 +1,15 @@
+diff --git a/crates/lib/tests/templaters.rs b/crates/lib/tests/templaters.rs
+index f92604e1..84885f9f 100644
+--- a/crates/lib/tests/templaters.rs
++++ b/crates/lib/tests/templaters.rs
+@@ -32,6 +32,10 @@ impl Args {
+     }
+ }
+ 
++#[cfg(not(feature = "python"))]
++fn main() {}
++
++#[cfg(feature = "python")]
+ // FIXME: Simplify FluffConfig handling. It's quite chaotic right now.
+ fn main() {
+     let mut args = Args::default();
diff --git a/pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff b/pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff
new file mode 100644
index 000000000000..ee6e3250adb8
--- /dev/null
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_dbt-test.diff
@@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_dbt.rs b/crates/cli/tests/ui_with_dbt.rs
+index d71a26c1..4d4ffe4f 100644
+--- a/crates/cli/tests/ui_with_dbt.rs
++++ b/crates/cli/tests/ui_with_dbt.rs
+@@ -3,6 +3,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
++#[cfg(not(feature = "python"))]
++fn main() {}
++
++#[cfg(feature = "python")]
+ fn main() {
+     let sample_dbt_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+         .parent()
diff --git a/pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff b/pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff
new file mode 100644
index 000000000000..0c202dadc247
--- /dev/null
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_jinja-test.diff
@@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_jinja.rs b/crates/cli/tests/ui_with_jinja.rs
+index 7c39f8a1..e4c96d41 100644
+--- a/crates/cli/tests/ui_with_jinja.rs
++++ b/crates/cli/tests/ui_with_jinja.rs
+@@ -4,6 +4,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
++#[cfg(not(feature = "python"))]
++fn main() {}
++
++#[cfg(feature = "python")]
+ fn main() {
+     let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+     test_dir.push("tests/jinja");
diff --git a/pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff b/pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff
new file mode 100644
index 000000000000..bcf1b957fca5
--- /dev/null
+++ b/pkgs/by-name/sq/sqruff/disable-ui_with_python-test.diff
@@ -0,0 +1,15 @@
+diff --git a/crates/cli/tests/ui_with_python.rs b/crates/cli/tests/ui_with_python.rs
+index 826f399c..0fa5ae33 100644
+--- a/crates/cli/tests/ui_with_python.rs
++++ b/crates/cli/tests/ui_with_python.rs
+@@ -4,6 +4,10 @@ use std::path::PathBuf;
+ use assert_cmd::Command;
+ use expect_test::expect_file;
+ 
++#[cfg(not(feature = "python"))]
++fn main() {}
++
++#[cfg(feature = "python")]
+ fn main() {
+     let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+     test_dir.push("tests/python");
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index f497f538e290..269d76be215c 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -9,25 +9,42 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sqruff";
-  version = "0.20.2";
+  version = "0.25.28";
 
   src = fetchFromGitHub {
     owner = "quarylabs";
     repo = "sqruff";
     tag = "v${version}";
-    hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
+    hash = "sha256-Xea6jXQos5gyF1FeGF7B5YaQszqfsKhGw1k8j0m7J6c=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sFKq7CxQ7yoPqDQOR9Nr111RCiSA6bK50QvhHkaU5Go=";
+  cargoHash = "sha256-agB//UDTsEje9pgig07dUy8/Fr+zx7/MC3AdLjqoKJY=";
 
   buildInputs = [
     rust-jemalloc-sys
   ];
 
-  # Patch the tests to find the binary
+  # Disable the `python` feature which doesn't work on Nix yet
+  buildNoDefaultFeatures = true;
+  # The jinja and dbt template engines require the `python` feature which we disabled, so we disable these tests
+  patches = [
+    ./disable-templaters-test.diff
+    ./disable-ui_with_dbt-test.diff
+    ./disable-ui_with_jinja-test.diff
+    ./disable-ui_with_python-test.diff
+  ];
+
+  # Patch the tests to find the sqruff binary
   postPatch = ''
-    substituteInPlace crates/cli/tests/ui.rs \
+    substituteInPlace \
+      crates/cli/tests/config_not_found.rs \
+      crates/cli/tests/configure_rule.rs \
+      crates/cli/tests/fix_parse_errors.rs \
+      crates/cli/tests/fix_return_code.rs \
+      crates/cli/tests/ui_github.rs \
+      crates/cli/tests/ui_json.rs \
+      crates/cli/tests/ui.rs \
       --replace-fail \
       'sqruff_path.push(format!("../../target/{}/sqruff", profile));' \
       'sqruff_path.push(format!("../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/{}/sqruff", profile));'

From 0fc2ab2e0e15e6f0917363de28579eb2dd959f35 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 02:48:30 +0200
Subject: [PATCH 0425/1497] nixos/vivid: correct meta.maintainer

`lib.maintainers.blackheaven` does not exist, but the github id matches `lib.maintainers.gdifolco` which corresponds with the author of https://github.com/NixOS/nixpkgs/pull/345656
---
 nixos/modules/programs/vivid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/vivid.nix b/nixos/modules/programs/vivid.nix
index 06c618e23fc1..c0fb5945614a 100644
--- a/nixos/modules/programs/vivid.nix
+++ b/nixos/modules/programs/vivid.nix
@@ -59,5 +59,5 @@ in
     ];
   };
 
-  meta.maintainers = with lib.maintainers; [ blackheaven ];
+  meta.maintainers = with lib.maintainers; [ gdifolco ];
 }

From e310c2ceb5d2fde87a38398cc943c0e86dc38688 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 00:54:01 +0000
Subject: [PATCH 0426/1497] python3Packages.gflanguages: 0.7.4 -> 0.7.5

---
 pkgs/development/python-modules/gflanguages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix
index 7f3c3e20d79f..933332684056 100644
--- a/pkgs/development/python-modules/gflanguages/default.nix
+++ b/pkgs/development/python-modules/gflanguages/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "gflanguages";
-  version = "0.7.4";
+  version = "0.7.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-d/Q5Kh/ApXP0AcNOuATy8GyssLcNUjboQPEj1Q48tuA=";
+    hash = "sha256-jc48DKUp3ai6AxcveyvR7TF80wmVLWfG58W2xR/HIsE=";
   };
 
   # Relax the dependency on protobuf 3. Other packages in the Google Fonts

From 5e0d8687e1237b13268c0a017e4a13d298330bcb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:56:51 +0800
Subject: [PATCH 0427/1497] protoc-gen-dart: 22.1.0 -> 22.3.0

---
 pkgs/by-name/pr/protoc-gen-dart/package.nix       | 4 ++--
 pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix
index b0bc5075a723..6b2610cd709e 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix
@@ -6,13 +6,13 @@
 
 buildDartApplication rec {
   pname = "protoc-gen-dart";
-  version = "22.1.0";
+  version = "22.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf.dart";
     tag = "protoc_plugin-v${version}";
-    hash = "sha256-GQw40xyZ5a42Vq9g4u+6pUEmkB6zPGpBVofyo5Qgdc0=";
+    hash = "sha256-P2h1M7Wga0qOrI/sTUrQ6k/a5gqKVqAfs/J1eGFHHwg=";
   };
 
   sourceRoot = "${src.name}/protoc_plugin";
diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
index edc868fb233e..13b7eb5483a6 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
+++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
@@ -303,11 +303,12 @@
     "protobuf": {
       "dependency": "direct main",
       "description": {
-        "path": "../protobuf",
-        "relative": true
+        "name": "protobuf",
+        "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731",
+        "url": "https://pub.dev"
       },
-      "source": "path",
-      "version": "4.0.1-wip"
+      "source": "hosted",
+      "version": "4.1.0"
     },
     "pub_semver": {
       "dependency": "transitive",

From 1859534d39fe28f23aff39ccccaca050b96af59c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:57:20 +0800
Subject: [PATCH 0428/1497] dart-sass: 1.89.0 -> 1.89.1

---
 pkgs/by-name/da/dart-sass/package.nix       | 12 ++++----
 pkgs/by-name/da/dart-sass/pubspec.lock.json | 32 ++++++++++-----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index b8945655f42a..d8862fd64f5f 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -4,6 +4,7 @@
   buildDartApplication,
   buf,
   protoc-gen-dart,
+  writableTmpDirAsHomeHook,
   testers,
   dart-sass,
   runCommand,
@@ -16,19 +17,19 @@ let
   embedded-protocol = fetchFromGitHub {
     owner = "sass";
     repo = "sass";
-    rev = "refs/tags/embedded-protocol-${embedded-protocol-version}";
+    tag = "embedded-protocol-${embedded-protocol-version}";
     hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro=";
   };
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.89.0";
+  version = "1.89.1";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
-    rev = version;
-    hash = "sha256-ydKkZlpjshIf8/Q1ufUFHWmJGonYPtzMiXn4VxDgHDo=";
+    tag = version;
+    hash = "sha256-G9uiG7fTDTx9wVH0bV7BeY2TpTEtTHDd0+z/+kLZiwU=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -36,12 +37,13 @@ buildDartApplication rec {
   nativeBuildInputs = [
     buf
     protoc-gen-dart
+    writableTmpDirAsHomeHook
   ];
 
   preConfigure = ''
     mkdir -p build
     ln -s ${embedded-protocol} build/language
-    HOME="$TMPDIR" buf generate
+    buf generate
   '';
 
   dartCompileFlags = [ "--define=version=${version}" ];
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index bbe061c58e4d..f2093583f6d9 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -144,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
+        "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.13.1"
+      "version": "1.14.0"
     },
     "crypto": {
       "dependency": "direct dev",
@@ -184,11 +184,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "dartdoc",
-        "sha256": "eb152ab07c585adb11cc24b7b93280a02f6ac5ff724cca4e6cabb24e8be88c82",
+        "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.3"
+      "version": "8.3.4"
     },
     "ffi": {
       "dependency": "transitive",
@@ -474,21 +474,21 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6",
+        "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
     },
     "protoc_plugin": {
       "dependency": "direct dev",
       "description": {
         "name": "protoc_plugin",
-        "sha256": "cb2c7ec4ca331a8b1b3042200d1fe329f989450c8d380b45565b21ae3f7f5ce9",
+        "sha256": "32fbf4ac1b1a7263440898c9011209c3a13c9063f326ef78da83734e6f992ff3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "22.1.0"
+      "version": "22.3.0"
     },
     "pub_api_client": {
       "dependency": "direct dev",
@@ -654,31 +654,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "f1665eeffe3b6b193548b5f515e8d1b54ccd9a6e0e7721a417e134e7ed7f06a1",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.26.0"
+      "version": "1.26.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "6c7653816b1c938e121b69ff63a33c9dc68102b65a5fb0a5c0f9786256ed33e6",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.5"
+      "version": "0.7.6"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "3caa7c3956b366643b2dedecff764cc32030317b2a15252aed845570df6bcc0f",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.9"
+      "version": "0.6.11"
     },
     "test_descriptor": {
       "dependency": "direct dev",
@@ -724,11 +724,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.1"
     },
     "watcher": {
       "dependency": "direct main",

From 081bb902cf597fa259e2458a55cebb80d0d87653 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:57:53 +0800
Subject: [PATCH 0429/1497] multipass: update protobuf

---
 pkgs/by-name/mu/multipass/pubspec.lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mu/multipass/pubspec.lock.json b/pkgs/by-name/mu/multipass/pubspec.lock.json
index fe53a9242864..a96a27a386ef 100644
--- a/pkgs/by-name/mu/multipass/pubspec.lock.json
+++ b/pkgs/by-name/mu/multipass/pubspec.lock.json
@@ -1 +1 @@
-{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6","url":"https://pub.dev"},"source":"hosted","version":"4.0.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}}
+{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a","url":"https://pub.dev"},"source":"hosted","version":"2.5.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70","url":"https://pub.dev"},"source":"hosted","version":"1.5.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a","url":"https://pub.dev"},"source":"hosted","version":"1.18.0"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27","url":"https://pub.dev"},"source":"hosted","version":"3.0.5"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.10.0+mp","resolved-ref":"e7c66932cf7ca8eba083268fa3230222c8cd0722","url":"https://github.com/andrei-toterman/dartssh2.git"},"source":"git","version":"2.10.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81","url":"https://pub.dev"},"source":"hosted","version":"14.1.0"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829","url":"https://pub.dev"},"source":"hosted","version":"12.0.0"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"8bcc3af859e9d47fab9c7dc315537406511a894ab578e198bd8f9ed745ea5a01","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+2"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb","url":"https://pub.dev"},"source":"hosted","version":"0.5.3"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492","url":"https://pub.dev"},"source":"hosted","version":"0.9.2+1"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385","url":"https://pub.dev"},"source":"hosted","version":"0.9.4"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef","url":"https://pub.dev"},"source":"hosted","version":"0.69.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2","url":"https://pub.dev"},"source":"hosted","version":"2.0.10+1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6","url":"https://pub.dev"},"source":"hosted","version":"0.3.1+4"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813","url":"https://pub.dev"},"source":"hosted","version":"4.0.1"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/andrei-toterman/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b","url":"https://pub.dev"},"source":"hosted","version":"4.0.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf","url":"https://pub.dev"},"source":"hosted","version":"0.7.1"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af","url":"https://pub.dev"},"source":"hosted","version":"1.9.0"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7","url":"https://pub.dev"},"source":"hosted","version":"2.2.10"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27","url":"https://pub.dev"},"source":"hosted","version":"6.0.2"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65","url":"https://pub.dev"},"source":"hosted","version":"3.1.5"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d","url":"https://pub.dev"},"source":"hosted","version":"2.5.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90","url":"https://pub.dev"},"source":"hosted","version":"0.1.9"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f","url":"https://pub.dev"},"source":"hosted","version":"2.5.2"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.99"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"7c1394c","resolved-ref":"7c1394c46aac4598ebdd3fa6670e4ea2904a4d31","url":"https://github.com/andrei-toterman/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"74ce1f35a8c74370b322049c9d00bf098938661e9f67054eae0f618e6dc0cb62","url":"https://pub.dev"},"source":"hosted","version":"0.3.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c","url":"https://pub.dev"},"source":"hosted","version":"1.3.2"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab","url":"https://pub.dev"},"source":"hosted","version":"6.3.10"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af","url":"https://pub.dev"},"source":"hosted","version":"3.2.0"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e","url":"https://pub.dev"},"source":"hosted","version":"2.3.3"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81","url":"https://pub.dev"},"source":"hosted","version":"1.1.11+1"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec","url":"https://pub.dev"},"source":"hosted","version":"5.5.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.5.0 <4.0.0","flutter":">=3.24.0"}}

From 8b3517b8f4a45c11efbab756800875e8e0d0c15e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 01:40:05 +0000
Subject: [PATCH 0430/1497] unstructured-api: 0.0.82 -> 0.0.85

---
 pkgs/by-name/un/unstructured-api/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index ba94ad44bed4..4cd47d26c13b 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -144,7 +144,7 @@ let
     ++ google-api-core.optional-dependencies.grpc
     ++ unstructured.optional-dependencies.all-docs
   );
-  version = "0.0.82";
+  version = "0.0.85";
   unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [
     d.punkt
     d.averaged-perceptron-tagger
@@ -158,7 +158,7 @@ stdenvNoCC.mkDerivation {
     owner = "Unstructured-IO";
     repo = "unstructured-api";
     rev = version;
-    hash = "sha256-mvcARpewqC25x3ZdpM8QB7SjbqGoBL/rtxi90KdKdO8=";
+    hash = "sha256-FNcm/7JxQE6ZksFtEgInnUhbKArZoyo9rlxhyHgRG3E=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fc7dcbfe5b6be4abace94daac204b9da56d27909 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 26 May 2025 16:36:32 +0000
Subject: [PATCH 0431/1497] itamae: update all gems to latest versions

---
 pkgs/by-name/it/itamae/Gemfile.lock | 6 +++---
 pkgs/by-name/it/itamae/gemset.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/it/itamae/Gemfile.lock b/pkgs/by-name/it/itamae/Gemfile.lock
index 0dad58c0fb5a..78e05c9d9c38 100644
--- a/pkgs/by-name/it/itamae/Gemfile.lock
+++ b/pkgs/by-name/it/itamae/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
     docker-api (2.4.0)
       excon (>= 0.64.0)
       multi_json
-    ed25519 (1.3.0)
+    ed25519 (1.4.0)
     excon (1.2.5)
       logger
     hashie (5.0.0)
@@ -25,7 +25,7 @@ GEM
     net-telnet (0.2.0)
     schash (0.1.2)
     sfl (2.3)
-    specinfra (2.92.0)
+    specinfra (2.94.0)
       base64
       net-scp
       net-ssh (>= 2.7)
@@ -43,4 +43,4 @@ DEPENDENCIES
   itamae
 
 BUNDLED WITH
-   2.6.2
+   2.6.6
diff --git a/pkgs/by-name/it/itamae/gemset.nix b/pkgs/by-name/it/itamae/gemset.nix
index a9abf91ee919..64125ddd770e 100644
--- a/pkgs/by-name/it/itamae/gemset.nix
+++ b/pkgs/by-name/it/itamae/gemset.nix
@@ -48,10 +48,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   excon = {
     dependencies = [ "logger" ];
@@ -174,10 +174,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0aswlmhh152c974i8bn8d90kjbwadp0bjgs9kgpxxb3vffsfxc1w";
+      sha256 = "1m7vplx6w0w0mmij6n7zgc68kd1xbkhyb4qg25vmk8p21nbjbw6j";
       type = "gem";
     };
-    version = "2.92.0";
+    version = "2.94.0";
   };
   thor = {
     groups = [ "default" ];

From 54d01b597bebf56af49cb93fde18bf650804f19a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:04:17 +0000
Subject: [PATCH 0432/1497] terraform-providers.rootly: 2.27.1 -> 2.27.2

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..30068bed7912 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1111,11 +1111,11 @@
     "vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg="
   },
   "rootly": {
-    "hash": "sha256-SwZm4XCQUf3TQ6m77fAnhHMoW6ckpO5XSnjpEYuNyec=",
+    "hash": "sha256-2TVqXQYiCMsMQJtZMWtYiPbeOOsPck5Hpu6cmo9ZaIM=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v2.27.1",
+    "rev": "v2.27.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw="
   },

From aa9c727515656a927b7937621972252172c608dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:05:37 +0000
Subject: [PATCH 0433/1497] python3Packages.pysmlight: 0.2.4 -> 0.2.5

---
 pkgs/development/python-modules/pysmlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index b5764abafbba..64a6ed10946c 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-ZNqNRz7d3HZybQG778+ubxuc7Eakf/kWpd3I3cosSIU=";
+    hash = "sha256-ylfOro/GqgXDAPdtwbAWOMBO207zp5T26HRnDYrIw34=";
   };
 
   build-system = [ poetry-core ];

From 788e16a8e9edee9613b3ccdda02018c854452e8d Mon Sep 17 00:00:00 2001
From: William Brockhus <pickeringw@gmail.com>
Date: Mon, 2 Jun 2025 12:05:54 +1000
Subject: [PATCH 0434/1497] bitwarden: 2025.4.2 -> 2025.5.0

---
 .../bi/bitwarden-desktop/dont-use-platform-triple.patch   | 4 ++--
 pkgs/by-name/bi/bitwarden-desktop/package.nix             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
index 0b39a187e39d..f2f9259ebc00 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/dont-use-platform-triple.patch
@@ -45,10 +45,10 @@ index 2922035..6497a38 100644
    ],
    "electronVersion": "34.0.0",
    "generateUpdatesFilesForAllChannels": true,
-@@ -67,7 +67,6 @@
-       ],
+@@ -68,7 +68,6 @@
        "CFBundleDevelopmentRegion": "en"
      },
+     "provisioningProfile": "bitwarden_desktop_developer_id.provisionprofile",
 -    "singleArchFiles": "node_modules/@bitwarden/desktop-napi/desktop_napi.darwin-*.node",
      "extraFiles": [
        {
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 70f8ada470e0..b2f9ab146577 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.4.2";
+  version = "2025.5.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ=";
+    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
   };
 
   patches = [
@@ -76,7 +76,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE=";
+  npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit
@@ -86,7 +86,7 @@ buildNpmPackage' rec {
       cargoRoot
       patches
       ;
-    hash = "sha256-EONHK33RuVy2ZlUzwdvdBX+6/jiCsrNo9ueZYQtWSkA=";
+    hash = "sha256-ZD/UPYRa+HR7hyWDP6S/BKvQpYRDwWQJV6iGF9LT2uY=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 

From 0b572db5dc48798d148beb5d7bba321c8f3aaae6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 23 May 2025 13:18:26 +0000
Subject: [PATCH 0435/1497] fastlane: 2.227.1 -> 2.227.2

---
 pkgs/by-name/fa/fastlane/Gemfile.lock | 16 +++++++-------
 pkgs/by-name/fa/fastlane/gemset.nix   | 32 +++++++++++++--------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/fa/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock
index 6f670951d9cf..d8c0b76d959f 100644
--- a/pkgs/by-name/fa/fastlane/Gemfile.lock
+++ b/pkgs/by-name/fa/fastlane/Gemfile.lock
@@ -11,18 +11,18 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1090.0)
-    aws-sdk-core (3.222.2)
+    aws-partitions (1.1106.0)
+    aws-sdk-core (3.224.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.99.0)
+    aws-sdk-kms (1.101.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.183.0)
+    aws-sdk-s3 (1.186.1)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -71,7 +71,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.1)
+    fastlane (2.227.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -158,7 +158,7 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.10.2)
+    json (2.12.1)
     jwt (2.10.1)
       base64
     logger (1.7.0)
@@ -173,7 +173,7 @@ GEM
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -185,7 +185,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     security (0.1.5)
-    signet (0.19.0)
+    signet (0.20.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
diff --git a/pkgs/by-name/fa/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix
index 84d17a97be9d..fbf71e8fb866 100644
--- a/pkgs/by-name/fa/fastlane/gemset.nix
+++ b/pkgs/by-name/fa/fastlane/gemset.nix
@@ -55,10 +55,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15nkd4iskiy2c2lh1w499978zvnxkirpdm2i0y5i0yvym43kkycx";
+      sha256 = "12svi07s5hss8wq9xpaxwy1ibl64bd00hsn12v810wvz19fw823l";
       type = "gem";
     };
-    version = "1.1090.0";
+    version = "1.1106.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -73,10 +73,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lf8aykj9ybs7mvfk27ccs221z7rhqm3lxqx6zy27lf6jl2hff86";
+      sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6";
       type = "gem";
     };
-    version = "3.222.2";
+    version = "3.224.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -87,10 +87,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
+      sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24";
       type = "gem";
     };
-    version = "1.99.0";
+    version = "1.101.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -102,10 +102,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k4zg6i7xrgqv4s66hxj0l5icx44bb1ax52al2s5gz3n1hrv01lc";
+      sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v";
       type = "gem";
     };
-    version = "1.183.0";
+    version = "1.186.1";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -461,10 +461,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "124ijrgr9w709093g7p7hvhg1l4wy4kr1c8rn82krri89pl4q6y2";
+      sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z";
       type = "gem";
     };
-    version = "2.227.1";
+    version = "2.227.2";
   };
   fastlane-sirp = {
     dependencies = [ "sysrandom" ];
@@ -668,10 +668,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
+      sha256 = "0fr0dxwn5a7z5m3i16v66pc35wmwc6mgj9f8dg7ch2bwq42y73zw";
       type = "gem";
     };
-    version = "2.10.2";
+    version = "2.12.1";
   };
   jwt = {
     dependencies = [ "base64" ];
@@ -809,10 +809,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   rake = {
     groups = [ "default" ];
@@ -910,10 +910,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk";
+      sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
       type = "gem";
     };
-    version = "0.19.0";
+    version = "0.20.0";
   };
   simctl = {
     dependencies = [

From fbeb29c7bdfdb1d0cd60ad637e74973e5ae077b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:31:49 +0000
Subject: [PATCH 0436/1497] veryl: 0.16.0 -> 0.16.1

---
 pkgs/by-name/ve/veryl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index 6c66cecf8284..fdf8346aad0b 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veryl";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
     rev = "v${version}";
-    hash = "sha256-KlW5GC5fgUnS6YAb01VEaKv48+yu8VqgAe/5QsilYjs=";
+    hash = "sha256-/GbykOurK3IHmknMh+TftU7aFcLqAlnEeiJ51sJcTeQ=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HKDkV2eDjhfuky2ORdKwbyBa/kt1gEqK55AibKg5VYE=";
+  cargoHash = "sha256-MQkxeV+06hL9DqReuHy7H8SMvh2Xn6Hqj/VY8a1scyQ=";
 
   nativeBuildInputs = [
     pkg-config

From 66f7fabe5910d1f3cbb5ae43e7e7a58153a8d048 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:49:24 +0000
Subject: [PATCH 0437/1497] python3Packages.pymilvus: 2.5.9 -> 2.5.10

---
 pkgs/development/python-modules/pymilvus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix
index 3f9875101fbb..4363cadd1de7 100644
--- a/pkgs/development/python-modules/pymilvus/default.nix
+++ b/pkgs/development/python-modules/pymilvus/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "pymilvus";
-  version = "2.5.9";
+  version = "2.5.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "milvus-io";
     repo = "pymilvus";
     tag = "v${version}";
-    hash = "sha256-x9qAZay5DoNyfQOpzjfy7/3cyjHwEJiQ441Y+sRyGLw=";
+    hash = "sha256-gxl9SqqFZusv4V/Xud56iz8lyUfITPPF4g4IUIAzl6U=";
   };
 
   build-system = [

From bed389dd2fd59e6e59a52cd6476fa36cf6c2eb91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:50:21 +0000
Subject: [PATCH 0438/1497] traccar: 6.7.0 -> 6.7.2

---
 pkgs/by-name/tr/traccar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix
index 7135a3a6ae6a..ce708ac8e469 100644
--- a/pkgs/by-name/tr/traccar/package.nix
+++ b/pkgs/by-name/tr/traccar/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "traccar";
-  version = "6.7.0";
+  version = "6.7.2";
   nativeBuildInputs = [ pkgs.makeWrapper ];
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
-    hash = "sha256-y2M4jQkmCI/mNSb7VPzcNfjf838ZvDp3et00P16Oga4=";
+    hash = "sha256-a6ZDJcviEPXLm91PnP6qflID2MLO4oD6MyVkQNRd688=";
   };
 
   installPhase = ''

From d9cd6cae2a57c3ef3a12b18bf0830ae4a2002fb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:50:26 +0000
Subject: [PATCH 0439/1497] web-ext: 8.7.0 -> 8.7.1

---
 pkgs/by-name/we/web-ext/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix
index e746254159b8..98823048496a 100644
--- a/pkgs/by-name/we/web-ext/package.nix
+++ b/pkgs/by-name/we/web-ext/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "web-ext";
-  version = "8.7.0";
+  version = "8.7.1";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "web-ext";
     rev = version;
-    hash = "sha256-k/S9YBU7D7FoXLK9aufBQfD4ZjCdlhGeDBnvfOk5H6Y=";
+    hash = "sha256-B0wlGOg4ZfFRBVrHdERHMv3BPKfLX28YYtdyDphQTcE=";
   };
 
-  npmDepsHash = "sha256-sykNWATICiPz3naZyzl6+b0g0v0D1AsfGYT5bahTlBI=";
+  npmDepsHash = "sha256-J7uDivhLjdMVQyuejcrCL7m7EsAs/DeeKD7r1Cv81qQ=";
 
   npmBuildFlags = [ "--production" ];
 

From 7a24afd11b798b09e0e00a059eb766cb201a56bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:52:52 +0000
Subject: [PATCH 0440/1497] kool: 3.5.0 -> 3.5.2

---
 pkgs/by-name/ko/kool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index 8ad93a44e022..5527f9ffb065 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "kool";
-  version = "3.5.0";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "kool-dev";
     repo = "kool";
     rev = version;
-    hash = "sha256-iB/9owaBNQVzdA4edrx0zl+COs7yVLs61Mij5kfjEhg=";
+    hash = "sha256-yUJbuMOLEa9LVRltskSwD0XBdmwwLcEaLYUHsSQOiCk=";
   };
 
   vendorHash = "sha256-IqUkIf0uk4iUTedTO5xRzjmJwHS+p6apo4E0WEEU6cc=";

From 0656fbc43f9b36c62bc4ffd6b4c845d3b48fc19c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:54:13 +0000
Subject: [PATCH 0441/1497] yubikey-manager: 5.6.1 -> 5.7.0

---
 pkgs/by-name/yu/yubikey-manager/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/yu/yubikey-manager/package.nix b/pkgs/by-name/yu/yubikey-manager/package.nix
index 6f3192774a1d..96f515441ada 100644
--- a/pkgs/by-name/yu/yubikey-manager/package.nix
+++ b/pkgs/by-name/yu/yubikey-manager/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
-  version = "5.6.1";
+  version = "5.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = "yubikey-manager";
-    rev = version;
-    hash = "sha256-qEEAByg6Smn1Wk8U4VA6MIJDLWBtM+S+qTDIcgPUGA0=";
+    tag = version;
+    hash = "sha256-G93fg2tgIo9u8FjIBBgd74qbYKiqfQo+sAV965bUipk=";
   };
 
   postPatch = ''
@@ -57,7 +57,7 @@ python3Packages.buildPythonPackage rec {
 
   meta = {
     homepage = "https://developers.yubico.com/yubikey-manager";
-    changelog = "https://github.com/Yubico/yubikey-manager/releases/tag/${version}";
+    changelog = "https://github.com/Yubico/yubikey-manager/releases/tag/${src.tag}";
     description = "Command line tool for configuring any YubiKey over all USB transports";
 
     license = lib.licenses.bsd2;

From 547fe24c1181395f39944124421315ba3da18bab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 02:58:54 +0000
Subject: [PATCH 0442/1497] vectorcode: 0.6.9 -> 0.6.10

---
 pkgs/by-name/ve/vectorcode/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index f508695954d2..a8c776fc62af 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vectorcode";
-  version = "0.6.9";
+  version = "0.6.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Davidyz";
     repo = "VectorCode";
     tag = version;
-    hash = "sha256-qXrXNt5uI/gePFyJ79y+zksSekq7BzsbL+1tvMQ/zKM=";
+    hash = "sha256-k9YpsVFV1HkIIIFPB7Iz7Jar+lY5vK6gpzNIlX55ZDY=";
   };
 
   build-system = with python3Packages; [

From 38479681c0a9cc42ac75220d061338b7f46980c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 03:11:07 +0000
Subject: [PATCH 0443/1497] bpftrace: 0.23.3 -> 0.23.4

---
 pkgs/by-name/bp/bpftrace/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 7c9174dec0d8..521ea29a4073 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.23.3";
+  version = "0.23.4";
 
   src = fetchFromGitHub {
     owner = "bpftrace";
     repo = "bpftrace";
     rev = "v${version}";
-    hash = "sha256-Jvl8Up3IH2/G0QMb0pZmQ2SSXOmjTj08KXoJXOR3Z48=";
+    hash = "sha256-fJOc5M+DhYjmooDb8p/kZbUOhQX27/6aau7Ff9dgjbs=";
   };
 
   buildInputs = with llvmPackages; [

From 245d42430b2ee14f9e1aae77f94c05adebd68588 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 1 Jun 2025 23:18:42 -0400
Subject: [PATCH 0444/1497] github-copilot-cli: drop

GitHub has ended this "technical preview", and the package on npm is now unmaintained.

But this feature remains actively developed in the "gh-copilot" package.
So I direct users there when throwing an exception.
(I don't just alias, because the shell commands are different.)

Link: https://githubnext.com/projects/copilot-cli/
---
 .../gi/github-copilot-cli/package-lock.json   | 3329 -----------------
 .../by-name/gi/github-copilot-cli/package.nix |   32 -
 pkgs/top-level/aliases.nix                    |    1 +
 3 files changed, 1 insertion(+), 3361 deletions(-)
 delete mode 100644 pkgs/by-name/gi/github-copilot-cli/package-lock.json
 delete mode 100644 pkgs/by-name/gi/github-copilot-cli/package.nix

diff --git a/pkgs/by-name/gi/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json
deleted file mode 100644
index 03bc0c1fc339..000000000000
--- a/pkgs/by-name/gi/github-copilot-cli/package-lock.json
+++ /dev/null
@@ -1,3329 +0,0 @@
-{
-  "name": "@githubnext/github-copilot-cli",
-  "version": "0.1.36",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@githubnext/github-copilot-cli",
-      "version": "0.1.36",
-      "dependencies": {
-        "applicationinsights": "^2.9.1",
-        "axios": "^1.6.0",
-        "chalk": "^5.1.0",
-        "cli-highlight": "^2.1.11",
-        "commander": "^9.4.1",
-        "get-stream": "^6.0.1",
-        "immer": "^9.0.16",
-        "ink": "^3.2.0",
-        "ink-divider": "^3.0.0",
-        "ink-select-input": "^4.2.1",
-        "ink-spinner": "^4.0.3",
-        "ink-text-input": "^4.0.3",
-        "inquirer": "^9.1.4",
-        "marked": "^4.2.12",
-        "marked-terminal": "^5.1.1",
-        "ora": "^6.1.2",
-        "radash": "^9.1.0",
-        "react": "17",
-        "react-devtools-core": "^4.28.4",
-        "react-dom": "17",
-        "react-query": "^3.39.2",
-        "semver": "^5.7.2",
-        "simple-update-notifier": "^1.1.0",
-        "tiny-invariant": "^1.3.1",
-        "tough-cookie": "^4.1.3",
-        "ts-dedent": "^2.2.0",
-        "use-zustand": "^0.0.1",
-        "uuid": "^9.0.0",
-        "zustand": "^4.1.4"
-      },
-      "bin": {
-        "github-copilot-cli": "cli.js"
-      },
-      "devDependencies": {
-        "@types/inquirer": "^9.0.2",
-        "@types/node": "^18.8.3",
-        "@types/react": "^18.0.25",
-        "@types/uuid": "^8.3.4",
-        "esbuild": "^0.15.10",
-        "genversion": "^3.1.1",
-        "typescript": "^4.8.4"
-      }
-    },
-    "node_modules/@azure/abort-controller": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
-      "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==",
-      "dependencies": {
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@azure/core-auth": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz",
-      "integrity": "sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==",
-      "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-util": "^1.1.0",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@azure/core-rest-pipeline": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz",
-      "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==",
-      "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.4.0",
-        "@azure/core-tracing": "^1.0.1",
-        "@azure/core-util": "^1.0.0",
-        "@azure/logger": "^1.0.0",
-        "form-data": "^4.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "tslib": "^2.2.0",
-        "uuid": "^8.3.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@azure/core-rest-pipeline/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/@azure/core-tracing": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz",
-      "integrity": "sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==",
-      "dependencies": {
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@azure/core-util": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz",
-      "integrity": "sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==",
-      "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@azure/logger": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
-      "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
-      "dependencies": {
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@azure/opentelemetry-instrumentation-azure-sdk": {
-      "version": "1.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5.tgz",
-      "integrity": "sha512-fsUarKQDvjhmBO4nIfaZkfNSApm1hZBzcvpNbSrXdcUBxu7lRvKsV5DnwszX7cnhLyVOW9yl1uigtRQ1yDANjA==",
-      "dependencies": {
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/logger": "^1.0.0",
-        "@opentelemetry/api": "^1.4.1",
-        "@opentelemetry/core": "^1.15.2",
-        "@opentelemetry/instrumentation": "^0.41.2",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz",
-      "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
-      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
-      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@ljharb/through": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.11.tgz",
-      "integrity": "sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/@microsoft/applicationinsights-web-snippet": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz",
-      "integrity": "sha512-2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ=="
-    },
-    "node_modules/@opentelemetry/api": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz",
-      "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/core": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.20.0.tgz",
-      "integrity": "sha512-lSRvk5AIdD6CtgYJcJXh0wGibQ3S/8bC2qbqKs9wK8e0K1tsWV6YkGFOqVc+jIRlCbZoIBeZzDe5UI+vb94uvg==",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "1.20.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.8.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation": {
-      "version": "0.41.2",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz",
-      "integrity": "sha512-rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw==",
-      "dependencies": {
-        "@types/shimmer": "^1.0.2",
-        "import-in-the-middle": "1.4.2",
-        "require-in-the-middle": "^7.1.1",
-        "semver": "^7.5.1",
-        "shimmer": "^1.2.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/instrumentation/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@opentelemetry/resources": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.20.0.tgz",
-      "integrity": "sha512-nOpV0vGegSq+9ze2cEDvO3BMA5pGBhmhKZiAlj+xQZjiEjPmJtdHIuBLRvptu2ahcbFJw85gIB9BYHZOvZK1JQ==",
-      "dependencies": {
-        "@opentelemetry/core": "1.20.0",
-        "@opentelemetry/semantic-conventions": "1.20.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.8.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.20.0.tgz",
-      "integrity": "sha512-BAIZ0hUgnhdb3OBQjn1FKGz/Iwie4l+uOMKklP7FGh7PTqEAbbzDNMJKaZQh6KepF7Fq+CZDRKslD3yrYy2Tzw==",
-      "dependencies": {
-        "@opentelemetry/core": "1.20.0",
-        "@opentelemetry/resources": "1.20.0",
-        "@opentelemetry/semantic-conventions": "1.20.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.8.0"
-      }
-    },
-    "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.20.0.tgz",
-      "integrity": "sha512-3zLJJCgTKYpbqFX8drl8hOCHtdchELC+kGqlVcV4mHW1DiElTtv1Nt9EKBptTd1IfL56QkuYnWJ3DeHd2Gtu/A==",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@types/inquirer": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.7.tgz",
-      "integrity": "sha512-Q0zyBupO6NxGRZut/JdmqYKOnN95Eg5V8Csg3PGKkP+FnvsUZx1jAyK7fztIszxxMuoBA6E3KXWvdZVXIpx60g==",
-      "dev": true,
-      "dependencies": {
-        "@types/through": "*",
-        "rxjs": "^7.2.0"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "18.19.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.8.tgz",
-      "integrity": "sha512-g1pZtPhsvGVTwmeVoexWZLTQaOvXwoSq//pTL0DHeNzUDrFnir4fgETdhjhIxjVnN+hKOuh98+E1eMLnUXstFg==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.11",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
-      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==",
-      "devOptional": true
-    },
-    "node_modules/@types/react": {
-      "version": "18.2.48",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
-      "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
-      "devOptional": true,
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.8",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
-      "devOptional": true
-    },
-    "node_modules/@types/shimmer": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz",
-      "integrity": "sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww=="
-    },
-    "node_modules/@types/through": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
-      "integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-      "dev": true
-    },
-    "node_modules/@types/yoga-layout": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz",
-      "integrity": "sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="
-    },
-    "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ansicolors": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz",
-      "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="
-    },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
-    },
-    "node_modules/applicationinsights": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.9.2.tgz",
-      "integrity": "sha512-wlDiD7v0BQNM8oNzsf9C836R5ze25u+CuCEZsbA5xMIXYYBxkqkWE/mo9GFJM7rsKaiGqpxEwWmePHKD2Lwy2w==",
-      "dependencies": {
-        "@azure/core-auth": "^1.5.0",
-        "@azure/core-rest-pipeline": "1.10.1",
-        "@azure/core-util": "1.2.0",
-        "@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.5",
-        "@microsoft/applicationinsights-web-snippet": "^1.0.1",
-        "@opentelemetry/api": "^1.7.0",
-        "@opentelemetry/core": "^1.19.0",
-        "@opentelemetry/sdk-trace-base": "^1.19.0",
-        "@opentelemetry/semantic-conventions": "^1.19.0",
-        "cls-hooked": "^4.2.2",
-        "continuation-local-storage": "^3.2.1",
-        "diagnostic-channel": "1.1.1",
-        "diagnostic-channel-publishers": "1.0.8"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "peerDependencies": {
-        "applicationinsights-native-metrics": "*"
-      },
-      "peerDependenciesMeta": {
-        "applicationinsights-native-metrics": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/arr-rotate": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/arr-rotate/-/arr-rotate-1.0.0.tgz",
-      "integrity": "sha512-yOzOZcR9Tn7enTF66bqKorGGH0F36vcPaSWg8fO0c0UYb3LX3VMXj5ZxEqQLNOecAhlRJ7wYZja5i4jTlnbIfQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
-      "dev": true
-    },
-    "node_modules/async-hook-jl": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz",
-      "integrity": "sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==",
-      "dependencies": {
-        "stack-chain": "^1.3.7"
-      },
-      "engines": {
-        "node": "^4.7 || >=6.9 || >=7.3"
-      }
-    },
-    "node_modules/async-listener": {
-      "version": "0.6.10",
-      "resolved": "https://registry.npmjs.org/async-listener/-/async-listener-0.6.10.tgz",
-      "integrity": "sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==",
-      "dependencies": {
-        "semver": "^5.3.0",
-        "shimmer": "^1.1.0"
-      },
-      "engines": {
-        "node": "<=0.11.8 || >0.11.10"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/auto-bind": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz",
-      "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/axios": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
-      "dependencies": {
-        "follow-redirects": "^1.15.4",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/big-integer": {
-      "version": "1.6.52",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
-      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/bl": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-      "dependencies": {
-        "buffer": "^6.0.3",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/broadcast-channel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
-      "dependencies": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/cardinal": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz",
-      "integrity": "sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==",
-      "dependencies": {
-        "ansicolors": "~0.3.2",
-        "redeyed": "~2.1.0"
-      },
-      "bin": {
-        "cdl": "bin/cdl.js"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
-    },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-highlight": {
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
-      "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "highlight.js": "^10.7.1",
-        "mz": "^2.4.0",
-        "parse5": "^5.1.1",
-        "parse5-htmlparser2-tree-adapter": "^6.0.0",
-        "yargs": "^16.0.0"
-      },
-      "bin": {
-        "highlight": "bin/highlight"
-      },
-      "engines": {
-        "node": ">=8.0.0",
-        "npm": ">=5.0.0"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-table3": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-      "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
-      "dependencies": {
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      },
-      "optionalDependencies": {
-        "@colors/colors": "1.5.0"
-      }
-    },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
-      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/cls-hooked": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz",
-      "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==",
-      "dependencies": {
-        "async-hook-jl": "^1.7.6",
-        "emitter-listener": "^1.0.1",
-        "semver": "^5.4.1"
-      },
-      "engines": {
-        "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1"
-      }
-    },
-    "node_modules/code-excerpt": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-3.0.0.tgz",
-      "integrity": "sha512-VHNTVhd7KsLGOqfX3SyeO8RyYPMp1GJOg194VITk04WMYCv4plV68YWe6TJZxd9MhobjtpMRnVky01gqZsalaw==",
-      "dependencies": {
-        "convert-to-spaces": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "node_modules/continuation-local-storage": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz",
-      "integrity": "sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==",
-      "dependencies": {
-        "async-listener": "^0.6.0",
-        "emitter-listener": "^1.1.1"
-      }
-    },
-    "node_modules/convert-to-spaces": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz",
-      "integrity": "sha512-cj09EBuObp9gZNQCzc7hByQyrs6jVGE+o9kSJmeUoj+GiPiJvi5LYqEH/Hmme4+MTLHM+Ejtq+FChpjjEnsPdQ==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "node_modules/diagnostic-channel": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz",
-      "integrity": "sha512-r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw==",
-      "dependencies": {
-        "semver": "^7.5.3"
-      }
-    },
-    "node_modules/diagnostic-channel-publishers": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.8.tgz",
-      "integrity": "sha512-HmSm9hXxSPxA9BaLGY98QU1zsdjeCk113KjAYGPCen1ZP6mhVaTPzHd6UYv5r21DnWANi+f+NyPOHruGT9jpqQ==",
-      "peerDependencies": {
-        "diagnostic-channel": "*"
-      }
-    },
-    "node_modules/diagnostic-channel/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
-      "dev": true,
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/emitter-listener": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz",
-      "integrity": "sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==",
-      "dependencies": {
-        "shimmer": "^1.2.0"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/esbuild": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
-      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.18",
-        "@esbuild/linux-loong64": "0.15.18",
-        "esbuild-android-64": "0.15.18",
-        "esbuild-android-arm64": "0.15.18",
-        "esbuild-darwin-64": "0.15.18",
-        "esbuild-darwin-arm64": "0.15.18",
-        "esbuild-freebsd-64": "0.15.18",
-        "esbuild-freebsd-arm64": "0.15.18",
-        "esbuild-linux-32": "0.15.18",
-        "esbuild-linux-64": "0.15.18",
-        "esbuild-linux-arm": "0.15.18",
-        "esbuild-linux-arm64": "0.15.18",
-        "esbuild-linux-mips64le": "0.15.18",
-        "esbuild-linux-ppc64le": "0.15.18",
-        "esbuild-linux-riscv64": "0.15.18",
-        "esbuild-linux-s390x": "0.15.18",
-        "esbuild-netbsd-64": "0.15.18",
-        "esbuild-openbsd-64": "0.15.18",
-        "esbuild-sunos-64": "0.15.18",
-        "esbuild-windows-32": "0.15.18",
-        "esbuild-windows-64": "0.15.18",
-        "esbuild-windows-arm64": "0.15.18"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
-      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
-      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
-      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
-      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
-      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
-      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
-      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
-      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
-      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
-      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
-      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
-      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
-      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
-      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
-      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
-      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
-      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
-      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
-      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
-      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/find-package": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/find-package/-/find-package-1.0.0.tgz",
-      "integrity": "sha512-yVn71XCCaNgxz58ERTl8nA/8YYtIQDY9mHSrgFBfiFtdNNfY0h183Vh8BRkKxD8x9TUw3ec290uJKhDVxqGZBw==",
-      "dev": true,
-      "dependencies": {
-        "parents": "^1.0.1"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/genversion": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/genversion/-/genversion-3.2.0.tgz",
-      "integrity": "sha512-OIYSX6XYA8PHecLDCTri30hadSZfAjZ8Iq1+BBDXqLWP4dRLuJNLoNjsSWtTpw97IccK2LDWzkEstxAB8GdN7g==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^7.2.0",
-        "ejs": "^3.1.9",
-        "find-package": "^1.0.0"
-      },
-      "bin": {
-        "genversion": "bin/genversion.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/genversion/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
-      "dependencies": {
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/immer": {
-      "version": "9.0.21",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
-      "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/import-in-the-middle": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz",
-      "integrity": "sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==",
-      "dependencies": {
-        "acorn": "^8.8.2",
-        "acorn-import-assertions": "^1.9.0",
-        "cjs-module-lexer": "^1.2.2",
-        "module-details-from-path": "^1.0.3"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ink": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ink/-/ink-3.2.0.tgz",
-      "integrity": "sha512-firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg==",
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "auto-bind": "4.0.0",
-        "chalk": "^4.1.0",
-        "cli-boxes": "^2.2.0",
-        "cli-cursor": "^3.1.0",
-        "cli-truncate": "^2.1.0",
-        "code-excerpt": "^3.0.0",
-        "indent-string": "^4.0.0",
-        "is-ci": "^2.0.0",
-        "lodash": "^4.17.20",
-        "patch-console": "^1.0.0",
-        "react-devtools-core": "^4.19.1",
-        "react-reconciler": "^0.26.2",
-        "scheduler": "^0.20.2",
-        "signal-exit": "^3.0.2",
-        "slice-ansi": "^3.0.0",
-        "stack-utils": "^2.0.2",
-        "string-width": "^4.2.2",
-        "type-fest": "^0.12.0",
-        "widest-line": "^3.1.0",
-        "wrap-ansi": "^6.2.0",
-        "ws": "^7.5.5",
-        "yoga-layout-prebuilt": "^1.9.6"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@types/react": ">=16.8.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ink-divider": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ink-divider/-/ink-divider-3.0.0.tgz",
-      "integrity": "sha512-Mqb9WArtEZCtXw622aHhJqPK157QNc+8ssl9/RvAZlS6nZRCKyW4mYOYCudQh6dSuFGt9eG5yaqT1mJaGmwu+w==",
-      "dependencies": {
-        "prop-types": "^15.7.2",
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "ink": ">=3.0.0",
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/ink-select-input": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/ink-select-input/-/ink-select-input-4.2.2.tgz",
-      "integrity": "sha512-E5AS2Vnd4CSzEa7Rm+hG47wxRQo1ASfh4msKxO7FHmn/ym+GKSSsFIfR+FonqjKNDPXYJClw8lM47RdN3Pi+nw==",
-      "dependencies": {
-        "arr-rotate": "^1.0.0",
-        "figures": "^3.2.0",
-        "lodash.isequal": "^4.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "ink": "^3.0.5",
-        "react": "^16.5.2 || ^17.0.0"
-      }
-    },
-    "node_modules/ink-spinner": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/ink-spinner/-/ink-spinner-4.0.3.tgz",
-      "integrity": "sha512-uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ==",
-      "dependencies": {
-        "cli-spinners": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "ink": ">=3.0.5",
-        "react": ">=16.8.2"
-      }
-    },
-    "node_modules/ink-text-input": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.3.tgz",
-      "integrity": "sha512-eQD01ik9ltmNoHmkeQ2t8LszYkv2XwuPSUz3ie/85qer6Ll/j0QSlSaLNl6ENHZakBHdCBVZY04iOXcLLXA0PQ==",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "type-fest": "^0.15.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "ink": "^3.0.0-3",
-        "react": "^16.5.2 || ^17.0.0"
-      }
-    },
-    "node_modules/ink-text-input/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ink-text-input/node_modules/type-fest": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.15.1.tgz",
-      "integrity": "sha512-n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ink/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer": {
-      "version": "9.2.12",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz",
-      "integrity": "sha512-mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q==",
-      "dependencies": {
-        "@ljharb/through": "^2.3.11",
-        "ansi-escapes": "^4.3.2",
-        "chalk": "^5.3.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "figures": "^5.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=14.18.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/inquirer/node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/figures": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
-      "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==",
-      "dependencies": {
-        "escape-string-regexp": "^5.0.0",
-        "is-unicode-supported": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/log-symbols/node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inquirer/node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/inquirer/node_modules/ora/node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
-      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jake": {
-      "version": "10.8.7",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-      "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
-      "dev": true,
-      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "node_modules/log-symbols": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz",
-      "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==",
-      "dependencies": {
-        "chalk": "^5.0.0",
-        "is-unicode-supported": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/marked": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/marked-terminal": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-5.2.0.tgz",
-      "integrity": "sha512-Piv6yNwAQXGFjZSaiNljyNFw7jKDdGrw70FSbtxEyldLsyeuV5ZHm/1wW++kWbrOF1VPnUgYOhB2oLL0ZpnekA==",
-      "dependencies": {
-        "ansi-escapes": "^6.2.0",
-        "cardinal": "^2.1.1",
-        "chalk": "^5.2.0",
-        "cli-table3": "^0.6.3",
-        "node-emoji": "^1.11.0",
-        "supports-hyperlinks": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "marked": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/marked-terminal/node_modules/ansi-escapes": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz",
-      "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==",
-      "dependencies": {
-        "type-fest": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/marked-terminal/node_modules/type-fest": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/match-sorter": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.3.tgz",
-      "integrity": "sha512-sgiXxrRijEe0SzHKGX4HouCpfHRPnqteH42UdMEW7BlWy990ZkzcvonJGv4Uu9WE7Y1f8Yocm91+4qFPCbmNww==",
-      "dependencies": {
-        "@babel/runtime": "^7.23.8",
-        "remove-accents": "0.5.0"
-      }
-    },
-    "node_modules/microseconds": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/module-details-from-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
-      "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/mute-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-      "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
-    "node_modules/nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
-      "dependencies": {
-        "big-integer": "^1.6.16"
-      }
-    },
-    "node_modules/node-emoji": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
-      "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
-      "dependencies": {
-        "lodash": "^4.17.21"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-6.3.1.tgz",
-      "integrity": "sha512-ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==",
-      "dependencies": {
-        "chalk": "^5.0.0",
-        "cli-cursor": "^4.0.0",
-        "cli-spinners": "^2.6.1",
-        "is-interactive": "^2.0.0",
-        "is-unicode-supported": "^1.1.0",
-        "log-symbols": "^5.1.0",
-        "stdin-discarder": "^0.1.0",
-        "strip-ansi": "^7.0.1",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/cli-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
-      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
-      "dependencies": {
-        "restore-cursor": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/restore-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
-      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parents": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
-      "dev": true,
-      "dependencies": {
-        "path-platform": "~0.11.15"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
-    },
-    "node_modules/parse5-htmlparser2-tree-adapter": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-      "dependencies": {
-        "parse5": "^6.0.1"
-      }
-    },
-    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    },
-    "node_modules/patch-console": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/patch-console/-/patch-console-1.0.0.tgz",
-      "integrity": "sha512-nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "node_modules/radash": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/radash/-/radash-9.5.0.tgz",
-      "integrity": "sha512-t0s8BJlvrk8YPaOS8X0J2xzqAsBlXAUkDEjoBXwlzaXsXNCpBILjT9OvWlabLa2KB/r4XrhThdXjxMs7SiCyIw==",
-      "engines": {
-        "node": ">=14.18.0"
-      }
-    },
-    "node_modules/react": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-devtools-core": {
-      "version": "4.28.5",
-      "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz",
-      "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==",
-      "dependencies": {
-        "shell-quote": "^1.6.1",
-        "ws": "^7"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "scheduler": "^0.20.2"
-      },
-      "peerDependencies": {
-        "react": "17.0.2"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/react-query": {
-      "version": "3.39.3",
-      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.3.tgz",
-      "integrity": "sha512-nLfLz7GiohKTJDuT4us4X3h/8unOh+00MLb2yJoGTPjxKs2bc1iDhkNx2bd5MKklXnOD3NrVZ+J2UXujA5In4g==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "broadcast-channel": "^3.4.1",
-        "match-sorter": "^6.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-reconciler": {
-      "version": "0.26.2",
-      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.26.2.tgz",
-      "integrity": "sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "scheduler": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "react": "^17.0.2"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/redeyed": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz",
-      "integrity": "sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==",
-      "dependencies": {
-        "esprima": "~4.0.0"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
-    "node_modules/remove-accents": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
-      "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A=="
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-in-the-middle": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz",
-      "integrity": "sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "module-details-from-path": "^1.0.3",
-        "resolve": "^1.22.1"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/scheduler": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/set-function-length": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
-      "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==",
-      "dependencies": {
-        "define-data-property": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.2",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/shimmer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
-      "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
-      "dependencies": {
-        "semver": "~7.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/simple-update-notifier/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stack-chain": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
-      "integrity": "sha512-D8cWtWVdIe/jBA7v5p5Hwl5yOSOrmZPWDPe2KxQ5UAGD+nxbxU0lKXA4h85Ta6+qgdKVL3vUxsbIZjc1kBG7ug=="
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stdin-discarder": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
-      "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==",
-      "dependencies": {
-        "bl": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/tiny-invariant": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-      "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ts-dedent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz",
-      "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
-      "engines": {
-        "node": ">=6.10"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/type-fest": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz",
-      "integrity": "sha512-53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
-    },
-    "node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/unload": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
-      "dependencies": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/use-zustand": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/use-zustand/-/use-zustand-0.0.1.tgz",
-      "integrity": "sha512-axjswesUfXirTQ1CC1F4r0dkaI7g2nMEftyvg23Wq4PnAbLogswzj+o5gbnnnQaQOMXKHxNZIlYpKfuTnL466Q==",
-      "peerDependencies": {
-        "react": "*"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/ws": {
-      "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yoga-layout-prebuilt": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.10.0.tgz",
-      "integrity": "sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==",
-      "dependencies": {
-        "@types/yoga-layout": "1.9.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/zustand": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.4.7.tgz",
-      "integrity": "sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==",
-      "dependencies": {
-        "use-sync-external-store": "1.2.0"
-      },
-      "engines": {
-        "node": ">=12.7.0"
-      },
-      "peerDependencies": {
-        "@types/react": ">=16.8",
-        "immer": ">=9.0",
-        "react": ">=16.8"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "immer": {
-          "optional": true
-        },
-        "react": {
-          "optional": true
-        }
-      }
-    }
-  }
-}
diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
deleted file mode 100644
index d93eb31f8609..000000000000
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchzip,
-}:
-
-buildNpmPackage rec {
-  pname = "github-copilot-cli";
-  version = "0.1.36";
-
-  src = fetchzip {
-    url = "https://registry.npmjs.org/@githubnext/github-copilot-cli/-/github-copilot-cli-${version}.tgz";
-    hash = "sha256-7n+7sN61OrqMVGaKll85+HwX7iGG9M/UW5lf2Pd5sRU=";
-  };
-
-  npmDepsHash = "sha256-h0StxzGbl3ZeOQ4Jy1BgJ5sJ0pAbubMCRsiIOYpU04w=";
-
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
-  '';
-
-  dontNpmBuild = true;
-
-  meta = with lib; {
-    description = "CLI experience for letting GitHub Copilot help you on the command line";
-    homepage = "https://githubnext.com/projects/copilot-cli/";
-    license = licenses.unfree; # upstream has no license
-    maintainers = [ maintainers.malo ];
-    platforms = platforms.all;
-    mainProgram = "github-copilot-cli";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8d5c09860a35..f9062d9b4b8f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -773,6 +773,7 @@ mapAliases {
     svn_all_fast_export = svn-all-fast-export;
     topGit = top-git;
   }; # Added 2021-01-14
+  github-copilot-cli = throw "'github-copilot-cli' has been removed because GitHub has replaced it with 'gh-copilot'."; # Added 2025-06-01
   givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22

From f86a47b15d971497b339dbd4a8056723e303e591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 03:21:19 +0000
Subject: [PATCH 0445/1497] python3Packages.aiokem: 0.5.11 -> 0.5.12

---
 pkgs/development/python-modules/aiokem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiokem/default.nix b/pkgs/development/python-modules/aiokem/default.nix
index fc6aedde3eaf..1ff1e3d60909 100644
--- a/pkgs/development/python-modules/aiokem/default.nix
+++ b/pkgs/development/python-modules/aiokem/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiokem";
-  version = "0.5.11";
+  version = "0.5.12";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "kohlerlibs";
     repo = "aiokem";
     tag = "v${version}";
-    hash = "sha256-1fBGmsp6DoDP1EUjp2tfWT3nTux0/2iiC6x/LxrCrd8=";
+    hash = "sha256-/NbPKN47aSfM7SllP04fHXV2fr+QQRr1x6NfbpeTfzc=";
   };
 
   build-system = [ setuptools ];

From c7e92d125ea8c57c9f630bb28d2221f6c40b60d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 03:36:22 +0000
Subject: [PATCH 0446/1497] shopware-cli: 0.6.1 -> 0.6.3

---
 pkgs/by-name/sh/shopware-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix
index f52e3bdb5416..99eece4824bc 100644
--- a/pkgs/by-name/sh/shopware-cli/package.nix
+++ b/pkgs/by-name/sh/shopware-cli/package.nix
@@ -10,12 +10,12 @@
 
 buildGoModule rec {
   pname = "shopware-cli";
-  version = "0.6.1";
+  version = "0.6.3";
   src = fetchFromGitHub {
     repo = "shopware-cli";
     owner = "FriendsOfShopware";
     tag = version;
-    hash = "sha256-GdZq3Jn+SAtf0SqJSc+52JA+VR3cFJ5DzQo3cMu9Ahs=";
+    hash = "sha256-UkLzjW3Ak+bMw+nRqlaojeJ67cxadkvufZ/pn1nTmoM=";
   };
 
   nativeBuildInputs = [

From 545535eb5c49af73789d58407fdf805723c4b005 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 2 Jun 2025 06:01:26 +0200
Subject: [PATCH 0447/1497] proton-ge-bin: GE-Proton10-3 -> GE-Proton10-4

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 3a24fa2ae7dd..d5bf56c940f4 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-3";
+  version = "GE-Proton10-4";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-V4znOni53KMZ0rs7O7TuBst5kDSaEOyWUGgL7EESVAU=";
+    hash = "sha256-Si/CQ2PINfhmsC+uW3iFBUoSczZdkqwCZ8FAFuipu68=";
   };
 
   dontUnpack = true;

From 792f2e04c353df9425813ebd92328d5aae5d6101 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Mon, 2 Jun 2025 01:05:22 -0300
Subject: [PATCH 0448/1497] scalafmt: 3.9.6 -> 3.9.7

---
 pkgs/by-name/sc/scalafmt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix
index 9ec30435e54b..f050bfbaa091 100644
--- a/pkgs/by-name/sc/scalafmt/package.nix
+++ b/pkgs/by-name/sc/scalafmt/package.nix
@@ -9,7 +9,7 @@
 
 let
   baseName = "scalafmt";
-  version = "3.9.6";
+  version = "3.9.7";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -19,7 +19,7 @@ let
       cp $(< deps) $out/share/java/
     '';
     outputHashMode = "recursive";
-    outputHash = "sha256-qn3by++aYx/azaoDJFQfo8PHyjd3w4qI7g6NMIzLiPE=";
+    outputHash = "sha256-x1hEJtzZ0DmFDc7X5Tua3F0BcWz/Atm2zmMr7GgfkUM=";
   };
 in
 stdenv.mkDerivation {

From 3cc2f5fd4b6217a4e847cac5a44be1dc7c4c59a3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 06:16:01 +0200
Subject: [PATCH 0449/1497] treewide: substitute finalAttrs.pname for strings

---
 pkgs/by-name/_7/_7zz/package.nix                  |  2 +-
 pkgs/by-name/as/as31/package.nix                  |  2 +-
 pkgs/by-name/bi/bind/package.nix                  |  2 +-
 pkgs/by-name/co/coal/package.nix                  |  2 +-
 pkgs/by-name/da/davis/package.nix                 |  4 ++--
 pkgs/by-name/di/dirdiff/package.nix               |  2 +-
 pkgs/by-name/ef/efibooteditor/package.nix         |  2 +-
 pkgs/by-name/ex/example-robot-data/package.nix    |  2 +-
 pkgs/by-name/fc/fcitx5-material-color/package.nix |  2 +-
 pkgs/by-name/fi/figma-linux/package.nix           |  2 +-
 pkgs/by-name/fm/fmi-reference-fmus/package.nix    |  2 +-
 pkgs/by-name/ge/genesys/package.nix               |  2 +-
 pkgs/by-name/go/go-jsonnet/package.nix            |  2 +-
 pkgs/by-name/ho/hottext/package.nix               |  6 +++---
 pkgs/by-name/id/ideamaker/package.nix             | 14 +++++++-------
 pkgs/by-name/id/idnkit/package.nix                |  2 +-
 pkgs/by-name/ir/irpf/package.nix                  | 10 +++++-----
 pkgs/by-name/ke/keepass/package.nix               |  2 +-
 pkgs/by-name/li/libconfig/package.nix             |  2 +-
 pkgs/by-name/mo/movim/package.nix                 |  2 +-
 pkgs/by-name/my/mya/package.nix                   |  4 ++--
 pkgs/by-name/ne/netgen/package.nix                | 10 +++++-----
 pkgs/by-name/oa/oakctl/package.nix                |  2 +-
 pkgs/by-name/oc/ocelot-desktop/package.nix        |  8 ++++----
 pkgs/by-name/pa/payload_dumper/package.nix        |  2 +-
 pkgs/by-name/pi/picolibc/package.nix              |  2 +-
 pkgs/by-name/pi/pixelfed/package.nix              |  2 +-
 pkgs/by-name/sc/scmutils/package.nix              |  2 +-
 pkgs/by-name/sn/snes9x/package.nix                |  4 ++--
 pkgs/by-name/sr/srb2/package.nix                  |  4 ++--
 pkgs/by-name/sr/srb2kart/package.nix              |  4 ++--
 pkgs/by-name/st/stardust/package.nix              |  2 +-
 pkgs/by-name/st/stegsolve/package.nix             |  4 ++--
 pkgs/by-name/st/stretchly/package.nix             | 12 ++++++------
 pkgs/by-name/st/stylelint-lsp/package.nix         |  8 ++++----
 pkgs/by-name/st/styluslabs-write/package.nix      |  4 ++--
 pkgs/by-name/te/texpresso/package.nix             |  2 +-
 pkgs/by-name/ti/ticktick/package.nix              | 10 +++++-----
 pkgs/by-name/tt/ttaenc/package.nix                |  4 ++--
 pkgs/by-name/uf/ufetch/package.nix                |  4 ++--
 pkgs/by-name/un/untie/package.nix                 |  2 +-
 pkgs/by-name/wh/whatsie/package.nix               |  6 +++---
 pkgs/by-name/xe/xeus/package.nix                  |  2 +-
 pkgs/by-name/zc/zcfan/package.nix                 |  2 +-
 pkgs/by-name/zs/zsh-forgit/package.nix            |  2 +-
 45 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index a2cc041d0e07..f9d462b75d88 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm555 -t $out/bin b/*/7zz${stdenv.hostPlatform.extensions.executable}
-    install -Dm444 -t $out/share/doc/${finalAttrs.pname} ../../../../DOC/*.txt
+    install -Dm444 -t $out/share/doc/7zz ../../../../DOC/*.txt
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/as/as31/package.nix b/pkgs/by-name/as/as31/package.nix
index 5f3104b43907..847b89cd14a3 100644
--- a/pkgs/by-name/as/as31/package.nix
+++ b/pkgs/by-name/as/as31/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.3.1";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/a/as31/${finalAttrs.pname}_${finalAttrs.version}.orig.tar.gz";
+    url = "mirror://debian/pool/main/a/as31/as31_${finalAttrs.version}.orig.tar.gz";
     name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     hash = "sha256-zSEyWHFon5nyq717Mpmdv1XZ5Hz0e8ZABqsP8M83c1U=";
   };
diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index f969a14feaef..9d9c108fd2bf 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "9.20.9";
 
   src = fetchurl {
-    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
+    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
     hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";
   };
 
diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix
index 24e269a1e9fb..c1024bb275c7 100644
--- a/pkgs/by-name/co/coal/package.nix
+++ b/pkgs/by-name/co/coal/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   postFixup = ''
     moveToOutput share/ament_index "$dev"
-    moveToOutput share/${finalAttrs.pname} "$dev"
+    moveToOutput share/coal "$dev"
   '';
 
   meta = {
diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix
index 45923d8625f2..3a0709b507f5 100644
--- a/pkgs/by-name/da/davis/package.nix
+++ b/pkgs/by-name/da/davis/package.nix
@@ -21,9 +21,9 @@ php.buildComposerProject2 (finalAttrs: {
   postInstall = ''
     chmod -R u+w $out/share
     # Only include the files needed for runtime in the derivation
-    mv $out/share/php/${finalAttrs.pname}/{migrations,public,src,config,bin,templates,tests,translations,vendor,symfony.lock,composer.json,composer.lock} $out
+    mv $out/share/php/davis/{migrations,public,src,config,bin,templates,tests,translations,vendor,symfony.lock,composer.json,composer.lock} $out
     # Save the upstream .env file for reference, but rename it so it is not loaded
-    mv $out/share/php/${finalAttrs.pname}/.env $out/env-upstream
+    mv $out/share/php/davis/.env $out/env-upstream
     rm -rf "$out/share"
   '';
 
diff --git a/pkgs/by-name/di/dirdiff/package.nix b/pkgs/by-name/di/dirdiff/package.nix
index 518dd43baca5..25cb41a27c39 100644
--- a/pkgs/by-name/di/dirdiff/package.nix
+++ b/pkgs/by-name/di/dirdiff/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://samba/paulus/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    url = "mirror://samba/paulus/dirdiff-${finalAttrs.version}.tar.gz";
     hash = "sha256-yzc2VNV4gCeAQ1XjVd8GlYYsO/wfaj/GAUcisxVqklI=";
   };
 
diff --git a/pkgs/by-name/ef/efibooteditor/package.nix b/pkgs/by-name/ef/efibooteditor/package.nix
index b9e888948fb2..2273b584c6f5 100644
--- a/pkgs/by-name/ef/efibooteditor/package.nix
+++ b/pkgs/by-name/ef/efibooteditor/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [ "-DQT_VERSION_MAJOR=6" ];
 
   postInstall = ''
-    install -Dm644 $src/LICENSE.txt $out/share/licenses/${finalAttrs.pname}/LICENSE
+    install -Dm644 $src/LICENSE.txt $out/share/licenses/efibooteditor/LICENSE
   '';
 
   meta = {
diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix
index 29cee31c54b2..430220c06e65 100644
--- a/pkgs/by-name/ex/example-robot-data/package.nix
+++ b/pkgs/by-name/ex/example-robot-data/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   # The package expect to find an `example-robot-data/robots` folder somewhere
   # either in install prefix or in the sources
   # where it can find the meshes for unit tests
-  preCheck = "ln -s source ../../${finalAttrs.pname}";
+  preCheck = "ln -s source ../../example-robot-data";
   pythonImportsCheck = [ "example_robot_data" ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/fc/fcitx5-material-color/package.nix b/pkgs/by-name/fc/fcitx5-material-color/package.nix
index 8b5147df9b82..7b0273f56ad3 100644
--- a/pkgs/by-name/fc/fcitx5-material-color/package.nix
+++ b/pkgs/by-name/fc/fcitx5-material-color/package.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     # https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-material-color/-/blob/main/PKGBUILD?ref_type=heads#L16
-    install -Dm644 arrow.png radio.png -t $out/share/${finalAttrs.pname}/
+    install -Dm644 arrow.png radio.png -t $out/share/fcitx5-material-color/
     for _variant in black blue brown deepPurple indigo orange pink red sakuraPink teal; do
       _variant_name=Material-Color-$_variant
       install -dm755 $_variant_name $out/share/fcitx5/themes/$_variant_name
diff --git a/pkgs/by-name/fi/figma-linux/package.nix b/pkgs/by-name/fi/figma-linux/package.nix
index 39c7b8ca891f..927163c5dc86 100644
--- a/pkgs/by-name/fi/figma-linux/package.nix
+++ b/pkgs/by-name/fi/figma-linux/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace $out/share/applications/figma-linux.desktop \
-          --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${finalAttrs.pname}"
+          --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/figma-linux"
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/fm/fmi-reference-fmus/package.nix b/pkgs/by-name/fm/fmi-reference-fmus/package.nix
index e41e1223d8b9..5807260ebe1f 100644
--- a/pkgs/by-name/fm/fmi-reference-fmus/package.nix
+++ b/pkgs/by-name/fm/fmi-reference-fmus/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.0.38";
   src = fetchFromGitHub {
     owner = "modelica";
-    repo = finalAttrs.pname;
+    repo = "reference-fmus";
     rev = "v${finalAttrs.version}";
     hash = "sha256-FeDKYcm9K670q1FGqy41Tp2Ag8p2JidH4z78zpHOngw=";
   };
diff --git a/pkgs/by-name/ge/genesys/package.nix b/pkgs/by-name/ge/genesys/package.nix
index 117b986c4f75..026a261e58e6 100644
--- a/pkgs/by-name/ge/genesys/package.nix
+++ b/pkgs/by-name/ge/genesys/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p $out
     mv bin lib $out
-    wrapProgram $out/bin/${finalAttrs.pname} \
+    wrapProgram $out/bin/genesys \
       --set JAVA_HOME "${jre.home}" \
       --prefix PATH : "${graphviz}/bin"
 
diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix
index f88fb1f1dcc4..a932b1531d97 100644
--- a/pkgs/by-name/go/go-jsonnet/package.nix
+++ b/pkgs/by-name/go/go-jsonnet/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "google";
-    repo = finalAttrs.pname;
+    repo = "go-jsonnet";
     tag = "v${finalAttrs.version}";
     hash = "sha256-J92xNDpCidbiSsN6NveS6BX6Tx+qDQqkgm6pjk1wBTQ=";
   };
diff --git a/pkgs/by-name/ho/hottext/package.nix b/pkgs/by-name/ho/hottext/package.nix
index 7269f16a5ac2..91e38a608a31 100644
--- a/pkgs/by-name/ho/hottext/package.nix
+++ b/pkgs/by-name/ho/hottext/package.nix
@@ -24,9 +24,9 @@ buildNimPackage (finalAttrs: {
   desktopItem = makeDesktopItem {
     categories = [ "Utility" ];
     comment = finalAttrs.meta.description;
-    desktopName = finalAttrs.pname;
-    exec = finalAttrs.pname;
-    name = finalAttrs.pname;
+    desktopName = "hottext";
+    exec = "hottext";
+    name = "hottext";
   };
 
   postInstall = ''
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 20b894708736..778de36bbc44 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -135,10 +135,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -D usr/lib/x86_64-linux-gnu/ideamaker/ideamaker \
-      $out/bin/${finalAttrs.pname}
+      $out/bin/ideamaker
 
     patchelf --replace-needed libquazip.so.1 libquazip1-qt5.so \
-      $out/bin/${finalAttrs.pname}
+      $out/bin/ideamaker
 
     mimetypeDir=$out/share/icons/hicolor/128x128/mimetypes
     mkdir -p ''$mimetypeDir
@@ -146,10 +146,10 @@ stdenv.mkDerivation (finalAttrs: {
       mv $file ''$mimetypeDir/''$(basename ''${file%.ico}).png
     done
     install -D ${./mimetypes.xml} \
-      $out/share/mime/packages/${finalAttrs.pname}.xml
+      $out/share/mime/packages/ideamaker.xml
 
     install -D usr/share/ideamaker/icons/ideamaker-icon.png \
-      $out/share/pixmaps/${finalAttrs.pname}.png
+      $out/share/pixmaps/ideamaker.png
 
     ln -s ${finalAttrs.desktopItem}/share/applications $out/share/
 
@@ -157,9 +157,9 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   desktopItem = makeDesktopItem {
-    name = finalAttrs.pname;
-    exec = finalAttrs.pname;
-    icon = finalAttrs.pname;
+    name = "ideamaker";
+    exec = "ideamaker";
+    icon = "ideamaker";
     desktopName = "Ideamaker";
     comment = "ideaMaker - www.raise3d.com";
     categories = [
diff --git a/pkgs/by-name/id/idnkit/package.nix b/pkgs/by-name/id/idnkit/package.nix
index 9f118fad71bb..23a0fb326fa5 100644
--- a/pkgs/by-name/id/idnkit/package.nix
+++ b/pkgs/by-name/id/idnkit/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.3";
 
   src = fetchurl {
-    url = "https://jprs.co.jp/idn/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
+    url = "https://jprs.co.jp/idn/idnkit-${finalAttrs.version}.tar.bz2";
     hash = "sha256-JtBxF2UAQqtGk/DgCWAnXVihvnc+bRPFA7o4RxDz6X4=";
   };
 
diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index c5aeda60c640..998dcc91ebc1 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -44,8 +44,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   desktopItems = [
     (makeDesktopItem {
-      name = finalAttrs.pname;
-      exec = finalAttrs.pname;
+      name = "irpf";
+      exec = "irpf";
       icon = "rfb64";
       desktopName = "Imposto de Renda Pessoa Física";
       comment = "Programa Oficial da Receita para elaboração do IRPF";
@@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    BASEDIR="$out/share/${finalAttrs.pname}"
+    BASEDIR="$out/share/irpf"
     mkdir -p "$BASEDIR"
 
     cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR"
@@ -64,10 +64,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"
 
     # make xdg-open overrideable at runtime
-    makeWrapper ${jdk11}/bin/java $out/bin/${finalAttrs.pname} \
+    makeWrapper ${jdk11}/bin/java $out/bin/irpf \
       --add-flags "-Dawt.useSystemAAFontSettings=on" \
       --add-flags "-Dswing.aatext=true" \
-      --add-flags "-jar $BASEDIR/${finalAttrs.pname}.jar" \
+      --add-flags "-jar $BASEDIR/irpf.jar" \
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
       --set _JAVA_AWT_WM_NONREPARENTING 1 \
       --set AWT_TOOLKIT MToolkit
diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix
index e7bfa51c4923..9c326f991c96 100644
--- a/pkgs/by-name/ke/keepass/package.nix
+++ b/pkgs/by-name/ke/keepass/package.nix
@@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    target="$out/lib/dotnet/${finalAttrs.pname}"
+    target="$out/lib/dotnet/keepass"
     mkdir -p "$target"
 
     cp -rv $outputFiles "$target"
diff --git a/pkgs/by-name/li/libconfig/package.nix b/pkgs/by-name/li/libconfig/package.nix
index 97a81eb7456b..0da2905d7725 100644
--- a/pkgs/by-name/li/libconfig/package.nix
+++ b/pkgs/by-name/li/libconfig/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.8";
 
   src = fetchurl {
-    url = "https://hyperrealm.github.io/${finalAttrs.pname}/dist/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    url = "https://hyperrealm.github.io/libconfig/dist/libconfig-${finalAttrs.version}.tar.gz";
     hash = "sha256-BR4V3Q6QfESQXzF5M/VIcxTypW6MZybIMEzpkIhIUKo=";
   };
 
diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index 51843cfc6ac1..54eb8db1f7dc 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -154,7 +154,7 @@ php.buildComposerProject2 (finalAttrs: {
     mkdir -p $out/bin
     cat << EOF > $out/bin/movim
     #!${lib.getExe dash}
-    ${lib.getExe finalAttrs.php} $out/share/php/${finalAttrs.pname}/daemon.php "\$@"
+    ${lib.getExe finalAttrs.php} $out/share/php/movim/daemon.php "\$@"
     EOF
     chmod +x $out/bin/movim
 
diff --git a/pkgs/by-name/my/mya/package.nix b/pkgs/by-name/my/mya/package.nix
index 0a6100663841..8b34114af33a 100644
--- a/pkgs/by-name/my/mya/package.nix
+++ b/pkgs/by-name/my/mya/package.nix
@@ -44,9 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     # Based on the upstream PKGBUILD
-    mkdir -p $out/share/doc/${finalAttrs.pname}
+    mkdir -p $out/share/doc/mya
     cp -a bin $out
-    cp $cmakeDir/README.md $out/share/doc/${finalAttrs.pname}
+    cp $cmakeDir/README.md $out/share/doc/mya
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix
index a58e521737db..c12f445798ec 100644
--- a/pkgs/by-name/ne/netgen/package.nix
+++ b/pkgs/by-name/ne/netgen/package.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "NETGEN_VERSION_GIT" "v${finalAttrs.version}-0")
     (lib.cmakeFeature "NG_INSTALL_DIR_BIN" "bin")
     (lib.cmakeFeature "NG_INSTALL_DIR_LIB" "lib")
-    (lib.cmakeFeature "NG_INSTALL_DIR_CMAKE" "lib/cmake/${finalAttrs.pname}")
+    (lib.cmakeFeature "NG_INSTALL_DIR_CMAKE" "lib/cmake/netgen")
     (lib.cmakeFeature "NG_INSTALL_DIR_PYTHON" python3Packages.python.sitePackages)
     (lib.cmakeFeature "NG_INSTALL_DIR_RES" "share")
     (lib.cmakeFeature "NG_INSTALL_DIR_INCLUDE" "include")
@@ -160,11 +160,11 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       rm $out/bin/{Netgen1,startup.sh}
-      mkdir -p $out/Applications/${finalAttrs.pname}.app/Contents/{MacOS,Resouces}
+      mkdir -p $out/Applications/netgen.app/Contents/{MacOS,Resouces}
       substituteInPlace $out/Info.plist --replace-fail "Netgen1" "netgen"
-      mv $out/Info.plist $out/Applications/${finalAttrs.pname}.app/Contents
-      mv $out/Netgen.icns $out/Applications/${finalAttrs.pname}.app/Contents/Resouces
-      ln -s $out/bin/netgen $out/Applications/${finalAttrs.pname}.app/Contents/MacOS/netgen
+      mv $out/Info.plist $out/Applications/netgen.app/Contents
+      mv $out/Netgen.icns $out/Applications/netgen.app/Contents/Resouces
+      ln -s $out/bin/netgen $out/Applications/netgen.app/Contents/MacOS/netgen
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
       # Extract pngs from the Apple icon image and create
diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix
index 1b0de871f1d0..2f8f4f2a2a43 100644
--- a/pkgs/by-name/oa/oakctl/package.nix
+++ b/pkgs/by-name/oa/oakctl/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/bin
-    install -D -m 0755 $src $out/bin/${finalAttrs.pname}
+    install -D -m 0755 $src $out/bin/oakctl
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix
index a8441efb34eb..73a127dc1d1c 100644
--- a/pkgs/by-name/oc/ocelot-desktop/package.nix
+++ b/pkgs/by-name/oc/ocelot-desktop/package.nix
@@ -77,14 +77,14 @@ stdenv.mkDerivation (finalAttrs: {
     ''
       runHook preInstall
 
-      mkdir -p $out/{bin,share/${finalAttrs.pname}}
-      install -Dm644 ${finalAttrs.src} $out/share/${finalAttrs.pname}/ocelot-desktop.jar
+      mkdir -p $out/{bin,share/ocelot-desktop}
+      install -Dm644 ${finalAttrs.src} $out/share/ocelot-desktop/ocelot-desktop.jar
 
       makeBinaryWrapper ${jre}/bin/java $out/bin/ocelot-desktop \
         --set JAVA_HOME ${jre.home} \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \
         --prefix PATH : "${lib.makeBinPath runtimePrograms}" \
-        --add-flags "-jar $out/share/${finalAttrs.pname}/ocelot-desktop.jar"
+        --add-flags "-jar $out/share/ocelot-desktop/ocelot-desktop.jar"
 
       # copy icons from zip file
       # ocelot/desktop/images/icon*.png
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       for size in 16 32 64 128 256; do
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        unzip -p $out/share/${finalAttrs.pname}/ocelot-desktop.jar \
+        unzip -p $out/share/ocelot-desktop/ocelot-desktop.jar \
           ocelot/desktop/images/icon"$size".png > $out/share/icons/hicolor/"$size"x"$size"/apps/ocelot-desktop.png
       done
 
diff --git a/pkgs/by-name/pa/payload_dumper/package.nix b/pkgs/by-name/pa/payload_dumper/package.nix
index 6f971ded3d4a..cb36c4cf1a68 100644
--- a/pkgs/by-name/pa/payload_dumper/package.nix
+++ b/pkgs/by-name/pa/payload_dumper/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    sitePackages=$out/${python3.sitePackages}/${finalAttrs.pname}
+    sitePackages=$out/${python3.sitePackages}/payload_dumper
 
     install -D ./payload_dumper.py $out/bin/payload_dumper
     install -D ./update_metadata_pb2.py $sitePackages/update_metadata_pb2.py
diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix
index e870fbe3d3f3..36a4c1a142b4 100644
--- a/pkgs/by-name/pi/picolibc/package.nix
+++ b/pkgs/by-name/pi/picolibc/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "picolibc";
-    repo = finalAttrs.pname;
+    repo = "picolibc";
     tag = finalAttrs.version;
     hash = "sha256-djOZKkinsaaYD4tUEA6mKdo+5em0GP1/+rI0mIm7Vs8=";
   };
diff --git a/pkgs/by-name/pi/pixelfed/package.nix b/pkgs/by-name/pi/pixelfed/package.nix
index 60417f781a4a..4ccf2885abaa 100644
--- a/pkgs/by-name/pi/pixelfed/package.nix
+++ b/pkgs/by-name/pi/pixelfed/package.nix
@@ -23,7 +23,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   postInstall = ''
     chmod -R u+w $out/share
-    mv "$out/share/php/${finalAttrs.pname}"/* $out
+    mv "$out/share/php/pixelfed"/* $out
     rm -R $out/bootstrap/cache
     # Move static contents for the NixOS module to pick it up, if needed.
     mv $out/bootstrap $out/bootstrap-static
diff --git a/pkgs/by-name/sc/scmutils/package.nix b/pkgs/by-name/sc/scmutils/package.nix
index 2b9c56b56027..8a8f8e9f1aa9 100644
--- a/pkgs/by-name/sc/scmutils/package.nix
+++ b/pkgs/by-name/sc/scmutils/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "20230902";
 
   src = fetchurl {
-    url = "https://groups.csail.mit.edu/mac/users/gjs/6946/mechanics-system-installation/native-code/${finalAttrs.pname}-src-${finalAttrs.version}.tar.gz";
+    url = "https://groups.csail.mit.edu/mac/users/gjs/6946/mechanics-system-installation/native-code/scmutils-src-${finalAttrs.version}.tar.gz";
     hash = "sha256-9/shOxoKwJ4uDTHmvXqhemgy3W+GUCmoqFm5e1t3W0M=";
   };
 
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index 77fdf7877922..9baa9309c3eb 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -106,9 +106,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm755 snes9x -t "$out/bin/"
-    install -Dm644 snes9x.conf.default -t "$out/share/doc/${finalAttrs.pname}/"
+    install -Dm644 snes9x.conf.default -t "$out/share/doc/snes9x/"
     install -Dm644 ../docs/{control-inputs,controls,snapshots}.txt -t \
-      "$out/share/doc/${finalAttrs.pname}/"
+      "$out/share/doc/snes9x/"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/sr/srb2/package.nix b/pkgs/by-name/sr/srb2/package.nix
index 208abc217571..70b606d782c9 100644
--- a/pkgs/by-name/sr/srb2/package.nix
+++ b/pkgs/by-name/sr/srb2/package.nix
@@ -90,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
   desktopItems = [
     (makeDesktopItem rec {
       name = "Sonic Robo Blast 2";
-      exec = finalAttrs.pname;
-      icon = finalAttrs.pname;
+      exec = "srb2";
+      icon = "srb2";
       comment = finalAttrs.meta.description;
       desktopName = name;
       genericName = name;
diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix
index 72d9c153de33..27241ec8e3c6 100644
--- a/pkgs/by-name/sr/srb2kart/package.nix
+++ b/pkgs/by-name/sr/srb2kart/package.nix
@@ -73,8 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
   desktopItems = [
     (makeDesktopItem rec {
       name = "Sonic Robo Blast 2 Kart";
-      exec = finalAttrs.pname;
-      icon = finalAttrs.pname;
+      exec = "srb2kart";
+      icon = "srb2kart";
       comment = "Kart racing mod based on SRB2";
       desktopName = name;
       genericName = name;
diff --git a/pkgs/by-name/st/stardust/package.nix b/pkgs/by-name/st/stardust/package.nix
index 530c4a93c7d8..6e0a0cbd493e 100644
--- a/pkgs/by-name/st/stardust/package.nix
+++ b/pkgs/by-name/st/stardust/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.1.13";
 
   src = fetchurl {
-    url = "http://iwar.free.fr/spip/IMG/gz/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    url = "http://iwar.free.fr/spip/IMG/gz/stardust-${finalAttrs.version}.tar.gz";
     hash = "sha256-t5cykB5zHYYj4tlk9QDhL7YQVgEScBZw9OIVXz5NOqc=";
   };
 
diff --git a/pkgs/by-name/st/stegsolve/package.nix b/pkgs/by-name/st/stegsolve/package.nix
index 33c186837a95..7d24479d9256 100644
--- a/pkgs/by-name/st/stegsolve/package.nix
+++ b/pkgs/by-name/st/stegsolve/package.nix
@@ -23,10 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   desktopItems = [
     (makeDesktopItem {
       type = "Application";
-      name = finalAttrs.pname;
+      name = "stegsolve";
       desktopName = "Stegsolve";
       comment = "A steganographic image analyzer, solver and data extractor for challanges";
-      exec = finalAttrs.pname;
+      exec = "stegsolve";
       categories = [ "Graphics" ];
     })
   ];
diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix
index 684cf57eadc2..39b1d6abdd0a 100644
--- a/pkgs/by-name/st/stretchly/package.nix
+++ b/pkgs/by-name/st/stretchly/package.nix
@@ -27,21 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin $out/share/${finalAttrs.pname}/
-    mv resources/app.asar* $out/share/${finalAttrs.pname}/
+    mkdir -p $out/bin $out/share/stretchly/
+    mv resources/app.asar* $out/share/stretchly/
 
     mkdir -p $out/share/applications
     ln -s ${finalAttrs.desktopItem}/share/applications/* $out/share/applications/
 
-    makeWrapper ${electron}/bin/electron $out/bin/${finalAttrs.pname} \
-      --add-flags $out/share/${finalAttrs.pname}/app.asar
+    makeWrapper ${electron}/bin/electron $out/bin/stretchly \
+      --add-flags $out/share/stretchly/app.asar
 
     runHook postInstall
   '';
 
   desktopItem = makeDesktopItem {
-    name = finalAttrs.pname;
-    exec = finalAttrs.pname;
+    name = "stretchly";
+    exec = "stretchly";
     icon = finalAttrs.icon;
     desktopName = "Stretchly";
     genericName = "Stretchly";
diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix
index 2f52bc167ea8..7de32eea7929 100644
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@@ -51,10 +51,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,lib/${finalAttrs.pname}}
-    mv {dist,node_modules} $out/lib/${finalAttrs.pname}
-    chmod a+x $out/lib/${finalAttrs.pname}/dist/index.js
-    ln -s $out/lib/${finalAttrs.pname}/dist/index.js $out/bin/stylelint-lsp
+    mkdir -p $out/{bin,lib/stylelint-lsp}
+    mv {dist,node_modules} $out/lib/stylelint-lsp
+    chmod a+x $out/lib/stylelint-lsp/dist/index.js
+    ln -s $out/lib/stylelint-lsp/dist/index.js $out/bin/stylelint-lsp
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/st/styluslabs-write/package.nix b/pkgs/by-name/st/styluslabs-write/package.nix
index 2da1066ae975..be176963d0bc 100644
--- a/pkgs/by-name/st/styluslabs-write/package.nix
+++ b/pkgs/by-name/st/styluslabs-write/package.nix
@@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
 
     for i in 16 24 48 64 96 128 256 512; do
       mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
-      magick scribbleres/write_512.png -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${finalAttrs.pname}.png
+      magick scribbleres/write_512.png -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/styluslabs-write.png
     done
 
     install -Dm444 scribbleres/linux/Write.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/Write.desktop \
         --replace-fail 'Exec=/opt/Write/Write' 'Exec=Write' \
-        --replace-fail 'Icon=Write144x144' 'Icon=${finalAttrs.pname}'
+        --replace-fail 'Icon=Write144x144' 'Icon=styluslabs-write'
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix
index ab4c11d7e980..7e65525348fb 100644
--- a/pkgs/by-name/te/texpresso/package.nix
+++ b/pkgs/by-name/te/texpresso/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dm0755 -t "$out/bin/" "build/${finalAttrs.pname}"
+    install -Dm0755 -t "$out/bin/" "build/texpresso"
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ti/ticktick/package.nix b/pkgs/by-name/ti/ticktick/package.nix
index fd3e9f34b65d..488a5adcc2d5 100644
--- a/pkgs/by-name/ti/ticktick/package.nix
+++ b/pkgs/by-name/ti/ticktick/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   unpackPhase = ''
     runHook preUnpack
 
-    mkdir -p "$out/share" "$out/opt/${finalAttrs.pname}" "$out/bin"
+    mkdir -p "$out/share" "$out/opt/ticktick" "$out/bin"
     dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out"
 
     runHook postUnpack
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    cp -av $out/opt/TickTick/* $out/opt/${finalAttrs.pname}
+    cp -av $out/opt/TickTick/* $out/opt/ticktick
     cp -av $out/usr/share/* $out/share
     rm -rf $out/usr $out/opt/TickTick
-    ln -sf "$out/opt/${finalAttrs.pname}/${finalAttrs.pname}" "$out/bin/${finalAttrs.pname}"
+    ln -sf "$out/opt/ticktick/ticktick" "$out/bin/ticktick"
 
-    substituteInPlace "$out/share/applications/${finalAttrs.pname}.desktop" \
-      --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/${finalAttrs.pname}"
+    substituteInPlace "$out/share/applications/ticktick.desktop" \
+      --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/ticktick"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/tt/ttaenc/package.nix b/pkgs/by-name/tt/ttaenc/package.nix
index 51fc8e26593e..0365544602f5 100644
--- a/pkgs/by-name/tt/ttaenc/package.nix
+++ b/pkgs/by-name/tt/ttaenc/package.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # Copy docs
-    install -dm755 "$out/share/doc/${finalAttrs.pname}"
-    install -m644 "ChangeLog-${finalAttrs.version}" README "$out/share/doc/${finalAttrs.pname}"
+    install -dm755 "$out/share/doc/ttaenc"
+    install -m644 "ChangeLog-${finalAttrs.version}" README "$out/share/doc/ttaenc"
   '';
 
   meta = {
diff --git a/pkgs/by-name/uf/ufetch/package.nix b/pkgs/by-name/uf/ufetch/package.nix
index 7241450b9cc4..3f2543d53263 100644
--- a/pkgs/by-name/uf/ufetch/package.nix
+++ b/pkgs/by-name/uf/ufetch/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/bin $out/share/licenses/${finalAttrs.pname}
+    mkdir -p $out/bin $out/share/licenses/ufetch
     ${
       if !full then
         "install -Dm755 ufetch-${osName} $out/bin/ufetch"
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           ln -s $out/bin/ufetch-${osName} $out/bin/ufetch
         ''
     }
-    install -Dm644 LICENSE $out/share/licenses/${finalAttrs.pname}/LICENSE
+    install -Dm644 LICENSE $out/share/licenses/ufetch/LICENSE
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/un/untie/package.nix b/pkgs/by-name/un/untie/package.nix
index 8ef7c90e5e3e..238c894ec6d0 100644
--- a/pkgs/by-name/un/untie/package.nix
+++ b/pkgs/by-name/un/untie/package.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "untie";
   version = "0.3";
   src = fetchurl {
-    url = "http://guichaz.free.fr/untie/files/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
+    url = "http://guichaz.free.fr/untie/files/untie-${finalAttrs.version}.tar.bz2";
     sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
   };
 
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index 7c1b5cd6c95d..a03610ff5c6e 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   desktopItems = [
     (makeDesktopItem {
-      name = finalAttrs.pname;
+      name = "whatsie";
       desktopName = "Whatsie";
-      icon = finalAttrs.pname;
-      exec = finalAttrs.pname;
+      icon = "whatsie";
+      exec = "whatsie";
       comment = finalAttrs.meta.description;
     })
   ];
diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix
index cafcbac3a7ae..9e9476ca8f25 100644
--- a/pkgs/by-name/xe/xeus/package.nix
+++ b/pkgs/by-name/xe/xeus/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
-    repo = finalAttrs.pname;
+    repo = "xeus";
     tag = finalAttrs.version;
     hash = "sha256-nR247SGnc3TSj6PCrJmY6ccACvYKeSYFMgoawyYLBNs=";
   };
diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix
index d661199e9a8f..3468ac8b399c 100644
--- a/pkgs/by-name/zc/zcfan/package.nix
+++ b/pkgs/by-name/zc/zcfan/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   installCheckPhase = ''
     runHook preInstallCheck
 
-    $out/bin/${finalAttrs.pname} -h
+    $out/bin/zcfan -h
 
     runHook postInstallCheck
   '';
diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index 646708ebdf1b..df964328188a 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     install -D bin/git-forgit $out/bin/git-forgit
     install -D completions/_git-forgit $out/share/zsh/site-functions/_git-forgit
-    install -D forgit.plugin.zsh $out/share/zsh/${finalAttrs.pname}/forgit.plugin.zsh
+    install -D forgit.plugin.zsh $out/share/zsh/zsh-forgit/forgit.plugin.zsh
     wrapProgram $out/bin/git-forgit \
       --prefix PATH : ${
         lib.makeBinPath [

From 13ad1dc3dbc519424b78342f8ca110b39b110bdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 04:18:02 +0000
Subject: [PATCH 0450/1497] terraform-providers.aws: 5.98.0 -> 5.99.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..6066cee25d73 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -126,13 +126,13 @@
     "vendorHash": null
   },
   "aws": {
-    "hash": "sha256-gBVJx6rk7rjrvyLaDJrHUmLRUbvgy60c/uQwsFXuQzA=",
+    "hash": "sha256-asrIQrhSSHjuOBFomgq9lbHc8rmkcy3OjJ5ig9I7XbU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v5.98.0",
+    "rev": "v5.99.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OxyOD/um7hOpYpsZCyNnbdvo5K/r/L7JlWvXQBncIDw="
+    "vendorHash": "sha256-low0aq3i3pmqbadYg1VZra+ZzoV6nqyGutf8xzaces0="
   },
   "azuread": {
     "hash": "sha256-lNjU/206yS+smSe1SYlz0TOqHRlvSQKqhJ67fswNlIQ=",

From 1fa4b8f503fcc4a15e795b43b1af11e4a794b405 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 04:28:41 +0000
Subject: [PATCH 0451/1497] python3Packages.command-runner: 1.7.3 -> 1.7.4

---
 pkgs/development/python-modules/command-runner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix
index 6506e68ccf31..fa1faf8da38a 100644
--- a/pkgs/development/python-modules/command-runner/default.nix
+++ b/pkgs/development/python-modules/command-runner/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "command-runner";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "netinvent";
     repo = "command_runner";
     tag = "v${version}";
-    hash = "sha256-BNjMMs44eDnGmcFXiMydJIU0RpsFOyd2TjH7BOGQP2E=";
+    hash = "sha256-i5VWoXHCdZtf4tJGgYvBqcMaBSSruCOkIl5ntZoSHio=";
   };
 
   build-system = [ setuptools ];

From 692cd46b8aea1a472d0b655767e7779cbef0c496 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 04:34:28 +0000
Subject: [PATCH 0452/1497] python3Packages.imeon-inverter-api: 0.3.13 ->
 0.3.14

---
 .../development/python-modules/imeon-inverter-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imeon-inverter-api/default.nix b/pkgs/development/python-modules/imeon-inverter-api/default.nix
index 47139fd28aec..be30b1c7fd05 100644
--- a/pkgs/development/python-modules/imeon-inverter-api/default.nix
+++ b/pkgs/development/python-modules/imeon-inverter-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "imeon-inverter-api";
-  version = "0.3.13";
+  version = "0.3.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Imeon-Inverters-for-Home-Assistant";
     repo = "inverter-api";
     tag = version;
-    hash = "sha256-1ovmIG20AcUzyesXT5HC6oPEKofpH2B+AEfmKQnNQ8c=";
+    hash = "sha256-zjG9rcKdV+o5M3yIRaxz93sP3u4Vfs8JhSSYzKdQi2I=";
   };
 
   build-system = [ pdm-pep517 ];

From f82ace024edec54e4cce02917fdeaba8441437b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 04:34:32 +0000
Subject: [PATCH 0453/1497] python3Packages.mkdocs-rss-plugin: 1.17.1 -> 1.17.3

---
 pkgs/development/python-modules/mkdocs-rss-plugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
index d21f09234b2e..a85dab5d93e3 100644
--- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-rss-plugin";
-  version = "1.17.1";
+  version = "1.17.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Guts";
     repo = "mkdocs-rss-plugin";
     tag = version;
-    hash = "sha256-Qa8EgjucJaxvKivE45kXSUgTx5RnLEpYCNZJRTO2E1Q=";
+    hash = "sha256-wgR0uwme7fXNZHx7xdm0HNfXG6qT4qpTJgR2SaXDel4=";
   };
 
   build-system = [ setuptools ];

From b7f032c04c1b9a72eabea37457cfaf34bfa09940 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:06 +0200
Subject: [PATCH 0454/1497] audio-sharing: inherit pname+version

---
 pkgs/by-name/au/audio-sharing/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix
index 3f4fe10a07dd..56ae0176498d 100644
--- a/pkgs/by-name/au/audio-sharing/package.nix
+++ b/pkgs/by-name/au/audio-sharing/package.nix
@@ -33,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-ePgEAVYXLOHWQXG92Grb9nmenyGj0JkgVy1UDsQF0xw=";
   };
 

From 9797f62b35b97f72d87d36d3b88d61d5c94577ee Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:06 +0200
Subject: [PATCH 0455/1497] fretboard: inherit pname+version

---
 pkgs/by-name/fr/fretboard/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix
index af726ce4f0c9..115e311419e8 100644
--- a/pkgs/by-name/fr/fretboard/package.nix
+++ b/pkgs/by-name/fr/fretboard/package.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    src = finalAttrs.src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-Gl78z9FR/sB14uFDLKgnfN4B5yOi6A6MH64gDXcLiWA=";
   };
 

From 2199079b1002a1f56656fc741d78f09f7812f61c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:06 +0200
Subject: [PATCH 0456/1497] furtherance: inherit pname+version

---
 pkgs/by-name/fu/furtherance/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix
index a9445a231233..eb23c4dc3bb2 100644
--- a/pkgs/by-name/fu/furtherance/package.nix
+++ b/pkgs/by-name/fu/furtherance/package.nix
@@ -30,8 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4=";
   };
 

From 4b1f1be69a7782e22e4033330ef247077c1e7956 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:06 +0200
Subject: [PATCH 0457/1497] gnome-obfuscate: inherit pname+version

---
 pkgs/by-name/gn/gnome-obfuscate/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-obfuscate/package.nix b/pkgs/by-name/gn/gnome-obfuscate/package.nix
index a36d7c8ad0d5..bd6fc1ec670d 100644
--- a/pkgs/by-name/gn/gnome-obfuscate/package.nix
+++ b/pkgs/by-name/gn/gnome-obfuscate/package.nix
@@ -33,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-Llgn+dYNKZ9Mles9f9Xor+GZoCCQ0cERkXz4MicZglY=";
   };
 

From b2568b752824ab9e3c032cb8d70e249add212161 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:07 +0200
Subject: [PATCH 0458/1497] lorem: inherit pname+version

---
 pkgs/by-name/lo/lorem/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix
index 8c8eafcdb15b..0b8c024946a0 100644
--- a/pkgs/by-name/lo/lorem/package.nix
+++ b/pkgs/by-name/lo/lorem/package.nix
@@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    src = finalAttrs.src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-4JYYcfsEoCGJWZCp0273gXrf8hfuHL/QSsLEHvNa4uA=";
   };
 

From 30f4d61c71cc37b81e43f73b68921396e5ec02a8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 07:01:07 +0200
Subject: [PATCH 0459/1497] rustls-ffi: inherit pname+version

---
 pkgs/by-name/ru/rustls-ffi/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix
index 11dca679d168..d86c53fd8441 100644
--- a/pkgs/by-name/ru/rustls-ffi/package.nix
+++ b/pkgs/by-name/ru/rustls-ffi/package.nix
@@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    src = finalAttrs.src;
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
+    inherit (finalAttrs) pname version src;
     hash = "sha256-gqc6en59QQpD14hOgRuGEPWLvrkyGn9tPR9vQmRAxIg=";
   };
 

From 8f2f709eae88340c6098848c26900f3d849180ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 05:01:48 +0000
Subject: [PATCH 0460/1497] protolint: 0.55.5 -> 0.55.6

---
 pkgs/by-name/pr/protolint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protolint/package.nix b/pkgs/by-name/pr/protolint/package.nix
index 5fbfce23b211..cc2eb70c91cb 100644
--- a/pkgs/by-name/pr/protolint/package.nix
+++ b/pkgs/by-name/pr/protolint/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "protolint";
-  version = "0.55.5";
+  version = "0.55.6";
 
   src = fetchFromGitHub {
     owner = "yoheimuta";
     repo = "protolint";
     rev = "v${version}";
-    hash = "sha256-uim4M1C51VVCOhcE/dyCLzx/Bks0h50+haw5mbAfiN8=";
+    hash = "sha256-RTej9zVQz6GESAoAAChidiolGEoHabUYlEZSV2gc8KQ=";
   };
 
-  vendorHash = "sha256-Zt1HbmdUpQmmK+404tfSs6qfZxZEqHIgQBoN63Els3M=";
+  vendorHash = "sha256-RS0t7n6pLYVKHluQtXsMjYL1SvN7IZFdKmkxOI8wFoE=";
 
   # Something about the way we run tests causes issues. It doesn't happen
   # when using "go test" directly:

From 628ef0435f6f47052773b7839b543061283cc246 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 05:21:32 +0000
Subject: [PATCH 0461/1497] python3Packages.ghome-foyer-api: 1.1.1 -> 1.2.2

---
 pkgs/development/python-modules/ghome-foyer-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ghome-foyer-api/default.nix b/pkgs/development/python-modules/ghome-foyer-api/default.nix
index 4025dd890f2a..34dbac9c9b0b 100644
--- a/pkgs/development/python-modules/ghome-foyer-api/default.nix
+++ b/pkgs/development/python-modules/ghome-foyer-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ghome-foyer-api";
-  version = "1.1.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "KapJI";
     repo = "ghome-foyer-api";
     tag = "v${version}";
-    hash = "sha256-sup+j9GFGTR+HimpkpvvAqtgYWtJt2qCPZzLvMG8hzI=";
+    hash = "sha256-Y8TfQ0cvmKyLw0UOoLbkXk2vSj+Qb11fCVfNrC1iYao=";
   };
 
   buildInputs = [
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Generated Python protobuf stubs for Google Home internal API";
     homepage = "https://github.com/KapJI/ghome-foyer-api";
-    changelog = "https://github.com/KapJI/ghome-foyer-api/releases/tag/v${version}";
+    changelog = "https://github.com/KapJI/ghome-foyer-api/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       hensoko

From 122c35d8d1930342495bfdd399be5aa19e6d367a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 05:28:14 +0000
Subject: [PATCH 0462/1497] vimPlugins.sonarlint-nvim: 0-unstable-2025-05-16 ->
 0-unstable-2025-05-30

---
 .../vim/plugins/non-generated/sonarlint-nvim/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
index d29421a04fc5..1fcb457e08c3 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "sonarlint.nvim";
-  version = "0-unstable-2025-05-16";
+  version = "0-unstable-2025-05-30";
 
   src = fetchFromGitLab {
     owner = "schrieveslaach";
     repo = "sonarlint.nvim";
-    rev = "2aa7a9fd9d8022d1c8d472fb63ce62e021d70130";
-    hash = "sha256-RfQthodqF6r24I6EJxlewjYiX3jLAIb/RMAOVnWs73s=";
+    rev = "060df51352f9fb876d4ff43b8cd4b669a6bdfd89";
+    hash = "sha256-2MAi0nZIvAly+5p5fWKMi3tGSzMJgMnAzWnsr0rt+NM=";
   };
 
   passthru.updateScript = nix-update-script {

From a5eecde98db9fc944c2493b823f3188189d2ac9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 05:52:38 +0000
Subject: [PATCH 0463/1497] tasks: 0.1.1 -> 0.2.0

---
 pkgs/by-name/ta/tasks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix
index 67a3478818c2..b342d0e908a5 100644
--- a/pkgs/by-name/ta/tasks/package.nix
+++ b/pkgs/by-name/ta/tasks/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tasks";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "tasks";
     tag = version;
-    hash = "sha256-OKXkAJ+TyMnTzvlUPwPU2MWgCTIN3cDiPcVPOzU4WEg=";
+    hash = "sha256-R8wXIw9Gn4uyLoXxyjp/bcK8vK7NkG/chcHe8LtTvo8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3SbqKB9DI1Bl8u8rrAPCO/sPKMByYhQ3YT63K5BDVvE=";
+  cargoHash = "sha256-iJutA18TvsWJceacfhzfEQa5zaQBMVC7fmtF1uPN3sQ=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From 5b264d69f77096f9ca190b0951bab636deb0bda2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 05:54:37 +0000
Subject: [PATCH 0464/1497] python3Packages.managesieve: 0.8 -> 0.8.1

---
 pkgs/development/python-modules/managesieve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix
index 0fbe90880551..a00f5f207db0 100644
--- a/pkgs/development/python-modules/managesieve/default.nix
+++ b/pkgs/development/python-modules/managesieve/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "managesieve";
-  version = "0.8";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2CCb6h69H58YT1byj/fkrfzGsMUbr0GHpJLcMpsSE/M=";
+    hash = "sha256-LVwe0Pn6YPIAuoIaxXMfvCbOfS4NAjozkrdMNZDq+uU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From eea8fa322e20cde868f7f24fd415338cf64b66b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 06:01:06 +0000
Subject: [PATCH 0465/1497] qmk: 1.1.7 -> 1.1.8

---
 pkgs/by-name/qm/qmk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix
index 4d5d40f34469..91c5cdc262d6 100644
--- a/pkgs/by-name/qm/qmk/package.nix
+++ b/pkgs/by-name/qm/qmk/package.nix
@@ -15,12 +15,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "qmk";
-  version = "1.1.7";
+  version = "1.1.8";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4Qhzsa5GAAeSgt7FZsRWIVO1ZB+010WtBv9SV38Xgto=";
+    hash = "sha256-C0Jra/IK61tngGsuEnMD4mySRc/iZVgdYEbMXtwpBZ0=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 0647fe593ef8f21a8dc192e561ce57221133fb3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 06:23:18 +0000
Subject: [PATCH 0466/1497] terraform-providers.tfe: 0.65.2 -> 0.66.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..c66a312cfade 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1336,13 +1336,13 @@
     "vendorHash": null
   },
   "tfe": {
-    "hash": "sha256-hMpCuLAnwwAb8ugKxKDuFvtII2k/lcwYYL0sCvZewOY=",
+    "hash": "sha256-w66HR1X/EUloz3W/6aBNvTsC5vWuAZytd2ej7DHVMU0=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.65.2",
+    "rev": "v0.66.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-PSUob2u8hue5ii+kV4bGcvexkIQxzWsHbbEbYO0celU="
+    "vendorHash": "sha256-z1gbeYR+UFl+sBgehLgBITc9VwxEV6bRpN9A/4Fp7Oc="
   },
   "thunder": {
     "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",

From 32c5ca69727dbb974136975ff508ad1e5eb11394 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Mon, 2 Jun 2025 12:11:44 +0530
Subject: [PATCH 0467/1497] pykickstart: fix broken changelog link

---
 pkgs/by-name/py/pykickstart/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/py/pykickstart/package.nix b/pkgs/by-name/py/pykickstart/package.nix
index 3d93456d6146..3afdc6aadf71 100644
--- a/pkgs/by-name/py/pykickstart/package.nix
+++ b/pkgs/by-name/py/pykickstart/package.nix
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Python package to interact with Kickstart files commonly found in the RPM world";
     homepage = "https://github.com/pykickstart/pykickstart";
-    changelog = "https://github.com/pykickstart/pykickstart/releases/tag/r${src.tag}";
+    changelog = "https://github.com/pykickstart/pykickstart/releases/tag/${src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       thefossguy

From 2cac66e0898db1a7c229cdbfda6c845565ba1904 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 06:43:47 +0000
Subject: [PATCH 0468/1497] sigil: 2.4.2 -> 2.5.1

---
 pkgs/by-name/si/sigil/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix
index 9fdb16fe57a7..46ad4b1b574f 100644
--- a/pkgs/by-name/si/sigil/package.nix
+++ b/pkgs/by-name/si/sigil/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigil";
-  version = "2.4.2";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     repo = "Sigil";
     owner = "Sigil-Ebook";
     tag = version;
-    hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw=";
+    hash = "sha256-1Z+OosEZJEHiUz+62wYuNeAyQXARh14WAtqBVjq1FZw=";
   };
 
   pythonPath = with python3Packages; [ lxml ];

From 846f227fd63000bd045e99651c4acb16d142039c Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Mon, 2 Jun 2025 08:44:05 +0200
Subject: [PATCH 0469/1497] maintainers: add max06 (#413015)

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d2f8aa0900da..17b80374239c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15567,6 +15567,12 @@
     name = "Max Niederman";
     keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4  CF5E 9AED 8814 81D8 444E"; } ];
   };
+  max06 = {
+    email = "max06.net@outlook.com";
+    github = "max06";
+    githubId = 7556827;
+    name = "Flo";
+  };
   maxbrunet = {
     email = "max@brnt.mx";
     github = "maxbrunet";

From cdd4fbac3d7c2d31f083389c56884def06b6ede6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Wed, 28 May 2025 11:10:16 +0200
Subject: [PATCH 0470/1497] coqPackages.vscoq-language-server: 2.2.5 -> 2.2.6

To be compatible with the update of the extension in #410879.
---
 .../coq-modules/vscoq-language-server/default.nix           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix
index d4ee9d6042f8..f4fd8e2ecb29 100644
--- a/pkgs/development/coq-modules/vscoq-language-server/default.nix
+++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix
@@ -14,8 +14,8 @@ let
     with lib.versions;
     lib.switch coq.coq-version [
       {
-        case = isEq "9.0";
-        out = "2.2.5";
+        case = range "8.18" "9.0";
+        out = "2.2.6";
       }
       {
         case = range "8.18" "8.20";
@@ -48,6 +48,8 @@ let
     release."2.2.1".sha256 = "sha256-miIVAv/8jlP1pXnoK1MWz4O6nlmb309a8UjcCivbiB4=";
     release."2.2.5".rev = "v2.2.5";
     release."2.2.5".sha256 = "sha256-XyIjwem/yS7UIpQATNixgKkrMOHHs74nkAOvpU5WG1k=";
+    release."2.2.6".rev = "v2.2.6";
+    release."2.2.6".sha256 = "sha256-J8nRTAwN6GBEYgqlXa2kkkrHPatXsSObQg9QUQoZhgE=";
     inherit location;
   });
   fetched = fetch (if version != null then version else defaultVersion);

From 2e3b56dd2c85caada8b5ede8b24f43fa35f53459 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 07:00:35 +0000
Subject: [PATCH 0471/1497] neothesia: 0.3.0 -> 0.3.1

---
 pkgs/by-name/ne/neothesia/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix
index f8531e58d232..ca27d3a671cb 100644
--- a/pkgs/by-name/ne/neothesia/package.nix
+++ b/pkgs/by-name/ne/neothesia/package.nix
@@ -12,13 +12,13 @@
   xorg,
 }:
 let
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "PolyMeilex";
     repo = "Neothesia";
     rev = "v${version}";
-    hash = "sha256-JD1jQ/a6GHtB/d/fRMCiE4ZOO676BIiZ980VIYUloU0=";
+    hash = "sha256-qYwBSye6RYClSlWmHwuy/rxq9w5932tR33Z+o2S1l8k=";
   };
 in
 rustPlatform.buildRustPackage {
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
   ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OYdKuYOL3X6eqVYANvmfTRA8TGd4+QLg0zodDH0jxXk=";
+  cargoHash = "sha256-mXeNAVYqPsBWiUZFV/atx/xjLgFNarm2HwI7k/NaAbc=";
 
   cargoBuildFlags = [
     "-p neothesia -p neothesia-cli"

From fca2d96340907789abc5db1ab095742e36428187 Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Tue, 4 Feb 2025 10:52:55 +0100
Subject: [PATCH 0472/1497] kconfiglib: add patch to parse 'modules' option

---
 ...mentary-support-for-modules-property.patch | 41 +++++++++++++++++++
 .../python-modules/kconfiglib/default.nix     |  5 +++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/kconfiglib/0001-Add-rudimentary-support-for-modules-property.patch

diff --git a/pkgs/development/python-modules/kconfiglib/0001-Add-rudimentary-support-for-modules-property.patch b/pkgs/development/python-modules/kconfiglib/0001-Add-rudimentary-support-for-modules-property.patch
new file mode 100644
index 000000000000..2a6bca2b9183
--- /dev/null
+++ b/pkgs/development/python-modules/kconfiglib/0001-Add-rudimentary-support-for-modules-property.patch
@@ -0,0 +1,41 @@
+From 3161fec0b9ff9154dbd952c3481400118fabb744 Mon Sep 17 00:00:00 2001
+From: Helmut Grohne <helmut.grohne@intenta.de>
+Date: Thu, 21 Apr 2022 10:07:53 +0200
+Subject: [PATCH] Add rudimentary support for modules property
+
+In linux commit 6dd85ff178cd76851e2184b13e545f5a88d1be30, Linux Torvalds
+changed "option modules" to plain "modules" since it was the only option
+left. kconfiglib does not have much support for either besides parsing
+it and suppressing warnings when it is applied to the 'MODULES' symbol.
+Mirror this behaviour for the newer "modules" property.
+
+Fixes: #106
+---
+ kconfiglib.py | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/kconfiglib.py b/kconfiglib.py
+index c67895c..ccef123 100644
+--- a/kconfiglib.py
++++ b/kconfiglib.py
+@@ -3263,6 +3263,20 @@ def _parse_props(self, node):
+                 else:
+                     self._parse_error("unrecognized option")
+ 
++            elif t0 is _T_MODULES:
++                # 'modules' formerly was 'option modules'. See above for why
++                # and when it is ignored. It was changed in
++                # linux commit 6dd85ff178cd76851e2184b13e545f5a88d1be30.
++                if node.item is not self.modules:
++                    self._warn("the 'modules' property is not supported. Let "
++                               "me know if this is a problem for you, as it "
++                               "wouldn't be that hard to implement. Note that "
++                               "modules are supported -- Kconfiglib just "
++                               "assumes the symbol name MODULES, like older "
++                               "versions of the C implementation did when "
++                               "'modules' wasn't used.",
++                               self.filename, self.linenr)
++
+             elif t0 is _T_OPTIONAL:
+                 if node.item.__class__ is not Choice:
+                     self._parse_error('"optional" is only valid for choices')
diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix
index 12c7ba6170db..e94ef18a9896 100644
--- a/pkgs/development/python-modules/kconfiglib/default.nix
+++ b/pkgs/development/python-modules/kconfiglib/default.nix
@@ -14,6 +14,11 @@ buildPythonPackage rec {
     sha256 = "0g690bk789hsry34y4ahvly5c8w8imca90ss4njfqf7m2qicrlmy";
   };
 
+  patches = [
+    # see https://github.com/ulfalizer/Kconfiglib/pull/119
+    ./0001-Add-rudimentary-support-for-modules-property.patch
+  ];
+
   # doesnt work out of the box but might be possible
   doCheck = false;
 

From f87dac4be32235f7a7409eaf3faaa10213264e34 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 18:23:26 +0200
Subject: [PATCH 0473/1497] workflows/{check-shell,lib-tests}: use nixpks CI
 cachix cache

Any change to shell.nix or ci/ currently needs to rebuild treefmt on 4
systems from scratch. We can avoid that by using the existing cachix
cache.

Adding the cache to lib-tests won't do much on it's own, yet, but it
will with the next commit.
---
 .github/workflows/check-shell.yml | 6 ++++++
 .github/workflows/lib-tests.yml   | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index b8cbe062b6a9..fc90a449fb34 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -44,5 +44,11 @@ jobs:
 
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
+          name: nixpkgs-ci
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
       - name: Build shell
         run: nix-build untrusted/ci -A shell
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index d176a76411f8..f11dca13581d 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -32,6 +32,12 @@ jobs:
         with:
           extra_nix_config: sandbox = true
 
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+        with:
+          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
+          name: nixpkgs-ci
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
       - name: Building Nixpkgs lib-tests
         run: |
           nix-build untrusted/ci -A lib-tests

From a7f4e0f9ae31e5ec90dd6ca7d5465d4ed97ee099 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 29 May 2025 18:30:34 +0200
Subject: [PATCH 0474/1497] lib/tests: avoid full rebuild when only maintainers
 change

The vast majority of CI jobs to build the lib tests are caused by
changes in the maintainer list. In this case, we currently run the full
test-suite which takes 3-4 minutes. By moving the maintainers and teams
tests out of the test-with-nix file, we save almost all of that.
Building only those two tests on a change is almost instant. This only
works, because we previously enabled cachix for the workflow.

Note, that these tests are not actually run with both nix versions, even
though they were listed in the "test with specific nix version" file.
That's because we only differ in the nix version run *inside* the
sandbox, but not doing the outer build.

Since this file seems to be re-used by NixOS/nix' CI, this is
technically a small loss in coverage for that repo, but nixpkgs CI
considerations outweigh that. But because of this, I left the other
non-nix-version-specific tests in that file.
---
 lib/tests/maintainers.nix   |  2 +-
 lib/tests/release.nix       | 11 ++++++++++-
 lib/tests/test-with-nix.nix |  8 --------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix
index 1d3fd5630c26..600d42054113 100644
--- a/lib/tests/maintainers.nix
+++ b/lib/tests/maintainers.nix
@@ -54,7 +54,7 @@ let
 
   missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);
 
-  success = pkgs.runCommand "checked-maintainers-success" { } ">$out";
+  success = pkgs.runCommand "checked-maintainers-success" { } "mkdir $out";
 
   failure =
     pkgs.runCommand "checked-maintainers-failure"
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 7ab6c24e38e6..51260ea0300b 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -28,5 +28,14 @@ let
 in
 pkgsBB.symlinkJoin {
   name = "nixpkgs-lib-tests";
-  paths = map testWithNix nixVersions;
+  paths = map testWithNix nixVersions ++ [
+    (import ./maintainers.nix {
+      inherit pkgs;
+      lib = import ../.;
+    })
+    (import ./teams.nix {
+      inherit pkgs;
+      lib = import ../.;
+    })
+  ];
 }
diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix
index 0be65a743f00..4f9aa53f83dd 100644
--- a/lib/tests/test-with-nix.nix
+++ b/lib/tests/test-with-nix.nix
@@ -19,14 +19,6 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
     buildInputs = [
       (import ./check-eval.nix)
       (import ./fetchers.nix)
-      (import ./maintainers.nix {
-        inherit pkgs;
-        lib = import ../.;
-      })
-      (import ./teams.nix {
-        inherit pkgs;
-        lib = import ../.;
-      })
       (import ../path/tests {
         inherit pkgs;
       })

From f2479721e4d19357bbe5c2a9287cc74ed6dd6475 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:09:00 +0200
Subject: [PATCH 0475/1497] ci/nixpkgs-vet: remove left-over pin

We're now consuming nixpkgs-vet from the pinned-nixpkgs, but apparently
forgot to remove all of this.
---
 ci/README.md                         | 20 --------------------
 ci/nixpkgs-vet.sh                    |  3 ---
 ci/nixpkgs-vet/pinned-version.txt    |  1 -
 ci/nixpkgs-vet/update-pinned-tool.sh | 22 ----------------------
 4 files changed, 46 deletions(-)
 delete mode 100644 ci/nixpkgs-vet/pinned-version.txt
 delete mode 100755 ci/nixpkgs-vet/update-pinned-tool.sh

diff --git a/ci/README.md b/ci/README.md
index 7fcda96e3480..67f55d15e548 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -20,23 +20,3 @@ Arguments:
 
 - `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
 - `REPOSITORY`: The repository from which to fetch the base branch. Defaults to <https://github.com/NixOS/nixpkgs.git>.
-
-## `ci/nixpkgs-vet`
-
-This directory contains scripts and files used and related to [`nixpkgs-vet`](https://github.com/NixOS/nixpkgs-vet/), which the CI uses to implement `pkgs/by-name` checks, along with many other Nixpkgs architecture rules.
-See also the [CI GitHub Action](../.github/workflows/nixpkgs-vet.yml).
-
-## `ci/nixpkgs-vet/update-pinned-tool.sh`
-
-Updates the pinned [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) in [`ci/nixpkgs-vet/pinned-version.txt`](./nixpkgs-vet/pinned-version.txt) to the latest [release](https://github.com/NixOS/nixpkgs-vet/releases).
-
-Each release contains a pre-built `x86_64-linux` version of the tool which is used by CI.
-
-This script currently needs to be called manually when the CI tooling needs to be updated.
-
-Why not just build the tooling right from the PRs Nixpkgs version?
-
-- Because it allows CI to check all PRs, even if they would break the CI tooling.
-- Because it makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds.
-- Because it improves security, since we don't have to build potentially untrusted code from PRs.
-  The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval).
diff --git a/ci/nixpkgs-vet.sh b/ci/nixpkgs-vet.sh
index b62e04fe0177..8ad2a35adfa0 100755
--- a/ci/nixpkgs-vet.sh
+++ b/ci/nixpkgs-vet.sh
@@ -61,9 +61,6 @@ trace "Done"
 trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "
 git -C "$tmp/merged" merge -q --no-edit "$baseSha"
 trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
-trace -n "Reading pinned nixpkgs-vet version from pinned-version.txt.. "
-toolVersion=$(<"$tmp/merged/ci/nixpkgs-vet/pinned-version.txt")
-trace -e "\e[34m$toolVersion\e[0m"
 
 trace "Running nixpkgs-vet.."
 nix-build ci -A nixpkgs-vet --argstr base "$tmp/base" --argstr head "$tmp/merged"
diff --git a/ci/nixpkgs-vet/pinned-version.txt b/ci/nixpkgs-vet/pinned-version.txt
deleted file mode 100644
index 845639eef26c..000000000000
--- a/ci/nixpkgs-vet/pinned-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.1.4
diff --git a/ci/nixpkgs-vet/update-pinned-tool.sh b/ci/nixpkgs-vet/update-pinned-tool.sh
deleted file mode 100755
index 78a9ae2411b8..000000000000
--- a/ci/nixpkgs-vet/update-pinned-tool.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq curl
-
-set -o pipefail -o errexit -o nounset
-
-trace() { echo >&2 "$@"; }
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-repository=NixOS/nixpkgs-vet
-pin_file=$SCRIPT_DIR/pinned-version.txt
-
-trace -n "Fetching latest release of $repository.. "
-latestRelease=$(curl -sSfL \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  https://api.github.com/repos/"$repository"/releases/latest)
-latestVersion=$(jq .tag_name -r <<< "$latestRelease")
-trace "$latestVersion"
-
-trace "Updating $pin_file"
-echo "$latestVersion" > "$pin_file"

From f7c25f0bf987f8a276d39a30075d067f54ad5b3e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:09:58 +0200
Subject: [PATCH 0476/1497] ci/pinned: manage nixpkgs and treefmt-nix with
 npins

Instead of rolling our own update script which only works for a single
pin, let's use npins. We can then use it for the treefmtNix pin as well,
which was mostly unmaintained, so far.
---
 ci/README.md                |  4 ++--
 ci/default.nix              | 11 +++++------
 ci/pinned-nixpkgs.json      |  4 ----
 ci/pinned.json              | 31 +++++++++++++++++++++++++++++++
 ci/update-pinned-nixpkgs.sh | 17 -----------------
 ci/update-pinned.sh         |  8 ++++++++
 6 files changed, 46 insertions(+), 29 deletions(-)
 delete mode 100644 ci/pinned-nixpkgs.json
 create mode 100644 ci/pinned.json
 delete mode 100755 ci/update-pinned-nixpkgs.sh
 create mode 100755 ci/update-pinned.sh

diff --git a/ci/README.md b/ci/README.md
index 67f55d15e548..66fb707ebec5 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -7,9 +7,9 @@ This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which i
 
 CI may need certain packages from Nixpkgs.
 In order to ensure that the needed packages are generally available without building,
-[`pinned-nixpkgs.json`](./pinned-nixpkgs.json) contains a pinned Nixpkgs version tested by Hydra.
+[`pinned.json`](./pinned.json) contains a pinned Nixpkgs version tested by Hydra.
 
-Run [`update-pinned-nixpkgs.sh`](./update-pinned-nixpkgs.sh) to update it.
+Run [`update-pinned.sh`](./update-pinned.sh) to update it.
 
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
diff --git a/ci/default.nix b/ci/default.nix
index 94d049903fca..ec35121bb24b 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -1,5 +1,5 @@
 let
-  pinnedNixpkgs = builtins.fromJSON (builtins.readFile ./pinned-nixpkgs.json);
+  pinned = (builtins.fromJSON (builtins.readFile ./pinned.json)).pins;
 in
 {
   system ? builtins.currentSystem,
@@ -10,8 +10,8 @@ let
   nixpkgs' =
     if nixpkgs == null then
       fetchTarball {
-        url = "https://github.com/NixOS/nixpkgs/archive/${pinnedNixpkgs.rev}.tar.gz";
-        sha256 = pinnedNixpkgs.sha256;
+        inherit (pinned.nixpkgs) url;
+        sha256 = pinned.nixpkgs.hash;
       }
     else
       nixpkgs;
@@ -25,9 +25,8 @@ let
   fmt =
     let
       treefmtNixSrc = fetchTarball {
-        # Master at 2025-02-12
-        url = "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz";
-        sha256 = "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna";
+        inherit (pinned.treefmt-nix) url;
+        sha256 = pinned.treefmt-nix.hash;
       };
       treefmtEval = (import treefmtNixSrc).evalModule pkgs {
         # Important: The auto-rebase script uses `git filter-branch --tree-filter`,
diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json
deleted file mode 100644
index 7a9596380c41..000000000000
--- a/ci/pinned-nixpkgs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
-  "sha256": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
-}
diff --git a/ci/pinned.json b/ci/pinned.json
new file mode 100644
index 000000000000..9748d218f5ea
--- /dev/null
+++ b/ci/pinned.json
@@ -0,0 +1,31 @@
+{
+  "pins": {
+    "nixpkgs": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "NixOS",
+        "repo": "nixpkgs"
+      },
+      "branch": "nixpkgs-unstable",
+      "submodules": false,
+      "revision": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
+      "url": "https://github.com/NixOS/nixpkgs/archive/3d1f29646e4b57ed468d60f9d286cde23a8d1707.tar.gz",
+      "hash": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
+    },
+    "treefmt-nix": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "numtide",
+        "repo": "treefmt-nix"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "4f09b473c936d41582dd744e19f34ec27592c5fd",
+      "url": "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz",
+      "hash": "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna"
+    }
+  },
+  "version": 5
+}
diff --git a/ci/update-pinned-nixpkgs.sh b/ci/update-pinned-nixpkgs.sh
deleted file mode 100755
index d44b59d80ede..000000000000
--- a/ci/update-pinned-nixpkgs.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq
-
-set -euo pipefail
-
-# https://stackoverflow.com/a/246128
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-repo=https://github.com/nixos/nixpkgs
-branch=nixpkgs-unstable
-file=$SCRIPT_DIR/pinned-nixpkgs.json
-
-defaultRev=$(git ls-remote "$repo" refs/heads/"$branch" | cut -f1)
-rev=${1:-$defaultRev}
-sha256=$(nix-prefetch-url --unpack "$repo/archive/$rev.tar.gz" --name source)
-
-jq -n --arg rev "$rev" --arg sha256 "$sha256" '$ARGS.named' | tee /dev/stderr > $file
diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh
new file mode 100755
index 000000000000..7e3a26695fe8
--- /dev/null
+++ b/ci/update-pinned.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p npins
+
+set -euo pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+npins --lock-file pinned.json update

From f0923df7f5df3f1c4cfab52ba7a90fdcb2669953 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 31 May 2025 19:19:26 +0200
Subject: [PATCH 0477/1497] ci/pinned: update

From the nixpkgs-unstable channel:
https://hydra.nixos.org/eval/1815701#tabs-inputs
---
 ci/pinned.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 9748d218f5ea..f29d17f7aa6c 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
-      "url": "https://github.com/NixOS/nixpkgs/archive/3d1f29646e4b57ed468d60f9d286cde23a8d1707.tar.gz",
-      "hash": "1wzvc9h9a6l9wyhzh892xb5x88kxmbzxb1k8s7fizyyw2q4nqw07"
+      "revision": "8ca7ec685bbee55d6dcb326abe23945c0806c39e",
+      "url": "https://github.com/NixOS/nixpkgs/archive/8ca7ec685bbee55d6dcb326abe23945c0806c39e.tar.gz",
+      "hash": "1hkxm871m66mjsc4acdki32qqnpgk3n6vi3zrzns2bwlwp6ivcjx"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "4f09b473c936d41582dd744e19f34ec27592c5fd",
-      "url": "https://github.com/numtide/treefmt-nix/archive/4f09b473c936d41582dd744e19f34ec27592c5fd.tar.gz",
-      "hash": "051vh6raskrxw5k6jncm8zbk9fhbzgm1gxpq9gm5xw1b6wgbgcna"
+      "revision": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
+      "url": "https://github.com/numtide/treefmt-nix/archive/1f3f7b784643d488ba4bf315638b2b0a4c5fb007.tar.gz",
+      "hash": "13qisjalw9qvd6lkd9g8225r46j5wdjrp3zw6jrs81q2vxwdz37m"
     }
   },
   "version": 5

From 16696db425184692aec2158eb5ec96917bbd7a8d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 09:15:42 +0200
Subject: [PATCH 0478/1497] firefox-bin: remove with lib;

---
 .../networking/browsers/firefox-bin/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 9e3b2c7f820f..1d2dfc1f5ef5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
     description = "Mozilla Firefox, free web browser (binary package)";
     homepage = "https://www.mozilla.org/firefox/";
@@ -188,10 +188,10 @@ stdenv.mkDerivation {
       free = false;
       redistributable = true; # since MPL-2.0 still applies
     };
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames mozillaPlatforms;
     hydraPlatforms = [ ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       taku0
       lovesegfault
     ];

From f42c9668cb15b736780fe39ab44d0b0002e072d7 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 09:19:50 +0200
Subject: [PATCH 0479/1497] avrdudess: use finalAttrs pattern, cleanup

---
 pkgs/by-name/av/avrdudess/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/av/avrdudess/package.nix b/pkgs/by-name/av/avrdudess/package.nix
index 6f767e3ae944..a50c3c0eada2 100644
--- a/pkgs/by-name/av/avrdudess/package.nix
+++ b/pkgs/by-name/av/avrdudess/package.nix
@@ -10,13 +10,13 @@
   xdg-utils,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avrdudess";
   version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip";
-    sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";
+    url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v${finalAttrs.version}/AVRDUDESS-${finalAttrs.version}-portable.zip";
+    hash = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc=";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
   dontInstall = true;
 
   buildPhase = ''
+    runHook preBuild
+
     mkdir -p "$out/avrdudess"
     mkdir -p "$out/bin"
 
@@ -52,15 +54,17 @@ stdenv.mkDerivation {
     __EOF__
 
     chmod a+x "$out/bin/"*
+
+    runHook postBuild
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GUI for AVRDUDE (AVR microcontroller programmer)";
     homepage = "https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/";
-    changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${version}/Changelog.txt";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${finalAttrs.version}/Changelog.txt";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.bjornfor ];
     mainProgram = "avrdudess";
   };
-}
+})

From 5db5bd097c8602f5362fea980ff1ce63cbd6391e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 10:49:45 +0200
Subject: [PATCH 0480/1497] nixos/taler: explicitly specify configFile

else the executables fail to work.
---
 nixos/modules/services/finance/taler/exchange.nix | 6 ++++--
 nixos/modules/services/finance/taler/merchant.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 16428a43d78d..4a940cddb104 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -25,6 +25,8 @@ let
     "secmod-eddsa"
     "secmod-rsa"
   ];
+
+  configFile = config.environment.etc."taler/taler.conf".source;
 in
 
 {
@@ -140,14 +142,14 @@ in
           lib.pipe servicesDB [
             (map (name: ''
               GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}";
-              GRANT USAGE ON SCHEMA exchange TO "taler-exchange-${name}";
+              GRANT USAGE ON ALL SEQUENCES IN SCHEMA exchange TO "taler-exchange-${name}";
             ''))
             lib.concatStrings
           ]
         );
       in
       ''
-        ${lib.getExe' cfg.package "taler-exchange-dbinit"}
+        ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
         psql -U taler-exchange-httpd -f ${dbScript}
       '';
   };
diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index e5a2f2ce5d10..1426882ac050 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -19,6 +19,8 @@ let
     "depositcheck"
     "exchange"
   ];
+
+  configFile = config.environment.etc."taler/taler.conf".source;
 in
 {
   imports = [
@@ -95,13 +97,13 @@ in
           lib.concatStrings (
             map (name: ''
               GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}";
-              GRANT USAGE ON SCHEMA merchant TO "taler-merchant-${name}";
+              GRANT USAGE ON ALL SEQUENCES IN SCHEMA merchant TO "taler-merchant-${name}";
             '') servicesDB
           )
         );
       in
       ''
-        ${lib.getExe' cfg.package "taler-merchant-dbinit"}
+        ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
         psql -U taler-${talerComponent}-httpd -f ${dbScript}
       '';
   };

From 85b6430face1be77a737813a82478d6485bb596c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:03:28 +0200
Subject: [PATCH 0481/1497] nixos/taler: use the same dynamicUser for services

which makes managing the database much simpler.
---
 .../modules/services/finance/taler/common.nix |  5 +++--
 .../services/finance/taler/exchange.nix       | 22 +++----------------
 .../services/finance/taler/merchant.nix       | 19 +++-------------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/finance/taler/common.nix b/nixos/modules/services/finance/taler/common.nix
index c6ade43084fd..891562c90ff8 100644
--- a/nixos/modules/services/finance/taler/common.nix
+++ b/nixos/modules/services/finance/taler/common.nix
@@ -51,7 +51,7 @@ in
       (lib.genAttrs (map (n: "taler-${talerComponent}-${n}") services) (name: {
         serviceConfig = {
           DynamicUser = true;
-          User = name;
+          User = dbName;
           Group = groupName;
           ExecStart = toString [
             (lib.getExe' cfg.package name)
@@ -85,6 +85,7 @@ in
             Type = "oneshot";
             DynamicUser = true;
             User = dbName;
+            Group = groupName;
             Restart = "on-failure";
             RestartSec = "5s";
           };
@@ -116,7 +117,7 @@ in
     services.postgresql = {
       enable = true;
       ensureDatabases = [ dbName ];
-      ensureUsers = map (service: { name = "taler-${talerComponent}-${service}"; }) servicesDB ++ [
+      ensureUsers = [
         {
           name = dbName;
           ensureDBOwnership = true;
diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 4a940cddb104..2b5861608a09 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -133,24 +133,8 @@ in
       after = [ "taler-exchange-httpd.service" ];
     };
 
-    # Taken from https://docs.taler.net/taler-exchange-manual.html#exchange-database-setup
-    # TODO: Why does aggregator need DELETE?
-    systemd.services."taler-${talerComponent}-dbinit".script =
-      let
-        deletePerm = name: lib.optionalString (name == "aggregator") ",DELETE";
-        dbScript = pkgs.writers.writeText "taler-exchange-db-permissions.sql" (
-          lib.pipe servicesDB [
-            (map (name: ''
-              GRANT SELECT,INSERT,UPDATE${deletePerm name} ON ALL TABLES IN SCHEMA exchange TO "taler-exchange-${name}";
-              GRANT USAGE ON ALL SEQUENCES IN SCHEMA exchange TO "taler-exchange-${name}";
-            ''))
-            lib.concatStrings
-          ]
-        );
-      in
-      ''
-        ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
-        psql -U taler-exchange-httpd -f ${dbScript}
-      '';
+    systemd.services."taler-${talerComponent}-dbinit".script = ''
+      ${lib.getExe' cfg.package "taler-exchange-dbinit"} -c ${configFile}
+    '';
   };
 }
diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index 1426882ac050..a541ba2d5b25 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -90,21 +90,8 @@ in
       path = [ cfg.package ];
     };
 
-    systemd.services."taler-${talerComponent}-dbinit".script =
-      let
-        # NOTE: not documented, but is necessary
-        dbScript = pkgs.writers.writeText "taler-merchant-db-permissions.sql" (
-          lib.concatStrings (
-            map (name: ''
-              GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA merchant TO "taler-merchant-${name}";
-              GRANT USAGE ON ALL SEQUENCES IN SCHEMA merchant TO "taler-merchant-${name}";
-            '') servicesDB
-          )
-        );
-      in
-      ''
-        ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
-        psql -U taler-${talerComponent}-httpd -f ${dbScript}
-      '';
+    systemd.services."taler-${talerComponent}-dbinit".script = ''
+      ${lib.getExe' cfg.package "taler-merchant-dbinit"} -c ${configFile}
+    '';
   };
 }

From 58fca012553b6dba1c32c1325c973ea43c31fe03 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:33:54 +0200
Subject: [PATCH 0482/1497] nixos/taler: update exchange settings

adding new and removing deprecated ones.
---
 .../modules/services/finance/taler/exchange.nix  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix
index 2b5861608a09..21e10d0f2002 100644
--- a/nixos/modules/services/finance/taler/exchange.nix
+++ b/nixos/modules/services/finance/taler/exchange.nix
@@ -46,11 +46,19 @@ in
         options = {
           # TODO: do we want this to be a sub-attribute or only define the exchange set of options here
           exchange = {
-            AML_THRESHOLD = lib.mkOption {
+            CURRENCY = lib.mkOption {
+              type = lib.types.nonEmptyStr;
+              description = ''
+                The currency which the exchange will operate with. This cannot be changed later.
+              '';
+            };
+            CURRENCY_ROUND_UNIT = lib.mkOption {
               type = lib.types.str;
-              default = "${cfgTaler.settings.taler.CURRENCY}:1000000";
-              defaultText = "1000000 in {option}`CURRENCY`";
-              description = "Monthly transaction volume until an account is considered suspicious and flagged for AML review.";
+              default = "${cfg.settings.exchange.CURRENCY}:0.01";
+              defaultText = "0.01 in {option}`CURRENCY`";
+              description = ''
+                Smallest amount in this currency that can be transferred using the underlying RTGS. For example: "EUR:0.01" or "JPY:1"
+              '';
             };
             DB = lib.mkOption {
               type = lib.types.enum [ "postgres" ];

From 276fca32650d0c7cfeb13a7429af05d9f3e9c6bf Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:44:01 +0200
Subject: [PATCH 0483/1497] nixos/taler: add exchangekeyupdate service

whose role is to sync Taler exchanges' information with the merchant.
---
 nixos/modules/services/finance/taler/merchant.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/finance/taler/merchant.nix b/nixos/modules/services/finance/taler/merchant.nix
index a541ba2d5b25..72b4a2a0b3c0 100644
--- a/nixos/modules/services/finance/taler/merchant.nix
+++ b/nixos/modules/services/finance/taler/merchant.nix
@@ -17,7 +17,7 @@ let
     "webhook"
     "wirewatch"
     "depositcheck"
-    "exchange"
+    "exchangekeyupdate"
   ];
 
   configFile = config.environment.etc."taler/taler.conf".source;

From e04f8bb993051a831a77ddbff1326cf26e610801 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:10:14 +0200
Subject: [PATCH 0484/1497] nixos/libeufin: update BASE_URL

which is now required to have a valid protocol.
---
 nixos/modules/services/finance/libeufin/common.nix | 3 ++-
 nixos/tests/taler/common/nodes.nix                 | 2 +-
 nixos/tests/taler/common/scripts.nix               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index d5e72b8ad0c5..4e0a6bffe02f 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -35,6 +35,7 @@ libeufinComponent:
           cfg.settings."libeufin-${libeufinComponent}db-postgres".CONFIG;
 
       bankPort = cfg.settings."${if isNexus then "nexus-httpd" else "libeufin-bank"}".PORT;
+      bankHost = lib.elemAt (lib.splitString "/" cfg.settings.libeufin-bank.BASE_URL) 2;
     in
     lib.mkIf cfg.enable {
       services.libeufin.settings = cfg.settings;
@@ -82,7 +83,7 @@ libeufinComponent:
                 args = lib.cli.toGNUCommandLineShell { } {
                   c = configFile;
                   inherit (account) username password name;
-                  payto_uri = "payto://x-taler-bank/bank:${toString bankPort}/${account.username}?receiver-name=${account.name}";
+                  payto_uri = "payto://x-taler-bank/${bankHost}/${account.username}?receiver-name=${account.name}";
                   exchange = lib.toLower account.username == "exchange";
                 };
               in
diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index 3e8b81ed5179..fcfcb6d6648f 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -103,7 +103,7 @@ rec {
                 # WIRE_TYPE = "iban";
                 X_TALER_BANK_PAYTO_HOSTNAME = "bank:8082";
                 # IBAN_PAYTO_BIC = "SANDBOXX";
-                BASE_URL = "bank:8082";
+                BASE_URL = "http://bank:8082/";
 
                 # Allow creating new accounts
                 ALLOW_REGISTRATION = "yes";
diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index 3860ae229070..98487c76ccf6 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -7,7 +7,7 @@
 
 let
   cfgNodes = pkgs.callPackage ./nodes.nix { inherit lib; };
-  bankConfig = nodes.bank.config.environment.etc."libeufin/libeufin.conf".source;
+  bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
 
   inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
 in

From 1741d8abaa3ced6eb823999d5af3cf734fb91d6e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:37:25 +0200
Subject: [PATCH 0485/1497] tests/taler: authenticate users with tokens

---
 nixos/tests/taler/common/scripts.nix | 18 ++++++++++++++++--
 nixos/tests/taler/tests/basic.nix    | 20 +++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index 98487c76ccf6..c074e9b03c6c 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -68,6 +68,20 @@ in
               + command
           )
 
+      # https://docs.taler.net/core/api-corebank.html#authentication
+      def create_token(machine, username, password):
+          """Create a read-write bank access token for a user"""
+          response = succeed(machine, [
+              "curl -X POST",
+              f"-u {username}:{password}",
+              "-H 'Content-Type: application/json'",
+              """
+              --data '{ "scope": "readwrite" }'
+              """,
+              f"-sSfL 'http://bank:8082/accounts/{username}/token'"
+          ])
+          return json.loads(response)["access_token"]
+
 
       def verify_balance(balanceWanted: str):
           """Compare Taler CLI wallet balance with expected amount"""
@@ -84,14 +98,14 @@ in
               client.succeed(f"echo Withdraw successfully made. New balance: {balanceWanted}")
 
 
-      def verify_conversion(regionalWanted: str):
+      def verify_conversion(regionalWanted: str, accessToken: str):
           """Compare converted Libeufin Nexus funds with expected regional currency"""
           # Get transaction details
           response = json.loads(
               succeed(bank, [
                   "curl -sSfL",
+                  f"-H 'Authorization: Bearer {accessToken}'",
                   # TODO: get exchange from config?
-                  "-u exchange:exchange",
                   "http://bank:8082/accounts/exchange/transactions"
               ])
           )
diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 3eeb50b04fa9..83c9e90cffe5 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -78,6 +78,9 @@ import ../../make-test-python.nix (
         exchange.start()
         exchange.wait_for_open_port(8081)
 
+        # Create access token for exchange
+        accessTokenExchange = create_token(exchange, "exchange", "exchange")
+
 
         with subtest("Set up exchange"):
             exchange.wait_until_succeeds("taler-exchange-offline download sign upload")
@@ -96,12 +99,14 @@ import ../../make-test-python.nix (
         merchant.start()
         merchant.wait_for_open_port(8083)
 
+        # Create access token for merchant
+        accessTokenMerchant = create_token(client, "merchant", "merchant")
 
         with subtest("Set up merchant"):
             # Create default instance (similar to admin)
             succeed(merchant, [
                 "curl -X POST",
-                "-H 'Authorization: Bearer secret-token:super_secret'",
+                f"-H 'Authorization: Bearer {accessTokenMerchant}'",
                 """
                 --data '{
                   "auth": { "method": "external" },
@@ -150,6 +155,8 @@ import ../../make-test-python.nix (
 
         client.succeed("curl -s http://exchange:8081/")
 
+        # Create access token for user
+        accessTokenUser = create_token(client, "${TUSER}", "${TPASS}")
 
         # Make a withdrawal from the CLI wallet
         with subtest("Make a withdrawal from the CLI wallet"):
@@ -164,7 +171,7 @@ import ../../make-test-python.nix (
             withdrawal = json.loads(
                 succeed(client, [
                     "curl -X POST",
-                    "-u ${TUSER}:${TPASS}",
+                    f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
                     f"""--data '{{"amount": "{balanceWanted}"}}'""", # double brackets escapes them
                     "-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals'"
@@ -176,7 +183,7 @@ import ../../make-test-python.nix (
                 wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange http://exchange:8081/")
                 succeed(client, [
                     "curl -X POST",
-                    "-u ${TUSER}:${TPASS}",
+                    f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
                     f"-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals/{withdrawal["withdrawal_id"]}/confirm'"
                 ])
@@ -231,14 +238,17 @@ import ../../make-test-python.nix (
             with subtest("Libeufin Nexus currency conversion"):
                 regionalWanted = "20"
 
+                # Create access token
+                accessTokenAdmin = create_token(bank, "${AUSER}", "${APASS}")
+
                 # Setup Nexus ebics keys
                 systemd_run(bank, "libeufin-nexus ebics-setup -L debug -c /etc/libeufin/libeufin.conf", "libeufin-nexus")
 
                 # Set currency conversion rates (1:1)
                 succeed(bank, [
                     "curl -X POST",
+                    f"-H 'Authorization: Bearer {accessTokenAdmin}'",
                     "-H 'Content-Type: application/json'",
-                    "-u ${AUSER}:${APASS}",
                     """
                     --data '{
                       "cashin_ratio": "1",
@@ -264,7 +274,7 @@ import ../../make-test-python.nix (
                 systemd_run(bank, f"""libeufin-nexus testing fake-incoming -c ${bankConfig} --amount="${FIAT_CURRENCY}:{regionalWanted}" --subject="{reservePub}" "payto://iban/CH4740123RW4167362694" """, "libeufin-nexus")
                 wallet_cli("run-until-done")
 
-                verify_conversion(regionalWanted)
+                verify_conversion(regionalWanted, accessTokenExchange)
       '';
   }
 )

From 21ad6f743cf6443686e8da067c168de0a4fa63a7 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:42:02 +0200
Subject: [PATCH 0486/1497] tests/taler: create exchange credentials at runtime

Basic auth is deprecated, so exchange credentials must be set at runtime
because it requires a token from the bank.
---
 nixos/tests/taler/common/nodes.nix         |  7 ++++++-
 nixos/tests/taler/common/scripts.nix       | 11 +++++++++++
 nixos/tests/taler/conf/taler-accounts.conf |  6 ------
 nixos/tests/taler/tests/basic.nix          |  6 ++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index fcfcb6d6648f..2b9a9ea6a878 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -55,7 +55,12 @@ rec {
             settings = {
               taler.CURRENCY = CURRENCY;
             };
-            includes = [ ../conf/taler-accounts.conf ];
+            includes = [
+              ../conf/taler-accounts.conf
+              # The exchange requires a token from the bank, so its credentials
+              # need to be set at runtime
+              "/etc/taler/secrets/exchange-account.secret.conf"
+            ];
             exchange = {
               enable = true;
               debug = true;
diff --git a/nixos/tests/taler/common/scripts.nix b/nixos/tests/taler/common/scripts.nix
index c074e9b03c6c..cad9935fc98a 100644
--- a/nixos/tests/taler/common/scripts.nix
+++ b/nixos/tests/taler/common/scripts.nix
@@ -83,6 +83,17 @@ in
           return json.loads(response)["access_token"]
 
 
+      # Basic auth is deprecated, so exchange credentials must be set at
+      # runtime because it requires a token from the bank.
+      def create_exchange_auth(token: str):
+          template = f"""
+          [exchange-accountcredentials-test]
+          WIRE_GATEWAY_URL = http://bank:8082/accounts/exchange/taler-wire-gateway/
+          WIRE_GATEWAY_AUTH_METHOD = BEARER
+          TOKEN = "{token}"
+          """
+          return "\n".join([line.strip() for line in template.splitlines()])
+
       def verify_balance(balanceWanted: str):
           """Compare Taler CLI wallet balance with expected amount"""
           balance = wallet_cli("balance --json")
diff --git a/nixos/tests/taler/conf/taler-accounts.conf b/nixos/tests/taler/conf/taler-accounts.conf
index 9246c25a83ad..8cfb482eb063 100644
--- a/nixos/tests/taler/conf/taler-accounts.conf
+++ b/nixos/tests/taler/conf/taler-accounts.conf
@@ -2,9 +2,3 @@
 PAYTO_URI = payto://x-taler-bank/bank:8082/exchange?receiver-name=Exchange
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://bank:8082/accounts/exchange/taler-wire-gateway/
-WIRE_GATEWAY_AUTH_METHOD = BASIC
-USERNAME = exchange
-PASSWORD = exchange
diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 83c9e90cffe5..4dc750adc45a 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -76,11 +76,17 @@ import ../../make-test-python.nix (
 
 
         exchange.start()
+
+        # exchange credentials must be set at runtime because it requires a token from the bank
+        exchange.succeed("mkdir -p /etc/taler/secrets/")
+        exchange.succeed("touch /etc/taler/secrets/exchange-account.secret.conf")
+
         exchange.wait_for_open_port(8081)
 
         # Create access token for exchange
         accessTokenExchange = create_token(exchange, "exchange", "exchange")
 
+        exchange.succeed(f'echo "{create_exchange_auth(accessTokenExchange)}" > /etc/taler/secrets/exchange-account.secret.conf')
 
         with subtest("Set up exchange"):
             exchange.wait_until_succeeds("taler-exchange-offline download sign upload")

From 12fa6482313a27ee3e374cb95f39fc411d4bb9e0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:43:36 +0200
Subject: [PATCH 0487/1497] tests/taler: update merchant instance's endpoint

---
 nixos/tests/taler/tests/basic.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 4dc750adc45a..64d35ed2ecc3 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -139,7 +139,7 @@ import ../../make-test-python.nix (
                   "credit_facade_credentials":{"type":"basic","username":"merchant","password":"merchant"}
                 }'
                 """,
-                "-sSfL 'http://merchant:8083/private/accounts'"
+                "-sSfL 'http://merchant:8083/instances/default/private/accounts'"
             ])
             # Register a new product to be ordered
             succeed(merchant, [
@@ -155,7 +155,7 @@ import ../../make-test-python.nix (
                   "next_restock": { "t_s": "never" }
                 }'
                 """,
-                "-sSfL 'http://merchant:8083/private/products'"
+                "-sSfL 'http://merchant:8083/instances/default/private/products'"
             ])
 
 
@@ -214,7 +214,7 @@ import ../../make-test-python.nix (
                       "inventory_products": [{ "product_id": "1", "quantity": 1 }]
                     }'
                     """,
-                    "-sSfL 'http://merchant:8083/private/orders'"
+                    "-sSfL 'http://merchant:8083/instances/default/private/orders'"
                 ])
             )
             order_id = response["order_id"]
@@ -224,7 +224,7 @@ import ../../make-test-python.nix (
             response = json.loads(
                 succeed(merchant, [
                     "curl -sSfL",
-                    f"http://merchant:8083/private/orders/{order_id}"
+                    f"http://merchant:8083/instances/default/private/orders/{order_id}"
                 ])
             )
             wallet_cli("run-until-done")

From 4ea47f35639a08e80c2f37ce8307cdb7978e9057 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:46:43 +0200
Subject: [PATCH 0488/1497] tests/taler: change bank admin password

which is now required to be at least 8 chars long.
---
 nixos/tests/taler/tests/basic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 64d35ed2ecc3..28932f20a8e2 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -35,13 +35,13 @@ import ../../make-test-python.nix (
         inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
         inherit (cfgScripts) commonScripts;
 
-        bankConfig = nodes.bank.config.environment.etc."libeufin/libeufin.conf".source;
+        bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
         bankSettings = nodes.bank.services.libeufin.settings.libeufin-bank;
         nexusSettings = nodes.bank.services.libeufin.nexus.settings;
 
         # Bank admin account credentials
         AUSER = "admin";
-        APASS = "admin";
+        APASS = "testAdmin";
 
         TUSER = "testUser";
         TPASS = "testUser";

From f73d14864524bd97b508b0cd653552154f2ff685 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 29 May 2025 11:58:09 +0200
Subject: [PATCH 0489/1497] tests/taler: pass config to taler-exchange-offline

else it doesn't work properly.
---
 nixos/tests/taler/tests/basic.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index 28932f20a8e2..a27e80357a26 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -35,6 +35,7 @@ import ../../make-test-python.nix (
         inherit (cfgNodes) CURRENCY FIAT_CURRENCY;
         inherit (cfgScripts) commonScripts;
 
+        configFile = nodes.exchange.environment.etc."taler/taler.conf".source;
         bankConfig = nodes.bank.environment.etc."libeufin/libeufin.conf".source;
         bankSettings = nodes.bank.services.libeufin.settings.libeufin-bank;
         nexusSettings = nodes.bank.services.libeufin.nexus.settings;
@@ -89,13 +90,15 @@ import ../../make-test-python.nix (
         exchange.succeed(f'echo "{create_exchange_auth(accessTokenExchange)}" > /etc/taler/secrets/exchange-account.secret.conf')
 
         with subtest("Set up exchange"):
-            exchange.wait_until_succeeds("taler-exchange-offline download sign upload")
-            # Enable exchange wire account
-            exchange.succeed('taler-exchange-offline upload < ${exchangeAccount}')
+            # Set up exchange keys
+            exchange.wait_until_succeeds('taler-exchange-offline -c "${configFile}" download sign upload')
 
-            # NOTE: cannot deposit coins/pay merchant if wire fees are not set up
-            exchange.succeed('taler-exchange-offline wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
-            exchange.succeed('taler-exchange-offline global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
+            # Enable exchange wire account
+            exchange.succeed('taler-exchange-offline -c "${configFile}" upload < ${exchangeAccount}')
+
+            # Set up wire fees, needed in order to deposit coins/pay merchant
+            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
 
 
         # Verify that exchange keys exist

From c1fe104a778c25eab8a1ec9e65be0fc28bb67da0 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 09:42:20 +0200
Subject: [PATCH 0490/1497] tests/taler: adjust currency wire fees

because making a withdrawal fails if the fees are 0, for some reason.
---
 nixos/tests/taler/tests/basic.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index a27e80357a26..c8b860701506 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -97,8 +97,8 @@ import ../../make-test-python.nix (
             exchange.succeed('taler-exchange-offline -c "${configFile}" upload < ${exchangeAccount}')
 
             # Set up wire fees, needed in order to deposit coins/pay merchant
-            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0" "${CURRENCY}:0" upload')
-            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0" "${CURRENCY}:0" "${CURRENCY}:0" 1h 6a 0 upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" wire-fee now x-taler-bank "${CURRENCY}:0.01" "${CURRENCY}:0.01" upload')
+            exchange.succeed('taler-exchange-offline -c "${configFile}" global-fee now "${CURRENCY}:0.01" "${CURRENCY}:0.0" "${CURRENCY}:0" 1h 6a 0 upload')
 
 
         # Verify that exchange keys exist
@@ -204,7 +204,8 @@ import ../../make-test-python.nix (
 
 
         with subtest("Pay for an order"):
-            balanceWanted = "${CURRENCY}:9" # after paying
+            # after paying (1 for the order and 0.1 as fee)
+            balanceWanted = "${CURRENCY}:8.9"
 
             # Create an order to be paid
             response = json.loads(

From b24910bccf3e1ee6a85b5ac1ff32fbf525dcfa81 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:00:41 +0200
Subject: [PATCH 0491/1497] tests/taler: fix currency withdrawal confirmation

---
 nixos/tests/taler/tests/basic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/taler/tests/basic.nix b/nixos/tests/taler/tests/basic.nix
index c8b860701506..ec9f592269a9 100644
--- a/nixos/tests/taler/tests/basic.nix
+++ b/nixos/tests/taler/tests/basic.nix
@@ -189,11 +189,16 @@ import ../../make-test-python.nix (
 
             # Accept & confirm withdrawal
             with subtest("Accept & confirm withdrawal"):
-                wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange http://exchange:8081/")
+                # the withdrawal can only be confirmed if this is executed twice, for some reason
+                for i in range(2):
+                    wallet_cli(f"withdraw accept-uri {withdrawal["taler_withdraw_uri"]} --exchange 'http://exchange:8081/'")
+                    client.sleep(5) # needs some time to process things
+
                 succeed(client, [
                     "curl -X POST",
                     f"-H 'Authorization: Bearer {accessTokenUser}'",
                     "-H 'Content-Type: application/json'",
+                    f"""--data '{{"amount": "{balanceWanted}"}}'""", # double brackets escapes them
                     f"-sSfL 'http://bank:8082/accounts/${TUSER}/withdrawals/{withdrawal["withdrawal_id"]}/confirm'"
                 ])
 

From 3213654cf8a9de0d32bf54823d30050b80ccdd80 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:27:36 +0200
Subject: [PATCH 0492/1497] tests/taler: update exchange node config

---
 nixos/tests/taler/common/nodes.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/taler/common/nodes.nix b/nixos/tests/taler/common/nodes.nix
index 2b9a9ea6a878..7da90ea528cb 100644
--- a/nixos/tests/taler/common/nodes.nix
+++ b/nixos/tests/taler/common/nodes.nix
@@ -65,9 +65,12 @@ rec {
               enable = true;
               debug = true;
               openFirewall = true;
+              # https://docs.taler.net/taler-exchange-manual.html#coins-denomination-keys
+              # NOTE: use `taler-harness`, not `taler-wallet-cli`
               denominationConfig = lib.readFile ../conf/taler-denominations.conf;
               settings = {
                 exchange = {
+                  inherit CURRENCY;
                   MASTER_PUBLIC_KEY = "2TQSTPFZBC2MC4E52NHPA050YXYG02VC3AB50QESM6JX1QJEYVQ0";
                   BASE_URL = "http://exchange:8081/";
                 };

From d062164ed8091e9b0658dfa17f185a85cd67c8e5 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:52:56 +0200
Subject: [PATCH 0493/1497] taler-merchant: work around expected paths

Some services expect the `sql` and `templates` directories to be
available under different paths than what's outputted.
---
 pkgs/by-name/ta/taler-merchant/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index fc5c87e56816..d6b620dbaf18 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -82,6 +82,14 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  postFixup = ''
+    # - taler-merchant-dbinit expects `versioning.sql` under `share/taler/sql`
+    # - taler-merchant-httpd expects `share/taler/merchant/templates`
+    mkdir -p $out/share/taler/sql
+    ln -s $out/share/taler-merchant $out/share/taler/merchant
+    ln -s $out/share/taler-merchant/sql $out/share/taler/sql/merchant
+  '';
+
   enableParallelBuilding = true;
 
   doInstallCheck = true;

From 1dd75bd295434483652d7b72971e6c32b201b0fd Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 10:54:48 +0200
Subject: [PATCH 0494/1497] taler-wallet-core: patch sqlite-helper script
 shebangs

---
 pkgs/by-name/ta/taler-wallet-core/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index 43f7cf4d89c5..e136588b3726 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -95,6 +95,11 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  postFixup = ''
+    # else it fails to find the python interpreter
+    patchShebangs --build $out/bin/taler-helper-sqlite3
+  '';
+
   env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
 
   meta = {

From 1c87f40c6795e29fbf85f0c916bb60615e811e7e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 11:15:22 +0200
Subject: [PATCH 0495/1497] taler-{exchange,merchant}: add passthru.tests

---
 pkgs/by-name/ta/taler-exchange/package.nix | 3 +++
 pkgs/by-name/ta/taler-merchant/package.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix
index dc4bc7fac66c..185af90a718b 100644
--- a/pkgs/by-name/ta/taler-exchange/package.nix
+++ b/pkgs/by-name/ta/taler-exchange/package.nix
@@ -19,6 +19,7 @@
   gettext,
   texinfo,
   libtool,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -109,6 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkTarget = "check";
 
+  passthru.tests = nixosTests.taler.basic;
+
   meta = {
     description = "Exchange component for the GNU Taler electronic payment system";
     longDescription = ''
diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix
index d6b620dbaf18..90bfac3411bb 100644
--- a/pkgs/by-name/ta/taler-merchant/package.nix
+++ b/pkgs/by-name/ta/taler-merchant/package.nix
@@ -14,6 +14,7 @@
   libgcrypt,
   texinfo,
   curl,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -98,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   checkTarget = "check";
 
+  passthru.tests = nixosTests.taler.basic;
+
   meta = {
     description = "Merchant component for the GNU Taler electronic payment system";
     longDescription = ''

From db0b526f9698cb7db9852b73d949bb63f22c8edd Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 30 May 2025 11:36:50 +0200
Subject: [PATCH 0496/1497] doc/rl-2505: add GNU Taler entry

---
 doc/release-notes/rl-2505.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 8a395089426d..73bfea0370de 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -28,6 +28,10 @@
   - Applications linked against different Mesa versions than installed on the system should now work correctly going forward (however, applications against older Mesa, e.g. from Nixpkgs releases before 25.05, remain broken)
   - Packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively
 
+- GNU Taler has been updated to version 1.0.
+  This marks a significant milestone as the GNU Taler payment system is now available in Swiss Francs for individuals and businesses in Switzerland.
+  For more details, see the [upstream release notes](https://www.taler.net/en/news/2025-01.html).
+
 - OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details.
 
 - Emacs has been updated to 30.1.

From 7da497a91a1feb48bdaf82dc0bd1263324471ec8 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 19:12:16 -0400
Subject: [PATCH 0497/1497] python3Packages.wokkel: init at 18.0.0

NGI project.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../wokkel/0001-Remove-py2-compat.patch       | 2671 +++++++++++++++++
 .../python-modules/wokkel/default.nix         |   72 +
 pkgs/top-level/python-packages.nix            |    2 +
 3 files changed, 2745 insertions(+)
 create mode 100644 pkgs/development/python-modules/wokkel/0001-Remove-py2-compat.patch
 create mode 100644 pkgs/development/python-modules/wokkel/default.nix

diff --git a/pkgs/development/python-modules/wokkel/0001-Remove-py2-compat.patch b/pkgs/development/python-modules/wokkel/0001-Remove-py2-compat.patch
new file mode 100644
index 000000000000..de37f66b3e34
--- /dev/null
+++ b/pkgs/development/python-modules/wokkel/0001-Remove-py2-compat.patch
@@ -0,0 +1,2671 @@
+From 6b3ab4a94e4d498cdabd5aac6b749031abd785c8 Mon Sep 17 00:00:00 2001
+From: Ralph Meijer <ralphm@ik.nu>
+Date: Thu, 18 Jul 2024 19:04:47 +0200
+Subject: [PATCH] Remove py2 compat
+
+Co-authored-by: OPNA2608 <opna2608@protonmail.com>
+---
+ setup.py                      |  11 ++-
+ wokkel/component.py           |  13 ++-
+ wokkel/data_form.py           |  70 ++++++----------
+ wokkel/delay.py               |   2 +-
+ wokkel/disco.py               |  51 ++++++------
+ wokkel/formats.py             |  20 ++---
+ wokkel/generic.py             |  19 +----
+ wokkel/iwokkel.py             | 150 +++++++++++++++++-----------------
+ wokkel/muc.py                 |  67 ++++++++-------
+ wokkel/pubsub.py              |  55 ++++++-------
+ wokkel/server.py              |  17 ++--
+ wokkel/shim.py                |   5 +-
+ wokkel/subprotocols.py        |  13 ++-
+ wokkel/test/helpers.py        |   5 +-
+ wokkel/test/test_client.py    |   3 +-
+ wokkel/test/test_data_form.py |  89 +++++---------------
+ wokkel/test/test_generic.py   |  75 +----------------
+ wokkel/test/test_muc.py       |  13 ++-
+ wokkel/test/test_server.py    |   6 +-
+ wokkel/test/test_shim.py      |   5 +-
+ wokkel/test/test_xmppim.py    |  19 ++---
+ wokkel/xmppim.py              |  89 ++++++++++----------
+ 22 files changed, 318 insertions(+), 479 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8804fd9..f7f1e33 100755
+--- a/setup.py
++++ b/setup.py
+@@ -40,11 +40,11 @@ setup(name='wokkel',
+       license='MIT',
+       platforms='any',
+       classifiers=[
+-          'Programming Language :: Python :: 2.7',
+           'Programming Language :: Python :: 3',
+-          'Programming Language :: Python :: 3.4',
+-          'Programming Language :: Python :: 3.5',
+           'Programming Language :: Python :: 3.6',
++          'Programming Language :: Python :: 3.7',
++          'Programming Language :: Python :: 3.8',
++          'Programming Language :: Python :: 3.9',
+       ],
+       packages=[
+           'wokkel',
+@@ -60,16 +60,15 @@ setup(name='wokkel',
+       install_requires=[
+           'incremental>=16.9.0',
+           'python-dateutil',
++          'Twisted[tls]>=16.4.0',
+       ],
+       extras_require={
+-          ":python_version<'3'": 'Twisted[tls]>=15.5.0',
+-          ":python_version>'3'": 'Twisted[tls]>=16.4.0',
+           "dev": [
+               "pyflakes",
+               "coverage",
++              "pydoctor",
+               "sphinx",
+               "towncrier",
+           ],
+-          "dev:python_version<'3'": "pydoctor",
+       },
+ )
+diff --git a/wokkel/component.py b/wokkel/component.py
+index da48230..9410837 100644
+--- a/wokkel/component.py
++++ b/wokkel/component.py
+@@ -12,7 +12,6 @@ from __future__ import division, absolute_import
+ from twisted.application import service
+ from twisted.internet import reactor
+ from twisted.python import log
+-from twisted.python.compat import unicode
+ from twisted.words.protocols.jabber.jid import internJID as JID
+ from twisted.words.protocols.jabber import component, error, xmlstream
+ from twisted.words.xish import domish
+@@ -105,7 +104,7 @@ class InternalComponent(xmlstream.XMPPHandlerCollection, service.Service):
+     components of this type connect to a router in the same process. This
+     allows for one-process XMPP servers.
+ 
+-    @ivar domains: Domains (as L{unicode}) this component will handle traffic
++    @ivar domains: Domains (as L{str}) this component will handle traffic
+         for.
+     @type domains: L{set}
+     """
+@@ -177,7 +176,7 @@ class ListenComponentAuthenticator(xmlstream.ListenAuthenticator):
+     Authenticator for accepting components.
+ 
+     @ivar secret: The shared used to authorized incoming component connections.
+-    @type secret: L{unicode}.
++    @type secret: L{str}.
+     """
+ 
+     namespace = NS_COMPONENT_ACCEPT
+@@ -241,7 +240,7 @@ class ListenComponentAuthenticator(xmlstream.ListenAuthenticator):
+         L{onHandshake}.
+         """
+         if (element.uri, element.name) == (self.namespace, 'handshake'):
+-            self.onHandshake(unicode(element))
++            self.onHandshake(str(element))
+         else:
+             exc = error.StreamError('not-authorized')
+             self.xmlstream.sendStreamError(exc)
+@@ -257,7 +256,7 @@ class ListenComponentAuthenticator(xmlstream.ListenAuthenticator):
+         be exchanged.
+         """
+         calculatedHash = xmlstream.hashPassword(self.xmlstream.sid,
+-                                                unicode(self.secret))
++                                                str(self.secret))
+         if handshake != calculatedHash:
+             exc = error.StreamError('not-authorized', text='Invalid hash')
+             self.xmlstream.sendStreamError(exc)
+@@ -301,7 +300,7 @@ class Router(object):
+ 
+         @param destination: Destination of the route to be added as a host name
+                             or L{None} for the default route.
+-        @type destination: L{unicode} or L{NoneType}
++        @type destination: L{str} or L{NoneType}
+ 
+         @param xs: XML Stream to register the route for.
+         @type xs:
+@@ -316,7 +315,7 @@ class Router(object):
+         Remove a route.
+ 
+         @param destination: Destination of the route that should be removed.
+-        @type destination: L{unicode}
++        @type destination: L{str}
+ 
+         @param xs: XML Stream to remove the route for.
+         @type xs:
+diff --git a/wokkel/data_form.py b/wokkel/data_form.py
+index ed9c5fc..7f1c34c 100644
+--- a/wokkel/data_form.py
++++ b/wokkel/data_form.py
+@@ -17,7 +17,6 @@ from __future__ import division, absolute_import
+ from zope.interface import implementer
+ from zope.interface.common import mapping
+ 
+-from twisted.python.compat import iteritems, unicode, _PY3
+ from twisted.words.protocols.jabber.jid import JID
+ from twisted.words.xish import domish
+ 
+@@ -51,9 +50,9 @@ class Option(object):
+     Data Forms field option.
+ 
+     @ivar value: Value of this option.
+-    @type value: L{unicode}
++    @type value: L{str}
+     @ivar label: Optional label for this option.
+-    @type label: L{unicode} or L{NoneType}
++    @type label: L{str} or L{NoneType}
+     """
+ 
+     def __init__(self, value, label=None):
+@@ -91,7 +90,7 @@ class Option(object):
+             raise Error("Option has no value")
+ 
+         label = element.getAttribute('label')
+-        return Option(unicode(valueElements[0]), label)
++        return Option(str(valueElements[0]), label)
+ 
+ 
+ class Field(object):
+@@ -108,15 +107,15 @@ class Field(object):
+     @ivar var: Field name. Optional if C{fieldType} is C{'fixed'}.
+     @type var: L{str}
+     @ivar label: Human readable label for this field.
+-    @type label: L{unicode}
++    @type label: L{str}
+     @ivar values: The values for this field, for multi-valued field
+-                  types, as a list of L{bool}, L{unicode} or L{JID}.
++                  types, as a list of L{bool}, L{str} or L{JID}.
+     @type values: L{list}
+     @ivar options: List of possible values to choose from in a response
+                    to this form as a list of L{Option}s.
+     @type options: L{list}
+     @ivar desc: Human readable description for this field.
+-    @type desc: L{unicode}
++    @type desc: L{str}
+     @ivar required: Whether the field is required to be provided in a
+                     response to this form.
+     @type required: L{bool}
+@@ -147,7 +146,7 @@ class Field(object):
+         try:
+             self.options = [Option(optionValue, optionLabel)
+                             for optionValue, optionLabel
+-                            in iteritems(options)]
++                            in options.items()]
+         except AttributeError:
+             self.options = options or []
+ 
+@@ -185,7 +184,7 @@ class Field(object):
+ 
+         Sets C{value} as the only element of L{values}.
+ 
+-        @type value: L{bool}, L{unicode} or L{JID}
++        @type value: L{bool}, L{str} or L{JID}
+         """
+         self.values = [value]
+ 
+@@ -229,7 +228,7 @@ class Field(object):
+             newValues = []
+             for value in self.values:
+                 if self.fieldType == 'boolean':
+-                    if isinstance(value, (str, unicode)):
++                    if isinstance(value, str):
+                         checkValue = value.lower()
+                         if not checkValue in ('0', '1', 'false', 'true'):
+                             raise ValueError("Not a boolean")
+@@ -263,9 +262,9 @@ class Field(object):
+ 
+         for value in self.values:
+             if isinstance(value, bool):
+-                value = unicode(value).lower()
++                value = str(value).lower()
+             else:
+-                value = unicode(value)
++                value = str(value)
+ 
+             field.addElement('value', content=value)
+ 
+@@ -288,7 +287,7 @@ class Field(object):
+ 
+     @staticmethod
+     def _parse_desc(field, element):
+-        desc = unicode(element)
++        desc = str(element)
+         if desc:
+             field.desc = desc
+ 
+@@ -305,7 +304,7 @@ class Field(object):
+ 
+     @staticmethod
+     def _parse_value(field, element):
+-        value = unicode(element)
++        value = str(element)
+         field.values.append(value)
+ 
+ 
+@@ -313,9 +312,9 @@ class Field(object):
+     def fromElement(element):
+         field = Field(None)
+ 
+-        for eAttr, fAttr in iteritems({'type': 'fieldType',
+-                                       'var': 'var',
+-                                       'label': 'label'}):
++        for eAttr, fAttr in {'type': 'fieldType',
++                             'var': 'var',
++                             'label': 'label'}.items():
+             value = element.getAttribute(eAttr)
+             if value:
+                 setattr(field, fAttr, value)
+@@ -350,7 +349,7 @@ class Field(object):
+ 
+         if 'options' in fieldDict:
+             options = []
+-            for value, label in iteritems(fieldDict['options']):
++            for value, label in fieldDict['options'].items():
+                 options.append(Option(value, label))
+             kwargs['options'] = options
+ 
+@@ -385,9 +384,9 @@ class Form(object):
+     @type formType: L{str}
+ 
+     @ivar title: Natural language title of the form.
+-    @type title: L{unicode}
++    @type title: L{str}
+ 
+-    @ivar instructions: Natural language instructions as a list of L{unicode}
++    @ivar instructions: Natural language instructions as a list of L{str}
+         strings without line breaks.
+     @type instructions: L{list}
+ 
+@@ -497,7 +496,7 @@ class Form(object):
+             C{fieldDefs}.
+         @type filterUnknown: L{bool}
+         """
+-        for name, value in iteritems(values):
++        for name, value in values.items():
+             fieldDict = {'var': name,
+                          'type': None}
+ 
+@@ -542,14 +541,14 @@ class Form(object):
+ 
+     @staticmethod
+     def _parse_title(form, element):
+-        title = unicode(element)
++        title = str(element)
+         if title:
+             form.title = title
+ 
+ 
+     @staticmethod
+     def _parse_instructions(form, element):
+-        instructions = unicode(element)
++        instructions = str(element)
+         if instructions:
+             form.instructions.append(instructions)
+ 
+@@ -624,36 +623,19 @@ class Form(object):
+         return key in self.fields
+ 
+ 
+-    def iterkeys(self):
++    def keys(self):
+         return iter(self)
+ 
+ 
+-    def itervalues(self):
++    def values(self):
+         for key in self:
+             yield self[key]
+ 
+ 
+-    def iteritems(self):
++    def items(self):
+         for key in self:
+             yield (key, self[key])
+ 
+-    if _PY3:
+-        keys = iterkeys
+-        values = itervalues
+-        items = iteritems
+-    else:
+-        def keys(self):
+-            return list(self)
+-
+-
+-        def values(self):
+-            return list(self.itervalues())
+-
+-
+-        def items(self):
+-            return list(self.iteritems())
+-
+-
+     def getValues(self):
+         """
+         Extract values from the named form fields.
+@@ -701,7 +683,7 @@ class Form(object):
+ 
+         filtered = []
+ 
+-        for name, field in iteritems(self.fields):
++        for name, field in self.fields.items():
+             if name in fieldDefs:
+                 fieldDef = fieldDefs[name]
+                 if 'type' not in fieldDef:
+diff --git a/wokkel/delay.py b/wokkel/delay.py
+index be06cb3..1dd1703 100644
+--- a/wokkel/delay.py
++++ b/wokkel/delay.py
+@@ -46,7 +46,7 @@ class Delay(object):
+         Render this instance into a domish Element.
+ 
+         @param legacy: If C{True}, use the legacy XEP-0091 format.
+-        @type legacy: C{bool}
++        @type legacy: L{bool}
+         """
+         if not self.stamp:
+             raise ValueError("stamp is required")
+diff --git a/wokkel/disco.py b/wokkel/disco.py
+index 9ea43ef..227789d 100644
+--- a/wokkel/disco.py
++++ b/wokkel/disco.py
+@@ -13,7 +13,6 @@ U{XEP-0030<http://xmpp.org/extensions/xep-0030.html>}.
+ from __future__ import division, absolute_import
+ 
+ from twisted.internet import defer
+-from twisted.python.compat import iteritems, unicode
+ from twisted.words.protocols.jabber import error, jid
+ from twisted.words.xish import domish
+ 
+@@ -29,11 +28,11 @@ IQ_GET = '/iq[@type="get"]'
+ DISCO_INFO = IQ_GET + '/query[@xmlns="' + NS_DISCO_INFO + '"]'
+ DISCO_ITEMS = IQ_GET + '/query[@xmlns="' + NS_DISCO_ITEMS + '"]'
+ 
+-class DiscoFeature(unicode):
++class DiscoFeature(str):
+     """
+     XMPP service discovery feature.
+ 
+-    This extends C{unicode} to convert to and from L{domish.Element}, but
++    This extends L{str} to convert to and from L{domish.Element}, but
+     further behaves identically.
+     """
+ 
+@@ -44,7 +43,7 @@ class DiscoFeature(unicode):
+         @rtype: L{domish.Element}.
+         """
+         element = domish.Element((NS_DISCO_INFO, 'feature'))
+-        element['var'] = unicode(self)
++        element['var'] = str(self)
+         return element
+ 
+ 
+@@ -68,11 +67,11 @@ class DiscoIdentity(object):
+     XMPP service discovery identity.
+ 
+     @ivar category: The identity category.
+-    @type category: C{unicode}
++    @type category: L{str}
+     @ivar type: The identity type.
+-    @type type: C{unicode}
++    @type type: L{str}
+     @ivar name: The optional natural language name for this entity.
+-    @type name: C{unicode}
++    @type name: L{str}
+     """
+ 
+     def __init__(self, category, idType, name=None):
+@@ -119,21 +118,21 @@ class DiscoInfo(object):
+     XMPP service discovery info.
+ 
+     @ivar nodeIdentifier: The optional node this info applies to.
+-    @type nodeIdentifier: C{unicode}
++    @type nodeIdentifier: L{str}
+     @ivar features: Features as L{DiscoFeature}.
+-    @type features: C{set}
++    @type features: L{set}
+     @ivar identities: Identities as a mapping from (category, type) to name,
+-                      all C{unicode}.
+-    @type identities: C{dict}
++                      all L{str}.
++    @type identities: L{dict}
+     @ivar extensions: Service discovery extensions as a mapping from the
+-                      extension form's C{FORM_TYPE} (C{unicode}) to
++                      extension form's C{FORM_TYPE} (L{str}) to
+                       L{data_form.Form}. Forms with no C{FORM_TYPE} field
+                       are mapped as C{None}. Note that multiple forms
+                       with the same C{FORM_TYPE} have the last in sequence
+                       prevail.
+-    @type extensions: C{dict}
++    @type extensions: L{dict}
+     @ivar _items: Sequence of added items.
+-    @type _items: C{list}
++    @type _items: L{list}
+     """
+ 
+     def __init__(self):
+@@ -226,9 +225,9 @@ class DiscoItem(object):
+     @ivar entity: The entity holding the item.
+     @type entity: L{jid.JID}
+     @ivar nodeIdentifier: The optional node identifier for the item.
+-    @type nodeIdentifier: C{unicode}
++    @type nodeIdentifier: L{str}
+     @ivar name: The optional natural language name for this entity.
+-    @type name: C{unicode}
++    @type name: L{str}
+     """
+ 
+     def __init__(self, entity, nodeIdentifier='', name=None):
+@@ -278,9 +277,9 @@ class DiscoItems(object):
+     XMPP service discovery items.
+ 
+     @ivar nodeIdentifier: The optional node this info applies to.
+-    @type nodeIdentifier: C{unicode}
++    @type nodeIdentifier: L{str}
+     @ivar _items: Sequence of added items.
+-    @type _items: C{list}
++    @type _items: L{list}
+     """
+ 
+     def __init__(self):
+@@ -353,9 +352,9 @@ class _DiscoRequest(generic.Request):
+     A Service Discovery request.
+ 
+     @ivar verb: Type of request: C{'info'} or C{'items'}.
+-    @type verb: C{str}
++    @type verb: L{str}
+     @ivar nodeIdentifier: Optional node to request info for.
+-    @type nodeIdentifier: C{unicode}
++    @type nodeIdentifier: L{str}
+     """
+ 
+     verb = None
+@@ -366,7 +365,7 @@ class _DiscoRequest(generic.Request):
+             NS_DISCO_ITEMS: 'items',
+             }
+ 
+-    _verbRequestMap = dict(((v, k) for k, v in iteritems(_requestVerbMap)))
++    _verbRequestMap = dict(((v, k) for k, v in _requestVerbMap.items()))
+ 
+     def __init__(self, verb=None, nodeIdentifier='',
+                        recipient=None, sender=None):
+@@ -415,7 +414,7 @@ class DiscoClientProtocol(XMPPHandler):
+         @type entity: L{jid.JID}
+ 
+         @param nodeIdentifier: Optional node to request info from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param sender: Optional sender address.
+         @type sender: L{jid.JID}
+@@ -438,7 +437,7 @@ class DiscoClientProtocol(XMPPHandler):
+         @type entity: L{jid.JID}
+ 
+         @param nodeIdentifier: Optional node to request info from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param sender: Optional sender address.
+         @type sender: L{jid.JID}
+@@ -534,7 +533,7 @@ class DiscoHandler(XMPPHandler, IQHandlerMixin):
+ 
+         @param deferredList: List of deferreds for which the results should be
+                              gathered.
+-        @type deferredList: C{list}
++        @type deferredList: L{list}
+         @return: Deferred that fires with a list of gathered results.
+         @rtype: L{defer.Deferred}
+         """
+@@ -566,7 +565,7 @@ class DiscoHandler(XMPPHandler, IQHandlerMixin):
+         @param target: The entity the request was sent to.
+         @type target: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The optional node being queried, or C{''}.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: Deferred with the gathered results from sibling handlers.
+         @rtype: L{defer.Deferred}
+         """
+@@ -589,7 +588,7 @@ class DiscoHandler(XMPPHandler, IQHandlerMixin):
+         @param target: The entity the request was sent to.
+         @type target: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The optional node being queried, or C{''}.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: Deferred with the gathered results from sibling handlers.
+         @rtype: L{defer.Deferred}
+         """
+diff --git a/wokkel/formats.py b/wokkel/formats.py
+index 0eb0be6..972cc7e 100644
+--- a/wokkel/formats.py
++++ b/wokkel/formats.py
+@@ -9,8 +9,6 @@ Generic payload formats.
+ 
+ from __future__ import division, absolute_import
+ 
+-from twisted.python.compat import unicode
+-
+ NS_MOOD = 'http://jabber.org/protocol/mood'
+ NS_TUNE = 'http://jabber.org/protocol/tune'
+ 
+@@ -55,7 +53,7 @@ class Mood:
+                 continue
+ 
+             if child.name == 'text':
+-                text = unicode(child)
++                text = str(child)
+             else:
+                 value = child.name
+ 
+@@ -76,19 +74,19 @@ class Tune:
+     U{XEP-0118<http://xmpp.org/extensions/xep-0118.html>}.
+ 
+     @ivar artist: The artist or performer of the song or piece.
+-    @type artist: C{unicode}
++    @type artist: L{str}
+     @ivar length: The duration of the song or piece in seconds.
+-    @type length: C{int}
++    @type length: L{int}
+     @ivar source: The collection (e.g. album) or other source.
+-    @type source: C{unicode}
++    @type source: L{str}
+     @ivar title: The title of the song or piece
+-    @type title: C{unicode}
++    @type title: L{str}
+     @ivar track: A unique identifier for the tune; e.g. the track number within
+                  the collection or the specific URI for the object.
+-    @type track: C{unicode}
++    @type track: L{str}
+     @ivar uri: A URI pointing to information about the song, collection, or
+                artist.
+-    @type uri: C{str}
++    @type uri: L{str}
+ 
+     """
+ 
+@@ -122,10 +120,10 @@ class Tune:
+                 continue
+ 
+             if child.name in ('artist', 'source', 'title', 'track', 'uri'):
+-                setattr(tune, child.name, unicode(child))
++                setattr(tune, child.name, str(child))
+             elif child.name == 'length':
+                 try:
+-                    tune.length = int(unicode(child))
++                    tune.length = int(str(child))
+                 except ValueError:
+                     pass
+ 
+diff --git a/wokkel/generic.py b/wokkel/generic.py
+index 2e975f6..becff8f 100644
+--- a/wokkel/generic.py
++++ b/wokkel/generic.py
+@@ -13,14 +13,11 @@ from zope.interface import implementer
+ 
+ from twisted.internet import defer, protocol
+ from twisted.python import reflect
+-from twisted.python.deprecate import deprecated
+ from twisted.words.protocols.jabber import error, jid, xmlstream
+ from twisted.words.protocols.jabber.xmlstream import toResponse
+ from twisted.words.xish import domish, utility
+ from twisted.words.xish.xmlstream import BootstrapMixin
+ 
+-from incremental import Version
+-
+ from wokkel.iwokkel import IDisco
+ from wokkel.subprotocols import XMPPHandler
+ 
+@@ -35,7 +32,7 @@ def parseXml(string):
+     Parse serialized XML into a DOM structure.
+ 
+     @param string: The serialized XML to be parsed, UTF-8 encoded.
+-    @type string: C{str}.
++    @type string: L{str}.
+     @return: The DOM structure, or C{None} on empty or incomplete input.
+     @rtype: L{domish.Element}
+     """
+@@ -332,17 +329,3 @@ class DeferredXmlStreamFactory(BootstrapMixin, protocol.ClientFactory):
+ 
+     def clientConnectionFailed(self, connector, reason):
+         self.deferred.errback(reason)
+-
+-
+-
+-@deprecated(Version("wokkel", 18, 0, 0), "unicode.encode('idna')")
+-def prepareIDNName(name):
+-    """
+-    Encode a unicode IDN Domain Name into its ACE equivalent.
+-
+-    This will encode the domain labels, separated by allowed dot code points,
+-    to their ASCII Compatible Encoding (ACE) equivalent, using punycode. The
+-    result is an ASCII byte string of the encoded labels, separated by the
+-    standard full stop.
+-    """
+-    return name.encode('idna')
+diff --git a/wokkel/iwokkel.py b/wokkel/iwokkel.py
+index 30a1057..35383b5 100644
+--- a/wokkel/iwokkel.py
++++ b/wokkel/iwokkel.py
+@@ -46,7 +46,7 @@ class IDisco(Interface):
+         @param nodeIdentifier: The optional identifier of the node at this
+             entity to retrieve the identify and features of.  The default is
+             C{''}, meaning the root node.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+     def getDiscoItems(requestor, target, nodeIdentifier=''):
+@@ -60,7 +60,7 @@ class IDisco(Interface):
+         @param nodeIdentifier: The optional identifier of the node at this
+                                entity to retrieve the identify and features of.
+                                The default is C{''}, meaning the root node.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+ 
+@@ -109,7 +109,7 @@ class IPubSubClient(Interface):
+         @param nodeIdentifier: Optional suggestion for the new node's
+                                identifier. If omitted, the creation of an
+                                instant node will be attempted.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: a deferred that fires with the identifier of the newly created
+                  node. Note that this can differ from the suggested identifier
+                  if the publish subscribe service chooses to modify or ignore
+@@ -124,7 +124,7 @@ class IPubSubClient(Interface):
+         @param service: The publish-subscribe service entity.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to be deleted.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -135,7 +135,7 @@ class IPubSubClient(Interface):
+         @param service: The publish-subscribe service entity.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to subscribe to.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param subscriber: JID to subscribe to the node.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+@@ -148,7 +148,7 @@ class IPubSubClient(Interface):
+         @param service: The publish-subscribe service entity.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to unsubscribe from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param subscriber: JID to unsubscribe from the node.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+@@ -165,9 +165,9 @@ class IPubSubClient(Interface):
+         @param service: The publish-subscribe service entity.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to publish to.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param items: List of item elements.
+-        @type items: C{list} of L{Item}
++        @type items: L{list} of L{Item}
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -191,12 +191,12 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node that was published
+             to.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param notifications: The notifications as tuples of subscriber, the
+             list of subscriptions and the list of items to be notified.
+-        @type notifications: C{list} of
+-            (L{JID<twisted.words.protocols.jabber.jid.JID>}, C{list} of
+-            L{Subscription<wokkel.pubsub.Subscription>}, C{list} of
++        @type notifications: L{list} of
++            (L{JID<twisted.words.protocols.jabber.jid.JID>}, L{list} of
++            L{Subscription<wokkel.pubsub.Subscription>}, L{list} of
+             L{Element<twisted.words.xish.domish.Element>})
+         """
+ 
+@@ -209,14 +209,14 @@ class IPubSubService(Interface):
+         @param service: The entity the notifications will originate from.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node that was deleted.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param subscribers: The subscribers for which a notification should be
+             sent out.
+-        @type subscribers: C{list} of
++        @type subscribers: L{list} of
+             L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param redirectURI: Optional XMPP URI of another node that subscribers
+             are redirected to.
+-        @type redirectURI: C{str}
++        @type redirectURI: L{str}
+         """
+ 
+     def publish(requestor, service, nodeIdentifier, items):
+@@ -228,9 +228,9 @@ class IPubSubService(Interface):
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to publish to.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param items: The items to be published as elements.
+-        @type items: C{list} of C{Element<twisted.words.xish.domish.Element>}
++        @type items: L{list} of C{Element<twisted.words.xish.domish.Element>}
+         @return: deferred that fires on success.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -244,7 +244,7 @@ class IPubSubService(Interface):
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to subscribe to.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param subscriber: The entity to be subscribed.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @return: A deferred that fires with a
+@@ -261,7 +261,7 @@ class IPubSubService(Interface):
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to unsubscribe from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @param subscriber: The entity to be unsubscribed.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @return: A deferred that fires with C{None} when unsubscription has
+@@ -277,7 +277,7 @@ class IPubSubService(Interface):
+         @type requestor: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+-        @return: A deferred that fires with a C{list} of subscriptions as
++        @return: A deferred that fires with a L{list} of subscriptions as
+                  L{Subscription<wokkel.pubsub.Subscription>}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -290,9 +290,9 @@ class IPubSubService(Interface):
+         @type requestor: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+-        @return: A deferred that fires with a C{list} of affiliations as
+-            C{tuple}s of (node identifier as C{unicode}, affiliation state as
+-            C{str}). The affiliation can be C{'owner'}, C{'publisher'}, or
++        @return: A deferred that fires with a L{list} of affiliations as
++            C{tuple}s of (node identifier as L{str}, affiliation state as
++            L{str}). The affiliation can be C{'owner'}, C{'publisher'}, or
+             C{'outcast'}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -308,8 +308,8 @@ class IPubSubService(Interface):
+         @param nodeIdentifier: The suggestion for the identifier of the node
+             to be created. If the request did not include a suggestion for the
+             node identifier, the value is C{None}.
+-        @type nodeIdentifier: C{unicode} or C{NoneType}
+-        @return: A deferred that fires with a C{unicode} that represents
++        @type nodeIdentifier: L{str} or C{NoneType}
++        @return: A deferred that fires with a L{str} that represents
+                  the identifier of the new node.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -322,10 +322,10 @@ class IPubSubService(Interface):
+         by option name. The value of each entry represents the specifics for
+         that option in a dictionary:
+ 
+-         - C{'type'} (C{str}): The option's type (see
++         - C{'type'} (L{str}): The option's type (see
+            L{Field<wokkel.data_form.Field>}'s doc string for possible values).
+-         - C{'label'} (C{unicode}): A human readable label for this option.
+-         - C{'options'} (C{dict}): Optional list of possible values for this
++         - C{'label'} (L{str}): A human readable label for this option.
++         - C{'options'} (L{dict}): Optional list of possible values for this
+            option.
+ 
+         Example::
+@@ -346,7 +346,7 @@ class IPubSubService(Interface):
+                 }
+             }
+ 
+-        @rtype: C{dict}.
++        @rtype: L{dict}.
+         """
+ 
+     def getDefaultConfiguration(requestor, service, nodeType):
+@@ -359,11 +359,11 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeType: The type of node for which the configuration is
+                          retrieved, C{'leaf'} or C{'collection'}.
+-        @type nodeType: C{str}
+-        @return: A deferred that fires with a C{dict} representing the default
+-                 node configuration. Keys are C{str}s that represent the
+-                 field name. Values can be of types C{unicode}, C{int} or
+-                 C{bool}.
++        @type nodeType: L{str}
++        @return: A deferred that fires with a L{dict} representing the default
++                 node configuration. Keys are L{str}s that represent the
++                 field name. Values can be of types L{str}, L{int} or
++                 L{bool}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -377,10 +377,10 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to retrieve the
+                                configuration from.
+-        @type nodeIdentifier: C{unicode}
+-        @return: A deferred that fires with a C{dict} representing the node
+-            configuration. Keys are C{str}s that represent the field name.
+-            Values can be of types C{unicode}, C{int} or C{bool}.
++        @type nodeIdentifier: L{str}
++        @return: A deferred that fires with a L{dict} representing the node
++            configuration. Keys are L{str}s that represent the field name.
++            Values can be of types L{str}, L{int} or L{bool}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -394,7 +394,7 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to change the
+                                configuration of.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: A deferred that fires with C{None} when the node's
+                  configuration has been changed.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+@@ -410,7 +410,7 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to retrieve items
+                                from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+     def retract(requestor, service, nodeIdentifier, itemIdentifiers):
+@@ -423,7 +423,7 @@ class IPubSubService(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to retract items
+                                from.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+     def purge(requestor, service, nodeIdentifier):
+@@ -435,7 +435,7 @@ class IPubSubService(Interface):
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to be purged.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+     def delete(requestor, service, nodeIdentifier):
+@@ -447,7 +447,7 @@ class IPubSubService(Interface):
+         @param service: The entity the request was addressed to.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node to be delete.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         """
+ 
+ 
+@@ -472,7 +472,7 @@ class IPubSubResource(Interface):
+         @param service: The publish-subscribe service entity.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to request the info for.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: A deferred that fires with a dictionary. If not empty,
+                  it must have the keys C{'type'} and C{'meta-data'} to keep
+                  respectively the node type and a dictionary with the meta
+@@ -491,7 +491,7 @@ class IPubSubResource(Interface):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Identifier of the node to request the childs
+             for.
+-        @type nodeIdentifier: C{unicode}
++        @type nodeIdentifier: L{str}
+         @return: A deferred that fires with a list of child node identifiers.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -505,10 +505,10 @@ class IPubSubResource(Interface):
+         by option name. The value of each entry represents the specifics for
+         that option in a dictionary:
+ 
+-         - C{'type'} (C{str}): The option's type (see
++         - C{'type'} (L{str}): The option's type (see
+            L{Field<wokkel.data_form.Field>}'s doc string for possible values).
+-         - C{'label'} (C{unicode}): A human readable label for this option.
+-         - C{'options'} (C{dict}): Optional list of possible values for this
++         - C{'label'} (L{str}): A human readable label for this option.
++         - C{'options'} (L{dict}): Optional list of possible values for this
+            option.
+ 
+         Example::
+@@ -529,7 +529,7 @@ class IPubSubResource(Interface):
+                 }
+             }
+ 
+-        @rtype: C{dict}.
++        @rtype: L{dict}.
+         """
+ 
+ 
+@@ -574,7 +574,7 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{list} of subscriptions as
++        @return: A deferred that fires with a L{list} of subscriptions as
+                  L{Subscription<wokkel.pubsub.Subscription>}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -586,9 +586,9 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{list} of affiliations as
+-            C{tuple}s of (node identifier as C{unicode}, affiliation state as
+-            C{str}). The affiliation can be C{'owner'}, C{'publisher'}, or
++        @return: A deferred that fires with a L{list} of affiliations as
++            C{tuple}s of (node identifier as L{str}, affiliation state as
++            L{str}). The affiliation can be C{'owner'}, C{'publisher'}, or
+             C{'outcast'}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -600,7 +600,7 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{unicode} that represents
++        @return: A deferred that fires with a L{str} that represents
+                  the identifier of the new node.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+@@ -612,10 +612,10 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{dict} representing the default
+-                 node configuration. Keys are C{str}s that represent the
+-                 field name. Values can be of types C{unicode}, C{int} or
+-                 C{bool}.
++        @return: A deferred that fires with a L{dict} representing the default
++                 node configuration. Keys are L{str}s that represent the
++                 field name. Values can be of types L{str}, L{int} or
++                 L{bool}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -626,9 +626,9 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{dict} representing the node
+-            configuration. Keys are C{str}s that represent the field name.
+-            Values can be of types C{unicode}, C{int} or C{bool}.
++        @return: A deferred that fires with a L{dict} representing the node
++            configuration. Keys are L{str}s that represent the field name.
++            Values can be of types L{str}, L{int} or L{bool}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -651,7 +651,7 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{list} of L{pubsub.Item}.
++        @return: A deferred that fires with a L{list} of L{pubsub.Item}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+         """
+ 
+@@ -698,9 +698,9 @@ class IPubSubResource(Interface):
+ 
+         @param request: The publish-subscribe request.
+         @type request: L{wokkel.pubsub.PubSubRequest}
+-        @return: A deferred that fires with a C{dict} of affiliations with the
++        @return: A deferred that fires with a L{dict} of affiliations with the
+             entity as key (L{JID<twisted.words.protocols.jabber.jid.JID>}) and
+-            the affiliation state as value (C{unicode}).  The affiliation can
++            the affiliation state as value (L{str}).  The affiliation can
+             be C{u'owner'}, C{u'publisher'}, or C{u'outcast'}.
+         @rtype: L{Deferred<twisted.internet.defer.Deferred>}
+ 
+@@ -748,7 +748,7 @@ class IMUCClient(Interface):
+         @type  user: L{muc.User}
+ 
+         @param subject: The subject of the given room.
+-        @type subject: C{unicode}
++        @type subject: L{str}
+         """
+ 
+ 
+@@ -769,7 +769,7 @@ class IMUCClient(Interface):
+ 
+         @param options: A mapping of field names to values, or C{None} to
+             cancel.
+-        @type options: C{dict}
++        @type options: L{dict}
+         """
+ 
+ 
+@@ -796,14 +796,14 @@ class IMUCClient(Interface):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the entitity joining the room.
+-        @type nick: C{unicode}
++        @type nick: L{str}
+ 
+         @param historyOptions: Options for conversation history sent by the
+             room upon joining.
+         @type historyOptions: L{HistoryOptions}
+ 
+         @param password: Optional password for the room.
+-        @type password: C{unicode}
++        @type password: L{str}
+ 
+         @return: A deferred that fires when the entity is in the room or an
+                  error has occurred.
+@@ -820,7 +820,7 @@ class IMUCClient(Interface):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The new nick name within the room.
+-        @type nick: C{unicode}
++        @type nick: L{str}
+         """
+ 
+ 
+@@ -876,7 +876,7 @@ class IMUCClient(Interface):
+ 
+         @param options: A mapping of field names to values, or C{None} to
+             cancel.
+-        @type options: C{dict}
++        @type options: L{dict}
+         """
+ 
+ 
+@@ -890,7 +890,7 @@ class IMUCClient(Interface):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param subject: The subject you want to set.
+-        @type subject: C{unicode}
++        @type subject: L{str}
+         """
+ 
+ 
+@@ -917,7 +917,7 @@ class IMUCClient(Interface):
+             holding the original stanza a
+             L{Element<twisted.words.xish.domish.Element>}, and C{'timestamp'}
+             with the timestamp.
+-        @type messages: C{list} of
++        @type messages: L{list} of
+             L{Element<twisted.words.xish.domish.Element>}
+         """
+ 
+@@ -933,7 +933,7 @@ class IMUCClient(Interface):
+         @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param reason: The reason for banning the entity.
+-        @type reason: C{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -949,10 +949,10 @@ class IMUCClient(Interface):
+ 
+         @param nick: The occupant to be banned.
+         @type nick: L{JID<twisted.words.protocols.jabber.jid.JID>} or
+-            C{unicode}
++            L{str}
+ 
+         @param reason: The reason given for the kick.
+-        @type reason: C{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+diff --git a/wokkel/muc.py b/wokkel/muc.py
+index 330664b..4c826f2 100644
+--- a/wokkel/muc.py
++++ b/wokkel/muc.py
+@@ -17,7 +17,6 @@ from dateutil.tz import tzutc
+ from zope.interface import implementer
+ 
+ from twisted.internet import defer
+-from twisted.python.compat import unicode
+ from twisted.python.constants import Values, ValueConstant
+ from twisted.words.protocols.jabber import jid, error, xmlstream
+ from twisted.words.xish import domish
+@@ -192,7 +191,7 @@ class AdminItem(object):
+         item.role = element.getAttribute('role')
+ 
+         for child in element.elements(NS_MUC_ADMIN, 'reason'):
+-            item.reason = unicode(child)
++            item.reason = str(child)
+ 
+         return item
+ 
+@@ -228,13 +227,13 @@ class DestructionRequest(generic.Request):
+     Room destruction request.
+ 
+     @param reason: Optional reason for the destruction of this room.
+-    @type reason: L{unicode}.
++    @type reason: L{str}.
+ 
+     @param alternate: Optional room JID of an alternate venue.
+     @type alternate: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+     @param password: Optional password for entering the alternate venue.
+-    @type password: L{unicode}
++    @type password: L{str}
+     """
+ 
+     stanzaType = 'set'
+@@ -395,10 +394,10 @@ class UserPresence(xmppim.AvailabilityPresence):
+     Availability presence sent from MUC service to client.
+ 
+     @ivar affiliation: Affiliation of the entity to the room.
+-    @type affiliation: L{unicode}
++    @type affiliation: L{str}
+ 
+     @ivar role: Role of the entity in the room.
+-    @type role: L{unicode}
++    @type role: L{str}
+ 
+     @ivar entity: The real JID of the entity this presence is from.
+     @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -408,7 +407,7 @@ class UserPresence(xmppim.AvailabilityPresence):
+     @type mucStatuses: L{Statuses}
+ 
+     @ivar nick: The nick name of the entity in the room.
+-    @type nick: L{unicode}
++    @type nick: L{str}
+     """
+ 
+     affiliation = None
+@@ -451,7 +450,7 @@ class UserPresence(xmppim.AvailabilityPresence):
+                 self.role = child.getAttribute('role')
+ 
+                 for reason in child.elements(NS_MUC_ADMIN, 'reason'):
+-                    self.reason = unicode(reason)
++                    self.reason = str(reason)
+ 
+             # TODO: destroy
+ 
+@@ -595,14 +594,14 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the entitity joining the room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param historyOptions: Options for conversation history sent by the
+             room upon joining.
+         @type historyOptions: L{HistoryOptions}
+ 
+         @param password: Optional password for the room.
+-        @type password: L{unicode}
++        @type password: L{str}
+ 
+         @return: A deferred that fires when the entity is in the room or an
+                  error has occurred.
+@@ -628,7 +627,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The new nick name within the room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+         """
+         occupantJID = jid.JID(tuple=(roomJID.user, roomJID.host, nick))
+         presence = BasicPresence(recipient=occupantJID)
+@@ -646,10 +645,10 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+ 
+         @param show: The availability of the entity. Common values are xa,
+             available, etc
+-        @type show: L{unicode}
++        @type show: L{str}
+ 
+         @param status: The current status of the entity.
+-        @type status: L{unicode}
++        @type status: L{str}
+         """
+         occupantJID = self._roomOccupantMap[roomJID]
+         presence = BasicPresence(recipient=occupantJID, show=show,
+@@ -704,7 +703,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param subject: The subject you want to set.
+-        @type subject: L{unicode}
++        @type subject: L{str}
+         """
+         message = GroupChat(roomJID.userhostJID(), subject=subject)
+         self.send(message.toElement())
+@@ -723,7 +722,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type invitee: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param reason: The reason for the invite.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+         """
+         message = InviteMessage(recipient=roomJID, invitee=invitee,
+                                 reason=reason)
+@@ -970,7 +969,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+             L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param affiliation: The affilation to the entities will acquire.
+-        @type affiliation: L{unicode}
++        @type affiliation: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -992,10 +991,10 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the user in this room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param reason: The reason for granting voice to the entity.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1015,10 +1014,10 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the user in this room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param reason: The reason for revoking voice from the entity.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1035,10 +1034,10 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the user in this room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param reason: The reason for granting moderation to the entity.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1058,7 +1057,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param reason: The reason for banning the entity.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1075,10 +1074,10 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The occupant to be banned.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param reason: The reason given for the kick.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param sender: The entity sending the request.
+         @type sender: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1095,7 +1094,7 @@ class MUCClientProtocol(xmppim.BasePresenceProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param reason: The reason for the destruction of the room.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param alternate: The JID of the room suggested as an alternate venue.
+         @type alternate: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1135,7 +1134,7 @@ class Room(object):
+     @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+     @ivar nick: The nick name for the client in this room.
+-    @type nick: L{unicode}
++    @type nick: L{str}
+ 
+     @ivar occupantJID: The JID of the occupant in the room. Generated from
+         roomJID and nick.
+@@ -1190,7 +1189,7 @@ class Room(object):
+         Get a user from the room's roster.
+ 
+         @param nick: The nick for the user in the MUC room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+         """
+         return self.roster.get(nick)
+ 
+@@ -1444,14 +1443,14 @@ class MUCClient(MUCClientProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The nick name for the entitity joining the room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+ 
+         @param historyOptions: Options for conversation history sent by the
+             room upon joining.
+         @type historyOptions: L{HistoryOptions}
+ 
+         @param password: Optional password for the room.
+-        @type password: L{unicode}
++        @type password: L{str}
+ 
+         @return: A deferred that fires with the room when the entity is in the
+             room, or with a failure if an error has occurred.
+@@ -1488,7 +1487,7 @@ class MUCClient(MUCClientProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nick: The new nick name within the room.
+-        @type nick: L{unicode}
++        @type nick: L{str}
+         """
+         def cb(presence):
+             # Presence confirmation, change the nickname.
+@@ -1530,10 +1529,10 @@ class MUCClient(MUCClientProtocol):
+ 
+         @param show: The availability of the entity. Common values are xa,
+             available, etc
+-        @type show: L{unicode}
++        @type show: L{str}
+ 
+         @param status: The current status of the entity.
+-        @type status: L{unicode}
++        @type status: L{str}
+         """
+         room = self._getRoom(roomJID)
+         d = MUCClientProtocol.status(self, roomJID, show, status)
+@@ -1549,7 +1548,7 @@ class MUCClient(MUCClientProtocol):
+         @type roomJID: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param reason: The reason for the destruction of the room.
+-        @type reason: L{unicode}
++        @type reason: L{str}
+ 
+         @param alternate: The JID of the room suggested as an alternate venue.
+         @type alternate: L{JID<twisted.words.protocols.jabber.jid.JID>}
+diff --git a/wokkel/pubsub.py b/wokkel/pubsub.py
+index 689a6e2..2eb1b44 100644
+--- a/wokkel/pubsub.py
++++ b/wokkel/pubsub.py
+@@ -16,7 +16,6 @@ from zope.interface import implementer
+ 
+ from twisted.internet import defer
+ from twisted.python import log
+-from twisted.python.compat import StringType, iteritems, unicode
+ from twisted.words.protocols.jabber import jid, error
+ from twisted.words.xish import domish
+ 
+@@ -107,20 +106,20 @@ class Subscription(object):
+ 
+     @ivar nodeIdentifier: The identifier of the node subscribed to.  The root
+         node is denoted by L{None}.
+-    @type nodeIdentifier: L{unicode}
++    @type nodeIdentifier: L{str}
+ 
+     @ivar subscriber: The subscribing entity.
+     @type subscriber: L{jid.JID}
+ 
+     @ivar state: The subscription state. One of C{'subscribed'}, C{'pending'},
+                  C{'unconfigured'}.
+-    @type state: L{unicode}
++    @type state: L{str}
+ 
+     @ivar options: Optional list of subscription options.
+     @type options: L{dict}
+ 
+     @ivar subscriptionIdentifier: Optional subscription identifier.
+-    @type subscriptionIdentifier: L{unicode}
++    @type subscriptionIdentifier: L{str}
+     """
+ 
+     def __init__(self, nodeIdentifier, subscriber, state, options=None,
+@@ -150,7 +149,7 @@ class Subscription(object):
+         element = domish.Element((defaultUri, 'subscription'))
+         if self.nodeIdentifier:
+             element['node'] = self.nodeIdentifier
+-        element['jid'] = unicode(self.subscriber)
++        element['jid'] = str(self.subscriber)
+         element['subscription'] = self.state
+         if self.subscriptionIdentifier:
+             element['subid'] = self.subscriptionIdentifier
+@@ -171,17 +170,17 @@ class Item(domish.Element):
+     def __init__(self, id=None, payload=None):
+         """
+         @param id: optional item identifier
+-        @type id: L{unicode}
++        @type id: L{str}
+         @param payload: optional item payload. Either as a domish element, or
+                         as serialized XML.
+-        @type payload: object providing L{domish.IElement} or L{unicode}.
++        @type payload: object providing L{domish.IElement} or L{str}.
+         """
+ 
+         domish.Element.__init__(self, (None, 'item'))
+         if id is not None:
+             self['id'] = id
+         if payload is not None:
+-            if isinstance(payload, StringType):
++            if isinstance(payload, str):
+                 self.addRawXml(payload)
+             else:
+                 self.addChild(payload)
+@@ -213,7 +212,7 @@ class PubSubRequest(generic.Stanza):
+     @type maxItems: L{int}.
+ 
+     @ivar nodeIdentifier: Identifier of the node the request is about.
+-    @type nodeIdentifier: L{unicode}
++    @type nodeIdentifier: L{str}
+ 
+     @ivar nodeType: The type of node that should be created, or for which the
+                     configuration is retrieved. C{'leaf'} or C{'collection'}.
+@@ -227,7 +226,7 @@ class PubSubRequest(generic.Stanza):
+     @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+     @ivar subscriptionIdentifier: Identifier for a specific subscription.
+-    @type subscriptionIdentifier: L{unicode}
++    @type subscriptionIdentifier: L{str}
+ 
+     @ivar subscriptions: Subscriptions to be modified, as a set of
+         L{Subscription}.
+@@ -235,7 +234,7 @@ class PubSubRequest(generic.Stanza):
+ 
+     @ivar affiliations: Affiliations to be modified, as a dictionary of entity
+         (L{JID<twisted.words.protocols.jabber.jid.JID>} to affiliation
+-        (L{unicode}).
++        (L{str}).
+     @type affiliations: L{dict}
+     """
+ 
+@@ -277,7 +276,7 @@ class PubSubRequest(generic.Stanza):
+     }
+ 
+     # Map request verb to request iq type and subelement name
+-    _verbRequestMap = dict(((v, k) for k, v in iteritems(_requestVerbMap)))
++    _verbRequestMap = dict(((v, k) for k, v in _requestVerbMap.items()))
+ 
+     # Map request verb to parameter handler names
+     _parameters = {
+@@ -487,7 +486,7 @@ class PubSubRequest(generic.Stanza):
+         Render maximum items into an items request.
+         """
+         if self.maxItems:
+-            verbElement['max_items'] = unicode(self.maxItems)
++            verbElement['max_items'] = str(self.maxItems)
+ 
+ 
+     def _parse_subidOrNone(self, verbElement):
+@@ -648,7 +647,7 @@ class PubSubEvent(object):
+     @param recipient: The entity to which the notification was sent.
+     @type recipient: L{wokkel.pubsub.ItemsEvent}
+     @param nodeIdentifier: Identifier of the node the event pertains to.
+-    @type nodeIdentifier: L{unicode}
++    @type nodeIdentifier: L{str}
+     @param headers: SHIM headers, see L{wokkel.shim.extractHeaders}.
+     @type headers: L{dict}
+     """
+@@ -772,7 +771,7 @@ class PubSubClient(XMPPHandler):
+         @param service: The publish subscribe service to create the node at.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: Optional suggestion for the id of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+         @param options: Optional node configuration options.
+         @type options: L{dict}
+         """
+@@ -807,7 +806,7 @@ class PubSubClient(XMPPHandler):
+         @param service: The publish subscribe service to delete the node from.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+         """
+         request = PubSubRequest('delete')
+         request.recipient = service
+@@ -825,7 +824,7 @@ class PubSubClient(XMPPHandler):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param subscriber: The entity to subscribe to the node. This entity
+             will get notifications of new published items.
+@@ -877,13 +876,13 @@ class PubSubClient(XMPPHandler):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param subscriber: The entity to unsubscribe from the node.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param subscriptionIdentifier: Optional subscription identifier.
+-        @type subscriptionIdentifier: L{unicode}
++        @type subscriptionIdentifier: L{str}
+         """
+         request = PubSubRequest('unsubscribe')
+         request.recipient = service
+@@ -901,7 +900,7 @@ class PubSubClient(XMPPHandler):
+         @param service: The publish subscribe service that keeps the node.
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+         @param items: Optional list of L{Item}s to publish.
+         @type items: L{list}
+         """
+@@ -922,7 +921,7 @@ class PubSubClient(XMPPHandler):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param maxItems: Optional limit on the number of retrieved items.
+         @type maxItems: L{int}
+@@ -930,10 +929,10 @@ class PubSubClient(XMPPHandler):
+         @param subscriptionIdentifier: Optional subscription identifier. In
+             case the node has been subscribed to multiple times, this narrows
+             the results to the specific subscription.
+-        @type subscriptionIdentifier: L{unicode}
++        @type subscriptionIdentifier: L{str}
+ 
+         @param itemIdentifiers: Identifiers of the items to be retrieved.
+-        @type itemIdentifiers: L{set} of L{unicode}
++        @type itemIdentifiers: L{set} of L{str}
+         """
+         request = PubSubRequest('items')
+         request.recipient = service
+@@ -965,13 +964,13 @@ class PubSubClient(XMPPHandler):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param subscriber: The entity subscribed to the node.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param subscriptionIdentifier: Optional subscription identifier.
+-        @type subscriptionIdentifier: L{unicode}
++        @type subscriptionIdentifier: L{str}
+ 
+         @rtype: L{data_form.Form}
+         """
+@@ -1002,7 +1001,7 @@ class PubSubClient(XMPPHandler):
+         @type service: L{JID<twisted.words.protocols.jabber.jid.JID>}
+ 
+         @param nodeIdentifier: The identifier of the node.
+-        @type nodeIdentifier: L{unicode}
++        @type nodeIdentifier: L{str}
+ 
+         @param subscriber: The entity subscribed to the node.
+         @type subscriber: L{JID<twisted.words.protocols.jabber.jid.JID>}
+@@ -1011,7 +1010,7 @@ class PubSubClient(XMPPHandler):
+         @type options: L{dict}.
+ 
+         @param subscriptionIdentifier: Optional subscription identifier.
+-        @type subscriptionIdentifier: L{unicode}
++        @type subscriptionIdentifier: L{str}
+         """
+         request = PubSubRequest('optionsSet')
+         request.recipient = service
+@@ -1356,7 +1355,7 @@ class PubSubService(XMPPHandler, IQHandlerMixin):
+         if request.nodeIdentifier:
+             affiliations['node'] = request.nodeIdentifier
+ 
+-        for entity, affiliation in iteritems(result):
++        for entity, affiliation in result.items():
+             item = affiliations.addElement('affiliation')
+             item['jid'] = entity.full()
+             item['affiliation'] = affiliation
+diff --git a/wokkel/server.py b/wokkel/server.py
+index 54517a2..fbd8452 100644
+--- a/wokkel/server.py
++++ b/wokkel/server.py
+@@ -22,7 +22,6 @@ from zope.interface import implementer
+ from twisted.internet import defer, reactor
+ from twisted.names.srvconnect import SRVConnector
+ from twisted.python import log, randbytes
+-from twisted.python.compat import iteritems, unicode
+ from twisted.words.protocols.jabber import error, ijabber, jid, xmlstream
+ from twisted.words.xish import domish
+ 
+@@ -40,15 +39,15 @@ def generateKey(secret, receivingServer, originatingServer, streamID):
+ 
+     @param secret: the shared secret known to the Originating Server and
+                    Authoritive Server.
+-    @type secret: L{unicode}
++    @type secret: L{str}
+     @param receivingServer: the Receiving Server host name.
+-    @type receivingServer: L{unicode}
++    @type receivingServer: L{str}
+     @param originatingServer: the Originating Server host name.
+-    @type originatingServer: L{unicode}
++    @type originatingServer: L{str}
+     @param streamID: the Stream ID as generated by the Receiving Server.
+-    @type streamID: L{unicode}
++    @type streamID: L{str}
+     @return: hexadecimal digest of the generated key.
+-    @type: C{str}
++    @type: L{str}
+     """
+ 
+     hashObject = sha256()
+@@ -340,7 +339,7 @@ class XMPPServerListenAuthenticator(xmlstream.ListenAuthenticator):
+         try:
+             if xmlstream.NS_STREAMS != rootElement.uri or \
+                self.namespace != self.xmlstream.namespace or \
+-               ('db', NS_DIALBACK) not in iteritems(rootElement.localPrefixes):
++               ('db', NS_DIALBACK) not in rootElement.localPrefixes.items():
+                 raise error.StreamError('invalid-namespace')
+ 
+             if targetDomain and targetDomain not in self.service.domains:
+@@ -379,7 +378,7 @@ class XMPPServerListenAuthenticator(xmlstream.ListenAuthenticator):
+             raise error.StreamError('invalid-from')
+ 
+         streamID = verify.getAttribute('id', '')
+-        key = unicode(verify)
++        key = str(verify)
+ 
+         calculatedKey = generateKey(self.service.secret, receivingServer,
+                                     originatingServer, streamID)
+@@ -415,7 +414,7 @@ class XMPPServerListenAuthenticator(xmlstream.ListenAuthenticator):
+ 
+         receivingServer = result['to']
+         originatingServer = result['from']
+-        key = unicode(result)
++        key = str(result)
+ 
+         d = self.service.validateConnection(receivingServer, originatingServer,
+                                             self.xmlstream.sid, key)
+diff --git a/wokkel/shim.py b/wokkel/shim.py
+index 3b12349..85a0848 100644
+--- a/wokkel/shim.py
++++ b/wokkel/shim.py
+@@ -12,7 +12,6 @@ U{XEP-0131<http://xmpp.org/extensions/xep-0131.html>}.
+ 
+ from __future__ import division, absolute_import
+ 
+-from twisted.python.compat import unicode
+ from twisted.words.xish import domish
+ 
+ NS_SHIM = "http://jabber.org/protocol/shim"
+@@ -30,7 +29,7 @@ def extractHeaders(stanza):
+     @param stanza: The stanza to extract headers from.
+     @type stanza: L{Element<twisted.words.xish.domish.Element>}
+     @return: Headers as a mapping from header name to a list of values.
+-    @rtype: C{dict}
++    @rtype: L{dict}
+     """
+     headers = {}
+ 
+@@ -38,6 +37,6 @@ def extractHeaders(stanza):
+                                                  'headers', NS_SHIM):
+         for header in domish.generateElementsQNamed(element.children,
+                                                     'header', NS_SHIM):
+-            headers.setdefault(header['name'], []).append(unicode(header))
++            headers.setdefault(header['name'], []).append(str(header))
+ 
+     return headers
+diff --git a/wokkel/subprotocols.py b/wokkel/subprotocols.py
+index f0a6090..b4cde14 100644
+--- a/wokkel/subprotocols.py
++++ b/wokkel/subprotocols.py
+@@ -14,7 +14,6 @@ from zope.interface import implementer
+ from twisted.internet import defer
+ from twisted.internet.error import ConnectionDone
+ from twisted.python import failure, log
+-from twisted.python.compat import iteritems, itervalues
+ from twisted.python.deprecate import deprecatedModuleAttribute
+ from twisted.words.protocols.jabber import error, ijabber, xmlstream
+ from twisted.words.protocols.jabber.xmlstream import toResponse
+@@ -130,15 +129,15 @@ class StreamManager(XMPPHandlerCollection):
+     @ivar xmlstream: currently managed XML stream
+     @type xmlstream: L{XmlStream}
+     @ivar logTraffic: if true, log all traffic.
+-    @type logTraffic: C{bool}
++    @type logTraffic: L{bool}
+     @ivar _initialized: Whether the stream represented by L{xmlstream} has
+                         been initialized. This is used when caching outgoing
+                         stanzas.
+-    @type _initialized: C{bool}
++    @type _initialized: L{bool}
+     @ivar _packetQueue: internal buffer of unsent data. See L{send} for details.
+     @type _packetQueue: L{list}
+     @ivar timeout: Default IQ request timeout in seconds.
+-    @type timeout: C{int}
++    @type timeout: L{int}
+     @ivar _reactor: A provider of L{IReactorTime} to track timeouts.
+     """
+     timeout = None
+@@ -277,7 +276,7 @@ class StreamManager(XMPPHandlerCollection):
+         # deferreds will never be fired.
+         iqDeferreds = self._iqDeferreds
+         self._iqDeferreds = {}
+-        for d in itervalues(iqDeferreds):
++        for d in iqDeferreds.values():
+             d.errback(reason)
+ 
+ 
+@@ -420,7 +419,7 @@ class IQHandlerMixin(object):
+ 
+     @cvar iqHandlers: Mapping from XPath queries (as a string) to the method
+                       name that will handle requests that match the query.
+-    @type iqHandlers: C{dict}
++    @type iqHandlers: L{dict}
+     """
+ 
+     iqHandlers = None
+@@ -455,7 +454,7 @@ class IQHandlerMixin(object):
+             return error.StanzaError('internal-server-error').toResponse(iq)
+ 
+         handler = None
+-        for queryString, method in iteritems(self.iqHandlers):
++        for queryString, method in self.iqHandlers.items():
+             if xpath.internQuery(queryString).matches(iq):
+                 handler = getattr(self, method)
+ 
+diff --git a/wokkel/test/helpers.py b/wokkel/test/helpers.py
+index 102b3dc..c76a4a0 100644
+--- a/wokkel/test/helpers.py
++++ b/wokkel/test/helpers.py
+@@ -8,7 +8,6 @@ Unit test helpers.
+ from __future__ import division, absolute_import
+ 
+ from twisted.internet import defer
+-from twisted.python.compat import iteritems
+ from twisted.words.xish import xpath
+ from twisted.words.xish.utility import EventDispatcher
+ 
+@@ -79,14 +78,14 @@ class TestableRequestHandlerMixin(object):
+         Find a handler and call it directly.
+ 
+         @param xml: XML stanza that may yield a handler being called.
+-        @type xml: C{str}.
++        @type xml: L{str}.
+         @return: Deferred that fires with the result of a handler for this
+                  stanza. If no handler was found, the deferred has its errback
+                  called with a C{NotImplementedError} exception.
+         """
+         handler = None
+         iq = parseXml(xml)
+-        for queryString, method in iteritems(self.service.iqHandlers):
++        for queryString, method in self.service.iqHandlers.items():
+             if xpath.internQuery(queryString).matches(iq):
+                 handler = getattr(self.service, method)
+ 
+diff --git a/wokkel/test/test_client.py b/wokkel/test/test_client.py
+index ef367f7..ef9adfd 100644
+--- a/wokkel/test/test_client.py
++++ b/wokkel/test/test_client.py
+@@ -8,6 +8,7 @@ Tests for L{wokkel.client}.
+ from __future__ import division, absolute_import
+ 
+ from twisted.internet import defer
++from twisted.python.compat import nativeString
+ from twisted.trial import unittest
+ from twisted.words.protocols.jabber import xmlstream
+ from twisted.words.protocols.jabber.client import XMPPAuthenticator
+@@ -152,7 +153,7 @@ class ClientCreatorTest(unittest.TestCase):
+ 
+         def cb(connector):
+             self.assertEqual('xmpp-client', connector.service)
+-            self.assertEqual('example.org', connector.domain)
++            self.assertEqual('example.org', nativeString(connector.domain))
+             self.assertEqual(factory, connector.factory)
+ 
+         def connect(connector):
+diff --git a/wokkel/test/test_data_form.py b/wokkel/test/test_data_form.py
+index 60e36f4..246f1c5 100644
+--- a/wokkel/test/test_data_form.py
++++ b/wokkel/test/test_data_form.py
+@@ -10,7 +10,6 @@ from __future__ import division, absolute_import
+ from zope.interface import verify
+ from zope.interface.common.mapping import IIterableMapping
+ 
+-from twisted.python.compat import unicode, _PY3
+ from twisted.trial import unittest
+ from twisted.words.xish import domish
+ from twisted.words.protocols.jabber import jid
+@@ -34,7 +33,7 @@ class OptionTest(unittest.TestCase):
+         self.assertEqual('option', element.name)
+         self.assertEqual(NS_X_DATA, element.uri)
+         self.assertEqual(NS_X_DATA, element.value.uri)
+-        self.assertEqual('value', unicode(element.value))
++        self.assertEqual('value', str(element.value))
+         self.assertFalse(element.hasAttribute('label'))
+ 
+ 
+@@ -48,7 +47,7 @@ class OptionTest(unittest.TestCase):
+         self.assertEqual('option', element.name)
+         self.assertEqual(NS_X_DATA, element.uri)
+         self.assertEqual(NS_X_DATA, element.value.uri)
+-        self.assertEqual('value', unicode(element.value))
++        self.assertEqual('value', str(element.value))
+         self.assertEqual('label', element['label'])
+ 
+ 
+@@ -225,7 +224,7 @@ class FieldTest(unittest.TestCase):
+         child = element.children[0]
+         self.assertEqual('desc', child.name)
+         self.assertEqual(NS_X_DATA, child.uri)
+-        self.assertEqual(u'My desc', unicode(child))
++        self.assertEqual(u'My desc', str(child))
+ 
+ 
+     def test_toElementRequired(self):
+@@ -248,7 +247,7 @@ class FieldTest(unittest.TestCase):
+         field = data_form.Field(fieldType='jid-single', var='test',
+                                 value=jid.JID(u'test@example.org'))
+         element = field.toElement()
+-        self.assertEqual(u'test@example.org', unicode(element.value))
++        self.assertEqual(u'test@example.org', str(element.value))
+ 
+ 
+     def test_toElementJIDTextSingle(self):
+@@ -258,7 +257,7 @@ class FieldTest(unittest.TestCase):
+         field = data_form.Field(fieldType='text-single', var='test',
+                                 value=jid.JID(u'test@example.org'))
+         element = field.toElement()
+-        self.assertEqual(u'test@example.org', unicode(element.value))
++        self.assertEqual(u'test@example.org', str(element.value))
+ 
+ 
+     def test_toElementBoolean(self):
+@@ -268,7 +267,7 @@ class FieldTest(unittest.TestCase):
+         field = data_form.Field(fieldType='boolean', var='test',
+                                 value=True)
+         element = field.toElement()
+-        self.assertEqual(u'true', unicode(element.value))
++        self.assertEqual(u'true', str(element.value))
+ 
+ 
+     def test_toElementBooleanTextSingle(self):
+@@ -277,7 +276,7 @@ class FieldTest(unittest.TestCase):
+         """
+         field = data_form.Field(var='test', value=True)
+         element = field.toElement()
+-        self.assertEqual(u'true', unicode(element.value))
++        self.assertEqual(u'true', str(element.value))
+ 
+ 
+     def test_toElementNoType(self):
+@@ -396,7 +395,7 @@ class FieldTest(unittest.TestCase):
+ 
+     def test_fromElementValueTextSingle(self):
+         """
+-        Parsed text-single field values should be of type C{unicode}.
++        Parsed text-single field values should be of type L{str}.
+         """
+         element = domish.Element((NS_X_DATA, 'field'))
+         element['type'] = 'text-single'
+@@ -407,7 +406,7 @@ class FieldTest(unittest.TestCase):
+ 
+     def test_fromElementValueJID(self):
+         """
+-        Parsed jid-single field values should be of type C{unicode}.
++        Parsed jid-single field values should be of type L{str}.
+         """
+         element = domish.Element((NS_X_DATA, 'field'))
+         element['type'] = 'jid-single'
+@@ -418,7 +417,7 @@ class FieldTest(unittest.TestCase):
+ 
+     def test_fromElementValueJIDMalformed(self):
+         """
+-        Parsed jid-single field values should be of type C{unicode}.
++        Parsed jid-single field values should be of type L{str}.
+ 
+         No validation should be done at this point, so invalid JIDs should
+         also be passed as-is.
+@@ -432,7 +431,7 @@ class FieldTest(unittest.TestCase):
+ 
+     def test_fromElementValueBoolean(self):
+         """
+-        Parsed boolean field values should be of type C{unicode}.
++        Parsed boolean field values should be of type L{str}.
+         """
+         element = domish.Element((NS_X_DATA, 'field'))
+         element['type'] = 'boolean'
+@@ -561,7 +560,7 @@ class FormTest(unittest.TestCase):
+         title = elements[0]
+         self.assertEqual('title', title.name)
+         self.assertEqual(NS_X_DATA, title.uri)
+-        self.assertEqual('Bot configuration', unicode(title))
++        self.assertEqual('Bot configuration', str(title))
+ 
+ 
+     def test_toElementInstructions(self):
+@@ -576,7 +575,7 @@ class FormTest(unittest.TestCase):
+         instructions = elements[0]
+         self.assertEqual('instructions', instructions.name)
+         self.assertEqual(NS_X_DATA, instructions.uri)
+-        self.assertEqual('Fill out this form!', unicode(instructions))
++        self.assertEqual('Fill out this form!', str(instructions))
+ 
+ 
+     def test_toElementInstructionsMultiple(self):
+@@ -593,10 +592,10 @@ class FormTest(unittest.TestCase):
+         instructions2 = elements[1]
+         self.assertEqual('instructions', instructions1.name)
+         self.assertEqual(NS_X_DATA, instructions1.uri)
+-        self.assertEqual('Fill out this form!', unicode(instructions1))
++        self.assertEqual('Fill out this form!', str(instructions1))
+         self.assertEqual('instructions', instructions2.name)
+         self.assertEqual(NS_X_DATA, instructions2.uri)
+-        self.assertEqual('no really', unicode(instructions2))
++        self.assertEqual('no really', str(instructions2))
+ 
+ 
+     def test_toElementFormType(self):
+@@ -613,7 +612,7 @@ class FormTest(unittest.TestCase):
+         self.assertEqual(NS_X_DATA, formTypeField.uri)
+         self.assertEqual('FORM_TYPE', formTypeField['var'])
+         self.assertEqual('hidden', formTypeField['type'])
+-        self.assertEqual('jabber:bot', unicode(formTypeField.value))
++        self.assertEqual('jabber:bot', str(formTypeField.value))
+ 
+ 
+     def test_toElementFields(self):
+@@ -1091,7 +1090,7 @@ class FormTest(unittest.TestCase):
+         self.assertNotIn('features', form)
+ 
+ 
+-    def test_iterkeys(self):
++    def test_keys(self):
+         """
+         Iterating over the keys of a form yields all field names.
+         """
+@@ -1101,10 +1100,10 @@ class FormTest(unittest.TestCase):
+                                                 values=['news', 'search'])]
+         form = data_form.Form('submit', fields=fields)
+         self.assertEqual(set(['botname', 'public', 'features']),
+-                         set(form.iterkeys()))
++                         set(form.keys()))
+ 
+ 
+-    def test_itervalues(self):
++    def test_values(self):
+         """
+         Iterating over the values of a form yields all field values.
+         """
+@@ -1112,63 +1111,19 @@ class FormTest(unittest.TestCase):
+                   data_form.Field('boolean', var='public', value=True)]
+         form = data_form.Form('submit', fields=fields)
+         self.assertEqual(set(['The Jabber Bot', True]),
+-                         set(form.itervalues()))
+-
+-
+-    def test_iteritems(self):
+-        """
+-        Iterating over the values of a form yields all item tuples.
+-        """
+-        fields = [data_form.Field(var='botname', value='The Jabber Bot'),
+-                  data_form.Field('boolean', var='public', value=True)]
+-        form = data_form.Form('submit', fields=fields)
+-        self.assertEqual(set([('botname', 'The Jabber Bot'),
+-                              ('public', True)]),
+-                         set(form.iteritems()))
+-
+-
+-    def test_keys(self):
+-        """
+-        Getting the keys of a form yields a list of field names.
+-        """
+-        fields = [data_form.Field(var='botname', value='The Jabber Bot'),
+-                  data_form.Field('boolean', var='public', value=True),
+-                  data_form.Field('list-multi', var='features',
+-                                                values=['news', 'search'])]
+-        form = data_form.Form('submit', fields=fields)
+-        keys = form.keys()
+-        if not _PY3:
+-            self.assertIsInstance(keys, list)
+-        self.assertEqual(set(['botname', 'public', 'features']),
+-                         set(keys))
+-
+-
+-    def test_values(self):
+-        """
+-        Getting the values of a form yields a list of field values.
+-        """
+-        fields = [data_form.Field(var='botname', value='The Jabber Bot'),
+-                  data_form.Field('boolean', var='public', value=True)]
+-        form = data_form.Form('submit', fields=fields)
+-        values = form.values()
+-        if not _PY3:
+-            self.assertIsInstance(values, list)
+-        self.assertEqual(set(['The Jabber Bot', True]), set(values))
++                         set(form.values()))
+ 
+ 
+     def test_items(self):
+         """
+-        Iterating over the values of a form yields a list of all item tuples.
++        Iterating over the values of a form yields all item tuples.
+         """
+         fields = [data_form.Field(var='botname', value='The Jabber Bot'),
+                   data_form.Field('boolean', var='public', value=True)]
+         form = data_form.Form('submit', fields=fields)
+-        items = form.items()
+-        if not _PY3:
+-            self.assertIsInstance(items, list)
+         self.assertEqual(set([('botname', 'The Jabber Bot'),
+                               ('public', True)]),
+-                         set(items))
++                         set(form.items()))
+ 
+ 
+     def test_getValues(self):
+diff --git a/wokkel/test/test_generic.py b/wokkel/test/test_generic.py
+index 94c39e5..4e4ab45 100644
+--- a/wokkel/test/test_generic.py
++++ b/wokkel/test/test_generic.py
+@@ -7,19 +7,12 @@ Tests for L{wokkel.generic}.
+ 
+ from __future__ import division, absolute_import
+ 
+-import re
+-
+ from zope.interface.verify import verifyObject
+ 
+-from twisted.python import deprecate
+-from twisted.python.compat import unicode
+ from twisted.trial import unittest
+-from twisted.trial.util import suppress as SUPPRESS
+ from twisted.words.xish import domish
+ from twisted.words.protocols.jabber.jid import JID
+ 
+-from incremental import Version
+-
+ from wokkel import generic
+ from wokkel.iwokkel import IDisco
+ from wokkel.test.helpers import XmlStreamStub
+@@ -66,11 +59,11 @@ class VersionHandlerTest(unittest.TestCase):
+         elements = list(domish.generateElementsQNamed(response.query.children,
+                                                       'name', NS_VERSION))
+         self.assertEquals(1, len(elements))
+-        self.assertEquals('Test', unicode(elements[0]))
++        self.assertEquals('Test', str(elements[0]))
+         elements = list(domish.generateElementsQNamed(response.query.children,
+                                                       'version', NS_VERSION))
+         self.assertEquals(1, len(elements))
+-        self.assertEquals('0.1.0', unicode(elements[0]))
++        self.assertEquals('0.1.0', str(elements[0]))
+ 
+ 
+ 
+@@ -314,67 +307,3 @@ class RequestTest(unittest.TestCase):
+ 
+         request = SetRequest()
+         self.assertEqual('set', request.stanzaType)
+-
+-
+-
+-class PrepareIDNNameTests(unittest.TestCase):
+-    """
+-    Tests for L{wokkel.generic.prepareIDNName}.
+-    """
+-
+-    suppress = [SUPPRESS(category=DeprecationWarning,
+-                         message=re.escape(
+-                             deprecate.getDeprecationWarningString(
+-                                 generic.prepareIDNName,
+-                                 Version("wokkel", 18, 0, 0),
+-                                 replacement="unicode.encode('idna')")))]
+-
+-
+-    def test_deprecated(self):
+-        """
+-        prepareIDNName is deprecated.
+-        """
+-        self.callDeprecated((Version("wokkel", 18, 0, 0),
+-                             "unicode.encode('idna')"),
+-                            generic.prepareIDNName, ("example.com"))
+-    test_deprecated.suppress = []
+-
+-
+-    def test_unicode(self):
+-        """
+-        A unicode all-ASCII name is converted to an ASCII byte string.
+-        """
+-        name = u"example.com"
+-        result = generic.prepareIDNName(name)
+-        self.assertEqual(b"example.com", result)
+-
+-
+-    def test_unicodeNonASCII(self):
+-        """
+-        A unicode with non-ASCII is converted to its ACE equivalent.
+-        """
+-        name = u"\u00e9chec.example.com"
+-        result = generic.prepareIDNName(name)
+-        self.assertEqual(b"xn--chec-9oa.example.com", result)
+-
+-
+-    def test_unicodeHalfwidthIdeographicFullStop(self):
+-        """
+-        Exotic dots in unicode names are converted to Full Stop.
+-        """
+-        name = u"\u00e9chec.example\uff61com"
+-        result = generic.prepareIDNName(name)
+-        self.assertEqual(b"xn--chec-9oa.example.com", result)
+-
+-
+-    def test_unicodeTrailingDot(self):
+-        """
+-        Unicode names with trailing dots retain the trailing dot.
+-
+-        L{encodings.idna.ToASCII} doesn't allow the empty string as the input,
+-        hence the implementation needs to strip a trailing dot, and re-add it
+-        after encoding the labels.
+-        """
+-        name = u"example.com."
+-        result = generic.prepareIDNName(name)
+-        self.assertEqual(b"example.com.", result)
+diff --git a/wokkel/test/test_muc.py b/wokkel/test/test_muc.py
+index f690d05..282a8a1 100644
+--- a/wokkel/test/test_muc.py
++++ b/wokkel/test/test_muc.py
+@@ -14,7 +14,6 @@ from zope.interface import verify
+ 
+ from twisted.trial import unittest
+ from twisted.internet import defer, task
+-from twisted.python.compat import iteritems, unicode
+ from twisted.words.xish import domish, xpath
+ from twisted.words.protocols.jabber.jid import JID
+ from twisted.words.protocols.jabber.error import StanzaError
+@@ -81,7 +80,7 @@ class StatusCodeTest(unittest.TestCase):
+             332: 'removed-shutdown',
+         }
+ 
+-        for code, condition in iteritems(codes):
++        for code, condition in codes.items():
+             constantName = condition.replace('-', '_').upper()
+             self.assertEqual(getattr(muc.STATUS_CODE, constantName),
+                              muc.STATUS_CODE.lookupByValue(code))
+@@ -757,7 +756,7 @@ class MUCClientProtocolTest(unittest.TestCase):
+         self.assertEquals('message', message.name)
+         self.assertEquals(self.roomJID.full(), message.getAttribute('to'))
+         self.assertEquals('groupchat', message.getAttribute('type'))
+-        self.assertEquals(u'This is a test', unicode(message.body))
++        self.assertEquals(u'This is a test', str(message.body))
+ 
+ 
+     def test_chat(self):
+@@ -773,7 +772,7 @@ class MUCClientProtocolTest(unittest.TestCase):
+         self.assertEquals('message', message.name)
+         self.assertEquals(otherOccupantJID.full(), message.getAttribute('to'))
+         self.assertEquals('chat', message.getAttribute('type'))
+-        self.assertEquals(u'This is a test', unicode(message.body))
++        self.assertEquals(u'This is a test', str(message.body))
+ 
+ 
+     def test_subject(self):
+@@ -787,7 +786,7 @@ class MUCClientProtocolTest(unittest.TestCase):
+         self.assertEquals('message', message.name)
+         self.assertEquals(self.roomJID.full(), message.getAttribute('to'))
+         self.assertEquals('groupchat', message.getAttribute('type'))
+-        self.assertEquals(u'This is a test', unicode(message.subject))
++        self.assertEquals(u'This is a test', str(message.subject))
+ 
+ 
+     def test_invite(self):
+@@ -806,7 +805,7 @@ class MUCClientProtocolTest(unittest.TestCase):
+         self.assertEquals(muc.NS_MUC_USER, message.x.invite.uri)
+         self.assertEquals(invitee.full(), message.x.invite.getAttribute('to'))
+         self.assertEquals(muc.NS_MUC_USER, message.x.invite.reason.uri)
+-        self.assertEquals(u'This is a test', unicode(message.x.invite.reason))
++        self.assertEquals(u'This is a test', str(message.x.invite.reason))
+ 
+ 
+     def test_getRegisterForm(self):
+@@ -1399,7 +1398,7 @@ class MUCClientProtocolTest(unittest.TestCase):
+         nodes = xpath.queryForNodes(query, iq)
+         self.assertNotIdentical(None, nodes, 'Bad configure request')
+         destroy = nodes[0]
+-        self.assertEquals('Time to leave', unicode(destroy.reason))
++        self.assertEquals('Time to leave', str(destroy.reason))
+ 
+         response = toResponse(iq, 'result')
+         self.stub.send(response)
+diff --git a/wokkel/test/test_server.py b/wokkel/test/test_server.py
+index 3e3c923..1efb6e5 100644
+--- a/wokkel/test/test_server.py
++++ b/wokkel/test/test_server.py
+@@ -8,7 +8,11 @@ Tests for L{wokkel.server}.
+ from __future__ import division, absolute_import
+ from twisted.internet import defer
+ from twisted.python import failure
+-from twisted.test.proto_helpers import StringTransport
++try:
++    from twisted.internet.testing import StringTransport
++except ImportError:
++    from twisted.test.proto_helpers import StringTransport
++
+ from twisted.trial import unittest
+ from twisted.words.protocols.jabber import error, jid, xmlstream
+ from twisted.words.xish import domish
+diff --git a/wokkel/test/test_shim.py b/wokkel/test/test_shim.py
+index ded4679..d3b76cf 100644
+--- a/wokkel/test/test_shim.py
++++ b/wokkel/test/test_shim.py
+@@ -9,7 +9,6 @@ Tests for {wokkel.shim}.
+ 
+ from __future__ import division, absolute_import
+ 
+-from twisted.python.compat import unicode
+ from twisted.trial import unittest
+ 
+ from wokkel import shim
+@@ -36,7 +35,7 @@ class HeadersTest(unittest.TestCase):
+         self.assertEquals(NS_SHIM, header.uri)
+         self.assertEquals('header', header.name)
+         self.assertEquals('Urgency', header['name'])
+-        self.assertEquals('high', unicode(header))
++        self.assertEquals('high', str(header))
+ 
+ 
+     def test_headerRepeated(self):
+@@ -47,7 +46,7 @@ class HeadersTest(unittest.TestCase):
+                            ('Collection', 'node2')])
+         elements = list(headers.elements())
+         self.assertEquals(2, len(elements))
+-        collections = set((unicode(element) for element in elements
++        collections = set((str(element) for element in elements
+                            if element['name'] == 'Collection'))
+         self.assertIn('node1', collections)
+         self.assertIn('node2', collections)
+diff --git a/wokkel/test/test_xmppim.py b/wokkel/test/test_xmppim.py
+index faab8ed..0d4fdbf 100644
+--- a/wokkel/test/test_xmppim.py
++++ b/wokkel/test/test_xmppim.py
+@@ -9,7 +9,6 @@ from __future__ import division, absolute_import
+ 
+ from twisted.internet import defer
+ from twisted.trial import unittest
+-from twisted.python.compat import unicode
+ from twisted.words.protocols.jabber import error
+ from twisted.words.protocols.jabber.jid import JID
+ from twisted.words.protocols.jabber.xmlstream import toResponse
+@@ -55,7 +54,7 @@ class PresenceClientProtocolTest(unittest.TestCase):
+         self.assertEquals(None, presence.uri)
+         self.assertEquals("user@example.com", presence.getAttribute('to'))
+         self.assertEquals("unavailable", presence.getAttribute('type'))
+-        self.assertEquals("Disconnected", unicode(presence.status))
++        self.assertEquals("Disconnected", str(presence.status))
+ 
+     def test_unavailableBroadcast(self):
+         """
+@@ -298,9 +297,9 @@ class PresenceProtocolTest(unittest.TestCase):
+         element = self.output[-1]
+         self.assertEquals("user@example.com", element.getAttribute('to'))
+         self.assertIdentical(None, element.getAttribute('type'))
+-        self.assertEquals(u'chat', unicode(element.show))
+-        self.assertEquals(u'Talk to me!', unicode(element.status))
+-        self.assertEquals(u'50', unicode(element.priority))
++        self.assertEquals(u'chat', str(element.show))
++        self.assertEquals(u'Talk to me!', str(element.status))
++        self.assertEquals(u'50', str(element.priority))
+ 
+     def test_availableLanguages(self):
+         """
+@@ -314,19 +313,19 @@ class PresenceProtocolTest(unittest.TestCase):
+         element = self.output[-1]
+         self.assertEquals("user@example.com", element.getAttribute('to'))
+         self.assertIdentical(None, element.getAttribute('type'))
+-        self.assertEquals(u'chat', unicode(element.show))
++        self.assertEquals(u'chat', str(element.show))
+ 
+         statuses = {}
+         for status in element.elements():
+             if status.name == 'status':
+                 lang = status.getAttribute((NS_XML, 'lang'))
+-                statuses[lang] = unicode(status)
++                statuses[lang] = str(status)
+ 
+         self.assertIn(None, statuses)
+         self.assertEquals(u'Talk to me!', statuses[None])
+         self.assertIn('nl', statuses)
+         self.assertEquals(u'Praat met me!', statuses['nl'])
+-        self.assertEquals(u'50', unicode(element.priority))
++        self.assertEquals(u'50', str(element.priority))
+ 
+ 
+     def test_availableSender(self):
+@@ -363,7 +362,7 @@ class PresenceProtocolTest(unittest.TestCase):
+         self.assertEquals(None, element.uri)
+         self.assertEquals("user@example.com", element.getAttribute('to'))
+         self.assertEquals("unavailable", element.getAttribute('type'))
+-        self.assertEquals("Disconnected", unicode(element.status))
++        self.assertEquals("Disconnected", str(element.status))
+ 
+ 
+     def test_unavailableBroadcast(self):
+@@ -568,7 +567,7 @@ class RosterItemTest(unittest.TestCase):
+         foundGroups = set()
+         for child in element.elements():
+             if child.uri == NS_ROSTER and child.name == 'group':
+-                foundGroups.add(unicode(child))
++                foundGroups.add(str(child))
+ 
+         self.assertEqual(groups, foundGroups)
+ 
+diff --git a/wokkel/xmppim.py b/wokkel/xmppim.py
+index e6af929..683577b 100644
+--- a/wokkel/xmppim.py
++++ b/wokkel/xmppim.py
+@@ -15,7 +15,6 @@ from __future__ import division, absolute_import
+ import warnings
+ 
+ from twisted.internet import defer
+-from twisted.python.compat import iteritems, itervalues, unicode
+ from twisted.words.protocols.jabber import error
+ from twisted.words.protocols.jabber.jid import JID
+ from twisted.words.xish import domish
+@@ -48,20 +47,20 @@ class AvailablePresence(Presence):
+             self.addElement('show', content=show)
+ 
+         if statuses is not None:
+-            for lang, status in iteritems(statuses):
++            for lang, status in statuses.items():
+                 s = self.addElement('status', content=status)
+                 if lang:
+                     s[(NS_XML, "lang")] = lang
+ 
+         if priority != 0:
+-            self.addElement('priority', content=unicode(int(priority)))
++            self.addElement('priority', content=str(int(priority)))
+ 
+ class UnavailablePresence(Presence):
+     def __init__(self, to=None, statuses=None):
+         Presence.__init__(self, to, type='unavailable')
+ 
+         if statuses is not None:
+-            for lang, status in iteritems(statuses):
++            for lang, status in statuses.items():
+                 s = self.addElement('status', content=status)
+                 if lang:
+                     s[(NS_XML, "lang")] = lang
+@@ -76,7 +75,7 @@ class PresenceClientProtocol(XMPPHandler):
+         for element in presence.elements():
+             if element.name == 'status':
+                 lang = element.getAttribute((NS_XML, 'lang'))
+-                text = unicode(element)
++                text = str(element)
+                 statuses[lang] = text
+         return statuses
+ 
+@@ -92,14 +91,14 @@ class PresenceClientProtocol(XMPPHandler):
+     def _onPresenceAvailable(self, presence):
+         entity = JID(presence["from"])
+ 
+-        show = unicode(presence.show or '')
++        show = str(presence.show or '')
+         if show not in ['away', 'xa', 'chat', 'dnd']:
+             show = None
+ 
+         statuses = self._getStatuses(presence)
+ 
+         try:
+-            priority = int(unicode(presence.priority or '')) or 0
++            priority = int(str(presence.priority or '')) or 0
+         except ValueError:
+             priority = 0
+ 
+@@ -133,14 +132,14 @@ class PresenceClientProtocol(XMPPHandler):
+         @type entity: {JID}
+         @param show: detailed presence information. One of C{'away'}, C{'xa'},
+                      C{'chat'}, C{'dnd'} or C{None}.
+-        @type show: C{str} or C{NoneType}
++        @type show: L{str} or C{NoneType}
+         @param statuses: dictionary of natural language descriptions of the
+                          availability status, keyed by the language
+                          descriptor. A status without a language
+                          specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+         @param priority: priority level of the resource.
+-        @type priority: C{int}
++        @type priority: L{int}
+         """
+ 
+     def unavailableReceived(self, entity, statuses=None):
+@@ -153,7 +152,7 @@ class PresenceClientProtocol(XMPPHandler):
+                          availability status, keyed by the language
+                          descriptor. A status without a language
+                          specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+         """
+ 
+     def subscribedReceived(self, entity):
+@@ -196,14 +195,14 @@ class PresenceClientProtocol(XMPPHandler):
+         @type entity: {JID}
+         @param show: optional detailed presence information. One of C{'away'},
+                      C{'xa'}, C{'chat'}, C{'dnd'}.
+-        @type show: C{str}
++        @type show: L{str}
+         @param statuses: dictionary of natural language descriptions of the
+                          availability status, keyed by the language
+                          descriptor. A status without a language
+                          specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+         @param priority: priority level of the resource.
+-        @type priority: C{int}
++        @type priority: L{int}
+         """
+         self.send(AvailablePresence(entity, show, statuses, priority))
+ 
+@@ -217,7 +216,7 @@ class PresenceClientProtocol(XMPPHandler):
+                          availability status, keyed by the language
+                          descriptor. A status without a language
+                          specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+         """
+         self.send(UnavailablePresence(entity, statuses))
+ 
+@@ -275,19 +274,19 @@ class AvailabilityPresence(BasePresence):
+     L{SubscriptionPresence}).
+ 
+     @ivar available: The availability being communicated.
+-    @type available: C{bool}
++    @type available: L{bool}
+     @ivar show: More specific availability. Can be one of C{'chat'}, C{'away'},
+                 C{'xa'}, C{'dnd'} or C{None}.
+-    @type show: C{str} or C{NoneType}
++    @type show: L{str} or C{NoneType}
+     @ivar statuses: Natural language texts to detail the (un)availability.
+                     These are represented as a mapping from language code
+-                    (C{str} or C{None}) to the corresponding text (C{unicode}).
++                    (L{str} or C{None}) to the corresponding text (L{str}).
+                     If the key is C{None}, the associated text is in the
+                     default language.
+-    @type statuses: C{dict}
++    @type statuses: L{dict}
+     @ivar priority: Priority level for this resource. Must be between -128 and
+                     127. Defaults to 0.
+-    @type priority: C{int}
++    @type priority: L{int}
+     """
+ 
+     childParsers = {(None, 'show'): '_childParser_show',
+@@ -309,7 +308,7 @@ class AvailabilityPresence(BasePresence):
+         if None in self.statuses:
+             return self.statuses[None]
+         elif self.statuses:
+-            for status in itervalues(self.status):
++            for status in self.status.values():
+                 return status
+         else:
+             return None
+@@ -318,20 +317,20 @@ class AvailabilityPresence(BasePresence):
+ 
+ 
+     def _childParser_show(self, element):
+-        show = unicode(element)
++        show = str(element)
+         if show in ('chat', 'away', 'xa', 'dnd'):
+             self.show = show
+ 
+ 
+     def _childParser_status(self, element):
+         lang = element.getAttribute((NS_XML, 'lang'), None)
+-        text = unicode(element)
++        text = str(element)
+         self.statuses[lang] = text
+ 
+ 
+     def _childParser_priority(self, element):
+         try:
+-            self.priority = int(unicode(element))
++            self.priority = int(str(element))
+         except ValueError:
+             pass
+ 
+@@ -353,9 +352,9 @@ class AvailabilityPresence(BasePresence):
+             if self.show in ('chat', 'away', 'xa', 'dnd'):
+                 presence.addElement('show', content=self.show)
+             if self.priority != 0:
+-                presence.addElement('priority', content=unicode(self.priority))
++                presence.addElement('priority', content=str(self.priority))
+ 
+-        for lang, text in iteritems(self.statuses):
++        for lang, text in self.statuses.items():
+             status = presence.addElement('status', content=text)
+             if lang:
+                 status[(NS_XML, 'lang')] = lang
+@@ -400,7 +399,7 @@ class BasePresenceProtocol(XMPPHandler):
+ 
+     @cvar presenceTypeParserMap: Maps presence stanza types to their respective
+         stanza parser classes (derived from L{Stanza}).
+-    @type presenceTypeParserMap: C{dict}
++    @type presenceTypeParserMap: L{dict}
+     """
+ 
+     presenceTypeParserMap = {}
+@@ -515,15 +514,15 @@ class PresenceProtocol(BasePresenceProtocol):
+ 
+         @param show: Optional detailed presence information. One of C{'away'},
+             C{'xa'}, C{'chat'}, C{'dnd'}.
+-        @type show: C{str}
++        @type show: L{str}
+ 
+         @param statuses: Mapping of natural language descriptions of the
+            availability status, keyed by the language descriptor. A status
+            without a language specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+ 
+         @param priority: priority level of the resource.
+-        @type priority: C{int}
++        @type priority: L{int}
+         """
+         presence = AvailabilityPresence(recipient=recipient, sender=sender,
+                                         show=show, statuses=statuses,
+@@ -541,7 +540,7 @@ class PresenceProtocol(BasePresenceProtocol):
+         @param statuses: dictionary of natural language descriptions of the
+             availability status, keyed by the language descriptor. A status
+             without a language specified, is keyed with C{None}.
+-        @type statuses: C{dict}
++        @type statuses: L{dict}
+         """
+         presence = AvailabilityPresence(recipient=recipient, sender=sender,
+                                         available=False, statuses=statuses)
+@@ -617,25 +616,25 @@ class RosterItem(object):
+     @ivar entity: The JID of the contact.
+     @type entity: L{JID}
+     @ivar name: The associated nickname for this contact.
+-    @type name: C{unicode}
++    @type name: L{str}
+     @ivar subscriptionTo: Subscription state to contact's presence. If C{True},
+                           the roster owner is subscribed to the presence
+                           information of the contact.
+-    @type subscriptionTo: C{bool}
++    @type subscriptionTo: L{bool}
+     @ivar subscriptionFrom: Contact's subscription state. If C{True}, the
+                             contact is subscribed to the presence information
+                             of the roster owner.
+-    @type subscriptionFrom: C{bool}
++    @type subscriptionFrom: L{bool}
+     @ivar pendingOut: Whether the subscription request to this contact is
+         pending.
+-    @type pendingOut: C{bool}
++    @type pendingOut: L{bool}
+     @ivar groups: Set of groups this contact is categorized in. Groups are
+-                  represented by an opaque identifier of type C{unicode}.
+-    @type groups: C{set}
++                  represented by an opaque identifier of type L{str}.
++    @type groups: L{set}
+     @ivar approved: Signals pre-approved subscription.
+-    @type approved: C{bool}
++    @type approved: L{bool}
+     @ivar remove: Signals roster item removal.
+-    @type remove: C{bool}
++    @type remove: L{bool}
+     """
+ 
+     __subscriptionStates = {(False, False): None,
+@@ -755,7 +754,7 @@ class RosterItem(object):
+             item.approved = element.getAttribute('approved') in ('true', '1')
+             for subElement in domish.generateElementsQNamed(element.children,
+                                                             'group', NS_ROSTER):
+-                item.groups.add(unicode(subElement))
++                item.groups.add(str(subElement))
+         return item
+ 
+ 
+@@ -771,7 +770,7 @@ class RosterRequest(Request):
+         retrieving the roster as a delta from a known cached version. This
+         should only be set if the recipient is known to support roster
+         versioning.
+-    @type version: C{unicode}
++    @type version: L{str}
+ 
+     @ivar rosterSet: If set, this is a roster set request. This flag is used
+         to make sure some attributes of the roster item are not rendered by
+@@ -821,7 +820,7 @@ class Roster(dict):
+     identifier for this version of the roster.
+ 
+     @ivar version: Roster version identifier.
+-    @type version: C{unicode}.
++    @type version: L{str}.
+     """
+ 
+     version = None
+@@ -892,7 +891,7 @@ class RosterClientProtocol(XMPPHandler, IQHandlerMixin):
+             known to support roster versioning. If there is no (valid) cached
+             version of the roster, but roster versioning is desired,
+             C{version} should be set to the empty string (C{u''}).
+-        @type version: C{unicode}
++        @type version: L{str}
+ 
+         @return: Roster as a mapping from L{JID} to L{RosterItem}.
+         @rtype: L{twisted.internet.defer.Deferred}
+@@ -1023,11 +1022,11 @@ class Message(Stanza):
+ 
+ 
+     def _childParser_body(self, element):
+-        self.body = unicode(element)
++        self.body = str(element)
+ 
+ 
+     def _childParser_subject(self, element):
+-        self.subject = unicode(element)
++        self.subject = str(element)
+ 
+ 
+     def toElement(self):
+-- 
+2.44.1
diff --git a/pkgs/development/python-modules/wokkel/default.nix b/pkgs/development/python-modules/wokkel/default.nix
new file mode 100644
index 000000000000..567610a1624a
--- /dev/null
+++ b/pkgs/development/python-modules/wokkel/default.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  incremental,
+  python-dateutil,
+  twisted,
+}:
+
+buildPythonPackage rec {
+  pname = "wokkel";
+  version = "18.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ralphm";
+    repo = "wokkel";
+    tag = version;
+    hash = "sha256-vIs9Zo8o7TWUTIqJG9SEHQd63aJFCRhj6k45IuxoCes=";
+  };
+
+  patches = [
+    # Fixes compat with current-day twisted
+    # https://github.com/ralphm/wokkel/pull/32 with all the CI & doc changes excluded
+    ./0001-Remove-py2-compat.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace wokkel/muc.py \
+      --replace-fail "twisted.python.constants" "constantly"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    incremental
+    python-dateutil
+    twisted
+  ];
+
+  nativeCheckInputs = [ twisted ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    trial wokkel
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [
+    "twisted.plugins.server"
+    "wokkel.disco"
+    "wokkel.muc"
+    "wokkel.pubsub"
+  ];
+
+  meta = {
+    description = "Twisted Jabber support library";
+    longDescription = ''
+      Wokkel is collection of enhancements on top of the Twisted networking framework, written in Python. It mostly
+      provides a testing ground for enhancements to the Jabber/XMPP protocol implementation as found in
+      Twisted Words, that are meant to eventually move there.
+    '';
+    homepage = "https://github.com/ralphm/wokkel"; # wokkel.ik.nu is dead
+    changelog = "https://github.com/ralphm/wokkel/blob/${version}/NEWS.rst";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ethancedwards8 ];
+    teams = [ lib.teams.ngi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89212361ac32..3aad48eeb4c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19149,6 +19149,8 @@ self: super: with self; {
 
   wn = callPackage ../development/python-modules/wn { };
 
+  wokkel = callPackage ../development/python-modules/wokkel { };
+
   wolf-comm = callPackage ../development/python-modules/wolf-comm { };
 
   woob = callPackage ../development/python-modules/woob { };

From 530b8475c05d5d61125966de20bc176605363870 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 21:07:39 -0400
Subject: [PATCH 0498/1497] lillydap: init at 1.0.1

NGI Project

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/li/lillydap/package.nix | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/li/lillydap/package.nix

diff --git a/pkgs/by-name/li/lillydap/package.nix b/pkgs/by-name/li/lillydap/package.nix
new file mode 100644
index 000000000000..d095f3a4a8ca
--- /dev/null
+++ b/pkgs/by-name/li/lillydap/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  cmake,
+  gperf,
+  arpa2cm,
+  quickder,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lillydap";
+  version = "1.0.1";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "lillydap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SQuvu1A9Iq/fKthfYyVQGWFuyHYnhIry/wvnwgdMKHY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    gperf
+  ];
+
+  buildInputs = [
+    arpa2cm
+    quickder
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Little LDAP: Event-driven, lock-free kernel for dynamic data servers, clients, filters";
+    homepage = "https://gitlab.com/arpa2/lillydap";
+    changelog = "https://gitlab.com/arpa2/lillydap/-/blob/v${finalAttrs.version}/CHANGES";
+    license = lib.licenses.bsd2;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    platforms = lib.platforms.unix;
+  };
+})

From 5c75f447c9e3d5ab21a7414b9edd2f929684be38 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 21:08:06 -0400
Subject: [PATCH 0499/1497] arpa2-leaf: init at 0.2

NGI project.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ar/arpa2-leaf/package.nix | 51 ++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/ar/arpa2-leaf/package.nix

diff --git a/pkgs/by-name/ar/arpa2-leaf/package.nix b/pkgs/by-name/ar/arpa2-leaf/package.nix
new file mode 100644
index 000000000000..3881c6094014
--- /dev/null
+++ b/pkgs/by-name/ar/arpa2-leaf/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  cmake,
+  arpa2cm,
+  quickder,
+  quickmem,
+  quick-sasl,
+  lillydap,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  # leaf is already used
+  pname = "arpa2-leaf";
+  version = "0.2";
+
+  src = fetchFromGitLab {
+    owner = "arpa2";
+    repo = "leaf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s52gtxM+BmG7oVrB5F0ORjkb4F3fWONiOxIWdDn2P5k=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    arpa2cm
+    quickder
+    quickmem
+    quick-sasl
+    lillydap
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "LDAP Extended Attribute Filter";
+    homepage = "https://gitlab.com/arpa2/leaf";
+    changelog = "https://gitlab.com/arpa2/leaf/-/blob/v${finalAttrs.version}/CHANGES";
+    license = lib.licenses.bsd2;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    platforms = lib.platforms.linux;
+  };
+})

From 01c3aea0e52c995643d84957d330685ee604c62a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 07:58:17 +0000
Subject: [PATCH 0500/1497] python3Packages.tesla-fleet-api: 1.0.17 -> 1.1.1

---
 pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index f66ef53f039b..ec395010bb1c 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.0.17";
+  version = "1.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-3JLC+GXFNBy7xEPuk/ajVROp6IzZ7Jul+1VyOMB7t58=";
+    hash = "sha256-ykVes0LXvkwdZRX9g1N9WqzDgKzR5u/YLKkdMC9lR64=";
   };
 
   build-system = [ setuptools ];

From cacfaf76c2d26880708315cca06f98778cd6111b Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 2 Jun 2025 10:10:05 +0200
Subject: [PATCH 0501/1497] nodejs: removal of hiprio usage

---
 pkgs/top-level/all-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57aefbbf9d1c..28513bcb2056 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3604,26 +3604,26 @@ with pkgs;
 
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = hiPrio nodejs_22;
+  nodejs = nodejs_22;
   nodejs-slim = nodejs-slim_22;
-  corepack = hiPrio corepack_22;
+  corepack = corepack_22;
 
   nodejs_20 = callPackage ../development/web/nodejs/v20.nix { };
   nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; };
-  corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; });
+  corepack_20 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; };
 
   nodejs_22 = callPackage ../development/web/nodejs/v22.nix { };
   nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
-  corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });
+  corepack_22 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; };
 
   nodejs_24 = callPackage ../development/web/nodejs/v24.nix { };
   nodejs-slim_24 = callPackage ../development/web/nodejs/v24.nix { enableNpm = false; };
-  corepack_24 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; });
+  corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_24; };
 
   # Update this when adding the newest nodejs major version!
   nodejs_latest = nodejs_24;
   nodejs-slim_latest = nodejs-slim_24;
-  corepack_latest = hiPrio corepack_24;
+  corepack_latest = corepack_24;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 

From f04e4b24adac2b9817714d6ae83d8a9bc605b499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 08:16:43 +0000
Subject: [PATCH 0502/1497] libretro.bsnes: 0-unstable-2025-05-16 ->
 0-unstable-2025-05-30

---
 pkgs/applications/emulators/libretro/cores/bsnes.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index 950bafe1813d..93a7da0140d4 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2025-05-16";
+  version = "0-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "aadae1cd3d8175a6e71525ab122e6b7a949091a7";
-    hash = "sha256-Tf/mJ4B3PuAbfYJCrFoC0sHOQgf+UCwp6jNlSau7XH0=";
+    rev = "c2df3ccaeb8f40852a63a4b66a381d82d4e9b95d";
+    hash = "sha256-bPW4ftbdUXsgAs/CEi5/x4iq1NKvgRmHOpMiNJ2W/Gc=";
   };
 
   makefile = "Makefile";

From 2dedc5349140ad843e7d0f6cf64b08db043c2eb4 Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Sun, 1 Jun 2025 21:58:13 +0200
Subject: [PATCH 0503/1497] vivaldi: add max06 as maintainer

---
 pkgs/by-name/vi/vivaldi/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 921b5363defc..b03a862c7713 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -235,6 +235,7 @@ stdenv.mkDerivation rec {
     mainProgram = "vivaldi";
     maintainers = with lib.maintainers; [
       marcusramberg
+      max06
       rewine
     ];
     platforms = [

From 2970860c61fce31b5d0b6044170c02ec12de21e8 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 2 Jun 2025 10:26:27 +0200
Subject: [PATCH 0504/1497] sdl2-compat: Add more relevant passthru tests

`monado` was added in #380523 to show `sdl2-compat` could be used
to build SDL2 programs when `sdl2-compat` was first added.
It is not particularly load-bearing, and because it depends on
OpenCV it is quite expensive to build from source in a world-rebuild.

I propose instead testing `SDL_compat`, `ffmpeg` and `qemu`.
These packages are much more important for nixpkgs as a whole,
either testing SDL, being required for most gui apps, or building VM tests.
`qemu` on darwin does not enable sdl support, so that check is linux-only.
---
 pkgs/by-name/sd/sdl2-compat/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index ee975d422139..03f76b78e462 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -2,20 +2,24 @@
   cmake,
   lib,
   fetchFromGitHub,
-  monado,
   ninja,
+  sdl3,
+  stdenv,
+  testers,
+  libX11,
+  libGL,
   nix-update-script,
+
+  # passthru tests
   SDL2_ttf,
   SDL2_net,
   SDL2_gfx,
   SDL2_sound,
   SDL2_mixer,
   SDL2_image,
-  sdl3,
-  stdenv,
-  testers,
-  libX11,
-  libGL,
+  SDL_compat,
+  ffmpeg,
+  qemu,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -76,16 +80,18 @@ stdenv.mkDerivation (finalAttrs: {
         pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
         inherit
+          SDL_compat
           SDL2_ttf
           SDL2_net
           SDL2_gfx
           SDL2_sound
           SDL2_mixer
           SDL2_image
+          ffmpeg
           ;
       }
       // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-        inherit monado;
+        inherit qemu;
       };
 
     updateScript = nix-update-script {

From dff25816ade78bab25d992759980198933fca2cc Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 2 Apr 2025 13:32:49 +0200
Subject: [PATCH 0505/1497] go/policy: some clarification

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/build-support/go/README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/go/README.md b/pkgs/build-support/go/README.md
index 89f0f83f019d..9a0b59836921 100644
--- a/pkgs/build-support/go/README.md
+++ b/pkgs/build-support/go/README.md
@@ -3,14 +3,13 @@
 Go promises that "programs written to the Go 1 specification will continue to compile and run correctly, unchanged, over the lifetime of that specification" [1].
 Newer toolchain versions should build projects developed against older toolchains without problems.
 
+**Definition(a "toolchain-breaking" package):**
 There are however Go packages depending on internal APIs of the toolchain/runtime/stdlib that are not covered by the Go compatibility promise.
-These packages may break on toolchain updates.
-We name packages that (often) break on toolchain updates `toolchain-breaking`.
+These packages may break on toolchain minor version upgrades.
 
-There is another set of packages that depends on the toolchain, but in another way:
-Packages providing development support for the Go language (like `gopls`, `golangci-lint`,...) must be compiled with the version they should be used for.
+**Definition(a "toolchain-latest" package):**
+Packages providing development support for the Go language (like `gopls`, `golangci-lint`,...) depend on the toolchain in another way: they must be compiled at least with the version they should be used for.
 If `gopls` is compiled for Go 1.23, it won't work for projects that require Go 1.24.
-We name packages that must be built with the latest toolchain to work as expected `toolchain-latest`.
 
 Go only ever has two supported toolchains. With a new minor release, the second last Go toolchain is automatically end of life, meaning it won't receive security updates anymore.
 
@@ -26,7 +25,9 @@ Based on this, we align on the following policy for toolchain/builder upgrades:
     A comment MUST be added explaining why this is the case for a certain package.
     It is important to keep the number of packages using this builder within nixpkgs low, so the bump won't cause a mass rebuild.
 
-    Consumer outside of nixpkgs on the other hand MAY rely on this toolchain/builder if they prefer being upgraded earlier to the newest toolchain.
+    `go_latest` MUST not point to release candidates of Go.
+
+    Consumer outside of nixpkgs on the other hand MAY rely on this toolchain/builder if they prefer being upgraded earlier to the newest toolchain minor version.
 
 3. Packages in `toolchain-breaking` SHOULD pin a toolchain version by using a builder with a fixed Go version (`buildGo1xxModule`).
   The use of `buildGo1xxModule` MUST be accompanied with a comment explaining why this has a dependency on a specific Go version.

From ad579ea83d5c7056f584d44e8451e9b9150bd79f Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 2 Apr 2025 14:00:52 +0200
Subject: [PATCH 0506/1497] docs/go: add section about versioned
 toolchains/builders

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 doc/languages-frameworks/go.section.md | 15 +++++++++++++++
 doc/redirects.json                     |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 172bf2ca8f37..fcc3c687d354 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -195,6 +195,21 @@ Specifies the contents of the `go.sum` file and triggers rebuilds when it change
 Defaults to `null`
 
 
+## Versioned toolchains and builders {#ssec-go-toolchain-versions}
+
+Beside `buildGoModule`, there are also versioned builders available that pin a specific Go version, like `buildGo124Module` for Go 1.24.
+Similar, versioned toolchains are available, like `go_1_24` for Go 1.24.
+Both builder and toolchain of a certain version will be removed as soon as the Go version reaches end of life.
+
+As toolchain updates in nixpkgs cause mass rebuilds and must go through the staging cycle, it can take a while until a new Go minor version is available to consumers of nixpkgs.
+If you want quicker access to the latest minor, use `go_latest` toolchain and `buildGoLatestModule` builder.
+To learn more about the Go maintenance and upgrade procedure in nixpkgs, check out the [Go toolchain/builder upgrade policy](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/README.md#go-toolchainbuilder-upgrade-policy).
+
+::: {.warning}
+The use of `go_latest` and `buildGoLatestModule` is restricted within nixpkgs.
+The [Go toolchain/builder upgrade policy](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/README.md#go-toolchainbuilder-upgrade-policy) must be followed.
+:::
+
 ## Overriding `goModules` {#buildGoModule-goModules-override}
 
 Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation.
diff --git a/doc/redirects.json b/doc/redirects.json
index 570c71ea705c..4475752b367a 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3006,6 +3006,9 @@
   "ex-buildGoModule": [
     "index.html#ex-buildGoModule"
   ],
+  "ssec-go-toolchain-versions" : [
+    "index.html#ssec-go-toolchain-versions"
+  ],
   "buildGoModule-goModules-override": [
     "index.html#buildGoModule-goModules-override"
   ],

From cec2770da61a9ce227949eca34731718cb75a2ad Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 2 Apr 2025 14:13:36 +0200
Subject: [PATCH 0507/1497] release-notes: mention new Go upgrade policy
 documentation, go_latest and buildGoLatestModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 doc/release-notes/rl-2505.section.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 8a395089426d..aa30b1f21208 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -226,6 +226,11 @@
 
 - `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes.
 
+- The newly added aliases `go_latest` and `buildGoLatestModule` are now available and can be use to prevent packages like `gopls` from breaking whenever the default toolchain minor version is lagging behind.
+  It can also be used _outside of nixpkgs_ to get fast access to new Go minor versions without having to wait for a staging cycle that will update the default builder/toolchain.
+
+- A [policy documenting the details of Go toolchain and builder upgrades](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/README.md#go-toolchainbuilder-upgrade-policy) in nixpkgs, as well as rules related to using non-default builders like `buildGo1xxModule` and `buildGoLatestModule` has been added in-tree.
+
 - top-level `playwright` now refers to the github Microsoft/playwright package
   instead of the python tester launcher. You can still refer to the python
   launcher via `python3Packages.toPythonApplication python3Packages.playwright`

From d5e92160875179dd44f70ef517835ed79201f55c Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <lucc@posteo.de>
Date: Mon, 9 Dec 2024 09:02:04 +0100
Subject: [PATCH 0508/1497] python313Packages.standard-mailcap: init at 3.13.0

---
 .../standard-mailcap/default.nix              | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/standard-mailcap/default.nix

diff --git a/pkgs/development/python-modules/standard-mailcap/default.nix b/pkgs/development/python-modules/standard-mailcap/default.nix
new file mode 100644
index 000000000000..8544a7f06dd3
--- /dev/null
+++ b/pkgs/development/python-modules/standard-mailcap/default.nix
@@ -0,0 +1,37 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "standard-mailcap";
+  version = "3.13.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.13";
+
+  src = fetchFromGitHub {
+    owner = "youknowone";
+    repo = "python-deadlib";
+    tag = "v${version}";
+    hash = "sha256-9mtQi5ufxP6xRonTrFC3oWFpWLbJraAmdQYozP3evgc=";
+    sparseCheckout = [ "mailcap" ];
+  };
+
+  build-system = [ setuptools ];
+  sourceRoot = "${src.name}/mailcap";
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "mailcap" ];
+
+  meta = {
+    description = "Standard library mailcap redistribution";
+    homepage = "https://github.com/youknowone/python-deadlib";
+    license = lib.licenses.psfl;
+    maintainers = [ lib.maintainers.lucc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aad48eeb4c9..6db91e8cd305 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16749,6 +16749,9 @@ self: super: with self; {
     else
       null;
 
+  standard-mailcap =
+    if pythonOlder "3.13" then null else callPackage ../development/python-modules/standard-mailcap { };
+
   standard-pipes =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;
 

From 7972b14809408677099bfa40d31940365067728f Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 19 May 2025 16:49:12 +0100
Subject: [PATCH 0509/1497] obs-studio-plugins.obs-aitum-multistream: init at
 1.0.7

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../plugins/obs-aitum-multistream.nix         | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 8019aa4a8b3a..a0d0b240bf3f 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -22,6 +22,8 @@
 
   obs-advanced-masks = callPackage ./obs-advanced-masks.nix { };
 
+  obs-aitum-multistream = qt6Packages.callPackage ./obs-aitum-multistream.nix { };
+
   obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
 
   obs-color-monitor = qt6Packages.callPackage ./obs-color-monitor.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
new file mode 100644
index 000000000000..c97b47e98266
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  obs-studio,
+  qtbase,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-aitum-multistream";
+  version = "1.0.7";
+
+  src = fetchFromGitHub {
+    owner = "Aitum";
+    repo = "obs-aitum-multistream";
+    tag = version;
+    hash = "sha256-TqddyTBRWLyfwYi9I0nQE8Z19YL2RwkZqUwi7F9XpwQ=";
+  };
+
+  # Fix FTBFS with Qt >= 6.8
+  prePatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'find_qt(COMPONENTS Widgets Core)' 'find_package(Qt6 REQUIRED COMPONENTS Core Widgets)'
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    curl
+    obs-studio
+    qtbase
+  ];
+  dontWrapQtApps = true;
+
+  cmakeFlags = [
+    # Prevent deprecation warnings from failing the build
+    (lib.cmakeOptionType "string" "CMAKE_CXX_FLAGS" "-Wno-error=deprecated-declarations")
+  ];
+
+  meta = {
+    description = "Plugin to stream everywhere from a single instance of OBS";
+    homepage = "https://github.com/Aitum/obs-aitum-multistream";
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    license = lib.licenses.gpl2Plus;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+  };
+}

From ab570b26d41452778fa4147d5e9e6246223cbb4b Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 2 Jun 2025 11:17:06 +0200
Subject: [PATCH 0510/1497] reposilite: 3.5.23 -> 3.5.24

https://github.com/dzikoysk/reposilite/releases/tag/3.5.24
---
 pkgs/by-name/re/reposilite/package.nix  |  4 ++--
 pkgs/by-name/re/reposilite/plugins.json | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index c19c0f013ebd..7b10a8efdef5 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "Reposilite";
-  version = "3.5.23";
+  version = "3.5.24";
 
   src = fetchurl {
     url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-7DNl0u2iYAlqhflJCIppy8huMKtFjjyRJzUPcWHoRnE=";
+    hash = "sha256-HyA59f4Og3bGTe5hEShkAt0jl9rLUBzGAGxUKgJV9Y0=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/re/reposilite/plugins.json b/pkgs/by-name/re/reposilite/plugins.json
index 0bbd0cde2419..a7ffffedc300 100644
--- a/pkgs/by-name/re/reposilite/plugins.json
+++ b/pkgs/by-name/re/reposilite/plugins.json
@@ -1,7 +1,7 @@
 {
-  "checksum": "sha256-k470nI1rGZJcUVETG3bmjqdvjkzeVM0OVWhONM6nJL8=",
-  "groovy": "sha256-8LjYnoXaEYmedWUPgqfDGVORQnpoDn5um02KWtkTjak=",
-  "migration": "sha256-T/n14xWA+YPZEDaybybtFiqcdE/I7SY/llvhwL+9JZU=",
-  "prometheus": "sha256-BChuSWSwPpwAA5jA9Lf4LsAGNA6uFlVqFNy7h9biZ9Q=",
-  "swagger": "sha256-uL3e85p1xk265xiNzDoxY62GPbp7qCummEMxXzKUn5Q="
+  "checksum": "sha256-XaFqu3ln73XLDSbHO7PUalwOLdtBfQ1pOGttcbM50To=",
+  "groovy": "sha256-sDHaaWdcx8kAnjoalizxVkMALljlrzvBLf0EjtZWsB0=",
+  "migration": "sha256-TAnaun2V8dVZeMWAWsThZcBD+DDgGj+7qMt4LTDkYpE=",
+  "prometheus": "sha256-yVs53YX8vIxjhojVYGK1xstw/8wZNE7C9DG01rdFpSc=",
+  "swagger": "sha256-gSiJeS0NLvVWlKg/CNkwpBD3fNZUWyBwrD53NWuY1Ug="
 }

From c5578bb0e1556adeb679aee79ce43ce38a251a3e Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 19 May 2025 17:09:11 +0100
Subject: [PATCH 0511/1497] obs-studio-plugins.obs-markdown: init at 0.2.7

---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../video/obs-studio/plugins/obs-markdown.nix | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-markdown.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 4da72ab45f92..7054bfb5282c 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -42,6 +42,8 @@
 
   obs-livesplit-one = callPackage ./obs-livesplit-one { };
 
+  obs-markdown = callPackage ./obs-markdown.nix { };
+
   obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { };
 
   obs-move-transition = callPackage ./obs-move-transition.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix
new file mode 100644
index 000000000000..c837952e6c2d
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  obs-studio,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-markdown";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "exeldro";
+    repo = "obs-markdown";
+    rev = version;
+    sha256 = "sha256-5ajX/cEa0n12Putx1k3ctl1v9wRzJRhyJNDlmjSMbeU=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+
+  postInstall = ''
+    rm -rf $out/obs-plugins $out/data
+  '';
+
+  meta = with lib; {
+    description = "Plugin for OBS Studio to add Markdown sources";
+    homepage = "https://github.com/exeldro/obs-markdown";
+    maintainers = with maintainers; [ flexiondotorg ];
+    license = licenses.gpl2Only;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+  };
+}

From e39aa7b8db980943a6ff6bdeb091a8679f91c1d4 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Tue, 20 May 2025 10:30:56 +0100
Subject: [PATCH 0512/1497] obs-studio-plugins.obs-retro-effects: init at 1.0.0

---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../obs-studio/plugins/obs-retro-effects.nix  | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 4da72ab45f92..67d166df8dd7 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -62,6 +62,8 @@
 
   obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { };
 
+  obs-retro-effects = callPackage ./obs-retro-effects.nix { };
+
   obs-rgb-levels = callPackage ./obs-rgb-levels.nix { };
 
   obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix
new file mode 100644
index 000000000000..3b9c2aadbdbd
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  obs-studio,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-retro-effects";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "FiniteSingularity";
+    repo = "obs-retro-effects";
+    rev = "${version}";
+    sha256 = "sha256-+dg5ySleMb9abT9kIM7HvRSRx9V08B9XPjfoAVe+tWY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+
+  postFixup = ''
+    mv $out/data/obs-plugins/${pname}/shaders $out/share/obs/obs-plugins/${pname}/
+    rm -rf $out/obs-plugins
+    rm -rf $out/data
+  '';
+
+  meta = with lib; {
+    description = "A collection of OBS filters to give your stream that retro feel.";
+    homepage = "https://github.com/FiniteSingularity/obs-retro-effects";
+    maintainers = with maintainers; [ flexiondotorg ];
+    license = licenses.gpl2Plus;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+  };
+}

From 3404b9bbfebd95f07cc1daf5333c4a049377ff98 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Tue, 20 May 2025 12:28:58 +0100
Subject: [PATCH 0513/1497] obs-studio-plugins.obs-dir-watch-media: init at
 0.7.0

---
 .../video/obs-studio/plugins/default.nix      |  2 +
 .../plugins/obs-dir-watch-media.nix           | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 4da72ab45f92..e6baf6d47a1c 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -30,6 +30,8 @@
 
   obs-composite-blur = callPackage ./obs-composite-blur.nix { };
 
+  obs-dir-watch-media = callPackage ./obs-dir-watch-media.nix { };
+
   obs-dvd-screensaver = callPackage ./obs-dvd-screensaver.nix { };
 
   obs-freeze-filter = qt6Packages.callPackage ./obs-freeze-filter.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix
new file mode 100644
index 000000000000..2ef998788b40
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  obs-studio,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-dir-watch-media";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "exeldro";
+    repo = "obs-dir-watch-media";
+    rev = version;
+    sha256 = "sha256-zvg8Bu5wlcQe91ggteEj7G9Kx+mY1R6EN64T13vp7pc=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+
+  postInstall = ''
+    rm -rf $out/obs-plugins $out/data
+  '';
+
+  meta = with lib; {
+    description = "Plugin for OBS Studio adding a filter that can watch a directory for media files";
+    homepage = "https://github.com/exeldro/obs-dir-watch-media";
+    maintainers = with maintainers; [ flexiondotorg ];
+    license = licenses.gpl2Only;
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+  };
+}

From 1890014066a0e5a6c819ee5792f51ad9d9fe34b9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 16 May 2025 17:32:37 +0200
Subject: [PATCH 0514/1497] galene: Extend maintenance to NGI team

---
 pkgs/by-name/ga/galene/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix
index 889521626dfc..a5481dd46dba 100644
--- a/pkgs/by-name/ga/galene/package.nix
+++ b/pkgs/by-name/ga/galene/package.nix
@@ -39,6 +39,7 @@ buildGoModule rec {
     changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES";
     license = licenses.mit;
     platforms = platforms.linux;
+    teams = [ lib.teams.ngi ];
     maintainers = with maintainers; [
       rgrunbla
       erdnaxe

From d53d87f8abd318dcab8f03168f63e56d63fe619d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 27 Apr 2025 12:53:55 +0200
Subject: [PATCH 0515/1497] galene-stt: init at 0.1

---
 pkgs/by-name/ga/galene-stt/package.nix | 91 ++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 pkgs/by-name/ga/galene-stt/package.nix

diff --git a/pkgs/by-name/ga/galene-stt/package.nix b/pkgs/by-name/ga/galene-stt/package.nix
new file mode 100644
index 000000000000..36caefe6d6a1
--- /dev/null
+++ b/pkgs/by-name/ga/galene-stt/package.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gitUpdater,
+  writeShellApplication,
+  _experimental-update-script-combinators,
+  galene,
+  libopus,
+  nix,
+  pkg-config,
+  sd,
+  whisper-cpp,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "galene-stt";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "jech";
+    repo = "galene-stt";
+    tag = "galene-stt-${finalAttrs.version}";
+    hash = "sha256-uW1b5T+p7KGvqt+PlR9d7bo62V+URHniS45sZP/VuLQ=";
+  };
+
+  vendorHash = "sha256-UFOxo8jq+gxN1dkM2A/BQqtT9ggIp7qovFRLv3Q6Io0=";
+
+  # Not necessary, but feels cleaner to pull it in like that
+  postPatch = ''
+    substituteInPlace whisper.go \
+      --replace-fail 'cgo LDFLAGS: -lwhisper' 'cgo pkg-config: whisper'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libopus
+    whisper-cpp
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru = {
+    updateScriptSrc = gitUpdater {
+      rev-prefix = "galene-stt-";
+    };
+    updateScriptVendor = writeShellApplication {
+      name = "update-galene-stt-vendorHash";
+      runtimeInputs = [
+        nix
+        sd
+      ];
+      text = ''
+        export UPDATE_NIX_ATTR_PATH="''${UPDATE_NIX_ATTR_PATH:-galene-stt}"
+
+        oldhash="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.goModules.drvAttrs.outputHash" | cut -d'"' -f2)"
+        newhash="$(nix-build -A "$UPDATE_NIX_ATTR_PATH.goModules" --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
+
+        if [ "$newhash" == "" ]; then
+          echo "No new vendorHash."
+          exit 0
+        fi
+
+        fname="$(nix-instantiate --eval -E "with import ./. {}; (builtins.unsafeGetAttrPos \"version\" $UPDATE_NIX_ATTR_PATH).file" | cut -d'"' -f2)"
+
+        ${sd.meta.mainProgram} --string-mode "$oldhash" "$newhash" "$fname"
+      '';
+    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      finalAttrs.passthru.updateScriptSrc.command
+      (lib.getExe finalAttrs.passthru.updateScriptVendor)
+    ];
+  };
+
+  meta = {
+    description = "Speech-to-text support for Galene";
+    homepage = "https://github.com/jech/galene-stt";
+    changelog = "https://github.com/jech/galene-stt/raw/${finalAttrs.src.rev}/CHANGES";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    inherit (galene.meta) maintainers;
+  };
+})

From 4bd4c663b11d645322db7b16be93b350ae6694bd Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 27 Apr 2025 13:24:40 +0200
Subject: [PATCH 0516/1497] galene-ldap: init at 0.2

---
 pkgs/by-name/ga/galene-ldap/package.nix | 73 +++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ga/galene-ldap/package.nix

diff --git a/pkgs/by-name/ga/galene-ldap/package.nix b/pkgs/by-name/ga/galene-ldap/package.nix
new file mode 100644
index 000000000000..c8ddd14b150d
--- /dev/null
+++ b/pkgs/by-name/ga/galene-ldap/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gitUpdater,
+  writeShellApplication,
+  _experimental-update-script-combinators,
+  galene,
+  nix,
+  sd,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "galene-ldap";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "jech";
+    repo = "galene-ldap";
+    tag = "galene-ldap-${finalAttrs.version}";
+    hash = "sha256-FXD90ishU3FBRj16tQx8wr+lSFl1dffNM1rU81Kfe1I=";
+  };
+
+  vendorHash = "sha256-i/pWXgcd01PgH1Q+WEm0gP1leTFBhqGxVGnl6c+J1aQ=";
+
+  strictDeps = true;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru = {
+    updateScriptSrc = gitUpdater {
+      rev-prefix = "galene-ldap-";
+    };
+    updateScriptVendor = writeShellApplication {
+      name = "update-galene-ldap-vendorHash";
+      runtimeInputs = [
+        nix
+        sd
+      ];
+      text = ''
+        export UPDATE_NIX_ATTR_PATH="''${UPDATE_NIX_ATTR_PATH:-galene-ldap}"
+
+        oldhash="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.goModules.drvAttrs.outputHash" | cut -d'"' -f2)"
+        newhash="$(nix-build -A "$UPDATE_NIX_ATTR_PATH.goModules" --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
+
+        if [ "$newhash" == "" ]; then
+          echo "No new vendorHash."
+          exit 0
+        fi
+
+        fname="$(nix-instantiate --eval -E "with import ./. {}; (builtins.unsafeGetAttrPos \"version\" $UPDATE_NIX_ATTR_PATH).file" | cut -d'"' -f2)"
+
+        ${sd.meta.mainProgram} --string-mode "$oldhash" "$newhash" "$fname"
+      '';
+    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      finalAttrs.passthru.updateScriptSrc.command
+      (lib.getExe finalAttrs.passthru.updateScriptVendor)
+    ];
+  };
+
+  meta = {
+    description = "LDAP support for the Galene videoconferencing server";
+    homepage = "https://github.com/jech/galene-ldap";
+    changelog = "https://github.com/jech/galene-ldap/raw/${finalAttrs.src.rev}/CHANGES";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    inherit (galene.meta) maintainers;
+  };
+})

From edf22f9bc4f02dbbfa08e93ce5303bc087117f0f Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 27 Apr 2025 14:03:09 +0200
Subject: [PATCH 0517/1497] galene-file-transfer: init at 0.2

---
 .../ga/galene-file-transfer/package.nix       | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ga/galene-file-transfer/package.nix

diff --git a/pkgs/by-name/ga/galene-file-transfer/package.nix b/pkgs/by-name/ga/galene-file-transfer/package.nix
new file mode 100644
index 000000000000..08776012c811
--- /dev/null
+++ b/pkgs/by-name/ga/galene-file-transfer/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gitUpdater,
+  writeShellApplication,
+  _experimental-update-script-combinators,
+  galene,
+  nix,
+  sd,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "galene-file-transfer";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "jech";
+    repo = "galene-file-transfer";
+    tag = "galene-file-transfer-${finalAttrs.version}";
+    hash = "sha256-T3OtEsHysAmHwvDIkxqXMKLqIeXEeX9uhEG4WFUgQL4=";
+  };
+
+  vendorHash = "sha256-Z2IYZtB2PAxJD8993reu+ldTG3LdPLNMbr9pP2NUBMA=";
+
+  strictDeps = true;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru = {
+    updateScriptSrc = gitUpdater {
+      rev-prefix = "galene-file-transfer-";
+    };
+    updateScriptVendor = writeShellApplication {
+      name = "update-galene-file-transfer-vendorHash";
+      runtimeInputs = [
+        nix
+        sd
+      ];
+      text = ''
+        export UPDATE_NIX_ATTR_PATH="''${UPDATE_NIX_ATTR_PATH:-galene-file-transfer}"
+
+        oldhash="$(nix-instantiate . --eval --strict -A "$UPDATE_NIX_ATTR_PATH.goModules.drvAttrs.outputHash" | cut -d'"' -f2)"
+        newhash="$(nix-build -A "$UPDATE_NIX_ATTR_PATH.goModules" --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
+
+        if [ "$newhash" == "" ]; then
+          echo "No new vendorHash."
+          exit 0
+        fi
+
+        fname="$(nix-instantiate --eval -E "with import ./. {}; (builtins.unsafeGetAttrPos \"version\" $UPDATE_NIX_ATTR_PATH).file" | cut -d'"' -f2)"
+
+        ${sd.meta.mainProgram} --string-mode "$oldhash" "$newhash" "$fname"
+      '';
+    };
+    updateScript = _experimental-update-script-combinators.sequence [
+      finalAttrs.passthru.updateScriptSrc.command
+      (lib.getExe finalAttrs.passthru.updateScriptVendor)
+    ];
+  };
+
+  meta = {
+    description = "Command-line file transfer client for the Galene videoconferencing server";
+    homepage = "https://github.com/jech/galene-file-transfer";
+    changelog = "https://github.com/jech/galene-file-transfer/raw/${finalAttrs.src.rev}/CHANGES";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    inherit (galene.meta) maintainers;
+  };
+})

From d709875eb3b15eeaf495dc209a390f8294ec6dc3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 1 May 2025 21:14:22 +0200
Subject: [PATCH 0518/1497] nixosTests.galene.basic: init

---
 nixos/tests/all-tests.nix          |  1 +
 nixos/tests/galene.nix             | 97 ++++++++++++++++++++++++++++++
 pkgs/by-name/ga/galene/package.nix |  5 ++
 3 files changed, 103 insertions(+)
 create mode 100644 nixos/tests/galene.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a91b390baa91..7a0bdb1888ec 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -529,6 +529,7 @@ in
   ft2-clone = runTest ./ft2-clone.nix;
   legit = runTest ./legit.nix;
   mimir = runTest ./mimir.nix;
+  galene = discoverTests (import ./galene.nix);
   gancio = runTest ./gancio.nix;
   garage = handleTest ./garage { };
   gatus = runTest ./gatus.nix;
diff --git a/nixos/tests/galene.nix b/nixos/tests/galene.nix
new file mode 100644
index 000000000000..a42d178ddc91
--- /dev/null
+++ b/nixos/tests/galene.nix
@@ -0,0 +1,97 @@
+let
+  makeTest = import ./make-test-python.nix;
+  galeneTestGroupsDir = "/var/lib/galene/groups";
+  galeneTestGroupFile = "galene-test-config.json";
+  galenePort = 8443;
+in
+{
+  basic = makeTest (
+    { pkgs, lib, ... }:
+    let
+      galeneTestGroupAdminName = "admin";
+      galeneTestGroupAdminPassword = "1234";
+    in
+    {
+      name = "galene-works";
+      meta = {
+        inherit (pkgs.galene.meta) maintainers;
+        platforms = lib.platforms.linux;
+      };
+
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
+
+          services.xserver.enable = true;
+
+          environment = {
+            # https://galene.org/INSTALL.html
+            etc.${galeneTestGroupFile}.source = (pkgs.formats.json { }).generate galeneTestGroupFile {
+              op = [
+                {
+                  username = galeneTestGroupAdminName;
+                  password = galeneTestGroupAdminPassword;
+                }
+              ];
+              other = [ { } ];
+            };
+
+            systemPackages = with pkgs; [
+              firefox
+            ];
+          };
+
+          services.galene = {
+            enable = true;
+            insecure = true;
+            httpPort = galenePort;
+            groupsDir = galeneTestGroupsDir;
+          };
+        };
+
+      enableOCR = true;
+
+      testScript = ''
+        machine.wait_for_x()
+
+        with subtest("galene starts"):
+            # Starts?
+            machine.wait_for_unit("galene")
+
+            # Keeps running after startup?
+            machine.sleep(10)
+            machine.wait_for_unit("galene")
+
+            # Reponds fine?
+            machine.succeed("curl -s -D - -o /dev/null 'http://localhost:${builtins.toString galenePort}' >&2")
+
+        machine.succeed("cp -v /etc/${galeneTestGroupFile} ${galeneTestGroupsDir}/test.json >&2")
+        machine.wait_until_succeeds("curl -s -D - -o /dev/null 'http://localhost:${builtins.toString galenePort}/group/test/' >&2")
+
+        with subtest("galene can join group"):
+            # Open site
+            machine.succeed("firefox --new-window 'http://localhost:${builtins.toString galenePort}/group/test/' >&2 &")
+            # Note: Firefox doesn't use a regular "-" in the window title, but "—" (Hex: 0xe2 0x80 0x94)
+            machine.wait_for_window("Test — Mozilla Firefox")
+            machine.send_key("ctrl-minus")
+            machine.send_key("ctrl-minus")
+            machine.send_key("alt-f10")
+            machine.wait_for_text(r"(Galène|Username|Password|Connect)")
+            machine.screenshot("galene-group-test-join")
+
+            # Log in as admin
+            machine.send_chars("${galeneTestGroupAdminName}")
+            machine.send_key("tab")
+            machine.send_chars("${galeneTestGroupAdminPassword}")
+            machine.send_key("ret")
+            machine.sleep(5)
+            # Close "Remember credentials?" FF prompt
+            machine.send_key("esc")
+            machine.sleep(5)
+            machine.wait_for_text(r"(Enable|Share|Screen)")
+            machine.screenshot("galene-group-test-logged-in")
+      '';
+    }
+  );
+}
diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix
index a5481dd46dba..10d89c331ece 100644
--- a/pkgs/by-name/ga/galene/package.nix
+++ b/pkgs/by-name/ga/galene/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
+  nixosTests,
 }:
 
 buildGoModule rec {
@@ -33,6 +34,10 @@ buildGoModule rec {
     cp -r ./static $static
   '';
 
+  passthru = {
+    tests.vm = nixosTests.galene.basic;
+  };
+
   meta = with lib; {
     description = "Videoconferencing server that is easy to deploy, written in Go";
     homepage = "https://github.com/jech/galene";

From e4b09e47ace7d87de083786b404bf232eb6c89d8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 30 May 2025 20:48:08 +0200
Subject: [PATCH 0519/1497] nixosTests.galene.file-transfer: init

---
 nixos/tests/galene.nix                        | 122 +++++++++++++++++-
 .../ga/galene-file-transfer/package.nix       |   2 +
 2 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/galene.nix b/nixos/tests/galene.nix
index a42d178ddc91..8805a088a56c 100644
--- a/nixos/tests/galene.nix
+++ b/nixos/tests/galene.nix
@@ -3,14 +3,12 @@ let
   galeneTestGroupsDir = "/var/lib/galene/groups";
   galeneTestGroupFile = "galene-test-config.json";
   galenePort = 8443;
+  galeneTestGroupAdminName = "admin";
+  galeneTestGroupAdminPassword = "1234";
 in
 {
   basic = makeTest (
     { pkgs, lib, ... }:
-    let
-      galeneTestGroupAdminName = "admin";
-      galeneTestGroupAdminPassword = "1234";
-    in
     {
       name = "galene-works";
       meta = {
@@ -94,4 +92,120 @@ in
       '';
     }
   );
+
+  file-transfer = makeTest (
+    { pkgs, lib, ... }:
+    {
+      name = "galene-file-transfer-works";
+      meta = {
+        inherit (pkgs.galene-file-transfer.meta) maintainers;
+        platforms = lib.platforms.linux;
+      };
+
+      nodes.machine =
+        { config, pkgs, ... }:
+        {
+          imports = [ ./common/x11.nix ];
+
+          services.xserver.enable = true;
+
+          environment = {
+            # https://galene.org/INSTALL.html
+            etc.${galeneTestGroupFile}.source = (pkgs.formats.json { }).generate galeneTestGroupFile {
+              op = [
+                {
+                  username = galeneTestGroupAdminName;
+                  password = galeneTestGroupAdminPassword;
+                }
+              ];
+              other = [ { } ];
+            };
+
+            systemPackages = with pkgs; [
+              firefox
+              galene-file-transfer
+            ];
+          };
+
+          services.galene = {
+            enable = true;
+            insecure = true;
+            httpPort = galenePort;
+            groupsDir = galeneTestGroupsDir;
+          };
+        };
+
+      enableOCR = true;
+
+      testScript = ''
+        machine.wait_for_x()
+
+        with subtest("galene starts"):
+            # Starts?
+            machine.wait_for_unit("galene")
+
+            # Keeps running after startup?
+            machine.sleep(10)
+            machine.wait_for_unit("galene")
+
+            # Reponds fine?
+            machine.succeed("curl -s -D - -o /dev/null 'http://localhost:${builtins.toString galenePort}' >&2")
+
+        machine.succeed("cp -v /etc/${galeneTestGroupFile} ${galeneTestGroupsDir}/test.json >&2")
+        machine.wait_until_succeeds("curl -s -D - -o /dev/null 'http://localhost:${builtins.toString galenePort}/group/test/' >&2")
+
+        with subtest("galene can join group"):
+            # Open site
+            machine.succeed("firefox --new-window 'http://localhost:${builtins.toString galenePort}/group/test/' >&2 &")
+            # Note: Firefox doesn't use a regular "-" in the window title, but "—" (Hex: 0xe2 0x80 0x94)
+            machine.wait_for_window("Test — Mozilla Firefox")
+            machine.send_key("ctrl-minus")
+            machine.send_key("ctrl-minus")
+            machine.send_key("alt-f10")
+            machine.wait_for_text(r"(Galène|Username|Password|Connect)")
+            machine.screenshot("galene-group-test-join")
+
+            # Log in as admin
+            machine.send_chars("${galeneTestGroupAdminName}")
+            machine.send_key("tab")
+            machine.send_chars("${galeneTestGroupAdminPassword}")
+            machine.send_key("ret")
+            machine.sleep(5)
+            # Close "Remember credentials?" FF prompt
+            machine.send_key("esc")
+            machine.sleep(5)
+            machine.wait_for_text(r"(Enable|Share|Screen)")
+            machine.screenshot("galene-group-test-logged-in")
+
+        with subtest("galene-file-transfer works"):
+            machine.succeed(
+                "galene-file-transfer "
+                + "-to '${galeneTestGroupAdminName}' "
+                + "-insecure 'http://localhost:${builtins.toString galenePort}/group/test/' "
+                + "${galeneTestGroupsDir}/test.json " # just try sending the groups file
+                + " >&2 &"
+            )
+            machine.sleep(5) # Give pop-up some time to appear
+            machine.wait_for_text(r"(offered to send us a file|Accept|Reject|disclose your IP)")
+            machine.screenshot("galene-file-transfer-dislogue")
+
+            # Focus on Accept button
+            machine.send_key("shift-tab")
+            machine.send_key("shift-tab")
+            machine.send_key("shift-tab")
+            machine.send_key("shift-tab")
+
+            # Accept download
+            machine.sleep(2)
+            machine.send_key("ret")
+
+            # Wait until complete & matching
+            machine.wait_until_succeeds(
+                "diff "
+                + "${galeneTestGroupsDir}/test.json " # original
+                + "/root/Downloads/test.json" # Received via file-transfer
+            )
+      '';
+    }
+  );
 }
diff --git a/pkgs/by-name/ga/galene-file-transfer/package.nix b/pkgs/by-name/ga/galene-file-transfer/package.nix
index 08776012c811..43b4c8619486 100644
--- a/pkgs/by-name/ga/galene-file-transfer/package.nix
+++ b/pkgs/by-name/ga/galene-file-transfer/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   gitUpdater,
+  nixosTests,
   writeShellApplication,
   _experimental-update-script-combinators,
   galene,
@@ -31,6 +32,7 @@ buildGoModule (finalAttrs: {
   ];
 
   passthru = {
+    tests.vm = nixosTests.galene.file-transfer;
     updateScriptSrc = gitUpdater {
       rev-prefix = "galene-file-transfer-";
     };

From 4f4e0d12026eddf3a5917d7794772d00de6e03f7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 11:36:46 +0200
Subject: [PATCH 0520/1497] python313Packages.tencentcloud-sdk-python: 3.0.1390
 -> 3.0.1391

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1390...refs/tags/3.0.1391

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1391/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index c50956c17ad5..fc1035dadcf4 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1390";
+  version = "3.0.1391";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-UOJ1NCWKFqcrU2uMX4qTy8ooFEy6TIrb1YTIthHspuM=";
+    hash = "sha256-bzxaCN2fXoZT2W8zpTg7DrBTmRfyUi2aVhrg+/Y1YkU=";
   };
 
   build-system = [ setuptools ];

From 71972361e8e03f0093b18b0596dbf0aba3475a0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 09:42:11 +0000
Subject: [PATCH 0521/1497] zashboard: 1.90.0 -> 1.93.0

---
 pkgs/by-name/za/zashboard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index eb4db28562f4..5b038dd71416 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.90.0";
+  version = "1.93.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LxA0X2E9Xue79xLAYuCz0ZA0v8hYVxkb+1h6qB4MiDI=";
+    hash = "sha256-0YlFDmn5XAQiGxGpFJtVgtFdPbxApVlsqRLwIun0YtI=";
   };
 
   nativeBuildInputs = [

From 78e4af9c32fe5c95c8b7bb9d2395b9b17d33474b Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 2 Jun 2025 11:49:34 +0200
Subject: [PATCH 0522/1497] libgourou: Refactor to use fetchFromGitea, replace
 rec with finalAttrs

---
 pkgs/by-name/li/libgourou/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix
index f55f52edd4b4..59fc3f7ded25 100644
--- a/pkgs/by-name/li/libgourou/package.nix
+++ b/pkgs/by-name/li/libgourou/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchzip,
+  fetchFromGitea,
   pugixml,
   updfparser,
   curl,
@@ -10,12 +10,15 @@
   installShellFiles,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libgourou";
   version = "0.8.7";
 
-  src = fetchzip {
-    url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz";
+  src = fetchFromGitea {
+    domain = "forge.soutade.fr";
+    owner = "soutade";
+    repo = "libgourou";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Tkft/pe3lH07pmyVibTEutIIvconUWDH1ZVN3qV4sSY=";
   };
 
@@ -46,7 +49,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
     install -Dt $out/include include/libgourou*.h
     install -Dt $out/lib libgourou.so
-    install -Dt $out/lib libgourou.so.${version}
+    install -Dt $out/lib libgourou.so.${finalAttrs.version}
     install -Dt $out/lib libgourou.a
     install -Dt $out/bin utils/acsmdownloader
     install -Dt $out/bin utils/adept_{activate,loan_mgt,remove}
@@ -62,4 +65,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 2c773498684810e8b884b66d375bbb238fe25cd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 09:50:17 +0000
Subject: [PATCH 0523/1497] libretro.flycast: 0-unstable-2025-05-22 ->
 0-unstable-2025-06-01

---
 pkgs/applications/emulators/libretro/cores/flycast.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 9c123e21ef8b..f5ad35c6edce 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-05-22";
+  version = "0-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "1953eb0eea10f6ddc780bea743ad74c57983b554";
-    hash = "sha256-Y0QmDzML8bSQi1DxFErBptSB31TrXmFGVoTYnd3Ppr0=";
+    rev = "d9ec0cb3ab0ce383f24f86d023e1889b7f37c5c7";
+    hash = "sha256-MwXq+qhba+PNS1e2LS3CduWcdO3Tm0OS8ny1Gq3Zo5s=";
     fetchSubmodules = true;
   };
 

From 7219c97de67d17de1c6755d27f5347cc36aa772c Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 2 Jun 2025 11:51:19 +0200
Subject: [PATCH 0524/1497] libgourou: Update homepage URL

---
 pkgs/by-name/li/libgourou/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix
index 59fc3f7ded25..b790d56deb29 100644
--- a/pkgs/by-name/li/libgourou/package.nix
+++ b/pkgs/by-name/li/libgourou/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     description = "Implementation of Adobe's ADEPT protocol for ePub/PDF DRM";
-    homepage = "https://indefero.soutade.fr/p/libgourou";
+    homepage = "https://forge.soutade.fr/soutade/libgourou";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ autumnal ];
     platforms = platforms.all;

From c8fc4ffd1d5ca5b74e03b466c9f348f8f2bb391c Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 2 Jun 2025 11:51:50 +0200
Subject: [PATCH 0525/1497] updfparser: Refactor to use fetchFromGitea, replace
 rec with finalAttrs

---
 pkgs/by-name/up/updfparser/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix
index 4ead9b3cdb9a..c82d453e7a81 100644
--- a/pkgs/by-name/up/updfparser/package.nix
+++ b/pkgs/by-name/up/updfparser/package.nix
@@ -1,16 +1,19 @@
 {
   lib,
   stdenv,
-  fetchzip,
+  fetchFromGitea,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   name = "updfparser";
-  version = "unstable-2024-03-24";
+  version = "0-unstable-2024-03-24";
   rev = "6060d123441a06df699eb275ae5ffdd50409b8f3";
 
-  src = fetchzip {
-    url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz";
+  src = fetchFromGitea {
+    inherit (finalAttrs) rev;
+    domain = "forge.soutade.fr";
+    owner = "soutade";
+    repo = "updfparser";
     hash = "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk=";
   };
 
@@ -34,4 +37,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ autumnal ];
     platforms = platforms.all;
   };
-}
+})

From 6d6550b6c496973cc28b79af5e329ab19389c8ab Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Mon, 2 Jun 2025 11:52:45 +0200
Subject: [PATCH 0526/1497] updfparser: Update homepage URL

---
 pkgs/by-name/up/updfparser/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix
index c82d453e7a81..d90095be538b 100644
--- a/pkgs/by-name/up/updfparser/package.nix
+++ b/pkgs/by-name/up/updfparser/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     description = "Very simple PDF parser";
-    homepage = "https://indefero.soutade.fr/p/updfparser";
+    homepage = "https://forge.soutade.fr/soutade/updfparser";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ autumnal ];
     platforms = platforms.all;

From a6f173ecc2021433b54d71ee002cd2a645a62cf4 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Mon, 2 Jun 2025 11:54:08 +0200
Subject: [PATCH 0527/1497] jenkins: 2.504.1 -> 2.504.2

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index c692d25eda70..d316adda27ca 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.504.1";
+  version = "2.504.2";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE=";
+    hash = "sha256-5SNHwB3TkRbDZPt+ureNFWvOj2rdKEhP9XH+DQ+uq/Y=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5d13909b5861537cf7feae00327ed07d8d112635 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 2 Jun 2025 11:54:42 +0200
Subject: [PATCH 0528/1497] cargo-insta: 1.42.2 -> 1.43.1

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/ca/cargo-insta/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 0f646fa77d63..0cb1c621bf54 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-insta";
-  version = "1.42.2";
+  version = "1.43.1";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "insta";
-    rev = "e81bae9b7b7f536bd9057158fe5a219facced116";
-    hash = "sha256-5IGp4WuC34wRB7xSiDWzScLvV26yjsdw/LT/7CN9hWc=";
+    rev = version;
+    hash = "sha256-8yFbf0MF5zDuMqG1AsCOvQhJc8D8cBH1WqCGulcXVH0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vx26ArAcsW0NNVNZa4M5hqz/sm1gecrun/bbRWMu07Q=";
+  cargoHash = "sha256-atPSV+dZgywgS+9M0LRtMqH4JP4UpYGjb2hyGAEwhkw=";
 
   checkFlags = [
     # Depends on `rustfmt` and does not matter for packaging.

From e32c57a41aae1e25d6b367476bb1464d2d26b040 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 10:25:11 +0000
Subject: [PATCH 0529/1497] terraform-providers.rancher2: 7.0.0 -> 7.2.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..54d3092c454a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1084,11 +1084,11 @@
     "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
   },
   "rancher2": {
-    "hash": "sha256-H6ZdGvKSYRlDsCKIHlPHdEv1+6aa1rll/73IeJ+PDhc=",
+    "hash": "sha256-5NkvGETjJ5eoZC5Ohnoq2y1DQVs2WTrh/wEVO1HQsOA=",
     "homepage": "https://registry.terraform.io/providers/rancher/rancher2",
     "owner": "rancher",
     "repo": "terraform-provider-rancher2",
-    "rev": "v7.0.0",
+    "rev": "v7.2.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },

From 235e8e028cfbd794509d7e1e4d5db4c8d900bbf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 10:34:38 +0000
Subject: [PATCH 0530/1497] namespace-cli: 0.0.415 -> 0.0.416

---
 pkgs/by-name/na/namespace-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index f50ee079751a..616dcb8b3e4e 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.415";
+  version = "0.0.416";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-mWiY2HbOE7R9ltunpSLiM84iscTuSJTQtWCbk2O/HIQ=";
+    hash = "sha256-Te2BFbzrGU7iw+CqDafOiIByUfHEb8QGBAci+6imIm4=";
   };
 
-  vendorHash = "sha256-waO9D0wSluzLl0pULeWMCYKh5IUqcS+VIvwDVwedx64=";
+  vendorHash = "sha256-hPZmNH4bhIds+Ps0pQCjYPfvVBaX8e3Bq/onq91Fzq8=";
 
   subPackages = [
     "cmd/nsc"

From ab1d36767120bd984b09dd6c263aafaf6f326677 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Jun 2025 12:45:48 +0200
Subject: [PATCH 0531/1497] graphene: fix static

Meson doesn't support gtk-doc for static builds.

Link: https://github.com/mesonbuild/meson/pull/14257
---
 pkgs/by-name/gr/graphene/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/graphene/package.nix b/pkgs/by-name/gr/graphene/package.nix
index 534c8d24fb9b..0cdf6d7c83ab 100644
--- a/pkgs/by-name/gr/graphene/package.nix
+++ b/pkgs/by-name/gr/graphene/package.nix
@@ -13,8 +13,11 @@
   nixosTests,
   glib,
   withDocumentation ?
-    stdenv.buildPlatform.canExecute stdenv.hostPlatform
-    || stdenv.hostPlatform.emulatorAvailable buildPackages,
+    (
+      stdenv.buildPlatform.canExecute stdenv.hostPlatform
+      || stdenv.hostPlatform.emulatorAvailable buildPackages
+    )
+    && !stdenv.hostPlatform.isStatic,
   gtk-doc,
   docbook_xsl,
   docbook_xml_dtd_43,

From c0e68745f91fac8cafa8deaee5ffc232f141f3f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 10:53:59 +0000
Subject: [PATCH 0532/1497] manga-tui: 0.7.0 -> 0.8.0

---
 pkgs/by-name/ma/manga-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
index af215b99a4dd..4c2da99f92a4 100644
--- a/pkgs/by-name/ma/manga-tui/package.nix
+++ b/pkgs/by-name/ma/manga-tui/package.nix
@@ -10,7 +10,7 @@
   nix-update-script,
 }:
 let
-  version = "0.7.0";
+  version = "0.8.0";
 in
 rustPlatform.buildRustPackage {
   pname = "manga-tui";
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage {
     owner = "josueBarretogit";
     repo = "manga-tui";
     rev = "v${version}";
-    hash = "sha256-1WFg2hG3UnOO9+HpUcdPkZNhsNYa2QG1PhzLZ4bQiQM=";
+    hash = "sha256-81P5LwL9njxA0qx4FvqgrHdqVgUXkZTTzAXLdRTftS4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1nERwIZCR/afgfGdronpy145GnDkbsB7YjF6XyDcfEY=";
+  cargoHash = "sha256-dne0sJ0K/UVXGaj/vUM9O++ZS0hu69bdLnV8VAr3tbM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 771fc3e30cfb7175778e44f7b8744b908007b5b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 11:02:27 +0000
Subject: [PATCH 0533/1497] spicetify-cli: 2.40.9 -> 2.40.10

---
 pkgs/by-name/sp/spicetify-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index c1794be0f9ed..44c545ecb7b2 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "spicetify-cli";
-  version = "2.40.9";
+  version = "2.40.10";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x3M6AbFiVCk1LM3k+D+NAnOclu90LAuBgYI/cBLpH3A=";
+    hash = "sha256-S9vC7gAbwW8YSpXyDryalXHW3aWffGlelyc/oaE5vXg=";
   };
 
   vendorHash = "sha256-901njlGcAxr12F9w6yQ+ESsptlwsZsMvKPUmlHxehmA=";

From 06b9a3090f86e515b14f354507c880de1c4c1d25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 11:16:02 +0000
Subject: [PATCH 0534/1497] renode-dts2repl: 0-unstable-2025-05-20 ->
 0-unstable-2025-05-28

---
 pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index 471402426394..2b0492851ead 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-05-20";
+  version = "0-unstable-2025-05-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "be40a3764a727a7a22eebb481b1fd3e0f70fca8c";
-    hash = "sha256-r+7J7AgWpBZuGpPU7EBn0KxM5ksHC6aED4oLe4oZzfQ=";
+    rev = "8413c5a08ed53867493b2a08fd4c730d7b419ee7";
+    hash = "sha256-Dl/JzkUP/mNBxz20C4qH5B3qpXjd4/q/r5n0RO3ga+U=";
   };
 
   nativeBuildInputs = [

From 3230c6105bd00b475c274261b756e7f9cc538521 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Jun 2025 10:34:49 +0200
Subject: [PATCH 0535/1497] skalibs: fix cross

Fixes: 875d3b3bae9e ("skawarePackages.skalibs: 2.14.3.0 -> 2.14.4.0")
---
 pkgs/development/skaware-packages/skalibs/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index fec66a095ce1..bf52599b7591 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -33,6 +33,15 @@ skawarePackages.buildPackage {
 
     ]
     ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [
+      # There's a fallback path for BSDs.
+      "--with-sysdep-procselfexe=${
+        if stdenv.hostPlatform.isLinux then
+          "/proc/self/exe"
+        else if stdenv.hostPlatform.isSunOS then
+          "/proc/self/path/a.out"
+        else
+          "none"
+      }"
       # ./configure: sysdep posixspawnearlyreturn cannot be autodetected
       # when cross-compiling. Please manually provide a value with the
       # --with-sysdep-posixspawnearlyreturn=yes|no|... option.

From 38d286ad7d6b210f796b98d46e98ec4c0b318cf9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 11:37:41 +0000
Subject: [PATCH 0536/1497] snipaste: 2.10.6 -> 2.10.7

---
 pkgs/by-name/sn/snipaste/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix
index 1230e2e284d6..f6eec3131d03 100644
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "snipaste";
-  version = "2.10.6";
+  version = "2.10.7";
   src = fetchurl {
     url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
-    hash = "sha256-lkP3YN4ZNbtM2beQEIWPxBE6JXToRBW48QAMLw/TBzQ=";
+    hash = "sha256-WzCSI0BfjolbWbj/mLhRj75tW/CvlbzQtFuBizg8xl4=";
   };
   contents = appimageTools.extract { inherit pname version src; };
 in

From 08fbd0e8aa6b83957fa6da3fd360b7293067105e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 11:56:26 +0000
Subject: [PATCH 0537/1497] whisper-ctranslate2: 0.5.2 -> 0.5.3

---
 pkgs/by-name/wh/whisper-ctranslate2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
index a92e8ab1bf7e..b950edf4b202 100644
--- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix
+++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
@@ -7,7 +7,7 @@
 }:
 let
   pname = "whisper-ctranslate2";
-  version = "0.5.2";
+  version = "0.5.3";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication {
     owner = "Softcatala";
     repo = "whisper-ctranslate2";
     tag = version;
-    hash = "sha256-53sKuaZJcH/i2C4oeKcvxRs3OmkvR3USw6nnPh+i+Eo=";
+    hash = "sha256-rRxadVYv69Jgzai+ANS6oKHOArTI9vPDPeTybtOySww=";
   };
 
   build-system = [ python3Packages.setuptools ];

From c8fa587d2fe57a0eb66707e6ef46140881401c9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:03:09 +0000
Subject: [PATCH 0538/1497] phel: 0.16.1 -> 0.17.0

---
 pkgs/by-name/ph/phel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 1cf285f3eeee..cebea03729cc 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.16.1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-irN1Dnov6vDiU4xGsf2nxz7/kz1YOMq0yOLYt4HY1EM=";
+    hash = "sha256-iS887QNUphe+czx1IEz+uESBqee73/mHzmg2Fvi26do=";
   };
 
-  vendorHash = "sha256-SDLpl2gBvtVjREfcy1WDFqsGRK1fKr2wKPuBkPhApNI=";
+  vendorHash = "sha256-lhxgL41gyHVOv1MqjwwnWQTQZz4WU2kWGCSV2EZoJrg=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 5b6c00d098ca11d1f9beec503a6c4f37cc2109b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:17:45 +0000
Subject: [PATCH 0539/1497] terraform-providers.tencentcloud: 1.81.194 ->
 1.81.197

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..6f5b7330413c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1327,11 +1327,11 @@
     "vendorHash": "sha256-HBdvXWZNPPAqPEKodwG0ZeiJOhfJHe9HRCcuozKpwVs="
   },
   "tencentcloud": {
-    "hash": "sha256-CHYuiAgzFIAApK8wZ75DtgVf8sAEVwrXP7l/l+VxB1o=",
+    "hash": "sha256-JMLuH/NDCNiByLh65NQH/goaN7/J7MGfsUNKfHJ3LFQ=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.81.194",
+    "rev": "v1.81.197",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 3350ffcef5aa31ca5ea6de3df8f9f7571b7cd004 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 14:23:30 +0200
Subject: [PATCH 0540/1497] python313Packages.tesla-fleet-api: add changelog to
 meta

---
 pkgs/development/python-modules/tesla-fleet-api/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index ec395010bb1c..a62c976ad2d1 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for Tesla Fleet API and Teslemetry";
     homepage = "https://github.com/Teslemetry/python-tesla-fleet-api";
+    changelog = "https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From c85d7c7db5e6e0a8684ecaef3f60ca6f0ed23b19 Mon Sep 17 00:00:00 2001
From: Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Date: Thu, 29 May 2025 08:44:00 +0200
Subject: [PATCH 0541/1497] amp-cli: add a smoketest for the binary

Just runs --version. Amp will try create a log directory in your
homedir, so we need to give it a homedir it can write to.

Additionally we remove the rec and use finalAttrs instead.
---
 pkgs/by-name/am/amp-cli/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index f62ec5f897ea..cb858a95eb2d 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -4,14 +4,15 @@
   fetchzip,
   ripgrep,
   makeWrapper,
+  testers,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
   version = "0.0.1748404992-ga3f78f";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz";
+    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
     hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA=";
   };
 
@@ -25,7 +26,7 @@ buildNpmPackage rec {
       "version": "0.0.0",
       "license": "UNLICENSED",
       "dependencies": {
-        "@sourcegraph/amp": "${version}"
+        "@sourcegraph/amp": "${finalAttrs.version}"
       },
       "bin": {
         "amp": "./bin/amp-wrapper.js"
@@ -69,6 +70,10 @@ buildNpmPackage rec {
   '';
 
   passthru.updateScript = ./update.sh;
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "HOME=$(mktemp -d) amp --version";
+  };
 
   meta = {
     description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph";
@@ -81,4 +86,4 @@ buildNpmPackage rec {
     ];
     mainProgram = "amp";
   };
-}
+})

From e5242f5e8cccb3b3e4aed120e15e6a785602efbe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 14:31:29 +0200
Subject: [PATCH 0542/1497] python313Packages.hyperion-py: 0.7.5 -> 0.7.6

Changelog: https://github.com/dermotduffy/hyperion-py/releases/tag/v0.7.6
---
 .../python-modules/hyperion-py/default.nix    | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix
index f19fe0ca85d5..5cb6a69ec2ac 100644
--- a/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/pkgs/development/python-modules/hyperion-py/default.nix
@@ -3,60 +3,44 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  pytestCheckHook,
-  pythonOlder,
   poetry-core,
   pytest-aiohttp,
   pytest-asyncio,
+  pytest-cov-stub,
+  pytest-timeout,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "hyperion-py";
-  version = "0.7.5";
-  disabled = pythonOlder "3.8";
-  format = "pyproject";
+  version = "0.7.6";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dermotduffy";
     repo = "hyperion-py";
-    rev = "v${version}";
-    hash = "sha256-arcnpCQsRuiWCrAz/t4TCjTe8DRDtRuzYp8k7nnjGDk=";
+    tag = "v${version}";
+    hash = "sha256-14taFSrtmgTBiie0eY2fSRkZndJSZ4GJNRx3MonrTzs=";
   };
 
-  patches = [
-    (fetchpatch {
-      # python3.10 compat: Drop loop kwarg in asyncio.sleep call
-      url = "https://github.com/dermotduffy/hyperion-py/commit/f02af52fcce17888984c99bfc03935e372011394.patch";
-      hash = "sha256-4nfsQVxd77VV9INwNxTyFRDlAjwdTYqfSGuF487hFCs=";
-    })
-  ];
+  build-system = [ poetry-core ];
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   nativeCheckInputs = [
     pytest-asyncio
     pytest-aiohttp
+    pytest-cov-stub
+    pytest-timeout
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
-    # pytest-asyncio 0.17.0 compat
-    "--asyncio-mode=auto"
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --timeout=9 --cov=hyperion" ""
-  '';
-
   pythonImportsCheck = [ "hyperion" ];
 
   meta = with lib; {
     description = "Python package for Hyperion Ambient Lighting";
     homepage = "https://github.com/dermotduffy/hyperion-py";
+    changelog = "https://github.com/dermotduffy/hyperion-py/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From b5f134c284bb3ef4598d24fcfc14b069dc0b335e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:33:38 +0000
Subject: [PATCH 0543/1497] vscode-extensions.dart-code.dart-code: 3.110.0 ->
 3.112.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b7fb23904f74..83f405810573 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1240,8 +1240,8 @@ let
         mktplcRef = {
           name = "dart-code";
           publisher = "dart-code";
-          version = "3.110.0";
-          hash = "sha256-YLdhL5xNj8sidZUzMVZgOK6zTXgQnWdKWRrDg0on90s=";
+          version = "3.112.0";
+          hash = "sha256-nnEEKijl5ZdsHyBAWCL+MucjNGIuup75xSJaVzNawrs=";
         };
 
         meta.license = lib.licenses.mit;

From 9db9057e348d93fb2dd9ac9b628eb0ffaf681add Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:34:10 +0000
Subject: [PATCH 0544/1497] vscode-extensions.dart-code.flutter: 3.110.0 ->
 3.112.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b7fb23904f74..7d950486fe0f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1251,8 +1251,8 @@ let
         mktplcRef = {
           name = "flutter";
           publisher = "dart-code";
-          version = "3.110.0";
-          hash = "sha256-Zi+q56XcHZGUKgF3TNpaYSwwdqLT8Q1fxf8dFVAEuQY=";
+          version = "3.112.0";
+          hash = "sha256-S+srv0zUCobM3IPXOME5oT0xdXdPmMHSs7rwNTBcnhk=";
         };
 
         meta.license = lib.licenses.mit;

From f2f7b44cb20cf93acc962a75aae7086a6c2f4be7 Mon Sep 17 00:00:00 2001
From: Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Date: Mon, 2 Jun 2025 14:35:19 +0200
Subject: [PATCH 0545/1497] amp-cli: update 0.0.1748404992-ga3f78f ->
 0.0.1748865683-g71e54e

---
 pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++----
 pkgs/by-name/am/amp-cli/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index 28c2a16ea664..b4ce79716cfb 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1748404992-ga3f78f"
+        "@sourcegraph/amp": "^0.0.1748865683-g71e54e"
       }
     },
     "node_modules/@colors/colors": {
@@ -29,9 +29,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1748404992-ga3f78f",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748404992-ga3f78f.tgz",
-      "integrity": "sha512-+BvCW8zrbO7ENRzMg0LdAeKigjzL+ASIDBjJ/m2uL2CVT8WPk1h34FTNCbvnO6kssimEtdP8FcxR/2O4AHwUbA==",
+      "version": "0.0.1748865683-g71e54e",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748865683-g71e54e.tgz",
+      "integrity": "sha512-ZiNbIbgCb/l7Q7wRT0sva6Ju7VDtq7+lijMWK8jotPorTq1DYUy3h7XJIOjyJEdvqlQkEfwrnbOfREmsnwlPyg==",
       "dependencies": {
         "@types/runes": "^0.4.3",
         "@vscode/ripgrep": "1.15.11",
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index cb858a95eb2d..12c2af788b69 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1748404992-ga3f78f";
+  version = "0.0.1748865683-g71e54e";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA=";
+    hash = "sha256-kkQKjw1SzDjV8/206i+NUyxeDhZ/35My9gyXRe/U7I8=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-05+hBr+eX3I92U9TsqPQrYcJCmKXTvz3n6ZTxR1XvC8=";
+  npmDepsHash = "sha256-yeZ5UCVUCbVjpYTYYN5mI6eCkShtnCKxumjpb5GRCws=";
 
   propagatedBuildInputs = [
     ripgrep

From 60691cedcbc5857c12959af1439c43804d905c68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:36:24 +0000
Subject: [PATCH 0546/1497] python3Packages.pynitrokey: 0.8.4 -> 0.8.5

---
 pkgs/development/python-modules/pynitrokey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix
index 7d71afb25bec..1586313a8823 100644
--- a/pkgs/development/python-modules/pynitrokey/default.nix
+++ b/pkgs/development/python-modules/pynitrokey/default.nix
@@ -30,7 +30,7 @@
 
 let
   pname = "pynitrokey";
-  version = "0.8.4";
+  version = "0.8.5";
   mainProgram = "nitropy";
 in
 
@@ -40,7 +40,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Sr3ecKyIjsemM2G72BQR0S5YzfXA0nK9i29yKNie9Ys=";
+    hash = "sha256-mPhH4IdpKKA9d8sJOGMWpGerzki5qZHFHe4u4ao2RgE=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 1053fabad58dfa22caef2e1f9d234d64c9b54d30 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 14:41:24 +0200
Subject: [PATCH 0547/1497] burpsuite: 2025.4.2 -> 2025.5.1

---
 pkgs/by-name/bu/burpsuite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 17d84183b9f6..5f45e0746bad 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.4.2";
+  version = "2025.5.1";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-wtCZ3/7JvygSCka4i3Il2ajpSuuTPTwHeVJa4gGFDPw=";
+        hash = "sha256-1AXAVXselQKqKsjTRJVN3rBQpSReTH3d0ulIahp9QCc=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-+1aTq7XKacsi/gzUpeZvSuwpKPDMo6H3C81pxWCC4w8=";
+        hash = "sha256-zX5QJz996WgKvDA6p5dRtmbZTRsgCl0URn302MkhVew=";
       };
 
   src = fetchurl {

From e2e0c2ea9d2d73a8c8e4505f09d3dd24a7389c22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 12:52:14 +0000
Subject: [PATCH 0548/1497] slirp4netns: 1.3.2 -> 1.3.3

---
 pkgs/by-name/sl/slirp4netns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix
index f7a643222a23..1b226420b85b 100644
--- a/pkgs/by-name/sl/slirp4netns/package.nix
+++ b/pkgs/by-name/sl/slirp4netns/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slirp4netns";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
     rev = "v${version}";
-    sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E=";
+    sha256 = "sha256-dPhUr9GdujTpUsnfvZDp8eOBQwlzqwtwziII2QWD4JA=";
   };
 
   nativeBuildInputs = [

From 6dea73ebdc42d9f87068a3944d3d5033e4313867 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 15:04:59 +0200
Subject: [PATCH 0549/1497] ike-scan: 1.9.5 -> 1.9.5-unstable-2024-09-15

---
 pkgs/by-name/ik/ike-scan/package.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ik/ike-scan/package.nix b/pkgs/by-name/ik/ike-scan/package.nix
index 754ab2afa6c5..903dcd2003e7 100644
--- a/pkgs/by-name/ik/ike-scan/package.nix
+++ b/pkgs/by-name/ik/ike-scan/package.nix
@@ -9,15 +9,24 @@
 
 stdenv.mkDerivation rec {
   pname = "ike-scan";
-  version = "1.9.5";
+  version = "1.9.5-unstable-2024-09-15";
 
   src = fetchFromGitHub {
     owner = "royhills";
     repo = "ike-scan";
-    rev = version;
-    sha256 = "sha256-mbfg8p3y4aKoXpmLuF9GXAMPEqV5CsvetwGCRDJ9UNY=";
+    rev = "c74c01fd22d9a3aae3d8ba9a0bd2eb1a2146ac6f";
+    hash = "sha256-+eicvirqzZrAJiaGaVjqZlSpU2+jTG/MRPv50P+1Tpc=";
   };
 
+  patches = [
+    # Using the same patches as for the Fedora RPM
+    (fetchpatch {
+      # Memory leaks, https://github.com/royhills/ike-scan/pull/15
+      url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
+      hash = "sha256-VVJZSTZfDV0qHuxdNoZV1NXJYCEMtB0bO1oi2hLCeXE=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     openssl
@@ -25,15 +34,6 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-openssl=${openssl.dev}" ];
 
-  patches = [
-    # Using the same patches as for the Fedora RPM
-    (fetchpatch {
-      # Memory leaks, https://github.com/royhills/ike-scan/pull/15
-      url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
-      sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm";
-    })
-  ];
-
   meta = with lib; {
     description = "Tool to discover, fingerprint and test IPsec VPN servers";
     longDescription = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       fingerprint and test IPsec VPN servers.
     '';
     homepage = "https://github.com/royhills/ike-scan";
-    license = with licenses; [ gpl3Plus ];
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fab ];
   };

From 3111745abcf9d4f8986648312030dee8432f0009 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:05:34 +0000
Subject: [PATCH 0550/1497] phrase-cli: 2.40.0 -> 2.42.0

---
 pkgs/by-name/ph/phrase-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 64a81fb07e3c..ff5cfee3099d 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.40.0";
+  version = "2.42.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-d/B5XzEAM1GlpQxshy0kEJexF01FlF99hnoctKDXhp0=";
+    sha256 = "sha256-dLdgJdR2faxpfHmYhhzn7nQxTrXDhF6XqOIKFLXDEj4=";
   };
 
-  vendorHash = "sha256-VV4ctHj9fPosAgqBOfkqOKETSeGJXFPPP+kBMgqV2nk=";
+  vendorHash = "sha256-zVIxBZ2zTXk407piA4dXxKfyD7Ke8RIq7lYogr/+rcs=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
 

From 826f4980861734ac84f89485072927e4874f3ef0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:18:22 +0800
Subject: [PATCH 0551/1497] watchexec: 2.3.1 -> 2.3.2

---
 pkgs/by-name/wa/watchexec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index 37a8fcb6c891..c8cc24bc4cde 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchexec";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "watchexec";
     repo = "watchexec";
     rev = "v${version}";
-    hash = "sha256-ldxB1/WgOe1uGfKXkMEtGHIlWiKJgnZz6j/7eCOGD8s=";
+    hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LdjJlf4HPN+kZOQKPNSdbYApGBD4Z6tKV9Y0FFKpAf0=";
+  cargoHash = "sha256-VtSRC4lyjMo2O9dNbVllcDEx08zQWJMQmQ/2bNMup6U=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5320ab9f9e6c0dcafd7eba984c1154b5bbc8b502 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:27:26 +0800
Subject: [PATCH 0552/1497] watchexec: use finalAttrs

---
 pkgs/by-name/wa/watchexec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index c8cc24bc4cde..b2785f3d8655 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -6,14 +6,14 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "watchexec";
   version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "watchexec";
     repo = "watchexec";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs=";
   };
 
@@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ maintainers.michalrus ];
     mainProgram = "watchexec";
   };
-}
+})

From 548afb3c372a67114a8b1bcd6ff18db07652b823 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:32:41 +0800
Subject: [PATCH 0553/1497] watchexec: avoid with lib;

---
 pkgs/by-name/wa/watchexec/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index b2785f3d8655..f53c82d7a630 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -38,11 +38,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion --zsh --name _watchexec completions/zsh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Executes commands in response to file modifications";
     homepage = "https://watchexec.github.io/";
-    license = with licenses; [ asl20 ];
-    maintainers = [ maintainers.michalrus ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
+      michalrus
+    ];
     mainProgram = "watchexec";
   };
 })

From 7719f944cf0b0902130003fdb3b12caeac6f9077 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:33:15 +0800
Subject: [PATCH 0554/1497] watchexec: add prince213 to maintainers

---
 pkgs/by-name/wa/watchexec/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index f53c82d7a630..14ce21826dd5 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -44,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [
       michalrus
+      prince213
     ];
     mainProgram = "watchexec";
   };

From 9a5165bf547cd6d2361f4ce106b1baabcea48a9a Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:37:14 +0800
Subject: [PATCH 0555/1497] watchexec: install bash and fish completions

---
 pkgs/by-name/wa/watchexec/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index 14ce21826dd5..c6adc8d680dc 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -35,7 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postInstall = ''
     installManPage doc/watchexec.1
-    installShellCompletion --zsh --name _watchexec completions/zsh
+    installShellCompletion --cmd watchexec \
+      --bash completions/bash \
+      --fish completions/fish \
+      --zsh completions/zsh
   '';
 
   meta = {

From cbf54c37a34b302da2b3d3caad2a983a6ffb04b0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 18 May 2025 20:39:04 +0800
Subject: [PATCH 0556/1497] watchexec: add passthru.updateScript

---
 pkgs/by-name/wa/watchexec/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix
index c6adc8d680dc..539390db5167 100644
--- a/pkgs/by-name/wa/watchexec/package.nix
+++ b/pkgs/by-name/wa/watchexec/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -41,6 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh completions/zsh
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Executes commands in response to file modifications";
     homepage = "https://watchexec.github.io/";

From 4c3d1ae0b535357a40ca1809f7ea8042ea2578a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:15:28 +0000
Subject: [PATCH 0557/1497] ogen: 1.13.0 -> 1.14.0

---
 pkgs/by-name/og/ogen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix
index b2c9e881f638..e31e52fe3db8 100644
--- a/pkgs/by-name/og/ogen/package.nix
+++ b/pkgs/by-name/og/ogen/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ogen";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "ogen-go";
     repo = "ogen";
     tag = "v${version}";
-    hash = "sha256-M2xKxaf+iWXTq+vMXsucMmVqs9BarCoyG6prmwcL8KI=";
+    hash = "sha256-w3h65MNXBgsH8PCHfoPqY+XNI6TMbLUAMI4Y3WWLEJM=";
   };
 
-  vendorHash = "sha256-TVnTg+SbTmpdfxWSr3KIPioQ/0OlUxCuCfyn5oMWPu8=";
+  vendorHash = "sha256-PQ2ZrigS9jZY1oL3Dsuc2RZwedZLzLKUqhMYfWiZ854=";
 
   patches = [ ./modify-version-handling.patch ];
 

From 4e466b224d874ae7b7c8fa006f7a11463b8f79cd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 15:23:39 +0200
Subject: [PATCH 0558/1497] evillimiter: add missing input

---
 pkgs/by-name/ev/evillimiter/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ev/evillimiter/package.nix b/pkgs/by-name/ev/evillimiter/package.nix
index b5d79f882ce7..5909e8f74468 100644
--- a/pkgs/by-name/ev/evillimiter/package.nix
+++ b/pkgs/by-name/ev/evillimiter/package.nix
@@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec {
     iptables
     netaddr
     netifaces
+    setuptools
     scapy
     terminaltables
     tqdm

From 8690847e1c0ec794b50082ca29f1d4e2074c8bc5 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 10 May 2025 18:50:52 +0200
Subject: [PATCH 0559/1497] tdlib: 1.8.47 -> 1.8.49

---
 pkgs/by-name/td/tdlib/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index ff98690c7ed9..13bbdd760d6a 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -11,6 +11,8 @@
   common-updater-scripts,
   jq,
   buildPackages,
+
+  tde2eOnly ? false,
 }:
 
 let
@@ -35,8 +37,8 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "tdlib";
-  version = "1.8.47";
+  pname = if tde2eOnly then "tde2e" else "tdlib";
+  version = "1.8.49";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -45,8 +47,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7";
-    hash = "sha256-RS7N+MMie/gNtcvPT4yjE2ymhZCsByS96O9nhiJ/bNY=";
+    rev = "51743dfd01dff6179e2d8f7095729caa4e2222e9";
+    hash = "sha256-duD8a/fppkmaKrvkHnbSxRnCLS60aNVcgaYyCoHzKgE=";
   };
 
   buildInputs = [
@@ -73,6 +75,10 @@ stdenv.mkDerivation {
     cmake --build native-build -j $NIX_BUILD_CORES
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "TD_E2E_ONLY" tde2eOnly)
+  ];
+
   # https://github.com/tdlib/td/issues/1974
   postPatch =
     ''

From 78315dfc5437381bc1d492814eee622fcd50455d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sat, 10 May 2025 18:51:53 +0200
Subject: [PATCH 0560/1497] telegram-desktop: 5.13.1 -> 5.14.3

---
 .../telegram/telegram-desktop/qt-6.9.patch    | 44 -------------------
 .../telegram/telegram-desktop/unwrapped.nix   | 14 ++----
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch
deleted file mode 100644
index c852a8ab833f..000000000000
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-index 4e1d7c136..7c8f95888 100644
---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
-+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-@@ -362,6 +362,10 @@ void PipPanel::init() {
- 	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		// Workaround Qt's forced transient parent.
- 		Ui::Platform::ClearTransientParent(widget());
-+	}, rp()->lifetime());
-+
-+	rp()->shownValue(
-+	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		Ui::Platform::SetWindowMargins(widget(), _padding);
- 	}, rp()->lifetime());
- 
-Submodule Telegram/lib_base contains modified content
-diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-index 8aca67c..6b781fb 100644
---- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-@@ -16,7 +16,11 @@
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
- #include <qpa/qplatformintegration.h>
- #include <private/qguiapplication_p.h>
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+#include <private/qdesktopunixservices_p.h>
-+#else // Qt >= 6.9.0
- #include <private/qgenericunixservices_p.h>
-+#endif // Qt < 6.9.0
- #endif // Qt >= 6.5.0
- 
- #include <sstream>
-@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) {
- 	}
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
--	if (const auto services = dynamic_cast<QGenericUnixServices*>(
-+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-+	using QDesktopUnixServices = QGenericUnixServices;
-+#endif // Qt < 6.9.0
-+	if (const auto services = dynamic_cast<QDesktopUnixServices*>(
- 			QGuiApplicationPrivate::platformIntegration()->services())) {
- 		return services->portalWindowIdentifier(window).toStdString();
- 	}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index d983f3a748c3..4af7adf07264 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -8,6 +8,7 @@
   ninja,
   clang,
   python3,
+  tdlib,
   tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
   qtbase,
   qtimageformats,
@@ -46,24 +47,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.13.1";
+  version = "5.14.3";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14=";
+    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";
   };
 
-  # Combined backport to fix Qt 6.9 issues:
-  # - https://github.com/telegramdesktop/tdesktop/commit/8b92ab25c776899c5432bf935447cac6f0b3ea2d
-  # - https://github.com/telegramdesktop/tdesktop/commit/c261c3367a11eeef69e6e346d339706dc4f00406
-  # FIXME: remove in next update
-  patches = [
-    ./qt-6.9.patch
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
       --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"'
@@ -104,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       microsoft-gsl
       boost
       ada
+      (tdlib.override { tde2eOnly = true; })
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       protobuf

From 77b11b22d1583745e01df2f8db4ac01e57a52939 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Mon, 2 Jun 2025 15:33:21 +0200
Subject: [PATCH 0561/1497] Revert "python3Packages.netbox-contract: 2.3.2 ->
 2.4.0"

---
 pkgs/development/python-modules/netbox-contract/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix
index 1ed9e45861ff..852ece1fc516 100644
--- a/pkgs/development/python-modules/netbox-contract/default.nix
+++ b/pkgs/development/python-modules/netbox-contract/default.nix
@@ -10,7 +10,7 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-contract";
-  version = "2.4.0";
+  version = "2.3.2";
   pyproject = true;
 
   disabled = pythonAtLeast "3.13";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "mlebreuil";
     repo = "netbox-contract";
     tag = "v${version}";
-    hash = "sha256-duA53cuJ3q6CRp239xNMXQhGZHGn7IBIGNLoxt7hZh8=";
+    hash = "sha256-e3N0m+oj2CMUXwI4dF/tXA+Lz+9+ZlbJAy+zHoRDNtw=";
   };
 
   build-system = [ setuptools ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = {
     description = "Contract plugin for netbox";
     homepage = "https://github.com/mlebreuil/netbox-contract";
-    changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.tag}";
+    changelog = "https://github.com/mlebreuil/netbox-contract/releases/tag/${src.rev}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ felbinger ];

From dbab73fb8f65254ef7dfd237d0cea30fff65dcb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:34:23 +0000
Subject: [PATCH 0562/1497] krapslog: 0.6.0 -> 0.6.1

---
 pkgs/by-name/kr/krapslog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix
index ceef566a4169..297c896d8f99 100644
--- a/pkgs/by-name/kr/krapslog/package.nix
+++ b/pkgs/by-name/kr/krapslog/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "krapslog";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "acj";
     repo = "krapslog-rs";
     rev = version;
-    sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc=";
+    sha256 = "sha256-c/Zh4fOsSKY0XopaklRbFEh4QM5jjUcj0zhAx5v9amI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Mv0wTuTWCsBGjlr4BhLezBOCtgQ0qq2kwLcZxU1nREM=";
+  cargoHash = "sha256-cXK7YZ9i/eKXTHPYnJcvcKyzFlZDnqmCBrEa75Mxfqc=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 

From 8a411150909570819828cff5d0501cd3c3500418 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 23:45:20 +1000
Subject: [PATCH 0563/1497] fly: 7.13.0 -> 7.13.2 (#412942)

---
 pkgs/by-name/fl/fly/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index c915657f0c08..fcafd2cc12a1 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "7.13.0";
+  version = "7.13.2";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    hash = "sha256-myvYACdTqnEb8aBpBeCA1qvcnF0lwYbSo6kMgSz7iiA=";
+    hash = "sha256-onowKvN8YLDWRRn3rGEMoMxc6XaAcBKJcFOHSVh9Yy8=";
   };
 
   vendorHash = "sha256-WC4uzTgvW15IumwmsWXXeiF5qagbeb5XWRaSjd1XLvA=";

From 1149cb0a2f379e112e206ea115eec0e717f629d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:49:55 +0000
Subject: [PATCH 0564/1497] vimPlugins.avante-nvim: 0.0.23-unstable-2025-05-30
 -> 0.0.23-unstable-2025-06-02

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index b76cf183d92e..19b4fd806bb7 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-05-30";
+  version = "0.0.23-unstable-2025-06-02";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "22418bff8bcac4377ebf975cd48f716823867979";
-    hash = "sha256-qyeiDDjeReOr+TvgCWnKhb8FBN9t1YPFGvVqPvxXr0k=";
+    rev = "647a459a2b87e5c9b2987cb44150b71beffdfb10";
+    hash = "sha256-GgLOcVp2IuMBr4aBRWJTvrAuWWiMEIHmec/S97piBaM=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 3dd14d8a5176e7a790e6eeeab7bfebd49c4b8eab Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 15:50:32 +0200
Subject: [PATCH 0565/1497] ci/nixpkgs-vet: fix random errors

Every now and then, the nixpkgs-vet CI job currently fails with one of:

  error: creating symlink
'/build/.local/share/nix/root/nix/var/nix/gcroots/profiles' ->
'/build/.local/share/nix/root/nix/var/nix/profiles': File exists

  error: SQLite database
'/build/.local/share/nix/root/nix/var/nix/db/db.sqlite' is busy

It's hard to reproduce for me, so just taking a guess with the required
changes.
---
 ci/nixpkgs-vet.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index 1ceec363c347..ccc5ba289dcf 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -25,6 +25,8 @@ runCommand "nixpkgs-vet"
     env.NIXPKGS_VET_NIX_PACKAGE = nix;
   }
   ''
+    export NIX_STATE_DIR=$(mktemp -d)
+
     nixpkgs-vet --base ${filtered base} ${filtered head}
 
     touch $out

From 59e2ae5065bf2d9046a0f4f4cd260a8a9248e6c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 13:56:41 +0000
Subject: [PATCH 0566/1497] git-cliff: 2.8.0 -> 2.9.0

---
 pkgs/by-name/gi/git-cliff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index 880c9c899594..b6bcbfacd1bc 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-cliff";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
     rev = "v${version}";
-    hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24=";
+    hash = "sha256-ZxMwQBhU+49+MaId16tH2np2slgCmq4yKi6PI9Dy+o4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GGEKQgnSB2HW3VIj4CfxzUZaWYE2/nHJPN9ZMmHY5Ns=";
+  cargoHash = "sha256-QPxrdmuQINzuZXyRRYDA+HguRdt6n++XuLj/OF0ceKU=";
 
   # attempts to run the program on .git in src which is not deterministic
   doCheck = false;

From dd7435fe61e26e4b8f64557ba5902cc9192b1bb6 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 23 May 2025 19:48:32 +0200
Subject: [PATCH 0567/1497] gimp3: 3.0.2 -> 3.0.4
 https://www.gimp.org/news/2025/05/18/gimp-3-0-4-released/

---
 pkgs/applications/graphics/gimp/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 639719d8d32d..d943e0efccab 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -77,7 +77,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gimp";
-  version = "3.0.2";
+  version = "3.0.4";
 
   outputs = [
     "out"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VG3cMMstDnkSPH/LTXghHh7npqrOkaagrYy8v26lcaI=";
+    hash = "sha256-jKouwnW/CTJldWVKwnavwIP4SR58ykXRnPKeaWrsqyU=";
   };
 
   patches = [
@@ -242,9 +242,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    patchShebangs \
-      app/tests/create_test_env.sh \
-      tools/gimp-mkenums
+    patchShebangs tools/gimp-mkenums
 
     # GIMP is executed at build time so we need to fix this.
     # TODO: Look into if we can fix the interp thing.

From ba3f75ca014ceac3183766f60fe33e431647f102 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 13:14:28 +0000
Subject: [PATCH 0568/1497] beam26Packages.rebar3: 3.24.0 -> 3.25.0

---
 pkgs/development/tools/build-managers/rebar3/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index a84a7ef6dac7..6cfedadca7d8 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -12,11 +12,12 @@
   git,
   gnused,
   nix,
+  nixfmt-rfc-style,
   rebar3-nix,
 }:
 
 let
-  version = "3.24.0";
+  version = "3.25.0";
   owner = "erlang";
   deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
   rebar3 = stdenv.mkDerivation rec {
@@ -29,7 +30,7 @@ let
       inherit owner;
       repo = pname;
       rev = version;
-      sha256 = "OhzgDipFhscHtRGlfc33ZewBgHgQLa9Zhjby/r1m49A=";
+      sha256 = "uiKgB+YuqKnfs9TZbnudp6TZd6ZGXfpF9c8jJffCs/U=";
     };
 
     buildInputs = [ erlang ];
@@ -94,6 +95,7 @@ let
           git
           gnused
           nix
+          nixfmt-rfc-style
           (rebar3WithPlugins { globalPlugins = [ rebar3-nix ]; })
         ]
       }
@@ -105,6 +107,7 @@ let
         tmpdir=$(mktemp -d)
         cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir"
         (cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")
+        nixfmt "$nix_path/rebar-deps.nix"
       else
         echo "rebar3 is already up-to-date"
       fi

From c106a5bc279406a70b74c064549e785ca51c13b1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 16:06:16 +0200
Subject: [PATCH 0569/1497] ci/codeowners-validator: fix typo in comment

split of from https://github.com/NixOS/nixpkgs/pull/413240 to avoid backporting that PR
---
 ci/codeowners-validator/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/codeowners-validator/default.nix b/ci/codeowners-validator/default.nix
index 5c2d5335c35e..76638c6ac116 100644
--- a/ci/codeowners-validator/default.nix
+++ b/ci/codeowners-validator/default.nix
@@ -20,7 +20,7 @@ buildGoModule {
     })
     # Undoes part of the above PR: We don't want to require write access
     # to the repository, that's only needed for GitHub's native CODEOWNERS.
-    # Furthermore, it removes an unneccessary check from the code
+    # Furthermore, it removes an unnecessary check from the code
     # that breaks tokens generated for GitHub Apps.
     ./permissions.patch
     # Allows setting a custom CODEOWNERS path using the OWNERS_FILE env var

From c77ac9dfc3e022dfeb2788dbf533d0d6b853f8c7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Jun 2025 15:54:57 +0200
Subject: [PATCH 0570/1497] treewide: fix typos

---
 lib/attrsets.nix                                     |  2 +-
 lib/fixed-points.nix                                 |  2 +-
 lib/options.nix                                      |  4 ++--
 lib/types.nix                                        |  2 +-
 nixos/lib/make-options-doc/default.nix               |  4 ++--
 nixos/lib/testing/network.nix                        |  2 +-
 nixos/maintainers/option-usages.nix                  |  2 +-
 nixos/modules/misc/ids.nix                           |  6 +++---
 nixos/modules/profiles/image-based-appliance.nix     |  2 +-
 nixos/modules/programs/turbovnc.nix                  |  2 +-
 nixos/modules/services/cluster/k3s/default.nix       |  2 +-
 nixos/modules/services/desktops/bonsaid.nix          |  2 +-
 nixos/modules/services/games/crossfire-server.nix    |  2 +-
 nixos/modules/services/hardware/kmonad.nix           |  2 +-
 nixos/modules/services/misc/ntfy-sh.nix              |  2 +-
 nixos/modules/services/monitoring/below.nix          |  2 +-
 nixos/modules/services/networking/cato-client.nix    |  2 +-
 nixos/modules/services/networking/fedimintd.nix      |  2 +-
 nixos/modules/services/networking/netbird.nix        |  2 +-
 .../services/networking/netbird/dashboard.nix        |  2 +-
 nixos/modules/services/networking/ssh/sshd.nix       |  2 +-
 .../modules/services/networking/yggdrasil-jumper.nix |  2 +-
 nixos/modules/services/security/tor.nix              |  2 +-
 nixos/modules/services/web-apps/davis.nix            |  2 +-
 nixos/modules/services/web-apps/plausible.nix        |  2 +-
 nixos/modules/services/web-apps/windmill.nix         |  2 +-
 nixos/modules/virtualisation/azure-common.nix        |  2 +-
 nixos/modules/virtualisation/azure-image.nix         |  2 +-
 nixos/modules/virtualisation/waagent.nix             |  2 +-
 nixos/tests/appliance-repart-image.nix               |  4 ++--
 nixos/tests/common/acme/server/default.nix           |  2 +-
 nixos/tests/ntfy-sh-migration.nix                    |  2 +-
 nixos/tests/sftpgo.nix                               |  4 ++--
 nixos/tests/systemd-sysupdate.nix                    |  2 +-
 nixos/tests/systemd-timesyncd-nscd-dnssec.nix        |  2 +-
 .../editors/emacs/elisp-packages/melpa-packages.nix  |  8 ++++----
 .../editors/vscode/extensions/default.nix            |  2 +-
 .../vscode/extensions/ms-vscode.cpptools/default.nix |  2 +-
 pkgs/applications/graphics/yacreader/default.nix     |  2 +-
 pkgs/build-support/rust/build-rust-crate/default.nix |  2 +-
 .../rust/build-rust-crate/test/rcgen-crates.nix      |  6 +++---
 pkgs/by-name/ad/adios2/package.nix                   |  2 +-
 pkgs/by-name/hy/hyperhdr/package.nix                 |  2 +-
 pkgs/by-name/il/ilmbase/package.nix                  |  2 +-
 pkgs/by-name/im/imlib2/package.nix                   |  2 +-
 pkgs/by-name/li/libcredis/package.nix                |  2 +-
 pkgs/by-name/mi/miktex/package.nix                   |  2 +-
 pkgs/by-name/mx/mxnet/package.nix                    |  2 +-
 pkgs/by-name/ty/typical/package.nix                  |  2 +-
 pkgs/by-name/us/usb-reset/package.nix                |  2 +-
 pkgs/by-name/yt/ytmdesktop/package.nix               |  2 +-
 pkgs/by-name/ze/zepp-simulator/package.nix           |  2 +-
 .../compilers/gcc/common/configure-flags.nix         |  2 +-
 .../haskell-modules/configuration-common.nix         |  8 ++++----
 pkgs/development/interpreters/ruby/default.nix       |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix        |  2 +-
 pkgs/development/libraries/openssl/default.nix       |  2 +-
 pkgs/development/libraries/vigra/default.nix         |  2 +-
 .../python-modules/brotlicffi/default.nix            |  2 +-
 pkgs/development/python-modules/datadog/default.nix  |  2 +-
 pkgs/development/python-modules/dm-haiku/default.nix |  2 +-
 .../python-modules/flashinfer/default.nix            |  2 +-
 pkgs/development/python-modules/fmpy/default.nix     |  2 +-
 pkgs/development/python-modules/itables/default.nix  |  2 +-
 .../python-modules/langchain-aws/default.nix         |  2 +-
 .../langchain-azure-dynamic-sessions/default.nix     |  2 +-
 .../python-modules/langchain-chroma/default.nix      |  2 +-
 .../python-modules/langchain-community/default.nix   |  2 +-
 .../python-modules/langchain-groq/default.nix        |  2 +-
 .../python-modules/langchain-huggingface/default.nix |  2 +-
 .../python-modules/langchain-mongodb/default.nix     |  2 +-
 .../python-modules/langchain-ollama/default.nix      |  2 +-
 .../python-modules/langchain-openai/default.nix      |  2 +-
 .../python-modules/langchain-tests/default.nix       |  2 +-
 .../langchain-text-splitters/default.nix             |  2 +-
 .../development/python-modules/langchain/default.nix |  2 +-
 .../python-modules/mpi-pytest/default.nix            |  2 +-
 .../piano-transcription-inference/default.nix        |  2 +-
 pkgs/development/python-modules/pip/default.nix      |  2 +-
 pkgs/development/python-modules/twisted/default.nix  |  2 +-
 pkgs/development/python-modules/yamllint/default.nix |  2 +-
 .../tools/build-managers/bazel/bazel_6/default.nix   |  2 +-
 .../tools/build-managers/bazel/bazel_7/default.nix   |  6 +++---
 pkgs/servers/home-assistant/default.nix              |  4 ++--
 pkgs/stdenv/generic/check-meta.nix                   |  2 +-
 pkgs/test/texlive/default.nix                        |  2 +-
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 pkgs/top-level/stage.nix                             |  2 +-
 88 files changed, 110 insertions(+), 110 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index fc6bf84415b8..84ae52454968 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1747,7 +1747,7 @@ rec {
 
   /**
     Get the first of the `outputs` provided by the package, or the default.
-    This function is alligned with `_overrideFirst()` from the `multiple-outputs.sh` setup hook.
+    This function is aligned with `_overrideFirst()` from the `multiple-outputs.sh` setup hook.
     Like `getOutput`, the function is idempotent.
 
     # Inputs
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index 1de5351d95aa..e73cc7ec3dac 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -389,7 +389,7 @@ rec {
 
       extensions = composeManyExtensions [ overlayA overlayB ];
 
-      # Caluculate the fixed point of all composed overlays.
+      # Calculate the fixed point of all composed overlays.
       fixedpoint = lib.fix (lib.extends extensions original );
 
     in fixedpoint
diff --git a/lib/options.nix b/lib/options.nix
index 007a14f15b67..198f3eef47df 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -404,7 +404,7 @@ rec {
     ```nix
     myType = mkOptionType {
       name = "myType";
-      merge = mergeDefaultOption; # <- This line is redundant. It is the default aready.
+      merge = mergeDefaultOption; # <- This line is redundant. It is the default already.
     };
     ```
 
@@ -470,7 +470,7 @@ rec {
     args@{
       message,
       # WARNING: the default merge function assumes that the definition is a valid (option) value. You MUST pass a merge function if the return value needs to be
-      #   - type checked beyond what .check does (which should be very litte; only on the value head; not attribute values, etc)
+      #   - type checked beyond what .check does (which should be very little; only on the value head; not attribute values, etc)
       #   - if you want attribute values to be checked, or list items
       #   - if you want coercedTo-like behavior to work
       merge ? loc: defs: (head defs).value,
diff --git a/lib/types.nix b/lib/types.nix
index 715da842ac01..d2f91cdf6f04 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -75,7 +75,7 @@ let
     if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}";
 
   # Internal functor to help for migrating functor.wrapped to functor.payload.elemType
-  # Note that individual attributes can be overriden if needed.
+  # Note that individual attributes can be overridden if needed.
   elemTypeFunctor =
     name:
     { elemType, ... }@payload:
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index ea24c4004e55..f49745cf59d4 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -45,7 +45,7 @@
 
   Documentation rendered as AsciiDoc. This is useful for e.g. man pages.
 
-  > Note: NixOS itself uses this ouput to to build the configuration.nix man page"
+  > Note: NixOS itself uses this output to to build the configuration.nix man page"
 
   ## optionsNix
 
@@ -59,7 +59,7 @@
   let
     # Evaluate a NixOS configuration
     eval = import (pkgs.path + "/nixos/lib/eval-config.nix") {
-      # Overriden explicitly here, this would include all modules from NixOS otherwise.
+      # Overridden explicitly here, this would include all modules from NixOS otherwise.
       # See: docs of eval-config.nix for more details
       baseModules = [];
       modules = [
diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix
index c393056009d8..5caea2710754 100644
--- a/nixos/lib/testing/network.nix
+++ b/nixos/lib/testing/network.nix
@@ -130,7 +130,7 @@ let
         virtualisation.test.nodeName = mkOption {
           internal = true;
           default = name;
-          # We need to force this in specilisations, otherwise it'd be
+          # We need to force this in specialisations, otherwise it'd be
           # readOnly = true;
           description = ''
             The `name` in `nodes.<name>`; stable across `specialisations`.
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index f53e5272e423..f876fd3523e7 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -60,7 +60,7 @@ let
   inherit (eval) pkgs;
 
   excludedTestOptions = [
-    # We cannot evluate _module.args, as it is used during the computation
+    # We cannot evaluate _module.args, as it is used during the computation
     # of the modules list.
     "_module.args"
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ebd53cb17ea5..64f0d4247ddc 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -273,7 +273,7 @@ in
       caddy = 239;
       taskd = 240;
       # factorio = 241; # DynamicUser = true
-      # emby = 242; # unusued, removed 2019-05-01
+      # emby = 242; # unused, removed 2019-05-01
       #graylog = 243;# dynamically allocated as of 2021-09-03
       sniproxy = 244;
       nzbget = 245;
@@ -371,7 +371,7 @@ in
       # system user or group of the same id in someone else's NixOS.
       # This could break their system and make that person upset for a whole day.
       #
-      # Sidenote: the default is defined in `shadow` module[2], and the relavent change
+      # Sidenote: the default is defined in `shadow` module[2], and the relevant change
       # was made way back in 2014[3].
       #
       # [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number)
@@ -700,7 +700,7 @@ in
       # system user or group of the same id in someone else's NixOS.
       # This could break their system and make that person upset for a whole day.
       #
-      # Sidenote: the default is defined in `shadow` module[2], and the relavent change
+      # Sidenote: the default is defined in `shadow` module[2], and the relevant change
       # was made way back in 2014[3].
       #
       # [1]: https://man7.org/linux/man-pages/man5/login.defs.5.html#:~:text=SYS_UID_MAX%20(number)%2C%20SYS_UID_MIN%20(number)
diff --git a/nixos/modules/profiles/image-based-appliance.nix b/nixos/modules/profiles/image-based-appliance.nix
index 7e8b6f696d54..67e173dd9366 100644
--- a/nixos/modules/profiles/image-based-appliance.nix
+++ b/nixos/modules/profiles/image-based-appliance.nix
@@ -1,4 +1,4 @@
-# This profile sets up a sytem for image based appliance usage. An appliance is
+# This profile sets up a system for image based appliance usage. An appliance is
 # installed as an image, cannot be re-built, has no Nix available, and is
 # generally not meant for interactive use. Updates to such an appliance are
 # handled by updating whole partition images via a tool like systemd-sysupdate.
diff --git a/nixos/modules/programs/turbovnc.nix b/nixos/modules/programs/turbovnc.nix
index 51550476cc35..395b068524cc 100644
--- a/nixos/modules/programs/turbovnc.nix
+++ b/nixos/modules/programs/turbovnc.nix
@@ -45,7 +45,7 @@ in
     # software rendering to implement GLX (OpenGL on Xorg).
     # However, just building TurboVNC with support for that is not enough
     # (it only takes care of the X server side part of OpenGL);
-    # the indiviudual applications (e.g. `glxgears`) also need to directly load
+    # the individual applications (e.g. `glxgears`) also need to directly load
     # the OpenGL libs.
     # Thus, this creates `/run/opengl-driver` populated by Mesa so that the applications
     # can find the llvmpipe `swrast.so` software rendering DRI lib via `libglvnd`.
diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index 22e3534ea591..6f0aba9c12f6 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -139,7 +139,7 @@ let
       [
         (yamlFormat.generate "helm-chart-manifest-${name}.yaml" (mkHelmChartCR name value))
       ]
-      # alternate the YAML doc seperator (---) and extraDeploy manifests to create
+      # alternate the YAML doc separator (---) and extraDeploy manifests to create
       # multi document YAMLs
       ++ (lib.concatMap (x: [
         yamlDocSeparator
diff --git a/nixos/modules/services/desktops/bonsaid.nix b/nixos/modules/services/desktops/bonsaid.nix
index c73c5870075d..2d99853ddb3e 100644
--- a/nixos/modules/services/desktops/bonsaid.nix
+++ b/nixos/modules/services/desktops/bonsaid.nix
@@ -143,7 +143,7 @@ in
       lib.mkDefault (json.generate "bonsai_tree.json" (filterNulls cfg.settings));
 
     # bonsaid is controlled by bonsaictl, so place the latter in the environment by default.
-    # bonsaictl is typically invoked by scripts or a DE so this isn't strictly necesssary,
+    # bonsaictl is typically invoked by scripts or a DE so this isn't strictly necessary,
     # but it's helpful while administering the service generally.
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/modules/services/games/crossfire-server.nix b/nixos/modules/services/games/crossfire-server.nix
index 11d572ea3db1..a858c1ee5c7d 100644
--- a/nixos/modules/services/games/crossfire-server.nix
+++ b/nixos/modules/services/games/crossfire-server.nix
@@ -176,7 +176,7 @@ in
       # need to be writeable, so we can't just point at the ones in the nix
       # store. Instead we take the approach of copying them out of the store
       # on first run. If `bookarch` already exists, we assume the rest of the
-      # files do as well, and copy nothing -- otherwise we risk ovewriting
+      # files do as well, and copy nothing -- otherwise we risk overwriting
       # server state information every time the server is upgraded.
       preStart = ''
         if [ ! -e "${cfg.stateDir}"/bookarch ]; then
diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix
index 72d5d7d71503..56a6472b4411 100644
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -201,7 +201,7 @@ let
       # the old service and then starts the new service after config updates.
       # Since we use path-based activation[1] here, the service unit will
       # immediately[2] be started by the path unit.  Probably that start is
-      # before config updates, whcih causes the service unit to use the old
+      # before config updates, which causes the service unit to use the old
       # config after nixos-rebuild switch.  Setting stopIfChanged to false works
       # around this issue by restarting the service after config updates.
       # [0]: https://nixos.org/manual/nixos/unstable/#sec-switching-systems
diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix
index 0e846b28d3b9..b69c03a6679d 100644
--- a/nixos/modules/services/misc/ntfy-sh.nix
+++ b/nixos/modules/services/misc/ntfy-sh.nix
@@ -107,7 +107,7 @@ in
           RestrictNamespaces = true;
           RestrictRealtime = true;
           MemoryDenyWriteExecute = true;
-          # Upstream Recommandation
+          # Upstream Recommendation
           LimitNOFILE = 20500;
         };
       };
diff --git a/nixos/modules/services/monitoring/below.nix b/nixos/modules/services/monitoring/below.nix
index 79f9badf65fe..74497cd0b608 100644
--- a/nixos/modules/services/monitoring/below.nix
+++ b/nixos/modules/services/monitoring/below.nix
@@ -91,7 +91,7 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.below ];
-    # /etc/below.conf is also refered to by the `below` CLI tool,
+    # /etc/below.conf is also referred to by the `below` CLI tool,
     #  so this can't be a store-only file whose path is passed to the service
     environment.etc."below/below.conf".text = cfgContents;
 
diff --git a/nixos/modules/services/networking/cato-client.nix b/nixos/modules/services/networking/cato-client.nix
index b9b31e0c5794..e4fa2259bf32 100644
--- a/nixos/modules/services/networking/cato-client.nix
+++ b/nixos/modules/services/networking/cato-client.nix
@@ -55,7 +55,7 @@ in
       wantedBy = [ "multi-user.target" ];
     };
 
-    # set up Security wrapper Same as inteded in deb post install
+    # set up Security wrapper Same as intended in deb post install
     security.wrappers.cato-clientd = {
       source = "${cfg.package}/bin/cato-clientd";
       owner = "root";
diff --git a/nixos/modules/services/networking/fedimintd.nix b/nixos/modules/services/networking/fedimintd.nix
index c7d93854e21a..c68512d8ec81 100644
--- a/nixos/modules/services/networking/fedimintd.nix
+++ b/nixos/modules/services/networking/fedimintd.nix
@@ -289,7 +289,7 @@ in
 
             {
               # Note: we want by default to enable OpenSSL, but it seems anything 100 and above is
-              # overriden by default value from vhost-options.nix
+              # overridden by default value from vhost-options.nix
               enableACME = mkOverride 99 true;
               forceSSL = mkOverride 99 true;
               locations.${cfg.nginx.path} = {
diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 1dc5267563dd..84383f7e28ca 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -550,7 +550,7 @@ in
               User = client.user.name;
               Group = client.user.group;
 
-              # settings implied by DynamicUser=true, without actully using it,
+              # settings implied by DynamicUser=true, without actually using it,
               # see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#DynamicUser=
               RemoveIPC = true;
               PrivateTmp = true;
diff --git a/nixos/modules/services/networking/netbird/dashboard.nix b/nixos/modules/services/networking/netbird/dashboard.nix
index 8d1cbe7f6de1..cc1ab9f46ff1 100644
--- a/nixos/modules/services/networking/netbird/dashboard.nix
+++ b/nixos/modules/services/networking/netbird/dashboard.nix
@@ -102,7 +102,7 @@ in
           # special options as its public anyway
           # As far as I know leaking this secret is just
           # an information leak as one can fetch some basic app
-          # informations from the IDP
+          # information from the IDP
           # To actually do something one still needs to have login
           # data and this secret so this being public will not
           # suffice for anything just decreasing security
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b53af1dbdf71..88ecfe22d70a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -42,7 +42,7 @@ let
       # values must be separated by whitespace or even commas.
       # Consult either sshd_config(5) or, as last resort, the OpehSSH source for parsing
       # the options at servconf.c:process_server_config_line_depth() to determine the right "mode"
-      # for each. But fortunaly this fact is documented for most of them in the manpage.
+      # for each. But fortunately this fact is documented for most of them in the manpage.
       commaSeparated = [
         "Ciphers"
         "KexAlgorithms"
diff --git a/nixos/modules/services/networking/yggdrasil-jumper.nix b/nixos/modules/services/networking/yggdrasil-jumper.nix
index 8a73b26a812c..195d1329ae4b 100644
--- a/nixos/modules/services/networking/yggdrasil-jumper.nix
+++ b/nixos/modules/services/networking/yggdrasil-jumper.nix
@@ -133,7 +133,7 @@ in
 
       services.yggdrasil.settings.Listen =
         let
-          # By default linux dynamically alocates ports in range 32768..60999
+          # By default linux dynamically allocates ports in range 32768..60999
           # `sysctl net.ipv4.ip_local_port_range`
           # See: https://xkcd.com/221/
           prot_port = {
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 960d4b647b8b..cc3f0f36e1b8 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -295,7 +295,7 @@ let
       (
         lib.mapAttrs (
           k: v:
-          # Not necesssary, but prettier rendering
+          # Not necessary, but prettier rendering
           if
             lib.elem k [
               "AutomapHostsSuffixes"
diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix
index 23a28ed84fd3..ad724dc1d1a2 100644
--- a/nixos/modules/services/web-apps/davis.nix
+++ b/nixos/modules/services/web-apps/davis.nix
@@ -348,7 +348,7 @@ in
                 else if
                   pgsqlLocal
                 # note: davis expects a non-standard postgres uri (due to the underlying doctrine library)
-                # specifically the dummy hostname which is overriden by the host query parameter
+                # specifically the dummy hostname which is overridden by the host query parameter
                 then
                   "postgres://${user}@localhost/${db.name}?host=/run/postgresql"
                 else if mysqlLocal then
diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index a4b84c56d2e4..36482f0e4306 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -224,7 +224,7 @@ in
               # Thus, disable distribution for improved simplicity and security:
               #
               # When distribution is enabled,
-              # Elixir spwans the Erlang VM, which will listen by default on all
+              # Elixir spawns the Erlang VM, which will listen by default on all
               # interfaces for messages between Erlang nodes (capable of
               # remote code execution); it can be protected by a cookie; see
               # https://erlang.org/doc/reference_manual/distributed.html#security).
diff --git a/nixos/modules/services/web-apps/windmill.nix b/nixos/modules/services/web-apps/windmill.nix
index b7b3ba3ca976..bc600b730a8c 100644
--- a/nixos/modules/services/web-apps/windmill.nix
+++ b/nixos/modules/services/web-apps/windmill.nix
@@ -132,7 +132,7 @@ in
       {
 
         # coming from https://github.com/windmill-labs/windmill/blob/main/init-db-as-superuser.sql
-        # modified to not grant priviledges on all tables
+        # modified to not grant privileges on all tables
         # create role windmill_user and windmill_admin only if they don't exist
         postgresql.postStart = lib.mkIf cfg.database.createLocally (
           lib.mkAfter ''
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 80196d74a139..55c6c706b017 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -26,7 +26,7 @@ in
 
     # Enable cloud-init by default for waagent.
     # Otherwise waagent would try manage networking using ifupdown,
-    # which is currently not availeble in nixpkgs.
+    # which is currently not available in nixpkgs.
     services.cloud-init.enable = true;
     services.cloud-init.network.enable = true;
     systemd.services.cloud-config.serviceConfig.Restart = "on-failure";
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 252381d0f198..fa09398e12f8 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -105,7 +105,7 @@ in
       splashImage = null;
       # For Gen 1 VM, configurate grub output to serial_com0.
       # Not needed for Gen 2 VM wbere serial_com0 does not exist,
-      # and outputing to console is enough to make Azure Serial Console working
+      # and outputting to console is enough to make Azure Serial Console working
       extraConfig = lib.mkIf (!efiSupport) ''
         serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
         terminal_input --append serial
diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix
index 4929b8435170..dc80456ebb91 100644
--- a/nixos/modules/virtualisation/waagent.nix
+++ b/nixos/modules/virtualisation/waagent.nix
@@ -67,7 +67,7 @@ let
         convert =
           attrs:
           pipe (recurse [ ] attrs) [
-            # Filter out null values and emoty lists
+            # Filter out null values and empty lists
             (filter (kv: kv.value != null && kv.value != [ ]))
             # Transform to Key=Value form, then concatenate
             (map (kv: "${kv.name}=${transform kv.value}"))
diff --git a/nixos/tests/appliance-repart-image.nix b/nixos/tests/appliance-repart-image.nix
index 11447cf8fa03..d35654c56a64 100644
--- a/nixos/tests/appliance-repart-image.nix
+++ b/nixos/tests/appliance-repart-image.nix
@@ -65,8 +65,8 @@ in
             repartConfig = {
               Type = "esp";
               Format = "vfat";
-              # Minimize = "guess" seems to not work very vell for vfat
-              # partitons. It's better to set a sensible default instead. The
+              # Minimize = "guess" seems to not work very well for vfat
+              # partitions. It's better to set a sensible default instead. The
               # aarch64 kernel seems to generally be a little bigger than the
               # x86_64 kernel. To stay on the safe side, leave some more slack
               # for every platform other than x86_64.
diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix
index 1f4b57dc5851..0786af59e60b 100644
--- a/nixos/tests/common/acme/server/default.nix
+++ b/nixos/tests/common/acme/server/default.nix
@@ -94,7 +94,7 @@ in
                   ) cfg.configuration.security.acme.certs
                 )
                 # A specialisation's config is nested under its configuration attribute.
-                # For ease of use, nest the root node's configuration simiarly.
+                # For ease of use, nest the root node's configuration similarly.
                 ([ { configuration = node; } ] ++ (builtins.attrValues node.specialisation))
             )
           );
diff --git a/nixos/tests/ntfy-sh-migration.nix b/nixos/tests/ntfy-sh-migration.nix
index 74ba58d98ebb..da2262e5f6b2 100644
--- a/nixos/tests/ntfy-sh-migration.nix
+++ b/nixos/tests/ntfy-sh-migration.nix
@@ -4,7 +4,7 @@
 # this test works doing a migration and asserting ntfy-sh runs properly. first,
 # ntfy-sh is configured to use a static user and group. then ntfy-sh is
 # started and tested. after that, ntfy-sh is shut down and a systemd drop
-# in configuration file is used to upate the service configuration to use
+# in configuration file is used to update the service configuration to use
 # DynamicUser=true. then the ntfy-sh is started again and tested.
 
 import ./make-test-python.nix {
diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix
index e3f7491a90d8..883f39966246 100644
--- a/nixos/tests/sftpgo.nix
+++ b/nixos/tests/sftpgo.nix
@@ -6,7 +6,7 @@
 # - downloading the file over sftp
 # - assert that the ACLs are respected
 # - share a file between alice and bob (using sftp)
-# - assert that eve cannot acceess the shared folder between alice and bob.
+# - assert that eve cannot access the shared folder between alice and bob.
 #
 # Additional test coverage for the remaining protocols (i.e. ftp, http and webdav)
 # would be a nice to have for the future.
@@ -333,7 +333,7 @@ in
   testScript =
     { nodes, ... }:
     let
-      # A function to generate test cases for wheter
+      # A function to generate test cases for whether
       # a specified username is expected to access the shared folder.
       accessSharedFoldersSubtest =
         {
diff --git a/nixos/tests/systemd-sysupdate.nix b/nixos/tests/systemd-sysupdate.nix
index 4cfd6c24438d..059f2db5df41 100644
--- a/nixos/tests/systemd-sysupdate.nix
+++ b/nixos/tests/systemd-sysupdate.nix
@@ -1,4 +1,4 @@
-# Tests downloading a signed update aritfact from a server to a target machine.
+# Tests downloading a signed update artifact from a server to a target machine.
 # This test does not rely on the `systemd.timer` units provided by the
 # `systemd-sysupdate` module but triggers the `systemd-sysupdate` service
 # manually to make the test more robust.
diff --git a/nixos/tests/systemd-timesyncd-nscd-dnssec.nix b/nixos/tests/systemd-timesyncd-nscd-dnssec.nix
index df30751b507e..d68b324858c0 100644
--- a/nixos/tests/systemd-timesyncd-nscd-dnssec.nix
+++ b/nixos/tests/systemd-timesyncd-nscd-dnssec.nix
@@ -4,7 +4,7 @@
 # correct time, we need to connect to an NTP server, which usually requires resolving its hostname.
 #
 # This test does the following:
-# - Sets up a DNS server (tinydns) listening on the eth1 ip addess, serving .ntp and fake.ntp records.
+# - Sets up a DNS server (tinydns) listening on the eth1 ip address, serving .ntp and fake.ntp records.
 # - Configures that DNS server as a resolver and enables DNSSEC in systemd-resolved settings.
 # - Configures systemd-timesyncd to use fake.ntp hostname as an NTP server.
 # - Performs a regular DNS lookup, to ensure it fails due to broken DNSSEC.
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index e3ef4bd8e9c1..7f21dac10a18 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -17,7 +17,7 @@
   ./update-from-overlay
 
   It will update both melpa and elpa packages using
-  https://github.com/nix-community/emacs-overlay. It's almost instantenous and
+  https://github.com/nix-community/emacs-overlay. It's almost instantaneous and
   formats commits for you.
 */
 
@@ -1355,7 +1355,7 @@ let
           hyperbole = ignoreCompilationError (addPackageRequires (mkHome super.hyperbole) [ self.el-mock ]); # elisp error
 
           # needs non-existent "browser database directory" during compilation
-          # TODO report to upsteam about missing dependency websocket
+          # TODO report to upstream about missing dependency websocket
           ibrowse = ignoreCompilationError (addPackageRequires super.ibrowse [ self.websocket ]);
 
           # elisp error and missing optional dependencies
@@ -1368,7 +1368,7 @@ let
 
           indium = mkHome super.indium;
 
-          # TODO report to upsteam
+          # TODO report to upstream
           inlineR = addPackageRequires super.inlineR [ self.ess ];
 
           # https://github.com/duelinmarkers/insfactor.el/issues/7
@@ -1547,7 +1547,7 @@ let
 
           org-gtd = ignoreCompilationError super.org-gtd; # elisp error
 
-          # needs newer org than the Eamcs 29.4 builtin one
+          # needs newer org than the Emacs 29.4 builtin one
           org-link-beautify = addPackageRequires super.org-link-beautify [
             self.org
             self.qrencode
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b7fb23904f74..b95bfa581946 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5709,7 +5709,7 @@ let
   };
 
   # TODO: add overrides overlay, so that we can have a generated.nix
-  # then apply extension specific modifcations to packages.
+  # then apply extension specific modifications to packages.
 
   # overlays will be applied left to right, overrides should come after aliases.
   overlays = lib.optionals config.allowAliases [
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index 9c29ea704f01..2b64214db1aa 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -33,7 +33,7 @@
 
   <https://github.com/Microsoft/vscode-cpptools/issues/35>
 
-  Once the symbolic link temporary solution taken, everything shoud run smootly.
+  Once the symbolic link temporary solution taken, everything should run smootly.
 */
 
 let
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index f47f5a0a022f..dcde6f9ae3ee 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       libsForQt5.qtmacextras # can be removed when using qt6
     ];
 
-  # custom Darwin install instructions taken from the upsteam compileOSX.sh script
+  # custom Darwin install instructions taken from the upstream compileOSX.sh script
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
 
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index f7cd3a421eb9..323b39c2e1f0 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -15,7 +15,7 @@
   jq,
   libiconv,
   # Controls codegen parallelization for all crates.
-  # May be overriden on a per-crate level.
+  # May be overridden on a per-crate level.
   # See <https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units>
   defaultCodegenUnits ? 1,
 }:
diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
index 4400df270666..08219db54930 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@@ -20,7 +20,7 @@
   defaultCrateOverrides ? pkgs.defaultCrateOverrides,
   # The features to enable for the root_crate or the workspace_members.
   rootFeatures ? [ "default" ],
-  # If true, throw errors instead of issueing deprecation warnings.
+  # If true, throw errors instead of issuing deprecation warnings.
   strictDeprecation ? false,
   # Used for conditional compilation based on CPU feature detection.
   targetFeatures ? [ ],
@@ -4485,9 +4485,9 @@ rec {
         runTests ? false,
         testCrateFlags ? [ ],
         testInputs ? [ ],
-        # Any command to run immediatelly before a test is executed.
+        # Any command to run immediately before a test is executed.
         testPreRun ? "",
-        # Any command run immediatelly after a test is executed.
+        # Any command run immediately after a test is executed.
         testPostRun ? "",
       }:
       lib.makeOverridable
diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index 6dc9083f41dd..ae66c6eae943 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
       yaml-cpp
       nlohmann_json
 
-      # Todo: add these optional dependcies in nixpkgs.
+      # Todo: add these optional dependencies in nixpkgs.
       # sz
       # mgard
       # catalyst
diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index f1d593c06ffd..43a979167901 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # Allow completly unvendoring hyperhdr
+    # Allow completely unvendoring hyperhdr
     # This can be removed on the next hyperhdr release
     ./unvendor.patch
   ];
diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix
index 74fcb9fe9a57..5c3c76833967 100644
--- a/pkgs/by-name/il/ilmbase/package.nix
+++ b/pkgs/by-name/il/ilmbase/package.nix
@@ -3,7 +3,7 @@
   lib,
   buildPackages,
   cmake,
-  # explicitely depending on openexr_2 because ilmbase doesn't exist for v3
+  # explicitly depending on openexr_2 because ilmbase doesn't exist for v3
   openexr_2,
 }:
 
diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix
index 752b3dfb8882..3183dc6306ef 100644
--- a/pkgs/by-name/im/imlib2/package.nix
+++ b/pkgs/by-name/im/imlib2/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   # Do not build amd64 assembly code on Darwin, because it fails to compile
-  # with unknow directive errors
+  # with unknown directive errors
   configureFlags =
     optional stdenv.hostPlatform.isDarwin "--enable-amd64=no"
     ++ optional (!svgSupport) "--without-svg"
diff --git a/pkgs/by-name/li/libcredis/package.nix b/pkgs/by-name/li/libcredis/package.nix
index 28103abe29e6..46644331bf0b 100644
--- a/pkgs/by-name/li/libcredis/package.nix
+++ b/pkgs/by-name/li/libcredis/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr";
   };
 
-  # credis build system has no install actions, provide our own.
+  # credits build system has no install actions, provide our own.
   installPhase = ''
     mkdir -p "$out/bin"
     mkdir -p "$out/lib"
diff --git a/pkgs/by-name/mi/miktex/package.nix b/pkgs/by-name/mi/miktex/package.nix
index 3abba4f2e345..05ebf8c1c2cc 100644
--- a/pkgs/by-name/mi/miktex/package.nix
+++ b/pkgs/by-name/mi/miktex/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./startup-config-support-nix-store.patch
     # Miktex will search exectables in "GetMyPrefix(true)/bin".
-    # The path evalutate to "/usr/bin" in FHS style linux distrubution,
+    # The path evaluate to "/usr/bin" in FHS style linux distribution,
     # compared to "/nix/store/.../bin" in NixOS.
     # As a result, miktex will fail to find e.g. 'pkexec','ksudo','gksu'
     # under /run/wrappers/bin in NixOS.
diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix
index 83e20d2c129f..74abf56e03ce 100644
--- a/pkgs/by-name/mx/mxnet/package.nix
+++ b/pkgs/by-name/mx/mxnet/package.nix
@@ -14,7 +14,7 @@
   perl,
   # mxnet cuda support is turned off, but dependencies like opencv can still be built with cudaSupport
   # and fail to compile without the cudatoolkit
-  # mxnet cuda support will not be availaible, as mxnet requires version <=11
+  # mxnet cuda support will not be available, as mxnet requires version <=11
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
 }:
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 91c9d00d4db6..b1fed0501db5 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
 
   patches = [
     # Related to https://github.com/stepchowfun/typical/pull/501
-    # Commiting a slightly different patch because the upstream one doesn't apply cleanly
+    # Committing a slightly different patch because the upstream one doesn't apply cleanly
     ./lifetime.patch
   ];
 
diff --git a/pkgs/by-name/us/usb-reset/package.nix b/pkgs/by-name/us/usb-reset/package.nix
index 8f722dd3c652..c573472304af 100644
--- a/pkgs/by-name/us/usb-reset/package.nix
+++ b/pkgs/by-name/us/usb-reset/package.nix
@@ -8,7 +8,7 @@
 stdenv.mkDerivation {
   pname = "usb-reset";
   # not tagged, but changelog has this with the date of the e9a9d6c commit
-  # and no significant change occured between bumping the version in the Makefile and that
+  # and no significant change occurred between bumping the version in the Makefile and that
   # and the changes since then (up to ff822d8) seem snap related
   version = "0.3";
 
diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix
index 3540e1e631cc..89afe420b2c1 100644
--- a/pkgs/by-name/yt/ytmdesktop/package.nix
+++ b/pkgs/by-name/yt/ytmdesktop/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # instead of runnning git during the build process
+    # instead of running git during the build process
     # use the .COMMIT file generated in the fetcher FOD
     ./git-rev-parse.patch
   ];
diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix
index f8d4503660f9..ff256529e23b 100644
--- a/pkgs/by-name/ze/zepp-simulator/package.nix
+++ b/pkgs/by-name/ze/zepp-simulator/package.nix
@@ -6,7 +6,7 @@
   copyDesktopItems,
   autoPatchelfHook,
 
-  # Upstream is officialy built with Electron 18
+  # Upstream is officially built with Electron 18
   # (but it works with latest Electron with minor changes, see HACK below)
   electron,
   asar,
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 3b09398dc678..20a3b230b9fd 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -38,7 +38,7 @@ assert !enablePlugin -> disableGdbPlugin;
 
 # Note [Windows Exception Handling]
 # sjlj (short jump long jump) exception handling makes no sense on x86_64,
-# it's forcably slowing programs down as it produces a constant overhead.
+# it's forcibly slowing programs down as it produces a constant overhead.
 # On x86_64 we have SEH (Structured Exception Handling) and we should use
 # that. On i686, we do not have SEH, and have to use sjlj with dwarf2.
 # Hence it's now conditional on x86_32 (i686 is 32bit).
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e45550d6d41f..2b8511e1063c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -20,7 +20,7 @@ with haskellLib;
 
 self: super:
 {
-  # Hackage's accelerate is from 2020 and incomptible with our GHC.
+  # Hackage's accelerate is from 2020 and incompatible with our GHC.
   # The existing derivation also has missing dependencies
   # compared to the source from github.
   # https://github.com/AccelerateHS/accelerate/issues/553
@@ -791,7 +791,7 @@ self: super:
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
 
-  # Bogus lower bound on data-default-class added via Hackage revison
+  # Bogus lower bound on data-default-class added via Hackage revision
   # https://github.com/mrkkrp/req/pull/180#issuecomment-2628201485
   req = overrideCabal {
     revision = null;
@@ -1963,7 +1963,7 @@ self: super:
     license = lib.licenses.bsd3;
     # ghc-bignum is not buildable if none of the three backends
     # is explicitly enabled. We enable Native for now as it doesn't
-    # depend on anything else as oppossed to GMP and FFI.
+    # depend on anything else as opposed to GMP and FFI.
     # Apply patch which fixes a compilation failure we encountered.
     # Will need to be kept until we can drop ghc-bignum entirely,
     # i. e. if GHC 8.10.* and 8.8.* have been removed.
@@ -2529,7 +2529,7 @@ self: super:
   # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1
   xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant;
 
-  # Test failure after libxcrypt migration, reported upstrem at
+  # Test failure after libxcrypt migration, reported upstream at
   # https://github.com/phadej/crypt-sha512/issues/13
   crypt-sha512 = dontCheck super.crypt-sha512;
 
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9461b0335ee5..48a5724b150b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -207,7 +207,7 @@ let
               # When using a baseruby, ruby always sets "libdir" to the build
               # directory, which nix rejects due to a reference in to /build/ in
               # the final product. Removing this reference doesn't seem to break
-              # anything and fixes cross compliation.
+              # anything and fixes cross compilation.
               ./dont-refer-to-build-dir.patch
             ];
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index fd5b46846952..bb47eb7faace 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -34,7 +34,7 @@
   # all dependants in Nixpkgs
   withSmallDeps ? ffmpegVariant == "small" || withFullDeps,
 
-  # Everything enabled; only guarded behind platform exclusivity or brokeness.
+  # Everything enabled; only guarded behind platform exclusivity or brokenness.
   # If you need to depend on ffmpeg-full because ffmpeg is missing some feature
   # your package needs, you should enable that feature in regular ffmpeg
   # instead.
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 50d2c25e56f2..0cd7d15a92d9 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -225,7 +225,7 @@ let
         # This avoids conflicts between man pages of openssl subcommands (for
         # example 'ts' and 'err') man pages and their equivalent top-level
         # command in other packages (respectively man-pages and moreutils).
-        # This is done in ubuntu and archlinux, and possiibly many other distros.
+        # This is done in ubuntu and archlinux, and possibly many other distros.
         "MANSUFFIX=ssl"
       ];
 
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 822865f8866e..91f39eb62472 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # Pathes to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592
+    # Patches to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592
     ./fix-llvm-19-1.patch
     ./fix-llvm-19-2.patch
   ];
diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix
index c909672dabea..7b010502d39b 100644
--- a/pkgs/development/python-modules/brotlicffi/default.nix
+++ b/pkgs/development/python-modules/brotlicffi/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   pythonOlder,
   cffi,
-  # overriden as pkgs.brotli
+  # overridden as pkgs.brotli
   brotli,
   setuptools,
   pytestCheckHook,
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 9b0576b5e41c..b00cb9405d3a 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
       # https://github.com/DataDog/datadogpy/issues/746
       "TestDogshell"
 
-      # Flaky: test execution time aganst magic values
+      # Flaky: test execution time against magic values
       "test_distributed"
       "test_timed"
       "test_timed_in_ms"
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 0a818b0b8f36..6e39b1e872ff 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -60,7 +60,7 @@ let
 
     # AttributeError: jax.core.Var was removed in JAX v0.6.0. Use jax.extend.core.Var instead, and
     # see https://docs.jax.dev/en/latest/jax.extend.html for details.
-    # Alrady on master: https://github.com/google-deepmind/dm-haiku/commit/cfe8480d253a93100bf5e2d24c40435a95399c96
+    # Already on master: https://github.com/google-deepmind/dm-haiku/commit/cfe8480d253a93100bf5e2d24c40435a95399c96
     # TODO: remove at the next release
     postPatch = ''
       substituteInPlace haiku/_src/jaxpr_info.py \
diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix
index 1600ab2c38a4..83b91b746e7c 100644
--- a/pkgs/development/python-modules/flashinfer/default.nix
+++ b/pkgs/development/python-modules/flashinfer/default.nix
@@ -3,7 +3,7 @@
 # requires the CUDA toolkit (via nvcc) to be available.
 #
 # This means that if you plan to use flashinfer, you will need to set the
-# environment varaible `CUDA_HOME` to `cudatoolkit`.
+# environment variable `CUDA_HOME` to `cudatoolkit`.
 {
   lib,
   config,
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index fd66b5f34bd2..0ea342c526cb 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -178,7 +178,7 @@ buildPythonPackage rec {
           };
 
         # FMPy searches for sundials without the "lib"-prefix; strip it
-        # and symlink the so-files into existance.
+        # and symlink the so-files into existence.
         postFixup = ''
           pushd $out/lib
           for so in *.so; do
diff --git a/pkgs/development/python-modules/itables/default.nix b/pkgs/development/python-modules/itables/default.nix
index 39e6c1292f15..712ee86840e0 100644
--- a/pkgs/development/python-modules/itables/default.nix
+++ b/pkgs/development/python-modules/itables/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   # itables has 4 different node packages, each with their own
   # package-lock.json, and partially depending on each other.
   # Our fetchNpmDeps tooling in nixpkgs doesn't support this yet, so we fetch
-  # the source tarball from pypi, wich includes the javascript bundle already.
+  # the source tarball from pypi, which includes the javascript bundle already.
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-S5HASUVfqTny+Vu15MYSSrEffCaJuL7UhDOc3eudVWI=";
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index eb2f53bcb3f3..7101aa562733 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     # Boto @ 1.35 has outstripped the version requirement
     "boto3"
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
index 507a1077a492..48b370202563 100644
--- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
+++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index b6fc144cc255..3566f1acb4f1 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
   ];
diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index 80c5f0e8139e..b9fcdd4bfc59 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest langchain and -core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain"
     "langchain-core"
     "numpy"
diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index a54f98e1e28b..08b65b629a1d 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index d9ef22aee8fb..1a27dd280ba0 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 5203d812d336..af4d6d4032c4 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
   ];
diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index f9cda1e40f5d..c17593224580 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 537520d435ee..6710daa6e852 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 51b591b4e83b..7c6bb1762386 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
   ];
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index 78936ef99755..d9d999de58aa 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
   ];
 
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 29138323fb55..c1c2cdd6440c 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
-    # That prevents us from updating individul components.
+    # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
     "tenacity"
diff --git a/pkgs/development/python-modules/mpi-pytest/default.nix b/pkgs/development/python-modules/mpi-pytest/default.nix
index 0d7933098a1f..585307c94b83 100644
--- a/pkgs/development/python-modules/mpi-pytest/default.nix
+++ b/pkgs/development/python-modules/mpi-pytest/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-r9UB5H+qAJc6k2SVAiOCI2yRDLNv2zKRmfrAan+cX9I=";
   };
 
-  # A temporary fixup to support fork mode with openmpi implemention
+  # A temporary fixup to support fork mode with openmpi implementation
   # See https://github.com/firedrakeproject/mpi-pytest/pull/17
   postPatch = lib.optionalString (mpi4py.mpi.pname == "openmpi") ''
     substituteInPlace pytest_mpi/plugin.py \
diff --git a/pkgs/development/python-modules/piano-transcription-inference/default.nix b/pkgs/development/python-modules/piano-transcription-inference/default.nix
index e57523d12195..855a1e0f012b 100644
--- a/pkgs/development/python-modules/piano-transcription-inference/default.nix
+++ b/pkgs/development/python-modules/piano-transcription-inference/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
   # Project has no tests.
   # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to
   # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702).
-  # pythonImportsCheck has no pre* hook, use checkPhase to wordaround that.
+  # pythonImportsCheck has no pre* hook, use checkPhase to workaround that.
   checkPhase = ''
     export NUMBA_CACHE_DIR="$(mktemp -d)"
   '';
diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 8f4269b523fd..dca65d503b20 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -24,7 +24,7 @@
   tomli-w,
   werkzeug,
 
-  # coupled downsteam dependencies
+  # coupled downstream dependencies
   pip-tools,
 }:
 
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 199944707eb4..e6d853fe2314 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -110,7 +110,7 @@ buildPythonPackage rec {
             "MulticastTests.test_multiListen"
           ];
           "src/twisted/trial/test/test_script.py" = [
-            # Fails in LXC containers with less than all cores availaible (limits.cpu)
+            # Fails in LXC containers with less than all cores available (limits.cpu)
             "AutoJobsTests.test_cpuCount"
           ];
           "src/twisted/internet/test/test_unix.py" = [
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index b79310cf1cba..bb46c3444136 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     [
       # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373
       "test_find_files_recursively"
-      # Issue wih fixture
+      # Issue with fixture
       "test_codec_built_in_equivalent"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
index 4232c7a98132..2ca251cffe85 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
@@ -241,7 +241,7 @@ stdenv.mkDerivation rec {
     # guarantee that it will always run in any nix context.
     #
     # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
-    # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
+    # NIX_BUILD_TOP env var to conditionally disable sleep features inside the
     # sandbox.
     #
     # If you want to investigate the sandbox profile path,
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
index 7a5b4a6a2bb8..fe710bdd30cb 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
@@ -323,11 +323,11 @@ stdenv.mkDerivation rec {
       # --{,tool_}java_runtime_version=local_jdk and rely on the fact no java
       # toolchain registered by default uses the local_jdk, making the selection
       # unambiguous.
-      # This toolchain has the advantage that it can use any ambiant java jdk,
+      # This toolchain has the advantage that it can use any ambient java jdk,
       # not only a given, fixed version. It allows bazel to work correctly in any
       # environment where JAVA_HOME is set to the right java version, like inside
       # nix derivations.
-      # However, this patch breaks bazel hermeticity, by picking the ambiant java
+      # However, this patch breaks bazel hermeticity, by picking the ambient java
       # version instead of the more hermetic remote_jdk prebuilt binaries that
       # rules_java provide by default. It also requires the user to have a
       # JAVA_HOME set to the exact version required by the project.
@@ -347,7 +347,7 @@ stdenv.mkDerivation rec {
       # guarantee that it will always run in any nix context.
       #
       # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
-      # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
+      # NIX_BUILD_TOP env var to conditionally disable sleep features inside the
       # sandbox.
       #
       # If you want to investigate the sandbox profile path,
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 002257de09c3..8d286ae30426 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -151,8 +151,8 @@ let
         ];
       });
 
-      # Pinned due to home-assistant still needing 1.10.0 verison
-      # Remove this when home-assistant upates the jellyfin-apiclient-python version
+      # Pinned due to home-assistant still needing 1.10.0 version
+      # Remove this when home-assistant updates the jellyfin-apiclient-python version
       jellyfin-apiclient-python = super.jellyfin-apiclient-python.overridePythonAttrs (oldAttrs: rec {
         version = "1.10.0";
         src = fetchFromGitHub {
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 739fe39394cb..1284935c5e4b 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -120,7 +120,7 @@ let
 
   isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or [ ]) != [ ];
 
-  # Alow granular checks to allow only some unfree packages
+  # Allow granular checks to allow only some unfree packages
   # Example:
   # {pkgs, ...}:
   # {
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 4154249ad1a6..34bbc12efaee 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -625,7 +625,7 @@ rec {
         "outocp"
         "pmxab"
 
-        # GUI scripts that accept no argument or crash without a graphics server; please test manualy
+        # GUI scripts that accept no argument or crash without a graphics server; please test manually
         "epspdftk"
         "texdoctk"
         "tlshell"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57aefbbf9d1c..5accf1cff649 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3658,7 +3658,7 @@ with pkgs;
 
   libhandy = callPackage ../development/libraries/libhandy { };
 
-  # Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
+  # Needed for apps that still depend on the unstable version of the library (not libhandy-1)
   libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
 
   libint = callPackage ../development/libraries/libint { };
@@ -4853,7 +4853,7 @@ with pkgs;
 
   zbar = libsForQt5.callPackage ../tools/graphics/zbar { };
 
-  # Nvidia support does not require any propietary libraries, so CI can build it.
+  # Nvidia support does not require any proprietary libraries, so CI can build it.
   # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section.
   zenith-nvidia = zenith.override {
     nvidiaSupport = true;
@@ -7057,7 +7057,7 @@ with pkgs;
   # host platform.
   #
   # Because this is the *next* stages choice, it's a bit non-modular to put
-  # here. In theory, bootstraping is supposed to not be a chain but at tree,
+  # here. In theory, bootstrapping is supposed to not be a chain but at tree,
   # where each stage supports many "successor" stages, like multiple possible
   # futures. We don't have a better alternative, but with this downside in
   # mind, please be judicious when using this attribute. E.g. for building
@@ -8209,7 +8209,7 @@ with pkgs;
     stdenv = stdenvNoLibc;
   };
 
-  # These are used when buiding compiler-rt / libgcc, prior to building libc.
+  # These are used when building compiler-rt / libgcc, prior to building libc.
   preLibcCrossHeaders =
     let
       inherit (stdenv.targetPlatform) libc;
@@ -10575,7 +10575,7 @@ with pkgs;
 
   nginxModules = recurseIntoAttrs (callPackage ../servers/http/nginx/modules.nix { });
 
-  # We should move to dynmaic modules and create a nginxFull package with all modules
+  # We should move to dynamic modules and create a nginxFull package with all modules
   nginxShibboleth = nginxStable.override {
     modules = [
       nginxModules.rtmp
@@ -13703,7 +13703,7 @@ with pkgs;
     jdk = jdk17;
   };
 
-  # perhaps there are better apps for this task? It's how I had configured my preivous system.
+  # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
   profanity = callPackage ../applications/networking/instant-messengers/profanity (
     {
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 3cd2a95f8ff0..2334242238d5 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -328,7 +328,7 @@ let
 
   # The complete chain of package set builders, applied from top to bottom.
   # stdenvOverlays must be last as it brings package forward from the
-  # previous bootstrapping phases which have already been overlayed.
+  # previous bootstrapping phases which have already been overlaid.
   toFix = lib.foldl' (lib.flip lib.extends) (self: { }) (
     [
       stdenvBootstappingAndPlatforms

From 72e244538d7456c4a3ee6cb9358a9c4184bde773 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 2 Jun 2025 16:19:21 +0200
Subject: [PATCH 0571/1497] ty: 0.0.1-alpha.7 -> 0.0.1-alpha.8

Diff: https://github.com/astral-sh/ty/compare/refs/tags/0.0.1-alpha.7...refs/tags/0.0.1-alpha.8

Changelog: https://github.com/astral-sh/ty/blob/0.0.1-alpha.8/CHANGELOG.md
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 1f8526f61419..fb7fc3989273 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.7";
+  version = "0.0.1-alpha.8";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-aonCRtXi9MZWhZO3SjMxAxsTm8iZZdrm36psGArFz/I=";
+    hash = "sha256-w/UEENP9tqwqFX/oCvI67DDMSmXzlCazAIP2wfmdDSs=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-pYv99huRgqcFcnkMkfFoejmZmVkb9q/VVlYfylPXo4o=";
+  cargoHash = "sha256-XISRy7Ncy0lTlsCFYmJBcgGiDJfdygTDF4f9O9ZlzDU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e9688cd9d3eb9549cea0d6362833bd457f81651e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 15:04:16 +0000
Subject: [PATCH 0572/1497] chart-testing: 3.12.0 -> 3.13.0

---
 pkgs/by-name/ch/chart-testing/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chart-testing/package.nix b/pkgs/by-name/ch/chart-testing/package.nix
index 707e20c0c92d..976e0c9c48fa 100644
--- a/pkgs/by-name/ch/chart-testing/package.nix
+++ b/pkgs/by-name/ch/chart-testing/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "chart-testing";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "chart-testing";
     rev = "v${version}";
-    hash = "sha256-q56ZM+YzL7RRC3RD3xO3K0hIDomKun5xmSKuiDTq1cU=";
+    hash = "sha256-59a86yR/TDAWGCsj3pbDjXJGMvyHYnjsnxzjWr61PuU=";
   };
 
-  vendorHash = "sha256-kTlqGZVOppf+WMcFw0T9FVbu9eOWAWzotR8fPPyo2Ms=";
+  vendorHash = "sha256-aVXISRthJxxvtrfC0DpewLHCiJPh4tO+SKl3Q9uP14k=";
 
   postPatch = ''
     substituteInPlace pkg/config/config.go \

From 7bcf9ade60603921f46e267461e0e157bd89adfb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 17:10:18 +0200
Subject: [PATCH 0573/1497] workflows/dismissed-review: drop

This doesn't work, because it doesn't have the required permissions to
make any modifications.
---
 .github/workflows/dismissed-review.yml | 30 --------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 .github/workflows/dismissed-review.yml

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
deleted file mode 100644
index 9886dad2b74e..000000000000
--- a/.github/workflows/dismissed-review.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Dismissed Review
-
-on:
-  pull_request_review:
-    types: [dismissed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  # The check-cherry-picks workflow creates review comments,
-  # that should sometimes be manually dismissed.
-  # When a CI-generated review is dismissed, this job automatically
-  # minimizes it, to prevent it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
-    if: github.event.review.user.login == 'github-actions[bot]'
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            await github.graphql(`mutation($node_id:ID!) {
-              minimizeComment(input: {
-                classifier: RESOLVED,
-                subjectId: $node_id
-              })
-              { clientMutationId }
-            }`, { node_id: context.payload.review.node_id })
-

From bd8e3683cb1151859407e02eac0a97c0302e44fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 15:14:46 +0000
Subject: [PATCH 0574/1497] c3c: 0.7.1 -> 0.7.2

---
 pkgs/by-name/c3/c3c/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 28253a6300da..b2c9d6e2d78e 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -19,13 +19,13 @@ in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   pname = "c3c${optionalString debug "-debug"}";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU=";
+    hash = "sha256-/S2rcZZe441b1sbiJDH1rnxT/mEP1694d5L8MIV6QQc=";
   };
 
   cmakeBuildType = if debug then "Debug" else "Release";

From 6d53dfcd455d9f359d38785be6d024fae2999128 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 2 Jun 2025 15:48:53 +0000
Subject: [PATCH 0575/1497] OVMFFull: debian-edk-src: 2024.05-1 -> 2025.02-8

This contains a patch required to build using Python 3.13, no other changes are relevant for our usage.
https://salsa.debian.org/qemu-team/edk2/-/commit/ba55ec3c5398be0d8184a47841d5c0010b20c599
---
 pkgs/applications/virtualization/OVMF/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index bfb069f4e053..cd5c8796f172 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -96,8 +96,8 @@ let
       "debian/python"
       "debian/PkKek-1-*.pem"
     ];
-    rev = "refs/tags/debian/2024.05-1";
-    hash = "sha256-uAjXJaHOVh944ZxcA2IgCsrsncxuhc0JKlsXs0E03s0=";
+    rev = "refs/tags/debian/2025.02-8";
+    hash = "sha256-kAwfS8TBdN1PTm5kxTvqFuA9edBfBuMt6XmRWnFnolQ=";
   };
 
   buildPrefix = "Build/*/*";

From a5594bd8d299691fd7e7bbb08bd5746952ef271e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 2 Jun 2025 23:39:38 +0800
Subject: [PATCH 0576/1497] pantheon.switchboard-plug-onlineaccounts: 8.0.1 ->
 8.0.2

https://github.com/elementary/switchboard-plug-onlineaccounts/compare/8.0.1...8.0.2
---
 .../apps/switchboard-plugs/onlineaccounts/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index a59ed798df55..4f7f9006acc5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-onlineaccounts";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = "settings-onlineaccounts";
     rev = version;
-    sha256 = "sha256-E4UAhrs+YQ47VEHMFY8PbSFvBqhqrTf4aPezeqEjdLo=";
+    sha256 = "sha256-0dt4E2g1nX78s2WK2HO6P/fKjXcsR61KJSpulgsZHPI=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Switchboard Online Accounts Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts";
+    homepage = "https://github.com/elementary/settings-onlineaccounts";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     teams = [ teams.pantheon ];

From 8869df704338824b59e7b9bb7c4ac3caf62ab1b7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 2 Jun 2025 23:39:54 +0800
Subject: [PATCH 0577/1497] pantheon.elementary-shortcut-overlay: 8.0.1 ->
 8.1.0

https://github.com/elementary/shortcut-overlay/compare/8.0.1...8.1.0
---
 .../desktop/elementary-shortcut-overlay/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index ce737ccdd4ae..cfd739884d67 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -16,18 +16,19 @@
   granite7,
   libgee,
   mutter,
+  pantheon-wayland,
   wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-shortcut-overlay";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "shortcut-overlay";
     rev = version;
-    sha256 = "sha256-RWFzs4rw/KC0MXkNfA178FejMbuIBh5FVox1RxmxCJA=";
+    sha256 = "sha256-oGExG7eWiZqXEPBRuLRTnbgo3hRVKo8vO51vMBPoQb0=";
   };
 
   nativeBuildInputs = [
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
     gtk4
     libgee
     mutter # org.gnome.mutter.keybindings
+    pantheon-wayland
   ];
 
   passthru = {

From 9bb3569e1813eab98c5d36e2ac7842f0e5804689 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 2 Jun 2025 23:49:06 +0800
Subject: [PATCH 0578/1497] monitor: Fix build with Vala 0.56.18

error: Compact class `Monitor.HwmonTemperature' cannot inherit from non-compact class `GLib.Object'
---
 pkgs/applications/system/monitor/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
index d949ab2eb1f8..5115a6e12d72 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@@ -84,6 +84,12 @@ stdenv.mkDerivation rec {
     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 = {

From 04d84b539fec1dcb427530298f8a9409b6b52fe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 15:52:48 +0000
Subject: [PATCH 0579/1497] mise: 2025.5.10 -> 2025.6.0

---
 pkgs/by-name/mi/mise/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 1ea85e434832..d8d340c6f655 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -21,17 +21,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2025.5.10";
+  version = "2025.6.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-G6bvWSjFhZRVkIZKUG+v7Ct1AtiLCQYmu5WLsVxfVgA=";
+    hash = "sha256-vlzId9SjxcSQ6DDw0H68zi7xHd2Nn3bPSG+rsR7UEBs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OVXcmlIrb+Q7B/FAayfrC/e4WdnWUgvjLn6hPDo8Ru4=";
+  cargoHash = "sha256-YVeF+2qJuOMhNQLEpH3P0ufqHU0sBFRHN5yXZGTJEQA=";
 
   nativeBuildInputs = [
     installShellFiles

From 01ab1fc0cb3cc2781cabd0d9d404edcef91e298b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 15:53:19 +0000
Subject: [PATCH 0580/1497] yaziPlugins.bypass: 25.3.2-unstable-2025-05-30 ->
 25.3.2-unstable-2025-06-01

---
 pkgs/by-name/ya/yazi/plugins/bypass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
index f98a0ad23c66..a4a62b2b4e33 100644
--- a/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/bypass/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "bypass.yazi";
-  version = "25.3.2-unstable-2025-05-30";
+  version = "25.3.2-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "bypass.yazi";
-    rev = "381fb89a21a58605c555c109f190309b2d116d30";
-    hash = "sha256-04cyOlG843Ot+jRT8GNFjJOzV4YdPBpI9XqbaK6KXu0=";
+    rev = "c1e5fcf6eeed0bfceb57b9738da6db9d0fb8af56";
+    hash = "sha256-ZndDtTMkEwuIMXG4SGe4B95Nw4fChfFhxJHj+IY30Kc=";
   };
 
   meta = {

From d85e9635e368f60c0fa353652149b3834b823cbd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 2 Jun 2025 18:53:57 +0300
Subject: [PATCH 0581/1497] 
 home-assistant-custom-lovelace-modules.universal-remote-card: 4.5.2 -> 4.5.3

Diff: https://github.com/Nerwyn/android-tv-card/compare/4.5.2...4.5.3
---
 .../universal-remote-card/package.nix                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index bf50a0ca5e20..847e8209fa87 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -6,18 +6,18 @@
 
 buildNpmPackage rec {
   pname = "universal-remote-card";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-woplybqlpx+xJdLJ0RWgDp3mR1l8Ntt+JA0SVyFaDQA=";
+    hash = "sha256-AxPpKp7SjeSB8VqclDJgkArC9zmjIkLQx+RBWQX0sLM=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-YN+Ftv5gEwXHqoO7KAyijZMS6g6i3bKbEnvoVLakrTQ=";
+  npmDepsHash = "sha256-KFgo1sKwCLmW0Il4tK2L+giF3th+YvVUWG3n+3HkRg4=";
 
   installPhase = ''
     runHook preInstall

From 252659081e250858a40bd96b27d0f13b6cce136f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 18:05:08 +0200
Subject: [PATCH 0582/1497] labels: automatically add labels for 24.11 on CI
 PRs

The chained backport unstable -> 25.05 -> 24.11 became too annoying for
me.
---
 .github/labeler-no-sync.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 2d4836c58b7b..7464dfd71bb6 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -22,6 +22,13 @@
         - doc/**/*
         - nixos/doc/**/*
 
+"backport release-24.11":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - .github/workflows/*
+        - ci/**/*.*
+
 "backport release-25.05":
   - any:
     - changed-files:

From b62b7136cb8dad6b7aeedf8c6b24f86cc9cb62e1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 3 Jun 2025 00:07:28 +0800
Subject: [PATCH 0583/1497] =?UTF-8?q?webkitgtk=5F6=5F0:=202.48.2=20?=
 =?UTF-8?q?=E2=86=92=202.48.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://webkitgtk.org/2025/05/28/webkitgtk2.48.3-released.html
https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.2...webkitgtk-2.48.3
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5b91295cf992..cdba05f195ad 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -80,7 +80,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.48.2";
+  version = "2.48.3";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
     if lib.versionAtLeast gtk3.version "4.0" then
       "6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
+    hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [

From 82c6ea2ddc9a2d59c8c765f76bee8141d051f71c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 17:58:24 +0200
Subject: [PATCH 0584/1497] workflows/check-cherry-picks: minimize more than
 one old review

After we removed the dismissed-review workflow, it can happen that
multiple non-minimized reviews exist after a force push. To avoid
cluttering the PR's history while it's actively worked on, we minimize
all of them instead of only the latest.
---
 .github/workflows/check-cherry-picks.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index b7d914caffdc..77aafd9f0ff2 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -115,16 +115,17 @@ jobs:
                 repo: context.repo.repo,
                 pull_number: context.payload.pull_request.number
               })).filter(review =>
-                review.user.login == 'github-actions[bot]' &&
-                review.state == 'CHANGES_REQUESTED'
+                review.user.login == 'github-actions[bot]'
               ).map(async (review) => {
-                await github.rest.pulls.dismissReview({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  pull_number: context.payload.pull_request.number,
-                  review_id: review.id,
-                  message: 'All cherry-picks are good now, thank you!'
-                })
+                if (review.state == 'CHANGES_REQUESTED') {
+                  await github.rest.pulls.dismissReview({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: context.payload.pull_request.number,
+                    review_id: review.id,
+                    message: 'All cherry-picks are good now, thank you!'
+                  })
+                }
                 await github.graphql(`mutation($node_id:ID!) {
                   minimizeComment(input: {
                     classifier: RESOLVED,

From ab654f18fbf6f31882562a53cf6832be2affe167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 2 Jun 2025 18:26:25 +0200
Subject: [PATCH 0585/1497] ktailctl: 0.20.1 -> 0.20.2

Changelog: https://github.com/f-koehler/KTailctl/releases/tag/v0.20.2
---
 pkgs/applications/networking/ktailctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix
index a9b5c72dbfbf..3ac34ced5542 100644
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -26,13 +26,13 @@
 }:
 
 let
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
     rev = "v${version}";
-    hash = "sha256-8vtNAqCDXbzEuGXqUZL26EMmVLJqSFu+E/zhK8VafLE=";
+    hash = "sha256-yMP+oAc1ZHr402j3NQOFLGFT/AK/PQ+figoVyOMEaus=";
   };
 
   goDeps =
@@ -40,7 +40,7 @@ let
       pname = "ktailctl-go-wrapper";
       inherit src version;
       modRoot = "src/wrapper";
-      vendorHash = "sha256-F0fY9ZqibZNIUQSIlLRO3rX4gYAFHWMdFtwRNigpGZE=";
+      vendorHash = "sha256-kX2L/ET6saxn73T4414ShRSeOIpX8i1HHjKkPbdjse0=";
     }).goModules;
 in
 stdenv.mkDerivation {

From 978f295e3614ae19b32d45e465dd1f20e014ca12 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 2 Jun 2025 16:52:04 +0000
Subject: [PATCH 0586/1497] flaresolverr: remove discouraged anti-pattern

---
 pkgs/by-name/fl/flaresolverr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 8ee30bdfc468..a3f6a17a21b8 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -59,11 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${finalAttrs.pname}-${finalAttrs.version}}
-    cp -r * $out/share/${finalAttrs.pname}-${finalAttrs.version}/.
+    mkdir -p $out/{bin,share/flaresolverr-${finalAttrs.version}}
+    cp -r * $out/share/flaresolverr-${finalAttrs.version}/.
 
     makeWrapper ${python}/bin/python $out/bin/flaresolverr \
-      --add-flags "$out/share/${finalAttrs.pname}-${finalAttrs.version}/src/flaresolverr.py" \
+      --add-flags "$out/share/flaresolverr-${finalAttrs.version}/src/flaresolverr.py" \
       --prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}"
   '';
 

From b44e4bd99a5911de9e82aceae7f93acd9bb535c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Mon, 2 Jun 2025 17:56:10 +0200
Subject: [PATCH 0587/1497] python3Packages.primp: 14.0.0 -> 15.0.0

---
 .../python-modules/primp/default.nix           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index 4c3d72fbc39a..3a7f8da6f22e 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -25,11 +25,11 @@ let
     modRoot = "./src";
     patches = [
       # A patch required to build boringssl compatible with `boring-sys2`.
-      # See https://github.com/0x676e67/boring2/blob/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/build/main.rs#L486-L489
+      # See https://github.com/0x676e67/boring2/blob/refs/tags/v4.15.11/boring-sys/build/main.rs#L486-L489
       (fetchpatch {
         name = "boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
-        url = "https://raw.githubusercontent.com/0x676e67/boring2/4edbff8cade24d5d83cc372c4502b59c5192b5a1/boring-sys/patches/boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
-        hash = "sha256-lM+2lLvfDHnxLl+OgZ6R8Y4Z6JfA9AiDqboT1mbxmao=";
+        url = "https://raw.githubusercontent.com/0x676e67/boring2/refs/tags/v4.15.11/boring-sys/patches/boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
+        hash = "sha256-JRRATcCXo0HBQTzgCAuLpxC3NEGrTw1cEmC0VHOgO2M=";
       })
     ];
 
@@ -45,7 +45,11 @@ let
       oa.env.NIX_CFLAGS_COMPILE
       + " "
       + toString (
-        lib.optionals stdenv.cc.isGNU [
+        lib.optionals stdenv.cc.isClang [
+          "-Wno-error=reorder-ctor"
+        ]
+        ++ lib.optionals stdenv.cc.isGNU [
+          "-Wno-error=reorder"
           "-Wno-error=ignored-attributes"
         ]
       );
@@ -61,19 +65,19 @@ let
 in
 buildPythonPackage rec {
   pname = "primp";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "primp";
     tag = "v${version}";
-    hash = "sha256-LrSygeioJlccOH1oyagw02ankkZK+H6Mzrgy8tB83mo=";
+    hash = "sha256-13o0Ni0dvZaoKgYy2cFQhebwKAJGm5Z2s+gVAddxYxU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-iPf25DMGNHrWYByNTylB6bPpLfzs0ADwgkjfhVxiiXA=";
+    hash = "sha256-UBpf9f3wJgbizHERsm83cuKHiMixj/8JX/IGvteySIo=";
   };
 
   nativeBuildInputs = [

From 96999641fbc332279c8b510992055fb60d985ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Mon, 2 Jun 2025 17:56:49 +0200
Subject: [PATCH 0588/1497] python3Packages.duckduckgo-search: 8.0.0 -> 8.0.2

---
 pkgs/development/python-modules/duckduckgo-search/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index fe7f0ac8af64..3000bbdbe448 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "duckduckgo-search";
-  version = "8.0.0";
+  version = "8.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "deedy5";
     repo = "duckduckgo_search";
     tag = "v${version}";
-    hash = "sha256-FoGBVHxEXM9Mt0wpy7GctrlqUfhZb8DlK3UhlHld7E0=";
+    hash = "sha256-Hbhrm++F6aVvJ//WAgyLNsJe+KS0cjnQ83I1ba72Ows=";
   };
 
   build-system = [ setuptools ];

From cf0d11234ee4f9ce5e449d8224f2ac1535f39e5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 17:47:47 +0000
Subject: [PATCH 0589/1497] hyprls: 0.6.0 -> 0.7.0

---
 pkgs/by-name/hy/hyprls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix
index bd713f25d09f..3815066a55ae 100644
--- a/pkgs/by-name/hy/hyprls/package.nix
+++ b/pkgs/by-name/hy/hyprls/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "hyprls";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprls";
     rev = "v${version}";
-    hash = "sha256-sXC/JMd2NYc74k19DxZyldH+QLZ6W8dVHy0uyqyuCmg=";
+    hash = "sha256-cJDDyF44nD/XvxtaGPYCk2MC574HDBHP1ByhVwqatvQ=";
   };
 
-  vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y=";
+  vendorHash = "sha256-WTdwIAC3gDWgCKlVuOtMyl0ZfdZ9RhlpqUl2S2d65HA=";
 
   checkFlags = [
     # Not yet implemented

From 7ee611b07f8cd0dcb68c2aa32374c82d7199f44a Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 2 Jun 2025 10:51:02 -0700
Subject: [PATCH 0590/1497] tests.fetchgit.fetchTags: fix flaky test by
 removing .git directory after getting tags

Closes #412967
---
 pkgs/build-support/fetchgit/tests.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index ce733347cfa0..fd6aebc335f7 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -90,9 +90,11 @@
     rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
     fetchTags = true;
     leaveDotGit = true;
-    sha256 = "sha256-2vfZnYjZlnC8ODz6B6aOqAqtb1Wbjojnn/5TmzwUrmo=";
+    sha256 = "sha256-y7l+46lVP2pzJwGON5qEV0EoxWofRoWAym5q9VXvpc8=";
     postFetch = ''
       cd $out && git describe --tags --always > describe-output.txt 2>&1 || echo "git describe failed" > describe-output.txt
+      # See https://github.com/NixOS/nixpkgs/issues/412967#issuecomment-2927452118
+      rm -rf .git
     '';
   };
 }

From cd90fbd9ccfa33c615d38c510f0437e17cfa9b6c Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Thu, 22 May 2025 13:42:27 +0200
Subject: [PATCH 0591/1497] fluent-bit: 3.2.6 -> 4.0.3

fluent-bit now dynamically links against libzstd, sqlite and msgpack

This means that we will not run into the issue that caused us
to roll back from 3.2.9 to 3.2.6 anymore (https://github.com/NixOS/nixpkgs/pull/395128)
as there shouldn't be two incompatible versions of libzstd loaded at the same time.

Fixes https://github.com/fluent/fluent-bit/issues/10139

Is this eligible for back-porting even-though it's a major version bump?  In my
opinion: yes.  We can't keep maintaining 3.x as all the builds after 3.2.6 have
the same issue so we are missing out on critical vulnerability fixes. In the
meantine Non of the following links mention any backwards compatibilities with
3.2.6:

* https://fluentbit.io/announcements/v4.0.0/
* https://fluentbit.io/announcements/v4.0.1/
* https://fluentbit.io/announcements/v4.0.2/
* https://fluentbit.io/announcements/v4.0.3/
* https://docs.fluentbit.io/manual/installation/upgrade-notes/
---
 pkgs/by-name/fl/fluent-bit/package.nix | 35 +++++++++-----------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 52a06e4cda95..796fd3d9ef78 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -1,41 +1,41 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
+  nixosTests,
+
   arrow-glib,
   bison,
   c-ares,
   cmake,
-  curl,
-  fetchFromGitHub,
   flex,
   jemalloc,
   libbacktrace,
   libbpf,
-  libnghttp2,
   libpq,
   libyaml,
   luajit,
+  msgpack-c,
+  nghttp2,
   nix-update-script,
-  nixosTests,
   openssl,
   pkg-config,
   rdkafka,
+  sqlite,
   systemd,
   versionCheckHook,
-  zlib,
   zstd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  # FIXME: We are deliberately on 3.2.6 as 3.2.7 and above are causing segfaults (https://github.com/fluent/fluent-bit/issues/10139)
-  version = "3.2.6";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S0sb954n17z+zrVNkYd6yiV01aNbOLJLOV+34PRkSXQ=";
+    hash = "sha256-hxlvidzrEE/5xzka414CerGQ/Vi2jXUnNvO/oSxrHQQ=";
   };
 
   # The source build documentation covers some dependencies and CMake options.
@@ -49,15 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Fortunately, there's the undocumented `FLB_PREFER_SYSTEM_LIBS` CMake option to link against system libraries for
   # some dependencies.
   #
-  # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L211-L218.
-  #
-  # Like `FLB_PREFER_SYSTEM_LIBS`, several CMake options aren't documented.
-  #
-  # See https://github.com/fluent/fluent-bit/blob/v3.2.6/CMakeLists.txt#L111-L157.
-  #
-  # The CMake options may differ across target platforms. We'll stick to the minimum.
-  #
-  # See https://github.com/fluent/fluent-bit/tree/v3.2.6/packaging/distros.
+  # https://github.com/fluent/fluent-bit/blob/v4.0.2/CMakeLists.txt#L245
 
   strictDeps = true;
 
@@ -72,19 +64,16 @@ stdenv.mkDerivation (finalAttrs: {
     [
       arrow-glib
       c-ares
-      # Needed by rdkafka.
-      curl
       jemalloc
       libbacktrace
-      libnghttp2
       libpq
       libyaml
       luajit
+      msgpack-c
+      nghttp2.dev
       openssl
       rdkafka
-      # Needed by rdkafka.
-      zlib
-      # Needed by rdkafka.
+      sqlite.dev
       zstd
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [

From 0b360e932837087c70b869670abbb9eaaf0e3178 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Mon, 2 Jun 2025 19:28:05 +0200
Subject: [PATCH 0592/1497] nixos/lasuite-docs: use systemd bind mount instead
 of stateful symlink for static directory

---
 nixos/modules/services/web-apps/lasuite-docs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix
index eb1c44c2e87b..24a321aae825 100644
--- a/nixos/modules/services/web-apps/lasuite-docs.nix
+++ b/nixos/modules/services/web-apps/lasuite-docs.nix
@@ -264,7 +264,7 @@ in
             type = types.str;
             default = if cfg.enableNginx then "localhost,127.0.0.1,${cfg.domain}" else "";
             defaultText = lib.literalExpression ''
-              if cfg.enableNginx then "localhost,127.0.0.1,$${cfg.domain}" else ""
+              if cfg.enableNginx then "localhost,127.0.0.1,''${cfg.domain}" else ""
             '';
             description = "Comma-separated list of hosts that are able to connect to the server";
           };
@@ -348,8 +348,6 @@ in
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
-        ln -sfT ${cfg.backendPackage}/share/static /var/lib/lasuite-docs/static
-
         if [ ! -f .version ]; then
           touch .version
         fi
@@ -371,6 +369,8 @@ in
       environment = pythonEnvironment;
 
       serviceConfig = {
+        BindReadOnlyPaths = "${cfg.backendPackage}/share/static:/var/lib/lasuite-docs/static";
+
         ExecStart = utils.escapeSystemdExecArgs (
           [
             (lib.getExe' cfg.backendPackage "gunicorn")

From cdbc334d2548359d681a363802abcba140972989 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 17:53:47 +0000
Subject: [PATCH 0593/1497] python3Packages.sse-starlette: 2.3.5 -> 2.3.6

---
 pkgs/development/python-modules/sse-starlette/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix
index 08691d5c5e2e..e64e15fe2c0a 100644
--- a/pkgs/development/python-modules/sse-starlette/default.nix
+++ b/pkgs/development/python-modules/sse-starlette/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "sse-starlette";
-  version = "2.3.5";
+  version = "2.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "sysid";
     repo = "sse-starlette";
     tag = "v${version}";
-    hash = "sha256-KTq8NwV4YhyfTLpsaF5jyrD3kyBcJ/xXtOwx4WvDFOo=";
+    hash = "sha256-7FlyV+TsVKGFsecONPm/Z50cCnyuUsr6pimPdc4Cs6c=";
   };
 
   build-system = [ setuptools ];

From f8ce8eb61e388566a439519ff7c2f159f01cbdbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 18:08:33 +0000
Subject: [PATCH 0594/1497] dprint-plugins.dprint-plugin-typescript: 0.95.4 ->
 0.95.5

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
index 3fb228eabfab..17c27fd563a6 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TypeScript/JavaScript code formatter.";
-  hash = "sha256-g41K7aTCZZc1zRoc9k1oG8rk88ZwJJH3jnnX+MKQ9mE=";
+  hash = "sha256-sn10yaYbp6VWspqEMKCd7HbDvKi35AW5Xn8FGzzN3kM=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "typescript";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-typescript";
   updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
-  url = "https://plugins.dprint.dev/typescript-0.95.4.wasm";
-  version = "0.95.4";
+  url = "https://plugins.dprint.dev/typescript-0.95.5.wasm";
+  version = "0.95.5";
 }

From fd64fcd75bc5531e998d18fd797587ee0105f63d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 18:16:26 +0000
Subject: [PATCH 0595/1497] rssguard: 4.8.4 -> 4.8.5

---
 pkgs/by-name/rs/rssguard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 8c0076f1600b..3f1b74b587a0 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rssguard";
-  version = "4.8.4";
+  version = "4.8.5";
 
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = "rssguard";
     tag = version;
-    sha256 = "sha256-CWRsuIvjgQHnCfHVUvellFLma8vvqoROfPjKOIuCSCI=";
+    sha256 = "sha256-JSw3zuKUPqxWbgzLVjLs41fOihQZcfU6PJGb4m6ua90=";
   };
 
   buildInputs = [

From 48baebba5090892683f2bdd6095e907d674e7106 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:32:44 +0200
Subject: [PATCH 0596/1497] workflows/codeowners: improve test-ability in forks

This allows to at least run basic codeowner stuff in forks.
---
 .github/workflows/codeowners-v2.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index 5c6b0b8da4c6..c4b2f65981ba 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -45,7 +45,6 @@ jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04-arm
-    if: github.repository_owner == 'NixOS'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -91,7 +90,6 @@ jobs:
   request:
     name: Request
     runs-on: ubuntu-24.04-arm
-    if: github.repository_owner == 'NixOS'
     steps:
       - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
 
@@ -101,6 +99,9 @@ jobs:
         with:
           path: trusted
 
+      - name: Build review request package
+        run: nix-build trusted/ci -A requestReviews
+
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         if: vars.OWNER_APP_ID
         id: app-token
@@ -111,9 +112,6 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
-      - name: Build review request package
-        run: nix-build trusted/ci -A requestReviews
-
       - name: Request reviews
         if: steps.app-token.outputs.token
         env:

From e1fa9f0fe5b406453853e74ad1618cad899202c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 18:40:17 +0000
Subject: [PATCH 0597/1497] vapoursynth: 71 -> 72

---
 pkgs/by-name/va/vapoursynth/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix
index 294481fae046..b16a2a12cafe 100644
--- a/pkgs/by-name/va/vapoursynth/package.nix
+++ b/pkgs/by-name/va/vapoursynth/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vapoursynth";
-  version = "71";
+  version = "72";
 
   src = fetchFromGitHub {
     owner = "vapoursynth";
     repo = "vapoursynth";
     rev = "R${version}";
-    hash = "sha256-gFfkZaYIpQnDckYk6a8hGJCjBQxjjMIgzPZ4k2sVab4=";
+    hash = "sha256-LRRz4471Rl/HwJ14zAkU/f2Acuofja8c0pGkuWihhsM=";
   };
 
   nativeBuildInputs = [

From 50f6d8d90946f9e6248de473795b768902240ab0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:33:47 +0200
Subject: [PATCH 0598/1497] workflows: condition steps with secrets on
 pull_request_target event

In a pull_request event, vars are available, but secrets are not. Thus
the steps will run, even though there is no secret to request those
tokens - they will fail.

The intent was, to skip them entirely in that case.
---
 .github/workflows/codeowners-v2.yml | 4 ++--
 .github/workflows/reviewers.yml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index c4b2f65981ba..b7f875cce01b 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -67,7 +67,7 @@ jobs:
         run: nix-build trusted/ci -A codeownersValidator
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_RO_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_RO_APP_ID }}
@@ -103,7 +103,7 @@ jobs:
         run: nix-build trusted/ci -A requestReviews
 
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_APP_ID }}
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 884cd2b266a6..a859ac70acb1 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -44,7 +44,7 @@ jobs:
       # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
       # Can't use the token received from permissions above, because it can't get enough permissions
       - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
-        if: vars.OWNER_APP_ID
+        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
         id: app-token
         with:
           app-id: ${{ vars.OWNER_APP_ID }}

From 58b557670474aa5d1eafeb4e83218fef0fd760a5 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Jun 2025 20:46:55 +0200
Subject: [PATCH 0599/1497] workflows/eval: fix pull_request condition

I changed the name of the workflow last minute before merge and forgot
to adjust the path here.
---
 .github/workflows/eval.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 40a60bbfe025..473f974a024b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - .github/workflows/eval.yml
-      - .github/workflows/reviews.yml # needs eval results from the same event type
+      - .github/workflows/reviewers.yml # needs eval results from the same event type
   pull_request_target:
   push:
     # Keep this synced with ci/request-reviews/dev-branches.txt

From 5a453a8a0da43b194fc81602c7d1820345dd982d Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Mon, 2 Jun 2025 20:47:20 +0200
Subject: [PATCH 0600/1497] cachix: 1.7.8 -> 1.7.9

---
 .../haskell-modules/configuration-common.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2b8511e1063c..e58a122e881b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -544,24 +544,24 @@ self: super:
 
   # Manually maintained
   cachix-api = overrideCabal (drv: {
-    version = "1.7.8";
+    version = "1.7.9";
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
-      tag = "v1.7.8";
-      hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
+      tag = "v1.7.9";
+      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
     };
     postUnpack = "sourceRoot=$sourceRoot/cachix-api";
   }) super.cachix-api;
   cachix = (
     overrideCabal
       (drv: {
-        version = "1.7.8";
+        version = "1.7.9";
         src = pkgs.fetchFromGitHub {
           owner = "cachix";
           repo = "cachix";
-          tag = "v1.7.8";
-          hash = "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=";
+          tag = "v1.7.9";
+          hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
         };
         postUnpack = "sourceRoot=$sourceRoot/cachix";
       })

From d9424d1120cce69c41ad865b8e6715c6c5153e24 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 15 May 2025 12:35:27 -0400
Subject: [PATCH 0601/1497] gleam: 1.10.0 -> 1.11.0

---
 pkgs/by-name/gl/gleam/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index ba739669ea84..e34a3baea82d 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gleam";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = "gleam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0qK9dWkKnoXbIIBMN3p5noPEke/bgC8Bjtmf6lwtyr4=";
+    hash = "sha256-oxzFAqPZ+ZHd/+GwofDg0gA4NIFYWi2v8fOjMn8ixSU=";
   };
 
-  cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs=";
+  cargoHash = "sha256-9kk7w85imYIhywBuAgJS8wYAIEM3hXoHymGgMMmrgnI=";
 
   nativeBuildInputs = [
     git

From 5eea0fb5df744e2d32d935a947fe3885bad44e01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 18:49:59 +0000
Subject: [PATCH 0602/1497] terramate: 0.13.1 -> 0.13.2

---
 pkgs/by-name/te/terramate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index f2a97e17c770..0f6330a48a4f 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "terramate";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${version}";
-    hash = "sha256-lIYtNvluKRufV0bXi2z2/8F7221Sum20usA0j0pHU7I=";
+    hash = "sha256-NN7M4ZJ67YwguDzSHkluW1wbwVbn+7otMQm+ot2el5I=";
   };
 
-  vendorHash = "sha256-84xlUXCJhsZjNxdWQ/Tr/WA4/+gP8NlqQQHnA8R8nz8=";
+  vendorHash = "sha256-Ldl4TGmfMLk9DJgoVUYCpjX5TyAwZyCSrOKdb6uo4eM=";
 
   # required for version info
   nativeBuildInputs = [ git ];

From a372d31536f914500801e535c7e1bf135cc2d6ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 19:05:50 +0000
Subject: [PATCH 0603/1497] proj: 9.6.0 -> 9.6.1

---
 pkgs/development/libraries/proj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 4c26b6d854c8..0200ed5e496a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proj";
-  version = "9.6.0";
+  version = "9.6.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = finalAttrs.version;
-    hash = "sha256-sY3AIvsQnV2zi38nJs/U6zTsIgIv4/CaZaxinCg5nEs=";
+    hash = "sha256-81wrwBB11SKhq2dTBrvbuUd97iYkTYYrYyKpk2IlHAA=";
   };
 
   patches = [

From 634dfadac3a002790450722d37c272b856e90261 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 20:16:40 -0500
Subject: [PATCH 0604/1497] maintainers: add noiioiu

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 06888aecad83..133219431b0a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17882,6 +17882,12 @@
     githubId = 810877;
     name = "Tom Doggett";
   };
+  noiioiu = {
+    github = "noiioiu";
+    githubId = 151288161;
+    name = "noiioiu";
+    keys = [ { fingerprint = "99CC 06D6 1456 3689 CE75  58F3 BF51 F00D 0748 2A89"; } ];
+  };
   noisersup = {
     email = "patryk@kwiatek.xyz";
     github = "noisersup";

From c1edd73399c277f852948b04c43301995cf6d560 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 19:06:31 +0000
Subject: [PATCH 0605/1497] protols: 0.12.0 -> 0.12.5

---
 pkgs/by-name/pr/protols/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix
index dd75421810dc..3b9043a35f16 100644
--- a/pkgs/by-name/pr/protols/package.nix
+++ b/pkgs/by-name/pr/protols/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "protols";
-  version = "0.12.0";
+  version = "0.12.5";
 
   src = fetchFromGitHub {
     owner = "coder3101";
     repo = "protols";
     tag = version;
-    hash = "sha256-v4ROQVoJmrukHFrxykr6EuBFXRuaBnPZ7f36ly7rPhg=";
+    hash = "sha256-zs78TKZU35UGAmEXK3EA9B6zRCqeCtNexHVAJERKyX8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fmsPkXwu8qy+SRyP5w940gqNmXg0V/p/vDSI7EIFrh0=";
+  cargoHash = "sha256-Lh6KJ5zclT650tPIpMJBALLj4gnis+fglhewiZ5mpMs=";
 
   meta = {
     description = "Protocol Buffers language server written in Rust";

From cd63aeda59e78c22045be783ddfa3d83d46e958c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 19:07:37 +0000
Subject: [PATCH 0606/1497] build(deps): bump cachix/install-nix-action from
 31.3.0 to 31.4.0

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.3.0 to 31.4.0.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/526118121621777ccd86f79b04685a9319637641...17fe5fb4a23ad6cbbe47d6b3f359611ad276644c)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/check-format.yml      | 2 +-
 .github/workflows/check-shell.yml       | 2 +-
 .github/workflows/codeowners-v2.yml     | 4 ++--
 .github/workflows/eval-aliases.yml      | 2 +-
 .github/workflows/eval.yml              | 4 ++--
 .github/workflows/lib-tests.yml         | 2 +-
 .github/workflows/manual-nixos-v2.yml   | 2 +-
 .github/workflows/manual-nixpkgs-v2.yml | 2 +-
 .github/workflows/nix-parse-v2.yml      | 2 +-
 .github/workflows/nixpkgs-vet.yml       | 2 +-
 .github/workflows/reviewers.yml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index 0d2ed9d0b967..616d8e574592 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index fc90a449fb34..03649bfd934d 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
index b7f875cce01b..a857b1542263 100644
--- a/.github/workflows/codeowners-v2.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -55,7 +55,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -91,7 +91,7 @@ jobs:
     name: Request
     runs-on: ubuntu-24.04-arm
     steps:
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
       # This is intentional, because we need to request the review of owners as declared in the base branch.
diff --git a/.github/workflows/eval-aliases.yml b/.github/workflows/eval-aliases.yml
index 2d0a156a8cdf..451656a103ab 100644
--- a/.github/workflows/eval-aliases.yml
+++ b/.github/workflows/eval-aliases.yml
@@ -26,7 +26,7 @@ jobs:
           merged-as-untrusted: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 473f974a024b..bb99c0dfbc68 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -68,7 +68,7 @@ jobs:
           path: untrusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
@@ -180,7 +180,7 @@ jobs:
           path: trusted
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/lib-tests.yml b/.github/workflows/lib-tests.yml
index f11dca13581d..710356d8b771 100644
--- a/.github/workflows/lib-tests.yml
+++ b/.github/workflows/lib-tests.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml
index e76251838665..6d0b050fb3f8 100644
--- a/.github/workflows/manual-nixos-v2.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml
index d685cc8994d8..7fa628959c64 100644
--- a/.github/workflows/manual-nixpkgs-v2.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 
diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml
index fa3ae5c2ac1a..201a9c8b48ca 100644
--- a/.github/workflows/nix-parse-v2.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           merged-as-untrusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
           nix_path: nixpkgs=channel:nixpkgs-unstable
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index bc99e7333520..e8694cc68979 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -36,7 +36,7 @@ jobs:
           merged-as-untrusted: true
           target-as-trusted: true
 
-      - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+      - uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
 
       - name: Running nixpkgs-vet
         env:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index a859ac70acb1..bf205a8b3890 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -34,7 +34,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31
+        uses: cachix/install-nix-action@17fe5fb4a23ad6cbbe47d6b3f359611ad276644c # v31
         with:
           extra_nix_config: sandbox = true
 

From 23fc3c4e5ad3028481d573fdb32dd35a2b49afc3 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 19:50:48 -0500
Subject: [PATCH 0607/1497] python3Packages.tkinter-gl: init at 1.0

---
 .../python-modules/tkinter-gl/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/tkinter-gl/default.nix

diff --git a/pkgs/development/python-modules/tkinter-gl/default.nix b/pkgs/development/python-modules/tkinter-gl/default.nix
new file mode 100644
index 000000000000..5e4902f2fe44
--- /dev/null
+++ b/pkgs/development/python-modules/tkinter-gl/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools-scm,
+  tkinter,
+}:
+
+buildPythonPackage rec {
+  pname = "tkinter-gl";
+  version = "1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "tkinter_gl";
+    tag = "v${version}_as_released";
+    hash = "sha256-ObI8EEQ7mAOAuV6f+Ld4HH0xkFzqiAZqHDvzjwPA/wM";
+  };
+
+  build-system = [ setuptools-scm ];
+
+  dependencies = [ tkinter ];
+
+  pythonImportsCheck = [ "tkinter_gl" ];
+
+  meta = {
+    description = "Base class for GL rendering surfaces in tkinter";
+    changelog = "https://github.com/3-manifolds/tkinter_gl/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/tkinter_gl";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aad48eeb4c9..02dab304fac6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17537,6 +17537,8 @@ self: super: with self; {
     py = python.override (lib.optionalAttrs (!python.isPyPy) { x11Support = true; });
   };
 
+  tkinter-gl = callPackage ../development/python-modules/tkinter-gl { };
+
   tld = callPackage ../development/python-modules/tld { };
 
   tldextract = callPackage ../development/python-modules/tldextract { };

From 5309622f97ce9497b67e1f876035021ff4cf9ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 2 Jun 2025 21:24:29 +0200
Subject: [PATCH 0608/1497] mullvad-browser: 14.5.2 -> 14.5.3

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.3
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 5fd46fbf8d97..879c487038f3 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.2";
+  version = "14.5.3";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-LyvrlsL/dLgoa94+JEuzbxeEl0n61ry2BcD5BlGV0sE=";
+      hash = "sha256-W005Lkgw96sYseB8LBE76b7+RxMC5vNb1+3KrDp8IE0=";
     };
   };
 

From 715f24da1f96eda872e1764bdfe8760977a214db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 19:34:13 +0000
Subject: [PATCH 0609/1497] protoc-gen-es: 2.5.0 -> 2.5.1

---
 pkgs/by-name/pr/protoc-gen-es/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index ea38a71b109b..9c30e4d41b5c 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -7,20 +7,20 @@
 
 buildNpmPackage rec {
   pname = "protoc-gen-es";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "protobuf-es";
     tag = "v${version}";
-    hash = "sha256-wllLeX7veCbpb/mTAIs0cf/hcVItEmw2HW/UR4k0Epc=";
+    hash = "sha256-afCfRi9YSQS8BoYrDR66FBW7sbfYvSxVSpxYM8F6CRw=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-PGieFyPgb2ERTdQc3HH5mg/uh5xj7nkUa0qwmgxofVY=";
+  npmDepsHash = "sha256-DDFMQqWoixZZ9u8MLOEaKiPAOB3pEGnsF7el8AIOPrc=";
 
   npmWorkspace = "packages/protoc-gen-es";
 

From 4f1cae5e3aeb2e470a8e83dff6cf633524a36bf5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:34:47 +0200
Subject: [PATCH 0610/1497] python313Packages.garth: 0.5.10 -> 0.5.12

Changelog: https://github.com/matin/garth/releases/tag/0.5.12
---
 pkgs/development/python-modules/garth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index e8d2749cdf80..54aa7860dd11 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.10";
+  version = "0.5.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IGBJNEGD+XgQQJG3sBh6t0CMZH9eRhJIfHE0+4Jx0H0=";
+    hash = "sha256-bzEPHhIg6F/WQOUoXuaVlZGxn9PU8VdevA/DQuQ7fBw=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From bc2cc0946c8a2023377508d68da2bea06b69738f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:35:29 +0200
Subject: [PATCH 0611/1497] python313Packages.aiohomekit: 3.2.14 -> 3.2.15

Diff: https://github.com/Jc2k/aiohomekit/compare/refs/tags/3.2.14...refs/tags/3.2.15

Changelog: https://github.com/Jc2k/aiohomekit/releases/tag/3.2.15
---
 pkgs/development/python-modules/aiohomekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index ea6b2f5b3454..4bd67403b3ad 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "3.2.14";
+  version = "3.2.15";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = "aiohomekit";
     tag = version;
-    hash = "sha256-TP5YW4pIWO0xHV1EY5hDa80MrBOvkZLyQTNP7m0x+AU=";
+    hash = "sha256-UAFiYTAz5TZVviwoCFzeSGi9acVytQU9hgVVVVecOBU=";
   };
 
   build-system = [ poetry-core ];

From bbeb76d12a4478e596e187b36e53f546b58dad64 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:38:15 +0200
Subject: [PATCH 0612/1497] gitleaks: 8.26.0 -> 8.27.0

Diff: https://github.com/zricethezav/gitleaks/compare/refs/tags/v8.26.0...refs/tags/v8.27.0

Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.27.0
---
 pkgs/by-name/gi/gitleaks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix
index b04e75d007c1..b286dc45285b 100644
--- a/pkgs/by-name/gi/gitleaks/package.nix
+++ b/pkgs/by-name/gi/gitleaks/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.26.0";
+  version = "8.27.0";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     tag = "v${version}";
-    hash = "sha256-lBIoEUjAllhUTS9PRSqdWUeBhEGs6wOHOWivj0PC9Is=";
+    hash = "sha256-62Tcj5NiEk4uaGpiallCjDzpkFbuTazfMiemEe+ATLg=";
   };
 
-  vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc=";
+  vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM=";
 
   ldflags = [
     "-s"

From 21597e06946147cd967d7394865226c23baeee71 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:39:05 +0200
Subject: [PATCH 0613/1497] prowler: 5.7.1 -> 5.7.2

Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/5.7.1...refs/tags/5.7.2

Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.7.2
---
 pkgs/by-name/pr/prowler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index ec6e267110ac..22f67824b1e3 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -21,14 +21,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "prowler";
-  version = "5.7.1";
+  version = "5.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "prowler";
     tag = version;
-    hash = "sha256-gs/upAQLdMfmoWQrl1wS1wo/8gpmkuRv/tuWhviqSMU=";
+    hash = "sha256-yVUZsH/hLl/VCbLdaMujIl6NT6FzgkPfhpcOrQMcHGk=";
   };
 
   pythonRelaxDeps = true;

From e1e5af4e71767ed003178be3513fd0600d63b679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 12:39:15 -0700
Subject: [PATCH 0614/1497] python3Packages.pyyaml-ft: fix pname

---
 pkgs/development/python-modules/pyyaml-ft/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyyaml-ft/default.nix b/pkgs/development/python-modules/pyyaml-ft/default.nix
index 5106be721f67..433f95f4db6e 100644
--- a/pkgs/development/python-modules/pyyaml-ft/default.nix
+++ b/pkgs/development/python-modules/pyyaml-ft/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "pyyaml";
+  pname = "pyyaml-ft";
   version = "7.0.1";
   pyproject = true;
 

From eb01e02bd5c96acf9e95044012452b7a1b56be70 Mon Sep 17 00:00:00 2001
From: Callan Bryant <callan.bryant@gmail.com>
Date: Sun, 18 May 2025 17:27:53 +0100
Subject: [PATCH 0615/1497] dsnet: init at 0.8.1 and init module

---
 nixos/modules/services/networking/dsnet.md  |  31 ++++
 nixos/modules/services/networking/dsnet.nix | 184 ++++++++++++++++++++
 pkgs/by-name/ds/dsnet/package.nix           |  47 +++++
 3 files changed, 262 insertions(+)
 create mode 100644 nixos/modules/services/networking/dsnet.md
 create mode 100644 nixos/modules/services/networking/dsnet.nix
 create mode 100644 pkgs/by-name/ds/dsnet/package.nix

diff --git a/nixos/modules/services/networking/dsnet.md b/nixos/modules/services/networking/dsnet.md
new file mode 100644
index 000000000000..1d6a91024540
--- /dev/null
+++ b/nixos/modules/services/networking/dsnet.md
@@ -0,0 +1,31 @@
+# dsnet {#module-services-dsnet}
+
+dsnet is a CLI tool to manage a centralised wireguard server. It allows easy
+generation of client configuration, handling key generation, IP allocation etc.
+
+It keeps its own configuration at `/etc/dsnetconfig.json`, which is more of a
+database. It contains key material too.
+
+The way this module works is to patch this database with whatever is configured
+in the nix service instantiation. This happens automatically when required.
+
+This way it is possible to decide what to let dnset manage and what parts you
+want to keep declaratively.
+
+```
+services.dsnet = {
+  enable = true;
+  settings = {
+    ExternalHostname = "vpn.example.com";
+    Network = "10.171.90.0/24";
+    Network6 = "";
+    IP = "10.171.90.1";
+    IP6 = "";
+    DNS = "10.171.90.1";
+    Networks = [ "0.0.0.0/0" ];
+  };
+
+```
+
+
+See <https://github.com/naggie/dsnet> for more information.
diff --git a/nixos/modules/services/networking/dsnet.nix b/nixos/modules/services/networking/dsnet.nix
new file mode 100644
index 000000000000..131f1b0adb40
--- /dev/null
+++ b/nixos/modules/services/networking/dsnet.nix
@@ -0,0 +1,184 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.dsnet;
+  settingsFormat = pkgs.formats.json { };
+  patchFile = settingsFormat.generate "dsnet-patch.json" cfg.settings;
+in
+{
+  options.services.dsnet = {
+    enable = lib.mkEnableOption "dsnet, a centralised Wireguard VPN manager";
+
+    package = lib.mkPackageOption pkgs "dsnet" { };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+
+        freeformType = settingsFormat.type;
+
+        options = {
+          ExternalHostname = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "vpn.example.com";
+            description = ''
+              The hostname that clients should use to connect to this server.
+              This is used to generate the client configuration files.
+
+              This is preferred over ExternalIP, as it allows for IPv4 and
+              IPv6, as well as enabling the ability tp change IP.
+            '';
+          };
+
+          ExternalIP = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "192.0.2.1";
+            description = ''
+              The external IP address of the server. This is used to generate
+              the client configuration files for when an ExternalHostname is not set.
+
+              Leaving this empty will cause dsnet to use the IP address of
+              what looks like the WAN interface.
+            '';
+          };
+
+          ExternalIP6 = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "2001:db8::1";
+            description = ''
+              The external IPv6 address of the server. This is used to generate
+              the client configuration files for when an ExternalHostname is
+              not set. Used in preference to ExternalIP.
+
+              Leaving this empty will cause dsnet to use the IP address of
+              what looks like the WAN interface.
+            '';
+          };
+
+          Network = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "172.18.0.0/24";
+            description = ''
+              The IPv4 network that the server will use to allocate IPs on the network.
+              Leave this empty to let dsnet choose a network.
+            '';
+          };
+
+          Network6 = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "2001:db8::1/64";
+            description = ''
+              The IPv6 network that the server will use to allocate IPs on the
+              network.
+              Leave this empty to let dsnet choose a network.
+            '';
+          };
+
+          IP = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "172.18.0.1";
+            description = ''
+              The IPv4 address that the server will use on the network.
+              Leave this empty to let dsnet choose an address.
+            '';
+          };
+
+          IP6 = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            example = "2001:db8::1";
+            description = ''
+              The IPv6 address that the server will use on the network
+              Leave this empty to let dsnet choose an address.
+            '';
+          };
+
+          Networks = lib.mkOption {
+            type = lib.types.nullOr (lib.types.listOf lib.types.str);
+            default = null;
+            example = [
+              "0.0.0.0/0"
+              "192.168.0.0/24"
+            ];
+            description = ''
+              The CIDR networks that should route through this server. Clients
+              will be configured to route traffic for these networks through
+              the server peer.
+            '';
+          };
+        };
+      };
+
+      default = { };
+      description = ''
+        The settings to use for dsnet. This will be converted to a JSON
+        object that will be passed to dsnet as a patch, using the patch
+        command when the service is started. See the dsnet documentation for
+        more information on the additional options.
+
+        Note that the resulting /etc/dsnetconfg.json is more of a database
+        than it is a configuration file. It is therefore recommended that
+        system specific values are configured here, rather than the full
+        configuration including peers.
+
+        Peers may be managed via the dsnet add/remove commands, negating the
+        need to manage key material and cumbersom configuration with nix. If
+        you want peer configuration in nix, you may as well use the regular
+        wireguard module.
+      '';
+      example = {
+        ExternalHostname = "vpn.example.com";
+        ExternalIP = "127.0.0.1";
+        ExternalIP6 = "";
+        ListenPort = 51820;
+        Network = "10.3.148.0/22";
+        Network6 = "";
+        IP = "10.3.148.1";
+        IP6 = "";
+        DNS = "8.8.8.8";
+        Networks = [ "0.0.0.0/0" ];
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.dsnet = {
+      description = "dsnet VPN Management";
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test ! -f /etc/dsnetconfig.json && ${lib.getExe cfg.package} init
+        ${lib.getExe cfg.package} patch < ${patchFile}
+      '';
+      serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package} up";
+        ExecStop = "${lib.getExe cfg.package} down";
+        Type = "oneshot";
+        # consider the service to be active after process exits, so it can be
+        # reloaded
+        RemainAfterExit = true;
+      };
+
+      reload = ''
+        ${lib.getExe cfg.package} patch < ${patchFile}
+        ${lib.getExe cfg.package} sync < ${patchFile}
+      '';
+
+      # reload _instead_ of restarting on change
+      reloadIfChanged = true;
+    };
+  };
+}
diff --git a/pkgs/by-name/ds/dsnet/package.nix b/pkgs/by-name/ds/dsnet/package.nix
new file mode 100644
index 000000000000..07b9a7aaed98
--- /dev/null
+++ b/pkgs/by-name/ds/dsnet/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "dsnet";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "naggie";
+    repo = "dsnet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CKDtILZMWFeSU5nTSguM2fi0BCFdvR2LqELIZ6LYOMk=";
+  };
+  vendorHash = "sha256-Q2Ipj9yZ+/GUBEmDvgwFLLww7EXnbvdvj/shGQnh1G8=";
+
+  subPackages = [ "cmd" ];
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/dsnet
+  '';
+
+  # The ldflags reduce the executable size by stripping some debug stuff.
+  # The other variables are set so that the output of dsnet version shows the
+  # git ref and the release version from github.
+  # Ref <https://github.com/NixOS/nixpkgs/pull/87383#discussion_r432097657>
+  ldflags = [
+    "-w"
+    "-s"
+    "-X github.com/naggie/dsnet.VERSION=${finalAttrs.src.tag}"
+    "-X github.com/naggie/dsnet.GIT_COMMIT=${finalAttrs.src.tag}"
+  ];
+
+  meta = {
+    description = "Fast command to manage a centralised Wireguard VPN";
+    homepage = "https://github.com/naggie/dsnet";
+    changelog = "https://github.com/naggie/dsnet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.naggie ];
+    mainProgram = "dsnet";
+  };
+
+})

From 6541cd28f1d22ecfc1553ce61d6dffad47c4bd3e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:42:09 +0200
Subject: [PATCH 0616/1497] cdncheck: 1.1.20 -> 1.1.21

Diff: https://github.com/projectdiscovery/cdncheck/compare/refs/tags/v1.1.20...refs/tags/v1.1.21

Changelog: https://github.com/projectdiscovery/cdncheck/releases/tag/v1.1.21
---
 pkgs/by-name/cd/cdncheck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index e913134cfa21..938ac9acdbef 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.20";
+  version = "1.1.21";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-qL2SNVHsAH+Z0A5Vv+kBa1O9VgdR7eZ29Z19s5GuTXA=";
+    hash = "sha256-GTYgo5rx4PrWLytqdH3LrasgyEAr1FuPyI26tGRaV0A=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

From d40276e4ff0f941b2ca288ec5843b907c3981d26 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:45:12 +0200
Subject: [PATCH 0617/1497] python313Packages.ha-mqtt-discoverable: 0.19.1 ->
 0.19.2

Diff: https://github.com/unixorn/ha-mqtt-discoverable/compare/refs/tags/v0.19.1...refs/tags/v0.19.2

Changelog: https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v0.19.2
---
 .../python-modules/ha-mqtt-discoverable/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index ca0cca858c1f..01c16773a24b 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ha-mqtt-discoverable";
-  version = "0.19.1";
+  version = "0.19.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable";
     tag = "v${version}";
-    hash = "sha256-zQ3ABrKhuWBZhRPM5tH8VmYErM+mP26rNweFOpoSeEg=";
+    hash = "sha256-LRXgB85jo0Frmdsq5cHQKQ60bYzuVPXsjPeGLj5uyNU=";
   };
 
   pythonRelaxDeps = [

From 8106b948de8f95ec19085c40d7c0b3a2c176d737 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 21:48:42 +0200
Subject: [PATCH 0618/1497] python313Packages.fst-pso: 1.8.1 -> 1.9.0

Changelog: https://github.com/aresio/fst-pso/releases/tag/1.9.0
---
 .../python-modules/fst-pso/default.nix          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/fst-pso/default.nix b/pkgs/development/python-modules/fst-pso/default.nix
index 3096bb743d11..6deb524307de 100644
--- a/pkgs/development/python-modules/fst-pso/default.nix
+++ b/pkgs/development/python-modules/fst-pso/default.nix
@@ -5,21 +5,25 @@
   miniful,
   numpy,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "fst-pso";
-  version = "1.8.1";
-  format = "setuptools";
+  version = "1.9.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-s9FuwnsLTTazWzBq9AwAzQs05eCp4wpx7QJJDolUomo=";
+    pname = "fst_pso";
+    inherit version;
+    hash = "sha256-znf1A/Vcz5ELFGFrpDzdj8O3XEDxpu+mCCb35GfWqN8=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     miniful
     numpy
   ];
@@ -32,7 +36,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Fuzzy Self-Tuning PSO global optimization library";
     homepage = "https://github.com/aresio/fst-pso";
-    license = with licenses; [ lgpl3Only ];
+    changelog = "https://github.com/aresio/fst-pso/releases/tag/${version}";
+    license = licenses.lgpl3Only;
     maintainers = with maintainers; [ fab ];
   };
 }

From 16ca5175592f852e0ebdc4c8fe439d1e4b6f2cf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 00:00:58 +0000
Subject: [PATCH 0619/1497] minio: 2025-03-12T18-04-18Z -> 2025-04-22T22-12-26Z

---
 pkgs/servers/minio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index cd43042c2d97..ff933a65c8c7 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -30,16 +30,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2025-03-12T18-04-18Z";
+  version = "2025-04-22T22-12-26Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-wN8eiBn1XGsaxeuFvJ9KJtL5flBfNq0dYcuIbkgl2Ko=";
+    hash = "sha256-BC633G27Zuhzk4DCLxtMGyWkQyo/3ObaIod7mDLPAqs=";
   };
 
-  vendorHash = "sha256-z8uaMUdboJzQ2pSeG6IGhArnxH40+INrBAjpnmZMdg8=";
+  vendorHash = "sha256-F7texxlSLNVjhlAZPtYYnAd91FIF/BNpq7t1dLaDUpk=";
 
   doCheck = false;
 

From dcd99fdf96a7216f3eebbd291a09a7f1dec6e539 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 07:58:49 +0000
Subject: [PATCH 0620/1497] minio-client: 2025-04-16T18-13-26Z ->
 2025-05-21T01-59-54Z

---
 pkgs/by-name/mi/minio-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix
index a5d1f8d023b8..71372676733d 100644
--- a/pkgs/by-name/mi/minio-client/package.nix
+++ b/pkgs/by-name/mi/minio-client/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "minio-client";
-  version = "2025-04-16T18-13-26Z";
+  version = "2025-05-21T01-59-54Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "sha256-23shNQWVIuTLL0FLM00919JaT2QR4R0ou5ZA2/mQ4PA=";
+    sha256 = "sha256-ss/GqOJz9FNrQzYABb8ePCMcmNVTYVji/Id1WOuu24M=";
   };
 
   vendorHash = "sha256-MpLQZFrf2sBAweXtYeFi5j6p6GaXuN99x+r4UK8D9xM=";

From c793c51b88374446e08937fa7b6eec78c0b0af01 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 2 Jun 2025 21:46:06 +0200
Subject: [PATCH 0621/1497] nixos/minio: replace deprecated mc config host
 command

---
 nixos/tests/minio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index dfe7f169def1..baef07aec993 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -82,7 +82,7 @@ in
 
     # Create a test bucket on the server
     machine.succeed(
-        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
+        "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
     )
     machine.succeed("mc mb minio/test-bucket")
     machine.succeed("${minioPythonScript}")
@@ -101,7 +101,7 @@ in
 
     # Create a test bucket on the server
     machine.succeed(
-        "mc config host add minio https://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
+        "mc alias set minio https://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
     )
     machine.succeed("mc --insecure mb minio/test-bucket")
     machine.succeed("${minioPythonScript} tls")

From 9606441731caf8c5990ad766d35feb37da859b93 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 2 Jun 2025 19:54:27 +0000
Subject: [PATCH 0622/1497] geoclock: remove finalAttrs.pname and hardcode

---
 pkgs/by-name/ge/geoclock/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ge/geoclock/package.nix b/pkgs/by-name/ge/geoclock/package.nix
index d8718f34a680..b4325ed4f7b3 100644
--- a/pkgs/by-name/ge/geoclock/package.nix
+++ b/pkgs/by-name/ge/geoclock/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoHash = "sha256-7mApZj3Ksy8Av0W+0+UZQCkH281bSBd4xo8/7JowmHs=";
-  cargoDepsName = finalAttrs.pname;
+  cargoDepsName = "geoclock";
 
   meta = {
     description = "Displays time as calculated by your longitude";

From 571c42f927de966d438304db07aa2244c8174aff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 19:59:21 +0000
Subject: [PATCH 0623/1497] treesheets: 0-unstable-2025-05-19 ->
 0-unstable-2025-06-02

---
 pkgs/by-name/tr/treesheets/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix
index 9c57eb2a3cbe..9f38024f1abb 100644
--- a/pkgs/by-name/tr/treesheets/package.nix
+++ b/pkgs/by-name/tr/treesheets/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2025-05-19";
+  version = "0-unstable-2025-06-02";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "a64445212a224b48c3daf054433a7ff68906670a";
-    hash = "sha256-o2En1E6MaYZcQLRPl4uU3isM2Q3aiu7mQ88ZJq1vrmo=";
+    rev = "1e6604b6257b41ba518907bfa21c24fa8245c46f";
+    hash = "sha256-zSZ7tMjG5/kSzHifMSA7Wsypv0/x+Oir6jx0I5Fyk2c=";
   };
 
   nativeBuildInputs = [

From e6a46807150cb922fad70fffabd5105a466fde58 Mon Sep 17 00:00:00 2001
From: Andrew Benbow <andrew.benbow@posteo.com>
Date: Mon, 2 Jun 2025 16:02:36 -0400
Subject: [PATCH 0624/1497] maintainers: adding OulipianSummer

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 06888aecad83..b55fd60e502f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18680,6 +18680,12 @@
     github = "Oughie";
     githubId = 123173954;
   };
+  OulipianSummer = {
+    name = "Andrew Benbow";
+    github = "OulipianSummer";
+    githubId = 47955980;
+    email = "abmurrow@duck.com";
+  };
   outfoxxed = {
     name = "outfoxxed";
     email = "nixpkgs@outfoxxed.me";

From 01431ac92d9f767561cfabc50042d5e9be3a3932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 20:03:19 +0000
Subject: [PATCH 0625/1497] mpvScripts.uosc: 5.9.2 -> 5.10.0

---
 pkgs/applications/video/mpv/scripts/uosc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix
index 17ad8b687976..8437d02a85ed 100644
--- a/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -9,14 +9,14 @@
 
 buildLua (finalAttrs: {
   pname = "uosc";
-  version = "5.9.2";
+  version = "5.10.0";
   scriptPath = "src/uosc";
 
   src = fetchFromGitHub {
     owner = "tomasklaen";
     repo = "uosc";
     rev = finalAttrs.version;
-    hash = "sha256-tBSMLzwiKAXdbvyI80ihl0x/ZcDrNd4e7r1g7+CrLgQ=";
+    hash = "sha256-Jj88PkP7hpyUOHsz0w0TOTTdJoQ/ShgJfHg//GUuUvM=";
   };
   passthru.updateScript = gitUpdater { };
 

From abeb33f662ae92b2d9a2d3080c480aef3bff3b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Jun 2025 13:40:33 +0200
Subject: [PATCH 0626/1497] libfaketime: 0.9.10 -> 0.9.11

https://github.com/wolfcw/libfaketime/releases/tag/v0.9.11

Drop the 3 patches, as they're included in this release.

(Detail: The local clang patch also removed "-Werror" from CFLAGS,
compared to upstream, but that seems irrelevant -- the clang build fails
before and after this change. But at least the patchPhase succeeds by
removing the patch.)
---
 .../0001-Remove-unsupported-clang-flags.patch | 13 ----------
 pkgs/by-name/li/libfaketime/package.nix       | 25 ++++---------------
 2 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch

diff --git a/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
deleted file mode 100644
index 7dfad4978005..000000000000
--- a/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 2af4804..bcff809 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -80,7 +80,7 @@ PREFIX ?= /usr/local
- LIBDIRNAME ?= /lib/faketime
- PLATFORM ?=$(shell uname)
- 
--CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
-+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
- ifeq ($(PLATFORM),SunOS)
- CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
- endif
diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 6feb112f8074..faa01d3ae8c3 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -9,33 +9,18 @@
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
     rev = "v${version}";
-    sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
+    sha256 = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
   };
 
-  patches =
-    [
-      ./nix-store-date.patch
-      (fetchpatch {
-        name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
-        url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
-        sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
-      })
-      (fetchpatch {
-        name = "LFS64.patch";
-        url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
-        hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
-      })
-    ]
-    ++ (lib.optionals stdenv.cc.isClang [
-      # https://github.com/wolfcw/libfaketime/issues/277
-      ./0001-Remove-unsupported-clang-flags.patch
-    ]);
+  patches = [
+    ./nix-store-date.patch
+  ];
 
   postPatch = ''
     patchShebangs test src

From 8f79c78d1d9073c81d109d0ef46bf6a1bd05877d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Jun 2025 14:25:31 +0200
Subject: [PATCH 0627/1497] libfaketime: use --replace-fail

---
 pkgs/by-name/li/libfaketime/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index faa01d3ae8c3..9c7847b94567 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     patchShebangs test src
     for a in test/functests/test_exclude_mono.sh src/faketime.c ; do
       substituteInPlace $a \
-        --replace /bin/bash ${stdenv.shell}
+        --replace-fail /bin/bash ${stdenv.shell}
     done
-    substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date
+    substituteInPlace src/faketime.c --replace-fail @DATE_CMD@ ${coreutils}/bin/date
   '';
 
   PREFIX = placeholder "out";

From edb16bf7674f82e322a870822b4b8792da1b79e9 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Tue, 3 Jun 2025 05:07:52 +0900
Subject: [PATCH 0628/1497] ArchiSteamFarm: 6.1.5.2 -> 6.1.6.7

Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.6.7

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 .../misc/ArchiSteamFarm/default.nix           |   4 +-
 .../misc/ArchiSteamFarm/deps.json             | 407 +++++++++---------
 .../misc/ArchiSteamFarm/web-ui/default.nix    |   6 +-
 3 files changed, 201 insertions(+), 216 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index ae52a8f37aa9..148b8dcb777e 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -12,13 +12,13 @@
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.1.5.2";
+  version = "6.1.6.7";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-BETlzGL/5IjXajyyvQtYb0Q0sra4BILSL9fX4BNPNSI=";
+    hash = "sha256-XdnKcWzw/d7yLG2efgw/gQ8UkPjExigffbomTD3YUgE=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json
index c4e14a7559e8..e7af742d589f 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.json
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json
@@ -11,263 +11,263 @@
   },
   {
     "pname": "Humanizer",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-j5g415a02zfIeLXopx3qd0h690ntRNaft3YwpBhsmXE="
   },
   {
     "pname": "Humanizer.Core",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-IfxxqpLbVmVTm9NA0mdcwGYgTbl+CaH0nTMUZNDU/1w="
   },
   {
     "pname": "Humanizer.Core.af",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-b2F23Ntez1spMh+H90P1yIMzTghyLSw6SoQgSoH7MGI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-HlLezoFw1Bc4kQ4RkgLDBRUUr5mYt48DwjRGTO+s7bI="
   },
   {
     "pname": "Humanizer.Core.ar",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-deIHuegZjN178w9bHU3QgG5wUSm3ZeepyHihBdiXbtQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-f3rf+bFcdXs2/jhbUvOKknSkUV4QdFlA/IsY2rX3XYg="
   },
   {
     "pname": "Humanizer.Core.az",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-jFMlxjSVIz2Qiv4DSHK2U8OqyBWL9juQOlB2xrC84YE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-TuKZItSJk3FonM7hltI3gjzvUkGY3dnEm5i/c411oEw="
   },
   {
     "pname": "Humanizer.Core.bg",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MfCHFo3SjU3QScfD/TQuV7FdR18i6EQVb/ophQY/6Yk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KQIxMSWtc6OdDFhBziB/8ii9owzUoF8kvAmNI+wgL08="
   },
   {
     "pname": "Humanizer.Core.bn-BD",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-lBSo0VFbuIagbznWWK7U+ecr3jz7dBGwFvCx3ligXsk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-yXH129xJi37oewDATPSfnMcFa6dJviEK/u50aM12tVw="
   },
   {
     "pname": "Humanizer.Core.cs",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-mhD6davLTy+v1tatG7wBYQdpo204hTKureuVpx8E7MA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-5jUP0tsD8VLrRY9Uja8+QH+U4C3IWlemUoEECaCpt5w="
   },
   {
     "pname": "Humanizer.Core.da",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5mE9JXGhBichj39Ds8ue4NOymzUQIjjJnSO84fZKK+c="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-IoqaQH6b31XXTVqHvFcnTTfHI44cWCUo0Cj9ssBxZTo="
   },
   {
     "pname": "Humanizer.Core.de",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-AknBQzk94LVu2NY2QYJqjCI11pfpLXi2pLgelZCpvds="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-EDO4GYHtgINO0r49VjXX3o3B3mYvcDGTmKOvBHebh2o="
   },
   {
     "pname": "Humanizer.Core.el",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-O8XR1zUP1lk3OFFI1vtwvzXOoLQfN7LxQlR6MEumPKM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-pmnL1t8CBj+HiCQuQ2piOp2ub5jNf8ehXjGIVR2QxOo="
   },
   {
     "pname": "Humanizer.Core.es",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Mp5SZwO5TOhK+wghOxEoKySlH19xx2Vs80pD8zJuWQU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-YUc4qUCwEg8o3aibHBqr/De3X6tPZh4WESimLKTLtIg="
   },
   {
     "pname": "Humanizer.Core.fa",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ONY2tAvoVpGbR3rFUsNfN3ldkjb9okH6GNTN72P983Y="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-2UCx9TETfq8ic37h+7kxDtcTDjR23P958q4rg+cDHe4="
   },
   {
     "pname": "Humanizer.Core.fi-FI",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-NgdDNR8qtQYFx8qBcy3ybPqWRBqKy4w7xrL4F/79SvI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-9VaVmg9c/cLjLO3piDMFT+92la14I/K8QIl7L4z8qeY="
   },
   {
     "pname": "Humanizer.Core.fr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-/aGQGAB4FIZ9P6ah+weq39XOC0MZMGOvhgainLIYvk4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-pATUaMZ+W+S+EnqdrfnA8KEWwfwNiPMd9KBFGG+n89k="
   },
   {
     "pname": "Humanizer.Core.fr-BE",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-bLNidoLR5tZASSP85DCX2QjTPTgqoFZDLsZXov3ec8Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-eBqr+WNi77NM3XxD/imhB9z69pazkeGDZ8Tq/2JZ3tU="
   },
   {
     "pname": "Humanizer.Core.he",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Ef0yaO9mbcHqpUhruZpWZgGcLtEZEu4yRC0nvujTOKQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-dDmmG8lTEAyeLy2Twsq7FgyN+iXbOzorHwrmbrBbyX4="
   },
   {
     "pname": "Humanizer.Core.hr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Loifax8U+8ho/Gyw2NcwNFywleKYNB1Hr9waTHGjmrg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-JXN3Di1KCE8XXZG6Im3LX2MUYRGP+7vgdh5BYNX1qNQ="
   },
   {
     "pname": "Humanizer.Core.hu",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-tPgZGD2AE68c67Rrpo5PK15q9ZXP7RwttaGwGfUp4lU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-zIvOmEc9dTuK2eUc3NoGHSf4NW1Py2jyNWcQnSwz8FU="
   },
   {
     "pname": "Humanizer.Core.hy",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-YWwDuwrilm22gzCMui+u71Q+FVg/kMxVa8xCX2v+isU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KcRfspYR53gLZwXkiOxLge6EVJYAOYvJ0JOg3k7K1jA="
   },
   {
     "pname": "Humanizer.Core.id",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-SZYleWmQ10OguOylRlgct7TVN8Sc2vrs4g492fteghM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-kV3cNRjmAc0ES+mbi1pGdNRETCUD561xpVw+MCxGfuw="
   },
   {
     "pname": "Humanizer.Core.is",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-7xIFwbQqqcFZhJFgQGgcDj0aS9GCkzk5hoxpUSPVfG0="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-YQnowTdXsOS68t6Dw49Lbe++h3nGW74ycqd+fNHpGXU="
   },
   {
     "pname": "Humanizer.Core.it",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ckKN4D4Ae/TsxytAeqznNMgzT+Jv82x2MQSnZJMios4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-ukEwnf2qgXnIG1HLbKgBsxGO5doNbsSa4QUEGvlwoK4="
   },
   {
     "pname": "Humanizer.Core.ja",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-kHZAfhn8FXJTND/09ue7wpD7WpGxCWHHpn0CgypJLqw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Xb1JtMPGOIoWJ+ZxJe2Y0Xarjh8OyummCjRvvSQtkRo="
   },
   {
     "pname": "Humanizer.Core.ko-KR",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-zLT2nlRba85r85s2Bt9WSJwuueYSr3xLwJHOW8Soy20="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-1qMa6+AioW2jEvofeGbVlClV35E/hCqa7tK+u/WospA="
   },
   {
     "pname": "Humanizer.Core.ku",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-Ef+QUC0b3kE6HmTa8CQinsHyd+ehpFlFxtmr5A/E9dE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-fCmhmrg6OpKY4un34jXrtfhJVIGTb9njmqaARc1oFsw="
   },
   {
     "pname": "Humanizer.Core.lb",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5hP1M9H+6uo7inDJMYNAjo0r/V3lIPb3mnmUKFe+CCw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-TtoGk0HVyMJZS6T0RBtjJo+ZnPBh1F7dyBGOjmzsw3U="
   },
   {
     "pname": "Humanizer.Core.lt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-SVDSW5CLqGL0SzqIJF+LbPuKmD/92CA/xjgsDXucNc8="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-3YvbbXkg3Ys2Wyr11e8PimW7VKGnfnwhpLJgBHEZBXk="
   },
   {
     "pname": "Humanizer.Core.lv",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-idNNH20jP++HlWli9FAcNoDsGz4Tc5UST4gxlb/ZvJA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-9ETnR+b4opyt+cGINZUjxu/p6p0R9VAUt7GFwOLaip8="
   },
   {
     "pname": "Humanizer.Core.ms-MY",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-aOrRmEDXCbN9Fmf0uUFn2zFePDT1uC6/gvqEThH4Frg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-iTLujZifN53wwK13W0UfE4/4YwrHtPsOpoy93pp84zs="
   },
   {
     "pname": "Humanizer.Core.mt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-B5mZrT0iTnfcxAOWNXt+SOXYi1klCqjPiP58p05gfFs="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-swb9rDwpOUxQA+0bDRuHUoSi8IlVWwhKh4IOWUXj5XA="
   },
   {
     "pname": "Humanizer.Core.nb",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-+vGxff/C9l6P40MCy24ZEcS+GwlYQoBCjOv1TgX7ZZ0="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-fgfkXoLB20nZ2+9Fk//f92wtgFzzGlGgOUIaq1ZEAj8="
   },
   {
     "pname": "Humanizer.Core.nb-NO",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-PdAieSuOp883+5fQY4OQYhMXgclTaX7RYSRQgmJcuWM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KV5xFk0yb5M8FVx+gNYB55T9ZXrxiUKtAPQ/Jp2BfHM="
   },
   {
     "pname": "Humanizer.Core.nl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-hwpUHNioWLXOAPePZ6atdfm9B2mrv3YDUinxtp5l5cQ="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-C0yQ30cv2O0qblHIqxXGfo4g1tsWn/OAth74395/PqY="
   },
   {
     "pname": "Humanizer.Core.pl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MTxJ+XGfR/ShDV5HlI5iOQ8fJpwhLuk+ELwipgz/SYM="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-psyNq8gVxLd+V504bUsak4sBeAMwu+LkDn10LFFTdfY="
   },
   {
     "pname": "Humanizer.Core.pt",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-cshgIqnIU+28cIKiGX4aojdDdAVu0Y3oTo9LPfuuxmk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-EvE2a92ATKLnYVeRKqiTcf+fbTl+GQzGzUy446QMZzk="
   },
   {
     "pname": "Humanizer.Core.ro",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-1RsFju1P3XCi+12zWH9jVhp3iQ1htPCq4A3DIE/dErI="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-15OBdIvHGNcadJPDR0KXS0S7qwKqKlkw6QyBz+mXoX0="
   },
   {
     "pname": "Humanizer.Core.ru",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-c5Ll2kUZm1vhDfkIblW2yi+MmQTSCrDmjaS9FkC63nc="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-uOeT1nJNfjCED8bH1yjfnNjVu6GQyEN1cveH17DwdhI="
   },
   {
     "pname": "Humanizer.Core.sk",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-MeFFOBinomAJ1aooldh2BfFi2jKl4gsf3rF6sqHiRRE="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-RfYnf8vo0LDa9PQh3x2W2h1afyz38eodZL79LVkmUG0="
   },
   {
     "pname": "Humanizer.Core.sl",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-ggOLhhI8RcjmG4nG6vJVK4EbubN/Mw1l1n8CchgMZJc="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Ef8LiqVKu2KBJfjk1rMhMCE5BFoqMlbBTv5gw3RUgb8="
   },
   {
     "pname": "Humanizer.Core.sr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-05yA3P0VMmRFfq0v0hCItNuYt++LDkBCk7ScYa3UOXw="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-SJKf2sbJbNIDoHR2zq9ZiLaOmkeCNEj89xY6E2TiTkY="
   },
   {
     "pname": "Humanizer.Core.sr-Latn",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-62kozBOCEdLM1W1AzqsoMHGtU3S3msK2uGTm7qxCf5Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-VjVVDD9vXrIX6EKXTAeDKpURngMUTHvMKPf+QUUee+k="
   },
   {
     "pname": "Humanizer.Core.sv",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-g+t6p+0AqyptEHkc+a1HKm77vBggMTNeqQf6KjeuygU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-BcUiRvxzIufCtvGohMRx11ylzCChkROXZqWGQoxx/BA="
   },
   {
     "pname": "Humanizer.Core.th-TH",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-mGYaSb8TaThiJc+iJ1mj6zjzQOjQSbTlaGs4mZyAiQA="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-KXRnY+8aia06+A2akruD8H3NVNrHDaHafn0gqku5bMA="
   },
   {
     "pname": "Humanizer.Core.tr",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-NOeZorj9vNpsImBcUjqlc7bN1bugS1rS1/4QVV8oYMk="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Xhm8K2sON5tzLvSXT5xrV+9WLIRqGkL8GL5xHijYlFQ="
   },
   {
     "pname": "Humanizer.Core.uk",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-fY/xIRXhIWofcCQg3aBJ9Jue0A8p1K7qEZjwGsJKpQ4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-LJHY8KUSt0DY6gaTa+MTjhB6FjPnpaGf0nHn0hurctE="
   },
   {
     "pname": "Humanizer.Core.uz-Cyrl-UZ",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-vnFy9SKfYZXM0o824X1/bgoux+r0zCbblcYx7yj0PQU="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-Ac43MMgr9RWEaDDiR+omXNMVN6NyQcfBdrrhI7ONRDA="
   },
   {
     "pname": "Humanizer.Core.uz-Latn-UZ",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-5xUO7jqWUeq5OSNiiORBf/5Wa9faV8e0D0NQahGn4S4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-PpnNZYmPmvozYS9QvKrIF9KmC2oq/uQBpoV19G/aUkI="
   },
   {
     "pname": "Humanizer.Core.vi",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-rcCMfEmpjuUTF5rOG0mAoq8JtV5Rk4QNxAvaW+TD9O4="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-WwcEnOxByumQ+C4JbyNMWoGwbdfFkcagCqzsA1C+NLQ="
   },
   {
     "pname": "Humanizer.Core.zh-CN",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-wO6VmvPVAo1sIXH5A8O3qMG0KXtl3odD4RM4saioMSU="
   },
   {
     "pname": "Humanizer.Core.zh-Hans",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-SjsgFJeB1m4p0J3TnOLdU7IEsSygh8/rIcYKcVl3ukQ="
   },
   {
     "pname": "Humanizer.Core.zh-Hant",
-    "version": "3.0.0-beta.54",
-    "hash": "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="
+    "version": "3.0.0-beta.96",
+    "hash": "sha256-nJm/yE6j3eRPLzQxD9AZaZC+P4cidSR6XEsuTDBV/Dw="
   },
   {
     "pname": "JetBrains.Annotations",
@@ -276,18 +276,18 @@
   },
   {
     "pname": "Markdig.Signed",
-    "version": "0.41.0",
-    "hash": "sha256-fFAfiC6UVrirA/I11urHK4z08iF96Rkez/3HtTmleDs="
+    "version": "0.41.1",
+    "hash": "sha256-A8dOAwZ9hMVPk8xZBaJOo0gu5Z01JQZiz0uZbIZA2eU="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
-    "version": "2.22.0",
-    "hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
+    "version": "2.23.0",
+    "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "9.0.4",
-    "hash": "sha256-TGyUwcxFsEDYvOTj+GBmhbkkb2vqe3Ver1Y8AqP7/x8="
+    "version": "9.0.5",
+    "hash": "sha256-v2T37X1dm/NG0ZJWk6cXB9lf8tOc6JI4uxFPqmV7ne0="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -296,8 +296,8 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
-    "version": "3.11.0-beta1.25123.3",
-    "hash": "sha256-FcW0EmA3dJfuV/rStaq47uSUkXV6jlmY1HCbvhpRbL4="
+    "version": "3.11.0-beta1.25173.3",
+    "hash": "sha256-AB7O5x6MmQ7lgPx8W8fYyOkEDnsxSoHjgpawV3/CGEc="
   },
   {
     "pname": "Microsoft.CodeCoverage",
@@ -344,11 +344,6 @@
     "version": "8.0.0",
     "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "9.0.0",
@@ -356,8 +351,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "6.0.1",
-    "hash": "sha256-ArXJ7mfSywrfif29cfkeaXL1s0soZSi+RZgAimukqNw="
+    "version": "6.0.2",
+    "hash": "sha256-WVM/gshGie1J9q5l3YWRzrPWYlVvX6ISI+SiVMoPp5o="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
@@ -394,11 +389,6 @@
     "version": "8.0.0",
     "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
   },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
-  },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
     "version": "9.0.0",
@@ -441,23 +431,23 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.8.0",
-    "hash": "sha256-UwRAN/yuGF5vss7vDHIxlLjn0kKGVPmN5ga3GQP2TF0="
+    "version": "8.11.0",
+    "hash": "sha256-qTBsPDE2FD/JA/n7P9g5FQPu7whUyX1X2HS62StxfLM="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.8.0",
-    "hash": "sha256-9eMcoTMyWb+4ZLxGxwa2BSQG1/nYR5TwLvuivXXsOjU="
+    "version": "8.11.0",
+    "hash": "sha256-JayQNiEiMsvpoAM993VNfJOyAYkatRoFBuLO+ZBzBGo="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.8.0",
-    "hash": "sha256-uKsTmgcGgjxAIIWt03XU0ecL5Zpdu2lcI7cIbyWDxtM="
+    "version": "8.11.0",
+    "hash": "sha256-aBJSBytPxw+t68O94B8Sj+PjtBi9c2Csy5x7xyVV4m8="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.8.0",
-    "hash": "sha256-MSChrqqB6LtJzhX5hSvdokHmZhlN05g2aK6CT1By8E8="
+    "version": "8.11.0",
+    "hash": "sha256-9sg63wXOJa2HrQBsC3w0vXsWww7FvCnjrtoaf7OsyuA="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
@@ -476,43 +466,48 @@
   },
   {
     "pname": "Microsoft.Testing.Extensions.CodeCoverage",
-    "version": "17.13.1",
-    "hash": "sha256-m74V71udgx4OZScpfyVeA0Oj5JKIvdU1W5wzXyeUHLQ="
+    "version": "17.14.2",
+    "hash": "sha256-sWmVaw72mtdUAi/xGNd/MSOVDxs6vlH0xC7g4Pr7oik="
   },
   {
     "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.6.3",
-    "hash": "sha256-DVwTXRoWHt8Ybfz1gv/TzmX6VfxaUp9lGghDEoby0dg="
+    "version": "1.7.1",
+    "hash": "sha256-HpIgMY0LRyeeipkW+rjhsqZnso3bWUTP5GZ4EJfkR0w="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport",
-    "version": "1.6.3",
-    "hash": "sha256-RX5m9VaXaAnmxQces8Knru7r4iHEC+EZMB0KYeXCcrc="
+    "version": "1.7.1",
+    "hash": "sha256-LrNo9GKe7cFL7JXKU4h1jpiGxp5465MRJFWhErfOYOs="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.6.3",
-    "hash": "sha256-gv7aCP029oku6xwYKclY5hI+ewShrk4tVFbDEND4FJI="
+    "version": "1.7.1",
+    "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk="
   },
   {
     "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.6.3",
-    "hash": "sha256-4FTZCHdI9WZwd3ejeFCVbx5O0UWLJwKJc6NduUQu0XE="
+    "version": "1.7.1",
+    "hash": "sha256-6o3qqXK6dxybHybl2k/aY2flxPc2z/1VQMWQPm2Ns0g="
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.4.3",
-    "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww="
+    "version": "1.6.2",
+    "hash": "sha256-RfdgATa3aTYLpGfv8ORI5uEP8dH87L5/gBDkxAG6ho4="
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.6.3",
-    "hash": "sha256-WJD2zC0b1jU5DRAFG3XmHiQJKdKnjDQB3xbdRmv8V9Q="
+    "version": "1.7.1",
+    "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4="
   },
   {
     "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.6.3",
-    "hash": "sha256-JK8l4K4uSO6mgsZ6Lo/Sv4VjaLGZjD5g/oZYy0iAYDs="
+    "version": "1.7.1",
+    "hash": "sha256-j/JO5dVIHWTbUO12ZZJdQ5CB2TcBqGfZTcmVFuT3nyA="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.AdapterUtilities",
+    "version": "17.13.0",
+    "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
@@ -531,34 +526,29 @@
   },
   {
     "pname": "MSTest",
-    "version": "3.8.3",
-    "hash": "sha256-Y9cVTLCQjO6j/P7Dq4/zWrF7EsVgQVnDTs5otXHzGkM="
+    "version": "3.9.1",
+    "hash": "sha256-7gpZKkbGRA4kjUMHrE5pgM3jQhzYQxO3RB5OfDz0Ed4="
   },
   {
     "pname": "MSTest.Analyzers",
-    "version": "3.8.3",
-    "hash": "sha256-/Nf6E5zQib741BKu4IwRBz36lW9+krWLy2904MT3O1M="
+    "version": "3.9.1",
+    "hash": "sha256-jr5UOnoX2mHFjMgo/e//4Fi736mkaYj6ChFuwP8jC2w="
   },
   {
     "pname": "MSTest.TestAdapter",
-    "version": "3.8.3",
-    "hash": "sha256-pBfg41vnc9z1W2uMuXRUnulGycyXJpBATsBHEiOi9mg="
+    "version": "3.9.1",
+    "hash": "sha256-nlX47U5Yxds0BXJtwWtMPY+HbEFO8TRr7yC+GS1laxU="
   },
   {
     "pname": "MSTest.TestFramework",
-    "version": "3.8.3",
-    "hash": "sha256-3dhd6vk2KdMwe+JNSoUZZ4+P04jPKBl3HTuc9ZXBTlw="
+    "version": "3.9.1",
+    "hash": "sha256-ORwTveV9nPnx4s9av8EFt8MQ4G0pF9M8Ped/ibZXvG4="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.1",
     "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
   },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
-  },
   {
     "pname": "Nito.AsyncEx.Coordination",
     "version": "5.1.2",
@@ -581,23 +571,23 @@
   },
   {
     "pname": "NLog",
-    "version": "5.4.0",
-    "hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
+    "version": "5.5.0",
+    "hash": "sha256-WkuKGo3iEqJruQuRZXMksqIbAQjZbFIANcm0zZr/fYE="
   },
   {
     "pname": "NLog.Extensions.Logging",
-    "version": "5.4.0",
-    "hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
+    "version": "5.5.0",
+    "hash": "sha256-gdhJP9V5lDHgRS8gpFDgW6CkkLKo+tACCqPvERLaZ68="
   },
   {
     "pname": "NLog.Web.AspNetCore",
-    "version": "5.4.0",
-    "hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk="
+    "version": "5.5.0",
+    "hash": "sha256-1n8wzNMBIVoLjDlFUyNO7lsunz6E8LlBHpokDFrLjA8="
   },
   {
     "pname": "OpenTelemetry",
-    "version": "1.11.2",
-    "hash": "sha256-sQAmDGH6rQSYWNCaqgyP7qWdDciAh+IKHf4IXFwuMq4="
+    "version": "1.12.0",
+    "hash": "sha256-WqUAXbwHyoksigzEgYnHNONl2TLd0ZM5MJ6jDsbYxas="
   },
   {
     "pname": "OpenTelemetry",
@@ -606,13 +596,13 @@
   },
   {
     "pname": "OpenTelemetry.Api",
-    "version": "1.11.2",
-    "hash": "sha256-LfsXbTxVR8f524bvIsIbLtQYxOtun4Bm3Me6IpxbvOw="
+    "version": "1.12.0",
+    "hash": "sha256-nw7Y84b98RFoL9eHip2Moz5sLHt3cDUDznYZLu3OCXU="
   },
   {
     "pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
-    "version": "1.11.2",
-    "hash": "sha256-p6moAb53XhkKlZ5LAy3RXPFtYFUqtOidyKJg6xzagRY="
+    "version": "1.12.0",
+    "hash": "sha256-HW5lCuHZgkh0SO94cJLcjfX3M0dJDV0xJIRV2pY0jXc="
   },
   {
     "pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
@@ -626,23 +616,23 @@
   },
   {
     "pname": "OpenTelemetry.Extensions.Hosting",
-    "version": "1.11.2",
-    "hash": "sha256-z2o0gfQSZKrRDJfKrs70jmJaK3/oTqW+LSD/b+alF78="
+    "version": "1.12.0",
+    "hash": "sha256-TbZ0XXPWa84m9810x7XQmxccWZmGnE8PM4rwG+88dmg="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.AspNetCore",
-    "version": "1.11.1",
-    "hash": "sha256-aTXVd+zdEMJFNdRDGg01PyP4vhpDl9tpTm5GlQ2oTxU="
+    "version": "1.12.0",
+    "hash": "sha256-38FaYhE33hu053RJq0pdlsCQScDU6cwONWX2UAFJeWM="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Http",
-    "version": "1.11.1",
-    "hash": "sha256-9bqehwixulMrjXt/ZFEosHLt6CIikLzzrdHFP5gNbzo="
+    "version": "1.12.0",
+    "hash": "sha256-3OVK3iC4k1KXwEZ4OsVJYwldQqzq6YuxL61oY7aaenE="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Runtime",
-    "version": "1.11.1",
-    "hash": "sha256-ssHSQx/O590o/25vy+BB4KH1ChIVzQjDnwW2LnGlkm0="
+    "version": "1.12.0",
+    "hash": "sha256-aGKGcW6Cb2MS64oLG+aZVNRle3YUtAcopSbYQ2Z51PE="
   },
   {
     "pname": "protobuf-net",
@@ -656,13 +646,13 @@
   },
   {
     "pname": "Scalar.AspNetCore",
-    "version": "2.2.1",
-    "hash": "sha256-dnxwn7KG02ko7QWSXf5xclfQSDg1OhqlnaWD6Le0Yfk="
+    "version": "2.4.4",
+    "hash": "sha256-MyNRQMFXIRf6znM3SL3P+Z8jO+3Q5i23TDQuG+ZUcTY="
   },
   {
     "pname": "SteamKit2",
-    "version": "3.1.0",
-    "hash": "sha256-Lpz0OQrKQW0AMrt9wvK4tO/NjJdHvXvlt+jitKrphVA="
+    "version": "3.2.0",
+    "hash": "sha256-hB/36fP9kf+1mIx+hTELUMHe8ZkmSKxOK41ZzOaBa3E="
   },
   {
     "pname": "System.Buffers",
@@ -681,33 +671,33 @@
   },
   {
     "pname": "System.Composition",
-    "version": "9.0.4",
-    "hash": "sha256-Ec1PdqzxQOaNsnonimmpyq5f5+Wa+lvWdR0Je3/a2OI="
+    "version": "9.0.5",
+    "hash": "sha256-Y8MPR8xot93lo4jAgVJ101M+JN973CpvOlCSYUK7wxc="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "9.0.4",
-    "hash": "sha256-r71EJF5F5ZjAgkuvcI00tAnnIrK+IQ5Wj7wU8MwwRRQ="
+    "version": "9.0.5",
+    "hash": "sha256-CkqRwQGCRteSmN+nRF0rm8wGf2QA7gfqsVF8lBTg9EE="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "9.0.4",
-    "hash": "sha256-BfLOq0FSx1QVfT2mqcqU/nfvgIJA+tf3Ng0CxHx1GG4="
+    "version": "9.0.5",
+    "hash": "sha256-iaSaDpiep+8dthACDpgN0GJ5jRqLVzCVEKNOHUuy3/0="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "9.0.4",
-    "hash": "sha256-+ep0Y2ptrKsb3JlArfhKndUuoBVrS1f59okbdKRKVYQ="
+    "version": "9.0.5",
+    "hash": "sha256-P98I/5Vs08bDObpicSzHXigXiadJA5uIKqd78WABU40="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "9.0.4",
-    "hash": "sha256-ztqnugik7Ye70YDQGvgPWfovFbHZ2R2tFSWZf8IGcMM="
+    "version": "9.0.5",
+    "hash": "sha256-o4yiU61i6X2Tn20pUrf/psESngE/nGHTlJSe4S7qIQ0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "9.0.4",
-    "hash": "sha256-WFw1we/U8o14HNXwwVW4lggCpekb2c/ptpO8LbWYBr8="
+    "version": "9.0.5",
+    "hash": "sha256-+09hA4PfsR9BLHkV1aadh8Jx10AwcFrG+49U0vMATPU="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
@@ -734,11 +724,6 @@
     "version": "4.5.4",
     "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
-  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
@@ -761,8 +746,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.4",
-    "hash": "sha256-VSlwaKi5WU6J0LYVh/hFfZuSkCG4V99MH2iLwspTrYA="
+    "version": "9.0.5",
+    "hash": "sha256-Ed2Ea4ssYYHBBeFs0Vva+G8lEF5VFcm+DWJl/xi7arY="
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -771,17 +756,17 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "6.0.0",
-    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+    "version": "6.0.1",
+    "hash": "sha256-l3oKwZStjew/ClSrDaVLyHDAExoP6Iwm6uqJSdI9YJo="
   },
   {
     "pname": "System.Text.Json",
-    "version": "6.0.10",
-    "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
+    "version": "6.0.11",
+    "hash": "sha256-KsgOU3RvSN/Kc+my45K0eua4owQPZar81LVF2Kzupf0="
   },
   {
-    "pname": "System.ValueTuple",
-    "version": "4.5.0",
-    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.5",
+    "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI="
   }
 ]
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index a5119a758495..059051c06594 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -7,7 +7,7 @@
 
 buildNpmPackage rec {
   pname = "asf-ui";
-  version = "6f0393c091d04ecb69dff790f6146cc375b71268";
+  version = "9920764dafb0a7a87c355d9c87aff285e41494be";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
@@ -15,10 +15,10 @@ buildNpmPackage rec {
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
     rev = version;
-    hash = "sha256-Mj7ubIB84gCE/Y3ZzISQ4coGLGZfg4curuBYQdRWiUY=";
+    hash = "sha256-w4pYFCdJiHocy41az4/tjWdBwAdI68RV/N8I0Onsofg=";
   };
 
-  npmDepsHash = "sha256-b5L1Lcmehv8aheFaYp0iPyNhwekOiq8J4rVaE4/Oqj4=";
+  npmDepsHash = "sha256-V9u+n4CTB+BU0zeiB8vLpFkI2VJGArU6WL+PFfi624M=";
 
   installPhase = ''
     runHook preInstall

From 90c03df84e12b15c82293be13be3a6e6d5a737e4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 2 Jun 2025 20:11:49 +0000
Subject: [PATCH 0629/1497] podman-desktop: Remove usage of finalAttrs.pname

---
 pkgs/by-name/po/podman-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 127b683dece6..ad256b2253f9 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (nix-update-script { })
     (lib.getExe (writeShellApplication {
-      name = "${finalAttrs.pname}-dependencies-updater";
+      name = "podman-desktop-dependencies-updater";
       runtimeInputs = [
         nix
         jq
         gnugrep
       ];
       runtimeEnv = {
-        PNAME = finalAttrs.pname;
+        PNAME = "podman-desktop";
         PKG_FILE = builtins.toString ./package.nix;
       };
       text = ''

From 54a9c1f2532d46767f1827b0f77bdc0953f720b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 22:18:21 +0200
Subject: [PATCH 0630/1497] python313Packages.pyfume: relax fst-pso

---
 pkgs/development/python-modules/pyfume/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyfume/default.nix b/pkgs/development/python-modules/pyfume/default.nix
index b79bf238d48c..e6649fb17153 100644
--- a/pkgs/development/python-modules/pyfume/default.nix
+++ b/pkgs/development/python-modules/pyfume/default.nix
@@ -27,6 +27,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools ];
 
   pythonRelaxDeps = [
+    "fst-pso"
     "numpy"
     "pandas"
     "scipy"
@@ -50,7 +51,7 @@ buildPythonPackage rec {
     description = "Python package for fuzzy model estimation";
     homepage = "https://github.com/CaroFuchs/pyFUME";
     changelog = "https://github.com/CaroFuchs/pyFUME/releases/tag/${version}";
-    license = with licenses; [ gpl3Only ];
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
   };
 }

From 871263f41e0c3c53cc314255fa836fcfdbd3a6be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 20:35:56 +0000
Subject: [PATCH 0631/1497] python3Packages.google-cloud-dlp: 3.29.0 -> 3.30.0

---
 pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 87e39d057cb1..56e170020fb0 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.29.0";
+  version = "3.30.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_dlp";
     inherit version;
-    hash = "sha256-FbNmneFjhZmqq17EMeNsiOSCq98+JODhAJDEzHabLiA=";
+    hash = "sha256-qTCw9C4ULzapSjGptsr5uFL4ThUpROTxsx2ICZCx6H0=";
   };
 
   build-system = [ setuptools ];

From 5680270f6e4e790706ddf9546ec795878e8a47c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 22:41:15 +0200
Subject: [PATCH 0632/1497] python313Packages.yara-python: 4.5.2 -> 4.5.4

Diff: VirusTotal/yara-python@refs/tags/v4.5.2...refs/tags/v4.5.4

Changelog: https://github.com/VirusTotal/yara-python/releases/tag/v4.5.4
---
 pkgs/development/python-modules/yara-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix
index aa3eea2d1975..c0e1bae93728 100644
--- a/pkgs/development/python-modules/yara-python/default.nix
+++ b/pkgs/development/python-modules/yara-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "yara-python";
-  version = "4.5.2";
+  version = "4.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "yara-python";
     tag = "v${version}";
-    hash = "sha256-RXqazMg78eGxA4JPUqSx0PTcNDmrGjBt5m6OJTmshNU=";
+    hash = "sha256-2ZwLpkT46KNTQ1ymvMGjnrfHQaIy/rXid0kXoCBixXA=";
   };
 
   # undefined symbol: yr_finalize

From cf11813ecb4de3f2c2464d592000d2845df73777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 20:44:42 +0000
Subject: [PATCH 0633/1497] gildas: 20250501_a -> 20250601_a

---
 pkgs/by-name/gi/gildas/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index 0669b77c7881..c6ca9514111a 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -24,8 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "may25a";
-  version = "20250501_a";
+  srcVersion = "jun25a";
+  version = "20250601_a";
   pname = "gildas";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
     ];
-    hash = "sha256-ofcuwc4vIKLbY/2uRqWG4sdrm9N0hpqz6zYwkZyySWo=";
+    hash = "sha256-DhUGaG96bsZ1NGfDQEujtiM0AUwZBMD42uRpRWI5DX0=";
   };
 
   nativeBuildInputs = [

From 6591213349c4a2b24acbcd5389f53281ef057fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 2 Jun 2025 22:47:21 +0200
Subject: [PATCH 0634/1497] nixos/glance: clarify settings _secret

---
 nixos/modules/services/web-apps/glance.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index ff5fd1195639..6b1512323690 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -100,10 +100,8 @@ in
         for more.
 
         Settings containing secret data should be set to an
-        attribute set containing the attribute
-        <literal>_secret</literal> - a string pointing to a file
-        containing the value the option should be set to. See the
-        example in `services.glance.settings.pages` at the weather widget
+        attribute set with this format: `{ _secret = "/path/to/secret"; }`.
+        See the example in `services.glance.settings.pages` at the weather widget
         with a location secret to get a better picture of this.
       '';
     };

From 3eaa9f140e97769672494c77ed0c8f1380989daf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 20:48:31 +0000
Subject: [PATCH 0635/1497] maa-assistant-arknights: 5.16.9 -> 5.16.10

---
 pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
index ec43cd01494a..7904f82f9503 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json
+++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
@@ -1,10 +1,10 @@
 {
   "stable": {
-    "version": "5.16.9",
-    "hash": "sha256-D6ea+fDffOxAPf9+dCOjbr9+meXdOEUN+1BAicO2xhc="
+    "version": "5.16.10",
+    "hash": "sha256-H3RW2SikKCYhmDsoID5Kye9qq6lAbuu8tedzCHuybis="
   },
   "beta": {
-    "version": "5.16.9",
-    "hash": "sha256-D6ea+fDffOxAPf9+dCOjbr9+meXdOEUN+1BAicO2xhc="
+    "version": "5.17.0-beta.1",
+    "hash": "sha256-qBfy7M5jqf4aPT5kcdzLm6HFZKn8KfYeZVaZvfY9rAg="
   }
 }

From 4ffae91638333adf921386b0540f3d86873ed787 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 22:52:29 +0200
Subject: [PATCH 0636/1497] python313Packages.notus-scanner: 22.7.1 -> 22.7.2

Diff: https://github.com/greenbone/notus-scanner/compare/refs/tags/v22.7.1...refs/tags/v22.7.2

Changelog: https://github.com/greenbone/notus-scanner/releases/tag/v22.7.2
---
 pkgs/development/python-modules/notus-scanner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 5da6021893c1..f7d6ae2eff5c 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "notus-scanner";
-  version = "22.7.1";
+  version = "22.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "notus-scanner";
     tag = "v${version}";
-    hash = "sha256-iTcGo33GRf+CihSRuK1GFXOpYL6TT8e3CRyK2/AA38U=";
+    hash = "sha256-JKDnqgEBzEIOI3WIh+SOycACFaYZoZHy7tPFirltDiM=";
   };
 
   pythonRelaxDeps = [

From 7334e2234a8bf070944409fc08a0b54d5967d960 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 22:53:09 +0200
Subject: [PATCH 0637/1497] python313Packages.pyexploitdb: 0.2.82 -> 0.2.83

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index b283032a9ff3..af792d4bb146 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.82";
+  version = "0.2.83";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-SA/7tQDYcpGKQQr/eD5U3sJUqxk/JW+NR5tv18Qijhg=";
+    hash = "sha256-G28FUHSLs4ALlOiybS2rDc0ZzGYYaeaSrYujVyiar60=";
   };
 
   build-system = [ setuptools ];

From 943ed0a2201735e5687fc602302467774202d43e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 20:54:56 +0000
Subject: [PATCH 0638/1497] python3Packages.simsimd: 6.4.4 -> 6.4.7

---
 pkgs/development/python-modules/simsimd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index 9302bb24ee82..d01b7de53831 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.4.4";
+  version = "6.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "simsimd";
     tag = "v${version}";
-    hash = "sha256-lOE8ZQlUZ0Y+3Lpm4H/ps4o0YO9k245lADxrfR3oI1E=";
+    hash = "sha256-FM1ge3opt0hwVSjNQWOAYeG6tDIwVLSbu9mZOJBxvJY=";
   };
 
   build-system = [

From e0fd22c6fef3ae2c74d36668422d08d765a405ca Mon Sep 17 00:00:00 2001
From: Andrew Benbow <andrew.benbow@posteo.com>
Date: Mon, 2 Jun 2025 16:55:51 -0400
Subject: [PATCH 0639/1497] drupal: init at 11.1.7

---
 pkgs/by-name/dr/drupal/package.nix | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/dr/drupal/package.nix

diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix
new file mode 100644
index 000000000000..057c67f3afc3
--- /dev/null
+++ b/pkgs/by-name/dr/drupal/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitLab,
+  php,
+  nixosTests,
+}:
+
+php.buildComposerProject2 (finalAttrs: {
+  pname = "drupal";
+  version = "11.1.7";
+
+  src = fetchFromGitLab {
+    domain = "git.drupalcode.org";
+    owner = "project";
+    repo = "drupal";
+    tag = finalAttrs.version;
+    hash = "sha256-jf28r44VDP9MzShoJMFD+6xSUcKBRGYJ1/ruQ3nGTRE=";
+  };
+
+  vendorHash = "sha256-LUZTf/Zn8p+V2K1LjhvrgaGBiTcSmGRsG1t9vXUcbeY=";
+  composerNoPlugins = false;
+
+  passthru = {
+    tests = {
+      inherit (nixosTests) drupal;
+    };
+  };
+
+  meta = {
+    description = "Drupal CMS";
+    license = lib.licenses.mit;
+    homepage = "https://drupal.org/";
+    maintainers = with lib.maintainers; [
+      drupol
+      OulipianSummer
+    ];
+    platforms = php.meta.platforms;
+  };
+})

From 2e2c2dea98b442fda3b79eaeff80cb1a7beade1d Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 3 Jun 2025 04:56:21 +0800
Subject: [PATCH 0640/1497] deskflow: 1.21.2 -> 1.22.0

---
 pkgs/by-name/de/deskflow/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index 9418d41ab034..36d8a1f03eb3 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deskflow";
-  version = "1.21.2";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "deskflow";
     repo = "deskflow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gXFBn8hlI8MZ9Vy3goPjosn0JgvaAgZaFIGh/3rFdx8=";
+    hash = "sha256-tNHQHReeOUc5lCs4dI3a5UzeJao+RPWXH4KdWhPwESI=";
   };
 
   postPatch = ''
@@ -101,13 +101,21 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preCheck
 
     export QT_QPA_PLATFORM=offscreen
-    ./bin/unittests
-    ./bin/integtests
+    ./bin/legacytests
 
     runHook postCheck
   '';
 
-  passthru.updateScript = nix-update-script { };
+  postInstall = ''
+    install -Dm644 ../README.md ../doc/configuration.md -t $out/share/doc/deskflow
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };
 
   meta = {
     homepage = "https://github.com/deskflow/deskflow";
@@ -117,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib; [
       licenses.gpl2Plus
       licenses.openssl
+      licenses.mit # share/applications/org.deskflow.deskflow.desktop
     ];
     platforms = lib.platforms.linux;
   };

From 223d142ea085c2a8f1afcd5a0a6885c749b41635 Mon Sep 17 00:00:00 2001
From: Andrew Benbow <andrew.benbow@posteo.com>
Date: Mon, 2 Jun 2025 16:56:22 -0400
Subject: [PATCH 0641/1497] nixos/drupal: init

---
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/web-apps/drupal.nix | 478 +++++++++++++++++++++
 nixos/tests/all-tests.nix                  |   1 +
 nixos/tests/drupal.nix                     |  27 ++
 4 files changed, 507 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/drupal.nix
 create mode 100644 nixos/tests/drupal.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 79f5c22f5b98..6b2e1ae03f44 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1533,6 +1533,7 @@
   ./services/web-apps/documize.nix
   ./services/web-apps/dokuwiki.nix
   ./services/web-apps/dolibarr.nix
+  ./services/web-apps/drupal.nix
   ./services/web-apps/echoip.nix
   ./services/web-apps/eintopf.nix
   ./services/web-apps/engelsystem.nix
diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix
new file mode 100644
index 000000000000..3d6726c7393b
--- /dev/null
+++ b/nixos/modules/services/web-apps/drupal.nix
@@ -0,0 +1,478 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    any
+    attrValues
+    flatten
+    literalExpression
+    mapAttrs
+    mapAttrs'
+    mapAttrsToList
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    mkOption
+    mkPackageOption
+    nameValuePair
+    optionalAttrs
+    types
+    ;
+  inherit (pkgs)
+    mariadb
+    stdenv
+    writeShellScript
+    ;
+  cfg = config.services.drupal;
+  eachSite = cfg.sites;
+  user = "drupal";
+  webserver = config.services.${cfg.webserver};
+
+  pkg =
+    hostName: cfg:
+    stdenv.mkDerivation (finalAttrs: {
+      pname = "drupal-${hostName}";
+      name = "drupal-${hostName}";
+      src = cfg.package;
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out
+        cp -r * $out/
+
+        runHook postInstall
+      '';
+
+      postInstallPhase = ''
+        ln -s ${cfg.filesDir} $out/share/php/drupal/sites/default/files
+        ln -s ${cfg.stateDir}/sites/default/settings.php $out/share/php/drupal/sites/default/settings.php
+        ln -s ${cfg.modulesDir} $out/share/php/drupal/modules
+        ln -s ${cfg.themesDir} $out/share/php/drupal/themes
+      '';
+    });
+
+  siteOpts =
+    {
+      options,
+      config,
+      lib,
+      name,
+      ...
+    }:
+    {
+      options = {
+        enable = mkEnableOption "Drupal web application";
+        package = mkPackageOption pkgs "drupal" { };
+
+        filesDir = mkOption {
+          type = types.path;
+          default = "/var/lib/drupal/${name}/sites/default/files";
+          defaultText = "/var/lib/drupal/<name>/sites/default/files";
+          description = ''
+            The location of the Drupal files directory.
+          '';
+        };
+
+        stateDir = mkOption {
+          type = types.path;
+          default = "/var/lib/drupal/${name}";
+          defaultText = "/var/lib/drupal/<name>";
+          description = "The location of the Drupal site state directory.";
+        };
+
+        modulesDir = mkOption {
+          type = types.path;
+          default = "/var/lib/drupal/${name}/modules";
+          defaultText = "/var/lib/drupal/<name>/modules";
+          description = "The location of Drupal modules.";
+        };
+
+        themesDir = mkOption {
+          type = types.path;
+          default = "/var/lib/drupal/${name}/themes";
+          defaultText = "/varlib/drupal/<name>/themes";
+          description = "The location of Drupal themes.";
+        };
+
+        phpOptions = mkOption {
+          type = types.attrsOf types.str;
+          default = { };
+          description = ''
+            Options for PHP's php.ini file for this Drupal site.
+          '';
+          example = literalExpression ''
+            {
+              "opcache.interned_strings_buffer" = "8";
+              "opcache.max_accelerated_files" = "10000";
+              "opcache.memory_consumption" = "128";
+              "opcache.revalidate_freq" = "15";
+              "opcache.fast_shutdown" = "1";
+            }
+          '';
+        };
+
+        database = {
+          host = mkOption {
+            type = types.str;
+            default = "localhost";
+            description = "Database host address.";
+          };
+
+          port = mkOption {
+            type = types.port;
+            default = 3306;
+            description = "Database host port.";
+          };
+
+          name = mkOption {
+            type = types.str;
+            default = "drupal";
+            description = "Database name.";
+          };
+
+          user = mkOption {
+            type = types.str;
+            default = "drupal";
+            description = "Database user.";
+          };
+
+          passwordFile = mkOption {
+            type = types.nullOr types.path;
+            default = null;
+            example = "/run/keys/database-dbpassword";
+            description = ''
+              A file containing the password corresponding to
+              {option}`database.user`.
+            '';
+          };
+
+          tablePrefix = mkOption {
+            type = types.str;
+            default = "dp_";
+            description = ''
+              The $table_prefix is the value placed in the front of your database tables.
+              Change the value if you want to use something other than dp_ for your database
+              prefix. Typically this is changed if you are installing multiple Drupal sites
+              in the same database.
+            '';
+          };
+
+          socket = mkOption {
+            type = types.nullOr types.path;
+            default = null;
+            defaultText = literalExpression "/run/mysqld/mysqld.sock";
+            description = "Path to the unix socket file to use for authentication.";
+          };
+
+          createLocally = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Create the database and database user locally.";
+          };
+        };
+
+        virtualHost = mkOption {
+          type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix);
+          example = literalExpression ''
+            {
+              adminAddr = "webmaster@example.org";
+              forceSSL = true;
+              enableACME = true;
+            }
+          '';
+          description = ''
+            Apache configuration can be done by adapting {option}`services.httpd.virtualHosts`.
+          '';
+        };
+
+        poolConfig = mkOption {
+          type =
+            with types;
+            attrsOf (oneOf [
+              str
+              int
+              bool
+            ]);
+          default = {
+            "pm" = "dynamic";
+            "pm.max_children" = 32;
+            "pm.start_servers" = 2;
+            "pm.min_spare_servers" = 2;
+            "pm.max_spare_servers" = 4;
+            "pm.max_requests" = 500;
+          };
+          description = ''
+            Options for the Drupal PHP pool. See the documentation on `php-fpm.conf`
+            for details on configuration directives.
+          '';
+        };
+      };
+
+      config.virtualHost.hostName = mkDefault name;
+    };
+in
+{
+  options = {
+    services.drupal = {
+      enable = mkEnableOption "drupal";
+      package = mkPackageOption pkgs "drupal" { };
+
+      sites = mkOption {
+        type = types.attrsOf (types.submodule siteOpts);
+        default = {
+          "localhost" = {
+            enable = true;
+          };
+        };
+        description = "Specification of one or more Drupal sites to serve";
+      };
+
+      webserver = mkOption {
+        type = types.enum [
+          "nginx"
+          "caddy"
+        ];
+        default = "nginx";
+        description = ''
+          Whether to use nginx or caddy for virtual host management.
+
+          Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
+          See [](#opt-services.nginx.virtualHosts) for further information.
+
+          Further caddy configuration can be done by adapting `services.caddy.virtualHosts.<name>`.
+          See [](#opt-services.caddy.virtualHosts) for further information.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable) (mkMerge [
+    {
+
+      assertions =
+        (mapAttrsToList (hostName: cfg: {
+          assertion = cfg.database.createLocally -> cfg.database.user == user;
+          message = ''services.drupal.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
+        }) eachSite)
+        ++ (mapAttrsToList (hostName: cfg: {
+          assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
+          message = ''services.drupal.sites."${hostName}".database.passwordFile cannot be specified if services.drupal.sites."${hostName}".database.createLocally is set to true.'';
+        }) eachSite);
+
+      services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
+        enable = true;
+        package = mkDefault mariadb;
+        ensureDatabases = mapAttrsToList (hostName: cfg: cfg.database.name) eachSite;
+        ensureUsers = mapAttrsToList (hostName: cfg: {
+          name = cfg.database.user;
+          ensurePermissions = {
+            "${cfg.database.name}.*" = "ALL PRIVILEGES";
+          };
+        }) eachSite;
+      };
+
+      services.phpfpm.pools = mapAttrs' (
+        hostName: cfg:
+        (nameValuePair "drupal-${hostName}" {
+          inherit user;
+          group = webserver.group;
+          settings = {
+            "listen.owner" = webserver.user;
+            "listen.group" = webserver.group;
+          } // cfg.poolConfig;
+        })
+      ) eachSite;
+    }
+
+    {
+      systemd.tmpfiles.rules = flatten (
+        mapAttrsToList (hostName: cfg: [
+          "d '${cfg.stateDir}' 0750 ${user} ${webserver.group} - -"
+          "d '${cfg.modulesDir}' 0750 ${user} ${webserver.group} - -"
+          "Z '${cfg.modulesDir}' 0750 ${user} ${webserver.group} - -"
+          "d '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
+          "Z '${cfg.themesDir}' 0750 ${user} ${webserver.group} - -"
+        ]) eachSite
+      );
+
+      users.users.${user} = {
+        group = webserver.group;
+        isSystemUser = true;
+      };
+    }
+
+    {
+      # Run a service that prepares the state directory.
+      systemd.services = mkMerge [
+        (mapAttrs' (
+          hostName: cfg:
+          (nameValuePair "drupal-state-init-${hostName}" {
+            wantedBy = [ "multi-user.target" ];
+            before = [ "nginx.service" ];
+            after = [ "local-fs.target" ];
+
+            serviceConfig = {
+              Type = "oneshot";
+              User = "root";
+              ExecStart = writeShellScript "drupal-state-init-${hostName}" ''
+                set -e
+
+                if [ ! -d "${cfg.stateDir}/sites" ]; then
+                  echo "Preparing sites directory..."
+                  cp -r "${cfg.package}/share/php/drupal/sites" "${cfg.stateDir}"
+                fi
+
+                if [ ! -d "${cfg.filesDir}" ]; then
+                  echo "Preparing files directory..."
+                  mkdir -p "${cfg.filesDir}"
+                  chown -R ${user}:${webserver.group} ${cfg.filesDir}
+                fi
+
+                settings="${cfg.stateDir}/sites/default/settings.php"
+                defaultSettings="${cfg.package}/share/php/drupal/sites/default/default.settings.php"
+
+                if [ ! -f "$settings" ]; then
+                  echo "Preparing settings.php for ${hostName}..."
+                  cp "$defaultSettings" "$settings"
+                  chmod 644 "$settings"
+                fi
+
+                # Set or reset file permissions so that the web user and webserver owns them.
+                chown -R ${user}:${webserver.group} ${cfg.stateDir}
+              '';
+            };
+          })
+        ) eachSite)
+
+        (optionalAttrs (any (v: v.database.createLocally) (attrValues eachSite)) {
+          httpd.after = [ "mysql.service" ];
+        })
+      ];
+    }
+
+    (mkIf (cfg.webserver == "nginx") {
+      services.nginx = {
+        enable = true;
+        virtualHosts = mapAttrs (hostName: cfg: {
+          serverName = mkDefault hostName;
+          root = "${pkg hostName cfg}/share/php/drupal";
+          extraConfig = ''
+            index index.php;
+          '';
+          locations = {
+            "~ '\.php$|^/update.php'" = {
+              extraConfig = ''
+                fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                fastcgi_pass unix:${config.services.phpfpm.pools."drupal-${hostName}".socket};
+                fastcgi_index index.php;
+                include "${config.services.nginx.package}/conf/fastcgi.conf";
+                fastcgi_param PATH_INFO $fastcgi_path_info;
+                fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+                # Mitigate https://httpoxy.org/ vulnerabilities
+                fastcgi_param HTTP_PROXY "";
+                fastcgi_intercept_errors off;
+                fastcgi_buffer_size 16k;
+                fastcgi_buffers 4 16k;
+                fastcgi_connect_timeout 300;
+                fastcgi_send_timeout 300;
+                fastcgi_read_timeout 300;
+              '';
+            };
+            "= /favicon.ico" = {
+              extraConfig = ''
+                log_not_found off;
+                access_log off;
+              '';
+            };
+            "= /robots.txt" = {
+              extraConfig = ''
+                allow all;
+                log_not_found off;
+                access_log off;
+              '';
+            };
+            "~ \..*/.*\.php$" = {
+              extraConfig = ''
+                return 403;
+              '';
+            };
+            "~ ^/sites/.*/private/" = {
+              extraConfig = ''
+                return 403;
+              '';
+            };
+            "~ ^/sites/[^/]+/files/.*\.php$" = {
+              extraConfig = ''
+                deny all;
+              '';
+            };
+            "~* ^/.well-known/" = {
+              extraConfig = ''
+                allow all;
+              '';
+            };
+            "/" = {
+              extraConfig = ''
+                try_files $uri /index.php?$query_string;
+              '';
+            };
+            "@rewrite" = {
+              extraConfig = ''
+                rewrite ^ /index.php;
+              '';
+            };
+            "~ /vendor/.*\.php$" = {
+              extraConfig = ''
+                deny all;
+                return 404;
+              '';
+            };
+            "~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$" = {
+              extraConfig = ''
+                try_files $uri @rewrite;
+                expires max;
+                log_not_found off;
+              '';
+            };
+            "~ ^/sites/.*/files/styles/" = {
+              extraConfig = ''
+                try_files $uri @rewrite;
+              '';
+            };
+            "~ ^(/[a-z\-]+)?/system/files/" = {
+              extraConfig = ''
+                try_files $uri /index.php?$query_string;
+              '';
+            };
+          };
+        }) eachSite;
+      };
+    })
+
+    (mkIf (cfg.webserver == "caddy") {
+      services.caddy = {
+        enable = true;
+        virtualHosts = mapAttrs' (
+          hostName: cfg:
+          (nameValuePair "http://${hostName}" {
+            extraConfig = ''
+              root * ${pkg hostName cfg}/share/php/drupal
+              file_server
+
+              encode zstd gzip
+              php_fastcgi unix/${config.services.phpfpm.pools."drupal-${hostName}".socket}
+            '';
+          })
+        ) cfg.sites;
+      };
+    })
+
+  ]);
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7a0bdb1888ec..b03125926e88 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -410,6 +410,7 @@ in
   drawterm = discoverTests (import ./drawterm.nix);
   drbd = runTest ./drbd.nix;
   druid = handleTestOn [ "x86_64-linux" ] ./druid { };
+  drupal = runTest ./drupal.nix;
   drbd-driver = runTest ./drbd-driver.nix;
   dublin-traceroute = runTest ./dublin-traceroute.nix;
   earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { };
diff --git a/nixos/tests/drupal.nix b/nixos/tests/drupal.nix
new file mode 100644
index 000000000000..193061a8dc42
--- /dev/null
+++ b/nixos/tests/drupal.nix
@@ -0,0 +1,27 @@
+{ lib, ... }:
+
+{
+  name = "drupal";
+
+  nodes = {
+    machine_default =
+      { pkgs, ... }:
+      {
+        services.drupal = {
+          enable = true;
+        };
+      };
+  };
+
+  testScript = ''
+    machine_default.start()
+    machine_default.wait_for_unit("phpfpm-drupal-localhost.service")
+    machine_default.wait_for_unit("nginx.service")
+    machine_default.wait_for_unit("mysql.service")
+  '';
+
+  meta.maintainers = [
+    lib.maintainers.drupol
+    lib.maintainers.OulipianSummer
+  ];
+}

From eac3b2f74f5acd25cbb332c06db79431fe928798 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 21:00:29 +0000
Subject: [PATCH 0642/1497] terraform-providers.mongodbatlas: 1.34.0 -> 1.35.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..202762a87e1f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -840,13 +840,13 @@
     "vendorHash": "sha256-7AU79r4OQbmrMI385KVIHon/4pWk6J9qnH+zQRrWtJI="
   },
   "mongodbatlas": {
-    "hash": "sha256-JQW9y1EfrEInmz2+Er8BE0+6ZdcrO/w1y+czg7jPeRE=",
+    "hash": "sha256-+JYvL6xGA2zIOg2fl8Bl7CYU4x9N4aVJpIl/6PYdyPU=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v1.34.0",
+    "rev": "v1.35.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-y9dhiG0zyOcvjgygLEW2o+GPXUug0ibxC2aLvfcY260="
+    "vendorHash": "sha256-fz6e/QEcWQY7ZrWyUbk8M/+RPB8dwN3NHPLmNLyGVhQ="
   },
   "namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

From 8116669db7fc457f8fca1d8f606ef26f6b2b5d09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 23:01:30 +0200
Subject: [PATCH 0643/1497] python313Packages.busylight-for-humans: 0.33.3 ->
 0.35.2

Changelog: https://github.com/JnyJny/busylight/releases/tag/0.35.2
---
 .../python-modules/busylight-for-humans/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix
index 6b04f233054b..8cbd44469a6d 100644
--- a/pkgs/development/python-modules/busylight-for-humans/default.nix
+++ b/pkgs/development/python-modules/busylight-for-humans/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "busylight-for-humans";
-  version = "0.33.3";
+  version = "0.35.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "busylight";
-    tag = version;
+    tag = "v${version}";
     hash = "sha256-0jmaVMN4wwqoO5wGMaV4kJefNUPOuJpWbsqHcZZ0Nh4=";
   };
 

From 3bddd16a376b1e7360395ccc4ca1d702644513ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 2 Jun 2025 22:28:25 +0200
Subject: [PATCH 0644/1497] nixos/glance: add environmentFile option

---
 nixos/modules/services/web-apps/glance.nix | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index 6b1512323690..4f96b550fb6e 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -103,9 +103,61 @@ in
         attribute set with this format: `{ _secret = "/path/to/secret"; }`.
         See the example in `services.glance.settings.pages` at the weather widget
         with a location secret to get a better picture of this.
+
+        Alternatively, you can use a single file with environment variables,
+        see `services.glance.environmentFile`.
       '';
     };
 
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      description =
+        let
+          singleQuotes = "''";
+        in
+        ''
+          Path to an environment file as defined in {manpage}`systemd.exec(5)`.
+
+          See upstream documentation
+          <https://github.com/glanceapp/glance/blob/main/docs/configuration.md#environment-variables>.
+
+          Example content of the file:
+          ```
+          TIMEZONE=Europe/Paris
+          ```
+
+          Example `services.glance.settings.pages` configuration:
+          ```nix
+            [
+              {
+                name = "Home";
+                columns = [
+                  {
+                    size = "full";
+                    widgets = [
+                      {
+                        type = "clock";
+                        timezone = "\''${TIMEZONE}";
+                        label = "Local Time";
+                      }
+                    ];
+                  }
+                ];
+              }
+            ];
+          ```
+
+          Note that when using Glance's `''${ENV_VAR}` syntax in Nix,
+          you need to escape it as follows: use `\''${ENV_VAR}` in `"` strings
+          and `${singleQuotes}''${ENV_VAR}` in `${singleQuotes}` strings.
+
+          Alternatively, you can put each secret in it's own file,
+          see `services.glance.settings`.
+        '';
+      default = "/dev/null";
+      example = "/var/lib/secrets/glance";
+    };
+
     openFirewall = mkOption {
       type = types.bool;
       default = false;
@@ -157,6 +209,7 @@ in
           '';
         ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}";
         WorkingDirectory = "/var/lib/glance";
+        EnvironmentFile = cfg.environmentFile;
         StateDirectory = "glance";
         RuntimeDirectory = "glance";
         RuntimeDirectoryMode = "0755";

From 412fd239896805aa1ed25b95243a88be20347fc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 23:08:02 +0200
Subject: [PATCH 0645/1497] python313Packages.owslib: 0.33.0 -> 0.34.0

Diff: https://github.com/geopython/OWSLib/compare/refs/tags/0.33.0...refs/tags/0.34.0

Changelog: https://github.com/geopython/OWSLib/releases/tag/0.34.0
---
 pkgs/development/python-modules/owslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 786523dd7420..b92c6fe11e42 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "owslib";
-  version = "0.33.0";
+  version = "0.34.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "geopython";
     repo = "OWSLib";
     tag = version;
-    hash = "sha256-Qp8Ow39r6u/6h9+2Qa7WMzrs6Lyek07tWYtxtvVgM/Y=";
+    hash = "sha256-6jY5QvNObAV7+eJP0cB5PSmVQ3Z+Bs4OoCJIlggcFW0=";
   };
 
   postPatch = ''

From 574dd889896ee3802a10be61b8e35c5112fc9b8c Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Tue, 3 Jun 2025 04:34:01 +0700
Subject: [PATCH 0646/1497] home-assistant-custom-components.oref_alert: 2.20.1
 -> 2.21.1 (#413259)

https://github.com/amitfin/oref_alert/releases/tag/v2.20.2
https://github.com/amitfin/oref_alert/releases/tag/v2.21.0
https://github.com/amitfin/oref_alert/releases/tag/v2.21.1
---
 .../home-assistant/custom-components/oref_alert/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
index d61c13f57f0d..7775b1ea0261 100644
--- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildHomeAssistantComponent,
   fetchFromGitHub,
+  aiofiles,
   shapely,
   pytestCheckHook,
   pytest-homeassistant-custom-component,
@@ -11,16 +12,17 @@
 buildHomeAssistantComponent rec {
   owner = "amitfin";
   domain = "oref_alert";
-  version = "2.20.1";
+  version = "2.21.1";
 
   src = fetchFromGitHub {
     owner = "amitfin";
     repo = "oref_alert";
     tag = "v${version}";
-    hash = "sha256-EsDGH7/newjHRYu4Lr5UkJ3qaaNupqlhe5CdffEpIVg=";
+    hash = "sha256-ov/smP7rflRfQMqYduTxDAYj5xQkpZJSzIQZrP0YADQ=";
   };
 
   dependencies = [
+    aiofiles
     shapely
   ];
 

From 273c68f65fa1f1af38075f73a2a10cdbe101c693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 21:35:51 +0000
Subject: [PATCH 0647/1497] terraform-providers.pagerduty: 3.25.2 -> 3.26.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..99b8b4cc536c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1012,11 +1012,11 @@
     "vendorHash": null
   },
   "pagerduty": {
-    "hash": "sha256-CvW7u0VD6qOHYUVJIin38qrkVLtNfNeK4QlLOICFu1E=",
+    "hash": "sha256-nCd2EQgLR1PNPBnWPSpRGxd3zwQ7dJy8fb3tWgGnbRc=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.25.2",
+    "rev": "v3.26.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 6041ea02f4280e63753c792da9ff533b7ce2193e Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 20:09:52 +0300
Subject: [PATCH 0648/1497] gopher: 3.0.18 -> 3.0.19

Also remove the patch, since this release fixes that issue
---
 pkgs/by-name/go/gopher/int_main.patch | 13 -------------
 pkgs/by-name/go/gopher/package.nix    |  8 ++------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/go/gopher/int_main.patch

diff --git a/pkgs/by-name/go/gopher/int_main.patch b/pkgs/by-name/go/gopher/int_main.patch
deleted file mode 100644
index 07024525b309..000000000000
--- a/pkgs/by-name/go/gopher/int_main.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 1b20711..79ce215 100644
---- a/configure
-+++ b/configure
-@@ -679,7 +679,7 @@ cat > conftest.$ac_ext << EOF
- #line 680 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
diff --git a/pkgs/by-name/go/gopher/package.nix b/pkgs/by-name/go/gopher/package.nix
index 248d507da4db..19a05a661c92 100644
--- a/pkgs/by-name/go/gopher/package.nix
+++ b/pkgs/by-name/go/gopher/package.nix
@@ -7,21 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "gopher";
-  version = "3.0.18";
+  version = "3.0.19";
 
   src = fetchFromGitHub {
     owner = "jgoerzen";
     repo = "gopher";
     rev = "release/${version}";
-    sha256 = "sha256-YAcpEV3SbiUZ4nqYk6k1M41YWdTGSSH7rNB15gv31qQ=";
+    sha256 = "sha256-8J63TnC3Yq7+64PPLrlPEueMa9D/eWkPsb08t1+rPAA=";
   };
 
   buildInputs = [ ncurses ];
 
-  patches = [
-    ./int_main.patch # https://github.com/jgoerzen/gopher/pull/8
-  ];
-
   preConfigure = "export LIBS=-lncurses";
 
   meta = with lib; {

From bc95f85dbfe1e198d2a50da5d402494319c6e448 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 21:51:50 +0000
Subject: [PATCH 0649/1497] krillinai: 1.1.5 -> 1.2.1-hotfix-2

---
 pkgs/by-name/kr/krillinai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix
index 181a896e0c39..35afea0b1aa1 100644
--- a/pkgs/by-name/kr/krillinai/package.nix
+++ b/pkgs/by-name/kr/krillinai/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "krillinai";
-  version = "1.1.5";
+  version = "1.2.1-hotfix-2";
 
   src = fetchFromGitHub {
     owner = "krillinai";
     repo = "KrillinAI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jQlgkpQ+UTzn6MqGa+yVQ9v04IGGlMQQim3s0Oc9Zts=";
+    hash = "sha256-Dw30Lsf4pHMDlrLmdoU+4v5SJfzx5UId6v/OocrsiS4=";
   };
 
-  vendorHash = "sha256-mpvypCZmvVVljftGpcV1aea3s7Xmhr0jLfKZIZ0nkX8=";
+  vendorHash = "sha256-14YNdIfylUpcWqHhrpgmjxBHYRXaoR59jb1QdTckuLY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From c28211bac84a2fdcd0e8e14d0d018fd91c504fbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 22:01:22 +0000
Subject: [PATCH 0650/1497] vscode-extensions.tabnine.tabnine-vscode: 3.283.0
 -> 3.287.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ad498faa43b4..122ef58c06b0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4703,8 +4703,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.283.0";
-          hash = "sha256-zn58iml+uN6K1qneLqnikaL5Gyk4rmNXo8TKKlO88jA=";
+          version = "3.287.0";
+          hash = "sha256-E4ew40NNuOW9e7ZIsJjkO/4r6gbbC2IsghFbO+n27cg=";
         };
         meta = {
           license = lib.licenses.mit;

From 21ec0dd7a84bc925a3613b97f553c1ba0f20f0f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 22:19:13 +0000
Subject: [PATCH 0651/1497] yaziPlugins.ouch: 0-unstable-2025-04-12 ->
 0-unstable-2025-06-01

---
 pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
index aec407f88dad..7e1d00065fed 100644
--- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "ouch.yazi";
-  version = "0-unstable-2025-04-12";
+  version = "0-unstable-2025-06-01";
 
   src = fetchFromGitHub {
     owner = "ndtoan96";
     repo = "ouch.yazi";
-    rev = "2496cd9ac2d1fb52597b22ae84f3af06c826a86d";
-    hash = "sha256-OsNfR7rtnq+ceBTiFjbz+NFMSV/6cQ1THxEFzI4oPJk=";
+    rev = "10b462765f37502065555e83c68a72bb26870fe2";
+    hash = "sha256-mtXl76a54Deg4cyrD0wr++sD/5b/kCsnJ+ngM6OokTc=";
   };
 
   meta = {

From e0fd47c071e504a04010875a90b79e143007de76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 22:37:35 +0000
Subject: [PATCH 0652/1497] snort: 3.7.4.0 -> 3.8.1.0

---
 pkgs/by-name/sn/snort/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix
index 405ed2cb1de7..ed050c8fe092 100644
--- a/pkgs/by-name/sn/snort/package.nix
+++ b/pkgs/by-name/sn/snort/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snort";
-  version = "3.7.4.0";
+  version = "3.8.1.0";
 
   src = fetchFromGitHub {
     owner = "snort3";
     repo = "snort3";
     tag = finalAttrs.version;
-    hash = "sha256-c5GVFzZOeaI2te49m9crt9I0E/awHjcDR621tvDVgSQ=";
+    hash = "sha256-+59e6rLMvLQ+LNxwRRG6nLXqjMsbn3bdykfMpwPgSpA=";
   };
 
   nativeBuildInputs = [

From 327a41474e77dd3fae42ade337d637c6b90d641c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:40:20 -0400
Subject: [PATCH 0653/1497] dbip-asn-lite: 2025-05 -> 2025-06

---
 pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 8be3a8f3a1b3..898d67764e52 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2025-05";
+  version = "2025-06";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-7o/mGSi66++h9mOPhsv/M/taDHJ7kPfKPh7jb+nC4IQ=";
+    hash = "sha256-ZlbspbZoeUrftP5xaPqY16BBZrPu1tU2AjbmJOOzN0w=";
   };
 
   dontUnpack = true;

From 4f48214aa44ec1ae11f538407f78e3a3c319c9c8 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:40:27 -0400
Subject: [PATCH 0654/1497] dbip-city-lite: 2025-05 -> 2025-06

---
 pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index 7d986448796b..fc49f52d647b 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2025-05";
+  version = "2025-06";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-Trqy6BlagHycC432BE1p/fF+hfcVpPhzVJTKIJQaWlY=";
+    hash = "sha256-iv4UfdLcmLE5d5y38kz4EFpDpecjScESr1I30dB+jDQ=";
   };
 
   dontUnpack = true;

From 91e34cce0049217bc358fd46a11151c3396bccad Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:40:35 -0400
Subject: [PATCH 0655/1497] dbip-country-lite: 2025-05 -> 2025-06

---
 pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index 23fb563eaffa..b6383b60b55f 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2025-05";
+  version = "2025-06";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-7ZmodKYVMID/5yOMZuEpRkb41/DTrgprJPG7DYnYNak=";
+    hash = "sha256-p3HJTzzAtkHgDdiXa9M1jPSukDo+AgRu3Cjf1Q+QXB8=";
   };
 
   dontUnpack = true;

From e51837dde43a29c7a42ea2bd0d3eb11a93d1bb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 15:48:50 -0700
Subject: [PATCH 0656/1497] flare-signal: 0.16.1 -> 0.16.2

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/refs/tags/0.16.1...0.16.2

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.16.2/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index 7ad1ac892efe..cd15e153b8a9 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -22,19 +22,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-5phXBsXi0kbTb4RVzbB4LS9b+S2M3U2l/6QYoSHo114=";
+    hash = "sha256-H7lh3yjAC4xSv5NsLo3q4bEzuLgEh/UExwCw3BJWUeQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-sI+zV1YW9RhtYRgUWiFKN8Iw9a5qkktOo0hFwyimPI8=";
+    hash = "sha256-x1Yyr6Mwd1fYylrhRflpnzkBKG6Zm8R5UO/jcqP+aKE=";
   };
 
   nativeBuildInputs = [

From 6e49a56258a976d8ff645d15a00104533639fe82 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:36:19 +0000
Subject: [PATCH 0657/1497] alertmanager-ntfy: 0-unstable-2025-05-04 ->
 0-unstable-2025-05-31

---
 pkgs/by-name/al/alertmanager-ntfy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index be0d1e4a35a9..c3e2db5b5345 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "alertmanager-ntfy";
-  version = "0-unstable-2025-05-04";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "alexbakker";
     repo = "alertmanager-ntfy";
-    rev = "f05e3c029bab3bdfb9aefbddbfc6bd9c7d4aa80f";
-    hash = "sha256-rKCJnffsBEXmTg2s0nqQf8BuHQnSgcwVBhC7gRzg4ew=";
+    rev = "76d5f772f70d6915c89da00414c20009b03cc361";
+    hash = "sha256-newJ1fCMEE3gsZncWU899Q6cS6llPNwJlHT7HdLQZf8=";
   };
 
   vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY=";

From b3168f37d27d0d16b8acfc9fa55cb882d7e4be6a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:36:03 +0000
Subject: [PATCH 0658/1497] clorinde: 0.15.1 -> 0.15.2

---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index 981fd2cf1b14..f56be8024eef 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-Ynz1pdgckQzMLuUJUGSzNRNwWZKrEZuYgrrT/BxAxzc=";
+    hash = "sha256-CrgJtgFX5RBNfFFr2ZZ0d3oKfryyLAHva7g2JyBFiB8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-g3pWvoTq1DlKlIDJq79IJrvDiLR0HZRPIt4K1YUPsvM=";
+  cargoHash = "sha256-jUtkhOAosrxHGRbAdzdrgLzL5Xp2YhxcrG/dcwUhdLg=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From b833b49732d8d57c2833295219109f993f42753c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:31:04 +0000
Subject: [PATCH 0659/1497] synapse-admin-etkecc: 0.11.0-etke42 ->
 0.11.1-etke43

---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index 4937bca343f3..01e3c58d2206 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.0-etke42";
+  version = "0.11.1-etke43";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HWhyG/dVP9M84OOYH95RPLqiXDYOs+QOxwLM8pPl1vA=";
+    hash = "sha256-mubONaT4qnbPlnYY15UtHGEp45k5mIxWt1shHRdwwTA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-GO5m+7fcm/XO38XlsQq6fwKslzdZkE6WleP3GHNKuPU=";
+    hash = "sha256-WFE2mtyK3xBOVIgJ0ODsv1C0pjpGdBM3+TtIiZUpj58=";
   };
 
   nativeBuildInputs = [

From a8414c8c84072086d5fff62152c3ab5900e52f61 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Tue, 3 Jun 2025 00:54:23 +0200
Subject: [PATCH 0660/1497] lon: 0.5.0 -> 0.7.0

---
 pkgs/by-name/lo/lon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix
index 0296246aa5b4..718b48d3586a 100644
--- a/pkgs/by-name/lo/lon/package.nix
+++ b/pkgs/by-name/lo/lon/package.nix
@@ -10,19 +10,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lon";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "lon";
     tag = version;
-    hash = "sha256-/7RelKn3pzC8n+b2OV1pcUEaWeEoH4qC2TvAWwni5AA=";
+    hash = "sha256-+hCqAtu9uo9BndZogXUIMMoL1pXmwyec5edj6gg82GM=";
   };
 
   sourceRoot = "source/rust/lon";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2/lHRv3bD0hX/JVSucsA3G5gM9NMgRrBf21JtEvzu64=";
+  cargoHash = "sha256-i+DAVtXAYQ254Y7jechjOcwe3nT/0O4AzxBH5QkK9aM=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From a24e9579d6dd1f70b261dcebb9a47d873efd19f2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 22:32:02 +0000
Subject: [PATCH 0661/1497] olivetin: 2025.5.26 -> 2025.6.1

---
 pkgs/by-name/ol/olivetin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 38833afae1ea..e39081ae01fa 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -81,18 +81,18 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.5.26";
+    version = "2025.6.1";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-BD52MxIHE56y3oWuRTCYmrEYMge70/MXt4B6g84ahF0=";
+      hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ=";
     };
 
     modRoot = "service";
 
-    vendorHash = "sha256-kfk4QFG+l+XKkKoOs2C1B6ZuMeeDz9DrzzR46S8Qnyk=";
+    vendorHash = "sha256-8rPJoB75de2Y56iyIwdI9HPk7OlCgfMPy28TW1i7+sU=";
 
     ldflags = [
       "-s"

From 99d0c8ba46c07eede6e72af0fc90368f343aca29 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:42:48 -0400
Subject: [PATCH 0662/1497] mtail: 3.0.23 -> 3.2.4

Diff: https://github.com/jaqx0r/mtail/compare/v3.0.23...v3.2.4
---
 pkgs/by-name/mt/mtail/package.nix | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 70077d7783c9..ec192cdd1df4 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -3,20 +3,25 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
+  gotools,
 }:
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.0.23";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc=";
+    hash = "sha256-3ox+EXd5/Rh3N/7GbX+JUmH4C9j/Er+REkUHZndTxw0=";
   };
 
-  vendorHash = "sha256-jE1tcZJ7TaMC3yegBHE3Zad9sF0EfbHxDA8ffehNL4U=";
+  vendorHash = "sha256-7EQFO7dlVhBwHdY6c3WmxJo4WdCUJbWKw5P4fL6jBsA=";
+
+  nativeBuildInputs = [
+    gotools # goyacc
+  ];
 
   ldflags = [
     "-X=main.Branch=main"
@@ -27,11 +32,20 @@ buildGoModule rec {
   # fails on darwin with: write unixgram -> <tmpdir>/rsyncd.log: write: message too long
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
+  checkFlags = [
+    # can only be executed under bazel
+    "-skip=TestExecMtail"
+  ];
+
+  preBuild = ''
+    GOOS= GOARCH= go generate ./...
+  '';
+
+  meta = {
     description = "Tool for extracting metrics from application logs";
     homepage = "https://github.com/jaqx0r/mtail";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nickcao ];
     mainProgram = "mtail";
   };
 }

From 3bdb5fff3a2c79293145f61e7ca87811e8724aad Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:59:27 -0400
Subject: [PATCH 0663/1497] python312Packages.mautrix: 0.20.7 -> 0.20.8

Diff: https://github.com/mautrix/python/compare/refs/tags/v0.20.7...refs/tags/v0.20.8

Changelog: https://github.com/mautrix/python/releases/tag/v0.20.8
---
 pkgs/development/python-modules/mautrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 2c28eaabbf35..1a38f699a0fb 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.20.7";
+  version = "0.20.8";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "mautrix";
     repo = "python";
     tag = "v${version}";
-    hash = "sha256-tOX/KQrECeEV3/0q3tpO4brUdalmw6IincF6pHzsEE8=";
+    hash = "sha256-giK8JZ6nzsA8SV6CzDNEbJmbwDju9t6fLJr/oXNjvKs=";
   };
 
   build-system = [ setuptools ];

From 8c565143029f9cfdbd8dc08d408f941c3165b931 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 1 May 2025 16:52:46 -0400
Subject: [PATCH 0664/1497] python312Packages.python-debian: 0.1.52 -> 1.0.1

Diff: https://salsa.debian.org/python-debian-team/python-debian/-/compare/refs/tags/0.1.52...1.0.1

Changelog: https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog
---
 pkgs/development/python-modules/python-debian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix
index c94707bc8a9b..0f638282e50f 100644
--- a/pkgs/development/python-modules/python-debian/default.nix
+++ b/pkgs/development/python-modules/python-debian/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-debian";
-  version = "0.1.52";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "python-debian-team";
     repo = "python-debian";
     tag = version;
-    hash = "sha256-+c+AiUCnpasOLbY6K4cuKUb6Ojwn0py78fL5W24WRwU=";
+    hash = "sha256-lSKtlBqAa8cJZZHMVb90eYIGem4DwVZLldaYSAJBNek=";
   };
 
   build-system = [

From ec0f23158776b89b6a3985c8c4cd6338d8f6b670 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 3 Jun 2025 00:59:01 +0200
Subject: [PATCH 0665/1497] ytdl-sub: fix updateScript

---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 pkgs/by-name/yt/ytdl-sub/update.sh   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/yt/ytdl-sub/update.sh

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index ab07b43ded8f..563e872fcd8a 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -4,8 +4,8 @@
   ffmpeg,
   lib,
   versionCheckHook,
-  nix-update-script,
 }:
+
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
   version = "2025.05.23";
@@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     homepage = "https://github.com/jmbannon/ytdl-sub";
diff --git a/pkgs/by-name/yt/ytdl-sub/update.sh b/pkgs/by-name/yt/ytdl-sub/update.sh
new file mode 100755
index 000000000000..dde9badd3023
--- /dev/null
+++ b/pkgs/by-name/yt/ytdl-sub/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix-update
+
+version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL "https://api.github.com/repos/jmbannon/ytdl-sub/releases/latest" | jq -r .tag_name)
+nix-update --version="$version" ytdl-sub

From 323925ea92eac775cee300d37959b9773b7795e1 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 2 Jun 2025 23:02:27 +0000
Subject: [PATCH 0666/1497] ytdl-sub: 2025.05.23 -> 2025.06.01.post1

---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 563e872fcd8a..20e51cf80293 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.05.23";
+  version = "2025.06.01.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-296lizseyBJdpu80MnquPB1ldGgpAcey3iDwiaLqpOQ=";
+    hash = "sha256-qwsUb9w/eeNO1mGYpnwkWgH5AfcUm7Y7DtkWep8SAcA=";
   };
 
   postPatch = ''

From 026b7627e6438390c8dbcb1563d8219917fb8376 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 23:09:18 +0000
Subject: [PATCH 0667/1497] python3Packages.gphoto2: 2.5.1 -> 2.6.0

---
 pkgs/development/python-modules/gphoto2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index 67da4bd44503..f1a589d1c6d2 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.5.1";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jgh7ff+iUaeNQtBsXw2Jm+2gj1ctvrY3oahGrbxx3uE=";
+    hash = "sha256-hev0a6RTC5dhXSXQMAgeLsjDzXmsU1GHOrsDpkn0MTI=";
   };
 
   nativeBuildInputs = [

From 4dc4df6ab3261963d148c3579886a08f8963e584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 16:23:50 -0700
Subject: [PATCH 0668/1497] python3Packages.gphoto2: modernize

---
 .../python-modules/gphoto2/default.nix        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index f1a589d1c6d2..58e3d19d3701 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   pkg-config,
   libgphoto2,
+  pytestCheckHook,
   setuptools,
   toml,
 }:
@@ -13,27 +14,35 @@ buildPythonPackage rec {
   version = "2.6.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-hev0a6RTC5dhXSXQMAgeLsjDzXmsU1GHOrsDpkn0MTI=";
+  src = fetchFromGitHub {
+    owner = "jim-easterbrook";
+    repo = "python-gphoto2";
+    tag = "v${version}";
+    hash = "sha256-S/uMP2kRXJDetpXT4+MmCvb35xSxEbzhtKJ0PbHIOIU=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
+  build-system = [
     setuptools
     toml
   ];
 
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [ libgphoto2 ];
 
-  doCheck = false; # No tests available
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "gphoto2" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/jim-easterbrook/python-gphoto2/blob/${src.tag}/CHANGELOG.txt";
     description = "Python interface to libgphoto2";
     homepage = "https://github.com/jim-easterbrook/python-gphoto2";
-    license = licenses.gpl3;
+    license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
   };
 }

From ba96c499e48696f4818e5e7830d7284e8bfdaf77 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 19:36:38 -0400
Subject: [PATCH 0669/1497] v2ray-domain-list-community: 20250526033544 ->
 20250602083629

Diff: https://github.com/v2fly/domain-list-community/compare/20250526033544...20250602083629
---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index d512752b7f97..2b1544c24ac4 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20250526033544";
+    version = "20250602083629";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-XA6kB8mwnwZwioviIlKbYr40pJ1ndOXecjMToE9mAYE=";
+      hash = "sha256-LdB4BUHDpPoA0c8yoZX9gZhaY97t4DfkR37y32yHlvk=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From 17423823a78628824f494c73025e0e8385a69a88 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 3 Jun 2025 01:37:50 +0200
Subject: [PATCH 0670/1497] chromium,chromedriver: 137.0.7151.55 ->
 137.0.7151.68

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop.html

This update includes 3 security fixes. Google is aware that an exploit
for CVE-2025-5419 exists in the wild.

CVEs:
CVE-2025-5419 CVE-2025-5068
---
 .../networking/browsers/chromium/info.json    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index f499bdc271af..5a20483448ed 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "137.0.7151.55",
+    "version": "137.0.7151.68",
     "chromedriver": {
-      "version": "137.0.7151.56",
-      "hash_darwin": "sha256-z4GTPrONaXARP0d8vInJdFxR052PuuI6IJy1PEv2RNg=",
-      "hash_darwin_aarch64": "sha256-wlSDfCiBTdLWwabpHwOiM8Y3asn7ueHGSMh2AANaE+A="
+      "version": "137.0.7151.69",
+      "hash_darwin": "sha256-G88jte6xraXrrfEvCj7zndpQ7nxyzappuu4oZ79XY8U=",
+      "hash_darwin_aarch64": "sha256-wbOD/sVjLVcpPzrbAGu8b8YMbUOKkOt7eNxJDLKRjxo="
     },
     "deps": {
       "depot_tools": {
@@ -20,8 +20,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
-        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
+        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
+        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -241,8 +241,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
-        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
+        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
+        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -791,8 +791,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
-        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
+        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
+        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
       }
     }
   },

From 2ec67b9e8123ffa09446136bc3ea322cb9af05dc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 23 May 2025 01:29:16 +0200
Subject: [PATCH 0671/1497] gale: 1.5.12 -> 1.7.1

---
 pkgs/by-name/ga/gale/package.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix
index fed9a69180a8..8793164a0ce7 100644
--- a/pkgs/by-name/ga/gale/package.nix
+++ b/pkgs/by-name/ga/gale/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
 
@@ -19,15 +18,15 @@
   webkitgtk_4_1,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gale";
-  version = "1.5.12";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "Kesomannen";
     repo = "gale";
     tag = finalAttrs.version;
-    hash = "sha256-5iJ04/q/emPwG0ILurFx2gNlXkZrfP2D6xv25AIlhfc=";
+    hash = "sha256-OaUpyG+XdP7AIA55enPf6/viBGBBQVuNi2QxgD5EVNc=";
   };
 
   postPatch = ''
@@ -35,33 +34,22 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    name = "gale-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     hash = "sha256-yaPUNtlb2vMwK42u+3/rViGx6YzhYxRDJylPu++tbNs=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs)
-      pname
-      version
-      src
-      cargoRoot
-      ;
-    hash = "sha256-GGH5kQlnYIlKbTAKbF275mH4J9BcbcBHSdzP7RgfDwk=";
-  };
-
   cargoRoot = "src-tauri";
-
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
+  cargoHash = "sha256-v0/A4jUq5t61KB7NLwvsl6wR7N0UUbdVCk7nFZVTOi8=";
+
   nativeBuildInputs = [
     jq
     moreutils
     npmHooks.npmConfigHook
     nodejs
-    rustPlatform.cargoSetupHook
     cargo-tauri.hook
-    rustPlatform.cargoCheckHook
     pkg-config
     wrapGAppsHook3
   ];

From b6827f586b28d4da1dc3b6e3cb1e01a89223f98a Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:55:33 -0400
Subject: [PATCH 0672/1497] python312Packages.datashader: 0.18.0 -> 0.18.1

Diff: https://github.com/holoviz/datashader/compare/refs/tags/v0.18.0...refs/tags/v0.18.1
---
 pkgs/development/python-modules/datashader/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index f2a8e1a53114..6300fc352f3b 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   hatchling,
   hatch-vcs,
@@ -24,16 +23,14 @@
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.18.0";
+  version = "0.18.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "holoviz";
     repo = "datashader";
     tag = "v${version}";
-    hash = "sha256-HduEO2XDH20tovtlpg5DbF96G5Lpbo+XVmQKnWvfyL8=";
+    hash = "sha256-nQsVuj4zK5bfF617K71n+El5/ZC7vNia7dhrIqv7t+M=";
   };
 
   build-system = [
@@ -68,6 +65,7 @@ buildPythonPackage rec {
     description = "Data visualization toolchain based on aggregating into a grid";
     mainProgram = "datashader";
     homepage = "https://datashader.org";
+    changelog = "https://github.com/holoviz/datashader/blob/${src.tag}/CHANGELOG.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nickcao ];
   };

From b30b024603581ad3616c7e732afe90d3abcbecd3 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 18:58:09 -0400
Subject: [PATCH 0673/1497] python312Packages.edk2-pytool-library: 0.23.2 ->
 0.23.3

Diff: https://github.com/tianocore/edk2-pytool-library/compare/refs/tags/v0.23.2...refs/tags/v0.23.3

Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.23.3
---
 .../python-modules/edk2-pytool-library/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index 5479191cff6e..796daf64dc20 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.23.2";
+  version = "0.23.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     tag = "v${version}";
-    hash = "sha256-ThAYxOgYa7IQEbizdH2b2oTulJu9oX9V/7v4o8vxXQM=";
+    hash = "sha256-fWt9epsc77YCQiB5BeuCHUZ2Or8ddgMDSZPHC4f3yZ8=";
   };
 
   build-system = [

From c54b50ee831b07a9d835299974884f1e56ad7b20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:00:16 +0000
Subject: [PATCH 0674/1497] omnictl: 0.50.0 -> 0.50.1

---
 pkgs/by-name/om/omnictl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix
index dba1f3c45bc4..d8d6067aa108 100644
--- a/pkgs/by-name/om/omnictl/package.nix
+++ b/pkgs/by-name/om/omnictl/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "omnictl";
-  version = "0.50.0";
+  version = "0.50.1";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "omni";
     rev = "v${version}";
-    hash = "sha256-zxtBAFfZrXbUL1V2AN8Cblm6M7HhogoncOzGyjOUcK4=";
+    hash = "sha256-ewbTYS5eRluTRY7pOzD/ylHUH2Wbgn/qoQvICnJ2vrg=";
   };
 
-  vendorHash = "sha256-ewJTnoJpnz/237j/mpYpi8Otwu3ge9QN8cNrAfCHvUM=";
+  vendorHash = "sha256-bS5g4cXzp9zKtlsE/EApm7mQJ3asZdyQ3vw8Vslz62Q=";
 
   ldflags = [
     "-s"

From f9738506f7a028249800a1c22e023102a64151ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:05:41 +0000
Subject: [PATCH 0675/1497] distroshelf: 1.0.7 -> 1.0.8

---
 pkgs/by-name/di/distroshelf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix
index 154e622bd951..d83c2c58931a 100644
--- a/pkgs/by-name/di/distroshelf/package.nix
+++ b/pkgs/by-name/di/distroshelf/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "distroshelf";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "DistroShelf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4xiqdLSmO9LXfVwF/QRJL8BhZDsNistdGVVT4YDdt4A=";
+    hash = "sha256-UZP/VohgYUe6Ly89oD9WlYyiAfQmTK1lXnf5TipoiNI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From d6619791686ecca939a88dea0050aff553682888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 2 Jun 2025 17:08:54 -0600
Subject: [PATCH 0676/1497] =?UTF-8?q?libosinfo:=201.11.0=20=E2=86=92=201.1?=
 =?UTF-8?q?2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NEWS: https://gitlab.com/libosinfo/libosinfo/-/blob/v1.12.0/NEWS

Changelog: https://gitlab.com/libosinfo/libosinfo/-/compare/v1.11.0...v1.12.0
---
 pkgs/by-name/li/libosinfo/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix
index c48b1d2c739a..5357338529bf 100644
--- a/pkgs/by-name/li/libosinfo/package.nix
+++ b/pkgs/by-name/li/libosinfo/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libosinfo";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-G/lu7J4UYPPRpxMWPMof8NSAo0kLUImSkvFFSLOpa2A=";
+    sha256 = "sha256-rYVX7OJnk9pD0m3lZePWjOLua/uNARO3zH3+B/a/xrY=";
   };
 
   outputs = [
@@ -65,10 +65,10 @@ stdenv.mkDerivation rec {
       osinfo_db_data_dir = "${osinfo-db}/share";
     })
 
-    # Fix build with libxml 2.12
+    # Fix build with libxml 2.14
     (fetchpatch {
-      url = "https://gitlab.com/libosinfo/libosinfo/-/commit/5bbdd06503456784c5ffa22409e8bab50470d673.patch";
-      hash = "sha256-KqgHXI+lD5VYp2wtA58Drp15TgNK1O3xCaYBy4/B9wc=";
+      url = "https://gitlab.com/libosinfo/libosinfo/-/commit/0adf38535637ec668e658d43f04f60f11f51574f.patch";
+      hash = "sha256-NZija5BwevRU7bAe2SPx9GnoGb1P+mXEbJ5EVAFT9Yw=";
     })
   ];
 

From 72ff2529d49a7310d6d4482a6159be97b0d446a9 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 2 Jun 2025 19:00:55 -0400
Subject: [PATCH 0677/1497] python312Packages.pygount: 2.0.0 -> 3.1.0

Diff: https://github.com/roskakori/pygount/compare/refs/tags/v2.0.0...refs/tags/v3.1.0

Changelog: https://github.com/roskakori/pygount/blob/refs/tags/v3.1.0/CHANGES.md
---
 .../python-modules/pygount/default.nix            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index e6cc42c4a6b9..f7325b9bbf9b 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -12,29 +12,25 @@
 
 buildPythonPackage rec {
   pname = "pygount";
-  version = "2.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roskakori";
     repo = "pygount";
     tag = "v${version}";
-    hash = "sha256-l2Rq+4u6NwUIwMYWY/qfne7DrG0guv6hwnqVq5wszAo=";
+    hash = "sha256-hoj27L1wXOjzU3jdWIP5MtlO6fzKOYXfW/Pf3AdYKc0=";
   };
 
   build-system = [
     hatchling
   ];
 
-  pythonRelaxDeps = [
-    "rich"
-  ];
-
   dependencies = [
-    pygments
     chardet
-    rich
     gitpython
+    pygments
+    rich
   ];
 
   nativeCheckInputs = [
@@ -45,6 +41,7 @@ buildPythonPackage rec {
     # requires network access
     "test_can_find_files_from_mixed_cloned_git_remote_url_and_local"
     "test_can_extract_and_close_and_find_files_from_cloned_git_remote_url_with_revision"
+    "test_succeeds_on_not_git_extension"
   ];
 
   pythonImportsCheck = [ "pygount" ];
@@ -53,7 +50,7 @@ buildPythonPackage rec {
     description = "Count lines of code for hundreds of languages using pygments";
     mainProgram = "pygount";
     homepage = "https://github.com/roskakori/pygount";
-    changelog = "https://github.com/roskakori/pygount/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/roskakori/pygount/blob/${src.tag}/docs/changes.md";
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ nickcao ];
   };

From 9441c5dc561fb8c06d7910141a6dea8737848828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 17:16:49 -0700
Subject: [PATCH 0678/1497] animdl: unpin cssselect

---
 pkgs/applications/video/animdl/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix
index 3c0fe37dd062..ca7e3abec0ed 100644
--- a/pkgs/applications/video/animdl/default.nix
+++ b/pkgs/applications/video/animdl/default.nix
@@ -21,7 +21,7 @@
 buildPythonApplication {
   pname = "animdl";
   version = "1.7.27";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "justfoolingaround";
@@ -34,7 +34,9 @@ buildPythonApplication {
   pythonRemoveDeps = [
     "comtypes" # windows only
   ];
+
   pythonRelaxDeps = [
+    "cssselect"
     "httpx"
     "lxml"
     "packaging"
@@ -45,10 +47,11 @@ buildPythonApplication {
     "yarl"
   ];
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     anchor-kr
     anitopy
     click

From c1d2184a49c7e590536020fc8121531dc96a5527 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:38:36 +0100
Subject: [PATCH 0679/1497] ccextractor: directly pass cargoRoot to fetcher

---
 pkgs/by-name/cc/ccextractor/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix
index ae94897395ff..7c8fbb886b86 100644
--- a/pkgs/by-name/cc/ccextractor/package.nix
+++ b/pkgs/by-name/cc/ccextractor/package.nix
@@ -49,10 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
   cargoRoot = "src/rust";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+    inherit (finalAttrs) src cargoRoot;
     patches = [ ./use-rsmpeg-0.15.patch ];
-    patchFlags = [ "-p3" ];
     hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk=";
   };
 

From e99c97f254c2f71d586287b773904eaf2d911eff Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:52:19 +0100
Subject: [PATCH 0680/1497] ceph: directly pass cargoRoot to fetcher

---
 pkgs/tools/filesystems/ceph/default.nix                   | 8 ++++++--
 .../filesystems/ceph/old-python-packages/cryptography.nix | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 1e9b4618c1b6..88c636048ab4 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -243,8 +243,12 @@ let
           };
           cargoRoot = "src/_bcrypt";
           cargoDeps = rustPlatform.fetchCargoVendor {
-            inherit pname version src;
-            sourceRoot = "${pname}-${version}/${cargoRoot}";
+            inherit
+              pname
+              version
+              src
+              cargoRoot
+              ;
             hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M=";
           };
         });
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
index 0ecf97dc27b5..5d82beffd690 100644
--- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
+++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
@@ -42,8 +42,12 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58=";
   };
 

From 3a6328f75aa7a31166b3401992a1e6a2d5996a11 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:19:45 +0100
Subject: [PATCH 0681/1497] ibus-engines.openbangla-keyboard: directly pass
 cargoRoot to fetcher

---
 pkgs/applications/misc/openbangla-keyboard/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix
index a059a14df05a..b2239c5d38a8 100644
--- a/pkgs/applications/misc/openbangla-keyboard/default.nix
+++ b/pkgs/applications/misc/openbangla-keyboard/default.nix
@@ -62,11 +62,7 @@ stdenv.mkDerivation rec {
     ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    postPatch = ''
-      cp ${./Cargo.lock} Cargo.lock
-    '';
-    sourceRoot = "${src.name}/${cargoRoot}";
+    inherit src cargoRoot postPatch;
     hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY=";
   };
 

From 9a40ac05c18987b0508fe6273ac39414a7d380f5 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:23:31 +0100
Subject: [PATCH 0682/1497] kdePackages.akonadi-search: directly pass cargoRoot
 to fetcher

---
 pkgs/kde/gear/akonadi-search/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix
index 7d46f87af0e1..03b37bb7bc7e 100644
--- a/pkgs/kde/gear/akonadi-search/default.nix
+++ b/pkgs/kde/gear/akonadi-search/default.nix
@@ -14,9 +14,8 @@ mkKdeDerivation rec {
   cargoRoot = "agent/rs/htmlparser";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version;
+    inherit pname version cargoRoot;
     src = sources.${pname};
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
     hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";
   };
 

From 9e2751327b434d49aff907ae2b811c0675dc654e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:23:42 +0100
Subject: [PATCH 0683/1497] kdePackages.kdepim-addons: directly pass cargoRoot
 to fetcher

---
 pkgs/kde/gear/kdepim-addons/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix
index b898e5d6410f..edae47c991bc 100644
--- a/pkgs/kde/gear/kdepim-addons/default.nix
+++ b/pkgs/kde/gear/kdepim-addons/default.nix
@@ -17,9 +17,8 @@ mkKdeDerivation rec {
   cargoRoot = "plugins/webengineurlinterceptor/adblock";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version;
+    inherit pname version cargoRoot;
     src = sources.${pname};
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
     hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";
   };
 

From 6c1bc14c30bf404c45e64537a1e1a1a8c216e392 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 30 May 2025 16:52:25 +0200
Subject: [PATCH 0684/1497] librepcb: directly pass cargoRoot to fetcher

---
 pkgs/applications/science/electronics/librepcb/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 6a706e5a81c4..34b430b07e10 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    sourceRoot = "source/${cargoRoot}";
+    inherit src cargoRoot;
     hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";
   };
 

From b67755bccd5d0e0db2ea6ac35f58f484884871c2 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:54:05 +0100
Subject: [PATCH 0685/1497] opengamepadui: directly pass cargoRoot to fetcher

---
 pkgs/by-name/op/opengamepadui/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix
index 497f1e03eda1..e700d72d27e9 100644
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@@ -35,8 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    sourceRoot = "source/${finalAttrs.cargoRoot}";
+    inherit (finalAttrs) src cargoRoot;
     hash = "sha256-T79G2bShJuFRfaCqG3IDHqW0s68yAdGyv58kdDYg6kg=";
   };
   cargoRoot = "extensions";

From c158832c51e5af38dd5e37291a1c49cbcb52af1a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:24:32 +0100
Subject: [PATCH 0686/1497] python313Packages.bcrypt: directly pass cargoRoot
 to fetcher

---
 pkgs/development/python-modules/bcrypt/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index 9c83ab0c5b1b..fa49f45058fd 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -33,8 +33,12 @@ buildPythonPackage rec {
 
   cargoRoot = "src/_bcrypt";
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
   };
 

From 6d8de291b422f67abb2a85dc01dcb6f229df209a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:27:22 +0100
Subject: [PATCH 0687/1497] python313Packages.biliass: directly pass cargoRoot
 to fetcher

---
 pkgs/development/python-modules/biliass/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix
index f58f280dae5e..03a8c74936f5 100644
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/pkgs/development/python-modules/biliass/default.nix
@@ -28,8 +28,9 @@ buildPythonPackage rec {
       pname
       version
       src
+      sourceRoot
+      cargoRoot
       ;
-    sourceRoot = "${sourceRoot}/${cargoRoot}";
     hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U=";
   };
 

From 0726017b4fcf2bece2d8702a6300092589ef57ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 17:20:15 -0700
Subject: [PATCH 0688/1497] animdl: move to pkgs/by-name

---
 .../an/animdl/package.nix}                    | 23 ++++---------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 4 insertions(+), 21 deletions(-)
 rename pkgs/{applications/video/animdl/default.nix => by-name/an/animdl/package.nix} (82%)

diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/by-name/an/animdl/package.nix
similarity index 82%
rename from pkgs/applications/video/animdl/default.nix
rename to pkgs/by-name/an/animdl/package.nix
index ca7e3abec0ed..28a2ecab20fd 100644
--- a/pkgs/applications/video/animdl/default.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -1,24 +1,9 @@
 {
   lib,
-  buildPythonApplication,
   fetchFromGitHub,
-  poetry-core,
-  anchor-kr,
-  anitopy,
-  click,
-  cssselect,
-  httpx,
-  lxml,
-  packaging,
-  pkginfo,
-  pycryptodomex,
-  pyyaml,
-  regex,
-  rich,
-  tqdm,
-  yarl,
+  python3Packages,
 }:
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "animdl";
   version = "1.7.27";
   pyproject = true;
@@ -47,11 +32,11 @@ buildPythonApplication {
     "yarl"
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     poetry-core
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     anchor-kr
     anitopy
     click
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5accf1cff649..09c32d2f97c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16931,8 +16931,6 @@ with pkgs;
 
   yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { });
 
-  animdl = python3Packages.callPackage ../applications/video/animdl { };
-
   dillo = callPackage ../by-name/di/dillo/package.nix {
     fltk = fltk13;
   };

From 7c6f50aedd536bd9aa03ed3a51a141db212a2200 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:29:10 +0100
Subject: [PATCH 0689/1497] python313Packages.libcst: directly pass cargoRoot
 to fetcher

---
 pkgs/development/python-modules/libcst/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index 5740deda9663..58c7c5e67781 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -33,8 +33,12 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${src.name}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-K8hug7JeLPIvrqgVaONKfixu8XRvn+pnqS0fHV+nTqg=";
   };
 

From 8aa2633d5600daab737e1e626daa18c489d85fbe Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 15 May 2025 01:38:37 +0200
Subject: [PATCH 0690/1497] python313Packages.temporalio: directly pass
 cargoRoot to fetcher

---
 pkgs/development/python-modules/temporalio/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index 63c45ee9f3f7..110d9a68b333 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -33,8 +33,12 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${src.name}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM=";
   };
 

From 6d70a4ac0eb912ddaecba2b89eab560ae09b2834 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 30 May 2025 16:42:15 +0200
Subject: [PATCH 0691/1497] ruby: directly pass cargoRoot to fetcher

---
 pkgs/development/interpreters/ruby/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 48a5724b150b..5e7357f2d01e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -216,8 +216,7 @@ let
           cargoDeps =
             if yjitSupport then
               rustPlatform.fetchCargoVendor {
-                inherit (finalAttrs) src;
-                sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}";
+                inherit (finalAttrs) src cargoRoot;
                 hash =
                   assert cargoHash != null;
                   cargoHash;

From 071c2273ef0d1a8ac96fee095a3eb7e28fd37c2a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:40:29 +0100
Subject: [PATCH 0692/1497] surrealist: directly pass cargoRoot to fetcher

---
 pkgs/by-name/su/surrealist/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix
index 175366a2c8fe..ac2372736750 100644
--- a/pkgs/by-name/su/surrealist/package.nix
+++ b/pkgs/by-name/su/surrealist/package.nix
@@ -60,8 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+    inherit (finalAttrs) src cargoRoot;
     hash = "sha256-Su9ZOPIskV5poeS8pgtri+sZANBpdgnuCsQqE4WKFdA=";
   };
 

From 501b8f1c698bc10902b70b2f36f9c6ebd24d55d9 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:35:43 +0100
Subject: [PATCH 0693/1497] wealthfolio: directly pass cargoRoot to fetcher

---
 pkgs/by-name/we/wealthfolio/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index 4f8b7ac07faf..56672781d455 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -36,8 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
-    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-MmdvEutdkX98DgX1aVuxs4gabuMX5aM8yC4eqgvd8Q4=";
   };
 

From 8e876759944795a410b39455d5c79b19b697d0e9 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:59:12 +0100
Subject: [PATCH 0694/1497] doc/rust: pass cargoRoot to fetcher in example

---
 doc/languages-frameworks/rust.section.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 5078de14d80f..39a24856cd31 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -605,8 +605,8 @@ In some projects, the Rust crate is not in the main Python source
 directory.  In such cases, the `cargoRoot` attribute can be used to
 specify the crate's directory relative to `sourceRoot`. In the
 following example, the crate is in `src/rust`, as specified in the
-`cargoRoot` attribute. Note that we also need to specify the correct
-path for `fetchCargoVendor`.
+`cargoRoot` attribute. Note that we also need to pass in `cargoRoot`
+to `fetchCargoVendor`.
 
 ```nix
 {
@@ -627,8 +627,12 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    sourceRoot = "${pname}-${version}/${cargoRoot}";
+    inherit
+      pname
+      version
+      src
+      cargoRoot
+      ;
     hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ=";
   };
 

From 6b8541bf625fc6ebee20da489785669758d9bf92 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 2 Jun 2025 13:20:58 -0700
Subject: [PATCH 0695/1497] vimPlugins.vectorcode-nvim: init at 0.6.10

---
 .../non-generated/vectorcode-nvim/default.nix | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix
new file mode 100644
index 000000000000..ac8e52fdfbbc
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  vimUtils,
+  vectorcode,
+  vimPlugins,
+}:
+let
+  inherit (vectorcode) src version;
+in
+vimUtils.buildVimPlugin {
+  inherit src version;
+
+  pname = "vectorcode.nvim";
+
+  # nixpkgs-update: no auto update
+  # This is built from the same source as vectorcode and will rebuild automatically
+
+  sourceRoot = "${src.name}/plugin";
+
+  dependencies = [
+    vimPlugins.plenary-nvim
+  ];
+
+  buildInputs = [ vectorcode ];
+
+  postPatch = ''
+    cp -r ../lua .
+  '';
+
+  meta = {
+    description = "Index and navigate your code repository using vectorcode";
+    homepage = "https://github.com/Davidyz/VectorCode/blob/main/docs/neovim.md";
+    inherit (vectorcode.meta) changelog license;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}

From 3b7cc72ca988c960758bb691f225d9542b7109db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:28:58 +0000
Subject: [PATCH 0696/1497] gitlab-release-cli: 0.23.0 -> 0.24.0

---
 pkgs/by-name/gi/gitlab-release-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix
index 7e827c7d3c38..0a5ba6824577 100644
--- a/pkgs/by-name/gi/gitlab-release-cli/package.nix
+++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gitlab-release-cli";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "release-cli";
     rev = "v${version}";
-    hash = "sha256-J+9BbzZYLR4Ie01NtjZRCcL/HtR78BiTEqFimfni/ps=";
+    hash = "sha256-ivOyDctjDfA4iGhZ0UxHTQYQGSQuQYDxndSn+IpOaJQ=";
   };
 
   vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU=";

From 933bdd18bd33b93ccc2588ff838c5bd02352cfb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:29:18 +0000
Subject: [PATCH 0697/1497] python3Packages.notus-scanner: 22.7.1 -> 22.7.2

---
 pkgs/development/python-modules/notus-scanner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix
index 5da6021893c1..f7d6ae2eff5c 100644
--- a/pkgs/development/python-modules/notus-scanner/default.nix
+++ b/pkgs/development/python-modules/notus-scanner/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "notus-scanner";
-  version = "22.7.1";
+  version = "22.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "notus-scanner";
     tag = "v${version}";
-    hash = "sha256-iTcGo33GRf+CihSRuK1GFXOpYL6TT8e3CRyK2/AA38U=";
+    hash = "sha256-JKDnqgEBzEIOI3WIh+SOycACFaYZoZHy7tPFirltDiM=";
   };
 
   pythonRelaxDeps = [

From 2db2fed53b4d2ffa02506146fa6b3282257dba08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:32:30 +0000
Subject: [PATCH 0698/1497] jq-lsp: 0.1.11 -> 0.1.12

---
 pkgs/by-name/jq/jq-lsp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jq/jq-lsp/package.nix b/pkgs/by-name/jq/jq-lsp/package.nix
index f82633cd71e6..428947a998f1 100644
--- a/pkgs/by-name/jq/jq-lsp/package.nix
+++ b/pkgs/by-name/jq/jq-lsp/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "jq-lsp";
-  version = "0.1.11";
+  version = "0.1.12";
 
   src = fetchFromGitHub {
     owner = "wader";
     repo = "jq-lsp";
     tag = "v${version}";
-    hash = "sha256-jnHM3VSfi0KioNmXlkjVIlV7/7bKipEvpnV+z13+59Y=";
+    hash = "sha256-rq6AZsRwCWCIqLH78mOAA2tWa66ys78hRCxnNSXxegc=";
   };
 
   vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY=";

From d307bc48c00e9f52c28c2ab7de8f8b5a38f9a18f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 00:36:28 +0000
Subject: [PATCH 0699/1497] cargo-xwin: 0.18.4 -> 0.18.5

---
 pkgs/by-name/ca/cargo-xwin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 5cdbbea67be7..039525814b43 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xwin";
-  version = "0.18.4";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${version}";
-    hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk=";
+    hash = "sha256-P4X7k0r29vEjsVHGOD/rFpltUF2PJHETVyazJ6c8UhQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8V5F0uhuJlc2uJtebQoHJT/qRZPCT2gXjwpRFbzUezk=";
+  cargoHash = "sha256-Oq3IfaywAZPrh4oom2ejPQRTM2BsgEzfaifaLAQzvbw=";
 
   meta = with lib; {
     description = "Cross compile Cargo project to Windows MSVC target with ease";

From f75147c277f232fb10e8b5dcead9d4e00d665323 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 01:01:07 +0000
Subject: [PATCH 0700/1497] amazon-ecr-credential-helper: 0.9.1 -> 0.10.0

---
 pkgs/by-name/am/amazon-ecr-credential-helper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
index 978b8cbb1c69..fa979d84fdfc 100644
--- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
+++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecr-credential-helper";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "amazon-ecr-credential-helper";
     rev = "v${version}";
-    sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo=";
+    sha256 = "sha256-so8ZquyfW2YLQj2Og60o3oACy/bxDsjeNA7ky/DHd2I=";
   };
 
   vendorHash = null;

From 2f77e272b134ff23915d03515eebdd4450a26815 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 01:12:05 +0000
Subject: [PATCH 0701/1497] diamond: 2.1.11 -> 2.1.12

---
 pkgs/by-name/di/diamond/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix
index a0104ed26108..3df9a9234b9a 100644
--- a/pkgs/by-name/di/diamond/package.nix
+++ b/pkgs/by-name/di/diamond/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "diamond";
-  version = "2.1.11";
+  version = "2.1.12";
 
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
     rev = "v${version}";
-    sha256 = "sha256-X/6sOClMFGBYksMrVfM1Y7MM3NmBEiRpmLg4Rbatc+w=";
+    sha256 = "sha256-C4hr0Strv7h76NzcOLB0tfbqKSk+Us6cwoJlstYfvto=";
   };
 
   nativeBuildInputs = [ cmake ];

From 1dec3c99ed102af11ca956b279272030c7a5c292 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 01:31:09 +0000
Subject: [PATCH 0702/1497] syncthingtray: 1.7.7 -> 1.7.8

---
 pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 0550b42cfaf0..0c527f192527 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.7.7";
+  version = "1.7.8";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-q7qGL89gPlFLV+lJgO7ruBPI2pBzoHqiF/FD5KP3cnM=";
+    hash = "sha256-aUIZJ+nSLs1W0zycu6Mz2pknJw4e+jNxaFLUpSP6EKA=";
   };
 
   buildInputs =

From 0135b8feef6c57b54b41e3b833774c842f0799b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 01:40:00 +0000
Subject: [PATCH 0703/1497] aaaaxy: 1.6.194 -> 1.6.241

---
 pkgs/by-name/aa/aaaaxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 8c41dbe8c3da..a1a3d289eea3 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -22,17 +22,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.6.194";
+  version = "1.6.241";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = "aaaaxy";
     rev = "v${version}";
-    hash = "sha256-4iL3+GeyOZoZN8IXo0jjSq3hYHKBTpytk8owXMdfACo=";
+    hash = "sha256-pfvz5qaGLhFw+UD4OL6R88Qw6Ml3Pn66ZMQI3f923JA=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-XBcrs6G3Kq9WsODegy2KxqSp+qwr+NpdLJLa3qmW9kA=";
+  vendorHash = "sha256-ojgI4HgNp2pbFAWeucdU8n3qW7ittAvp+ptDndCQlEI=";
 
   buildInputs = [
     alsa-lib

From a8a9031d1e0337d2095225bc2c9955864d7a6e6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 01:59:57 +0000
Subject: [PATCH 0704/1497] nvidia_oc: 0.1.20 -> 0.1.21

---
 pkgs/by-name/nv/nvidia_oc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nv/nvidia_oc/package.nix b/pkgs/by-name/nv/nvidia_oc/package.nix
index b3e6bcf783a4..717eb520d9d0 100644
--- a/pkgs/by-name/nv/nvidia_oc/package.nix
+++ b/pkgs/by-name/nv/nvidia_oc/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nvidia_oc";
-  version = "0.1.20";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "Dreaming-Codes";
     repo = "nvidia_oc";
     tag = version;
-    hash = "sha256-2BijC+LDZJKEheZVlqG+EP6+/GSRLNQfxPEUKCY8lfU=";
+    hash = "sha256-I5L+VUcbMw4lLvEvtcjs/3BXLKovEg/34DZAL4a7LJU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Xt+0clazawNvc9iIX6PR76NlyuJnjCTMkI/k2JzJ6nw=";
+  cargoHash = "sha256-VRrMSDKB8VrfdKUbZ63XY1oq0xaxgcwn739dt0C/KKY=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

From 76403e2dfac9089813c0d727a2325e1079016a7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:16:53 +0000
Subject: [PATCH 0705/1497] freshrss: 1.26.2 -> 1.26.3

---
 pkgs/servers/web-apps/freshrss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index 47fd945d0e05..7b4f54db4dd0 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "FreshRSS";
-  version = "1.26.2";
+  version = "1.26.3";
 
   src = fetchFromGitHub {
     owner = "FreshRSS";
     repo = "FreshRSS";
     rev = version;
-    hash = "sha256-TVtyX0/HKtLHFjHHjZDwOOcbHJ7Bq0NrlI3drlm6Gy4=";
+    hash = "sha256-/573UMMALfU46uJefxf/DMhEcIMiI+CVR9lg9kXFdF0=";
   };
 
   postPatch = ''

From 2e73d72004bee815b2126c517057d23c83ce44e1 Mon Sep 17 00:00:00 2001
From: Thomas Gebert <thomas@gebert.app>
Date: Mon, 2 Jun 2025 22:21:40 -0400
Subject: [PATCH 0706/1497] bigpemu: 1.18 -> 1.19

---
 pkgs/by-name/bi/bigpemu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bigpemu/package.nix b/pkgs/by-name/bi/bigpemu/package.nix
index 580328557216..6832de3b5d58 100644
--- a/pkgs/by-name/bi/bigpemu/package.nix
+++ b/pkgs/by-name/bi/bigpemu/package.nix
@@ -11,12 +11,12 @@
 let
   bigpemu-unwrapped = stdenv.mkDerivation rec {
     pname = "BigPEmu";
-    version = "1.18";
+    version = "1.19";
     src = fetchurl {
       url = "https://www.richwhitehouse.com/jaguar/builds/BigPEmu_Linux64_v${
         builtins.replaceStrings [ "." ] [ "" ] version
       }.tar.gz";
-      hash = "sha256-fYzC1gYi6/6/Ouxd1reRXRGHshLwLFK4N/Md7GiiU9Y=";
+      hash = "sha256-kiZ9yzDRkDLzd5EtjIn32TL27Y2GG8ysG0zTM1JRyTU=";
     };
 
     installPhase = ''

From 070a7700a6eb9362633b1940e102bbfd6e1e3a2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:25:05 +0000
Subject: [PATCH 0707/1497] gqlgen: 0.17.73 -> 0.17.74

---
 pkgs/by-name/gq/gqlgen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix
index 87f0129aef6f..a45d38f22d3a 100644
--- a/pkgs/by-name/gq/gqlgen/package.nix
+++ b/pkgs/by-name/gq/gqlgen/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.17.73";
+  version = "0.17.74";
 in
 buildGoModule {
   pname = "gqlgen";
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "99designs";
     repo = "gqlgen";
     tag = "v${version}";
-    hash = "sha256-s6D9ohFdUhch2LhpmHYBgpBrO/5WEM1TX/+DIfwxSPc=";
+    hash = "sha256-vnUsqJTurGK4pymgDHYpatQ8qW00SfJdxk+CfC/62UA=";
   };
 
-  vendorHash = "sha256-QN3ebVC6cJBnpm9Kyhg16EcXoT2rI1fR6QEf6i74WHg=";
+  vendorHash = "sha256-k0jWR8t9ZaShEYAXrJi7bUXs7uJ8/rbtHQioQd7/pf8=";
 
   subPackages = [ "." ];
 

From 8e57e96eb13bc3a860fc2b286b534cc2d37ea5b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:31:15 +0000
Subject: [PATCH 0708/1497] doctl: 1.127.0 -> 1.128.0

---
 pkgs/by-name/do/doctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 864380f6bdd7..50f0c3a67c5d 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.127.0";
+  version = "1.128.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${version}";
-    hash = "sha256-wdba3kly0Iqsqs0i+AGMsNtzO3dsFIZVc0g0arL/NfM=";
+    hash = "sha256-/G+T7tvK1Jg13a6cBA2T58yPPypP1j1/6IvBws3SEOA=";
   };
 
   meta = {

From bd20ceb6d9978c6d2f494f230f1cb9c6c864fac3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:33:17 +0000
Subject: [PATCH 0709/1497] rofi-unwrapped: 1.7.9 -> 1.7.9.1

---
 pkgs/applications/misc/rofi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index cb3793b782f4..b7e9ea3e707a 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -29,14 +29,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-unwrapped";
-  version = "1.7.9";
+  version = "1.7.9.1";
 
   src = fetchFromGitHub {
     owner = "davatorium";
     repo = "rofi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-YI6ShRRBJ9ExkzDnI31YjtI1mWRWPzVRYQvpTAtLTeI=";
+    hash = "sha256-HZMVGlK6ig7kWf/exivoiTe9J/SLgjm7VwRm+KgKN44=";
   };
 
   preConfigure = ''

From 9cdb3ffef0a9d9a74d40b55e5d8544198d935b43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:34:22 +0000
Subject: [PATCH 0710/1497] cotp: 1.9.5 -> 1.9.6

---
 pkgs/by-name/co/cotp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix
index f4425425c19f..9ad7560e9927 100644
--- a/pkgs/by-name/co/cotp/package.nix
+++ b/pkgs/by-name/co/cotp/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cotp";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "replydev";
     repo = "cotp";
     rev = "v${version}";
-    hash = "sha256-Jv5BT7P/OXLkkfrEf+8x2IrACMhqr3zpbcKX8I/TzDc=";
+    hash = "sha256-bbmxnzCUvhZ7rjaqbFCB+Qqx3EfY/W8OKhMNlt6KQ64=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9iZyi3TPnqRpt+SRI3t7kwwiGpwUjQ0BrLZQY3X383o=";
+  cargoHash = "sha256-pWgHwqU/xbD5aA2ZCuI7PaImmdojHATgZ+SVSwjnqbk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
 

From 569709b8dc7e00cc83ef7f9e7862112ea1f77c85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:41:55 +0000
Subject: [PATCH 0711/1497] xlockmore: 5.82 -> 5.83

---
 pkgs/by-name/xl/xlockmore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xl/xlockmore/package.nix b/pkgs/by-name/xl/xlockmore/package.nix
index 857e200f4bac..b3d209294a1e 100644
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xlockmore";
-  version = "5.82";
+  version = "5.83";
 
   src = fetchurl {
     url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
-    sha256 = "sha256-1pB43ywLfflQLg2PooSTKwWSepcrYo16tnyJwG/mt7I=";
+    sha256 = "sha256-ppjQmf1qPBnEHhl8EG2ejDo4pOj/B3wqpLrHYp1pyMM=";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From 361ecc5174e7bc568773d58ee933589e29b79da9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 02:43:15 +0000
Subject: [PATCH 0712/1497] python3Packages.granian: 2.3.1 -> 2.3.2

---
 pkgs/development/python-modules/granian/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 8a75a70eaa59..a9271048d300 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -20,19 +20,19 @@
 
 buildPythonPackage rec {
   pname = "granian";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     tag = "v${version}";
-    hash = "sha256-LDO5lyEk9ZJOfccVNYU6mIGJV952Z7NgMweQWclxQ9o=";
+    hash = "sha256-qJ65ILj7xLqOWmpn1UzNQHUnzFg714gntVSmYHpI65I=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-NYOORW3OQXSqmDMsFWjNl6UmN1RO/hAz+nuLfm/y6Uk=";
+    hash = "sha256-swfqKp8AsxNAUc7dlce6J4dNQbNGWrCcUDc31AhuMmI=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 50d08c8985d7d9bd4b0c533a7f013e263c151fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 19:45:41 -0700
Subject: [PATCH 0713/1497] python3Packages.anchor-kr: modernize

---
 .../python-modules/anchor-kr/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/anchor-kr/default.nix b/pkgs/development/python-modules/anchor-kr/default.nix
index 10828482b830..563589c651f0 100644
--- a/pkgs/development/python-modules/anchor-kr/default.nix
+++ b/pkgs/development/python-modules/anchor-kr/default.nix
@@ -2,11 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
 }:
 buildPythonPackage {
-  pname = "anchor";
-  version = "3";
-  format = "setuptools";
+  pname = "anchor-kr";
+  version = "0.1.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "justfoolingaround";
@@ -16,12 +17,14 @@ buildPythonPackage {
     hash = "sha256-t75IFBSz6ncHRqXRxbrM9EQdr8xPXjSd9di+/y2LegE=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "anchor" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for scraping";
     homepage = "https://github.com/justfoolingaround/anchor";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ passivelemon ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ passivelemon ];
   };
 }

From e3ddaec323a0b105ee74049322a24d91c40b96a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 03:00:30 +0000
Subject: [PATCH 0714/1497] 
 home-assistant-custom-lovelace-modules.auto-entities: 1.15.1 -> 1.16.1

---
 .../custom-lovelace-modules/auto-entities/package.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
index c855d8857b47..d58d8e61da3d 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/auto-entities/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "auto-entities";
-  version = "1.15.1";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-auto-entities";
     tag = "v${version}";
-    hash = "sha256-dGTbF7KO59Flw470i5U+0/ROEZYKe0KH9Y2R4JVyvd8=";
+    hash = "sha256-yMqf4LA/fBTIrrYwacUTb2fL758ZB1k471vdsHAiOj8=";
   };
 
-  npmDepsHash = "sha256-OvXlCqD9KI4D9xsTY7morOzXsB+3w12METm2uvcO9h8=";
+  npmDepsHash = "sha256-XLhTLK08zW1BFj/PI8/61FWzoyvWi5X5sEkGlF1IuZU=";
 
   installPhase = ''
     runHook preInstall

From 4e5773eeda27bc5eb25282693473940738a8525e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 20:05:08 -0700
Subject: [PATCH 0715/1497] tail-tray: 0.2.22 -> 0.2.23

Diff: https://github.com/SneWs/tail-tray/compare/refs/tags/v0.2.22...refs/tags/v0.2.23

Changelog: https://github.com/SneWs/tail-tray/releases/tag/v0.2.23
---
 pkgs/by-name/ta/tail-tray/desktop.patch | 16 ----------------
 pkgs/by-name/ta/tail-tray/package.nix   | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/by-name/ta/tail-tray/desktop.patch

diff --git a/pkgs/by-name/ta/tail-tray/desktop.patch b/pkgs/by-name/ta/tail-tray/desktop.patch
deleted file mode 100644
index 56162f2f4c01..000000000000
--- a/pkgs/by-name/ta/tail-tray/desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tail-tray.desktop.in b/tail-tray.desktop.in
-index 2d1c7be..5e859ae 100644
---- a/tail-tray.desktop.in
-+++ b/tail-tray.desktop.in
-@@ -2,8 +2,8 @@
- Name=Tail Tray
- GenericName=Tail Tray
- Comment=Tailscale Tray Application
--Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/tail-tray
--Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/icons/hicolor/128x128/apps/tailscale.png
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/tail-tray
-+Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/128x128/apps/tailscale.png
- Type=Application
- Categories=Qt;KDE;Utility;X-Networking;X-Internet;X-VPN;
- StartupNotify=true
-
diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix
index e91844da2856..883285623381 100644
--- a/pkgs/by-name/ta/tail-tray/package.nix
+++ b/pkgs/by-name/ta/tail-tray/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   davfs2,
   cmake,
   extra-cmake-modules,
@@ -11,15 +12,24 @@
 
 stdenv.mkDerivation rec {
   pname = "tail-tray";
-  version = "0.2.22";
+  version = "0.2.23";
 
   src = fetchFromGitHub {
     owner = "SneWs";
     repo = "tail-tray";
     tag = "v${version}";
-    sha256 = "sha256-1tYuZBJFIGwub3wJR/Ms1Dybhn3KMzKYrpgzZEXwqWU=";
+    hash = "sha256-fnr7EheVG3G4oLAe9liAy5qCDED/7eL0mUiE0qXsco4=";
   };
 
+  patches = [
+    # https://github.com/SneWs/tail-tray/pull/82
+    (fetchpatch {
+      name = "dont-use-absoulte-paths-in-desktop-file.patch";
+      url = "https://github.com/SneWs/tail-tray/commit/08aa4a4e061f21c2dcd07c94249f2eb15c4e4416.patch";
+      hash = "sha256-6YOJes40e2rgVabYns55M5h1FGyFG+gjSewCaXesT8U=";
+    })
+  ];
+
   nativeBuildInputs = with kdePackages; [
     wrapQtAppsHook
     qttools
@@ -39,14 +49,10 @@ stdenv.mkDerivation rec {
     "-DDAVFS_ENABLED=ON"
   ];
 
-  patches = [
-    ./desktop.patch
-  ];
-
   meta = {
     description = "Tray icon to manage Tailscale";
     homepage = "https://github.com/SneWs/tail-tray";
-    changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}";
+    changelog = "https://github.com/SneWs/tail-tray/releases/tag/${src.tag}";
     mainProgram = "tail-tray";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Svenum ];

From a9cdbd802358583dc8b66cf102a6824144e221d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 03:31:49 +0000
Subject: [PATCH 0716/1497] vscode-extensions.julialang.language-julia: 1.140.2
 -> 1.141.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ad498faa43b4..cfb7604e2eb7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2792,8 +2792,8 @@ let
         mktplcRef = {
           name = "language-julia";
           publisher = "julialang";
-          version = "1.140.2";
-          hash = "sha256-YQwJq3QSzb2pAOLyy0w8RtrjAlxudBGN52fQtj+OmOk=";
+          version = "1.141.2";
+          hash = "sha256-i5mY037rs65BKiQLvUbu9Lup2ljhZI0owqjZ0AUsXMw=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog";

From 6bda6c4366264c1357a7d5dc87dfbc3f4fd458fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 04:01:45 +0000
Subject: [PATCH 0717/1497] homepage-dashboard: 1.2.0 -> 1.3.2

---
 .../by-name/ho/homepage-dashboard/package.nix |  6 +-
 .../prerender_cache_path.patch                | 73 ++++++++++---------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index d746cd5bd228..b48cb98ebe58 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "homepage-dashboard";
-  version = "1.2.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B6hgQWAILfZNRFN4APX/3T2LcVj2FQPS/CAUdUA+drU=";
+    hash = "sha256-45Z2XS+ij6J6WSCb9/oDQa2eC9wKu+D7ncYwcB6K5gQ=";
   };
 
   # This patch ensures that the cache implementation respects the env
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       patches
       ;
-    hash = "sha256-1WsiSG+dZVpd28bBjf3EYn95sxMCXsQPd27/otWW0nI=";
+    hash = "sha256-aPkXHKG3vDsfYqYx9q9+2wZhuFqmPcXdoBqOfAvW9oA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
index 0cb82e17f77b..2476c65ade35 100644
--- a/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
+++ b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch
@@ -1,11 +1,26 @@
-diff --git c/patches/next.patch i/patches/next.patch
+diff --git a/package.json b/package.json
+index bb093c43..deeb4b8b 100644
+--- a/package.json
++++ b/package.json
+@@ -66,6 +66,9 @@
+   "pnpm": {
+     "onlyBuiltDependencies": [
+       "sharp"
+-    ]
++    ],
++    "patchedDependencies": {
++      "next": "patches/next.patch"
++    }
+   }
+ }
+diff --git a/patches/next.patch b/patches/next.patch
 new file mode 100644
-index 00000000..f4e808ed
+index 00000000..dd1d8b7c
 --- /dev/null
-+++ i/patches/next.patch
++++ b/patches/next.patch
 @@ -0,0 +1,13 @@
 +diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js
-+index cbf9f0ce142ecf2202ec957ccb5dffc7d176bed7..6a19329d33e471e9d49b4a80ccb712ab5b6f39a6 100644
++index c5bbdefd8aa2e97df91df00d1686d63fe54c8c0d..4dcdd8760e5ed135f7509c289abb33b5005ed470 100644
 +--- a/dist/server/lib/incremental-cache/file-system-cache.js
 ++++ b/dist/server/lib/incremental-cache/file-system-cache.js
 +@@ -24,7 +24,7 @@ class FileSystemCache {
@@ -17,17 +32,17 @@ index 00000000..f4e808ed
 +         this.revalidatedTags = ctx.revalidatedTags;
 +         this.debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE;
 +         if (ctx.maxMemoryCacheSize) {
-diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml
-index 170e380e..a6b1df1b 100644
---- c/pnpm-lock.yaml
-+++ i/pnpm-lock.yaml
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+index e3387dea..05918fa6 100644
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
 @@ -4,6 +4,11 @@ settings:
    autoInstallPeers: true
    excludeLinksFromLockfile: false
  
 +patchedDependencies:
 +  next:
-+    hash: 183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f
++    hash: 9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab
 +    path: patches/next.patch
 +
  importers:
@@ -36,17 +51,17 @@ index 170e380e..a6b1df1b 100644
 @@ -52,10 +57,10 @@ importers:
          version: 1.2.2
        next:
-         specifier: ^15.2.4
--        version: 15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+        version: 15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+         specifier: ^15.3.1
+-        version: 15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++        version: 15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        next-i18next:
          specifier: ^12.1.0
--        version: 12.1.0(next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+        version: 12.1.0(next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+-        version: 12.1.0(next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++        version: 12.1.0(next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        ping:
          specifier: ^0.4.4
          version: 0.4.4
-@@ -101,10 +106,6 @@ importers:
+@@ -98,10 +103,6 @@ importers:
        xml-js:
          specifier: ^1.6.11
          version: 1.6.11
@@ -57,7 +72,7 @@ index 170e380e..a6b1df1b 100644
      devDependencies:
        '@tailwindcss/forms':
          specifier: ^0.5.10
-@@ -154,6 +155,10 @@ importers:
+@@ -151,6 +152,10 @@ importers:
        typescript:
          specifier: ^5.7.3
          version: 5.7.3
@@ -68,37 +83,29 @@ index 170e380e..a6b1df1b 100644
  
  packages:
  
-@@ -4905,7 +4910,7 @@ snapshots:
+@@ -4901,7 +4906,7 @@ snapshots:
  
    natural-compare@1.4.0: {}
  
--  next-i18next@12.1.0(next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-+  next-i18next@12.1.0(next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+-  next-i18next@12.1.0(next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
++  next-i18next@12.1.0(next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
      dependencies:
        '@babel/runtime': 7.26.9
        '@types/hoist-non-react-statics': 3.3.6
-@@ -4913,14 +4918,14 @@ snapshots:
+@@ -4909,14 +4914,14 @@ snapshots:
        hoist-non-react-statics: 3.3.2
        i18next: 21.10.0
        i18next-fs-backend: 1.2.0
--      next: 15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-+      next: 15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+-      next: 15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
++      next: 15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
        react: 18.3.1
        react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      transitivePeerDependencies:
        - react-dom
        - react-native
  
--  next@15.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-+  next@15.2.4(patch_hash=183a00d10b2d534fdac49f2a3fe0e99fac7e401361e53e91c29d6f548caea03f)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+-  next@15.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
++  next@15.3.1(patch_hash=9673472f3289a59e3cf64a56303c75752c2556c0d74d2a648eca3576b2695cab)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
      dependencies:
-       '@next/env': 15.2.4
+       '@next/env': 15.3.1
        '@swc/counter': 0.1.3
-diff --git c/pnpm-workspace.yaml i/pnpm-workspace.yaml
-new file mode 100644
-index 00000000..fc500af5
---- /dev/null
-+++ i/pnpm-workspace.yaml
-@@ -0,0 +1,2 @@
-+patchedDependencies:
-+  next: patches/next.patch

From 8db639d97af5baa0f48ef9d592b3a4eae868c007 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 04:43:51 +0000
Subject: [PATCH 0718/1497] thunderbird-esr-bin-unwrapped: 128.10.2esr ->
 128.11.0esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index e879a9482ab6..7758d6a5d882 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "128.10.2esr";
+  version = "128.11.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/af/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/af/thunderbird-128.11.0esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "32ac45687bc7ac6687325123956030e3b5638eb5b6ba39e4b7c6ce291e0a7c3a";
+      sha256 = "b0a8ffa0b3a489f5c4121aaef34b51b13eb3802a77f3561601152796031a2faa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ar/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ar/thunderbird-128.11.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "59e2aa5f85c69b99d9fa30de35dbd81c4b549deb98beb15c3a3fe913f63a05e9";
+      sha256 = "1309c22fed0408f03fa7121de214625f622b74ada6fef86a289f7d660c6e17ea";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ast/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ast/thunderbird-128.11.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "b989c0979f2708d30c275cb03c7055d3758a6c21be3aac85ea0f4613e18c48ca";
+      sha256 = "6c97500878038dfe1823ef6c10295fb17bb54d86552e11964fb48db3ee1c1f16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/be/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/be/thunderbird-128.11.0esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b7ada50a52b826821c24e5ddcd48b0f93bc723cf7cb1807f5414f65f9a0f0574";
+      sha256 = "7c936e7ac0c2ece4ac5bf8529d327ddd86dd995bcb9f6b0aa0f538d7a61cb440";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/bg/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/bg/thunderbird-128.11.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "5656c1761dec960f2dcf12655594c9efcd987097664e4a3f8ca3ad84e1a15f10";
+      sha256 = "73280bd32c41edc38094c3299707c8b2449deba9735d32bf801967203f4e39fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/br/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/br/thunderbird-128.11.0esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "c953f8bc188049807b2a52308f63ebe92528634a1f1fbdc356c194d2c78a239a";
+      sha256 = "200bb74fce955a7e7fe1ae03d469e662cc885e76f543f05ad288be7d849042a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ca/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ca/thunderbird-128.11.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "37d64068cf3de591c7339d58e2a87a6e37a6efadf33b16b427afa775d16ab01e";
+      sha256 = "dde2e5e69b7bf24ff0e6cb9bdb202a3f363a568e5636109d339f9e24d62d5c79";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cak/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cak/thunderbird-128.11.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "997d42a67385057cd2c913c97cf1b0ca2d7359c4e90958935e28d3a670bda908";
+      sha256 = "d546f73a7d12eb5551a326d4ed90d1236a893522c9ccf636ef98e789f407dfb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cs/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cs/thunderbird-128.11.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "583a97c5725b1cd102ee862a795146d8e07b82831c66cc2aeba04983335569f5";
+      sha256 = "d72847a0cd7511bf954425b74f64190aac603577f0438cd86504f0e73e99470d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/cy/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/cy/thunderbird-128.11.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "100be8be3f2af0f974bd0c970a2e9a119d2789c3178b18f615ab26a8a5da732e";
+      sha256 = "27e198634bcee4eb9a048537caac55294cd08da193e9d4db6237173ce696b2ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/da/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/da/thunderbird-128.11.0esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3ba04f8108ca983444b6c9cf029d1be0a2b8a03283cc628c38a1754d252b2e36";
+      sha256 = "bfdcec29a1b0f512f5183b8ea3a3dde0de5e31c0a289108365ef208c641c57ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/de/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/de/thunderbird-128.11.0esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "34251009f64852e02acf2a7780e03b37e41238a738ff739fd0689def677d055b";
+      sha256 = "13b8cdc1bb772de898caf376c89da74f75cf2f4040a3cda858f0f88af3c8eff8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/dsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/dsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "378e3b2b0666985eadd85699be9f48b6b6fd01b92116c21abe3deadccd6bc025";
+      sha256 = "db534420d5fd292849e9f54ef9bf0755dd301a04b2700d2bb2ac8d4b6fd6ddc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/el/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/el/thunderbird-128.11.0esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "495dd2886f5569a5517ed74fbc23c8c7c5d73f8da02d4616470c518cd0182582";
+      sha256 = "3ddda65156961513f393c4bf13a679d5c878427793ed5c18d6b9b9cbfddd64ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-CA/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-CA/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "02fab5f0f675326a8da132a5d1edf4676754739bcaac81202f00537a2586de40";
+      sha256 = "a32fe87536fdb2537170abafe84ea860c2ab66bf247db9529b5029711c951198";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-GB/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-GB/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "a161eb8e8fc8fcf9c01d0df61c0b1e2942ba91c88e942b46b5b4ba6d5508fa94";
+      sha256 = "450afd730337f4bde982dded28ec0434996e3734a1b93ac93d981ae299af5349";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/en-US/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/en-US/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "d13d05ccdd81ce74acaabcafd930cc8ac401074d5076e566c52d713f78fbed84";
+      sha256 = "de6d32c96c6c3b99c0f35f6f38f08079d534a5b7f2ef38cc8cf1f61549885274";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-AR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-AR/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "81c96dcf22cb9f9a754cbe577476e2c3ad2a0c4b97362fa5a39ae9535b8a3fd8";
+      sha256 = "164c540d9e275860e5503982b3bda20d840be9728b8629c943a5fb9084168625";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-ES/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-ES/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "fff28b92e2ef78ae96021fa11d9f64a83a511d03d48456c38e7e979c654f9f41";
+      sha256 = "10a77813766ff14ad64d9317b9bb19877d135ab3e184a56516b79a524bf77c38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/es-MX/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/es-MX/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "fee9e9ded630da598162cfe13b2e9ab8437bed55ebee916e93319a39ed39c0b1";
+      sha256 = "9d2c4fac454703423a6bb91651bcc47c722a9cca8f739abc87c6bdd6b7523739";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/et/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/et/thunderbird-128.11.0esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "5e6b90bbbbe5b88db5475b506f44afef401b7d7abaea19f01d5bae69ccb2ea82";
+      sha256 = "a44d881fc416f588a4bed3303ed07b1fc158adf2bbac3196710d43a30065aa9e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/eu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/eu/thunderbird-128.11.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3904b86d5911e124671a36614d68801f0a702dd14c76deff1001084712d82ef2";
+      sha256 = "6847b49aa68e9adcf3883163aba6f012e3bc54998f5eec334493841bbbbafcd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fi/thunderbird-128.11.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "4d2637e90731ad0438c391c23a163557f7a8f392bec0fa777caa1864a566b296";
+      sha256 = "8c1d9abcb72ec6dcb9b3d40d0311c28613d0a2efb7869ccd6ca04a423bcc1b64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fr/thunderbird-128.11.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "3451a88c03c8609d0bba49403747adfdc104ade529a41aa0ea69c26d7d20e238";
+      sha256 = "2ddebc586491cc7448c22fa13585b82a6a13c91d46eaed62f77128d63efe4b67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/fy-NL/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/fy-NL/thunderbird-128.11.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "04ef53f52451b1a9cb9cbf8d24e58c1eadad6e355fde1d40584ec35fd729f37e";
+      sha256 = "c73d2692e2be3e86253657ae9c98186249b579aee77344c13d9c16d9dc30f1eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ga-IE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ga-IE/thunderbird-128.11.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "065f54dfa31af305456d6adabe104aee8b36614b436e2f507304532f60282f4a";
+      sha256 = "f7f1a13ba8c9e59b9d5a6049d7970d8bcdd407e4823c3c3ed4e118728cd17640";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gd/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gd/thunderbird-128.11.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "8f5be4d85b29a964492155b551c1a1d2d8aae519b9ec3ae6c4deea3ce6c3118b";
+      sha256 = "dd60c63c98dc43e7f6446a3d563550dfe35c3c5350a014ec5127b20453be8a74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/gl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/gl/thunderbird-128.11.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "d8d436272b00d3bb417a2ed9557473a51bb7ad8cb124b6f3adcb48a044d20139";
+      sha256 = "b89d7f956c78a8432c0e02e100f286585df6f17af43ba005b8b4aab02e72fbe6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/he/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/he/thunderbird-128.11.0esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "4e9d21a0300b3d5fc0c22b4578029f7891eb198d3899a41a97e43e31b5744456";
+      sha256 = "36d5b9928cc3f70882931defe1f87d7430514d358ef7e9214ea145ee096966c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hr/thunderbird-128.11.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "f9f471729cd9174292310370ee884dc64a3d3bb007c0a90c0e51a3da603e6441";
+      sha256 = "070b2e037e96e338d658b088ea2b39b75799dd5aff1cbab2f942f7142d9bbd5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "d919b79430d951386d9e340066f030c66574e4cc800e8986277849133c075630";
+      sha256 = "5d69c7f93def7bec56afb85990380c6eb76c543af61aad3933493fab60081d0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hu/thunderbird-128.11.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "b86531fad71c2b7287f9cf4eedee394bc8df4fa5fae69983b371449f7037f517";
+      sha256 = "6253b1908a8c268f51babd096947d4755bb4eee3d64bc06e9fa9ee44d31c9813";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/hy-AM/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/hy-AM/thunderbird-128.11.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "a34d67d0feef03ca29c6e18361e2240016a8dab99d4088ceb1856def9c032103";
+      sha256 = "422965b47284186ab870784274ba01526069cb7c14384286e46414e079dee130";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/id/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/id/thunderbird-128.11.0esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "dbf37b9933fad9455e4369315288bd0b27d5a35a3cd7f287064740516e7b0ffc";
+      sha256 = "f1a91dbcdda48d90b517d1e1966dff27f16c2e5b3bd9ddec0b026a91f41080af";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/is/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/is/thunderbird-128.11.0esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "18f2bc1194fb3bbddf369812c39820c9d2f18acd48bc8d9b0ff18b8607cbd3a3";
+      sha256 = "e2b3127f2b032af7e2cb69377700251b0fc9b26c68258884c9de2236d38ac1d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/it/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/it/thunderbird-128.11.0esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "502731138817eacd40b39c1bd4fa8bd99229322379a4f943889a98112686c56d";
+      sha256 = "a3ef4ccb354fe207d037e0ffe802b334f127dbec84138782316d629f3568a4b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ja/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ja/thunderbird-128.11.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "5a25e8b6ca621834569535b112018f537713c6840bb790bfb9eef10f60ea1979";
+      sha256 = "0a8ce5f4b644287f38279693b7859576961b07d0a6e019b408fe18ff92d386fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ka/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ka/thunderbird-128.11.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "468da54c2eddac0b0b62284b6112e7ebad18f20ce94ee9ce7640501c7b4eefa3";
+      sha256 = "724c39f5f6cc8c3de6fdc80162e2f07d93a661126466a4802f3acad54d10a402";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kab/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kab/thunderbird-128.11.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "3a80a0d11535e220ffccbd4009d70919d0e51e243cea9838dee713e0c48622bf";
+      sha256 = "136a6aa0611487b679beb8ac4bbe4512015e5432d7a3c109b23b2ad137cf7138";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/kk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/kk/thunderbird-128.11.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "27f24eebe0c8944a4378fa79b94934ab1d52151f33e17ddb79882efefdc2ecd4";
+      sha256 = "23c544b09ba1e49f56a8eece84d07b2f683ae7114ffd6e6377bef46591721ece";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ko/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ko/thunderbird-128.11.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "1c5ece914d5c2fefad92b86826a51dfd14fc6b1dc10c98cc1e6111c75023369c";
+      sha256 = "b17748d3d4306f661cb708b859589c118b3c48b3f833e7d545a0940084454d42";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lt/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lt/thunderbird-128.11.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "fde7c5990d66185b314d76ceb8c333ff64099ffc07e63a332c5fca6c00ba1f14";
+      sha256 = "4e6bf8b343156935412358b0e362f7de7f66cac00b94824090e8c89966a589c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/lv/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/lv/thunderbird-128.11.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "37fe3860e71c18ca6ae3d2676a59551b730a4d8e4c86dfb54c45caa23092e996";
+      sha256 = "9173422a5df58b13f62d74df636555f7e040bc8f3cba600aeb29626b3c989327";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ms/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ms/thunderbird-128.11.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "acb16c973cbeb2df79ef47b81d8dcf34244fc47356a9de4f02056553bab176b5";
+      sha256 = "6bfb11c4461c4292402fe3217d1be193136a0bd660440b12465c4a3e7255c0fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nb-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nb-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "cee8d13a7a5d740f7bd3816ced07f3c5b15f57890000786fa30971ca877852ab";
+      sha256 = "c69773267bbc3dbd6a7d53b66a02b8b6b76f34c899e710a0d446e4a0839531f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nl/thunderbird-128.11.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8a357e8863854549e34f568bd3f13e8ea764469a42bbb4f77e3b34bdf30a27c4";
+      sha256 = "05458c4137e09c20f9be6e335d346e048d054dd62fb1f2a89500790f14ee7c76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/nn-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/nn-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "307b17af7bd1f49e4ca53a32515b37a25b5cf5c438ccf14340add0043eb7f090";
+      sha256 = "0055cc060a0934d20e4e264d051ac50eae91455554497c9f5f4ab2aaaa382a76";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pa-IN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pa-IN/thunderbird-128.11.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "246c22a85f5774f6255bf18c893131abb4366631b0adf6c17ef0eb52a2d9fb67";
+      sha256 = "8dda9257c94d3a5753f578c67a8c5c939757bbc812d2f75a02633dc6717a6712";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pl/thunderbird-128.11.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "a77097830b70ad7359032ac1c665ccc8336fb1c73dc9edd515439c191508ac43";
+      sha256 = "afdd28291f27a634c8b7d0d3fb4d02056973818a4218913a20d4560e8b532fa3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-BR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-BR/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "25683e5114e047bd971ee110fc2a2deca4eb05895585bee19d9febe6daedfec9";
+      sha256 = "496b95963b9949a7009d2416837aac60523fe53ddb07dede29a60680532f0f0e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/pt-PT/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/pt-PT/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "314669c2e16bdcb921edf2c7d4a05bc1d3c079cab571913b229f8fbda6b9a0c7";
+      sha256 = "ab60938e6f28fee805d23d739d52b003ee9b94ad2648d917cc8dcf283ac59980";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/rm/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/rm/thunderbird-128.11.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "bddc21e319f78f91e10f9fb670103c62fddb7e342fc69cf6cd9ba1414f813dbe";
+      sha256 = "4ff61809a1e3fc19e415d11c98eb6cfd6f94d8246de3d4d736612820a5461aff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ro/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ro/thunderbird-128.11.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "fcefb28c153e60f93b64b31e3a5214b0e3feac182cb2c6abee9b81954a8e8f3b";
+      sha256 = "a4debb5cb3782c674f1fe48064fd761ae80d15388fbcc0303ee8252d7c6a8ef7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/ru/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/ru/thunderbird-128.11.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "7fbf7fdaf651279f7da0ba0ace7c84b283851f1c66d28cc4e80ae995d13c950e";
+      sha256 = "fcf137902ef9fbf274bba913277ef04a598f708c0eb5e6e0bcd8ccb26485dd37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sk/thunderbird-128.11.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "bf1555bb22dd49e884801b7c2206d23511373fa1bb0b41b51c3def0b2fd61080";
+      sha256 = "666e6f9e8fe7d206a356fb577c61c08da96bbe176439e52e855a2c3125cda9b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sl/thunderbird-128.11.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "8d5c9a36f43f7b01f50dd331191851f84871369aae51ec2aa35cf1b3a6c5db2c";
+      sha256 = "21bdfa1b4f26d3c15bbb19d14e9be1b8810e143d0163276f88961fc7f8c9d2a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sq/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sq/thunderbird-128.11.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "ec2e4438939c531f0cb9a7259587c2b34741e35e1f048f8afc32da21702cf48d";
+      sha256 = "c814479ade79d4f1a67fec8f0029602eea11b3e4bd1b04def7f2fce38e7f9f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sr/thunderbird-128.11.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5b4497554d608437a8b30838a7fb69225c9ee278294ac0001ef81f423a89f749";
+      sha256 = "f763ec52bd9ad5597177be270b4f64262d79a50a624a614ae391d8aca1f16f81";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/sv-SE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/sv-SE/thunderbird-128.11.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "52f0c7d3dcc0436f5b7e5ec1d6931c492d1d4ca22c1e0d8283953eedc953d075";
+      sha256 = "113bf376ed90b9d40f3a305b821e1ddb578770b7ad7dc982c5e21aa1cc00f437";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/th/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/th/thunderbird-128.11.0esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e0e2ab100b2377a4a36f6316bfd10b2b710192e6140473c5a7f632f25a826e75";
+      sha256 = "c188b57aa0a53d4fe904e3978bf1e49d0dd62bcf817ed5a5c65466d202389a18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/tr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/tr/thunderbird-128.11.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "9d004357fd63aee822743c5b512b607a42a58ee602a6cb9b2d49649e21de62c8";
+      sha256 = "3dcd14eff5be9c753cce59874ddc3f0424d7fd55dc7c85f615580f9bd5f1b4b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uk/thunderbird-128.11.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "17f199833b8a68334fecc3fe9e2bbe0640df1edcaa5b73099b9ac3450639e7ae";
+      sha256 = "230a96141510e9cf113781ebd4749fcd2e4fe5e65054cc6013ebe1e38406f55f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/uz/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/uz/thunderbird-128.11.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "b7110c93ec4a371751d59e4f53b70fa0b7ecb8ce37c39338f4290b67bfaf57bd";
+      sha256 = "1729cfe13c1df489a74b6307ac08660e3bffd390ac8b706061ff2b05f866619e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/vi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/vi/thunderbird-128.11.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "a65d2d75efe893ff70fdf8066a2fc9c2e01335bf888018138f8ea3305023b988";
+      sha256 = "89e07861fec281e858faa92bcca44e393d7cfcb240db525451d9c21671447ac4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-CN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-CN/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "67e5388a5104db522656a8a71ec981aa66738e224cae387ec20ea16907bb156c";
+      sha256 = "91f65b163623a716ba54656173e48e73624f35b80caad06053eee3d3bcb3028c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-x86_64/zh-TW/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-x86_64/zh-TW/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "d1c0f54b1ed4c774e448f639de527c3d8aad7ae4fc9a208831f9ed24c096aad6";
+      sha256 = "b7f1e29fdc6f1333c8717ccbf8912646ee6fe8b02215c13eee5310a1bd1751c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/af/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/af/thunderbird-128.11.0esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "554d279e12a5eb69026515927cec8d52f413ed135abdbdad4ce4c74beabc3ff8";
+      sha256 = "79e8f7d5fd539b76dee8083c14784addee0bda0117b51b219ebb4762e9d0006f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ar/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ar/thunderbird-128.11.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "0368bdb472973f90852a3a1d48110a80a011e1a10aca7c79a69abf2f6450aa0b";
+      sha256 = "a98c61432bf0150d41b1e91b0094939b6a39348878b31b7195762e2de2802fe2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ast/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ast/thunderbird-128.11.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "84b219380fc971949ff5439c725c2e4c3f9fee45d3c21a89c5e1e792f16230ce";
+      sha256 = "ce19fd8535e87d57673dc5f01bdda71ab2ce4dbfe4b8a5318ab3779f16b912a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/be/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/be/thunderbird-128.11.0esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "9517508abf59a3808a72a6cff8340fc0f6b513bc3e0a6c25f5a3161545df9831";
+      sha256 = "9972d5163c1167650a7be20962a2f1f24b3e8bc7523f6e0fe4592b3ac67c00b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/bg/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/bg/thunderbird-128.11.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "1174c9d5e8e4eb15c3dc706573a26508e9166f569b524bb72a4722d3580622c0";
+      sha256 = "3b30ccc53a5cdc0524dc87b27438bb0293e78160d4c9e73fdd6566ce3f1e0d17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/br/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/br/thunderbird-128.11.0esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4fd4aeaf463cfe51edaccebfc5002ad2b0707d95c34a7507079c0a9c05e235ba";
+      sha256 = "4f3748883067431b85f7ec7232f547bc796593f39df19619791e8e1fcb33176f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ca/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ca/thunderbird-128.11.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e5ea1ee6183f22afb5d82037c02f113780b934742b2bf34f45d6c933548166c7";
+      sha256 = "e4c7d90c5d7bcfc094321f31c90aa781df05a09cd9233bcc1d0ab4245728306d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cak/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cak/thunderbird-128.11.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "03bc4a5836a1c53e63928aa353fd139131f563f0cac57fb756a90031635102d0";
+      sha256 = "2dc3d129c1bcd405ea401713f1e2085d240a8d7a639b05b8c8a41130ce9ff794";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cs/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cs/thunderbird-128.11.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "b0045dc51487acae65a19859eaf77da0d46bfb802fa47de8b9928a63cdc0b8b4";
+      sha256 = "668bf801d6276dfecb16bb8725f1bbf30b29b88cec84e4937e6f183434f01004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/cy/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/cy/thunderbird-128.11.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "24784b3d632cbd0406d3f49bd59b91bb58090437fd5df3a779a5408271ec4ef3";
+      sha256 = "8c5c187ac03f6c15dd925b8629ece2600502d22195d189a8bb1c82ba53906e23";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/da/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/da/thunderbird-128.11.0esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "344b2f94ef3bf421de9a080e746cbcf0ecee452e087b0367fa154dd1fc739af1";
+      sha256 = "d56faf22d047e0c8e812bc90c8cd386ae2064eb0c393b0b511c20c672665e5be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/de/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/de/thunderbird-128.11.0esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "0417f7ecefaa36f4bd71649b763438337f622574717a5f14ed95f8ce3df89fa2";
+      sha256 = "ba27c673edcfeb3062cfb302e58feeeaff1a6a310211b245d37a57f55cfcdb25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/dsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/dsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "04ebe59e2b011e6a730fcd1b69111afadc074ec50ea6e59618ba4a0d0a6f06fc";
+      sha256 = "838caf3134a77780ca9df68478e3bf82823dd4ce30434bc6602990e6570772aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/el/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/el/thunderbird-128.11.0esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "4dd04548a217bec07da4d895868abc120d88e302c019c685fbc1c36cd0d229f8";
+      sha256 = "7280b1211b1573e15dcbd27e9494c1e2425756ae8f23e1c16d89e9fc759421fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-CA/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-CA/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "d56e986ac4c5480816796e23f929eb5184bd901039e663f6e9bf901b489a9086";
+      sha256 = "1cba98d71b0cf1a9eb650a45876f533344038214f98f1de985e295397dd95acd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-GB/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-GB/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "d5ba719a84000c14daa25132d64fd321aea901ff9f9e939a94ef6a93bec4481c";
+      sha256 = "b6b95419b44feae7eb47f1c31625c0d7ce7a201642fbbce881f954379efe3e1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/en-US/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/en-US/thunderbird-128.11.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c6ce95eba101ee2551d79e59b677ad13628c97b7a3e601c99962fb6b385e9474";
+      sha256 = "15296a6f1fa57e7c9b204925c19503eb4848a4ca024677fb3fc00732661e5f9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-AR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-AR/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "2d91e16dfcc286be656201914aa62704161f491048ae892821f00d1ffd36ec0a";
+      sha256 = "01d801f7171a76f8d60de07ffa47b41ffb10f2bc904d72e0b7f2902626a724b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-ES/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-ES/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a7a839b57ce0879cfb33ee70b54bce0a3f9052b3b6a2a9b2268f01610fee01ab";
+      sha256 = "a8ef2366404d128b2107f0fe63c4246497bee7c45a5180c21e9f1a28744bda25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/es-MX/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/es-MX/thunderbird-128.11.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "2dab61fe7ef7ac8b8614bf7111cc7a2dea4243ffa0dc37595f462d9b879bb4d6";
+      sha256 = "28b87e0a3c422146b15e17d523aff37cbd56be81d2b5541f6c62f72eb5b34be8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/et/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/et/thunderbird-128.11.0esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "538af624c7d96901899de0faed1091519f7ac5fad4f260ab40feee24689331d6";
+      sha256 = "9ea05e436d4bbe64b3126090341615870cae452757e6a0f8ce0c6da297caa79e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/eu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/eu/thunderbird-128.11.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "25eaa899a5f0e5e1787e856e3f7a7973d968db2bc6948445d058c4c7a43afe04";
+      sha256 = "7b25e5ef8ae9f353358d58226ea20582d196d387469011fd2ab3527b737953f2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fi/thunderbird-128.11.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "393ee4e73b1a6906ab36191a387c657723795857df5ef5af3206f5bcaae8150b";
+      sha256 = "7a135aceb0c1b9b2d0517d48e61ef56bdc2370ceb3e65d5e4ecf948272b148d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fr/thunderbird-128.11.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "ca8a858a80e64f83a06a3900a6aa9dc445854fd6e78b7e8b9cd8ea0e161c547d";
+      sha256 = "2263eb3f54e93e2c6306d0e68f9e27988e7c09cc6dba08414595d01face08740";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/fy-NL/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/fy-NL/thunderbird-128.11.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "c94884eaa33c589d51d3f50db142b6da46c721e9967f4f38c5e888c465e73d59";
+      sha256 = "dfc031584e1eafd390cf286a34232e296dcd98ea3818f60dd38965d44432f565";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ga-IE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ga-IE/thunderbird-128.11.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1dff069ff686f802a9a4f994d951562b95672b7e622190f7ea68c72100260004";
+      sha256 = "b80b2e6e57d2b63e495134a1829660ad125a55f1caa561ffd98d132c97a139c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gd/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gd/thunderbird-128.11.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "3ba96213640608e651a3399b11f549e937a8934942fc7b2ccb5211eaf308bb10";
+      sha256 = "29228207b3aac9bd54df245031459ebc5495b0bb15ba4cdd936dae566d94deca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/gl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/gl/thunderbird-128.11.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "be563f8931f6d4c2d2884954918695e45954a17cc1ed918632ae374f8a72e31c";
+      sha256 = "9ab1995698d206eb046e5b96e6f18c290e99ada6c7b7bc64347fb1cc603ce66f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/he/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/he/thunderbird-128.11.0esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "0907587fbf48098d8893e584ee5b95084be62c2e9a201a2f76cffebdd184cd60";
+      sha256 = "9adf0aed871d04cfe814800f1fcbc8128a9449afbdd21d9d4b47c0c9048df61f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hr/thunderbird-128.11.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "3fbb591beb65c487e343fb8b95576df8a034ddf60c5e022c98e2bc51ceeeaefe";
+      sha256 = "b62307dbe3fa6d62600dd92f9416a2bbab32b12bffc2668242eeca33093871d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hsb/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hsb/thunderbird-128.11.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "d36e0fc30948362447e15a3ddbe5b7753cbb4f6047aa50a605e31d0869541736";
+      sha256 = "246069502c7e64d2772274a656d7e4a80a6b4e053468a501a9603609d24d3c6b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hu/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hu/thunderbird-128.11.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "de307687acfd84ccfb2c4e07778a56738ca1d07a5d91099f1d6ee0c031c889fa";
+      sha256 = "f9adc3da0aa28b66ebc4f370d05f58904d361b0e3b24078d653967490387ef50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/hy-AM/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/hy-AM/thunderbird-128.11.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "fd487b9bfc7e0a0be153cdec4d46a67a9fbfddd21746836d138f1c6170ecadce";
+      sha256 = "f77f12e8d0323602c8994e3bd513190558aadf34c21d29fe1b13f4f9156e707f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/id/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/id/thunderbird-128.11.0esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "28829aec9940b2cf497ccfbf00011cf05da3093b7fbf7733314b29b0c2370964";
+      sha256 = "7b73d10c98ab8dd3b808fae707878ff5726944cb32564b9c03c4dcc83fdb4c2f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/is/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/is/thunderbird-128.11.0esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "df72777dc77c19b79d7f2c0575daea73ddcf797aff95ab89d8e284ca911c93f5";
+      sha256 = "77f500e0e9b2571731b7095d1660260bfbfd4e69c4731e19ebcd2d3e9621064f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/it/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/it/thunderbird-128.11.0esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "f8afa4bdfba62e4827f5ad6542e96b77135191caca4604d719ca3518475ab7f2";
+      sha256 = "209bac038f4fe98fa717c0d4c8edf2ddfc8c10351024db3dd184446be0df9020";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ja/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ja/thunderbird-128.11.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f76939f1ded154bbb0bde163529236ffae3a4d12b9fb2cd606334bc862506e8b";
+      sha256 = "4f1a227819a301dddf4a6a59e1655fe5c45030dcc20ef00581a9a0072cbcd0ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ka/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ka/thunderbird-128.11.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "89de590ac0b7d90557c3197d3a56d01553fd9611640ab18115d8c8e1d6a43eaa";
+      sha256 = "7b91286ebdd92926ec66c5784f28c028dcf8466524914fd795ff054f65e87de2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kab/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kab/thunderbird-128.11.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "dee0d7fd820c95bf174ade270517cdef450fa849c467cce8564c966ece6f339b";
+      sha256 = "5c4900accf4e1c78de6e8b8c010ea4fb6caf8f13746be982acff97fb50f73680";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/kk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/kk/thunderbird-128.11.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "e1478b260477e4d464ced10dabb22d1ed0750e3c6f43be1fb3ae61a1162a67a2";
+      sha256 = "34c00860100e2a6f628440f2c981ecd20bff6d6277acd29b4f7206c8c79c842c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ko/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ko/thunderbird-128.11.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "56790b48cc32d739ca730288cdccce25f54424e21c91424eb8324943afae2aa4";
+      sha256 = "8eaeae964a1854551819386b2fb84a4fcc77f3d4ff512a234ab7cfcede93dbd3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lt/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lt/thunderbird-128.11.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "753c27fe095768054e25e1dce5d85e8242357ea859d79691ee8ac42adb2e147d";
+      sha256 = "be8ae36d61171efb90f94e40c6548d29d79cfa75fbd4c1eebc646a09f8eb62a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/lv/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/lv/thunderbird-128.11.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "c8451f012ebf33d1869397f00b200280ad86aa38d49e9d3c9a1125e4fcf755ca";
+      sha256 = "be4617b8892e9402c3f71222d0f4c5dd817a6150fd62ecd06e3ca39a5567d317";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ms/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ms/thunderbird-128.11.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "9bc0113511a56339cf8e9e8fc1c35a685b0a5afa01c62a7db4449678a3b8dac7";
+      sha256 = "9d91e6caf44a4fb59bc2f4eb98120f8edf99410b26dfbd19e95b5147d8dfe40a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nb-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nb-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "9f02a3feb0db4d1e79b3c347f022b97bde01f4005b02997170eaa2b429b5be4a";
+      sha256 = "a2410593b21fbd893529e69dc9014d2a0656eb2b386abac88f8fb7719e40fb73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nl/thunderbird-128.11.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ce88dedc9da2f2ab2851fddbd44c00cbe4fc74003f969f9613e691c9de5ccbc9";
+      sha256 = "6213d0b2338c7bb96e489bb98497f411258ed7d5b9ff911e1190cb46a19371a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/nn-NO/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/nn-NO/thunderbird-128.11.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "413cb0d84dbba0c3526f7c481fee6259cb8091bfd4f15d93aad0859b9efa5c30";
+      sha256 = "7fab860f87513fd6d51d5059885080eba0145679ae0e08cd32a5fcbce4b5574a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pa-IN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pa-IN/thunderbird-128.11.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "cd27f82b0c424271f72713280691a0822454cc34359102b3bb3746da4c0e12fb";
+      sha256 = "71812f79a2caaf52d82d0c979a00d9617dc61cce7271e9fe7a77a0390d4781ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pl/thunderbird-128.11.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "6319af7ae44e5c7c70447eaff2d08c40c94bd148b12ee503cb46ec60ed67ecec";
+      sha256 = "c21318200cf87abf4ed29ee28042194e2e98476ec6b0b5e5a969c6f03edec86c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-BR/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-BR/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8c7795b78e5b33e796c62d3cf6b14923f800dff9780586cf5b5e09c4a08bd1b5";
+      sha256 = "38f250376d391e3b1d6e8911ffa17f958499635f5edbdf1f24ac1fe20b954d5d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/pt-PT/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/pt-PT/thunderbird-128.11.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "537275194481b434b4da764f531982b3cddc65026772c6eca4bab7716324bcd7";
+      sha256 = "49486228ff9d9386c30121f0486e6706d0f0288a98d1a609b744b72e9b33f75e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/rm/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/rm/thunderbird-128.11.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "9184a43ea9278cd8e21a87a9e01e798a87fd4c5f16bb726dfddd388691381e02";
+      sha256 = "0ea2ca69000833a10ce6514c29271cef21f3d9f5c8190e65f7a4fb6e04772b11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ro/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ro/thunderbird-128.11.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "872af950a18ad098b7451bb9a5e3db9e59ef4a4dc6397f745bc33498c65c0123";
+      sha256 = "711600bf95079a73f2bb8eaa4f38a03f6f19a6ec0cc2a7eb190bc83e2691b400";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/ru/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/ru/thunderbird-128.11.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2fa2eed44bb13725e284f48e48a258d1c94cc703a1e828dd0dddb68ab71275cc";
+      sha256 = "ae8a9c18f949cc8da0b59b1c5d0d8fcb8971c17b877ab3186d7db6ce7e4d1a5b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sk/thunderbird-128.11.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "2b42255b7b46701a3d36a63402aba2897d92feda5264b4b815054f51aabf1c26";
+      sha256 = "d208072fad055567a49aaebd077d0792ccd1eb5abe06bd1ded38290acb46be84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sl/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sl/thunderbird-128.11.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "5d624398004e5057e70f27032b65556617b5f523916d63dd06912d909d79570b";
+      sha256 = "1dfb61309fe70f8e2e150eec820f8b781fddaca80eb505aeacab20a606b79348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sq/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sq/thunderbird-128.11.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d18adc705068b99e1a8db93fcf61354cf9d7e635242d040a6df999f75db47534";
+      sha256 = "e840139cab6e541aadee9176a499e8b43bdfe5b235c027be057863504ca8e8e4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sr/thunderbird-128.11.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "b88f6abf7f6b07221f218b1ec37598b9aa01dd9e2d0438f2de64ecb75a741aa4";
+      sha256 = "e0bf6f7b511f42abe57aa8fb60c2c17644917b64fb2cce153d84c4c05f768c4c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/sv-SE/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/sv-SE/thunderbird-128.11.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "54605b5dfdd075d90a47df2bf2b0de2e4d09efc69d94978e9602c703c11cee3c";
+      sha256 = "7a0c15fd62d7cac19603703ea98db055a8f6a2919b3014c24d4239ec81a9affa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/th/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/th/thunderbird-128.11.0esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "bbfbb4c2054b83dcb5eb8d462b3e5f1a3484718107ab76209c10b38036b2fbb7";
+      sha256 = "a7ea7940d8633b658434bda40237fe6ade0d53119df682d3cf29e22dbc40d0a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/tr/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/tr/thunderbird-128.11.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "7e680d399821d1c598539f96e8620230fc3189f4db4e69726ac4f5290cac5847";
+      sha256 = "b0eeccd04d688630eaf5b89abb315a8ae6d26ebdc9aa81e162de038f0b9ce823";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uk/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uk/thunderbird-128.11.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "30ba8c50de9f3fadbbb6f2e8f266d23a4a2a3fa790017eca5a6cdd20ee0ab2cb";
+      sha256 = "8887e558faf706e0d06361263467c530f0effbb5d98182f9c0a86660f43070ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/uz/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/uz/thunderbird-128.11.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6e58618fe41416118fa64b2ed39673c288ae201bc6d79b3babf91d92bc1ae52d";
+      sha256 = "7340529cc7b782a976198ff9b406cc2ece3b38b5cb21e06f671a0dbe9e69624f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/vi/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/vi/thunderbird-128.11.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "278150ef1e4da83135d923bf6946e055429c1b868b6497e2883e73829420ec52";
+      sha256 = "90fe241497823b198b05204ec7912286cf17adfab93278ef7ef6e3751a929505";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-CN/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-CN/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "1aadf0d5c77ca3953c69a0ee83d50b5478d6ee0a104727808915daf6ef510e0e";
+      sha256 = "bce0ff5de4331df1318b97af68fdfcad66510bb3a45896c192e6a6430aebf884";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/linux-i686/zh-TW/thunderbird-128.10.2esr.tar.bz2";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/linux-i686/zh-TW/thunderbird-128.11.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "927a901e7cb354a70a019def25a083acd69d24ef818413baf0b40a37cd4e26ce";
+      sha256 = "0eb96f16b451c7f7dc767c5902cf718f23900e172f58fb75cf904ae2ac80c522";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/af/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/af/Thunderbird%20128.11.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "22ca7995531360cf6e04e7b2c3bfac9f3c3893d3a81babd97554d2a0dce08c4f";
+      sha256 = "da085fe383e5180a2a4f8c0f09d00a6aefb34f87165fa1294f3cd695d2fe1243";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ar/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ar/Thunderbird%20128.11.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "415f3d70a41725d05501664af3fbe49baa22993b3c58b13b2a7753d9dedd581e";
+      sha256 = "1669163e39c4faa41b731b3d3706dac9a711137ca9579aa08e4f5f0e415268bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ast/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ast/Thunderbird%20128.11.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "ed97924c303731cc3f51b8a6eec6cc7fc301ca0343ddc0b2795090145742f1b9";
+      sha256 = "15bed24f02a8acee10d8d1032d61192e69b51dd27b0c27111ffdd69bc01059ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/be/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/be/Thunderbird%20128.11.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "233dbc1b8cc02a148dc8edb0af5c7330f032f926756a2fa724f70757a76d6d6b";
+      sha256 = "2ee91bc9d17323daddf940b1404483b76fbd453e466389167b2ab5fe94b18c94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/bg/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/bg/Thunderbird%20128.11.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "92c6566551fca5783fcdff48c144884e3e11fc86df70e09255dda0d3ff55e4d2";
+      sha256 = "f443a05e626c2d97393f5837e74c73060d70d16986e03f59136f775ef6e4736d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/br/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/br/Thunderbird%20128.11.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "8dff7c98c95a3d8c88e5c1a08ed1b186fc87814a611639174eb21264d551e1ab";
+      sha256 = "0fc5557a2e70a23e57ec42dfadd6845ee45216a381ec0fc10180243d66615a73";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ca/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ca/Thunderbird%20128.11.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "d259d8ba72b06118bb80d363a72419c11d4ba2fd598ecb263426a00ea9984f33";
+      sha256 = "1e6362c01b20e61d6b01e6c7b99844463db75d87bdc42a0481fa2ceea74df788";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cak/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cak/Thunderbird%20128.11.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "5209334c9054da4367140e218596ab6cbcec6e6ef9845d2efad82bf34243fdf4";
+      sha256 = "a7cd7e195246ba738fc992f2dd5c157ed3f857cf4cd6c3925a8a5138de2c1df4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cs/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cs/Thunderbird%20128.11.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "3d8584c0fd7c98df5ea5e816b88d5a8d3e030ecf2d698733d973de1b93416582";
+      sha256 = "25698c35ea90de843cb228a31190c708b4f50868bae5fa86ff6108009984878b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/cy/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/cy/Thunderbird%20128.11.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "ffc4c090213902fbd1bf1bb0669cac59c2977db112fb2c6209c95b3826f23fd2";
+      sha256 = "a00be11e9f16854b74681cdda118bce2fc6c89dca9cdb7e94ab029556179d10b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/da/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/da/Thunderbird%20128.11.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "78333c27a23b07df19e3432dcc495d7b4e5213135d46de580a044e551ba24db5";
+      sha256 = "a2e83e16817051806676f162881e4e86e02c66597e373310b21ad1008146bb20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/de/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/de/Thunderbird%20128.11.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "cf64fb1dff251b9be08d2c292b3bbb5bf3bf21934d4fd36fb8e86cc1871ea2cf";
+      sha256 = "f4d06c64a3e88ed08eee81b0f6fbf9ba58a9b08b41908324547f7490bca4b279";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/dsb/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/dsb/Thunderbird%20128.11.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "aff968d157a7205389f190187e6f75037312eaf68388662159095d7e1f9edac3";
+      sha256 = "ef0140803e0c66de10fbed038c9222b37ae4720f40351bb45cd04c6aac4c731f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/el/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/el/Thunderbird%20128.11.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "3e4cafc655fdbc05875cc9bd228a1bcfb66c04c6f3c619f2019c16e21505e95d";
+      sha256 = "9b6ee192ada2e5b8676d5f1aefcd8e22cc99c9a1eaabcd298fcf706eb62863b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-CA/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-CA/Thunderbird%20128.11.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "fb0ca3007309d3185f88027ef1e15839b570c6e9560cc5bd2978035279908b0b";
+      sha256 = "ac02b3c4c3230ee3cc398c4ecef9909efabfc501d47168861d9c0df272f9519d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-GB/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-GB/Thunderbird%20128.11.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "caa3e8b45758357221dab746f37b86bf619fac54eb8d5805a9f66569e2d04df8";
+      sha256 = "bc2c20160179b52efa9a5709ed4f3275560dfdaa0e4d3ca10766689e844f712a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/en-US/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/en-US/Thunderbird%20128.11.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "ba9e09dd0def5c75735722243e4b8d7da5ba2b11dd3b8994d1d930c9c0add1e6";
+      sha256 = "4be869257fa9b50364f9f1cbe64e9b89520a4b1d11c1bf7727ea002320a0d7f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-AR/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-AR/Thunderbird%20128.11.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "25c5aded50b3fb96260c475c552e7658425a5ca8c72a132a2ab1b125e40fe39f";
+      sha256 = "e3bdbec28bf3cd1f63693581bd4bb3f402da1f1c4c9a850442a3c36f182524a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-ES/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-ES/Thunderbird%20128.11.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "c9bbc6a4426ade7e37c2bd3bfb4bfdb61ab4dd1de93f7a0431663496eacc0d6e";
+      sha256 = "9d4ce0f71c07514a34c4d28b19eb5dab2502770ff9da96649957808ab1b07b82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/es-MX/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/es-MX/Thunderbird%20128.11.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "7348b0c7216b3291e4b38f28164377aae4c661c1ceb054a2d9230dd6588059f5";
+      sha256 = "7213926fd638ed67f2393d7eeae3cc648003b43f2713fed5c45c48a71957727f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/et/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/et/Thunderbird%20128.11.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "5dcaa2f42d9622ab70fefb8d0ad628b755db7089521760942fd2ce4ef657841f";
+      sha256 = "eebd432cc11c7c5f464c88c31b79f02152dcf131959f15fa53580aa8d0073ead";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/eu/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/eu/Thunderbird%20128.11.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "a07eb1c197c794de75dd775e28de9d22c475bb9a307bf1907b3c79352dfe21d7";
+      sha256 = "f78b9242f66418c1b654c67ae43f4705c5c725f116061778905ff649d753f0c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fi/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fi/Thunderbird%20128.11.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "432fed748bb7f6e6e208a5bb5df1473c02fa907c3b8e29ec533b5c941cbd4875";
+      sha256 = "1c76f1a38ff3e5d1ec1b118e014eebccfe09e1a7375b337128978adfbbe8e31b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fr/Thunderbird%20128.11.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "85102f7fa7354b8ef9781818f7652bc44022a9f63a38ce9b9d19badf65b0c444";
+      sha256 = "b900fdb8621904b6bc8d2f730e4896ae82f7cfa4847fdbfb6c5e30716ecb529f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/fy-NL/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/fy-NL/Thunderbird%20128.11.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "0964debe3d588a2225e71d5ad80dc0eb1feb1ef36e62c90bad2bb130b98c1b8e";
+      sha256 = "00a351ef965a57b89a8b7fa5ba7b198c5ebba3d418c8484601146e501f129f16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ga-IE/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ga-IE/Thunderbird%20128.11.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "e10a02e2fcd554e0c909ca742123fa643533cd4e9e39a346321a1d7dabb85fd4";
+      sha256 = "9099460bf5eb5ac6299559a987105c8d1463118e60b3acb8e834a7305e14ee86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gd/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gd/Thunderbird%20128.11.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "9c5717d49db87fe568bf886768b87609fd3e5a10715d4eb62959e096d7af254c";
+      sha256 = "1c7e069df9a19230ed6b894e3185c1b7b171ae0d5f1fac1c1bfb5c56317d50e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/gl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/gl/Thunderbird%20128.11.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "c7b0811dd4fab566df241e36f66db7e102b8f890a052fa9bd200fa98a9213f11";
+      sha256 = "8b7c53595ac38cb56a4977b260a61552630b24601db4dc383a1d2be5944e538d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/he/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/he/Thunderbird%20128.11.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "6aee90447ba014314aa57329b4276e9a72212283d1ef940c5107b81e167eede4";
+      sha256 = "b8a50d2f13c25acfc52c8d28e833f524b92bca7d1af838cb25f67d05356b55cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hr/Thunderbird%20128.11.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1b4a9f58301104832d2aed47e18e55a76f98be0de0c410586a3314bce0b264d7";
+      sha256 = "f5a53ab0f611af6047bc58742f4ad3da14ef41478ab9b52ce2425ee3a7f1f686";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hsb/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hsb/Thunderbird%20128.11.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a16ee92d77c6fc479b90eb1e72ee545389c0fb811384f772f50a5e3ca25cdf0a";
+      sha256 = "6aa2fa1e62297d244fd18ac2f2517e75c9c8c381ac67fb0f14b9c3ad330529c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hu/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hu/Thunderbird%20128.11.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "fd406f8f4ca98767e8bbecd8240a9e426f08499ae22c1d144279d6f8685f9b32";
+      sha256 = "fbbfa983987a224920cc4fb806703e51e689f1d35801dfdea63a9f0249105a64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/hy-AM/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/hy-AM/Thunderbird%20128.11.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "64f481062e8b9706dbd59432f33a288451eb3e7366ee261f750eaf710c142694";
+      sha256 = "a45d3670f7f0e3b4556137d93dc6dd6754addf14998de1b2e4e849027e459d56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/id/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/id/Thunderbird%20128.11.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "f567578b4de2d52d589b5be3bb00935f2bdf7b5b9aedbf527c5c3549976e1b66";
+      sha256 = "00a7e4b6b9448e977952e0bb1784e863d444063604653f138202b93600477d43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/is/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/is/Thunderbird%20128.11.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "d3fdf81c1679d7ca1dd3ad0b436238d74074142c02fd3998621de287273a27ce";
+      sha256 = "2a7ed1ddba330a2bea14ee1ebe03355e86243b257eecd289ba28a3ba95a11c3a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/it/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/it/Thunderbird%20128.11.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "e75713c79859185182a47d599881af6d5612259c0023bb48fdff6ed0e05d3bcc";
+      sha256 = "7da455c0c44b199cc46311ed898f851f0e41b7d948e3e8098fe4ec61b8d8e135";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ja-JP-mac/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ja-JP-mac/Thunderbird%20128.11.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "265eaf1f69d69baad642450e9e10855d23713533c61dc4a8122aa4d1f82b886e";
+      sha256 = "a0bf0b932bd66b0c9e736576d60eae8d15c5ad034693ffba6d255916afa6e123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ka/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ka/Thunderbird%20128.11.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "43fa6cbdd7003ca5c553fa719ef997a55d030bef4477fa6e070be8ea5ab7c34c";
+      sha256 = "80f0f47724169f8e5ee992aea5eb91828d76acb46c981a4ad1623ad002a88ec4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kab/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kab/Thunderbird%20128.11.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "bbef2ca1a0b93856a5804f493f99e9cdb48d997951c7a26ea8d9653d1a137caa";
+      sha256 = "34c78ee1a34c8fdbc2758af1e5a453a7c09a39e8d0ea5738e9b397e8aab74d46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/kk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/kk/Thunderbird%20128.11.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "029111db6f6e2a4743203a199642d79b2bf53821b80cba64536f0d3b7b69252d";
+      sha256 = "4b06bfae6288320843745a9f14a09f9215f83a534b570f0caf18c167aa2c639d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ko/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ko/Thunderbird%20128.11.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "4928a32a552ed8cc06290688bd408e8210d624576bee90a0f815803807923dcd";
+      sha256 = "2aad2ccce1383b396ae8dd5d40a07daa5fedbac4b7d878b7a157b4f920e75b5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lt/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lt/Thunderbird%20128.11.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "c25faed290d8854a541f045847b6bd1c84566e83a8dc3e8c58fec37e227fd8df";
+      sha256 = "c79d788688778a912b57e5f1e05798bb96903a333985cabbb3963bcce6723543";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/lv/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/lv/Thunderbird%20128.11.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "2a6a0ca0d81aad713836bc869835912fc15fc48d39710e6d183957c4ff1a3cb1";
+      sha256 = "d84936a74f0a888f1da82eb0ccaf397c9f433d6c5faf517fd5bcc409e2ea31a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ms/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ms/Thunderbird%20128.11.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "2de77b4ed730b3a4e45e46e8a32b21d8324a7eb65aff02c80c00d56c204b5dca";
+      sha256 = "15e3f97f44294668d22cd96a346dbd22c5d64c2526593872f6ca8412d634a9a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nb-NO/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nb-NO/Thunderbird%20128.11.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ad9c66bc8743fd389d8ee8267f77a5ef2490ec5ccf8ec779d3476286771a6ab3";
+      sha256 = "87823062cd2d43536018305dc0425e8b604f4df14336e54751ac1fee4a5be79e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nl/Thunderbird%20128.11.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "f4de8cb671f64ecb48824c47f289be3913939f9b9983be396a85445be1dbd3b7";
+      sha256 = "02ece8ecee3d231bf566f6939a0388d78d0fa717a80f4fb94713db92870f4f67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/nn-NO/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/nn-NO/Thunderbird%20128.11.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "331290030cfd61b5e2989f53a05772f1a240a4ee3940371ebabb95ced714f105";
+      sha256 = "b5b1c602b497bfad1b48842c06e24ffd64d032183d354811f5a791e652505373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pa-IN/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pa-IN/Thunderbird%20128.11.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "a461a8fff8c71a3a2b1b4515c56f478500cbfc14c658a22605393e7e84b122b0";
+      sha256 = "92a253aed7e42efed4a85adf74f8e6dde0208a94bd3f887219f0b29075d26ba8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pl/Thunderbird%20128.11.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "89c236463e94ef52dabef54509ff06fd65d428840673b27d50aa9e942654f819";
+      sha256 = "966febf37cf9c2da85ffac82d7da03fc482a6135e25dbf78800401239215448e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-BR/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-BR/Thunderbird%20128.11.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "d4e7bd32a5631194269fd4bec820f1ada537b4ac9b52a0d591924c18ea56e39d";
+      sha256 = "0fcd133b82aeffcb7814142b88ff1aba12af813374a24fa3d85c62d62077554a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/pt-PT/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/pt-PT/Thunderbird%20128.11.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "8b70f7d6d1e42ccb19cf444177feb5076179db00be8edae67228b50b9fe25ed2";
+      sha256 = "3b171a3b97807a81149e7d27572318056fce2fb6872f40f354e651624ff5fa53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/rm/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/rm/Thunderbird%20128.11.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "cd6a878f277c14c8676a924457f9ec34fb8814424bc07ba315ac0da61cffdf75";
+      sha256 = "76edae404bd60f35f2752d6098c1df55b124520c15246e5eb173676ab4e4b915";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ro/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ro/Thunderbird%20128.11.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "a9d7c416d1c5088e30c3e29fcdddeeb649853527f29f02c93640d69225904b25";
+      sha256 = "e3167f11923f5fc2c5dc985dedf5daaf029b8097d9a7f43417b39911708ce27f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/ru/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/ru/Thunderbird%20128.11.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "db02e46e3e43e48993fc83b325510ddcd06a24f0eccf854ccd58dd2543ab54a9";
+      sha256 = "5bcb97eb90761a83d1c68049d7f98ba1232d93996cafc2c175001c720bf7ae1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sk/Thunderbird%20128.11.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "efb821a174b4d6fe67b47bf27fa08fb2a8a73e4de91d1c711fad1cb9daedfefd";
+      sha256 = "bbc0a8484ba2356bdbf3bda13f15c72e502acfa848d96d802ce045334ed27584";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sl/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sl/Thunderbird%20128.11.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "0cb4bd37456a94e86080e30273e4adc3b99d0a99ab48e9cc21dc418dbe586c26";
+      sha256 = "883034d9eaa9a0f34742fa3d51f0499625644b1400bc3a5e17e444c1d84dff9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sq/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sq/Thunderbird%20128.11.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "4c6b8553cebe0aa7ad69cefe62dad07a41903a538fd0dfaabe8fefe683e0784c";
+      sha256 = "bbe0490ea11d4cf67daa3d200b017b5c023d15fccd0e9055af55145a414fe585";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sr/Thunderbird%20128.11.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "c8da386ae81e591dcc21cbcb7e551213e0b708d9e2afdfdd37de748924dcb738";
+      sha256 = "abd1d84d5e15bb544fd088890660d8541f7f53f969818415a6029546d62c1ab3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/sv-SE/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/sv-SE/Thunderbird%20128.11.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "2be8d7b3b3ea9e01f58e51c6fe57ee9d03e808af76f6ddd2245dc8ab168732da";
+      sha256 = "f6162e8a7ab8ec395c41d5ae2c12a2e7115248dc67d525577d6a70c55d7f4568";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/th/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/th/Thunderbird%20128.11.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c5d80526f220ddd839c99520c71998e7bcdf7a895420e9b620ce8c2ea35167f0";
+      sha256 = "c0c0e65f1cd3de690a94b8a018489ba2b398d26e4475e084f5756b533c847ba6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/tr/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/tr/Thunderbird%20128.11.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "e7fa77ee37073102a567de924ca861eaf85ca0acc07ca30dc206fd84c206f9bd";
+      sha256 = "aa8d919937da919d67f22bed23432393f1c14764a8a34e0da58d6df33ee09cdd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uk/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uk/Thunderbird%20128.11.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "bae90b1cea274b5a82d65e136106bb862790811801d9a79638f45bdf60d01836";
+      sha256 = "e317aa1da153f12abac7938838f3b902859514974e416ff382f9431dfa79ce1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/uz/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/uz/Thunderbird%20128.11.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "9c2ce9163edc102c8a024418d8e173619c345ea8c293a3c6fe3e9d88cc75717a";
+      sha256 = "102bba7d14f01947d1a4fb7e3f9b69133faaf7bdba54d129477fa6bddafd28c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/vi/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/vi/Thunderbird%20128.11.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "7ed5db39e6cd01d14bcac8b19f57f35e13dc6f18bf2be0544b397b06ca919677";
+      sha256 = "80162191a22406dcf6613bf09c7eb6dfdb6b83799dba528a4b09b0d4b955a6bc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-CN/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-CN/Thunderbird%20128.11.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "257172a2f75feeae7d182c1104b8cc7638121f2cb5f4115566398555d69f90ce";
+      sha256 = "f2a12e4fbd3b0afe1739dc3e70681943e5dde3cd7244b701fce8c7ec93c4ef1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.10.2esr/mac/zh-TW/Thunderbird%20128.10.2esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/128.11.0esr/mac/zh-TW/Thunderbird%20128.11.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7e06ef23770ce86947bb0953c2594ae0ef2ab517a9ba44534c05507fb3081007";
+      sha256 = "e977bc3a7dd0e8d0298241a418fd081db651524e6dd956e1713c80f20a4c58c7";
     }
   ];
 }

From f3a853bea05b5be01f3667fb5c8f2cac543573d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 05:09:05 +0000
Subject: [PATCH 0719/1497] python3Packages.kserve: 0.15.1 -> 0.15.2

---
 pkgs/development/python-modules/kserve/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index 239a35a08963..4307c502f8b3 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -54,14 +54,14 @@
 
 buildPythonPackage rec {
   pname = "kserve";
-  version = "0.15.1";
+  version = "0.15.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kserve";
     repo = "kserve";
     tag = "v${version}";
-    hash = "sha256-k+uyOhsxWPpiA82wCCEn53W2VQgSHGgSABFipEPErRk=";
+    hash = "sha256-NklR2Aoa5UdWkqNOfX+xl3R158JDSQtStXv9DkklOwM=";
   };
 
   sourceRoot = "${src.name}/python/kserve";
@@ -176,7 +176,7 @@ buildPythonPackage rec {
   meta = {
     description = "Standardized Serverless ML Inference Platform on Kubernetes";
     homepage = "https://github.com/kserve/kserve/tree/master/python/kserve";
-    changelog = "https://github.com/kserve/kserve/releases/tag/v${version}";
+    changelog = "https://github.com/kserve/kserve/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 6104638321c4b22023b2e70bfa681bfd7c8be90a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 05:10:46 +0000
Subject: [PATCH 0720/1497] stevenblack-blocklist: 3.15.37 -> 3.15.42

---
 pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index f9074dd623e0..c1ac6753d65f 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.15.37";
+  version = "3.15.42";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-d254AsNQgjExXaGd9EQ5dZ1xy5nP6Zqe2INtR9IKMiQ=";
+    hash = "sha256-Hd5jy64tknibRgPQczERdXLtX/PJdc9tC4gI1K+2uhE=";
   };
 
   outputs = [

From 69eb665ac11e08bfcde6cef12788c9e3772d643f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 3 Jun 2025 14:12:31 +0900
Subject: [PATCH 0721/1497] serpl: update cargoHash in updateScript

---
 pkgs/by-name/se/serpl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 24cc7ae109c5..255a3d36ba03 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
   makeWrapper,
   ast-grep,
   ripgrep,
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage {
       }"
   '';
 
-  passthru.updateScript = gitUpdater { };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Simple terminal UI for search and replace, ala VS Code";

From 83689d6cc59ae276d5d255b319fa672cc671e3b0 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 3 Jun 2025 14:15:26 +0900
Subject: [PATCH 0722/1497] serpl: 0.3.3 -> 0.3.4

Diff: https://github.com/yassinebridi/serpl/compare/0.3.3...0.3.4
---
 pkgs/by-name/se/serpl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index 255a3d36ba03..d34f3f35b55d 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -9,7 +9,7 @@
 }:
 let
   pname = "serpl";
-  version = "0.3.3";
+  version = "0.3.4";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
     owner = "yassinebridi";
     repo = "serpl";
     rev = version;
-    hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg=";
+    hash = "sha256-lEvUS1RlZ4CvervzyfODsFqRJAiA6PyLNUVWhSoPMDY=";
   };
 
   buildFeatures = [ "ast_grep" ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage {
   nativeBuildInputs = [ makeWrapper ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YfSxjlpUyRwpSoKmHOZrULGIIWTQ14JJwbsNB807WYQ=";
+  cargoHash = "sha256-reeJsSNifPeDzqMKVpS1Pmyn9x1F+Vin/xy81d5rKVs=";
 
   postFixup = ''
     # Serpl needs ripgrep to function properly.

From e7ba9484b65ac3759768a756ec3d342104d3ef37 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 3 Jun 2025 14:21:17 +0900
Subject: [PATCH 0723/1497] serpl: add versionCheckHook

---
 pkgs/by-name/se/serpl/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix
index d34f3f35b55d..3fe8d61ac8e8 100644
--- a/pkgs/by-name/se/serpl/package.nix
+++ b/pkgs/by-name/se/serpl/package.nix
@@ -6,6 +6,7 @@
   makeWrapper,
   ast-grep,
   ripgrep,
+  versionCheckHook,
 }:
 let
   pname = "serpl";
@@ -38,6 +39,13 @@ rustPlatform.buildRustPackage {
       }"
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/serpl";
+  versionCheckProgramArg = "--version";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 0847f6f7ddceaed48da5eb808a393eea27a54635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 2 Jun 2025 22:23:37 -0700
Subject: [PATCH 0724/1497] python3Packages.curl-cffi: 0.10.0 -> 0.11.1

Diff: https://github.com/lexiforest/curl_cffi/compare/refs/tags/v0.10.0...refs/tags/v0.11.1

Changelog: https://github.com/lexiforest/curl_cffi/releases/tag/v0.11.0
---
 .../python-modules/curl-cffi/default.nix      | 61 +++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 1f55b5bc466f..6ba6faedf147 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -7,19 +7,31 @@
   curl-impersonate-chrome,
   cffi,
   certifi,
-  typing-extensions,
+  charset-normalizer,
+  cryptography,
+  fastapi,
+  httpx,
+  proxy-py,
+  pytest-asyncio,
+  pytest-trio,
+  pytestCheckHook,
+  python-multipart,
+  trustme,
+  uvicorn,
+  websockets,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.10.0";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-h7PPlxjIVT6T9x7gKBSifuWl8wzUNDwRcaUifUS0icM=";
+    hash = "sha256-hpsAga5741oTBT87Rt7XTyxxu7SQ5Usw+2VVr54oA8k=";
   };
 
   patches = [ ./use-system-libs.patch ];
@@ -33,7 +45,6 @@ buildPythonPackage rec {
   dependencies = [
     cffi
     certifi
-    typing-extensions
   ];
 
   env = lib.optionalAttrs stdenv.cc.isGNU {
@@ -42,7 +53,49 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "curl_cffi" ];
 
+  nativeCheckInputs = [
+    charset-normalizer
+    cryptography
+    fastapi
+    httpx
+    proxy-py
+    pytest-asyncio
+    pytest-trio
+    pytestCheckHook
+    python-multipart
+    trustme
+    uvicorn
+    websockets
+    writableTmpDirAsHomeHook
+  ];
+
+  preCheck = ''
+    # import from $out
+    rm -r curl_cffi
+  '';
+
+  pytestFlags = [
+    "tests/unittest"
+    # test accesses network
+    "--deselect tests/unittest/test_smoke.py::test_async"
+  ];
+
+  disabledTests = [
+    # FIXME ImpersonateError: Impersonating chrome136 is not supported
+    "test_impersonate_without_version"
+    "test_with_impersonate"
+    # InvalidURL: Invalid URL component 'path'
+    "test_update_params"
+    # tests access network
+    "test_add_handle"
+    "test_socket_action"
+    "test_without_impersonate"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
+    changelog = "https://github.com/lexiforest/curl_cffi/releases/tag/${src.tag}";
     description = "Python binding for curl-impersonate via cffi";
     homepage = "https://curl-cffi.readthedocs.io";
     license = licenses.mit;

From 79b33b83ecc3176be7360303e90e6d035f7a2c3e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 3 Jun 2025 03:29:13 +0200
Subject: [PATCH 0725/1497] ligo: remove at 1.7.1

---
 pkgs/development/compilers/ligo/default.nix   | 133 ------------------
 .../ligo/make-compatible-with-linol-0_6.patch |  13 --
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |  15 --
 4 files changed, 1 insertion(+), 161 deletions(-)
 delete mode 100644 pkgs/development/compilers/ligo/default.nix
 delete mode 100644 pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch

diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix
deleted file mode 100644
index b83bb18c23bb..000000000000
--- a/pkgs/development/compilers/ligo/default.nix
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  lib,
-  fetchFromGitLab,
-  git,
-  coq,
-  ocamlPackages,
-  cacert,
-  ocaml-crunch,
-  jq,
-  mustache-go,
-  yaml2json,
-  tezos-rust-libs,
-}:
-
-ocamlPackages.buildDunePackage rec {
-  pname = "ligo";
-  version = "1.7.1";
-  src = fetchFromGitLab {
-    owner = "ligolang";
-    repo = "ligo";
-    rev = version;
-    hash = "sha256-pBoLgS/9MLMrc98niI+o2JoJ3gpvhyRY2o9GmVc5hIA=";
-    fetchSubmodules = true;
-  };
-
-  patches = [ ./make-compatible-with-linol-0_6.patch ];
-
-  # The build picks this up for ligo --version
-  LIGO_VERSION = version;
-
-  # This is a hack to work around the hack used in the dune files
-  OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
-
-  nativeBuildInputs = [
-    ocaml-crunch
-    git
-    coq
-    ocamlPackages.crunch
-    ocamlPackages.menhir
-    ocamlPackages.ocaml-recovery-parser
-    # deps for changelog
-    jq
-    mustache-go
-    yaml2json
-  ];
-
-  buildInputs = with ocamlPackages; [
-    coq
-    menhir
-    menhirLib
-    qcheck
-    ocamlgraph
-    bisect_ppx
-    decompress
-    fileutils
-    ppx_deriving
-    ppx_deriving_yojson
-    ppx_yojson_conv
-    ppx_expect
-    ppx_import
-    terminal_size
-    ocaml-recovery-parser
-    yojson
-    getopt
-    core
-    core_unix
-    pprint
-    linenoise
-    crunch
-    semver
-    lambda-term
-    tar-unix
-    parse-argv
-    hacl-star
-    prometheus
-    lwt_ppx
-    msgpck
-    # lsp
-    linol
-    linol-lwt
-    ocaml-lsp
-    # Test helpers deps
-    qcheck
-    qcheck-alcotest
-    alcotest-lwt
-    # vendored tezos' deps
-    aches
-    aches-lwt
-    ctypes
-    ctypes_stubs_js
-    class_group_vdf
-    dune-configurator
-    hacl-star
-    hacl-star-raw
-    lwt-canceler
-    ipaddr
-    bls12-381
-    bls12-381-signature
-    ptime
-    mtime
-    lwt_log
-    secp256k1-internal
-    resto
-    resto-directory
-    resto-cohttp-self-serving-client
-    irmin-pack
-    ezjsonm
-    data-encoding
-    pure-splitmix
-    zarith_stubs_js
-    simple-diff
-    seqes
-    stdint
-    tezt
-  ];
-
-  nativeCheckInputs = [
-    cacert
-    ocamlPackages.ca-certs
-  ];
-
-  doCheck = false; # Tests fail, but could not determine the reason
-
-  meta = with lib; {
-    homepage = "https://ligolang.org/";
-    downloadPage = "https://ligolang.org/docs/intro/installation";
-    description = "Friendly Smart Contract Language for Tezos";
-    mainProgram = "ligo";
-    license = licenses.mit;
-    platforms = ocamlPackages.ocaml.meta.platforms;
-    maintainers = with maintainers; [ ulrikstrid ];
-  };
-}
diff --git a/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch b/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch
deleted file mode 100644
index 659ca3faaf73..000000000000
--- a/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/bin/cli.ml b/src/bin/cli.ml
-index 36ee98cbec..960bfc85a0 100644
---- a/src/bin/cli.ml
-+++ b/src/bin/cli.ml
-@@ -3537,7 +3537,7 @@ module Lsp_server = struct
-           ~session_id
-           ~skip_analytics
-       in
--      let server = Linol_lwt.Jsonrpc2.create_stdio (s :> Linol_lwt.Jsonrpc2.server) in
-+      let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() (s :> Linol_lwt.Jsonrpc2.server) in
-       let shutdown () = Poly.(s#get_status = `ReceivedExit) in
-       let task = Linol_lwt.Jsonrpc2.run ~shutdown server in
-       let analytics_job =
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 58fd81d447cf..8878ce3fd2fb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1050,6 +1050,7 @@ mapAliases {
   licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
   lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects.";
+  ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
   lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22
   limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5accf1cff649..2059e78c69d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3488,21 +3488,6 @@ with pkgs;
 
   ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { };
 
-  ligo =
-    let
-      ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (
-        self: super: {
-          zarith = super.zarith.override { version = "1.13"; };
-        }
-      );
-    in
-    callPackage ../development/compilers/ligo {
-      coq = coq_8_13.override {
-        customOCamlPackages = ocaml_p;
-      };
-      ocamlPackages = ocaml_p;
-    };
-
   leocad = callPackage ../applications/graphics/leocad { };
 
   libcoap = callPackage ../applications/networking/libcoap {

From 2d4932bb0f6210ff9f7de31f9c9f84d82d0cce85 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 3 Jun 2025 03:32:21 +0200
Subject: [PATCH 0726/1497] tezos-rust-libs: remove at 1.5

---
 pkgs/by-name/te/tezos-rust-libs/package.nix | 68 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 pkgs/by-name/te/tezos-rust-libs/package.nix

diff --git a/pkgs/by-name/te/tezos-rust-libs/package.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix
deleted file mode 100644
index 03e10ca9ed6b..000000000000
--- a/pkgs/by-name/te/tezos-rust-libs/package.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  fetchFromGitLab,
-  stdenv,
-  llvmPackages,
-  cargo,
-  libiconv,
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.5";
-  pname = "tezos-rust-libs";
-  src = fetchFromGitLab {
-    owner = "tezos";
-    repo = "tezos-rust-libs";
-    rev = "v${version}";
-    hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw=";
-  };
-
-  nativeBuildInputs = [
-    llvmPackages.llvm
-    cargo
-  ];
-  propagatedBuildInputs = [ llvmPackages.libllvm ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    cargo build \
-      --target-dir target-librustzcash \
-      --package librustzcash \
-      --release
-
-    cargo build \
-      --target-dir target-wasmer \
-      --package wasmer-c-api \
-      --no-default-features \
-      --features singlepass,cranelift,wat,middlewares,universal \
-      --release
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib/tezos-rust-libs/rust
-    cp "librustzcash/include/librustzcash.h" \
-        "target-librustzcash/release/librustzcash.a" \
-        "wasmer-2.3.0/lib/c-api/wasm.h" \
-        "wasmer-2.3.0/lib/c-api/wasmer.h" \
-        "target-wasmer/release/libwasmer.a" \
-        "$out/lib/tezos-rust-libs"
-    cp -r "librustzcash/include/rust" "$out/lib/tezos-rust-libs"
-
-    runHook postInstall
-  '';
-
-  cargoVendorDir = "./vendor";
-
-  meta = {
-    homepage = "https://gitlab.com/tezos/tezos-rust-libs";
-    description = "Tezos: all rust dependencies and their dependencies";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ulrikstrid ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8878ce3fd2fb..a7504c19471a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1889,6 +1889,7 @@ mapAliases {
   tepl = libgedit-tepl; # Added 2024-04-29
   termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   testVersion = testers.testVersion; # Added 2022-04-20
+  tezos-rust-libs = ligo; # Added 2025-06-03
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
   thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20
   thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30

From 1c418539d57737e6f72dd1345826775c9d1db059 Mon Sep 17 00:00:00 2001
From: Mark Polyakov <mark@markasoftware.com>
Date: Mon, 2 Jun 2025 22:48:30 -0700
Subject: [PATCH 0727/1497] maintainers: add markasoftware

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2bdd25f9a199..5afe1859c894 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15154,6 +15154,12 @@
     github = "mariuskimmina";
     githubId = 38843153;
   };
+  markasoftware = {
+    name = "Mark Polyakov";
+    email = "mark@markasoftware.com";
+    github = "markasoftware";
+    githubId = 6380084;
+  };
   markbeep = {
     email = "mrkswrn@gmail.com";
     github = "markbeep";

From 9912fec25517dfc0d3201f10928386d9b1b3f671 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 05:48:36 +0000
Subject: [PATCH 0728/1497] git-spice: 0.13.0 -> 0.14.1

---
 pkgs/by-name/gi/git-spice/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index 1305f143527f..d1225d994d01 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGo124Module rec {
   pname = "git-spice";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${version}";
-    hash = "sha256-hqdU0j7H3hhhjGV4lmluG1D6NXNqI80d9gGr5KJ9D+Q=";
+    hash = "sha256-Le33Ri2mt6ccTpC0GN0TLtQKqN/cGD2Rt8ZG56lnjtI=";
   };
 
-  vendorHash = "sha256-Wi/NNqHnHrfikO0EWDXNdTjPmgHrGSs2k612c0w8OA8=";
+  vendorHash = "sha256-ccFt9T/p//ABMK/SuHKKnQJZH8yM0yRzYm/cON4I6CQ=";
 
   subPackages = [ "." ];
 

From 4c47049f17d42a13ac02f3eb36b3a2eef448eacd Mon Sep 17 00:00:00 2001
From: Mark Polyakov <mark@markasoftware.com>
Date: Mon, 2 Jun 2025 22:48:51 -0700
Subject: [PATCH 0729/1497] gpx-animator: init at 1.8.2

---
 pkgs/by-name/gp/gpx-animator/deps.json   | 1058 ++++++++++++++++++++++
 pkgs/by-name/gp/gpx-animator/package.nix |   74 ++
 2 files changed, 1132 insertions(+)
 create mode 100644 pkgs/by-name/gp/gpx-animator/deps.json
 create mode 100644 pkgs/by-name/gp/gpx-animator/package.nix

diff --git a/pkgs/by-name/gp/gpx-animator/deps.json b/pkgs/by-name/gp/gpx-animator/deps.json
new file mode 100644
index 000000000000..2a5e40a587db
--- /dev/null
+++ b/pkgs/by-name/gp/gpx-animator/deps.json
@@ -0,0 +1,1058 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/fasterxml#oss-parent/48": {
+   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.14.1": {
+   "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.14": {
+   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+  },
+  "com/github/johnrengelman#shadow/8.1.1": {
+   "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=",
+   "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=",
+   "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU="
+  },
+  "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": {
+   "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA="
+  },
+  "com/github/spotbugs#com.github.spotbugs.gradle.plugin/5.0.14": {
+   "pom": "sha256-Klkwu/Y1CRjxRVMBd47nOhi3C5ZMFG25FzC3dd/M8Nw="
+  },
+  "com/github/spotbugs/snom#spotbugs-gradle-plugin/5.0.14": {
+   "jar": "sha256-Gq1P++fZeNkPYJxQe5sQYQzYiVI66xM6E+cKqKKLjh0=",
+   "module": "sha256-zk1p44LM+Ra/awSedTdrbZaKDKUgh63wvRYEPUMwk7w=",
+   "pom": "sha256-SaFhGVMRRSvY6ObRpx90ZX+Z7VHCl30EevlVvbZ5Ye4="
+  },
+  "commons-io#commons-io/2.11.0": {
+   "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
+   "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+  },
+  "io/fabric8#kubernetes-client-bom/5.12.2": {
+   "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
+  },
+  "io/netty#netty-bom/4.1.86.Final": {
+   "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
+   "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.0.0": {
+   "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/27": {
+   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+  },
+  "org/apache/ant#ant-launcher/1.10.13": {
+   "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=",
+   "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o="
+  },
+  "org/apache/ant#ant-parent/1.10.13": {
+   "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk="
+  },
+  "org/apache/ant#ant/1.10.13": {
+   "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=",
+   "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/logging#logging-parent/7": {
+   "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
+  },
+  "org/apache/logging/log4j#log4j-api/2.20.0": {
+   "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
+   "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.20.0": {
+   "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
+  },
+  "org/apache/logging/log4j#log4j-core/2.20.0": {
+   "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
+   "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
+  },
+  "org/apache/logging/log4j#log4j/2.20.0": {
+   "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
+  },
+  "org/bytedeco#gradle-javacpp/1.5.8": {
+   "jar": "sha256-H78KbdbZXsC0H2S1c3wWrx/R8144jYLwVGsL/jOM+Gc=",
+   "module": "sha256-7nP2tMlQ1SI8NiMZVFu+Fki48NWZahFumPt2sh4tqt4=",
+   "pom": "sha256-kFe8CG7ytFoNQ/wPPGejcp9poVm/yoE5x6rUgQBHU8s="
+  },
+  "org/bytedeco#javacpp/1.5.8": {
+   "jar": "sha256-J9Xq+PRDP2QEquCtNM27+sdRdOJEwR04Ii4NB1rzOGM=",
+   "pom": "sha256-aNdDDWI0S0qLjWQ4RYFrQ0F8s6Gj3El8rRm0OMDzDAk="
+  },
+  "org/bytedeco/gradle-javacpp-platform#org.bytedeco.gradle-javacpp-platform.gradle.plugin/1.5.8": {
+   "pom": "sha256-GMYKqOXscnBfX1R7NSTYDF9cZPXCXGJ9r8XxVvRs5fY="
+  },
+  "org/codehaus/groovy#groovy-bom/3.0.14": {
+   "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
+  },
+  "org/codehaus/plexus#plexus-utils/3.5.1": {
+   "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
+   "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
+  },
+  "org/codehaus/plexus#plexus/10": {
+   "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
+  },
+  "org/eclipse/ee4j#project/1.0.6": {
+   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+  },
+  "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
+   "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
+  },
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/junit#junit-bom/5.7.2": {
+   "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
+   "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+  },
+  "org/junit#junit-bom/5.9.1": {
+   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-commons/9.4": {
+   "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+   "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
+  },
+  "org/ow2/asm#asm-tree/9.4": {
+   "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+   "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
+  },
+  "org/ow2/asm#asm/9.4": {
+   "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+   "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/springframework#spring-framework-bom/5.3.24": {
+   "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
+   "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
+  },
+  "org/vafer#jdependency/2.8.0": {
+   "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
+   "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "ch/qos/logback#logback-classic/1.4.6": {
+   "jar": "sha256-YNcDCTnZYq/TzsMC6X7aZmhPI7bS3mJ6V3NEBbyOvKg=",
+   "pom": "sha256-kTy2lodqVoRhlG2ikY1X1YmPq9TNUYpsK42sMTYPTGc="
+  },
+  "ch/qos/logback#logback-core/1.4.6": {
+   "jar": "sha256-8Zy9I0s/fU4SksYstJ6QkO4SqA5yiRQxB2y7x98taUw=",
+   "pom": "sha256-1xXaLXfUKGP78e5WT7mwLsm9kmRJYq6cDuBdcvcfsaQ="
+  },
+  "ch/qos/logback#logback-parent/1.4.6": {
+   "pom": "sha256-JAzchDnB1+Rkgzb7u2G9iYY3Uqu3Ed6TWaGriQnD5K8="
+  },
+  "com/adobe/xmp#xmpcore/6.1.11": {
+   "jar": "sha256-j3AzxXm5n6DZ1t3LlEiHW15LV3w1AAInjORpl9Z4tzc=",
+   "pom": "sha256-cZEYGCECwlM+kqL2fANRAmTmFgVxpzishj51cSQXMj0="
+  },
+  "com/beust#jcommander/1.48": {
+   "jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=",
+   "pom": "sha256-EH4aAn6KszS4H7KJYGDba68y430uME5glCNtPn6ymQM="
+  },
+  "com/drewnoakes#metadata-extractor/2.18.0": {
+   "jar": "sha256-R4k2H9Bji9skFVS3oMyuIF7SOWl+K3D6nK2t7WmEtWU=",
+   "pom": "sha256-p9E4Id81LFQz1QjswN6KDwSWOE6kggfYEhR8pZgqFZ4="
+  },
+  "com/github/romankh3#image-comparison/4.4.0": {
+   "jar": "sha256-szMYgbr9HVOeco5GcDAZMdAZojouq/JXNwoGB1yxbIM=",
+   "pom": "sha256-0dQC8UcjY4K1/2oNdgtOjisML3ionnp+rorN/Xzgm4w="
+  },
+  "com/github/spotbugs#spotbugs-annotations/4.7.3": {
+   "jar": "sha256-wP0awuIqzdRpE6L/dFUbcfEkRXGZaIaYIEr0vz1DFl0=",
+   "module": "sha256-C85puO9wOJqNWr30ddFzAXe1CeQYZGP/2x1emmrVz/4=",
+   "pom": "sha256-NpAQoZC5Xi2aJi2OxRfexrZIeqGhuUaKKBY5SvS6J7Q="
+  },
+  "com/github/spotbugs#spotbugs/4.7.3": {
+   "jar": "sha256-3zfqshp9BKqAeAijPp98CBRRywLBS0osMxGZdr5JhSA=",
+   "module": "sha256-0xel6FE2WKCWvGxSqWnZOSrvrXjjq6o8xA9GQbXxpfA=",
+   "pom": "sha256-kiN32QwQdRhmiu93V5ysUgRYUqgNhCrUYIhvZ6yUld4="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.8.9": {
+   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  },
+  "com/google/code/gson#gson-parent/2.9.1": {
+   "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk="
+  },
+  "com/google/code/gson#gson/2.8.9": {
+   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
+   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  },
+  "com/google/code/gson#gson/2.9.1": {
+   "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=",
+   "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM="
+  },
+  "com/google/errorprone#error_prone_annotations/2.11.0": {
+   "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=",
+   "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg="
+  },
+  "com/google/errorprone#error_prone_parent/2.11.0": {
+   "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/31.1-jre": {
+   "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
+  },
+  "com/google/guava#guava/31.1-jre": {
+   "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
+   "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/1.3": {
+   "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+   "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
+  },
+  "com/ibm/icu#icu4j/59.1": {
+   "jar": "sha256-3q4ITtgb9Rk+9DsYGe5vEgNZ8QHvDxGqlGl/gumpEAU=",
+   "pom": "sha256-GvLMNO6decJdkw07N1vxDiTWicwdtVQwGfm4iGJcOMo="
+  },
+  "com/jgoodies#jgoodies-common/1.8.1": {
+   "jar": "sha256-3coQwW4dx6GzmcFFgPCq4jAUhR5X0iTLlsJg5tZJ0q0=",
+   "pom": "sha256-ia2b+Cr1wL1uSt8Vn2CBNhe4dtHL2hZ2pIlzv2QJIvI="
+  },
+  "com/jgoodies#jgoodies-forms/1.9.0": {
+   "jar": "sha256-dVx5UBq9gG9aqDJX3Iiyylkj5pZfPL/ocxFsfJdoIQo=",
+   "pom": "sha256-XPoeoCxNwZ0n3Vr8pRPynGerNE0aylU9jxbxW2mOT4U="
+  },
+  "com/openhtmltopdf#openhtmltopdf-core/1.0.10": {
+   "jar": "sha256-Pm/SJQ2DPVALfNSLeolnANDDO9n3eiGeggSTsBVm7aM=",
+   "pom": "sha256-fEK4zFhNkS5ZpEXz6217vuM4EVYRn2iwT8+jzQYh8uk="
+  },
+  "com/openhtmltopdf#openhtmltopdf-jsoup-dom-converter/1.0.0": {
+   "jar": "sha256-63ui8tallHmuPwTjuETJ7+XHpftVV5YCtwIy/NNRKHs=",
+   "pom": "sha256-LIRgEos9pbYvJ331iv+WrsJUFjzhSX7xmnXGaBs4b+4="
+  },
+  "com/openhtmltopdf#openhtmltopdf-parent/1.0.0": {
+   "pom": "sha256-tHP0Fk58V55SlYQOqMamBrdoBDoI7gAv2OLifU91kbc="
+  },
+  "com/openhtmltopdf#openhtmltopdf-parent/1.0.10": {
+   "pom": "sha256-d4ItapCYU0Pkx5CvlcEumrVKMCOKVFlOC3ncgRlk72k="
+  },
+  "com/openhtmltopdf#openhtmltopdf-pdfbox/1.0.10": {
+   "jar": "sha256-fekN8bPs+E5vDa+AjXJMERQgB6LyK/8ZNkeb8XJR0xo=",
+   "pom": "sha256-s1Ec1lzqF2iM8T/zHsVw10CLgb/d1S+uzK7tRVDMFxU="
+  },
+  "com/openhtmltopdf#openhtmltopdf-rtl-support/1.0.10": {
+   "jar": "sha256-VnXAtW1hOxVEb50JItiXga9I8FMxMmqHvbPRd1xwMhU=",
+   "pom": "sha256-w6P5q1EzekCkCG6v1NI/xaUZNZrpXv9pauUqu+T3HNI="
+  },
+  "com/puppycrawl/tools#checkstyle/10.9.3": {
+   "jar": "sha256-1X3pra1Cq2C7KXLlD4OhMcqm9iNHhPWUOjhxIAZhWR8=",
+   "pom": "sha256-qDfEUo/JqQ1oi8lQOcdSSCQPfG16GonZSDro+CWc508="
+  },
+  "com/sun/istack#istack-commons-runtime/4.1.1": {
+   "jar": "sha256-foFIxb9dWub4xFNMGHP4LoC/f5Fk/QnuVz3wATkY3NM=",
+   "pom": "sha256-AUdG9nro0Ku35gdfQHVy5ZE18RC4/4npzp0IdzCM254="
+  },
+  "com/sun/istack#istack-commons/4.1.1": {
+   "pom": "sha256-znYnSjAvr2kDaUDykxvQKNr8jf4RX26vB5aW2IXSAww="
+  },
+  "com/sun/xml/bind#jaxb-bom-ext/4.0.2": {
+   "pom": "sha256-3a1puTobatRYDGhlRC1PP2ah3PFMqoAuXqedNq2/Tcs="
+  },
+  "com/sun/xml/bind/mvn#jaxb-parent/4.0.2": {
+   "pom": "sha256-DO8mAlOvLk20M9jTNWjge3YfhvUI8Zy7zuHLK4HciqA="
+  },
+  "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.2": {
+   "pom": "sha256-12bnPAvaLjHkcF6NeSY6cu97lSF7wLPMIH09q0h/UGg="
+  },
+  "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.2": {
+   "pom": "sha256-NouOjMgRbYsOMTQVDrf4cdDpkWJYGoWfqo1L57zCvnc="
+  },
+  "com/vladsch/flexmark#flexmark-all/0.64.0": {
+   "jar": "sha256-YhGjIyjyeIhSfEv+eAmumlbLVgCKYXNFnO6akbutMTk=",
+   "pom": "sha256-1MruAxkvzhDOz4ojyvEJqtvgMxKLwsDHf7ILBRO/7y8="
+  },
+  "com/vladsch/flexmark#flexmark-ext-abbreviation/0.64.0": {
+   "jar": "sha256-AKOmtZND9xwEsHcaWWaE+XCtS2smSHXmjWASj8yuu3E=",
+   "pom": "sha256-jSzCgGy2HshhVje2IR2cz70jILD8W6UMKw4hoYTLxAc="
+  },
+  "com/vladsch/flexmark#flexmark-ext-admonition/0.64.0": {
+   "jar": "sha256-L68dru5fCDCAhhNg7HE9ogCCe6Too6ddSYbiV0KnSjQ=",
+   "pom": "sha256-9/uNwsEQXqRaJ5VHOEV5U2lBp4QC6OvLOQa/5lHSejI="
+  },
+  "com/vladsch/flexmark#flexmark-ext-anchorlink/0.64.0": {
+   "jar": "sha256-6PlJ1jKMSqbLJoL09BwYzGrkbZuceT5tsbbbaOE239w=",
+   "pom": "sha256-MbIoIA+tk9X6JzKo2V465MvbwTVZBB1y7Ji+sL9xgQc="
+  },
+  "com/vladsch/flexmark#flexmark-ext-aside/0.64.0": {
+   "jar": "sha256-MBlq9EIxQx4SkpL1H/GihxFJ7vg0zFvd3ViG4LTIOK0=",
+   "pom": "sha256-Dy6pFse93nQrWkFoSATx/P5KZTvbe0phgfR9UsKMS6U="
+  },
+  "com/vladsch/flexmark#flexmark-ext-attributes/0.64.0": {
+   "jar": "sha256-do3USlnfCCPWHi2CRAPIPMuFYlUZ/6oKywc3Hzy7GM0=",
+   "pom": "sha256-h+TziC5G5gpRcVlD30E3kNSpeWueAdjNzOqvQX/oi+4="
+  },
+  "com/vladsch/flexmark#flexmark-ext-autolink/0.64.0": {
+   "jar": "sha256-n24IZCADCSI2e+uu7xCbxoFMzf/wMqEjo4XIgqdKBh4=",
+   "pom": "sha256-XsuX3Heh13pJ3864L2HqHLZWsD40d0xl0zd/dI5nAJs="
+  },
+  "com/vladsch/flexmark#flexmark-ext-definition/0.64.0": {
+   "jar": "sha256-l3Yp+QZbmm2ExMsGXyBnQMtL6cESqpzjabpekQPZk5E=",
+   "pom": "sha256-9ybbKVFALID85u7uDHFkczH9fs82O45ZjbwAzj05hA4="
+  },
+  "com/vladsch/flexmark#flexmark-ext-emoji/0.64.0": {
+   "jar": "sha256-QLuQiVzhnO71sdnUQCwlLPRKFwdFTZ5hcGCsPYExZwI=",
+   "pom": "sha256-xkTvRKaeh1SSCZOdN0o/1bSdQCWfoxbVUjbLbnSUpyo="
+  },
+  "com/vladsch/flexmark#flexmark-ext-enumerated-reference/0.64.0": {
+   "jar": "sha256-HCW9zOo/O8tfJjzbl+W0ceVNLVyBML89Xa7iIbO1KGE=",
+   "pom": "sha256-bcdR5rL7RCktWk7RDebytGSHLQsO0YIKzj1OzHgs4Uc="
+  },
+  "com/vladsch/flexmark#flexmark-ext-escaped-character/0.64.0": {
+   "jar": "sha256-Pr3ATmrxnAqYpDR4F/tV0l3Zzsd6KA4a6lnv284pkh0=",
+   "pom": "sha256-6YLrqtx0CFj7VrscE0qKQKGXEmVSOjWnrDsrK14bFVc="
+  },
+  "com/vladsch/flexmark#flexmark-ext-footnotes/0.64.0": {
+   "jar": "sha256-UwjoadpnYh2LIlLBkkmNVFycF0J+9FYDYGJI+3d0THE=",
+   "pom": "sha256-QgvB2qkf7HyfXGdcjBzurYJUDuZ0OpzfHTCSuLIMBjg="
+  },
+  "com/vladsch/flexmark#flexmark-ext-gfm-issues/0.64.0": {
+   "jar": "sha256-eypqRXCWa5tlFWW1fDCfaQFE2Ty0jrA/AqrNWHAN2Ss=",
+   "pom": "sha256-kweXWvRFfAyq71UMlm6546obvVUXRtmYo2LP/t3act4="
+  },
+  "com/vladsch/flexmark#flexmark-ext-gfm-strikethrough/0.64.0": {
+   "jar": "sha256-UDoHOrSx29JXZJell+tR8TYZAvt7KUxgXomEhauR2yw=",
+   "pom": "sha256-L1As/ZAAaKuO1FEb/1B3nxG0t+y3SWDqZZEGrwPIHWE="
+  },
+  "com/vladsch/flexmark#flexmark-ext-gfm-tasklist/0.64.0": {
+   "jar": "sha256-60afO0i08bTL+hJ0ENnFUSDKdh6qZ1oDIQxgUrm9y5k=",
+   "pom": "sha256-VIKG2hGu7YRHUlazVZavI7+SgDDAIg+Pw4+nvGw4DC0="
+  },
+  "com/vladsch/flexmark#flexmark-ext-gfm-users/0.64.0": {
+   "jar": "sha256-Q8UuuvQtGFLO1GBcXo1T4c31vEoDdTgWquvqCyM0b98=",
+   "pom": "sha256-fe8wE2CCMNUAhkP6478je2wqsdlYkgiQb2LTOHnrTMk="
+  },
+  "com/vladsch/flexmark#flexmark-ext-gitlab/0.64.0": {
+   "jar": "sha256-1gjf/vr9HEzbnMfLoHvkYvcuIsmw/tyW/VeKQvH8TpA=",
+   "pom": "sha256-eHNQ+d+/t/263Mm5L0AygdZQCNj8t+N0ONAQicFoKrU="
+  },
+  "com/vladsch/flexmark#flexmark-ext-ins/0.64.0": {
+   "jar": "sha256-NX7/g4QuCjj2TDybPQfRD4hTnXNgz6zNki1aaoy7Pks=",
+   "pom": "sha256-6StgiDY4GWjm4KBApNUYIn+w1FRUmG1YUbLMEq5O004="
+  },
+  "com/vladsch/flexmark#flexmark-ext-jekyll-front-matter/0.64.0": {
+   "jar": "sha256-kgW6pcCFHmpHhKog6imqdcGULA4bJEjFklo3aeDDrZM=",
+   "pom": "sha256-LiXFPnl7q16g0bBRFiOSipHks1ht+3kav0yPzJ9ceNM="
+  },
+  "com/vladsch/flexmark#flexmark-ext-jekyll-tag/0.64.0": {
+   "jar": "sha256-eSCbHKXPexqbmUCuwGEEb5V+5mHXK4niSAquwlPPfmA=",
+   "pom": "sha256-hWyY+vDhNlT+DD+3NAnVSbnJT/q8PicUZo7jXMhBn6Y="
+  },
+  "com/vladsch/flexmark#flexmark-ext-macros/0.64.0": {
+   "jar": "sha256-ibSC8B/kwFI31RARfGkijEPoiW0d1NL76hSOrgT+ZxM=",
+   "pom": "sha256-TMoUvNNsnv32NAFa0PkZeI+HSGzNCp1A8D49/s1uS2E="
+  },
+  "com/vladsch/flexmark#flexmark-ext-media-tags/0.64.0": {
+   "jar": "sha256-gdVjwI15OxD6cvMAHZek2MnUdLF0QeSW9l4V6WnG+qQ=",
+   "pom": "sha256-az3O4RPERfCqpF93N8W4Ud2kryn0me0tQDQB0Gac8uI="
+  },
+  "com/vladsch/flexmark#flexmark-ext-resizable-image/0.64.0": {
+   "jar": "sha256-hfVp9He5j9H7sMC1cFx7xOLKBDSgqSp8zW7IsmF0Vq8=",
+   "pom": "sha256-Mcp5e5hNa+phCJgFxgWtFcz1WIpr9a5SsI36K22acLM="
+  },
+  "com/vladsch/flexmark#flexmark-ext-superscript/0.64.0": {
+   "jar": "sha256-ZkIhZ/1GUdEfea7p7E5C2omCLYF+RXTP0tMztvsygz4=",
+   "pom": "sha256-cW0MZ6ZAll+osZf/YLMatCJjiUQ3i4TGqiYPhm2Vhv0="
+  },
+  "com/vladsch/flexmark#flexmark-ext-tables/0.64.0": {
+   "jar": "sha256-ROvZl1uan2yjY5OFASv9CiWn5E6B231yzrACPGWMsBM=",
+   "pom": "sha256-79OmqDrgUM6f4TZG2s9LnelbKZQPZuePguKpfte+WOc="
+  },
+  "com/vladsch/flexmark#flexmark-ext-toc/0.64.0": {
+   "jar": "sha256-dRD7mX2BAC6VPXBXkSn9P0kqy9XqNrY2OinRouJsEus=",
+   "pom": "sha256-H/LX34k4RKkisHu2jBSLVQSYaeh8S1+9Eh/LcjjKcxw="
+  },
+  "com/vladsch/flexmark#flexmark-ext-typographic/0.64.0": {
+   "jar": "sha256-Sc2E6l4HlE6JWVEFMnLdZ8aabxCvSip3//6oWwuSieo=",
+   "pom": "sha256-F1OTdSk6t44U85DER4VavZq9X/fhTun90ZLwxPNxbUo="
+  },
+  "com/vladsch/flexmark#flexmark-ext-wikilink/0.64.0": {
+   "jar": "sha256-a9fZ2dbkf4od9LgFr7DQIE+mjsd200nI17XwYqYX5vA=",
+   "pom": "sha256-tn1DD+fDVeCkrjZenE1gkMfuDLnde4jNNVtazTfv4vM="
+  },
+  "com/vladsch/flexmark#flexmark-ext-xwiki-macros/0.64.0": {
+   "jar": "sha256-9gJ2LqXmlbYkAgx2uXvgd5MqMk7Ii6vwH9Gblm3Qp1A=",
+   "pom": "sha256-CpL8KpdacxIRd8nmjyVDiD2Z+ZEU9uzxFrq+UBt2m48="
+  },
+  "com/vladsch/flexmark#flexmark-ext-yaml-front-matter/0.64.0": {
+   "jar": "sha256-w0qcCxKMda+ELDH5K6F1DzVfMxlQXzbEKFFRktm8enQ=",
+   "pom": "sha256-VW7Od92UcNiFue6RZIFZWlFGTSIWhnUD+OOfn85hn/s="
+  },
+  "com/vladsch/flexmark#flexmark-ext-youtube-embedded/0.64.0": {
+   "jar": "sha256-pm1Io2r9VnnPciRF8xjKwlvRrmfXT1YERz+DIQ+JOG4=",
+   "pom": "sha256-sTfNH8rLQx19MIpzluDamq3qV/k68t9JArb5bUw9uEs="
+  },
+  "com/vladsch/flexmark#flexmark-html2md-converter/0.64.0": {
+   "jar": "sha256-jaqUSuUYR5E6XtDpdG+jyN+hE3kDmpGz9rvDXzGzYRQ=",
+   "pom": "sha256-SfsuY82tRD2QIS+FpUCmbvFvWTMGGn4jfuAaIbeLTMw="
+  },
+  "com/vladsch/flexmark#flexmark-java/0.64.0": {
+   "pom": "sha256-DzKIZahC74G9Y4jB+/LfthzsjxeOd+2w1DJiR2/Zwtc="
+  },
+  "com/vladsch/flexmark#flexmark-jira-converter/0.64.0": {
+   "jar": "sha256-Mk7eszPXEeO4Kgl1Fk6zXFqx8fi/CEwMTtaNUacEArs=",
+   "pom": "sha256-sxjCkjEygljBMRrhNdB9CJJjr+hANzQDRxiwhxkR8ZY="
+  },
+  "com/vladsch/flexmark#flexmark-pdf-converter/0.64.0": {
+   "jar": "sha256-a0hranhxfnaLPfVukd8wp/klf3Q2b9hwr7IE87wJcKw=",
+   "pom": "sha256-NP28yZlzJZ2mDIyg2FLOFS3wpO3GeVj7D7jigTO5EOc="
+  },
+  "com/vladsch/flexmark#flexmark-profile-pegdown/0.64.0": {
+   "jar": "sha256-y+ygT9k97ANf9Lhd7/qXagofJbXDdK1IJ1CyuGgvIRs=",
+   "pom": "sha256-vA4sTwmXpoMRKIoF2rSqtaEtjYY5OXodE93mfqfo4lI="
+  },
+  "com/vladsch/flexmark#flexmark-util-ast/0.64.0": {
+   "jar": "sha256-18odHwJ0V6X+zQtODdNg2Ij0szW+2AnBBG+nVGaultw=",
+   "pom": "sha256-8J2I9of9pRO/iVBjrDiTVdSn0BYRDMycF+F6n8yrbtc="
+  },
+  "com/vladsch/flexmark#flexmark-util-builder/0.64.0": {
+   "jar": "sha256-IhjNI5JURy5z6Y/D9O6CiAQZQJgWu7WFeVbafMjqcP4=",
+   "pom": "sha256-4shhAtpDQBaOAPVp8TtwtBTqONsteddKI0K3AwmhvEE="
+  },
+  "com/vladsch/flexmark#flexmark-util-collection/0.64.0": {
+   "jar": "sha256-X2jm2ieFBxAAyb6OHqaWjzBtjhRXNwzAYOn/eXTl+J8=",
+   "pom": "sha256-MEhtpvhV9X5JCegmyAVTdYLU2odai6nypSKOHprpY0c="
+  },
+  "com/vladsch/flexmark#flexmark-util-data/0.64.0": {
+   "jar": "sha256-QGE+lEaeQ9kdOoU/TGP5fj4b6JHNZL7W4qf2M45/YCQ=",
+   "pom": "sha256-l2wYgftg7AuXOh28peID6YZ63P3GYeIn+A6/OzHSO5s="
+  },
+  "com/vladsch/flexmark#flexmark-util-dependency/0.64.0": {
+   "jar": "sha256-lKvB3mrklHPJOX6tQ0T1XartObMIGUNFEXi3ieXrVlA=",
+   "pom": "sha256-An7WYGSX2tWqEQzVGirC4IlR8ZpFfNPeWYgMQwOvgE8="
+  },
+  "com/vladsch/flexmark#flexmark-util-format/0.64.0": {
+   "jar": "sha256-pM0u/oQKEz/kCKK/q8kqIdhEAtmvnoKeBSp0UQLo8ow=",
+   "pom": "sha256-V+svkx1MjeiieIdFyrNHxCrGUeaYJDNyoW4/IFV84J0="
+  },
+  "com/vladsch/flexmark#flexmark-util-html/0.64.0": {
+   "jar": "sha256-rhiKVYjhizcla7qhsxRzH/wH1pFwQSRFhGUZMIHaU9c=",
+   "pom": "sha256-7txhuO2YsnFgHFghssm3AylXWp26ri0OHgoGpwrP6H8="
+  },
+  "com/vladsch/flexmark#flexmark-util-misc/0.64.0": {
+   "jar": "sha256-Fm//sY40tK6AoYk6rRDh977TehepOrzvPS5Bd81mbjg=",
+   "pom": "sha256-pO6qkEgw+AK86T0o0SLmcjoroxN3yHfkxlpxgWFEEAI="
+  },
+  "com/vladsch/flexmark#flexmark-util-options/0.64.0": {
+   "jar": "sha256-ZJZkA+O4ZceTbrY+eBWhmnJrhU5FuBc6ihP30Bu4Gx0=",
+   "pom": "sha256-TLjhhNIyqhNL9mNgwmlliuhZtcW5ZGYsDVJhhmoPTjM="
+  },
+  "com/vladsch/flexmark#flexmark-util-sequence/0.64.0": {
+   "jar": "sha256-VdlCv3nSfB01HG9UhyxzQVPMyJUqXdUla3zHFsmvh1w=",
+   "pom": "sha256-wQVm3WINTPH5O6eSe5rD9COVSGkUj87Nj1qfH1hw8Tk="
+  },
+  "com/vladsch/flexmark#flexmark-util-visitor/0.64.0": {
+   "jar": "sha256-y2JWuVZaie0IZIVHZXsMm58ovzfCXFReQx7eEPtc2jU=",
+   "pom": "sha256-mh3XLXJiLfK4UTF+3Pjyd3CsWhZYZ5Diyz2M/d4bEtU="
+  },
+  "com/vladsch/flexmark#flexmark-util/0.64.0": {
+   "jar": "sha256-Kcsj15uQmfZxQ3fbjHo/DKmctsc+xRVJaSByts8MMQs=",
+   "pom": "sha256-oAqfr2rRMN8UOi7s+WhLqa8eCQEwEjaJ95fAkw4ogMs="
+  },
+  "com/vladsch/flexmark#flexmark-youtrack-converter/0.64.0": {
+   "jar": "sha256-MO+UZ7yfndMLH1zZ2lmJqvJfMqe7GrSuPZRNORoqH5s=",
+   "pom": "sha256-pxwRECE/ODT2ChYRT0lxPS9GqW3GJWn3YBFe1OuxjR8="
+  },
+  "com/vladsch/flexmark#flexmark/0.64.0": {
+   "jar": "sha256-LqqlExPuL13OHgTdv3k0lreQqOX/uYQdf1KoUg62t1M=",
+   "pom": "sha256-ghGnouT0Qi2GLOI10E9V4M1m3KUHA0BeOldALbmzSrE="
+  },
+  "commons-beanutils#commons-beanutils/1.9.4": {
+   "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+   "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-collections#commons-collections/3.2.2": {
+   "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
+   "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
+  },
+  "commons-io#commons-io/20030203.000550": {
+   "jar": "sha256-f97EcIXrAcBg0HvXkSHuoqjPHY8RCuS6ieAwd5UlL08=",
+   "pom": "sha256-ue0Mne+Ff7ULVXJYNEn+Mf64B1L5aN6fYBw5FX9hNKc="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "de/rototor/pdfbox#graphics2d/0.32": {
+   "jar": "sha256-N/jzhzlflsIUrET3R1x6Lh+DLfwd4omjYQ4P+/co9nk=",
+   "pom": "sha256-c1kfzPP1PAFJ1TitQ4490Qy9u5el+Tib/rwtImNBBxQ="
+  },
+  "de/rototor/pdfbox#pdfboxgraphics2d-parent/0.32": {
+   "pom": "sha256-Hoe4voyix97tOswUxMl7Y0iD+xNwztwMGan6Z3ExaGQ="
+  },
+  "info/picocli#picocli/4.7.1": {
+   "jar": "sha256-DnGR++Mk+5340tIHwHtma43CW7vib1OkxS4v7OYkqXY=",
+   "pom": "sha256-+pvmlFd2A+LUy1X0UjctP2wPk+XzjuXNf7Yos3k8qbw="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.0": {
+   "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.1": {
+   "jar": "sha256-M7rj8PEtu1p6/IHYAqEwNZzbRLvH+0shP0mzSdBJGgQ=",
+   "pom": "sha256-aTJZ+O/tqXSHm/MFz3HPELZUjYxvZ6ufNYyWrUfnygA="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": {
+   "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": {
+   "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=",
+   "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs="
+  },
+  "javax/activation#activation/1.1.1": {
+   "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=",
+   "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A="
+  },
+  "jaxen#jaxen/1.2.0": {
+   "jar": "sha256-cP7vndda0GTe8Fo86Jda66UV7n0b4UbRIZnIgopkF0w=",
+   "pom": "sha256-zEgr+qIqVQepb6WzorYVkRRDrT9zZOAgBNGQsGfzsH8="
+  },
+  "net/jcip#jcip-annotations/1.0": {
+   "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=",
+   "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc="
+  },
+  "net/sf/saxon#Saxon-HE/11.4": {
+   "jar": "sha256-QuNUlNwua16XJWrnzfK3zjBDnDUlZvNd4CvtOgaisWk=",
+   "pom": "sha256-zE2jTuC+5MZa2118spI0H2Wb76NSiPbjH4CdxLsvxXU="
+  },
+  "net/sf/saxon#Saxon-HE/12.1": {
+   "jar": "sha256-IA8skvaHHVG8LhS3Br82TTvb8isnlgtu1rqH5BZk5VA=",
+   "pom": "sha256-0wqLQpc3MZf2YH5RpAppxVe7Ts7aweZU0bAiob/ZjYI="
+  },
+  "net/sourceforge/pmd#pmd-core/6.55.0": {
+   "jar": "sha256-bQT8maP3SlN8Bn0NKeZiSdygiPpBtyjUZ+7Db9hnIY0=",
+   "pom": "sha256-NquxsZDOOOpFkvkvu5I2bI8Nyo86RDEdU42MbNdAP9s="
+  },
+  "net/sourceforge/pmd#pmd-java/6.55.0": {
+   "jar": "sha256-fdBP8x1JZNYCfxPARoFw1OC6LiaFAz7VJLWawIrP3EY=",
+   "pom": "sha256-y6U9x7sywnwE04i3D7MPTTNqtX6Sfyzo4cKmExznUfM="
+  },
+  "net/sourceforge/pmd#pmd/6.55.0": {
+   "pom": "sha256-ENRt2Qw3aJGB9TsHi/60VZwkxkuAjkAAtCQJKPNib/w="
+  },
+  "net/sourceforge/saxon#saxon/9.1.0.8": {
+   "jar": "sha256-89zegQZsddtP/KNB1UNVXbu7p//3um0cLn3hEB3qOUo=",
+   "pom": "sha256-mwd5+pbfKagzvOMhjo25zAGGNgWy9zrePTCM4ff3kXk="
+  },
+  "net/sourceforge/saxon#saxon/9.1.0.8/dom": {
+   "jar": "sha256-xs8+zH9LZauLYT0A/Z6cBkilqgMmSpQboP0tpTOfkXo="
+  },
+  "org/antlr#antlr4-master/4.11.1": {
+   "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0="
+  },
+  "org/antlr#antlr4-master/4.7.2": {
+   "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
+  },
+  "org/antlr#antlr4-runtime/4.11.1": {
+   "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=",
+   "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ="
+  },
+  "org/antlr#antlr4-runtime/4.7.2": {
+   "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
+   "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/16": {
+   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/24": {
+   "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU="
+  },
+  "org/apache#apache/27": {
+   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+  },
+  "org/apache#apache/29": {
+   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  },
+  "org/apache/bcel#bcel/6.5.0": {
+   "jar": "sha256-ves4HQ0ZmZ4iHmoPjYv0T1sZwuV+q/aLcNwJhlKu+vU=",
+   "pom": "sha256-/B6eb17UvSAMsGYghsiYwAAmOGoutKY0hBH34OBotcU="
+  },
+  "org/apache/commons#commons-lang3/3.12.0": {
+   "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=",
+   "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
+  },
+  "org/apache/commons#commons-lang3/3.8.1": {
+   "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
+   "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/39": {
+   "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/apache/commons#commons-parent/50": {
+   "pom": "sha256-e3ots/dHB0tYZ/VT1e/IByvibt4yh50FLDR+fIERfwY="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/54": {
+   "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
+  },
+  "org/apache/commons#commons-text/1.10.0": {
+   "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
+   "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/12": {
+   "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E="
+  },
+  "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": {
+   "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU="
+  },
+  "org/apache/httpcomponents/client5#httpclient5/5.1.3": {
+   "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=",
+   "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8="
+  },
+  "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": {
+   "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=",
+   "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y="
+  },
+  "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": {
+   "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs="
+  },
+  "org/apache/httpcomponents/core5#httpcore5/5.1.3": {
+   "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=",
+   "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64="
+  },
+  "org/apache/logging#logging-parent/5": {
+   "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI="
+  },
+  "org/apache/logging/log4j#log4j-api/2.19.0": {
+   "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=",
+   "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.19.0": {
+   "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c="
+  },
+  "org/apache/logging/log4j#log4j-core/2.19.0": {
+   "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=",
+   "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk="
+  },
+  "org/apache/logging/log4j#log4j/2.19.0": {
+   "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ="
+  },
+  "org/apache/maven#maven-artifact/3.9.1": {
+   "jar": "sha256-G2c9ds+HdzRMY1DViFM+o5Tdk/6aGyv/MZ2Wyw3edPI=",
+   "pom": "sha256-U6pfgPZmS3uytKEfY8uWuTMdxk0g+8JgOVis7GVzzVg="
+  },
+  "org/apache/maven#maven-parent/39": {
+   "pom": "sha256-z+SCCqHZauUdHcWw4qncWCxCR4wkyVyoI49UfmC+9yE="
+  },
+  "org/apache/maven#maven/3.9.1": {
+   "pom": "sha256-BuLk22P5EFoLZN3zR0dVD3PIAE/lTfCkt7GW30PH9sM="
+  },
+  "org/apache/pdfbox#fontbox/2.0.24": {
+   "jar": "sha256-LowKVpqQsEc0+8DIBdd/TsA/mMEfVwUFXM13GMGVPWg=",
+   "pom": "sha256-+lX3XamiHT8osnOq5N0BlvgZWJeXbwaJBrtL8TOkOy8="
+  },
+  "org/apache/pdfbox#pdfbox-parent/2.0.24": {
+   "pom": "sha256-2UnC4D8CN2P/UxJx+XK8wPtLjpBn95+VUE4wGniROFg="
+  },
+  "org/apache/pdfbox#pdfbox/2.0.24": {
+   "jar": "sha256-PCwFU+wOdTPEkLTJUuGvETYh3lJ1r244DhHQ2aCk89Y=",
+   "pom": "sha256-K/bZPEyekiATK9qB9gPkactDWCk0nCh+zzpyTDEJLD4="
+  },
+  "org/apache/pdfbox#xmpbox/2.0.24": {
+   "jar": "sha256-Jzg98ihbniKMOfLHVa3uu+93R5PTPE8g8NyZ6euq9nM=",
+   "pom": "sha256-9zR7V9mny0VGvY5PqJVuYW/ezUak0lkNGovrhHpUVkw="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/bytedeco#artoolkitplus/2.3.1-1.5.8": {
+   "jar": "sha256-E62uNasDMp1/zKD1/ggUKCwz4GRQPPI2/t5AcG4G4Ow=",
+   "pom": "sha256-iBiEMhBqWyqjWaPLuoBE70tDcgpD6igiaiol/q+2aLs="
+  },
+  "org/bytedeco#ffmpeg-platform-gpl/5.1.2-1.5.8": {
+   "jar": "sha256-6wYR1gkeiQSos6sjINZD3+gnMR+vCbqYkCaYDNmv3mg=",
+   "pom": "sha256-f87SGBcgK7q1pE5U2hnHFSZLPa3F/UnNUXvheqX8QpE="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8": {
+   "jar": "sha256-N9U0VLPHBL6gTXuDiLbkxniaVxUvY87gxBSz3XMNNGQ=",
+   "pom": "sha256-b0TncWhEiadEjU8DYFy4ZLJS2zw1U0upc6a2FSy2HHo="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/android-arm-gpl": {
+   "jar": "sha256-tZs58BhrDJWUb8vfLpCy4Uuz9MUGNmdovWWbngLOQBk="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/android-arm64-gpl": {
+   "jar": "sha256-U9OUb+2jt4o0Epgj/3IIprKPvU9BLLLAz/Xy7/PXWos="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/android-x86-gpl": {
+   "jar": "sha256-vjXtMPRHopSWI3+bbN9awCDV5HV20Bs1kx7yY1kcWJg="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/android-x86_64-gpl": {
+   "jar": "sha256-7RxhcLNnbdCUBv4h+MpH28FB5inRa2+Un43592eumjA="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/linux-arm64-gpl": {
+   "jar": "sha256-AIKQ5RkVq2sLNGlxamRe0eBryWgy5tIH9etzu+TGBuQ="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/linux-armhf-gpl": {
+   "jar": "sha256-3nJz/rxnS20E//hpi8lD8s0HZUfddoDfq+2KEM4204s="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/linux-ppc64le-gpl": {
+   "jar": "sha256-Ys9titA4rL5yqfFnKahOkZO5jKv+rVbXiXAJxKVnBx0="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/linux-x86-gpl": {
+   "jar": "sha256-Dko72ZrRQ3W276Jh3Bcj1F3/rLNurS4WMrLpLJtmf1U="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/linux-x86_64-gpl": {
+   "jar": "sha256-qvy4BkSuvOdozmqfUz6LALumKz0FMgQ7lJzvWKbUuXY="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/macosx-arm64-gpl": {
+   "jar": "sha256-Xnd3BtEUeZjHc3TNUasydQDrRRi8UfosxTFc4HfkIFE="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/macosx-x86_64-gpl": {
+   "jar": "sha256-AwHpQKAwHFl8ObW+ur4d0GNmcGgNxW4671+NkXIOIvo="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/windows-x86-gpl": {
+   "jar": "sha256-q4LDIh2d1QISVHJ61+niqs8oZ1OSgnh/ErdIMBp2ggU="
+  },
+  "org/bytedeco#ffmpeg/5.1.2-1.5.8/windows-x86_64-gpl": {
+   "jar": "sha256-rJjjKnu4Xj45oLe6oPNjhprfsj+pxv8MsrxwiGIkblw="
+  },
+  "org/bytedeco#flandmark/1.07-1.5.8": {
+   "jar": "sha256-vN+zvmZ2RU7fIqOvLGIHW9fe2o/orjN+rHo9BMgLIL8=",
+   "pom": "sha256-4lHa5UjAT+lX8IniMArhmZyvHKp5O5RDAbL75qMN4EY="
+  },
+  "org/bytedeco#flycapture/2.13.3.31-1.5.8": {
+   "jar": "sha256-681xJ5swSsQrGXeVIc3TwfU8UPmGlgkbLptVXxl5nBM=",
+   "pom": "sha256-TMIcCXVPFuwqkDwq1Far0Ow7KWHF4NiurCxsq1vR5Cw="
+  },
+  "org/bytedeco#javacpp-platform/1.5.8": {
+   "jar": "sha256-368nabsftrvyt6WpGzQc0hY5XCUzeIy/VnWPrqzagNI=",
+   "pom": "sha256-pfRwrXvkFw5F/Iw7drJXF3nGf7TthaNBHNsSz6mDvD0="
+  },
+  "org/bytedeco#javacpp-presets/1.5.8": {
+   "pom": "sha256-uCm0nxPCJ5y3OMEseZOmmbvQgs7U8iJVBI/nQwx+rtA="
+  },
+  "org/bytedeco#javacpp/1.5.8": {
+   "jar": "sha256-J9Xq+PRDP2QEquCtNM27+sdRdOJEwR04Ii4NB1rzOGM=",
+   "pom": "sha256-aNdDDWI0S0qLjWQ4RYFrQ0F8s6Gj3El8rRm0OMDzDAk="
+  },
+  "org/bytedeco#javacpp/1.5.8/android-arm": {
+   "jar": "sha256-MMRr4ASIZpsY/hVR2QZcxUYbo/qg3TDFhlns1kBas6Y="
+  },
+  "org/bytedeco#javacpp/1.5.8/android-arm64": {
+   "jar": "sha256-ufA58o6bwJTW3LNiuDv4gHGjWEKi9NOwOZzf8TKXNAo="
+  },
+  "org/bytedeco#javacpp/1.5.8/android-x86": {
+   "jar": "sha256-oOnTbV6/9aeP+A4JY8cvbjcqP5v+l44qEHYeIyZhubY="
+  },
+  "org/bytedeco#javacpp/1.5.8/android-x86_64": {
+   "jar": "sha256-4AFL8xkaqqKD77EteBBR3A30Xh0f0pyoTQ5rTPWv6ug="
+  },
+  "org/bytedeco#javacpp/1.5.8/ios-arm64": {
+   "jar": "sha256-j6p7AmmfohAiFGzA+NoCZS611qt+WBScAZ7ERXGNvVk="
+  },
+  "org/bytedeco#javacpp/1.5.8/ios-x86_64": {
+   "jar": "sha256-6mHblQHlZGzyekpGvEZwD9QV8j6KCKp8Twq2e8HmIXE="
+  },
+  "org/bytedeco#javacpp/1.5.8/linux-arm64": {
+   "jar": "sha256-WBfo9P61qs0jeT/wUqY+8FBrHk1xGFd85eziU/7P148="
+  },
+  "org/bytedeco#javacpp/1.5.8/linux-armhf": {
+   "jar": "sha256-dVkkr04wIr9WggmtWQULtoF+YBXsZ41bLWxdbuDFyLE="
+  },
+  "org/bytedeco#javacpp/1.5.8/linux-ppc64le": {
+   "jar": "sha256-mG1ko0dW0y1S1AaoHdulI88LER3UDfsIq5JIFO/dhjQ="
+  },
+  "org/bytedeco#javacpp/1.5.8/linux-x86": {
+   "jar": "sha256-ZM5K62EPdfp2Ln8UcizoIGkgOdnye6GjeHzd14Q8kGA="
+  },
+  "org/bytedeco#javacpp/1.5.8/linux-x86_64": {
+   "jar": "sha256-NreAV83MX6DclQ4pJxpYwKbvxVc72b0oRbmczLsxFqc="
+  },
+  "org/bytedeco#javacpp/1.5.8/macosx-arm64": {
+   "jar": "sha256-xgV0gDa3FY7coBKMP+vOa658Syl0BlY+uuKg3LxZEmE="
+  },
+  "org/bytedeco#javacpp/1.5.8/macosx-x86_64": {
+   "jar": "sha256-bE8L9AR4fFo3TFc7JEXV1tjOYg98nvQbLGAdH+ODbWo="
+  },
+  "org/bytedeco#javacpp/1.5.8/windows-x86": {
+   "jar": "sha256-tTbgYNYk4I2VTjT1KNQotMsYL/fn6lwDEMHXkdLHrFs="
+  },
+  "org/bytedeco#javacpp/1.5.8/windows-x86_64": {
+   "jar": "sha256-G7CBlNdngM2IX7/SftJN+xygiO4LeorqJag2yxUG7tw="
+  },
+  "org/bytedeco#javacv/1.5.8": {
+   "jar": "sha256-a6gqK+Vkue0yBhKQaFrv6jr+oA1KvKAMIqPPMZFZy1Q=",
+   "pom": "sha256-UL3o/3vj5J20UWckOPzz5eKUaNNNEaQWDIqSUMsIj/A="
+  },
+  "org/bytedeco#leptonica/1.82.0-1.5.8": {
+   "jar": "sha256-LEdWIcYf/8g8z5/sQCg6QKvY5kw6JH2aEt0R65whHBE=",
+   "pom": "sha256-tktsM9bTqml8LrlV9AzH1Lf/aX550EdlDH7Vi78pdtc="
+  },
+  "org/bytedeco#libdc1394/2.2.6-1.5.8": {
+   "jar": "sha256-tHFTsG0qfL9A8ifbF9wgW9imyVVlxiAspQfI+Gyo99U=",
+   "pom": "sha256-eTHxBuHhu5iCBzxo1/kfw+uBjuEPTyNfq1iMJ/0oXqY="
+  },
+  "org/bytedeco#libfreenect/0.5.7-1.5.8": {
+   "jar": "sha256-BKmPv0wppn1LIAEf5b4gl4za+xyns7E6UgID+v4G668=",
+   "pom": "sha256-fXj5h1ZlDIeMKYfsehglVG2EEJC/tic4C8JlWPrTtuQ="
+  },
+  "org/bytedeco#libfreenect2/0.2.0-1.5.8": {
+   "jar": "sha256-2A+cLirzUhMXJmq3eRpd85akBrpMmGFjn/8DiunZJTM=",
+   "pom": "sha256-en8s2hwug1wNrsG5+zVr2+6gpKOBpwHa83I0dw5uymw="
+  },
+  "org/bytedeco#librealsense/1.12.4-1.5.8": {
+   "jar": "sha256-mweOkNDj99vQyT0OpqiAyBAoe3ZkeHFDbJnk0gGjP84=",
+   "pom": "sha256-JvFCSsvDU3T02F7G0fektVr/TqbpZgFAbX3c1opdtm0="
+  },
+  "org/bytedeco#librealsense2/2.50.0-1.5.8": {
+   "jar": "sha256-v9YLDa5jsqp/E448fILYKoweDOoWuUw+C/nYwMT1hHw=",
+   "pom": "sha256-RfMdwke+KTDXpwVDpLeVZsmhh55SX5Pe0wS297h/JRs="
+  },
+  "org/bytedeco#openblas/0.3.21-1.5.8": {
+   "jar": "sha256-iKM2imHyJIZQSJaKW7b63yJMwL0lOD4WzQ9Bthk9+cE=",
+   "pom": "sha256-k+wcqxivc92Rn+FICENPp/srtx753AHhYhWSWSbCoc0="
+  },
+  "org/bytedeco#opencv/4.6.0-1.5.8": {
+   "jar": "sha256-tFA4yK+gb7x0J5togHNj9AiMhggxIcWJ1HbFdCeUob8=",
+   "pom": "sha256-6e1l0g6COKCcVqrrOOEsK3AoIJw6OangTKbRAjkRxuY="
+  },
+  "org/bytedeco#tesseract/5.2.0-1.5.8": {
+   "jar": "sha256-aX5jCCtj97kKIt/6wq43RgPii0ehcIyPBBh4zglZVB8=",
+   "pom": "sha256-enImYR7nHVHRxD1gATQTDozuoEv2edWULBAUpkKAq1Q="
+  },
+  "org/bytedeco#videoinput/0.200-1.5.8": {
+   "jar": "sha256-VsmQD5/AFNWpAcgEP3titR9o41jX/eatYA/e0KdW9+4=",
+   "pom": "sha256-1WydCqcwwiWStItsYBgs9keMznmhS9uVYTUaqFr4FSU="
+  },
+  "org/checkerframework#checker-qual/3.27.0": {
+   "jar": "sha256-Jf2m8+su4hOf9dfTmSZn1Sbr8bD7h982/HWqNWeebas=",
+   "module": "sha256-H1L7VyqCR4PvVyPW0LejEUOz2JKpQerXur4OH/kWM30=",
+   "pom": "sha256-yXIt1Co1ywpkPGgAoo2sf8UXbYDkz2v4XBgjdzFjOrk="
+  },
+  "org/codehaus/plexus#plexus-utils/3.5.1": {
+   "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
+   "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
+  },
+  "org/codehaus/plexus#plexus/10": {
+   "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
+  },
+  "org/dom4j#dom4j/2.1.3": {
+   "jar": "sha256-VJ8wB8YpD2qQHlfR0zG07Q5r9zhPeL8QMW/87sqDTeY=",
+   "module": "sha256-3sfF/Y1SDa+1exXi87a+LxgFYTQqP0Ub7u6QVUO8FwM=",
+   "pom": "sha256-zcnEn1nSMNQnF3G7dkqnCX1qy83CUAFJ5NLJUd9crDA="
+  },
+  "org/eclipse/angus#angus-activation-project/2.0.0": {
+   "pom": "sha256-XWbOorFVObbyILKpygExfmkmV8/zjdX534ZHeDmMzp0="
+  },
+  "org/eclipse/angus#angus-activation/2.0.0": {
+   "jar": "sha256-OhLTIaDzWqlFj/m27pOj3na3jj8YsHfIFyFHPYMHkUc=",
+   "pom": "sha256-WWP2VibTUuLmKwThx00MKVjVeBAg66w9dmO6tPwTaek="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/eclipse/ee4j#project/1.0.8": {
+   "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s="
+  },
+  "org/glassfish/jaxb#jaxb-bom/4.0.2": {
+   "pom": "sha256-hvpoBVc0q6rsD1sAu+cuz7wfyjkPlGR+ETDpC/2tbyE="
+  },
+  "org/glassfish/jaxb#jaxb-core/4.0.2": {
+   "jar": "sha256-1/8pVK14SAu6uTkczP86IvQqgrbgmuyhx9UCQRxHDM0=",
+   "pom": "sha256-qsL2Td/uox/eo8TLEBi77oAmQ2E/yya173GzEzSR0QM="
+  },
+  "org/glassfish/jaxb#jaxb-runtime/4.0.2": {
+   "jar": "sha256-G8Jx5htxykvYnrBT89LJHUeCEbAqiYLLUg8hb+DpqTk=",
+   "pom": "sha256-m7rMSS/NedNhN9i2CD9aZvw1W7QwZVVgbJqF+gqAsJI="
+  },
+  "org/glassfish/jaxb#txw2/4.0.2": {
+   "jar": "sha256-6nGRLk8KQlMPd8mECukAGcRkAt7f3wB8/wN5dCmgzww=",
+   "pom": "sha256-F7HnMmZGah+se1lvZPWsjCloMYFDQpvduw7sY21Myec="
+  },
+  "org/imgscalr#imgscalr-lib/4.2": {
+   "jar": "sha256-bxKKccXoehb4EFE6c608d9DuC7Yi7gzh6tEVvMvHbQo=",
+   "pom": "sha256-GFcf68Cw2eCGpN2U+CiAQs8CK8dSyXGEf3splBbkVC4="
+  },
+  "org/javassist#javassist/3.28.0-GA": {
+   "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
+   "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0="
+  },
+  "org/jetbrains#annotations/15.0": {
+   "jar": "sha256-10WZzvKzY/2zzdMZhRWsoJDj6j6YsrpHPG5G8RTasnI=",
+   "pom": "sha256-ZyZnisB7SBteNdOu785Sa5X9GO3jPQ2Fyxxoi83w6EA="
+  },
+  "org/jsoup#jsoup/1.14.3": {
+   "jar": "sha256-kq8Z7FfMd2N9tEkPD1AR8ERNNTIJzjYIO6xCj5uBo5w=",
+   "pom": "sha256-UsW86oFXCKOWqs6xQZm5Z5j8MhmtBSNvAaKttMhekGE="
+  },
+  "org/junit#junit-bom/5.7.1": {
+   "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
+   "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
+  },
+  "org/junit#junit-bom/5.9.0": {
+   "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
+   "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
+  },
+  "org/junit#junit-bom/5.9.1": {
+   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.9.2": {
+   "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=",
+   "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=",
+   "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.9.2": {
+   "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=",
+   "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=",
+   "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.9.2": {
+   "jar": "sha256-vekZAKXOXWZju0S8cISUs12u/Nc+G7evphpK/+OOqX0=",
+   "module": "sha256-8nRsapwHfhjCW1ZoP7LWNatKBLlOppASBIJVD/aocfs=",
+   "pom": "sha256-eTcn73c9vO6co7HzzvcIrqDpUpPmfQ1Gj3e+hA2OyRw="
+  },
+  "org/junit/platform#junit-platform-commons/1.9.2": {
+   "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=",
+   "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=",
+   "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck="
+  },
+  "org/junit/platform#junit-platform-engine/1.9.2": {
+   "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=",
+   "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=",
+   "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ="
+  },
+  "org/nibor/autolink#autolink/0.6.0": {
+   "jar": "sha256-qAvgMPY4bxgRHK2RYcC2mDFXNSobWaWeYAIXLw0yHAQ=",
+   "pom": "sha256-kWdVZHo0zLNn4Rg00oOAGYyDSt/PZg4NmD43W49cKPI="
+  },
+  "org/opentest4j#opentest4j/1.2.0": {
+   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-analysis/9.4": {
+   "jar": "sha256-e1+MXjvzQbW7Vw0m83nj/evcMnMhhxWcQkeRZAU/Nz0=",
+   "pom": "sha256-fZtgkidiP2x+9v13+gbaWG0Na6wRTPPnICDaiFPYdZw="
+  },
+  "org/ow2/asm#asm-commons/9.4": {
+   "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+   "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
+  },
+  "org/ow2/asm#asm-tree/9.4": {
+   "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+   "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
+  },
+  "org/ow2/asm#asm-util/9.4": {
+   "jar": "sha256-PXkyuT/1UFZkHnz7YB+WvNXNBx4bBQPHilAUIyKXoj4=",
+   "pom": "sha256-ugQzwHsMD2mA8suPgEH/WcgemEgeEBliEFFi43IvH5I="
+  },
+  "org/ow2/asm#asm/9.4": {
+   "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+   "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
+  },
+  "org/reflections#reflections/0.10.2": {
+   "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
+   "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
+  },
+  "org/slf4j#slf4j-api/2.0.0": {
+   "jar": "sha256-oiPm35G4TxnUnF68X1+Xx/RDhBn4SlL6BeHPxu7Tiqk=",
+   "pom": "sha256-Ri98K2JXw2dZ8XY0axr/ADI/W2Nhm9jxonFrLqvnxnA="
+  },
+  "org/slf4j#slf4j-api/2.0.7": {
+   "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=",
+   "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE="
+  },
+  "org/slf4j#slf4j-parent/2.0.0": {
+   "pom": "sha256-pi0qZ9d/fLRw+siIvEIdhIjvIBTnwr+Ne0GT1fKKz7U="
+  },
+  "org/slf4j#slf4j-parent/2.0.7": {
+   "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec="
+  },
+  "org/slf4j#slf4j-simple/2.0.0": {
+   "jar": "sha256-qE0IW9is0HHv9dHMGKe6bZz9CAou6IpmiUkuLEn5fpY=",
+   "pom": "sha256-9k/4Cue1R84QpIiaejqva1gjV+Xg9is7w0rYx9OtNQQ="
+  },
+  "org/sonatype/oss#oss-parent/3": {
+   "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/xmlresolver#xmlresolver/4.4.3": {
+   "jar": "sha256-nWQslsP2gR4gqfbP7jyhXshOy5Ofa+Y5/uBlZwdzp9E=",
+   "module": "sha256-8GvLyo9h/M9XRtT+zEg+GgGNCYvVGRdxTH2wBCIA+Dc=",
+   "pom": "sha256-FGtXOSRyKmK1jnF2r2hgxoD4p3+XJsXiGHnJxAHtRkI="
+  },
+  "org/xmlresolver#xmlresolver/4.4.3/data": {
+   "jar": "sha256-pX2yPXXDWAyxXrbhqFRoP0V5z9Jl9c8QEaaYPZrtDx8="
+  },
+  "org/xmlresolver#xmlresolver/5.1.1": {
+   "jar": "sha256-MSL4rkDERq27MDzVUldoA/2/bq77hL985D0TNlsnymg=",
+   "module": "sha256-DaZVpENW8JhTRljd56tHCwOSc8Wc9NyU7HcQYnCpzV0=",
+   "pom": "sha256-pQDlCR85eXYVDo05n+tBDIXlfXyQl9Y5gdMeL27Bbtk="
+  },
+  "org/xmlresolver#xmlresolver/5.1.1/data": {
+   "jar": "sha256-uvgjj/PdgGV2SHWvLkHeiw7kWF4AsC9R7JEb1l/TwcM="
+  },
+  "xml-apis#xml-apis/1.4.01": {
+   "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=",
+   "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI="
+  }
+ }
+}
diff --git a/pkgs/by-name/gp/gpx-animator/package.nix b/pkgs/by-name/gp/gpx-animator/package.nix
new file mode 100644
index 000000000000..f274e0304105
--- /dev/null
+++ b/pkgs/by-name/gp/gpx-animator/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gradle_8,
+  jdk17,
+  makeBinaryWrapper,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gpx-animator";
+  version = "1.8.2";
+
+  gradle = gradle_8.override { java = jdk17; };
+
+  nativeBuildInputs = [
+    finalAttrs.gradle
+    makeBinaryWrapper
+  ];
+
+  src = fetchFromGitHub {
+    owner = "gpx-animator";
+    repo = "gpx-animator";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-U6nrS7utnUCohCzkOdmehtSdu+5d0KJF81mXWc/666A=";
+  };
+
+  mitmCache = finalAttrs.gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # We only need `gradleBuildTask = "shadowJar"` instead of the slower default `gradleBuildTask
+  # = "assemble"` (which also generates tarballs, etc) to generate the final .jar. However, the
+  # shadowJar task doesn't have dependencies set up correctly so it won't create the
+  # `version.txt` file and the resulting application will say "UNKNOWN_VERSION" in the titlebar
+  # and everywhere else. As a side effect, we don't need doCheck = true either because the
+  # assemble task also runs tests.
+  __darwinAllowLocalNetworking = true;
+
+  # Most other java packages use `jre_minimal` with extra modules rather than the full `jdk` as
+  # the runtime dependency. But gpx-animator uses javax modules that cannot just be added
+  # as modules in jre_minimal.
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 build/libs/gpx-animator-${finalAttrs.version}-all.jar -t $out/share/gpx-animator/
+    makeWrapper ${jdk17}/bin/java $out/bin/gpx-animator \
+      --add-flags "-jar $out/share/gpx-animator/gpx-animator-${finalAttrs.version}-all.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "GPX track to video animator";
+    longDescription = ''
+      GPX Animator generates video from GPX files, it supports:
+
+      - Multiple GPX tracks with mutliple track segments
+      - Skipping idle parts
+      - Configurable color, label, width and time offset per track
+      - Configurable video size, fps and speedup or total video time
+      - Background map from any public TMS server
+    '';
+    homepage = "https://gpx-animator.app";
+    changelog = "https://github.com/gpx-animator/gpx-animator/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.markasoftware ];
+    mainProgram = "gpx-animator";
+    platforms = lib.platforms.unix;
+  };
+})

From 716d4db111dece868578de4e8079a4d7e06dc6e5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 3 Jun 2025 09:13:00 +0300
Subject: [PATCH 0730/1497] Revert "nixos/murmur: Get rid of global lib
 expansion"

---
 nixos/modules/services/networking/murmur.nix | 226 +++++++++++--------
 1 file changed, 127 insertions(+), 99 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 8ff4c8110638..aa205d1f60b4 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -5,6 +5,8 @@
   ...
 }:
 
+with lib;
+
 let
   cfg = config.services.murmur;
   forking = cfg.logFile != null;
@@ -12,53 +14,68 @@ let
     database=${cfg.stateDir}/murmur.sqlite
     dbDriver=QSQLITE
 
-    autobanAttempts=${lib.toString cfg.autobanAttempts}
-    autobanTimeframe=${lib.toString cfg.autobanTimeframe}
-    autobanTime=${lib.toString cfg.autobanTime}
+    autobanAttempts=${toString cfg.autobanAttempts}
+    autobanTimeframe=${toString cfg.autobanTimeframe}
+    autobanTime=${toString cfg.autobanTime}
 
-    logfile=${lib.optionalString (cfg.logFile != null) cfg.logFile}
-    ${lib.optionalString forking "pidfile=/run/murmur/murmurd.pid"}
+    logfile=${optionalString (cfg.logFile != null) cfg.logFile}
+    ${optionalString forking "pidfile=/run/murmur/murmurd.pid"}
 
     welcometext="${cfg.welcometext}"
-    port=${lib.toString cfg.port}
+    port=${toString cfg.port}
 
-    ${lib.optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
-    ${lib.optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
+    ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
+    ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
 
-    bandwidth=${lib.toString cfg.bandwidth}
-    users=${lib.toString cfg.users}
+    bandwidth=${toString cfg.bandwidth}
+    users=${toString cfg.users}
 
-    textmessagelength=${lib.toString cfg.textMsgLength}
-    imagemessagelength=${lib.toString cfg.imgMsgLength}
-    allowhtml=${lib.boolToString cfg.allowHtml}
-    logdays=${lib.toString cfg.logDays}
-    bonjour=${lib.boolToString cfg.bonjour}
-    sendversion=${lib.boolToString cfg.sendVersion}
+    textmessagelength=${toString cfg.textMsgLength}
+    imagemessagelength=${toString cfg.imgMsgLength}
+    allowhtml=${boolToString cfg.allowHtml}
+    logdays=${toString cfg.logDays}
+    bonjour=${boolToString cfg.bonjour}
+    sendversion=${boolToString cfg.sendVersion}
 
-    ${lib.optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
-    ${lib.optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
-    ${lib.optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
-    ${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
+    ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
+    ${optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
+    ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
+    ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
 
-    certrequired=${lib.boolToString cfg.clientCertRequired}
-    ${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
-    ${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
-    ${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
+    certrequired=${boolToString cfg.clientCertRequired}
+    ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
+    ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
+    ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
 
-    ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
+    ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
 
     ${cfg.extraConfig}
   '';
 in
 {
+  imports = [
+    (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
+    (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
+  ];
+
   options = {
     services.murmur = {
-      enable = lib.mkEnableOption "Mumble server";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "If enabled, start the Murmur Mumble server.";
+      };
 
-      openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server";
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open ports in the firewall for the Murmur Mumble server.
+        '';
+      };
 
-      user = lib.mkOption {
-        type = lib.types.str;
+      user = mkOption {
+        type = types.str;
         default = "murmur";
         description = ''
           The name of an existing user to use to run the service.
@@ -66,8 +83,8 @@ in
         '';
       };
 
-      group = lib.mkOption {
-        type = lib.types.str;
+      group = mkOption {
+        type = types.str;
         default = "murmur";
         description = ''
           The name of an existing group to use to run the service.
@@ -75,16 +92,16 @@ in
         '';
       };
 
-      stateDir = lib.mkOption {
-        type = lib.types.path;
+      stateDir = mkOption {
+        type = types.path;
         default = "/var/lib/murmur";
         description = ''
           Directory to store data for the server.
         '';
       };
 
-      autobanAttempts = lib.mkOption {
-        type = lib.types.int;
+      autobanAttempts = mkOption {
+        type = types.int;
         default = 10;
         description = ''
           Number of attempts a client is allowed to make in
@@ -93,8 +110,8 @@ in
         '';
       };
 
-      autobanTimeframe = lib.mkOption {
-        type = lib.types.int;
+      autobanTimeframe = mkOption {
+        type = types.int;
         default = 120;
         description = ''
           Timeframe in which a client can connect without being banned
@@ -102,47 +119,47 @@ in
         '';
       };
 
-      autobanTime = lib.mkOption {
-        type = lib.types.int;
+      autobanTime = mkOption {
+        type = types.int;
         default = 300;
         description = "The amount of time an IP ban lasts (in seconds).";
       };
 
-      logFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      logFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
         example = "/var/log/murmur/murmurd.log";
         description = "Path to the log file for Murmur daemon. Empty means log to journald.";
       };
 
-      welcometext = lib.mkOption {
-        type = lib.types.str;
+      welcometext = mkOption {
+        type = types.str;
         default = "";
         description = "Welcome message for connected clients.";
       };
 
-      port = lib.mkOption {
-        type = lib.types.port;
+      port = mkOption {
+        type = types.port;
         default = 64738;
         description = "Ports to bind to (UDP and TCP).";
       };
 
-      hostName = lib.mkOption {
-        type = lib.types.str;
+      hostName = mkOption {
+        type = types.str;
         default = "";
         description = "Host to bind to. Defaults binding on all addresses.";
       };
 
-      package = lib.mkPackageOption pkgs "murmur" { };
+      package = mkPackageOption pkgs "murmur" { };
 
-      password = lib.mkOption {
-        type = lib.types.str;
+      password = mkOption {
+        type = types.str;
         default = "";
         description = "Required password to join server, if specified.";
       };
 
-      bandwidth = lib.mkOption {
-        type = lib.types.int;
+      bandwidth = mkOption {
+        type = types.int;
         default = 72000;
         description = ''
           Maximum bandwidth (in bits per second) that clients may send
@@ -150,26 +167,26 @@ in
         '';
       };
 
-      users = lib.mkOption {
-        type = lib.types.int;
+      users = mkOption {
+        type = types.int;
         default = 100;
         description = "Maximum number of concurrent clients allowed.";
       };
 
-      textMsgLength = lib.mkOption {
-        type = lib.types.int;
+      textMsgLength = mkOption {
+        type = types.int;
         default = 5000;
         description = "Max length of text messages. Set 0 for no limit.";
       };
 
-      imgMsgLength = lib.mkOption {
-        type = lib.types.int;
+      imgMsgLength = mkOption {
+        type = types.int;
         default = 131072;
         description = "Max length of image messages. Set 0 for no limit.";
       };
 
-      allowHtml = lib.mkOption {
-        type = lib.types.bool;
+      allowHtml = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Allow HTML in client messages, comments, and channel
@@ -177,8 +194,8 @@ in
         '';
       };
 
-      logDays = lib.mkOption {
-        type = lib.types.int;
+      logDays = mkOption {
+        type = types.int;
         default = 31;
         description = ''
           How long to store RPC logs for in the database. Set 0 to
@@ -186,16 +203,23 @@ in
         '';
       };
 
-      bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers";
+      bonjour = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Bonjour auto-discovery, which allows clients over
+          your LAN to automatically discover Murmur servers.
+        '';
+      };
 
-      sendVersion = lib.mkOption {
-        type = lib.types.bool;
+      sendVersion = mkOption {
+        type = types.bool;
         default = true;
         description = "Send Murmur version in UDP response.";
       };
 
-      registerName = lib.mkOption {
-        type = lib.types.str;
+      registerName = mkOption {
+        type = types.str;
         default = "";
         description = ''
           Public server registration name, and also the name of the
@@ -204,8 +228,8 @@ in
         '';
       };
 
-      registerPassword = lib.mkOption {
-        type = lib.types.str;
+      registerPassword = mkOption {
+        type = types.str;
         default = "";
         description = ''
           Public server registry password, used authenticate your
@@ -214,14 +238,14 @@ in
         '';
       };
 
-      registerUrl = lib.mkOption {
-        type = lib.types.str;
+      registerUrl = mkOption {
+        type = types.str;
         default = "";
         description = "URL website for your server.";
       };
 
-      registerHostname = lib.mkOption {
-        type = lib.types.str;
+      registerHostname = mkOption {
+        type = types.str;
         default = "";
         description = ''
           DNS hostname where your server can be reached. This is only
@@ -231,36 +255,40 @@ in
         '';
       };
 
-      clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
+      clientCertRequired = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Require clients to authenticate via certificates.";
+      };
 
-      sslCert = lib.mkOption {
-        type = lib.types.str;
+      sslCert = mkOption {
+        type = types.str;
         default = "";
         description = "Path to your SSL certificate.";
       };
 
-      sslKey = lib.mkOption {
-        type = lib.types.str;
+      sslKey = mkOption {
+        type = types.str;
         default = "";
         description = "Path to your SSL key.";
       };
 
-      sslCa = lib.mkOption {
-        type = lib.types.str;
+      sslCa = mkOption {
+        type = types.str;
         default = "";
         description = "Path to your SSL CA certificate.";
       };
 
-      extraConfig = lib.mkOption {
-        type = lib.types.lines;
+      extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = "Extra configuration to put into murmur.ini.";
       };
 
-      environmentFile = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
+      environmentFile = mkOption {
+        type = types.nullOr types.path;
         default = null;
-        example = lib.literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
+        example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
         description = ''
           Environment file as defined in {manpage}`systemd.exec(5)`.
 
@@ -283,8 +311,8 @@ in
         '';
       };
 
-      dbus = lib.mkOption {
-        type = lib.types.enum [
+      dbus = mkOption {
+        type = types.enum [
           null
           "session"
           "system"
@@ -295,19 +323,19 @@ in
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    users.users.murmur = lib.mkIf (cfg.user == "murmur") {
+  config = mkIf cfg.enable {
+    users.users.murmur = mkIf (cfg.user == "murmur") {
       description = "Murmur Service user";
       home = cfg.stateDir;
       createHome = true;
       uid = config.ids.uids.murmur;
       group = cfg.group;
     };
-    users.groups.murmur = lib.mkIf (cfg.group == "murmur") {
+    users.groups.murmur = mkIf (cfg.group == "murmur") {
       gid = config.ids.gids.murmur;
     };
 
-    networking.firewall = lib.mkIf cfg.openFirewall {
+    networking.firewall = mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
       allowedUDPPorts = [ cfg.port ];
     };
@@ -325,8 +353,8 @@ in
       serviceConfig = {
         # murmurd doesn't fork when logging to the console.
         Type = if forking then "forking" else "simple";
-        PIDFile = lib.mkIf forking "/run/murmur/murmurd.pid";
-        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
+        PIDFile = mkIf forking "/run/murmur/murmurd.pid";
+        EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
         ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini";
         Restart = "always";
         RuntimeDirectory = "murmur";
@@ -362,7 +390,7 @@ in
 
     # currently not included in upstream package, addition requested at
     # https://github.com/mumble-voip/mumble/issues/6078
-    services.dbus.packages = lib.mkIf (cfg.dbus == "system") [
+    services.dbus.packages = mkIf (cfg.dbus == "system") [
       (pkgs.writeTextFile {
         name = "murmur-dbus-policy";
         text = ''
@@ -404,19 +432,19 @@ in
           r /run/murmur/murmurd.ini,
           r ${configFile},
       ''
-      + lib.optionalString (cfg.logFile != null) ''
+      + optionalString (cfg.logFile != null) ''
         rw ${cfg.logFile},
       ''
-      + lib.optionalString (cfg.sslCert != "") ''
+      + optionalString (cfg.sslCert != "") ''
         r ${cfg.sslCert},
       ''
-      + lib.optionalString (cfg.sslKey != "") ''
+      + optionalString (cfg.sslKey != "") ''
         r ${cfg.sslKey},
       ''
-      + lib.optionalString (cfg.sslCa != "") ''
+      + optionalString (cfg.sslCa != "") ''
         r ${cfg.sslCa},
       ''
-      + lib.optionalString (cfg.dbus != null) ''
+      + optionalString (cfg.dbus != null) ''
         dbus bus=${cfg.dbus}
       ''
       + ''

From 929a16ec26ae15effd9b52d1d4e54b80c7cc4938 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 06:27:47 +0000
Subject: [PATCH 0731/1497] python3Packages.roombapy: 1.9.0 -> 1.9.1

---
 pkgs/development/python-modules/roombapy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix
index 26f79276053a..cd18675e0ed9 100644
--- a/pkgs/development/python-modules/roombapy/default.nix
+++ b/pkgs/development/python-modules/roombapy/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "roombapy";
-  version = "1.9.0";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pschmitt";
     repo = "roombapy";
     tag = version;
-    hash = "sha256-fcCK6yby9Jfc4lSSETn13Y+4A3qjvYfm4Ps3T5yG4Rc=";
+    hash = "sha256-63PqNmJC0IWPPMVyZdKoZikvBA4phMcYxlTBk/m1cq0=";
   };
 
   nativeBuildInputs = [
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     description = "Python program and library to control Wi-Fi enabled iRobot Roombas";
     mainProgram = "roombapy";
     homepage = "https://github.com/pschmitt/roombapy";
-    changelog = "https://github.com/pschmitt/roombapy/releases/tag/${version}";
+    changelog = "https://github.com/pschmitt/roombapy/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };

From 8b485354b56ab7e7c6a25b6835910a6e4726e32f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 06:42:16 +0000
Subject: [PATCH 0732/1497] terraform-providers.kafka: 0.10.1 -> 0.10.2

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 0f38468968ec..8f169ae61bb4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -696,13 +696,13 @@
     "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s="
   },
   "kafka": {
-    "hash": "sha256-xFuNCHUE2r+NGsvLmD2W+d9oB6RjV/2o4sAxqTOJUtE=",
+    "hash": "sha256-RZwag424lXwI1GR/kFOcpv+huaYMyG4jcFjkhvA0Nlc=",
     "homepage": "https://registry.terraform.io/providers/Mongey/kafka",
     "owner": "Mongey",
     "repo": "terraform-provider-kafka",
-    "rev": "v0.10.1",
+    "rev": "v0.10.2",
     "spdx": "MIT",
-    "vendorHash": "sha256-wnyCBxqvmWfgR/MLRVcA/cXeq08qcuhSVIsSWYPTJGc="
+    "vendorHash": "sha256-57V/0JIsq+pqbWmg3iZ0s8t8iD2Xtipy08I/+ZJCkNc="
   },
   "kafka-connect": {
     "hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",

From 9a11225bbde5373bc2ae3363f16c22c7ebe6839e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 06:59:40 +0000
Subject: [PATCH 0733/1497] dooit-extras: 0.2.0 -> 0.2.1

---
 pkgs/by-name/do/dooit-extras/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dooit-extras/package.nix b/pkgs/by-name/do/dooit-extras/package.nix
index ec68b74ba121..5cd863f26376 100644
--- a/pkgs/by-name/do/dooit-extras/package.nix
+++ b/pkgs/by-name/do/dooit-extras/package.nix
@@ -10,14 +10,14 @@ let
 in
 python3.pkgs.buildPythonPackage rec {
   pname = "dooit-extras";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dooit-org";
     repo = "dooit-extras";
     tag = "v${version}";
-    hash = "sha256-ZBzzH8k4oC3ovLF9+9rzzFZaDDoOvcbX5NCh1WBedK4=";
+    hash = "sha256-h29lN32Qca8edF1aLhLxnV97MMEapX3Docc+CIEF6I4=";
   };
 
   build-system = with python3.pkgs; [ poetry-core ];

From 3ef7fc3154555c1bca06f2e7ed3909228721b968 Mon Sep 17 00:00:00 2001
From: Hugo Herter <git@hugoherter.com>
Date: Thu, 15 May 2025 20:38:30 +0200
Subject: [PATCH 0734/1497] python3Packages.unsloth-zoo: 2025.4.1 -> 2025.5.11

---
 .../python-modules/unsloth-zoo/default.nix       |  7 +++++--
 .../unsloth-zoo/dont-require-unsloth.patch       | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/unsloth-zoo/default.nix b/pkgs/development/python-modules/unsloth-zoo/default.nix
index 163361671cae..16dc99b9c96a 100644
--- a/pkgs/development/python-modules/unsloth-zoo/default.nix
+++ b/pkgs/development/python-modules/unsloth-zoo/default.nix
@@ -13,6 +13,7 @@
   datasets,
   hf-transfer,
   huggingface-hub,
+  msgspec,
   packaging,
   peft,
   psutil,
@@ -26,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "unsloth-zoo";
-  version = "2025.4.1";
+  version = "2025.5.11";
   pyproject = true;
 
   # no tags on GitHub
   src = fetchPypi {
     pname = "unsloth_zoo";
     inherit version;
-    hash = "sha256-mRs/NMCNJWT52S7mtbQI332IQR6+/IaL29XmtMOz3fE=";
+    hash = "sha256-QRKcFkNlr7pICEy3il+za6hDYjvsSxHIBM6VaB1c5mk=";
   };
 
   # pyproject.toml requires an obsolete version of protobuf,
@@ -41,6 +42,7 @@ buildPythonPackage rec {
   # Upstream issue: https://github.com/unslothai/unsloth-zoo/pull/68
   pythonRelaxDeps = [
     "protobuf"
+    "transformers"
   ];
 
   patches = [
@@ -59,6 +61,7 @@ buildPythonPackage rec {
     datasets
     hf-transfer
     huggingface-hub
+    msgspec
     packaging
     peft
     psutil
diff --git a/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch b/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch
index 6c06b8537115..4d4bdb13a05c 100644
--- a/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch
+++ b/pkgs/development/python-modules/unsloth-zoo/dont-require-unsloth.patch
@@ -1,8 +1,9 @@
 diff --git a/unsloth_zoo/__init__.py b/unsloth_zoo/__init__.py
+index a629854..06014b1 100644
 --- a/unsloth_zoo/__init__.py
 +++ b/unsloth_zoo/__init__.py
-@@ -17,14 +17,10 @@
- __version__ = "2025.3.17"
+@@ -17,8 +17,6 @@
+ __version__ = "2025.5.11"
  
  from importlib.util import find_spec
 -if find_spec("unsloth") is None:
@@ -10,6 +11,17 @@ diff --git a/unsloth_zoo/__init__.py b/unsloth_zoo/__init__.py
  pass
  del find_spec
  
+@@ -28,13 +26,14 @@ def get_device_type():
+         return "cuda"
+     elif hasattr(torch, "xpu") and torch.xpu.is_available():
+         return "xpu"
++    else:
++        # Allow import during tests
++        return None
+     raise NotImplementedError("Unsloth currently only works on NVIDIA GPUs and Intel GPUs.")
+ pass
+ DEVICE_TYPE : str = get_device_type()
+ 
  import os
 -if not ("UNSLOTH_IS_PRESENT" in os.environ):
 -    raise ImportError("Please install Unsloth via `pip install unsloth`!")

From f3d3dc1633cac9540ad7106e17ec652bcb580a51 Mon Sep 17 00:00:00 2001
From: Hugo Herter <git@hugoherter.com>
Date: Thu, 15 May 2025 20:38:43 +0200
Subject: [PATCH 0735/1497] python3Packages.unsloth: 2025.4.1 -> 2025.5.9

---
 pkgs/development/python-modules/unsloth/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unsloth/default.nix b/pkgs/development/python-modules/unsloth/default.nix
index 797dc6e51ac3..5c88054db0ba 100644
--- a/pkgs/development/python-modules/unsloth/default.nix
+++ b/pkgs/development/python-modules/unsloth/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "unsloth";
-  version = "2025.4.1";
+  version = "2025.5.9";
   pyproject = true;
 
   # Tags on the GitHub repo don't match
   src = fetchPypi {
     pname = "unsloth";
     inherit version;
-    hash = "sha256-9LtDGfdWH7R3U/xi+aK3V4zA+vs83S6Cp0F2NQKvSdY=";
+    hash = "sha256-ud4+6BmyNvtvJz56dhS9SIXxTDw740rSfxxoi5itw4U=";
   };
 
   build-system = [
@@ -73,6 +73,7 @@ buildPythonPackage rec {
   # Upstream issue: https://github.com/unslothai/unsloth-zoo/pull/68
   pythonRelaxDeps = [
     "protobuf"
+    "transformers"
   ];
 
   # The source repository contains no test

From 10e3d9b04acc4b3ef334f010f6fc0aa014cead80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 May 2025 22:12:43 +0000
Subject: [PATCH 0736/1497] python3Packages.trl: 0.15.2 -> 0.17.0

---
 pkgs/development/python-modules/trl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix
index 1c75339a5fae..818e996025ba 100644
--- a/pkgs/development/python-modules/trl/default.nix
+++ b/pkgs/development/python-modules/trl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "trl";
-  version = "0.15.2";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "trl";
     tag = "v${version}";
-    hash = "sha256-HsSmFXFqDOWVLa6VXdPZVS9C3bjYcsliR0TwNpPiQx4=";
+    hash = "sha256-kRZhtrKGNTJ9TJypRG9dABNn00w77dwx+JxT+2PUrfY=";
   };
 
   build-system = [
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Train transformer language models with reinforcement learning";
     homepage = "https://github.com/huggingface/trl";
-    changelog = "https://github.com/huggingface/trl/releases/tag/v${version}";
+    changelog = "https://github.com/huggingface/trl/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hoh ];
   };

From b74a37b2c2a782696796f661784d514ca70dba19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 07:16:31 +0000
Subject: [PATCH 0737/1497] hexpatch: 1.11.2 -> 1.11.3

---
 pkgs/by-name/he/hexpatch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index 22b7ad94f8b6..762b65f05462 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hexpatch";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "Etto48";
     repo = "HexPatch";
     tag = "v${version}";
-    hash = "sha256-xeHOViakCRMXQqmuUCeekL0tyYyh61OnU0zDk767NPU=";
+    hash = "sha256-hGHvu727PbpqIFzfmBscD9kdwuXR0SRFZ3lbgXPxR24=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3eaEgzGVSz6MjNqRGjzP8GoOZ/3eYOkI4Gd6+n+6vDg=";
+  cargoHash = "sha256-zRNXGGpREk5xRODbGQ0SlYpU+bLPdXhlchQAc/nTsbs=";
 
   nativeBuildInputs = [
     cmake

From 9aea39cab1cf070ad500047c5f08b49d6e9de43d Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 3 Jun 2025 09:32:49 +0200
Subject: [PATCH 0738/1497] proj: fix changelog file URL

---
 pkgs/development/libraries/proj/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 0200ed5e496a..be79b8659203 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS";
+    changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS.md";
     description = "Cartographic Projections Library";
     homepage = "https://proj.org/";
     license = licenses.mit;

From 006f78adc7d07ea02040d701b656aa69434abd4c Mon Sep 17 00:00:00 2001
From: Konrad Malik <konrad.malik@gmail.com>
Date: Tue, 3 Jun 2025 09:35:33 +0200
Subject: [PATCH 0739/1497] roslyn-ls: 5.0.0-1.25263.3 -> 5.0.0-1.25266.2

---
 pkgs/by-name/ro/roslyn-ls/deps.json   | 12 ++++++------
 pkgs/by-name/ro/roslyn-ls/package.nix |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index c6dee3bbd21d..728f6b4653fe 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -193,15 +193,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "9.0.0-beta.25255.5",
-    "hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg"
+    "version": "9.0.0-beta.25263.2",
+    "hash": "sha256-mFVYybJiMi58vu+hT4VfXgWCWAXGeKxI7OwUQi2FO/A=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25263.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25263.2.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "9.0.0-beta.25255.5",
-    "hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg"
+    "version": "9.0.0-beta.25263.2",
+    "hash": "sha256-J86joC1OMlnjMppEBf9GwEbc0IdVJ/XjshBiZunH/EU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25263.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25263.2.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 4c45c67694c9..60c5cb3b1360 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -32,18 +32,18 @@ in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.78.15";
+  vsVersion = "2.80.16";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-Lim2f2//NFiMrZzvpREMlk6/5NWatVTiQrciAAxIiLY=";
+    hash = "sha256-4kFu0bxbLZ31ifGluSrN9sN5EwzLg3bVHnh9iB9TGpA=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.0.0-1.25263.3";
+  version = "5.0.0-1.25266.2";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 80c1e72855ecdf437134f3b77012ca618e55edba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 07:43:32 +0000
Subject: [PATCH 0740/1497] kakoune-unwrapped: 2024.05.18 -> 2025.06.03

---
 pkgs/applications/editors/kakoune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 7b20a0d668d3..a2bd4c7e087e 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kakoune-unwrapped";
-  version = "2024.05.18";
+  version = "2025.06.03";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1nYSVbvQ4tz1r8p7zCD6w/79haqpelb15qva9r3Fwew=";
+    hash = "sha256-AJvh6NVFpbPsyzfeii/5muE+i4TwfxhwhDVgMLYOJCM=";
   };
   makeFlags = [
     "debug=no"

From 043ae5734c847bf01bf35ad191b88a6f16db498d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 07:47:04 +0000
Subject: [PATCH 0741/1497] zapret: 70.6 -> 71

---
 pkgs/by-name/za/zapret/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index d603a00a4bbf..534effaa4ef2 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "70.6";
+  version = "71";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VnC4UeR8Zxr8oKx9icZBTUNjVWpd16wLKyZ+zNShJQk=";
+    hash = "sha256-OeOnzqYyRAQNRtjtPHwzDL/csuTAUgIRJKsPVr3iBac=";
   };
 
   buildInputs = [

From d91a010673321205c5cd56c856556156e176ec6f Mon Sep 17 00:00:00 2001
From: SirBerg <benno@boerg.co>
Date: Tue, 3 Jun 2025 10:00:38 +0200
Subject: [PATCH 0742/1497] volanta: 1.11.3 -> 1.12.0

---
 pkgs/by-name/vo/volanta/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index 389b78429b2a..361cc6d615c4 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "volanta";
-  version = "1.11.3";
+  version = "1.12.0";
   src = fetchurl {
-    url = "https://cdn.volanta.app/software/volanta-app/${version}-622dc10d/volanta-${version}.AppImage";
-    hash = "sha256-vplJEE+D2Yzr4fD//CdLRAYAKQp6a1RR0jZ1N46Q8xU=";
+    url = "https://cdn.volanta.app/software/volanta-app/${version}-0e24f0ee/volanta-${version}.AppImage";
+    hash = "sha256-PwBnKR0oFMJtyPxpgDGlSDmcxY9wxhp2Un6mkRJIlfI=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in

From 922eaa48b16109788a4f6360baee79d5dfdd9173 Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Sun, 1 Jun 2025 00:07:52 +0200
Subject: [PATCH 0743/1497] hyprshell: 3.3.2 -> 4.1.1

---
 pkgs/by-name/hy/hyprshell/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index aa5737abee5c..b68be2b18faa 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprshell";
-  version = "3.3.2";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
     repo = "hyprswitch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=";
+    hash = "sha256-eSTeNVHkfUS6qlN1pWWpMVeT+jjacithCHOpOhRKanA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DEifup2oAcqZplx2JoN3hkP1VmxwYVFS8ZqfpR80baA=";
+  cargoHash = "sha256-NzyK46zmHWxFaTS9mzFC7kBUMys1sjmcWaZUcwLusEk=";
 
   nativeBuildInputs = [
     wrapGAppsHook4

From e87a500d1f223da9b51e149acbdf11f8ee0bb7b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:23:22 +0000
Subject: [PATCH 0744/1497] atlas: 0.33.1 -> 0.34.0

---
 pkgs/by-name/at/atlas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index 7b51a249213f..9f8751f82522 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Io7FnPxvr3XIj+Tbf1yVxjTnqoRzQZnaVlImcwBjwXE=";
+    hash = "sha256-7s03YrZw7J2LRCHibMqzBBtVUBSPVEf+TMqtKoWSkkM=";
   };
 
   modRoot = "cmd/atlas";

From a5d6651ce12ecd3239fdd739a1bf9a9f64b70cfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:24:30 +0000
Subject: [PATCH 0745/1497] python3Packages.awswrangler: 3.11.0 -> 3.12.0

---
 pkgs/development/python-modules/awswrangler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix
index dd1c755c047d..25f935b01284 100644
--- a/pkgs/development/python-modules/awswrangler/default.nix
+++ b/pkgs/development/python-modules/awswrangler/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "awswrangler";
-  version = "3.11.0";
+  version = "3.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "aws";
     repo = "aws-sdk-pandas";
     tag = version;
-    hash = "sha256-dIdNrfhBrfrzXmspw25yd/y6MbXRrLfDveCQk+AERV0=";
+    hash = "sha256-BudK7pP7b8YJRyDCQAZv8FtxF5paA+AR/ZBt9UO3XjM=";
   };
 
   pythonRelaxDeps = [
@@ -86,7 +86,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pandas on AWS";
     homepage = "https://github.com/aws/aws-sdk-pandas";
-    changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${version}";
+    changelog = "https://github.com/aws/aws-sdk-pandas/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ mcwitt ];
   };

From 81018611de2e47a87467206a18adc5daab0790f0 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 3 Jun 2025 16:24:58 +0800
Subject: [PATCH 0746/1497] notation: use finalAttrs

---
 pkgs/by-name/no/notation/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/no/notation/package.nix b/pkgs/by-name/no/notation/package.nix
index 1d3ee6f1eb1f..93127ccb8def 100644
--- a/pkgs/by-name/no/notation/package.nix
+++ b/pkgs/by-name/no/notation/package.nix
@@ -4,17 +4,16 @@
   fetchFromGitHub,
   installShellFiles,
   testers,
-  notation,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "notation";
   version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "notaryproject";
     repo = "notation";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-l9A5AwKJ/atN92Oral6PRH2nCbMJ+/ST9weXYRZXWms=";
   };
 
@@ -30,7 +29,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/notaryproject/notation/internal/version.Version=${version}"
+    "-X github.com/notaryproject/notation/internal/version.Version=${finalAttrs.version}"
     "-X github.com/notaryproject/notation/internal/version.BuildMetadata="
   ];
 
@@ -42,7 +41,7 @@ buildGoModule rec {
   '';
 
   passthru.tests.version = testers.testVersion {
-    package = notation;
+    package = finalAttrs.finalPackage;
     command = "notation version";
   };
 
@@ -53,4 +52,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "notation";
   };
-}
+})

From 46824d3b0823638bc9ae6acc429f810b0a8a20b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:36:14 +0000
Subject: [PATCH 0747/1497] vaultenv: 0.18.0 -> 0.19.0

---
 pkgs/development/tools/haskell/vaultenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 0b44a8b05395..ee9d867c128d 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -32,13 +32,13 @@
 }:
 mkDerivation rec {
   pname = "vaultenv";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "channable";
     repo = "vaultenv";
     rev = "v${version}";
-    hash = "sha256-Qb9GMAFjQBsPItwkiWSMWv8WJyc5hOz9Yrq5PPOFVQo=";
+    hash = "sha256-x3c9TKrCF3tsEFofYAXfK6DWdirEUxWWTttNqU/sJSc=";
   };
 
   buildTools = [ hpack ];

From bce8b8ba7378adc1728b071a430aae21b613fa2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 21:12:13 +0000
Subject: [PATCH 0748/1497] python3Packages.mpi-pytest: 2025.4.0 -> 2025.5.0
 mpi-pytest now support OpenMPI forking mode, postPatch is no more needed.

changelog: https://github.com/firedrakeproject/mpi-pytest/releases/tag/v2025.5.0

diff: https://github.com/firedrakeproject/mpi-pytest/compare/v2025.4.0...v2025.5.0
---
 .../development/python-modules/mpi-pytest/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mpi-pytest/default.nix b/pkgs/development/python-modules/mpi-pytest/default.nix
index 585307c94b83..740c0de6dc3b 100644
--- a/pkgs/development/python-modules/mpi-pytest/default.nix
+++ b/pkgs/development/python-modules/mpi-pytest/default.nix
@@ -11,23 +11,16 @@
 
 buildPythonPackage rec {
   pname = "mpi-pytest";
-  version = "2025.4.0";
+  version = "2025.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "mpi-pytest";
     tag = "v${version}";
-    hash = "sha256-r9UB5H+qAJc6k2SVAiOCI2yRDLNv2zKRmfrAan+cX9I=";
+    hash = "sha256-Eq53rCM3xwY30BuGUaTH4Nuloc/9kGJMFhspLH04zqE=";
   };
 
-  # A temporary fixup to support fork mode with openmpi implementation
-  # See https://github.com/firedrakeproject/mpi-pytest/pull/17
-  postPatch = lib.optionalString (mpi4py.mpi.pname == "openmpi") ''
-    substituteInPlace pytest_mpi/plugin.py \
-      --replace-fail '"-genv", CHILD_PROCESS_FLAG, "1"' '"-x", f"{CHILD_PROCESS_FLAG}=1"'
-  '';
-
   build-system = [
     setuptools
   ];

From 190febec5b90a5fae1da7ac705feffb51f58d3aa Mon Sep 17 00:00:00 2001
From: Neyts Zupan <zupo@users.noreply.github.com>
Date: Tue, 3 Jun 2025 09:55:03 +0100
Subject: [PATCH 0749/1497] paretosecurity: 0.2.27 -> 0.2.31

---
 pkgs/by-name/pa/paretosecurity/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix
index 05211c8098fe..53722be17a66 100644
--- a/pkgs/by-name/pa/paretosecurity/package.nix
+++ b/pkgs/by-name/pa/paretosecurity/package.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     webkitgtk_4_1
   ];
   pname = "paretosecurity";
-  version = "0.2.27";
+  version = "0.2.31";
 
   src = fetchFromGitHub {
     owner = "ParetoSecurity";
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     hash = "sha256-dYQNSzovWCX7sj7VjgBc5GHz+5dKLTiB5pvbVSLMyqY=";
   };
 
-  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0";
+  vendorHash = "sha256-PhuHRs0PjIJqY3ZBC4ga7zFxgf57xfPjJ3VIDaA61F0=";
   proxyVendor = true;
 
   # Skip building the Windows installer

From b0324ca0a306cc3b1e642c51e0ca63403f2ab519 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:56:43 +0000
Subject: [PATCH 0750/1497] smpmgr: 0.12.0 -> 0.12.1

---
 pkgs/by-name/sm/smpmgr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index cbcc7e673820..8f22b5fdf222 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "smpmgr";
-  version = "0.12.0";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = version;
-    hash = "sha256-HNL9e3D/uZwJI0d4escbhe51zKH7hBFAnCGZZuZdla4=";
+    hash = "sha256-nEDvJ9R5xFY5LU3nFnXQXbvupg3+TbvcUK6/ZlNN788=";
   };
 
   build-system = with python3Packages; [
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Simple Management Protocol (SMP) Manager for remotely managing MCU firmware";
     homepage = "https://github.com/intercreate/smpmgr";
-    changelog = "https://github.com/intercreate/smpmgr/releases/tag/${version}";
+    changelog = "https://github.com/intercreate/smpmgr/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ otavio ];
     mainProgram = "smpmgr";

From 6333a028bb6813fc84a19ca34f9539630815f9dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 08:59:48 +0000
Subject: [PATCH 0751/1497] flake-checker: 0.2.6 -> 0.2.7

---
 pkgs/by-name/fl/flake-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index 51b6b98b2ac2..8a1e86d09794 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flake-checker";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${version}";
-    hash = "sha256-qEdwtyk5IaYCx67BFnLp4iUN+ewfPMl/wjs9K4hKqGc=";
+    hash = "sha256-RwkyyrWm0QRNOn7Bb9jKOyJ049B6pPmhbrx8tXpUf4w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5eaVjrAPxBQdG+LQ6mQ/ZYAdslpdK3mrZ5Vbuwe3iQw=";
+  cargoHash = "sha256-lB7+2dQGfbn7IhmCAN0jvFTGjJDBpw57VHi3qIwwOZ4=";
 
   meta = with lib; {
     description = "Health checks for your Nix flakes";

From 4420c5078b3c12c493149b573348ff9b9be76717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 09:00:45 +0000
Subject: [PATCH 0752/1497] netavark: 1.15.0 -> 1.15.1

---
 pkgs/by-name/ne/netavark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix
index 0392ef6e3145..2c5ad1b57736 100644
--- a/pkgs/by-name/ne/netavark/package.nix
+++ b/pkgs/by-name/ne/netavark/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "netavark";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "netavark";
     rev = "v${version}";
-    hash = "sha256-V+JwfKWo8gqVq/lF0MMt8sovPRyb3saBxsUhdMo4C5g=";
+    hash = "sha256-/X0G26XuIBVLnXVADws+CGWwDA8IwTs/XEbA0slaazs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-C2+N3jPdqh/cmJ2efrUnScXo1rFBEec6w4r8M6OfcPo=";
+  cargoHash = "sha256-orhYOBZDfrbXJ+nNBu2nsiTUbpKuGWmfuryCzyXSjG0=";
 
   nativeBuildInputs = [
     installShellFiles

From c4f3c2c7428d43ebd5c407a3ec6e834c8697cbd8 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 3 Jun 2025 17:06:16 +0800
Subject: [PATCH 0753/1497] yazi: append .yazi to plugin folders automatically

---
 nixos/modules/programs/yazi.nix  |  4 ++--
 pkgs/by-name/ya/yazi/package.nix | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix
index b7e56cf63077..8486cf611c46 100644
--- a/nixos/modules/programs/yazi.nix
+++ b/nixos/modules/programs/yazi.nix
@@ -76,7 +76,7 @@ in
       example = lib.literalExpression ''
         {
           foo = ./foo;
-          bar = pkgs.bar;
+          inherit (pkgs.yaziPlugins) bar;
         }
       '';
     };
@@ -97,7 +97,7 @@ in
       example = lib.literalExpression ''
         {
           foo = ./foo;
-          bar = pkgs.bar;
+          inherit (pkgs.yaziPlugins) bar;
         }
       '';
     };
diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix
index 7b45631d0b2d..112147d182b6 100644
--- a/pkgs/by-name/ya/yazi/package.nix
+++ b/pkgs/by-name/ya/yazi/package.nix
@@ -69,14 +69,20 @@ let
         mkdir $out/plugins
         ${lib.optionalString (plugins != { }) ''
           ${lib.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins
+            lib.mapAttrsToList (
+              name: value:
+              "ln -s ${value} $out/plugins/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+            ) plugins
           )}
         ''}
 
         mkdir $out/flavors
         ${lib.optionalString (flavors != { }) ''
           ${lib.concatStringsSep "\n" (
-            lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors
+            lib.mapAttrsToList (
+              name: value:
+              "ln -s ${value} $out/flavors/${if lib.hasSuffix ".yazi" name then name else "${name}.yazi"}"
+            ) flavors
           )}
         ''}
 

From 9aec4904a800c576472c660783874ebd74f831bb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 3 Jun 2025 11:17:41 +0200
Subject: [PATCH 0754/1497] granian: add meta.changelog

---
 pkgs/development/python-modules/granian/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 8a75a70eaa59..ccfa53e7e4b4 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -96,6 +96,7 @@ buildPythonPackage rec {
   meta = {
     description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications";
     homepage = "https://github.com/emmett-framework/granian";
+    changelog = "https://github.com/emmett-framework/granian/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     mainProgram = "granian";
     maintainers = with lib.maintainers; [

From c1c945f0efac2bd1b8272a616d2b330138cda315 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 1 Jun 2025 15:05:15 +0200
Subject: [PATCH 0755/1497] bluemail: 1.140.8-1922 -> 1.140.93

---
 pkgs/by-name/bl/bluemail/package.nix | 49 ++++++++++++++++++----------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index 872e43f7725d..80535baaf553 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchurl,
-  dpkg,
+  squashfsTools,
   autoPatchelfHook,
   copyDesktopItems,
   pango,
@@ -22,14 +22,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bluemail";
-  version = "1.140.8-1922";
+  version = "1.140.93";
 
-  # Taking a snapshot of the DEB release because there are no tagged version releases.
-  # For new versions, download the upstream release, extract it and check for the version string.
-  # In case there's a new version, create a snapshot of it on https://archive.org before updating it here.
+  # To update, check https://search.apps.ubuntu.com/api/v1/package/bluemail and copy the anon_download_url and version.
   src = fetchurl {
-    url = "https://web.archive.org/web/20240208120704/https://download.bluemail.me/BlueMail/deb/BlueMail.deb";
-    hash = "sha256-dnYOb3Q/9vSDssHGS2ywC/Q24Oq96/mvKF+eqd/4dVw=";
+    url = "https://api.snapcraft.io/api/v1/snaps/download/ZVlj0qw0GOFd5JgTfL8kk2Y5eIG1IpiH_178.snap";
+    hash = "sha512-xv7fn+VrtrxauejhgEMdTnmnDXb17TwanXZR6Lqfg5N40MbyDu76XQAWRB8xFU/+GdCTmjv47EaOC7SnnOw4EA==";
   };
 
   desktopItems = [
@@ -43,6 +41,7 @@ stdenv.mkDerivation rec {
       mimeTypes = [
         "x-scheme-handler/me.blueone.linux"
         "x-scheme-handler/mailto"
+        "x-scheme-handler/bluemail-notif"
       ];
       categories = [ "Office" ];
     })
@@ -52,10 +51,24 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     copyDesktopItems
     makeWrapper
-    dpkg
+    squashfsTools
     wrapGAppsHook3
   ];
 
+  unpackPhase = ''
+    runHook preUnpack
+
+    unsquashfs $src
+
+    runHook postUnpack
+  '';
+
+  sourceRoot = "squashfs-root";
+
+  postPatch = ''
+    rm -rf usr libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1
+  '';
+
   buildInputs = [
     pango
     gtk3
@@ -75,12 +88,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    mv opt/BlueMail/* $out
-    ln -s $out/bluemail $out/bin/bluemail
+    mkdir -p $out/{bin,opt/bluemail}
+    mv * $out/opt/bluemail
+    ln -s $out/opt/bluemail/bluemail $out/bin/bluemail
 
-    mkdir -p $out/share/icons
-    mv usr/share/icons/hicolor $out/share/icons/
+    mkdir -p $out/share/icons/hicolor/1024x1024/apps
+    ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/hicolor/1024x1024/apps/bluemail.png
 
     runHook postInstall
   '';
@@ -97,17 +110,19 @@ stdenv.mkDerivation rec {
   ];
 
   preFixup = ''
-    wrapProgram $out/bin/bluemail \
+    wrapProgram $out/opt/bluemail/bluemail \
       ''${makeWrapperArgs[@]} \
       ''${gappsWrapperArgs[@]}
   '';
 
   meta = with lib; {
-    description = "Free, secure, universal email app, capable of managing an unlimited number of mail accounts";
+    description = "Cross platform email and calendar app, with AI features and a modern design";
     homepage = "https://bluemail.me";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
+    # Vendored copy of Electron.
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ onny ];
+    maintainers = with maintainers; [ ];
+    mainProgram = "bluemail";
   };
 }

From ebd6d1eaa34e7e6127c44d7ddc0ff304966a02e1 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:32:08 +0200
Subject: [PATCH 0756/1497] python3Packages.azure-keyvault-securitydomain: init
 at 1.0.0b1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../azure-keyvault-securitydomain/default.nix | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix

diff --git a/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix b/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix
new file mode 100644
index 000000000000..419a82400344
--- /dev/null
+++ b/pkgs/development/python-modules/azure-keyvault-securitydomain/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  wheel,
+  azure-core,
+  isodate,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "azure-keyvault-securitydomain";
+  version = "1.0.0b1";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "azure_keyvault_securitydomain";
+    inherit version;
+    hash = "sha256-MpGhked4qUfkso7QEyeJKpOu3PjgoN1nTPEWyxEEN3Y=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    azure-core
+    isodate
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "azure.keyvault.securitydomain"
+  ];
+
+  meta = {
+    description = "Microsoft Corporation Azure Keyvault Securitydomain Client Library for Python";
+    homepage = "https://pypi.org/project/azure-keyvault-securitydomain/1.0.0b1/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ katexochen ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aad48eeb4c9..b9e2debf67fb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1295,6 +1295,10 @@ self: super: with self; {
 
   azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { };
 
+  azure-keyvault-securitydomain =
+    callPackage ../development/python-modules/azure-keyvault-securitydomain
+      { };
+
   azure-kusto-data = callPackage ../development/python-modules/azure-kusto-data { };
 
   azure-kusto-ingest = callPackage ../development/python-modules/azure-kusto-ingest { };

From 193ede2ccf489ea6c15bed0efbb94799683b7079 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:35:11 +0200
Subject: [PATCH 0757/1497] python3Packages.azure-mgmt-containerservices:
 35.0.0 -> 36.0.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index a466e490a2a2..43d6f2fa3951 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "35.0.0";
+  version = "36.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_containerservice";
     inherit version;
-    hash = "sha256-caFJs9ZcK8XJyceEOhH4HDofth6hhzJv6qlK087j3HQ=";
+    hash = "sha256-l/PnbSs6auieHmxzmEjx4OB1jHKCqjNNV7MAhvbzbJ8=";
   };
 
   build-system = [ setuptools ];

From 8860b04024c18eec679a3f3d063634f7b8ab802c Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:51:28 +0200
Subject: [PATCH 0758/1497] python3Packages.azure-mgmt-recoveryservicesbackup:
 9.1.0 -> 9.2.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../azure-mgmt-recoveryservicesbackup/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 5504636c0443..cffea93f11fb 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -11,14 +11,15 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservicesbackup";
-  version = "9.1.0";
+  version = "9.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Hp/UBsDJ7iYn9aNx8BL4dzQvf8bzOyVk/NFNbwZjzQ8=";
+    pname = "azure_mgmt_recoveryservicesbackup";
+    inherit version;
+    hash = "sha256-xAKz4ipsOHnfVrw34AYxQsM1LFECWZ/xAtGYJPGzKyk=";
   };
 
   build-system = [ setuptools ];

From 7fba5a1d473d068de953220201fef9c0bef612de Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:55:13 +0200
Subject: [PATCH 0759/1497] python3Packages.azure-mgmt-storage: 22.2.0 ->
 23.0.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index e13baadc1fbf..656c1ddd798d 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-storage";
-  version = "22.2.0";
+  version = "23.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_storage";
     inherit version;
-    hash = "sha256-f+1DPSROJ20G3fNPn6e5uHE08IX8Y0YBr1tn8qAITYY=";
+    hash = "sha256-HFlU1Zvdy5edBbxJ5DFxam4rL3VpCblrp8QyYQcq/L8=";
   };
 
   build-system = [ setuptools ];

From 6774ccc0a89babf18037ebfc64fa963c8dbcc769 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:55:50 +0200
Subject: [PATCH 0760/1497] azure-cli: 2.73.0 -> 2.74.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 1cc1ffc07535..be490aa33876 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.73.0";
+  version = "2.74.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-MLmTV/tg5fM3XFEMtBLPdvsiUS5Gj8CH/zvdehDoka0=";
+    hash = "sha256-wX1XKC3snnKEQeqlW+btshjdcMR/5m2Z69QtcJe2Opc=";
   };
 
   # put packages that needs to be overridden in the py package scope
@@ -168,6 +168,7 @@ py.pkgs.toPythonApplication (
         azure-keyvault-certificates
         azure-keyvault-keys
         azure-keyvault-secrets
+        azure-keyvault-securitydomain
         azure-mgmt-advisor
         azure-mgmt-apimanagement
         azure-mgmt-appconfiguration

From c3a517063847af38a47cda3526f582c2d464175d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:10 +0200
Subject: [PATCH 0761/1497] azure-cli-extensions.mongo-db: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 1efbd6c658a9..de6d9bc3ae6e 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -699,6 +699,13 @@
     "hash": "sha256-LZVypO1wbfj2JsYgNq0i9GoVsRMnP4/5sGMTo4Cif1Y=",
     "description": "Microsoft Azure Command-Line Tools MobileNetwork Extension"
   },
+  "mongo-db": {
+    "pname": "mongo-db",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mongo_db-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-z/i+P/kx4MT8XskhqjohRL3Xpne9teLe6jmfCv6iv+0=",
+    "description": "Microsoft Azure Command-Line Tools MongoDb Extension"
+  },
   "monitor-control-service": {
     "pname": "monitor-control-service",
     "version": "1.2.0",

From 78ba1b2de1ce286523ddd6e2111df73ffa2af280 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:12 +0200
Subject: [PATCH 0762/1497] azure-cli-extensions.vme: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index de6d9bc3ae6e..628f8c1fd8a2 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1091,6 +1091,13 @@
     "hash": "sha256-LbbCU9Q4YtBqRSUHPWe2Hx00t8iDIWK9Owv//SS5raY=",
     "description": "Manage virtual WAN, hubs, VPN gateways and VPN sites"
   },
+  "vme": {
+    "pname": "vme",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vme-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-cCAZh8ytxz5sEtyNuV/EqZ9KqOifBXr1W8PBJWctz/8=",
+    "description": "Microsoft Azure Command-Line Tools Vme Extension"
+  },
   "vmware": {
     "pname": "vmware",
     "version": "7.2.0",

From c811891d24c55029b4afa01a1144f943c1f880fc Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:14 +0200
Subject: [PATCH 0763/1497] azure-cli-extensions.carbon: init at 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 628f8c1fd8a2..80bd23781137 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -188,6 +188,13 @@
     "hash": "sha256-WNODVEbdk+WFsPa1IKLbZVG4qSfjXiXaR0fUz4pMAJs=",
     "description": "Microsoft Azure Command-Line Tools Blueprint Extension"
   },
+  "carbon": {
+    "pname": "carbon",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/carbon-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-w+HDLtCIAIhlFTpR4iUMEKPC2vInPWWmMTX0VT9q1lg=",
+    "description": "Microsoft Azure Command-Line Tools Carbon Extension"
+  },
   "change-analysis": {
     "pname": "change-analysis",
     "version": "0.1.0",

From 5010d90b096ba81cc2e8064d05d3f4b96b23f460 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:16 +0200
Subject: [PATCH 0764/1497] azure-cli-extensions.k8s-extension: 1.6.4 -> 1.6.5

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 80bd23781137..009fa26199be 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -596,9 +596,9 @@
   },
   "k8s-extension": {
     "pname": "k8s-extension",
-    "version": "1.6.4",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.4-py3-none-any.whl",
-    "hash": "sha256-O11I5IFPdUDFWcMwgucurugl+zHzkvAL5Idj5UCHkwY=",
+    "version": "1.6.5",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.5-py3-none-any.whl",
+    "hash": "sha256-MZJr6cLtg9m1TD5aYHw2ynfI1Rin5UvaAS7k0QsmZ7k=",
     "description": "Microsoft Azure Command-Line Tools K8s-extension Extension"
   },
   "k8s-runtime": {

From 003e93ccf25d382e3046f26b5c38b0459a7f1a30 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:19 +0200
Subject: [PATCH 0765/1497] azure-cli-extensions.aks-preview: 17.0.0b4 ->
 18.0.0b7

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 009fa26199be..f0f3a774bf1b 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -50,9 +50,9 @@
   },
   "aks-preview": {
     "pname": "aks-preview",
-    "version": "17.0.0b4",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-17.0.0b4-py2.py3-none-any.whl",
-    "hash": "sha256-KZ4j1OvY/ziVZnv1nAnowWD+ujYrOYMxfOmH6krHDjI=",
+    "version": "18.0.0b7",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b7-py2.py3-none-any.whl",
+    "hash": "sha256-5xRE/WGe/PbTavC/b9MrrXMwXVsBoEEog44A8YJu9cY=",
     "description": "Provides a preview for upcoming AKS features"
   },
   "akshybrid": {

From 71ecefb828dd89a74c4296f1504271fdac601d58 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:21 +0200
Subject: [PATCH 0766/1497] azure-cli-extensions.datadog: 0.1.1 -> 1.0.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index f0f3a774bf1b..4d77f6049c06 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -295,10 +295,10 @@
   },
   "datadog": {
     "pname": "datadog",
-    "version": "0.1.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-0.1.1-py3-none-any.whl",
-    "hash": "sha256-mjj9XW0BZG8pnue19o6CrXCIicfQvXLgtraxPlRV6Tc=",
-    "description": "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension"
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-1.0.0-py3-none-any.whl",
+    "hash": "sha256-VCcoKbYC+F8EbEMRzCMBX3a6LvdkkYKfM5OuC7WhUQI=",
+    "description": "Microsoft Azure Command-Line Tools Datadog Extension"
   },
   "datafactory": {
     "pname": "datafactory",

From 12673a511993baf71a80acc25b459128cbd62ca0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:23 +0200
Subject: [PATCH 0767/1497] azure-cli-extensions.zones: 1.0.0b1 -> 1.0.0b3

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 4d77f6049c06..33ab3b6e71a9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1135,9 +1135,9 @@
   },
   "zones": {
     "pname": "zones",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-/CPMEVqdxeyzt2l3K8+eqv5Hs+EWjXJeKdWtD4xxGG0=",
+    "version": "1.0.0b3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b3-py3-none-any.whl",
+    "hash": "sha256-O9gcKKvWDFmlnZabIioDGNIxqn8XDaE4xeOt3/q+7Rk=",
     "description": "Microsoft Azure Command-Line Tools Zones Extension"
   }
 }

From f56e35aec69bcd77ead8b18946d56002917b33a1 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:25 +0200
Subject: [PATCH 0768/1497] azure-cli-extensions.datafactory: 1.0.3 -> 1.0.4

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 33ab3b6e71a9..d757d97db65c 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -302,9 +302,9 @@
   },
   "datafactory": {
     "pname": "datafactory",
-    "version": "1.0.3",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.3-py3-none-any.whl",
-    "hash": "sha256-ZvQWykXTiKMvuzc4ByUecOIFNH+j6HBWaW7xaTCa6vs=",
+    "version": "1.0.4",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.4-py3-none-any.whl",
+    "hash": "sha256-mn2ogckgs4gnsOUpavOHVsV+zOxXzosTAW98z4W063Y=",
     "description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension"
   },
   "datamigration": {

From 389f2d938c0f82e27ec85da81887daa21f6e39be Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:27 +0200
Subject: [PATCH 0769/1497] azure-cli-extensions.dynatrace: 1.1.0 -> 1.1.1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index d757d97db65c..b687ae5cb145 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -393,9 +393,9 @@
   },
   "dynatrace": {
     "pname": "dynatrace",
-    "version": "1.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl",
-    "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=",
+    "version": "1.1.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.1-py3-none-any.whl",
+    "hash": "sha256-uDqTcLrHCSrShT7CMl3GrMWLXjGGqvB2ofaLCrnyhvg=",
     "description": "Microsoft Azure Command-Line Tools Dynatrace Extension"
   },
   "edgeorder": {

From 541fae181e4e9bb6c2bbeb1f82a775f6259ebb57 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:29 +0200
Subject: [PATCH 0770/1497] azure-cli-extensions.cosmosdb-preview: 1.4.0 ->
 1.6.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index b687ae5cb145..3955f6f3d48a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -246,9 +246,9 @@
   },
   "cosmosdb-preview": {
     "pname": "cosmosdb-preview",
-    "version": "1.4.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.4.0-py2.py3-none-any.whl",
-    "hash": "sha256-u8wSLjuIyy6aC4tPKou9dSk1nKeb19Tx8JhpUYVGH34=",
+    "version": "1.6.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.0-py2.py3-none-any.whl",
+    "hash": "sha256-OO8IjVRhGOfsCb/Oot7Dc7PmfNsDmaXiCuG0at8Hb44=",
     "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"
   },
   "costmanagement": {

From 54d4f605119a1655016ea1cde681072f8319a028 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:31 +0200
Subject: [PATCH 0771/1497] azure-cli-extensions.informatica: 1.0.0b1 ->
 1.0.0b2

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 3955f6f3d48a..ea2e99ebe16f 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -568,9 +568,9 @@
   },
   "informatica": {
     "pname": "informatica",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-YWaukceOdMAa870erS1igycH4XbqD31dMKXdSF9IJGI=",
+    "version": "1.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b2-py3-none-any.whl",
+    "hash": "sha256-TGbjP7LsW7SgdBawNYMvFe8kAAdFzbzMCcJp+s0wy0w=",
     "description": "Microsoft Azure Command-Line Tools Informatica Extension"
   },
   "init": {

From e0a01c8277f0f0f4bdf7149b91af0f9fb9f2c2b7 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:33 +0200
Subject: [PATCH 0772/1497] azure-cli-extensions.connectedmachine: 1.1.1b1 ->
 2.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index ea2e99ebe16f..57879b3e2abc 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -232,9 +232,9 @@
   },
   "connectedmachine": {
     "pname": "connectedmachine",
-    "version": "1.1.1b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.1.1b1-py3-none-any.whl",
-    "hash": "sha256-IFX8KBG4QrgEIdsPzhlHQ1/q+0sFgQBlMUeF+wgTzGA=",
+    "version": "2.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-2.0.0b1-py3-none-any.whl",
+    "hash": "sha256-TNewwps4rNSx/O+GIhdFMsLJC8Z0pxD2VIlGsujOPVs=",
     "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension"
   },
   "connectedvmware": {

From 07a25d001b145c69c51061f5ba5bc7e17a064c3d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:35 +0200
Subject: [PATCH 0773/1497] azure-cli-extensions.astronomer: 1.0.0 -> 1.0.1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 57879b3e2abc..7fb583bcd03c 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -113,9 +113,9 @@
   },
   "astronomer": {
     "pname": "astronomer",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.0-py3-none-any.whl",
-    "hash": "sha256-tMpBtdnLd67StGLe1KOSrjzols6NnLlKCGcdDLaBds0=",
+    "version": "1.0.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.1-py3-none-any.whl",
+    "hash": "sha256-71tmCfbCGCyOIQjP3QvdcpEnHC00tw9MIXqmGfcBCno=",
     "description": "Microsoft Azure Command-Line Tools Astronomer Extension"
   },
   "authV2": {

From 831133e4d40a1578052f88e223d5e089e7a50152 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:37 +0200
Subject: [PATCH 0774/1497] azure-cli-extensions.databox: 1.1.0 -> 1.2.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 7fb583bcd03c..5f71972806d0 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -281,9 +281,9 @@
   },
   "databox": {
     "pname": "databox",
-    "version": "1.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.1.0-py3-none-any.whl",
-    "hash": "sha256-e0GmBSHXz2UtTNygUvydLsY3Hz14hOwKdLqafVAB17s=",
+    "version": "1.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.2.0-py3-none-any.whl",
+    "hash": "sha256-bFHiTEUKirHc90iJUkqcPfKRrJlBonekcEMzVeReQfc=",
     "description": "Microsoft Azure Command-Line Tools Databox Extension"
   },
   "databricks": {

From 0554893842d2ccecc3ef62c2780d94ce55397260 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:39 +0200
Subject: [PATCH 0775/1497] azure-cli-extensions.blueprint: 0.3.2 -> 1.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 5f71972806d0..9fcace070e3c 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -183,9 +183,9 @@
   },
   "blueprint": {
     "pname": "blueprint",
-    "version": "0.3.2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-0.3.2-py3-none-any.whl",
-    "hash": "sha256-WNODVEbdk+WFsPa1IKLbZVG4qSfjXiXaR0fUz4pMAJs=",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-WVBTayQ3Asbs5Q8sE8d4q68xIJN6i0cZiNHV+8szmlQ=",
     "description": "Microsoft Azure Command-Line Tools Blueprint Extension"
   },
   "carbon": {

From 19c52a36bbe74ad13397095b4d2beeae5cb32340 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:41 +0200
Subject: [PATCH 0776/1497] azure-cli-extensions.weights-and-biases: remove

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 -------
 pkgs/by-name/az/azure-cli/extensions-manual.nix     | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 9fcace070e3c..9d0b70cb5a68 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1119,13 +1119,6 @@
     "hash": "sha256-kIsN8HzvZSF2oPK/D9z1i10W+0kD7jwG9z8Ls5E6XA8=",
     "description": "Additional commands for Azure AppService"
   },
-  "weights-and-biases": {
-    "pname": "weights-and-biases",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/weights_and_biases-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-p961+8YG/7LsyS8b+xfEPq2hZeiwlwqBvnyXnkxoz3o=",
-    "description": "Microsoft Azure Command-Line Tools WeightsAndBiases Extension"
-  },
   "workloads": {
     "pname": "workloads",
     "version": "1.1.0",
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 609acd44a90e..730384f5fd2a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -157,4 +157,5 @@
   deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224
   logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459
   spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652
+  weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764
 }

From b0c4014634d1516c2d0afab182e4c7567c04efe6 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 08:57:44 +0200
Subject: [PATCH 0777/1497] azure-cli-extensions.pinecone: remove

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 -------
 pkgs/by-name/az/azure-cli/extensions-manual.nix     | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 9d0b70cb5a68..17a13455115a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -825,13 +825,6 @@
     "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=",
     "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"
   },
-  "pinecone": {
-    "pname": "pinecone",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/pinecone-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-5WXKpClTweNCLz/wW/PcKLbpFOdJagp1l7FOD3Ou/WM=",
-    "description": "Microsoft Azure Command-Line Tools Pinecone Extension"
-  },
   "playwright-cli-extension": {
     "pname": "playwright-cli-extension",
     "version": "1.0.0b1",
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 730384f5fd2a..3468f56c3812 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -156,6 +156,7 @@
   connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194
   deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224
   logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459
+  pinecone = throw "The 'pinecone' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8763
   spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652
   weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764
 }

From 20b282da75d816cca2c6fb30b39d340569020622 Mon Sep 17 00:00:00 2001
From: adamjhf <git@freeth.dev>
Date: Wed, 21 May 2025 11:56:28 +0000
Subject: [PATCH 0778/1497] cargo-leptos: 0.2.28 -> 0.2.35

cargo-leptos: 0.2.28 -> 0.2.35

cargo-leptos: fix darwin

cargo-leptos: remove vendored-openssl

cargo-leptos: fix idmail build

x

cargo-leptos 2

cargo-leptos

remove idmail change

revert idmail
---
 pkgs/by-name/ca/cargo-leptos/package.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 21527f9b2e59..cffa2be21f6e 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -1,21 +1,37 @@
 {
   fetchFromGitHub,
   lib,
+  stdenv,
   rustPlatform,
+  pkg-config,
+  openssl,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-leptos";
-  version = "0.2.28";
+  version = "0.2.35";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = "cargo-leptos";
     rev = "v${version}";
-    hash = "sha256-SjpfM963Zux+H5QhK8prvDLuI56fP5PqX5gcVbthRx4=";
+    hash = "sha256-CNktytEm6+5QTPAlxNz07+s7gue9dA5zZM82YQOWFSw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs=";
+  cargoHash = "sha256-O/JyB47UP6rLeAG1rt1dXhaKfZ71QPg7qAeciHAvrAk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  env =
+    {
+      OPENSSL_NO_VENDOR = 1;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+      # Fix for C++ compiler version on darwin for wasm-opt
+      CRATE_CC_NO_DEFAULTS = 1;
+    };
 
   # https://github.com/leptos-rs/cargo-leptos#dependencies
   buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise

From ed32f66cd0153e934e673efd68b3efe6b7dbcba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 09:41:36 +0000
Subject: [PATCH 0779/1497] home-manager: 0-unstable-2025-05-23 ->
 0-unstable-2025-06-02

---
 pkgs/by-name/ho/home-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 3b9b94a41e17..764292e4985e 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-05-23";
+  version = "0-unstable-2025-06-02";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "7419250703fd5eb50e99bdfb07a86671939103ea";
-    hash = "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=";
+    rev = "cb809ec1ff15cf3237c6592af9bbc7e4d983e98c";
+    hash = "sha256-BJ0qRIdvt5aeqm3zg/5if7b5rruG05zrSX3UpLqjDRk=";
   };
 
   nativeBuildInputs = [

From b7d46f979198e74e8f12d30a4f7f29e01c43c944 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 09:47:07 +0000
Subject: [PATCH 0780/1497] n8n: 1.93.0 -> 1.95.2

---
 pkgs/by-name/n8/n8n/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 6882af2fb37a..42c7448d8669 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,18 +17,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.93.0";
+  version = "1.95.2";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-qq4oehZnwp9Zj+h827exILrgLgM/yHQzjWRQsdmYWgs=";
+    hash = "sha256-MFREFqDuT7xTCOJ6s6bcDG8jjTSckyqJTvAFSukV5x0=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-bLpYfIIJYmooRX7F/L8e7kdbEKPNJE6EPqjhPdAwJt4=";
+    hash = "sha256-ikGRHuAy9kmpxhu0Aawk6qL2vMYygSgf3YPdfs7OwOM=";
   };
 
   nativeBuildInputs =

From ac2ffcdeaf60fcf101b4f6390b7581763eb763e2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 3 Jun 2025 11:59:38 +0200
Subject: [PATCH 0781/1497] python312Packages.waymax: 0-unstable-2024-03-23 ->
 0-unstable-2025-05-30

Diff: https://github.com/waymo-research/waymax/compare/720f9214a9bf79b3da7926497f0cd0468ca3e630...48b33d71aac20a22db7d25f2d3220596899d944a

Changelog: https://github.com/waymo-research/waymax/blob/main/CHANGELOG.md
---
 .../python-modules/waymax/default.nix         | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/waymax/default.nix b/pkgs/development/python-modules/waymax/default.nix
index 6fb36ddcf8b8..187448c8ea9d 100644
--- a/pkgs/development/python-modules/waymax/default.nix
+++ b/pkgs/development/python-modules/waymax/default.nix
@@ -21,31 +21,16 @@
 
 buildPythonPackage {
   pname = "waymax";
-  version = "0-unstable-2024-03-23";
+  version = "0-unstable-2025-05-30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "waymo-research";
     repo = "waymax";
-    rev = "720f9214a9bf79b3da7926497f0cd0468ca3e630";
-    hash = "sha256-B1Rp5MATbEelp6G6K2wwV83QpINhOHgvAxb3mBN52Eg=";
+    rev = "48b33d71aac20a22db7d25f2d3220596899d944a";
+    hash = "sha256-YV0KI0UrFXO3HvKjqJE+K+hJJuYI4GiIR4l1fZNnl/E=";
   };
 
-  # AttributeError: jax.tree_map was removed in JAX v0.6.0: use jax.tree.map (jax v0.4.25 or newer) or jax.tree_util.tree_map (any JAX version).
-  # https://github.com/waymo-research/waymax/pull/77
-  postPatch = ''
-    substituteInPlace \
-      waymax/agents/expert.py \
-      waymax/agents/waypoint_following_agent.py \
-      waymax/agents/waypoint_following_agent_test.py \
-      waymax/dynamics/abstract_dynamics_test.py \
-      waymax/dynamics/state_dynamics_test.py \
-      waymax/env/base_environment_test.py \
-      waymax/env/rollout_test.py \
-      waymax/env/wrappers/brax_wrapper_test.py \
-      --replace-fail "jax.tree_map" "jax.tree_util.tree_map"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [

From ab77870a4b3fd15031f7c66428fdc06aabf5800c Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 3 Jun 2025 10:21:39 +0000
Subject: [PATCH 0782/1497] vimix-cursors: fix build

The `cairosvg` executable is no longer supplied by
`python3Packages.cairosvg`, use the top-level package instead.
---
 pkgs/by-name/vi/vimix-cursors/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vimix-cursors/package.nix b/pkgs/by-name/vi/vimix-cursors/package.nix
index 665938ae02e4..b55a999ec03e 100644
--- a/pkgs/by-name/vi/vimix-cursors/package.nix
+++ b/pkgs/by-name/vi/vimix-cursors/package.nix
@@ -2,8 +2,8 @@
   lib,
   fetchFromGitHub,
   stdenvNoCC,
+  cairosvg,
   inkscape,
-  python3Packages,
   xcursorgen,
 }:
 stdenvNoCC.mkDerivation {
@@ -18,8 +18,8 @@ stdenvNoCC.mkDerivation {
   };
 
   nativeBuildInputs = [
+    cairosvg
     inkscape
-    python3Packages.cairosvg
     xcursorgen
   ];
 

From 84667ad2999f896357e5baee1698b3543ec94161 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Fri, 30 May 2025 17:15:35 +0200
Subject: [PATCH 0783/1497] rocqPackages.hierarchy-builder: init at 1.9.1

---
 .../coq-modules/hierarchy-builder/default.nix | 17 ++++++++
 .../hierarchy-builder/default.nix             | 40 +++++++++++++++++++
 pkgs/top-level/rocq-packages.nix              |  1 +
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/rocq-modules/hierarchy-builder/default.nix

diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index 3bd52d63accb..07064760975e 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkCoqDerivation,
   coq,
+  rocqPackages,
   stdlib,
   coq-elpi,
   version ? null,
@@ -96,4 +97,20 @@ hb.overrideAttrs (
   // lib.optionalAttrs (o.version != null && o.version == "1.8.1") {
     propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];
   }
+  # this is just a wrapper for rocqPackages.hierarchy-builder for Rocq >= 9.0
+  //
+    lib.optionalAttrs
+      (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))
+      {
+        configurePhase = ''
+          echo no configuration
+        '';
+        buildPhase = ''
+          echo building nothing
+        '';
+        installPhase = ''
+          echo installing nothing
+        '';
+        propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.hierarchy-builder ];
+      }
 )
diff --git a/pkgs/development/rocq-modules/hierarchy-builder/default.nix b/pkgs/development/rocq-modules/hierarchy-builder/default.nix
new file mode 100644
index 000000000000..7987c1c6373a
--- /dev/null
+++ b/pkgs/development/rocq-modules/hierarchy-builder/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  mkRocqDerivation,
+  rocq-core,
+  rocq-elpi,
+  version ? null,
+}:
+
+let
+  hb = mkRocqDerivation {
+    pname = "hierarchy-builder";
+    owner = "math-comp";
+    inherit version;
+    defaultVersion =
+      with lib.versions;
+      lib.switch rocq-core.rocq-version [
+        {
+          case = range "9.0" "9.0";
+          out = "1.9.1";
+        }
+      ] null;
+    release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0=";
+    releaseRev = v: "v${v}";
+
+    propagatedBuildInputs = [ rocq-elpi ];
+
+    meta = with lib; {
+      description = "High level commands to declare a hierarchy based on packed classes";
+      maintainers = with maintainers; [
+        cohencyril
+        siraben
+      ];
+      license = licenses.mit;
+    };
+  };
+in
+hb.overrideAttrs (
+  o:
+  lib.optionalAttrs (o.version == "1.9.1") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
+)
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 2c684ba39527..25da5b7ac389 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -37,6 +37,7 @@ let
       mkRocqDerivation = lib.makeOverridable (callPackage ../build-support/rocq { });
 
       bignums = callPackage ../development/rocq-modules/bignums { };
+      hierarchy-builder = callPackage ../development/rocq-modules/hierarchy-builder { };
       rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi { };
       stdlib = callPackage ../development/rocq-modules/stdlib { };
 

From 1cf1e829dd0b91f72e298d13bd7e474773b3df58 Mon Sep 17 00:00:00 2001
From: Tungsten842 <886724vf@anonaddy.me>
Date: Tue, 3 Jun 2025 12:30:28 +0200
Subject: [PATCH 0784/1497] evil-helix: 20250413 -> 20250601

---
 pkgs/by-name/ev/evil-helix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix
index 01262f9e2d63..4bef9ecc3d47 100644
--- a/pkgs/by-name/ev/evil-helix/package.nix
+++ b/pkgs/by-name/ev/evil-helix/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "evil-helix";
-  version = "20250413";
+  version = "20250601";
 
   src = fetchFromGitHub {
     owner = "usagi-flow";
     repo = "evil-helix";
     rev = "release-${version}";
-    hash = "sha256-0dXDAhnkkr5rh4UK0zkT3xYthk01VbNnRrYe5rD3oh4=";
+    hash = "sha256-bsl9ltPXEhkcnnHFAXQMyBCh1qd+UBV0XK2EcJOe+eg=";
   };
 
   useFetchCargoVendor = true;

From 468205049464833b55ebbd47f4611b3624fc020b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 04:43:33 +0000
Subject: [PATCH 0785/1497] wgpu-utils: 24.0.3 -> 25.0.2

---
 pkgs/by-name/wg/wgpu-utils/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix
index 0a1141b6319c..dfbebd6f0f98 100644
--- a/pkgs/by-name/wg/wgpu-utils/package.nix
+++ b/pkgs/by-name/wg/wgpu-utils/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wgpu-utils";
-  version = "24.0.3";
+  version = "25.0.2";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu";
     tag = "wgpu-v${version}";
-    hash = "sha256-MoHpMdOKwCdQ2iO4O8WDskOQXgeFwpsD/UhQOhSbF70=";
+    hash = "sha256-Na8UWMEzY0mvw8YERZ86PH79Z5YlXITPdOYha7Ahn7k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-l7V8awY17YxVyBzWV+BHRva7FczZQxJy8c6xve27gjs=";
+  cargoHash = "sha256-9o1Tb0pVTc3iWPjNlAPBQX72djcx3EPJhxuUW6xZfCs=";
 
   nativeBuildInputs = [
     pkg-config

From 3ee1cb2d2476e21dc4a4712267d000eb78d415c6 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 3 Jun 2025 12:46:02 +0200
Subject: [PATCH 0786/1497] gopls: use buildGoLatestModule

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/go/gopls/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix
index c0200f76c20b..70e9133beb21 100644
--- a/pkgs/by-name/go/gopls/package.nix
+++ b/pkgs/by-name/go/gopls/package.nix
@@ -1,12 +1,15 @@
 {
   lib,
-  buildGoModule,
+  # gopls breaks if it is compiled with a lower version than the one it is running against.
+  # This will affect users especially when project they work on bump go minor version before
+  # the update went through nixpkgs staging. Further, gopls is a central ecosystem component.
+  buildGoLatestModule,
   fetchFromGitHub,
   nix-update-script,
   versionCheckHook,
 }:
 
-buildGoModule (finalAttrs: {
+buildGoLatestModule (finalAttrs: {
   pname = "gopls";
   version = "0.18.1";
 

From 87e7b408996069e2a261a649cc5738a6a78a676e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 3 Jun 2025 12:54:40 +0200
Subject: [PATCH 0787/1497] python313Packages.pytest-spec: 4.0.0 -> 5.0.0

---
 pkgs/development/python-modules/pytest-spec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix
index e1cc01003aa5..dce9e0d9d6aa 100644
--- a/pkgs/development/python-modules/pytest-spec/default.nix
+++ b/pkgs/development/python-modules/pytest-spec/default.nix
@@ -12,16 +12,16 @@
 
 buildPythonPackage rec {
   pname = "pytest-spec";
-  version = "4.0.0";
+  version = "5.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "pchomik";
     repo = "pytest-spec";
     tag = version;
-    hash = "sha256-SOu4ucRcLQSk1YOfNifFDezsB+ZeLXTwbJJ93/3EASk=";
+    hash = "sha256-EWhKqGOLBa+Eb4fJtkamP8it+hWeK3rGWKgY8mJI53U=";
   };
 
   build-system = [

From 1b18666d6a9018dac1f5a99b015d15f57b2d1189 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 30 Apr 2025 17:00:02 +0100
Subject: [PATCH 0788/1497] python3Packages.craft-parts: 2.8.0 -> 2.10.0

---
 .../development/python-modules/craft-parts/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index 585e66d25fa1..3ab3e99727d8 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -25,11 +25,12 @@
   ant,
   maven,
   jdk,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "craft-parts";
-  version = "2.8.0";
+  version = "2.10.0";
 
   pyproject = true;
 
@@ -37,7 +38,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-parts";
     tag = version;
-    hash = "sha256-1SnT/yB6vJm82yhszBRjeph13B91KYap8/KR4L9VcjM=";
+    hash = "sha256-nGOLzQ+mlLHmqkknWklCIEN7HOgQznuYO1rbqUvL1N4=";
   };
 
   patches = [ ./bash-path.patch ];
@@ -76,14 +77,11 @@ buildPythonPackage rec {
     requests-mock
     socat
     squashfsTools
+    writableTmpDirAsHomeHook
   ];
 
   pytestFlagsArray = [ "tests/unit" ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTests = [
     # Relies upon paths not present in Nix (like /bin/bash)
     "test_run_builtin_build"

From 97f036f7a65ba6eec087ede13737e634374842ab Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Thu, 1 May 2025 10:45:19 +0100
Subject: [PATCH 0789/1497] python3Packages.craft-application: 4.10.0 -> 5.3.0

---
 .../craft-application/default.nix             | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 6b2d0ea7e1e2..8951c8982519 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -10,7 +10,7 @@
   craft-providers,
   jinja2,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   hypothesis,
   license-expression,
   nix-update-script,
@@ -20,29 +20,33 @@
   pytest-mock,
   pytest-subprocess,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   responses,
   setuptools-scm,
   snap-helpers,
   freezegun,
+  cacert,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "craft-application";
-  version = "4.10.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-application";
     tag = version;
-    hash = "sha256-9M49/XQuWwKuQqseleTeZYcrwd/S16lNCljvlVsoXbs=";
+    hash = "sha256-6iD35ql3/vUzILh5VMWiFwBKPoGPfCUgEKD4g7s55Y0=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools==75.8.0" "setuptools"
+
+      substituteInPlace craft_application/git/_utils.py \
+        --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
   '';
 
   build-system = [ setuptools-scm ];
@@ -68,7 +72,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
-    git
+    gitMinimal
     hypothesis
     pyfakefs
     pytest-check
@@ -76,11 +80,10 @@ buildPythonPackage rec {
     pytest-subprocess
     pytestCheckHook
     responses
+    writableTmpDirAsHomeHook
   ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
-
     # Tests require access to /etc/os-release, which isn't accessible in
     # the test environment, so create a fake file, and modify the code
     # to look for it.
@@ -90,6 +93,11 @@ buildPythonPackage rec {
 
     substituteInPlace craft_application/util/platforms.py \
       --replace-fail "os_utils.OsRelease()" "os_utils.OsRelease(os_release_file='$HOME/os-release')"
+
+    # Not using `--replace-fail` here only because it simplifies overriding this package in the charmcraft
+    # derivation. Once charmcraft has moved to craft-application >= 5, `--replace-fail` can be added.
+    substituteInPlace tests/conftest.py \
+      --replace "include_lsb=False, include_uname=False, include_oslevel=False" "include_lsb=False, include_uname=False, include_oslevel=False, os_release_file='$HOME/os-release'"
   '';
 
   pythonImportsCheck = [ "craft_application" ];
@@ -109,6 +117,10 @@ buildPythonPackage rec {
       # slightly in a later revision of craft-platforms. No functional error.
       "test_platform_invalid_arch"
       "test_platform_invalid_build_arch"
+      # Asserts against string output which fails when not on Ubuntu.
+      "test_run_error_with_docs_url"
+      # Asserts a fallback path for SSL certs that we override in a patch.
+      "test_import_fallback_wrong_metadata"
     ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # These tests have hardcoded "amd64" strings which fail on aarch64
@@ -117,6 +129,11 @@ buildPythonPackage rec {
       "test_process_grammar_default"
     ];
 
+  disabledTestPaths = [
+    # These tests assert outputs of commands that assume Ubuntu-related output.
+    "tests/unit/services/test_lifecycle.py"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 2d65dd6dc7bfae5830fc92f568e3d50154261349 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:12:33 +0200
Subject: [PATCH 0790/1497] python312Packages.mypy-boto3-athena: 1.38.13 ->
 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index aa3fecbc922f..d2906643a92c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -142,8 +142,8 @@ rec {
       "sha256-ksKIbASQfKzf67Pkdv5HUipoep/8Qv7jVcjC4KCqAoI=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.38.13"
-      "sha256-1Fonc55fVM8ksqCTBwXVHeqhypgsYegoW8PEEPqcTF4=";
+    buildMypyBoto3Package "athena" "1.38.28"
+      "sha256-XX50pZpMd4N0hIKQ08RiZlgwlUSVkS7CJs4nCkpOrk0=";
 
   mypy-boto3-auditmanager =
     buildMypyBoto3Package "auditmanager" "1.38.22"

From 6765898a09d52b730a2c79d5a1821ec4e79f2e57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:12:36 +0200
Subject: [PATCH 0791/1497] python312Packages.mypy-boto3-backup: 1.38.0 ->
 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d2906643a92c..11b877c59649 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -158,8 +158,8 @@ rec {
       "sha256-g+40VJVE4PQG5k1wjIFcEio5kyLpdaQzfSFp/ABEXh8=";
 
   mypy-boto3-backup =
-    buildMypyBoto3Package "backup" "1.38.0"
-      "sha256-XYfzsfQvrnPdBaA+C8t2LGaE9Y93DRUIsWVFylNz8VI=";
+    buildMypyBoto3Package "backup" "1.38.28"
+      "sha256-8si5OnwscqeipuFC7d2KA2CerV+vjFLvQ0YzN7JbG14=";
 
   mypy-boto3-backup-gateway =
     buildMypyBoto3Package "backup-gateway" "1.38.0"

From 907230fde318813d8e192965b1fd8978da14698e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:12:48 +0200
Subject: [PATCH 0792/1497] python312Packages.mypy-boto3-compute-optimizer:
 1.38.0 -> 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 11b877c59649..55496b55e08b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -330,8 +330,8 @@ rec {
       "sha256-VPJP8laiJsNC/uxn/K2jaH2jrQWfltP46xLJEg1erx0=";
 
   mypy-boto3-compute-optimizer =
-    buildMypyBoto3Package "compute-optimizer" "1.38.0"
-      "sha256-DNpcAOVA9BvJDK/ZnCUF/iXJrQM7nxQB0YkH1DkWgQs=";
+    buildMypyBoto3Package "compute-optimizer" "1.38.28"
+      "sha256-ItKYimrEeI5dR8fF76gJ7VQ6Ws/WQNU0srmtQyHFylo=";
 
   mypy-boto3-config =
     buildMypyBoto3Package "config" "1.38.0"

From 915b02ef4a3683537a15ee9ab65c3f9a53b95a21 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:12:58 +0200
Subject: [PATCH 0793/1497] python312Packages.mypy-boto3-ecs: 1.38.18 ->
 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 55496b55e08b..77afe5b3ad9b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ rec {
       "sha256-aSZu8mxsTho4pvWWbNwlJf0IROjqjTlIUEE5DJkAje4=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.38.18"
-      "sha256-UjzMLvaDYVIrmHDFO/TlyofiwRqGlHA+aDqWcRepHdI=";
+    buildMypyBoto3Package "ecs" "1.38.28"
+      "sha256-f/ZRV3fRPB1B7xP8lJX/jPXVuFY+gdUm4lZJlZCj55k=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.38.0"

From dff84a1ed288f0100aa3e9fc12ebbd216e642f19 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:12:59 +0200
Subject: [PATCH 0794/1497] python312Packages.mypy-boto3-eks: 1.38.0 -> 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 77afe5b3ad9b..93445129a464 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -470,8 +470,8 @@ rec {
       "sha256-Z2LMQFtcTNqxsoWKGg4iBFtbwnXGVVXQrRa/bZdnl40=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.38.0"
-      "sha256-Z2TfCH3Prd6E9SkUXRKrHApw2uwnmSZWGxlphcI5i2U=";
+    buildMypyBoto3Package "eks" "1.38.28"
+      "sha256-eCS3kazYfOaVavz2q1gxbSnuW7bULnS4xDwB7X8aTBg=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"

From 9e4b239a85002202fd07c400a6cf65f690fd0da1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:13:03 +0200
Subject: [PATCH 0795/1497] python312Packages.mypy-boto3-entityresolution:
 1.38.0 -> 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 93445129a464..a07efb8cb2c5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -510,8 +510,8 @@ rec {
       "sha256-+BU0uQBQmQSxGwXalJ9A95Y8RXaFy9L6Lk8Z3D6QwkM=";
 
   mypy-boto3-entityresolution =
-    buildMypyBoto3Package "entityresolution" "1.38.0"
-      "sha256-U7q6B2Bh/5J3WBB0CmUJbNBFa+d28FYTsGiabMA5Kjc=";
+    buildMypyBoto3Package "entityresolution" "1.38.28"
+      "sha256-LsEqZ6G1W/lIijYQTf5H0VyBfWWyUi26j6IwEQcQ+8k=";
 
   mypy-boto3-es =
     buildMypyBoto3Package "es" "1.38.0"

From f049f51b08d5c2e402134a72c227152943a6b622 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:13:58 +0200
Subject: [PATCH 0796/1497] python312Packages.mypy-boto3-synthetics: 1.38.25 ->
 1.38.28

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a07efb8cb2c5..84dc690bfa12 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1346,8 +1346,8 @@ rec {
       "sha256-b6TgvxWdQI5TAI/OsJzmzlte1v30NdJucdedKgCb9LY=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.38.25"
-      "sha256-E9+a0LjuQfyxL/b/uZpMCrvWFmX2vPS+qJNMKcc10mU=";
+    buildMypyBoto3Package "synthetics" "1.38.28"
+      "sha256-demumYyUtBHj8Gzmml5374UxOLyWVMa71rN3pq55hDc=";
 
   mypy-boto3-textract =
     buildMypyBoto3Package "textract" "1.38.0"

From f0e8163cf253f323b95092c8dd1c514a27a65c22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:14:13 +0200
Subject: [PATCH 0797/1497] python313Packages.botocore-stubs: 1.38.27 ->
 1.38.28

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 0abffec95991..8538f3d24f3c 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.38.27";
+  version = "1.38.28";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-WDFdExi3nY+L0oiLFYfZD6T/phAKWLYQlGEQ6IVwuZU=";
+    hash = "sha256-uVSQULgQUb27kZZjI9aitsXHjKjcwyjhbfxEt2W+Ob4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 1bab1bc3f7a7239496c103cab2250633dfbbe416 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Jun 2025 13:14:23 +0200
Subject: [PATCH 0798/1497] python313Packages.boto3-stubs: 1.38.27 -> 1.38.28

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index eb3a6d6aa67f..1e1fe1867c43 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.27";
+  version = "1.38.28";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-ikXzK4PSnsPbKLN+po6l8XmxQYYyEUl++SuhjiqJauw=";
+    hash = "sha256-+ujgCepNgQt35J2IJHGDtdjRU78mjr3otKvfWKcBgC8=";
   };
 
   build-system = [ setuptools ];

From fee9749b90b5bbe51760d9515ff326ef39e1ef39 Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Mon, 2 Jun 2025 21:17:59 +0200
Subject: [PATCH 0799/1497] google-cloud-sdk: 2nd fix for pyopenssl

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 356353a99d88..04557b36753b 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -25,12 +25,18 @@ let
   pythonCustom = python3.override {
     self = pythonCustom;
     packageOverrides = _: super: {
+      # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
+      # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
       pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
         version = "24.2.1";
         src = old.src.override {
           tag = version;
-          hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
+          hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio=";
         };
+        disabledTests = old.disabledTests ++ [
+          "test_shutdown_closed"
+          "test_closed"
+        ];
       });
     };
   };

From 412521436adb14f46e6bc1cd5ca6a7782ea76b91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 11:21:43 +0000
Subject: [PATCH 0800/1497] percona-server: 8.4.4-4 -> 8.4.5-5

---
 pkgs/servers/sql/percona-server/8_4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index 3d54b99970cc..5803fd2a6872 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -50,11 +50,11 @@ assert !(withJemalloc && withTcmalloc);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.4.4-4";
+  version = "8.4.5-5";
 
   src = fetchurl {
     url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-10QYJQeCY3pFHmtBIQ72rsagicNJgHvNtbLPvjjUyg4=";
+    hash = "sha256-i0f/Ndwqbn6qyqLSBK5FbBW12ZUzYMy2JQ2o1o2Y9q8=";
   };
 
   nativeBuildInputs = [

From a8e7bf1b04773d4cdd383a48cdf24e3b0c988fc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 11:38:20 +0000
Subject: [PATCH 0801/1497] handheld-daemon: 3.15.7 -> 3.15.10

---
 pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index def156ffaaae..d3c5ca4b5c9c 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -16,14 +16,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.15.7";
+  version = "3.15.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     tag = "v${version}";
-    hash = "sha256-DxJy0CsVjH77rht+1xmXddoMkuNj7GTA24wOnwM+Ho8=";
+    hash = "sha256-VlFcozpW6JQs1jsit6cE3pOZLqJR4IS6nmNDqeTygKo=";
   };
 
   # Handheld-daemon runs some selinux-related utils which are not in nixpkgs.

From ce95b2d517da044afa083cf5fad9af24726f86b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 11:50:34 +0000
Subject: [PATCH 0802/1497] vscode-extensions.ziglang.vscode-zig: 0.6.9 ->
 0.6.10

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index e2f270939fcf..1f04d6af32d6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5656,8 +5656,8 @@ let
         mktplcRef = {
           name = "vscode-zig";
           publisher = "ziglang";
-          version = "0.6.9";
-          hash = "sha256-R18NnnsYVLmCNdGU0plIYn2MKrlSedfJoXH/amxKKaY=";
+          version = "0.6.10";
+          hash = "sha256-Tptl+tJ2ZlnKyswdTjnPJakhiiJn+1XmB82rbk8aO1w=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";

From 81705370cb5975c0425431b613526db7bec0960a Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 19 May 2025 12:38:49 +0100
Subject: [PATCH 0803/1497] station: 1.52.2 -> 3.3.0

Co-authored-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/st/station/package.nix | 55 ++++++++++++++++-------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/st/station/package.nix b/pkgs/by-name/st/station/package.nix
index 7e9391b6866f..c80a0ad5a3b4 100644
--- a/pkgs/by-name/st/station/package.nix
+++ b/pkgs/by-name/st/station/package.nix
@@ -1,43 +1,50 @@
 {
+  lib,
   appimageTools,
   fetchurl,
-  lib,
+  makeWrapper,
+  nix-update-script,
 }:
-
 let
+  version = "3.3.0";
   pname = "station";
-  version = "1.52.2";
-
   src = fetchurl {
-    url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}-x86_64.AppImage";
-    sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid";
+    url = "https://github.com/getstation/desktop-app/releases/download/v${version}/Station-x86_64.AppImage";
+    hash = "sha256-OiUVRKpU2W1dJ6z9Dqvxd+W4/oNpG+Zolj43ZHpKaO0=";
   };
-
   appimageContents = appimageTools.extractType2 {
     inherit pname version src;
   };
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
   inherit pname version src;
-
-  profile = ''
-    export LC_ALL=C.UTF-8
-  '';
-
   extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
-      $out/share/icons/hicolor/512x512/apps/browserx.png
-    substituteInPlace $out/share/applications/browserx.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+    source "${makeWrapper}/nix-support/setup-hook"
+    wrapProgram $out/bin/${pname} \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+    install -m 444 -D ${appimageContents}/station-desktop-app.desktop \
+      $out/share/applications/station-desktop-app.desktop
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/station-desktop-app.png \
+      $out/share/icons/hicolor/512x512/apps/station-desktop-app.png
+    substituteInPlace $out/share/applications/station-desktop-app.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=station'
   '';
 
-  meta = with lib; {
-    description = "Single place for all of your web applications";
-    homepage = "https://getstation.com";
-    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--url=https://github.com/getstation/desktop-app" ];
+    };
+  };
+
+  meta = {
+    changelog = "https://github.com/getstation/desktop-app/releases/tag/v${version}";
+    description = "A single place for all of your web applications";
+    downloadPage = "https://github.com/getstation/desktop-app/releases";
+    homepage = "https://getstation.com/";
+    license = lib.licenses.asl20;
     mainProgram = "station";
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From 095941be3f03eb00308ce8fc86545afe228a2029 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 3 Jun 2025 12:56:05 +0100
Subject: [PATCH 0804/1497] python3Packages.craft-platforms: 0.8.0 -> 0.9.0

---
 pkgs/development/python-modules/craft-platforms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix
index f22f119f3311..fd70c823ce64 100644
--- a/pkgs/development/python-modules/craft-platforms/default.nix
+++ b/pkgs/development/python-modules/craft-platforms/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "craft-platforms";
-  version = "0.8.0";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-platforms";
     tag = version;
-    hash = "sha256-U57hmQ3UPuwoue8kAxAXiH8ecViryFqIxmpnaAdQnZo=";
+    hash = "sha256-Ec4zncigqampXND0YvDnExrrB9ls3Sf0KfYVbwLGbqY=";
   };
 
   postPatch = ''

From 9ed7bc4de3f1dab32cc034ef16942b9605b34caa Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Thu, 22 May 2025 09:27:49 +0100
Subject: [PATCH 0805/1497] python3Packages.logassert: 8.2 -> 8.4

Signed-off-by: Jon Seager <jon@sgrs.uk>
---
 pkgs/development/python-modules/logassert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/logassert/default.nix b/pkgs/development/python-modules/logassert/default.nix
index 04640d926e9a..c062caac6583 100644
--- a/pkgs/development/python-modules/logassert/default.nix
+++ b/pkgs/development/python-modules/logassert/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "logassert";
-  version = "8.2";
+  version = "8.4";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "facundobatista";
     repo = "logassert";
     tag = version;
-    hash = "sha256-wtSX1jAHanHCF58cSNluChWY3lrrsgludnnW+xVJuOo=";
+    hash = "sha256-GKGNvOZde8Q6X5h+QC5936qTDWpcXYHuLXpsGuxw1Mw=";
   };
 
   build-system = [ setuptools ];

From 1934a054928ed455d69e8a25ea71ef60fcbbc1dc Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Fri, 23 May 2025 09:12:49 +0100
Subject: [PATCH 0806/1497] python3Packages.craft-providers: 2.2.0 -> 2.3.0

---
 .../python-modules/craft-providers/default.nix        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix
index e2392e0b3531..ab10ed1717b4 100644
--- a/pkgs/development/python-modules/craft-providers/default.nix
+++ b/pkgs/development/python-modules/craft-providers/default.nix
@@ -16,11 +16,12 @@
   freezegun,
   pytest-subprocess,
   logassert,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "craft-providers";
-  version = "2.2.0";
+  version = "2.3.0";
 
   pyproject = true;
 
@@ -28,7 +29,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-providers";
     tag = version;
-    hash = "sha256-HCt6xdUu8+6CtkLeUrY2KYnULLwLLobDDm4O1DAiZrc=";
+    hash = "sha256-EJoFuESgjEKoI1BKO02jd4iI/DFBphLujR/vGST/JGk=";
   };
 
   patches = [
@@ -75,13 +76,9 @@ buildPythonPackage rec {
     pytest-subprocess
     pytestCheckHook
     responses
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    mkdir -p check-phase
-    export HOME="$(pwd)/check-phase"
-  '';
-
   pytestFlagsArray = [ "tests/unit" ];
 
   disabledTestPaths = [

From 0160be867cc929d2fadc4b9fefc6bfab8b46f2c5 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 3 Jun 2025 11:54:36 +0100
Subject: [PATCH 0807/1497] python3Packages.pydantic-yaml: 1.4.0 -> 1.5.1

---
 pkgs/development/python-modules/pydantic-yaml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix
index d9e2eeaff85d..e1c980e55274 100644
--- a/pkgs/development/python-modules/pydantic-yaml/default.nix
+++ b/pkgs/development/python-modules/pydantic-yaml/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pydantic-yaml";
-  version = "1.4.0";
+  version = "1.5.1";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "NowanIlfideme";
     repo = "pydantic-yaml";
     tag = "v${version}";
-    hash = "sha256-xlFSczMCEkSDhtzSl8qzZwwZd0IelPmjTEV+Jk9G0fI=";
+    hash = "sha256-UOehghNjPymuZtGp1yM5T15M6/XmK1rgTN9uVCVOst4=";
   };
 
   postPatch = ''
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   meta = {
     description = "Small helper library that adds some YAML capabilities to pydantic";
     homepage = "https://github.com/NowanIlfideme/pydantic-yaml";
-    changelog = "https://github.com/NowanIlfideme/pydantic-yaml/releases/tag/v${version}";
+    changelog = "https://github.com/NowanIlfideme/pydantic-yaml/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jnsgruk ];
   };

From 20166b536c7c9a569521d9ac549e1f921240b876 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Thu, 1 May 2025 10:46:31 +0100
Subject: [PATCH 0808/1497] snapcraft: 8.8.1 -> 8.9.0

---
 pkgs/by-name/sn/snapcraft/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index de6d5b213dd4..86ca64c861c4 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -14,7 +14,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.8.1";
+  version = "8.9.2";
 
   pyproject = true;
 
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-gn2roiwNLUFJsuen2qGPvl4DyE6gPUQibS1Cn7cj2L8=";
+    hash = "sha256-4Dv2q/aKWnQkQ6ANYev/5fT1fFKh1MytYJtHK0iAzhk=";
   };
 
   patches = [

From 6b0cc29998b64c9c64ce2a36682d52a4419b317c Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Thu, 1 May 2025 10:48:43 +0100
Subject: [PATCH 0809/1497] rockcraft: 1.10.0 -> 1.12.0

---
 pkgs/by-name/ro/rockcraft/package.nix | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index 9ec578ffe1e6..be29de5fcc69 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -4,26 +4,29 @@
   fetchFromGitHub,
   dpkg,
   nix-update-script,
-  testers,
-  rockcraft,
-  cacert,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "rockcraft";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "rockcraft";
     rev = version;
-    hash = "sha256-LrUs6/YRQYU0o1kmNdBhafvDIyw91FnW8+9i0Jj5f+Y=";
+    hash = "sha256-yv+TGDSUBKJf5X+73Do9KrAcCodeBPqpIHgpYZslR3o=";
   };
 
   pyproject = true;
+
   build-system = with python3Packages; [ setuptools-scm ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail "setuptools~=80.8.0" "setuptools"
+  '';
+
   dependencies = with python3Packages; [
     craft-application
     craft-archives
@@ -32,6 +35,10 @@ python3Packages.buildPythonApplication rec {
     tabulate
   ];
 
+  pythonRelaxDeps = [
+    "craft-providers"
+  ];
+
   nativeCheckInputs =
     with python3Packages;
     [
@@ -40,32 +47,25 @@ python3Packages.buildPythonApplication rec {
       pytest-mock
       pytest-subprocess
       pytestCheckHook
+      versionCheckHook
       writableTmpDirAsHomeHook
     ]
     ++ [ dpkg ];
 
+  pytestFlagsArray = [ "tests/unit" ];
+
   disabledTests = [
     "test_project_all_platforms_invalid"
     "test_run_init_flask"
     "test_run_init_django"
+    # Mock is broken for Unix FHS reasons.
+    "test_run_pack_services"
   ];
 
-  disabledTestPaths = [
-    # Relies upon info in the .git directory which is stripped by fetchFromGitHub,
-    # and the version is overridden anyway.
-    "tests/integration/test_version.py"
-    # Tests non-Nix native packaging
-    "tests/integration/test_setuptools.py"
-  ];
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "SSL_CERT_FILE" ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = rockcraft;
-      command = "env SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt HOME=$(mktemp -d) rockcraft --version";
-      version = "rockcraft ${version}";
-    };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     mainProgram = "rockcraft";

From ab1efec921059810dc83dd3f19844d95e9b1ca5e Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 2 Jun 2025 10:48:02 +0100
Subject: [PATCH 0810/1497] charmcraft: override `craft-application` to use v4

`craft-application` has been bumped to version 5,
which both `snapcraft` and `rockcraft` have
updated to use, but `charmcraft` has yet to make
the transition.

This change essentially just overrides the single
dependency to the supported version just for this
package, thus unblocking the evolution of other
dependencies in nixpkgs.
---
 pkgs/by-name/ch/charmcraft/package.nix | 66 +++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index ec94207f8d56..da442fc12d58 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -1,12 +1,54 @@
 {
   lib,
   git,
-  python3Packages,
+  python3,
   fetchFromGitHub,
   nix-update-script,
+  testers,
+  charmcraft,
+  cacert,
 }:
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = self: super: {
+      craft-application = super.craft-application.overridePythonAttrs (old: rec {
+        version = "4.10.0";
+        src = fetchFromGitHub {
+          owner = "canonical";
+          repo = "craft-application";
+          tag = version;
+          hash = "sha256-9M49/XQuWwKuQqseleTeZYcrwd/S16lNCljvlVsoXbs=";
+        };
 
-python3Packages.buildPythonApplication rec {
+        patches = [ ];
+
+        postPatch = ''
+          substituteInPlace pyproject.toml \
+            --replace-fail "setuptools==75.8.0" "setuptools"
+
+          substituteInPlace craft_application/git/_git_repo.py \
+            --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
+        '';
+
+        preCheck = ''
+          export HOME=$(mktemp -d)
+
+          # Tests require access to /etc/os-release, which isn't accessible in
+          # the test environment, so create a fake file, and modify the code
+          # to look for it.
+          echo 'ID=nixos' > $HOME/os-release
+          echo 'NAME=NixOS' >> $HOME/os-release
+          echo 'VERSION_ID="24.05"' >> $HOME/os-release
+
+          substituteInPlace craft_application/util/platforms.py \
+            --replace-fail "os_utils.OsRelease()" "os_utils.OsRelease(os_release_file='$HOME/os-release')"
+        '';
+      });
+    };
+  };
+in
+python.pkgs.buildPythonApplication rec {
   pname = "charmcraft";
   version = "3.4.6";
 
@@ -23,7 +65,7 @@ python3Packages.buildPythonApplication rec {
     substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}"
   '';
 
-  dependencies = with python3Packages; [
+  dependencies = with python.pkgs; [
     craft-application
     craft-cli
     craft-parts
@@ -47,7 +89,7 @@ python3Packages.buildPythonApplication rec {
     urllib3
   ];
 
-  build-system = with python3Packages; [ setuptools-scm ];
+  build-system = with python.pkgs; [ setuptools-scm ];
 
   pythonRelaxDeps = [
     "urllib3"
@@ -57,7 +99,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs =
-    with python3Packages;
+    with python.pkgs;
     [
       freezegun
       hypothesis
@@ -69,7 +111,10 @@ python3Packages.buildPythonApplication rec {
       responses
       setuptools
     ]
-    ++ [ git ];
+    ++ [
+      cacert
+      git
+    ];
 
   preCheck = ''
     mkdir -p check-phase
@@ -85,7 +130,14 @@ python3Packages.buildPythonApplication rec {
     "test_read_charm_from_yaml_file_self_contained_success[full-platforms.yaml]"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = charmcraft;
+      command = "env SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt HOME=$(mktemp -d) charmcraft --version";
+      version = "charmcraft ${version}";
+    };
+  };
 
   meta = {
     mainProgram = "charmcraft";

From 8a5386533f1bf16efa01ce84564be8ef03f511ee Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 2 Jun 2025 21:05:06 +0100
Subject: [PATCH 0811/1497] charmcraft: 3.4.5 -> 3.5.0

---
 pkgs/by-name/ch/charmcraft/package.nix | 59 ++++++++------------------
 1 file changed, 17 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index da442fc12d58..8d39d10f6837 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -1,19 +1,20 @@
 {
   lib,
-  git,
+  gitMinimal,
   python3,
   fetchFromGitHub,
   nix-update-script,
-  testers,
-  charmcraft,
   cacert,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 let
+  version = "4.10.0";
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
-      craft-application = super.craft-application.overridePythonAttrs (old: rec {
-        version = "4.10.0";
+      craft-application = super.craft-application.overridePythonAttrs (old: {
+        inherit version;
         src = fetchFromGitHub {
           owner = "canonical";
           repo = "craft-application";
@@ -21,28 +22,9 @@ let
           hash = "sha256-9M49/XQuWwKuQqseleTeZYcrwd/S16lNCljvlVsoXbs=";
         };
 
-        patches = [ ];
-
         postPatch = ''
-          substituteInPlace pyproject.toml \
-            --replace-fail "setuptools==75.8.0" "setuptools"
-
-          substituteInPlace craft_application/git/_git_repo.py \
-            --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
-        '';
-
-        preCheck = ''
-          export HOME=$(mktemp -d)
-
-          # Tests require access to /etc/os-release, which isn't accessible in
-          # the test environment, so create a fake file, and modify the code
-          # to look for it.
-          echo 'ID=nixos' > $HOME/os-release
-          echo 'NAME=NixOS' >> $HOME/os-release
-          echo 'VERSION_ID="24.05"' >> $HOME/os-release
-
-          substituteInPlace craft_application/util/platforms.py \
-            --replace-fail "os_utils.OsRelease()" "os_utils.OsRelease(os_release_file='$HOME/os-release')"
+          substituteInPlace pyproject.toml --replace-fail "setuptools==75.8.0" "setuptools"
+          substituteInPlace craft_application/git/_git_repo.py --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
         '';
       });
     };
@@ -50,7 +32,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "charmcraft";
-  version = "3.4.6";
+  version = "3.5.0";
 
   pyproject = true;
 
@@ -58,7 +40,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "canonical";
     repo = "charmcraft";
     tag = version;
-    hash = "sha256-i7XhsVmeO3fzAWCQ1v9J/dv4oSdN00svauIColQcj9A=";
+    hash = "sha256-NIOfjd4r9mDP0x1IpIVJlU+Aza0a17bc3jDxtInrf4A=";
   };
 
   postPatch = ''
@@ -113,14 +95,11 @@ python.pkgs.buildPythonApplication rec {
     ]
     ++ [
       cacert
-      git
+      gitMinimal
+      versionCheckHook
+      writableTmpDirAsHomeHook
     ];
 
-  preCheck = ''
-    mkdir -p check-phase
-    export HOME="$(pwd)/check-phase"
-  '';
-
   pytestFlagsArray = [ "tests/unit" ];
 
   disabledTests = [
@@ -130,14 +109,10 @@ python.pkgs.buildPythonApplication rec {
     "test_read_charm_from_yaml_file_self_contained_success[full-platforms.yaml]"
   ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = charmcraft;
-      command = "env SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt HOME=$(mktemp -d) charmcraft --version";
-      version = "charmcraft ${version}";
-    };
-  };
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "SSL_CERT_FILE" ];
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     mainProgram = "charmcraft";

From a9491cd4ac9cd2489454dc3674cb1941d758e016 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 3 Jun 2025 19:50:35 +0800
Subject: [PATCH 0812/1497] dfilemanager: drop

---
 pkgs/by-name/df/dfilemanager/package.nix | 42 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/df/dfilemanager/package.nix

diff --git a/pkgs/by-name/df/dfilemanager/package.nix b/pkgs/by-name/df/dfilemanager/package.nix
deleted file mode 100644
index 74d65f0ecc16..000000000000
--- a/pkgs/by-name/df/dfilemanager/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-  file,
-}:
-
-stdenv.mkDerivation {
-  pname = "dfilemanager";
-  version = "unstable-2021-02-20";
-
-  src = fetchFromGitHub {
-    owner = "probonopd";
-    repo = "dfilemanager";
-    rev = "61179500a92575e05cf9a71d401c388726bfd73d";
-    hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qttools
-    libsForQt5.solid
-    file
-  ];
-
-  cmakeFlags = [ "-DQT5BUILD=true" ];
-
-  meta = {
-    homepage = "https://github.com/probonopd/dfilemanager";
-    description = "File manager written in Qt/C++";
-    mainProgram = "dfm";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.unix;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 761f9ec1c342..eae74be595b4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -529,6 +529,7 @@ mapAliases {
 
   demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
   devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27
+  dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
   dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07

From 5c453a33dd17f33cbbf787c1ac90453237084c9d Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 3 Jun 2025 20:29:16 +0800
Subject: [PATCH 0813/1497] qv2ray: drop

---
 .../networking/qv2ray/default.nix             | 90 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 pkgs/applications/networking/qv2ray/default.nix

diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix
deleted file mode 100644
index 2e570937f2d7..000000000000
--- a/pkgs/applications/networking/qv2ray/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  lib,
-  stdenv,
-  mkDerivation,
-  fetchFromGitHub,
-  symlinkJoin,
-  qttools,
-  cmake,
-  grpc,
-  protobuf_21,
-  openssl,
-  pkg-config,
-  c-ares,
-  libGL,
-  zlib,
-  curl,
-  v2ray,
-  v2ray-geoip,
-  v2ray-domain-list-community,
-  assets ? [
-    v2ray-geoip
-    v2ray-domain-list-community
-  ],
-}:
-
-mkDerivation rec {
-  pname = "qv2ray";
-  version = "unstable-2023-07-11";
-
-  src = fetchFromGitHub {
-    owner = "Qv2ray";
-    repo = "Qv2ray";
-    rev = "b3080564809dd8aef864a54ca1b79f0984fe986b";
-    hash = "sha256-LwBjuX5x3kQcdEfPLEirWpkMqOigkhNoh/VNmBfPAzw=";
-    fetchSubmodules = true;
-  };
-
-  postPatch = lib.optionals stdenv.hostPlatform.isDarwin ''
-    substituteInPlace cmake/platforms/macos.cmake \
-      --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt
-  '';
-
-  assetsDrv = symlinkJoin {
-    name = "v2ray-assets";
-    paths = assets;
-  };
-
-  cmakeFlags = [
-    "-DQV2RAY_DISABLE_AUTO_UPDATE=on"
-    "-DQV2RAY_USE_V5_CORE=on"
-    "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang"
-    "-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'"
-    "-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'"
-  ];
-
-  preConfigure = ''
-    export _QV2RAY_BUILD_INFO_="Qv2ray Nixpkgs"
-    export _QV2RAY_BUILD_EXTRA_INFO_="(Nixpkgs build) nixpkgs"
-  '';
-
-  buildInputs = [
-    libGL
-    zlib
-    grpc
-    protobuf_21
-    openssl
-    c-ares
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qttools
-    curl
-  ];
-
-  meta = with lib; {
-    description = "GUI frontend to v2ray";
-    homepage = "https://github.com/Qv2ray/Qv2ray";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
-      poscat
-      rewine
-    ];
-    platforms = platforms.all;
-    # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25
-    broken = stdenv.hostPlatform.isDarwin;
-    mainProgram = "qv2ray";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 761f9ec1c342..ea7d4b8ab083 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1640,6 +1640,7 @@ mapAliases {
   quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   quickserve = throw "'quickserve' has been removed because its upstream is unavailable"; # Added 2025-05-10
+  qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
   qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
 
   ### R ###
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4db4c33be0..a1de21d47472 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9485,8 +9485,6 @@ with pkgs;
     }
   );
 
-  qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { };
-
   readline = readline82;
 
   readline70 = callPackage ../development/libraries/readline/7.0.nix { };

From f369b2b8248f8c9284428c6a8947aab541285399 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 17 May 2025 12:58:07 +0200
Subject: [PATCH 0814/1497] mopidy: exclude pipewire on darwin

---
 pkgs/applications/audio/mopidy/mopidy.nix | 48 ++++++++++++-----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index 6cb96daea52b..d839daaaa437 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -24,30 +24,32 @@ pythonPackages.buildPythonApplication rec {
 
   nativeBuildInputs = [ wrapGAppsNoGuiHook ];
 
-  buildInputs = with gst_all_1; [
-    glib-networking
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-    # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
-    (gst-plugins-rs.overrideAttrs (
-      newAttrs: oldAttrs: {
-        cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
-          vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
-            inherit (newAttrs) patches;
-            outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
-          };
-        });
+  buildInputs =
+    with gst_all_1;
+    [
+      glib-networking
+      gst-plugins-bad
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3)
+      (gst-plugins-rs.overrideAttrs (
+        newAttrs: oldAttrs: {
+          cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
+            vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
+              inherit (newAttrs) patches;
+              outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
+            };
+          });
 
-        # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
-        patches = oldAttrs.patches or [ ] ++ [
-          ./spotify-access-token-auth.patch
-        ];
-      }
-    ))
-    pipewire
-  ];
+          # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/
+          patches = oldAttrs.patches or [ ] ++ [
+            ./spotify-access-token-auth.patch
+          ];
+        }
+      ))
+    ]
+    ++ lib.optional (!stdenv.hostPlatform.isDarwin) pipewire;
 
   propagatedBuildInputs =
     [ gobject-introspection ]

From efcafec80599e0f6102c77b6400ca30458bb1940 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 3 Jun 2025 13:31:23 +0100
Subject: [PATCH 0815/1497] icloudpd: 1.27.5 -> 1.28.0

---
 pkgs/by-name/ic/icloudpd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index b22418b0158d..ef518266d446 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.27.5";
+  version = "1.28.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     tag = "v${version}";
-    hash = "sha256-7D/oyX5gBvybelFRsZAmr5xGRB6G7uD2V8ZTGFpbHGg=";
+    hash = "sha256-t2S/WfjNdCgCqaoXtmIu6Gb8tsccRw1Jn8iyjbSukzY=";
   };
 
   pythonRelaxDeps = true;

From 88a0e9bc989fa0be57327a05231cfc97e1cf7ee5 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 3 Jun 2025 13:33:48 +0100
Subject: [PATCH 0816/1497] google-chrome: 137.0.7151.55 -> 137.0.7151.68

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index eb061b7902c4..22e07fc21e39 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.55";
+    version = "137.0.7151.68";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-Q4zf60OQN/2NRozssVrnmbYWGRm05Mt2/6LozfENzgM=";
+      hash = "sha256-TBJ6XOnxrP/+Gnd2Y3/aYbRG5N+b7dKS/u80ZK4E+MM=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -276,11 +276,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "137.0.7151.56";
+    version = "137.0.7151.69";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acps6il5fco5kfidgoaidec3sdha_137.0.7151.56/GoogleChrome-137.0.7151.56.dmg";
-      hash = "sha256-nFk2qg8+9gipnG+4u1sRO4Uq5Iv4TVvxaTETHzF+huw=";
+      url = "http://dl.google.com/release2/chrome/aciew3ymglq2kjdorwr226xwu5iq_137.0.7151.69/GoogleChrome-137.0.7151.69.dmg";
+      hash = "sha256-5WU8ZD/+uyNsAhPR0fSR9FkFleKMakUduErm49rMRcI=";
     };
 
     dontPatch = true;

From 864f68b39cb1ed5bc8a067278e8a0dc3e35d0571 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 12:39:22 +0000
Subject: [PATCH 0817/1497] cargo-workspaces: 0.3.6 -> 0.4.0

---
 pkgs/by-name/ca/cargo-workspaces/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index 59befd9ae071..b22bbdc30083 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -10,15 +10,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-workspaces";
-  version = "0.3.6";
+  version = "0.4.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-JqLKFVM/EnVAPF7erINpHdaaDG+g2nbB0iE/hB1gml8=";
+    hash = "sha256-kBjiRPEWHKhX6vTB48TjKYhlpaiieNzE1l0PjaLTL4k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EfTcbgvOQ2KgUpu4+QBUVTaz/ToH9FuMHlXMpJN1BK4=";
+  cargoHash = "sha256-vHLc738wFunyUDu6/B5foTE2/wExd2Yxcl638iqOWdw=";
 
   nativeBuildInputs = [
     pkg-config

From 06ca99e301ebdd332f72576d731edc193d8b6913 Mon Sep 17 00:00:00 2001
From: Mattias Cockburn Chaparro <mattias.cockburn_chaparro@stackit.cloud>
Date: Mon, 26 May 2025 09:44:17 +0200
Subject: [PATCH 0818/1497] zarf: 0.54.0 -> 0.55.6

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/by-name/za/zarf/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index ad9d25b60d3a..e000d9ae9eef 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.54.0";
+  version = "0.55.6";
 
   src = fetchFromGitHub {
     owner = "zarf-dev";
     repo = "zarf";
-    rev = "v${version}";
-    hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs=";
+    tag = "v${version}";
+    hash = "sha256-UoTbw5QW9HpGDWHOC0Wv/4FaTKWEztHRp/XAOatqqjs=";
   };
 
-  vendorHash = "sha256-Cz+w0tOEamCxf61hvQ03X/kXPY+qrmdBN8s26lr/wZ8=";
+  vendorHash = "sha256-AJd/QVL+ZoLORqeYrC/WkRtggYd3nhg8AEZ9Gb1j2tQ=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];
@@ -25,6 +25,7 @@ buildGoModule rec {
   preBuild = ''
     mkdir -p build/ui
     touch build/ui/index.html
+    rm -rf hack/schema
   '';
 
   doCheck = false;
@@ -33,11 +34,11 @@ buildGoModule rec {
     "-s"
     "-w"
     "-X"
-    "github.com/zarf-dev/zarf/src/config.CLIVersion=${src.rev}"
+    "github.com/zarf-dev/zarf/src/config.CLIVersion=${src.tag}"
     "-X"
-    "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}"
+    "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.tag}"
     "-X"
-    "k8s.io/component-base/version.gitCommit=${src.rev}"
+    "k8s.io/component-base/version.gitCommit=${src.tag}"
     "-X"
     "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z"
   ];
@@ -45,9 +46,9 @@ buildGoModule rec {
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     export K9S_LOGS_DIR=$(mktemp -d)
     installShellCompletion --cmd zarf \
-      --bash <($out/bin/zarf completion --no-log-file bash) \
-      --fish <($out/bin/zarf completion --no-log-file fish) \
-      --zsh  <($out/bin/zarf completion --no-log-file zsh)
+      --bash <($out/bin/zarf completion bash) \
+      --fish <($out/bin/zarf completion fish) \
+      --zsh  <($out/bin/zarf completion zsh)
   '';
 
   meta = with lib; {
@@ -55,6 +56,8 @@ buildGoModule rec {
     mainProgram = "zarf";
     homepage = "https://zarf.dev";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ragingpastry ];
+    maintainers = with maintainers; [
+      ragingpastry
+    ];
   };
 }

From aa386c1cb4cdb76773a72586c93f9d59ba76f45d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 12:41:32 +0000
Subject: [PATCH 0819/1497] kakoune-lsp: 18.1.3 -> 18.2.0

---
 pkgs/by-name/ka/kakoune-lsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix
index bbbe29f0fd80..6708b0cdf48d 100644
--- a/pkgs/by-name/ka/kakoune-lsp/package.nix
+++ b/pkgs/by-name/ka/kakoune-lsp/package.nix
@@ -8,19 +8,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kakoune-lsp";
-  version = "18.1.3";
+  version = "18.2.0";
 
   src = fetchFromGitHub {
     owner = "kakoune-lsp";
     repo = "kakoune-lsp";
     rev = "v${version}";
-    hash = "sha256-2jD0meehUNGvmywOY4D9CwP1qswD7QCPlctLBjngzvE=";
+    hash = "sha256-71XnCHAXOcrXu0xizwdwJPkhnmfEjmVP++6mxmTcnM4=";
   };
 
   patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-fb6RDcOLtkrUqw+BX2oa43d84BGF8IA2HxhdGgB94iU=";
+  cargoHash = "sha256-cr/fvV2JjjfLdsT0Ej2aNoNKDLqmJsOOREcwxWpjfE0=";
 
   meta = {
     description = "Kakoune Language Server Protocol Client";

From d2225c5ed3870504c32500ca3ed10c16125a1892 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 12:53:02 +0000
Subject: [PATCH 0820/1497] i2p: 2.8.2 -> 2.9.0

---
 pkgs/by-name/i2/i2p/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix
index 8df086cdfef4..92c44e1f6222 100644
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "i2p";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchzip {
     urls =
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
         "https://files.i2p-projekt.de/"
         "https://download.i2p2.no/releases/"
       ]);
-    hash = "sha256-GQhZrjguihc3FyWt5MUC61+pTvaB3ij2h+SQmasJtUI=";
+    hash = "sha256-8gnCjSBcTz8KxNPo9KUnnn2IWfCswA/sGDkqzOjNX34=";
   };
 
   strictDeps = true;

From 51104bca6e7b853662b31699baf526a57da5f2a7 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 2 Jun 2025 08:42:56 +0200
Subject: [PATCH 0821/1497] treewide: remove with lib Part 1

---
 pkgs/applications/audio/librespot/default.nix          |  6 +++---
 pkgs/applications/audio/mixxx/default.nix              |  8 ++++----
 pkgs/applications/audio/mopidy/musicbox-webclient.nix  |  6 +++---
 pkgs/applications/audio/samplebrain/default.nix        |  8 ++++----
 pkgs/applications/audio/strawberry/default.nix         |  8 ++++----
 pkgs/applications/blockchains/bitcoin-abc/default.nix  |  8 ++++----
 .../applications/blockchains/bitcoin-knots/default.nix |  8 ++++----
 pkgs/applications/editors/qxmledit/default.nix         |  6 +++---
 pkgs/applications/editors/your-editor/default.nix      |  8 ++++----
 pkgs/applications/gis/qmapshack/default.nix            |  8 ++++----
 pkgs/applications/graphics/drawio/default.nix          |  6 +++---
 pkgs/applications/graphics/xournalpp/default.nix       |  8 ++++----
 pkgs/applications/misc/bitwarden-menu/default.nix      |  6 +++---
 pkgs/applications/misc/heimer/default.nix              |  8 ++++----
 pkgs/applications/misc/klayout/default.nix             |  8 ++++----
 pkgs/applications/misc/opentrack/default.nix           |  6 +++---
 pkgs/applications/misc/synergy/default.nix             |  8 ++++----
 pkgs/applications/misc/valentina/default.nix           |  8 ++++----
 pkgs/applications/misc/whalebird/default.nix           |  6 +++---
 .../applications/networking/cluster/calico/default.nix |  8 ++++----
 pkgs/applications/networking/cluster/kuma/default.nix  |  6 +++---
 pkgs/applications/networking/cluster/rke2/builder.nix  | 10 +++++-----
 .../networking/cluster/sonobuoy/default.nix            |  6 +++---
 .../networking/cluster/terraform/default.nix           |  6 +++---
 pkgs/applications/networking/compactor/default.nix     |  8 ++++----
 .../telegram/kotatogram-desktop/default.nix            |  8 ++++----
 .../networking/instant-messengers/twinkle/default.nix  |  8 ++++----
 pkgs/applications/networking/maestral-qt/default.nix   |  8 ++++----
 .../networking/mailreaders/notmuch/default.nix         | 10 +++++-----
 .../networking/mailreaders/thunderbird-bin/default.nix |  6 +++---
 .../networking/mailreaders/thunderbird/packages.nix    |  8 ++++----
 pkgs/applications/networking/netmaker/default.nix      |  6 +++---
 .../networking/newsreaders/quiterss/default.nix        |  8 ++++----
 .../networking/sniffers/wireshark/default.nix          |  8 ++++----
 pkgs/applications/networking/sync/rclone/default.nix   |  6 +++---
 pkgs/applications/networking/wgnord/default.nix        |  6 +++---
 pkgs/applications/office/kbibtex/default.nix           |  8 ++++----
 .../science/astronomy/celestia/default.nix             |  8 ++++----
 pkgs/applications/science/biology/nest/default.nix     |  8 ++++----
 .../applications/science/electronics/gerbv/default.nix |  8 ++++----
 pkgs/applications/science/misc/sasview/default.nix     |  6 +++---
 .../version-management/git-machete/default.nix         |  6 +++---
 pkgs/applications/video/mpv/scripts/mpris.nix          |  8 ++++----
 pkgs/applications/video/mpv/scripts/thumbnail.nix      |  8 ++++----
 .../obs-studio/plugins/obs-multi-rtmp/default.nix      |  6 +++---
 .../video/obs-studio/plugins/obs-vaapi/default.nix     |  6 +++---
 pkgs/applications/virtualization/lima/default.nix      |  6 +++---
 .../window-managers/phosh/phosh-mobile-settings.nix    |  8 ++++----
 pkgs/by-name/ac/accerciser/package.nix                 |  8 ++++----
 pkgs/by-name/ac/acme-sh/package.nix                    |  4 ++--
 pkgs/by-name/ad/adalanche/package.nix                  |  6 +++---
 pkgs/by-name/ad/adbtuifm/package.nix                   |  8 ++++----
 pkgs/by-name/ad/adreaper/package.nix                   |  6 +++---
 pkgs/by-name/ad/adriconf/package.nix                   |  8 ++++----
 pkgs/by-name/ad/advancecomp/package.nix                |  8 ++++----
 pkgs/by-name/ad/adwaita-icon-theme/package.nix         |  8 ++++----
 pkgs/by-name/ai/aide/package.nix                       |  8 ++++----
 pkgs/by-name/ai/aiodnsbrute/package.nix                |  6 +++---
 pkgs/by-name/ai/airgeddon/package.nix                  |  8 ++++----
 pkgs/by-name/ai/airlift/package.nix                    |  6 +++---
 pkgs/by-name/ai/airscan/package.nix                    |  6 +++---
 pkgs/by-name/al/alacritty/package.nix                  |  8 ++++----
 pkgs/by-name/al/alejandra/package.nix                  |  6 +++---
 pkgs/by-name/al/ali/package.nix                        |  8 ++++----
 pkgs/by-name/al/alienarena/package.nix                 |  8 ++++----
 pkgs/by-name/al/alterx/package.nix                     |  6 +++---
 pkgs/by-name/al/alvr/package.nix                       |  8 ++++----
 pkgs/by-name/am/amass/package.nix                      |  6 +++---
 pkgs/by-name/am/amazon-ssm-agent/package.nix           |  8 ++++----
 pkgs/by-name/am/ameba/package.nix                      |  6 +++---
 pkgs/by-name/am/amfora/package.nix                     |  6 +++---
 pkgs/by-name/ap/apachetomcatscanner/package.nix        |  6 +++---
 pkgs/by-name/ap/aperture/package.nix                   |  6 +++---
 pkgs/by-name/ap/apkeep/package.nix                     |  6 +++---
 pkgs/by-name/ap/apkleaks/package.nix                   |  6 +++---
 pkgs/by-name/ap/apktool/package.nix                    | 10 +++++-----
 pkgs/by-name/ar/arduino-ide/package.nix                |  6 +++---
 pkgs/by-name/ar/arduino-language-server/package.nix    |  6 +++---
 pkgs/by-name/ar/argc/package.nix                       |  6 +++---
 pkgs/by-name/ar/argo-workflows/package.nix             |  8 ++++----
 pkgs/by-name/ar/argocd-vault-plugin/package.nix        |  6 +++---
 pkgs/by-name/ar/aria2/package.nix                      |  8 ++++----
 pkgs/by-name/ar/arjun/package.nix                      |  6 +++---
 pkgs/by-name/ar/artem/package.nix                      |  6 +++---
 pkgs/by-name/as/askalono/package.nix                   |  6 +++---
 pkgs/by-name/as/asn/package.nix                        |  6 +++---
 pkgs/by-name/as/asnmap/package.nix                     |  6 +++---
 pkgs/by-name/as/assh/package.nix                       |  8 ++++----
 pkgs/by-name/aw/await/package.nix                      |  8 ++++----
 pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix     |  6 +++---
 pkgs/by-name/aw/aws-iam-authenticator/package.nix      |  6 +++---
 pkgs/by-name/aw/aws-sam-cli/package.nix                |  6 +++---
 pkgs/by-name/aw/awscli2/package.nix                    |  6 +++---
 pkgs/by-name/aw/awsebcli/package.nix                   |  6 +++---
 pkgs/by-name/aw/awslimitchecker/package.nix            |  6 +++---
 pkgs/by-name/ba/baboossh/package.nix                   |  6 +++---
 pkgs/by-name/ba/badrobot/package.nix                   |  6 +++---
 pkgs/by-name/ba/bambu-studio/package.nix               |  8 ++++----
 pkgs/by-name/ba/bat/package.nix                        |  6 +++---
 pkgs/by-name/ba/batmon/package.nix                     |  8 ++++----
 pkgs/by-name/ba/bazel-buildtools/package.nix           |  8 ++++----
 pkgs/by-name/ba/bazel-remote/package.nix               |  6 +++---
 pkgs/by-name/ba/bazelisk/package.nix                   |  6 +++---
 pkgs/by-name/be/bearer/package.nix                     |  6 +++---
 pkgs/by-name/be/beatprints/package.nix                 |  8 ++++----
 pkgs/by-name/be/beluga/package.nix                     |  8 ++++----
 pkgs/by-name/bi/bigquery-emulator/package.nix          |  6 +++---
 pkgs/by-name/bi/biodiff/package.nix                    |  6 +++---
 pkgs/by-name/bi/bird-lg/package.nix                    |  6 +++---
 pkgs/by-name/bi/bird2/package.nix                      |  8 ++++----
 pkgs/by-name/bi/bird3/package.nix                      |  8 ++++----
 pkgs/by-name/bl/blackbox-terminal/package.nix          |  8 ++++----
 pkgs/by-name/bl/blueman/package.nix                    |  8 ++++----
 pkgs/by-name/bl/bluetuith/package.nix                  | 10 +++++-----
 pkgs/by-name/bl/bluewalker/package.nix                 |  8 ++++----
 pkgs/by-name/bo/bom/package.nix                        |  6 +++---
 pkgs/by-name/bo/bomber-go/package.nix                  |  6 +++---
 pkgs/by-name/bo/boofuzz/package.nix                    |  6 +++---
 pkgs/by-name/bo/bosh-cli/package.nix                   |  6 +++---
 pkgs/by-name/bo/boundary/package.nix                   | 10 +++++-----
 pkgs/by-name/br/breads-ad/package.nix                  |  6 +++---
 pkgs/by-name/br/brev-cli/package.nix                   |  6 +++---
 pkgs/by-name/br/browsr/package.nix                     |  6 +++---
 pkgs/by-name/ca/cadaver/package.nix                    |  8 ++++----
 pkgs/by-name/ca/caerbannog/package.nix                 |  6 +++---
 pkgs/by-name/ca/caf/package.nix                        |  8 ++++----
 pkgs/by-name/ca/caffeine-ng/package.nix                |  8 ++++----
 pkgs/by-name/ca/calcurse/package.nix                   |  8 ++++----
 pkgs/by-name/ca/cameradar/package.nix                  |  6 +++---
 pkgs/by-name/ca/cansina/package.nix                    |  6 +++---
 pkgs/by-name/ca/cargo-about/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-audit/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-binstall/package.nix             |  6 +++---
 pkgs/by-name/ca/cargo-binutils/package.nix             |  6 +++---
 pkgs/by-name/ca/cargo-c/package.nix                    |  6 +++---
 pkgs/by-name/ca/cargo-clone/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-cross/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-deadlinks/package.nix            |  6 +++---
 pkgs/by-name/ca/cargo-deny/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-diet/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-docset/package.nix               |  6 +++---
 pkgs/by-name/ca/cargo-edit/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-expand/package.nix               |  6 +++---
 pkgs/by-name/ca/cargo-generate/package.nix             |  6 +++---
 pkgs/by-name/ca/cargo-hack/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-insta/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-leptos/package.nix               |  6 +++---
 pkgs/by-name/ca/cargo-lock/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-make/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-outdated/package.nix             |  6 +++---
 pkgs/by-name/ca/cargo-public-api/package.nix           |  6 +++---
 pkgs/by-name/ca/cargo-rdme/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-release/package.nix              |  6 +++---
 pkgs/by-name/ca/cargo-run-bin/package.nix              |  6 +++---
 pkgs/by-name/ca/cargo-show-asm/package.nix             |  6 +++---
 pkgs/by-name/ca/cargo-sort/package.nix                 |  6 +++---
 pkgs/by-name/ca/cargo-spellcheck/package.nix           |  6 +++---
 pkgs/by-name/ca/cargo-sync-readme/package.nix          |  6 +++---
 pkgs/by-name/ca/cargo-tally/package.nix                |  6 +++---
 pkgs/by-name/ca/cargo-toml-lint/package.nix            |  6 +++---
 pkgs/by-name/ca/cargo-ui/package.nix                   |  6 +++---
 pkgs/by-name/ca/cargo-update/package.nix               |  6 +++---
 pkgs/by-name/ca/cargo-workspaces/package.nix           |  6 +++---
 pkgs/by-name/ca/cargo-zigbuild/package.nix             |  6 +++---
 pkgs/by-name/ca/cariddi/package.nix                    |  6 +++---
 pkgs/by-name/ca/cascadia-code/package.nix              | 10 +++++-----
 pkgs/by-name/cd/cdecrypt/package.nix                   |  8 ++++----
 pkgs/by-name/cd/cdk-go/package.nix                     |  6 +++---
 pkgs/by-name/cd/cdncheck/package.nix                   |  6 +++---
 pkgs/by-name/ce/cent/package.nix                       |  6 +++---
 pkgs/by-name/ce/cero/package.nix                       |  6 +++---
 pkgs/by-name/ch/chain-bench/package.nix                |  6 +++---
 pkgs/by-name/ch/changelogger/package.nix               |  6 +++---
 pkgs/by-name/ch/changie/package.nix                    |  6 +++---
 pkgs/by-name/ch/chaos/package.nix                      |  6 +++---
 pkgs/by-name/ch/charm-freeze/package.nix               |  6 +++---
 pkgs/by-name/ch/charm/package.nix                      |  6 +++---
 pkgs/by-name/ch/checkip/package.nix                    |  6 +++---
 pkgs/by-name/ch/checkmate/package.nix                  |  6 +++---
 pkgs/by-name/ch/checkov/package.nix                    |  6 +++---
 pkgs/by-name/ch/checkpwn/package.nix                   |  6 +++---
 pkgs/by-name/ch/checkstyle/package.nix                 |  8 ++++----
 pkgs/by-name/ch/cheese/package.nix                     |  8 ++++----
 pkgs/by-name/ch/cherrybomb/package.nix                 |  6 +++---
 pkgs/by-name/ch/chisel/package.nix                     |  6 +++---
 pkgs/by-name/cl/clair/package.nix                      |  6 +++---
 pkgs/by-name/cl/clairvoyance/package.nix               |  6 +++---
 pkgs/by-name/cl/clever-tools/package.nix               |  6 +++---
 pkgs/by-name/cl/clj-kondo/package.nix                  |  8 ++++----
 pkgs/by-name/cl/cljfmt/package.nix                     |  8 ++++----
 pkgs/by-name/cl/cloud-custodian/package.nix            |  6 +++---
 pkgs/by-name/cl/cloud-hypervisor/package.nix           |  6 +++---
 pkgs/by-name/cl/cloud-nuke/package.nix                 |  6 +++---
 pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix     |  6 +++---
 pkgs/by-name/cl/cloudflared/package.nix                |  8 ++++----
 pkgs/by-name/cl/cloudfox/package.nix                   |  6 +++---
 pkgs/by-name/cl/cloudhunter/package.nix                |  6 +++---
 pkgs/by-name/cl/cloudlist/package.nix                  |  6 +++---
 pkgs/by-name/cl/cloudrecon/package.nix                 |  6 +++---
 pkgs/by-name/cl/cloudsmith-cli/package.nix             |  8 ++++----
 pkgs/by-name/cm/cmark-gfm/package.nix                  |  8 ++++----
 pkgs/by-name/cm/cmark/package.nix                      |  8 ++++----
 pkgs/by-name/cn/cnquery/package.nix                    |  6 +++---
 pkgs/by-name/co/cobra-cli/package.nix                  |  6 +++---
 pkgs/by-name/co/codeberg-pages/package.nix             |  6 +++---
 pkgs/by-name/co/codechecker/package.nix                |  8 ++++----
 pkgs/by-name/co/coercer/package.nix                    |  6 +++---
 pkgs/by-name/co/coinlive/package.nix                   |  6 +++---
 pkgs/by-name/co/commitmsgfmt/package.nix               |  6 +++---
 pkgs/by-name/co/commix/package.nix                     |  6 +++---
 pkgs/by-name/co/comodoro/package.nix                   |  6 +++---
 pkgs/by-name/co/comrak/package.nix                     |  6 +++---
 pkgs/by-name/co/conkeyscan/package.nix                 |  6 +++---
 pkgs/by-name/co/conpass/package.nix                    |  6 +++---
 pkgs/by-name/co/consul/package.nix                     |  8 ++++----
 pkgs/by-name/co/container2wasm/package.nix             |  6 +++---
 pkgs/by-name/co/copilot-cli/package.nix                |  6 +++---
 pkgs/by-name/co/coreth/package.nix                     |  6 +++---
 pkgs/by-name/co/coturn/package.nix                     |  8 ++++----
 pkgs/by-name/co/cozette/package.nix                    |  8 ++++----
 pkgs/by-name/cp/cpufetch/package.nix                   |  6 +++---
 pkgs/by-name/cr/crabz/package.nix                      |  6 +++---
 pkgs/by-name/cr/crcpp/package.nix                      |  8 ++++----
 pkgs/by-name/cr/crossplane-cli/package.nix             |  6 +++---
 pkgs/by-name/cr/crosswords/package.nix                 |  8 ++++----
 pkgs/by-name/cr/crowdsec/package.nix                   |  6 +++---
 pkgs/by-name/cr/crun/package.nix                       |  8 ++++----
 pkgs/by-name/cr/cryfs/package.nix                      |  8 ++++----
 pkgs/by-name/cy/cyberchef/package.nix                  |  8 ++++----
 pkgs/by-name/cy/cyclonedx-cli/package.nix              | 10 +++++-----
 pkgs/by-name/da/dalfox/package.nix                     |  6 +++---
 pkgs/by-name/da/darkstat/package.nix                   |  6 +++---
 pkgs/by-name/da/darktile/package.nix                   |  8 ++++----
 pkgs/by-name/da/das/package.nix                        |  6 +++---
 pkgs/by-name/da/dasel/package.nix                      |  6 +++---
 pkgs/by-name/da/databricks-sql-cli/package.nix         |  6 +++---
 pkgs/by-name/da/datree/package.nix                     |  6 +++---
 pkgs/by-name/da/dav1d/package.nix                      |  8 ++++----
 pkgs/by-name/db/dbmate/package.nix                     |  6 +++---
 pkgs/by-name/de/debootstrap/package.nix                |  8 ++++----
 pkgs/by-name/de/deckmaster/package.nix                 |  8 ++++----
 pkgs/by-name/de/delta/package.nix                      |  6 +++---
 pkgs/by-name/de/denaro/package.nix                     |  8 ++++----
 pkgs/by-name/de/dendrite/package.nix                   |  8 ++++----
 pkgs/by-name/de/dep-scan/package.nix                   |  6 +++---
 pkgs/by-name/de/dependency-track-exporter/package.nix  |  6 +++---
 pkgs/by-name/de/depotdownloader/package.nix            |  6 +++---
 pkgs/by-name/de/desync/package.nix                     |  6 +++---
 pkgs/by-name/de/devhelp/package.nix                    |  8 ++++----
 pkgs/by-name/de/devpi-client/package.nix               |  6 +++---
 pkgs/by-name/de/devspace/package.nix                   |  6 +++---
 pkgs/by-name/di/diffoscope/package.nix                 |  8 ++++----
 pkgs/by-name/di/dinish/package.nix                     |  8 ++++----
 pkgs/by-name/di/discocss/package.nix                   |  8 ++++----
 pkgs/by-name/di/discordchatexporter-cli/package.nix    |  8 ++++----
 .../by-name/di/discordchatexporter-desktop/package.nix |  6 +++---
 pkgs/by-name/di/distribution/package.nix               |  8 ++++----
 pkgs/by-name/di/dive/package.nix                       |  6 +++---
 .../do/docker-compose-language-service/package.nix     |  6 +++---
 pkgs/by-name/do/docker-credential-gcr/package.nix      |  6 +++---
 pkgs/by-name/do/docker-slim/package.nix                |  6 +++---
 pkgs/by-name/do/dockle/package.nix                     |  6 +++---
 pkgs/by-name/do/dontgo403/package.nix                  |  6 +++---
 pkgs/by-name/do/dooit/package.nix                      |  6 +++---
 pkgs/by-name/do/doq/package.nix                        |  6 +++---
 pkgs/by-name/do/dos2unix/package.nix                   |  8 ++++----
 pkgs/by-name/do/dotool/package.nix                     |  6 +++---
 pkgs/by-name/dy/dynamips/package.nix                   |  8 ++++----
 pkgs/by-name/dy/dyndnsc/package.nix                    |  8 ++++----
 pkgs/by-name/ec/ec2stepshell/package.nix               |  6 +++---
 pkgs/by-name/ec/ecs-agent/package.nix                  |  8 ++++----
 pkgs/by-name/ek/eksctl/package.nix                     |  6 +++---
 pkgs/by-name/el/elan/package.nix                       |  6 +++---
 pkgs/by-name/el/elasticsearch-curator/package.nix      |  6 +++---
 pkgs/by-name/el/elfinfo/package.nix                    |  6 +++---
 pkgs/by-name/el/ell/package.nix                        |  8 ++++----
 pkgs/by-name/en/enc/package.nix                        |  6 +++---
 pkgs/by-name/en/endlessh-go/package.nix                |  6 +++---
 pkgs/by-name/en/endlessh/package.nix                   |  8 ++++----
 pkgs/by-name/en/engelsystem/package.nix                |  8 ++++----
 pkgs/by-name/en/entr/package.nix                       |  8 ++++----
 pkgs/by-name/en/enum4linux-ng/package.nix              |  6 +++---
 pkgs/by-name/en/enumerepo/package.nix                  |  6 +++---
 pkgs/by-name/en/envio/package.nix                      |  8 ++++----
 pkgs/by-name/en/envoy/package.nix                      |  6 +++---
 pkgs/by-name/es/espflash/package.nix                   |  6 +++---
 pkgs/by-name/es/esphome/package.nix                    |  6 +++---
 pkgs/by-name/eu/eureka-ideas/package.nix               |  6 +++---
 pkgs/by-name/fa/fable/package.nix                      | 10 +++++-----
 pkgs/by-name/fa/faketty/package.nix                    |  6 +++---
 pkgs/by-name/fa/fangfrisch/package.nix                 |  6 +++---
 pkgs/by-name/fa/faraday-agent-dispatcher/package.nix   |  6 +++---
 pkgs/by-name/fa/faraday-cli/package.nix                |  6 +++---
 pkgs/by-name/fa/fastjet-contrib/package.nix            |  8 ++++----
 pkgs/by-name/fa/fastnetmon-advanced/package.nix        |  8 ++++----
 pkgs/by-name/fc/fcft/package.nix                       |  8 ++++----
 pkgs/by-name/fe/fead/package.nix                       |  6 +++---
 pkgs/by-name/fe/feishin/package.nix                    | 10 +++++-----
 pkgs/by-name/fe/felix-fm/package.nix                   |  6 +++---
 pkgs/by-name/fe/fend/package.nix                       |  6 +++---
 pkgs/by-name/fe/fernglas/package.nix                   |  8 ++++----
 301 files changed, 1020 insertions(+), 1020 deletions(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 6a29a96e470b..8cc8ff489d38 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -61,12 +61,12 @@ rustPlatform.buildRustPackage rec {
       --set ALSA_PLUGIN_DIR '${alsa-plugins}/lib/alsa-lib'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open Source Spotify client library and playback daemon";
     mainProgram = "librespot";
     homepage = "https://github.com/librespot-org/librespot";
     changelog = "https://github.com/librespot-org/librespot/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ bennofs ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ bennofs ];
   };
 }
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index a90f55870d68..56eab79bba4f 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -142,16 +142,16 @@ stdenv.mkDerivation rec {
     cp "$rules" "$out/lib/udev/rules.d/69-mixxx-usb-uaccess.rules"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://mixxx.org";
     description = "Digital DJ mixing software";
     mainProgram = "mixxx";
     changelog = "https://github.com/mixxxdj/mixxx/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [
       benley
       bfortz
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index caf18e26e7f1..13325c27668e 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -22,11 +22,11 @@ pythonPackages.buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Mopidy frontend extension and web client with additional features for Pi MusicBox";
     homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient";
     changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/audio/samplebrain/default.nix b/pkgs/applications/audio/samplebrain/default.nix
index 07daf0300c67..33c46aca0f85 100644
--- a/pkgs/applications/audio/samplebrain/default.nix
+++ b/pkgs/applications/audio/samplebrain/default.nix
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     install -m 444 -D desktop/samplebrain.svg $out/share/icons/hicolor/scalable/apps/samplebrain.svg
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Custom sample mashing app";
     mainProgram = "samplebrain";
     homepage = "https://thentrythis.org/projects/samplebrain";
     changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${version}_release";
-    maintainers = with maintainers; [ mitchmindtree ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ mitchmindtree ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index 9ac536343140..9fd22a49e86a 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -116,14 +116,14 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Music player and music collection organizer";
     homepage = "https://www.strawberrymusicplayer.org/";
     changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ peterhoeg ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ peterhoeg ];
     # upstream says darwin should work but they lack maintainers as of 0.6.6
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "strawberry";
   };
 }
diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
index a9270da67d9f..a59989946e5a 100644
--- a/pkgs/applications/blockchains/bitcoin-abc/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -79,7 +79,7 @@ mkDerivation rec {
     find ./. -type f -iname "*.sh" -exec chmod +x {} \;
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Peer-to-peer electronic cash system (Cash client)";
     longDescription = ''
       Bitcoin ABC is the name of open source software which enables the use of Bitcoin.
@@ -90,10 +90,10 @@ mkDerivation rec {
     '';
     homepage = "https://bitcoinabc.org/";
     changelog = "https://www.bitcoinabc.org/doc/release-notes/release-notes-${version}.html";
-    maintainers = with maintainers; [ lassulus ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ lassulus ];
+    license = lib.licenses.mit;
     broken = stdenv.hostPlatform.isDarwin;
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "bitcoin-cli";
   };
 }
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index e1410eff679d..c7e2332eb37f 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -89,15 +89,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Derivative of Bitcoin Core with a collection of improvements";
     homepage = "https://bitcoinknots.org/";
     changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${version}/doc/release-notes.md";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       prusnak
       mmahut
     ];
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix
index 9d64e6549c8e..89e948dddb05 100644
--- a/pkgs/applications/editors/qxmledit/default.nix
+++ b/pkgs/applications/editors/qxmledit/default.nix
@@ -49,12 +49,12 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Simple XML editor based on qt libraries";
     homepage = "https://sourceforge.net/projects/qxmledit";
-    license = licenses.lgpl2;
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.unix;
     changelog = "https://github.com/lbellonda/qxmledit/blob/${version}/NEWS";
     mainProgram = "qxmledit";
   };
diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix
index 272729bcb47f..6769ede91831 100644
--- a/pkgs/applications/editors/your-editor/default.nix
+++ b/pkgs/applications/editors/your-editor/default.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture";
     homepage = "https://your-editor.org/";
     changelog = "https://github.com/your-editor/yed/blob/${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ uniquepointer ];
+    license = with lib.licenses; [ mit ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ uniquepointer ];
     mainProgram = "yed";
   };
 }
diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix
index de60afff3ffe..1c6e0b27b4ff 100644
--- a/pkgs/applications/gis/qmapshack/default.nix
+++ b/pkgs/applications/gis/qmapshack/default.nix
@@ -50,15 +50,15 @@ stdenv.mkDerivation rec {
     }"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Consumer grade GIS software";
     homepage = "https://github.com/Maproom/qmapshack";
     changelog = "https://github.com/Maproom/qmapshack/blob/V_${version}/changelog.txt";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       dotlambda
       sikmir
     ];
-    platforms = with platforms; linux;
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index d237920dabb8..8925a2f2d576 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Desktop version of draw.io for creating diagrams";
     homepage = "https://about.draw.io/";
     license = with lib.licenses; [
@@ -138,8 +138,8 @@ stdenv.mkDerivation rec {
       unfreeRedistributable
     ];
     changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}";
-    maintainers = with maintainers; [ darkonion0 ];
-    platforms = platforms.darwin ++ platforms.linux;
+    maintainers = with lib.maintainers; [ darkonion0 ];
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
     mainProgram = "drawio";
   };
 }
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 3c1a0f0533a7..e21d290a448d 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
     homepage = "https://xournalpp.github.io/";
     changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
     mainProgram = "xournalpp";
   };
 }
diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/applications/misc/bitwarden-menu/default.nix
index 902fddb32297..80c87ebac1c7 100644
--- a/pkgs/applications/misc/bitwarden-menu/default.nix
+++ b/pkgs/applications/misc/bitwarden-menu/default.nix
@@ -31,12 +31,12 @@ buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}";
     description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database";
     mainProgram = "bwm";
     homepage = "https://github.com/firecat53/bitwarden-menu";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aman9das ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aman9das ];
   };
 }
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 564d28e73f2b..9ce7b2621ed0 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -27,13 +27,13 @@ mkDerivation rec {
     qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple cross-platform mind map and note-taking tool written in Qt";
     mainProgram = "heimer";
     homepage = "https://github.com/juzzlin/Heimer";
     changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 05da14b20c82..2448b2e2dc53 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -84,13 +84,13 @@ mkDerivation rec {
   # and no format arguments [-Werror=format-security]"
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
+  meta = {
     description = "High performance layout viewer and editor with support for GDS and OASIS";
     mainProgram = "klayout";
-    license = with licenses; [ gpl2Plus ];
+    license = with lib.licenses; [ gpl2Plus ];
     homepage = "https://www.klayout.de/";
     changelog = "https://www.klayout.de/development.html#${version}";
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix
index 8297117956c9..86c892452ab2 100644
--- a/pkgs/applications/misc/opentrack/default.nix
+++ b/pkgs/applications/misc/opentrack/default.nix
@@ -96,12 +96,12 @@ mkDerivation {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/opentrack/opentrack";
     description = "Head tracking software for MS Windows, Linux, and Apple OSX";
     mainProgram = "opentrack";
     changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ zaninime ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ zaninime ];
   };
 }
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a8c77f1d821b..d395e68608ea 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -137,13 +137,13 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = lib.optional (!withGUI) true;
 
-  meta = with lib; {
+  meta = {
     description = "Share one mouse and keyboard between multiple computers";
     homepage = "https://symless.com/synergy";
     changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog";
     mainProgram = lib.optionalString (!withGUI) "synergyc";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ talyz ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ talyz ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 746fd8aaad50..d168d732eb59 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
     install -Dm644 dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open source sewing pattern drafting software";
     homepage = "https://smart-pattern.com.ua/";
     changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix
index aab1423a81dd..f53049637bef 100644
--- a/pkgs/applications/misc/whalebird/default.nix
+++ b/pkgs/applications/misc/whalebird/default.nix
@@ -102,13 +102,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Single-column Fediverse client for desktop";
     mainProgram = "whalebird";
     homepage = "https://whalebird.social";
     changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ weathercold ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ weathercold ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index af8c26c2ba44..c6c50c4cb9df 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -32,13 +32,13 @@ builtins.mapAttrs
         "-w"
       ];
 
-      meta = with lib; {
+      meta = {
         homepage = "https://projectcalico.docs.tigera.io";
         changelog = "https://github.com/projectcalico/calico/releases/tag/v${version}";
         description = "Cloud native networking and network security";
-        license = licenses.asl20;
-        maintainers = with maintainers; [ urandom ];
-        platforms = platforms.linux;
+        license = lib.licenses.asl20;
+        maintainers = with lib.maintainers; [ urandom ];
+        platforms = lib.platforms.linux;
         inherit mainProgram;
       };
     }
diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 045210950a4f..12f67a593caf 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -63,11 +63,11 @@ buildGoModule rec {
       "-X ${prefix}.buildDate=${version}"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Service mesh controller";
     homepage = "https://kuma.io/";
     changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ zbioe ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ zbioe ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix
index d4c521bffe22..605cfcc6b2a3 100644
--- a/pkgs/applications/networking/cluster/rke2/builder.nix
+++ b/pkgs/applications/networking/cluster/rke2/builder.nix
@@ -150,17 +150,17 @@ buildGoModule (finalAttrs: {
       // moduleTests;
   } // (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/rancher/rke2";
     description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution";
-    changelog = "https://github.com/rancher/rke2/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/rancher/rke2/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       rorosen
       zimbatm
       zygot
     ];
     mainProgram = "rke2";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index bfe9d0a89835..4d279ce5ae9f 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Diagnostic tool that makes it easier to understand the state of a Kubernetes cluster";
     longDescription = ''
       Sonobuoy is a diagnostic tool that makes it easier to understand the state of
@@ -56,9 +56,9 @@ buildGoModule rec {
 
     homepage = "https://sonobuoy.io";
     changelog = "https://github.com/vmware-tanzu/sonobuoy/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "sonobuoy";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       carlosdagos
       saschagrunert
       wilsonehusin
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index b6ac750d8eb1..d2a4fc33341f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -75,12 +75,12 @@ let
 
         subPackages = [ "." ];
 
-        meta = with lib; {
+        meta = {
           description = "Tool for building, changing, and versioning infrastructure";
           homepage = "https://www.terraform.io/";
           changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md";
-          license = licenses.bsl11;
-          maintainers = with maintainers; [
+          license = lib.licenses.bsl11;
+          maintainers = with lib.maintainers; [
             Chili-Man
             kalbasit
             timstott
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index b137309458a9..e783aef616c7 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -90,12 +90,12 @@ stdenv.mkDerivation rec {
     wireshark-cli
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools to capture DNS traffic and record it in C-DNS files";
     homepage = "https://dns-stats.org/";
     changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ fdns ];
-    platforms = platforms.unix;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ fdns ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
index 06b283a60766..eeac3c06a725 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
@@ -60,18 +60,18 @@ telegram-desktop.override {
       })
     ];
 
-    meta = with lib; {
+    meta = {
       description = "Kotatogram – experimental Telegram Desktop fork";
       longDescription = ''
         Unofficial desktop client for the Telegram messenger, based on Telegram Desktop.
 
         It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes
       '';
-      license = licenses.gpl3Only;
-      platforms = platforms.all;
+      license = lib.licenses.gpl3Only;
+      platforms = lib.platforms.all;
       homepage = "https://kotatogram.github.io";
       changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}";
-      maintainers = with maintainers; [ ilya-fedin ];
+      maintainers = with lib.maintainers; [ ilya-fedin ];
       mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram";
     };
   };
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 3a2c62e277ab..b09b724dc20a 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -61,12 +61,12 @@ mkDerivation rec {
     # "-DWITH_DIAMONDCARD=On" seems ancient and broken
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/LubosD/twinkle/blob/${version}/NEWS";
     description = "SIP-based VoIP client";
     homepage = "http://twinkle.dolezel.info/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.mkg20001 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.mkg20001 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 26ec805cb557..467e03ca16e8 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -59,16 +59,16 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru.tests.maestral = nixosTests.maestral;
 
-  meta = with lib; {
+  meta = {
     description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
     homepage = "https://maestral.app";
     changelog = "https://github.com/samschott/maestral/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       peterhoeg
       sfrijters
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "maestral_qt";
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index b4570d58434b..bf1c439bbc3b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -217,16 +217,16 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Mail indexer";
     homepage = "https://notmuchmail.org/";
-    changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       flokli
       puckipedia
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "notmuch";
   };
 })
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bed3329957db..f86e352bcc6a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -128,13 +128,13 @@ stdenv.mkDerivation {
     gtk3 = gtk3;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
     description = "Mozilla Thunderbird, a full-featured email client (binary package)";
     homepage = "http://www.mozilla.org/thunderbird/";
     mainProgram = "thunderbird";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mpl20;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ lovesegfault ];
     platforms = builtins.attrNames mozillaPlatforms;
     hydraPlatforms = [ ];
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index ee32ac85aeb0..becb2c0c6981 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -60,21 +60,21 @@ let
         icu77 = icu77';
       };
 
-      meta = with lib; {
+      meta = {
         changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
         description = "Full-featured e-mail client";
         homepage = "https://thunderbird.net/";
         mainProgram = "thunderbird";
-        maintainers = with maintainers; [
+        maintainers = with lib.maintainers; [
           lovesegfault
           pierron
           vcunat
         ];
-        platforms = platforms.unix;
+        platforms = lib.platforms.unix;
         broken = stdenv.buildPlatform.is32bit;
         # since Firefox 60, build on 32-bit platforms fails with "out of memory".
         # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
-        license = licenses.mpl20;
+        license = lib.licenses.mpl20;
       };
     }).override
       {
diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix
index 1b6d530016b2..12a3474fef98 100644
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -37,12 +37,12 @@ buildGoModule rec {
     xorg.libXrandr
   ];
 
-  meta = with lib; {
+  meta = {
     description = "WireGuard automation from homelab to enterprise";
     homepage = "https://netmaker.io";
     changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       urandom
       qjoly
     ];
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 1adc5d981b87..33c42b4eec21 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     sqlite.dev
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt-based RSS/Atom news feed reader";
     longDescription = ''
       QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader
@@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://quiterss.org";
     changelog = "https://github.com/QuiteRSS/quiterss/blob/${version}/CHANGELOG";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 575151378b5f..a1c981c855c4 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -214,7 +214,7 @@ stdenv.mkDerivation rec {
     cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Powerful network protocol analyzer";
     longDescription = ''
       Wireshark (formerly known as "Ethereal") is a powerful network
@@ -223,9 +223,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.wireshark.org";
     changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       bjornfor
       fpletz
     ];
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 10df3c901135..5c8c39c45f54 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -99,13 +99,13 @@ buildGoModule rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command line program to sync files and directories to and from major cloud storage";
     homepage = "https://rclone.org";
     changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "rclone";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       SuperSandro2000
     ];
   };
diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix
index 7f146995abde..ee1a15285627 100644
--- a/pkgs/applications/networking/wgnord/default.nix
+++ b/pkgs/applications/networking/wgnord/default.nix
@@ -56,13 +56,13 @@ resholve.mkDerivation rec {
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "NordVPN Wireguard (NordLynx) client in POSIX shell";
     homepage = "https://github.com/phirecc/wgnord";
     changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}";
     maintainers = with lib.maintainers; [ urandom ];
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "wgnord";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix
index a43636a2417f..8465279a6063 100644
--- a/pkgs/applications/office/kbibtex/default.nix
+++ b/pkgs/applications/office/kbibtex/default.nix
@@ -79,13 +79,13 @@ mkDerivation rec {
     "${lib.makeBinPath [ bibutils ]}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Bibliography editor for KDE";
     mainProgram = "kbibtex";
     homepage = "https://userbase.kde.org/KBibTeX";
     changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dotlambda ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 43b7b27ce71e..407a47964c76 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -51,13 +51,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://celestiaproject.space/";
     description = "Real-time 3D simulation of space";
     mainProgram = "celestia";
     changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hjones2199 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ hjones2199 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix
index 3026ac9ce885..1c5d40629cf6 100644
--- a/pkgs/applications/science/biology/nest/default.nix
+++ b/pkgs/applications/science/biology/nest/default.nix
@@ -78,15 +78,15 @@ stdenv.mkDerivation rec {
     command = "nest --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "NEST is a command line tool for simulating neural networks";
     homepage = "https://www.nest-simulator.org/";
     changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       jiegec
       davidcromp
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index 66e7a5cdbeee..9dd3e1a1d8e7 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
     "--disable-update-desktop-database"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Gerber (RS-274X) viewer";
     mainProgram = "gerbv";
     homepage = "https://gerbv.github.io/";
     changelog = "https://github.com/gerbv/gerbv/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ mog ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ mog ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix
index 068ee6f4244a..eae9f1e5d063 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/pkgs/applications/science/misc/sasview/default.nix
@@ -69,11 +69,11 @@ python3.pkgs.buildPythonApplication rec {
     "test_data_reader_exception"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fitting and data analysis for small angle scattering data";
     homepage = "https://www.sasview.org";
     changelog = "https://github.com/SasView/sasview/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ rprospero ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ rprospero ];
   };
 }
diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index 73cb83527862..5b9db51a215f 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -48,12 +48,12 @@ buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/VirtusLab/git-machete";
     description = "Git repository organizer and rebase/merge workflow automation tool";
     changelog = "https://github.com/VirtusLab/git-machete/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ blitz ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ blitz ];
     mainProgram = "git-machete";
   };
 }
diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index fbb1a8f68583..7d488c7e66fd 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
   stripDebugList = [ "share/mpv/scripts" ];
   passthru.scriptName = "mpris.so";
 
-  meta = with lib; {
+  meta = {
     description = "MPRIS plugin for mpv";
     homepage = "https://github.com/hoyon/mpv-mpris";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ajs124 ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ajs124 ];
     changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${version}";
   };
 }
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
index fc37b1a50dea..f789a4553da5 100644
--- a/pkgs/applications/video/mpv/scripts/thumbnail.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -26,12 +26,12 @@ buildLua rec {
   extraScripts = [ "mpv_thumbnail_script_server.lua" ];
   passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua";
 
-  meta = with lib; {
+  meta = {
     description = "Lua script to show preview thumbnails in mpv's OSC seekbar";
     homepage = "https://github.com/marzzzello/mpv_thumbnail_script";
     changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
index b16e35f53151..abd3e2fbe6e5 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
     rm -rf $out/dist
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sorayuki/obs-multi-rtmp/";
     changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}";
     description = "Multi-site simultaneous broadcast plugin for OBS Studio";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ jk ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index 31241c74f119..fdbb8bbafe3d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -57,15 +57,15 @@ stdenv.mkDerivation rec {
     mv $out/lib/obs-vaapi.so $out/lib/obs-plugins/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "OBS Studio VAAPI support via GStreamer";
     homepage = "https://github.com/fzwoch/obs-vaapi";
     changelog = "https://github.com/fzwoch/obs-vaapi/releases/tag/${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       ahuzik
       pedrohlc
     ];
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 6365ef7d44c8..6337a7a7749c 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -85,11 +85,11 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lima-vm/lima";
     description = "Linux virtual machines (on macOS, in most cases)";
     changelog = "https://github.com/lima-vm/lima/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ anhduy ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ anhduy ];
   };
 }
diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
index 027d24cc7592..a795eb8e26fd 100644
--- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
+++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
@@ -73,13 +73,13 @@ stdenv.mkDerivation rec {
     updateScript = directoryListingUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Settings app for mobile specific things";
     mainProgram = "phosh-mobile-settings";
     homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings";
     changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ rvl ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rvl ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix
index d8a3ed5b2fbe..d3c133575abb 100644
--- a/pkgs/by-name/ac/accerciser/package.nix
+++ b/pkgs/by-name/ac/accerciser/package.nix
@@ -69,13 +69,13 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/accerciser";
     changelog = "https://gitlab.gnome.org/GNOME/accerciser/-/blob/${version}/NEWS?ref_type=tags";
     description = "Interactive Python accessibility explorer";
     mainProgram = "accerciser";
-    teams = [ teams.gnome ];
-    license = licenses.bsd3;
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix
index cdaba282258e..27c3f9d6278a 100644
--- a/pkgs/by-name/ac/acme-sh/package.nix
+++ b/pkgs/by-name/ac/acme-sh/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       runHook postInstall
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://acme.sh/";
     changelog = "https://github.com/acmesh-official/acme.sh/releases/tag/${version}";
     description = "Pure Unix shell script implementing ACME client protocol";
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       - IPv6 ready
       - Cron job notifications for renewal or error etc.
     '';
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     teams = [ lib.teams.serokell ];
     inherit (coreutils.meta) platforms;
     mainProgram = "acme.sh";
diff --git a/pkgs/by-name/ad/adalanche/package.nix b/pkgs/by-name/ad/adalanche/package.nix
index 477dde7085b8..9085277b33f9 100644
--- a/pkgs/by-name/ad/adalanche/package.nix
+++ b/pkgs/by-name/ad/adalanche/package.nix
@@ -28,12 +28,12 @@ buildGoModule rec {
     "-X=github.com/lkarlslund/adalanche/modules/version.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Active Directory ACL Visualizer and Explorer";
     homepage = "https://github.com/lkarlslund/adalanche";
     changelog = "https://github.com/lkarlslund/Adalanche/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "adalanche";
   };
 }
diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix
index f92b0c16653f..e7657fbafbd9 100644
--- a/pkgs/by-name/ad/adbtuifm/package.nix
+++ b/pkgs/by-name/ad/adbtuifm/package.nix
@@ -13,13 +13,13 @@ buildGoModule rec {
     hash = "sha256-TK93O9XwMrsrQT3EG0969HYMtYkK0a4PzG9FSTqHxAY=";
   };
   vendorHash = "sha256-voVoowjM90OGWXF4REEevO8XEzT7azRYiDay4bnGBks=";
-  meta = with lib; {
+  meta = {
     description = "TUI-based file manager for the Android Debug Bridge";
     homepage = "https://github.com/darkhz/adbtuifm";
     changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ daru-san ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ daru-san ];
     mainProgram = "adbtuifm";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix
index 77c6129d3ea3..02900efa7390 100644
--- a/pkgs/by-name/ad/adreaper/package.nix
+++ b/pkgs/by-name/ad/adreaper/package.nix
@@ -22,14 +22,14 @@ buildGoModule rec {
     mv $out/bin/ADReaper $out/bin/$pname
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Enumeration tool for Windows Active Directories";
     homepage = "https://github.com/AidenPearce369/ADReaper";
     changelog = "https://github.com/AidenPearce369/ADReaper/releases/tag/ADReaperv${version}";
     # Upstream doesn't have a license yet
     # https://github.com/AidenPearce369/ADReaper/issues/2
-    license = with licenses; [ unfree ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ unfree ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ADReaper";
   };
 }
diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix
index 1af8cd753b4d..678ad2590012 100644
--- a/pkgs/by-name/ad/adriconf/package.nix
+++ b/pkgs/by-name/ad/adriconf/package.nix
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
       -t $out/share/icons/hicolor/256x256/apps/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.freedesktop.org/mesa/adriconf/";
     changelog = "https://gitlab.freedesktop.org/mesa/adriconf/-/releases/v${version}";
     description = "GUI tool used to configure open source graphics drivers";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ muscaln ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ muscaln ];
+    platforms = lib.platforms.linux;
     mainProgram = "adriconf";
   };
 }
diff --git a/pkgs/by-name/ad/advancecomp/package.nix b/pkgs/by-name/ad/advancecomp/package.nix
index fe6d79f732ca..db560a6178c9 100644
--- a/pkgs/by-name/ad/advancecomp/package.nix
+++ b/pkgs/by-name/ad/advancecomp/package.nix
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     echo "${version}" >.version
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Set of tools to optimize deflate-compressed files";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     homepage = "https://github.com/amadvance/advancecomp";
     changelog = "https://github.com/amadvance/advancecomp/blob/v${version}/HISTORY";
   };
diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
index 4eba811c8583..c4fe4a7e27ae 100644
--- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme";
     changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${version}/NEWS?ref_type=tags";
-    platforms = with platforms; linux ++ darwin;
-    teams = [ teams.gnome ];
-    license = licenses.cc-by-sa-30;
+    platforms = with lib.platforms; linux ++ darwin;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.cc-by-sa-30;
   };
 }
diff --git a/pkgs/by-name/ai/aide/package.nix b/pkgs/by-name/ai/aide/package.nix
index 9ec1e6d05692..ca594035403c 100644
--- a/pkgs/by-name/ai/aide/package.nix
+++ b/pkgs/by-name/ai/aide/package.nix
@@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://aide.github.io/";
     changelog = "https://github.com/aide/aide/blob/v${version}/ChangeLog";
     description = "File and directory integrity checker";
     mainProgram = "aide";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ happysalada ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ happysalada ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
index ee7202936ff6..12c1690b6231 100644
--- a/pkgs/by-name/ai/aiodnsbrute/package.nix
+++ b/pkgs/by-name/ai/aiodnsbrute/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     "aiodnsbrute.cli"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "DNS brute force utility";
     mainProgram = "aiodnsbrute";
     homepage = "https://github.com/blark/aiodnsbrute";
     changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${version}";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix
index 3d03cd3e02c3..b67687d75178 100644
--- a/pkgs/by-name/ai/airgeddon/package.nix
+++ b/pkgs/by-name/ai/airgeddon/package.nix
@@ -162,13 +162,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Multi-use TUI to audit wireless networks";
     mainProgram = "airgeddon";
     homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon";
     changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ai/airlift/package.nix b/pkgs/by-name/ai/airlift/package.nix
index 6f52867db78e..655a3981b353 100644
--- a/pkgs/by-name/ai/airlift/package.nix
+++ b/pkgs/by-name/ai/airlift/package.nix
@@ -47,12 +47,12 @@ python3.pkgs.buildPythonApplication rec {
   pythonImportsCheck = [
     "airlift"
   ];
-  meta = with lib; {
+  meta = {
     description = "Flexible, configuration driven CLI for Apache Airflow local development";
     homepage = "https://github.com/jl178/airlift";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/jl178/airlift/releases/tag/v${version}";
-    maintainers = with maintainers; [ jl178 ];
+    maintainers = with lib.maintainers; [ jl178 ];
     mainProgram = "airlift";
   };
 }
diff --git a/pkgs/by-name/ai/airscan/package.nix b/pkgs/by-name/ai/airscan/package.nix
index fe1027fb7c55..24329648114f 100644
--- a/pkgs/by-name/ai/airscan/package.nix
+++ b/pkgs/by-name/ai/airscan/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-I5JRGaff6OIwx4q7BjpFwvJiQe4kw03V8+McYPcJhho=";
 
-  meta = with lib; {
+  meta = {
     description = "Package to scan paper documents using the Apple AirScan (eSCL) protocol";
     mainProgram = "airscan1";
     homepage = "https://github.com/stapelberg/airscan";
     changelog = "https://github.com/stapelberg/airscan/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ johannwagner ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ johannwagner ];
   };
 }
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 6fd102d45387..1141b6ee14aa 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -128,16 +128,16 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform, GPU-accelerated terminal emulator";
     homepage = "https://github.com/alacritty/alacritty";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "alacritty";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       rvdp
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
   };
 }
diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix
index d694755d2de5..e14c2f1bc19a 100644
--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec {
     version = testers.testVersion { package = alejandra; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Uncompromising Nix Code Formatter";
     homepage = "https://github.com/kamadorueda/alejandra";
     changelog = "https://github.com/kamadorueda/alejandra/blob/${version}/CHANGELOG.md";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [
       _0x4A6F
       kamadorueda
       sciencentistguy
diff --git a/pkgs/by-name/al/ali/package.nix b/pkgs/by-name/al/ali/package.nix
index 719f3c44da67..87336219f2f8 100644
--- a/pkgs/by-name/al/ali/package.nix
+++ b/pkgs/by-name/al/ali/package.nix
@@ -18,13 +18,13 @@ buildGoModule rec {
 
   vendorHash = "sha256-YWx9K04kTMaI0FXebwRQVCt0nxIwZ6xlbtI2lk3qp0M=";
 
-  meta = with lib; {
+  meta = {
     description = "Generate HTTP load and plot the results in real-time";
     homepage = "https://github.com/nakabonne/ali";
     changelog = "https://github.com/nakabonne/ali/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ farcaller ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ farcaller ];
     mainProgram = "ali";
     # Broken on darwin for Go toolchain > 1.22, with error:
     # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'
diff --git a/pkgs/by-name/al/alienarena/package.nix b/pkgs/by-name/al/alienarena/package.nix
index 06982ef32274..17adcf7a99a1 100644
--- a/pkgs/by-name/al/alienarena/package.nix
+++ b/pkgs/by-name/al/alienarena/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       --replace libGL.so.1 ${libGL}/lib/libGL.so.1
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}";
     description = "Free, stand-alone first-person shooter computer game";
     longDescription = ''
@@ -59,9 +59,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://alienarena.org";
     # Engine is under GPLv2, everything else is under
-    license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ astsmtl ];
-    platforms = platforms.linux;
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ astsmtl ];
+    platforms = lib.platforms.linux;
     hydraPlatforms = [ ];
   };
 }
diff --git a/pkgs/by-name/al/alterx/package.nix b/pkgs/by-name/al/alterx/package.nix
index 198b8fed43be..f6c4d776b438 100644
--- a/pkgs/by-name/al/alterx/package.nix
+++ b/pkgs/by-name/al/alterx/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-aTA5KGeYmJnbVRbEhT9LigQoJFLD17q9spzBV4BGhNw=";
 
-  meta = with lib; {
+  meta = {
     description = "Fast and customizable subdomain wordlist generator using DSL";
     mainProgram = "alterx";
     homepage = "https://github.com/projectdiscovery/alterx";
     changelog = "https://github.com/projectdiscovery/alterx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix
index b82579aa1b80..45ec956967e5 100644
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@@ -136,16 +136,16 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Stream VR games from your PC to your headset via Wi-Fi";
     homepage = "https://github.com/alvr-org/ALVR/";
     changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "alvr_dashboard";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       luNeder
       jopejoe1
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/am/amass/package.nix b/pkgs/by-name/am/amass/package.nix
index e7aa091c3bff..79b8444fa112 100644
--- a/pkgs/by-name/am/amass/package.nix
+++ b/pkgs/by-name/am/amass/package.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
   # https://github.com/OWASP/Amass/issues/640
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
       The OWASP Amass tool suite obtains subdomain names by scraping data
@@ -46,8 +46,8 @@ buildGoModule rec {
     '';
     homepage = "https://owasp.org/www-project-amass/";
     changelog = "https://github.com/OWASP/Amass/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       kalbasit
       fab
     ];
diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index 183dfd1d9d60..6bf362ef3e1f 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -169,13 +169,13 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Agent to enable remote management of your Amazon EC2 instance configuration";
     changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}";
     homepage = "https://github.com/aws/amazon-ssm-agent";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       manveru
       anthonyroussel
       arianvp
diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index f7f7f8bd98b6..091dffa10bfc 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -19,12 +19,12 @@ crystal.buildCrystalPackage rec {
   format = "make";
   installFlags = [ "INSTALL_BIN=${coreutils}/bin/install" ];
 
-  meta = with lib; {
+  meta = {
     description = "Static code analysis tool for Crystal";
     mainProgram = "ameba";
     homepage = "https://crystal-ameba.github.io";
     changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index bb335a505bb2..ca5f8793e4cb 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     install -Dm644 amfora.desktop -t $out/share/applications
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fancy terminal browser for the Gemini protocol";
     mainProgram = "amfora";
     homepage = "https://github.com/makeworld-the-better-one/amfora";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ deifactor ];
+    license = with lib.licenses; [ gpl3 ];
+    maintainers = with lib.maintainers; [ deifactor ];
     changelog = "https://github.com/makeworld-the-better-one/amfora/blob/v${version}/CHANGELOG.md";
   };
 }
diff --git a/pkgs/by-name/ap/apachetomcatscanner/package.nix b/pkgs/by-name/ap/apachetomcatscanner/package.nix
index 9abec5a1ea22..c6a07d040a4a 100644
--- a/pkgs/by-name/ap/apachetomcatscanner/package.nix
+++ b/pkgs/by-name/ap/apachetomcatscanner/package.nix
@@ -41,12 +41,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "apachetomcatscanner" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to scan for Apache Tomcat server vulnerabilities";
     homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
     changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ApacheTomcatScanner";
   };
 }
diff --git a/pkgs/by-name/ap/aperture/package.nix b/pkgs/by-name/ap/aperture/package.nix
index 7e47e02c12ab..eb17e90700d3 100644
--- a/pkgs/by-name/ap/aperture/package.nix
+++ b/pkgs/by-name/ap/aperture/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   subPackages = [ "cmd/aperture" ];
 
-  meta = with lib; {
+  meta = {
     description = "L402 (Lightning HTTP 402) Reverse Proxy";
     homepage = "https://github.com/lightninglabs/aperture";
     changelog = "https://github.com/lightninglabs/aperture/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       sputn1ck
       HannahMR
     ];
diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix
index e95face53a8d..571f8f473c12 100644
--- a/pkgs/by-name/ap/apkeep/package.nix
+++ b/pkgs/by-name/ap/apkeep/package.nix
@@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for downloading APK files from various sources";
     homepage = "https://github.com/EFForg/apkeep";
     changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "apkeep";
   };
 }
diff --git a/pkgs/by-name/ap/apkleaks/package.nix b/pkgs/by-name/ap/apkleaks/package.nix
index b83d71c0c380..6044436ca8f8 100644
--- a/pkgs/by-name/ap/apkleaks/package.nix
+++ b/pkgs/by-name/ap/apkleaks/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "apkleaks" ];
 
-  meta = with lib; {
+  meta = {
     description = "Scanning APK file for URIs, endpoints and secrets";
     homepage = "https://github.com/dwisiswant0/apkleaks";
     changelog = "https://github.com/dwisiswant0/apkleaks/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "apkleaks";
   };
 }
diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix
index b69e66a85370..e8f32d5aff44 100644
--- a/pkgs/by-name/ap/apktool/package.nix
+++ b/pkgs/by-name/ap/apktool/package.nix
@@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
         --prefix PATH : ${lib.getBin aapt}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for reverse engineering Android apk files";
     mainProgram = "apktool";
     homepage = "https://ibotpeaches.github.io/Apktool/";
     changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ offline ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix
index 8c55748c2182..10ef56583a6d 100644
--- a/pkgs/by-name/ar/arduino-ide/package.nix
+++ b/pkgs/by-name/ar/arduino-ide/package.nix
@@ -26,13 +26,13 @@ appimageTools.wrapType2 {
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
 
-  meta = with lib; {
+  meta = {
     description = "Open-source electronics prototyping platform";
     homepage = "https://www.arduino.cc/en/software";
     changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     mainProgram = "arduino-ide";
-    maintainers = with maintainers; [ clerie ];
+    maintainers = with lib.maintainers; [ clerie ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/ar/arduino-language-server/package.nix b/pkgs/by-name/ar/arduino-language-server/package.nix
index 18b6761e30b3..0c78013478a4 100644
--- a/pkgs/by-name/ar/arduino-language-server/package.nix
+++ b/pkgs/by-name/ar/arduino-language-server/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
       "-extldflags '-static'"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Arduino Language Server based on Clangd to Arduino code autocompletion";
     mainProgram = "arduino-language-server";
     homepage = "https://github.com/arduino/arduino-language-server";
     changelog = "https://github.com/arduino/arduino-language-server/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ BattleCh1cken ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ BattleCh1cken ];
   };
 }
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 051d4e83e0bd..709cb2c92e47 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -61,16 +61,16 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command-line options, arguments and sub-commands parser for bash";
     mainProgram = "argc";
     homepage = "https://github.com/sigoden/argc";
     changelog = "https://github.com/sigoden/argc/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix
index 475d9054aa19..90397b11b9f1 100644
--- a/pkgs/by-name/ar/argo-workflows/package.nix
+++ b/pkgs/by-name/ar/argo-workflows/package.nix
@@ -88,13 +88,13 @@ buildGoModule rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Container native workflow engine for Kubernetes";
     mainProgram = "argo";
     homepage = "https://github.com/argoproj/argo";
     changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ groodt ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ groodt ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ar/argocd-vault-plugin/package.nix b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
index cf8995226633..79c6b736e2b4 100644
--- a/pkgs/by-name/ar/argocd-vault-plugin/package.nix
+++ b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
@@ -36,12 +36,12 @@ buildGoModule rec {
     version = "argocd-vault-plugin v${version} (unknown) BuildDate: 1970-01-01T00:00:00Z";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://argocd-vault-plugin.readthedocs.io";
     changelog = "https://github.com/argoproj-labs/argocd-vault-plugin/releases/tag/v${version}";
     description = "Argo CD plugin to retrieve secrets from Secret Management tools and inject them into Kubernetes secrets";
     mainProgram = "argocd-vault-plugin";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/ar/aria2/package.nix b/pkgs/by-name/ar/aria2/package.nix
index ee98ae99d934..aaab59f0fb4c 100644
--- a/pkgs/by-name/ar/aria2/package.nix
+++ b/pkgs/by-name/ar/aria2/package.nix
@@ -69,14 +69,14 @@ stdenv.mkDerivation rec {
     aria2 = nixosTests.aria2;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://aria2.github.io";
     changelog = "https://github.com/aria2/aria2/releases/tag/release-${version}";
     description = "Lightweight, multi-protocol, multi-source, command-line download utility";
     mainProgram = "aria2c";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       koral
       timhae
diff --git a/pkgs/by-name/ar/arjun/package.nix b/pkgs/by-name/ar/arjun/package.nix
index b24de04dfaa8..0fdfcfe6746d 100644
--- a/pkgs/by-name/ar/arjun/package.nix
+++ b/pkgs/by-name/ar/arjun/package.nix
@@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec {
     "arjun"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "HTTP parameter discovery suite";
     homepage = "https://github.com/s0md3v/Arjun";
     changelog = "https://github.com/s0md3v/Arjun/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ octodi ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ octodi ];
     mainProgram = "arjun";
   };
 }
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index 9305dabc5f83..9724034396ba 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/build/artem-*/out/_artem
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Small CLI program to convert images to ASCII art";
     homepage = "https://github.com/finefindus/artem";
     changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "artem";
   };
 }
diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix
index 22fe897f47b1..1cf8823dc723 100644
--- a/pkgs/by-name/as/askalono/package.nix
+++ b/pkgs/by-name/as/askalono/package.nix
@@ -17,12 +17,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ug79p75Oa5lsd9COWO2aIx3jN7de1QZggMFiOPAN5kQ=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect open source licenses from texts";
     homepage = "https://github.com/jpeddicord/askalono";
     changelog = "https://github.com/jpeddicord/askalono/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "askalono";
   };
 }
diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix
index e370f5f599f4..58800a0d87bd 100644
--- a/pkgs/by-name/as/asn/package.nix
+++ b/pkgs/by-name/as/asn/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       }"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "OSINT command line tool for investigating network data";
     longDescription = ''
       ASN / RPKI validity / BGP stats / IPv4v6 / Prefix / URL / ASPath / Organization /
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/nitefood/asn";
     changelog = "https://github.com/nitefood/asn/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ devhell ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "asn";
   };
 }
diff --git a/pkgs/by-name/as/asnmap/package.nix b/pkgs/by-name/as/asnmap/package.nix
index 7246edd85187..76098352d739 100644
--- a/pkgs/by-name/as/asnmap/package.nix
+++ b/pkgs/by-name/as/asnmap/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to gather network ranges using ASN information";
     homepage = "https://github.com/projectdiscovery/asnmap";
     changelog = "https://github.com/projectdiscovery/asnmap/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "asnmap";
   };
 }
diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix
index f66cb33959d8..c2f5eecd3ee5 100644
--- a/pkgs/by-name/as/assh/package.nix
+++ b/pkgs/by-name/as/assh/package.nix
@@ -41,12 +41,12 @@ buildGoModule rec {
     $out/bin/assh --help > /dev/null
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts";
     homepage = "https://github.com/moul/assh";
     changelog = "https://github.com/moul/assh/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = with platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index dea61fe0fc3d..f0366d440154 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}";
     description = "Small binary that runs a list of commands in parallel and awaits termination";
     homepage = "https://github.com/slavaGanzin/await";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chewblacka ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chewblacka ];
+    platforms = lib.platforms.all;
     mainProgram = "await";
   };
 }
diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
index 62cda863f0c7..675645240b43 100644
--- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
+++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
@@ -73,12 +73,12 @@ localPython.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://aws-encryption-sdk-cli.readthedocs.io/";
     changelog = "https://github.com/aws/aws-encryption-sdk-cli/blob/v${version}/CHANGELOG.rst";
     description = "CLI wrapper around aws-encryption-sdk-python";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "aws-encryption-cli";
-    maintainers = with maintainers; [ anthonyroussel ];
+    maintainers = with lib.maintainers; [ anthonyroussel ];
   };
 }
diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
index 5bd7daaaf416..58f8f3500613 100644
--- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix
+++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
 
   subPackages = [ "cmd/aws-iam-authenticator" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator";
     description = "AWS IAM credentials for Kubernetes authentication";
     mainProgram = "aws-iam-authenticator";
     changelog = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ srhb ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ srhb ];
   };
 }
diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index 35d50ba68d77..996af6a74f75 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -151,13 +151,13 @@ python3.pkgs.buildPythonApplication rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for local development and testing of Serverless applications";
     homepage = "https://github.com/aws/aws-sam-cli";
     changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "sam";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       lo1tuma
       anthonyroussel
     ];
diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 069be0822da0..7dd85ca13e74 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -186,12 +186,12 @@ py.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Unified tool to manage your AWS services";
     homepage = "https://aws.amazon.com/cli/";
     changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       bhipple
       davegallant
       bryanasdev000
diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 5bd2de1009f6..de20644a4e08 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -93,12 +93,12 @@ python.pkgs.buildPythonApplication rec {
     "test_aws_eb_profile_environment_variable_found__profile_exists_in_credentials_file"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command line interface for Elastic Beanstalk";
     homepage = "https://aws.amazon.com/elasticbeanstalk/";
     changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kirillrdy ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kirillrdy ];
     mainProgram = "eb";
   };
 }
diff --git a/pkgs/by-name/aw/awslimitchecker/package.nix b/pkgs/by-name/aw/awslimitchecker/package.nix
index 9a603a5e6024..e309decf0818 100644
--- a/pkgs/by-name/aw/awslimitchecker/package.nix
+++ b/pkgs/by-name/aw/awslimitchecker/package.nix
@@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "awslimitchecker.checker" ];
 
-  meta = with lib; {
+  meta = {
     description = "Script and python package to check your AWS service limits and usage via boto3";
     homepage = "http://awslimitchecker.readthedocs.org";
     changelog = "https://github.com/jantman/awslimitchecker/blob/${version}/CHANGES.rst";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ zakame ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ zakame ];
     mainProgram = "awslimitchecker";
   };
 }
diff --git a/pkgs/by-name/ba/baboossh/package.nix b/pkgs/by-name/ba/baboossh/package.nix
index 26c1182a01a3..24d4012dcb97 100644
--- a/pkgs/by-name/ba/baboossh/package.nix
+++ b/pkgs/by-name/ba/baboossh/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "baboossh" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to do SSH spreading";
     homepage = "https://github.com/cybiere/baboossh";
     changelog = "https://github.com/cybiere/baboossh/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "baboossh";
   };
 }
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index 79197e8f539a..33525d78c396 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
       --zsh <($out/bin/badrobot completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/controlplaneio/badrobot";
     changelog = "https://github.com/controlplaneio/badrobot/blob/v${version}/CHANGELOG.md";
     description = "Operator Security Audit Tool";
@@ -45,7 +45,7 @@ buildGoModule rec {
       likelihood that a compromised Operator would be able to obtain full
       cluster permissions.
     '';
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ jk ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 69290e946837..5c499dcd4e43 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -189,16 +189,16 @@ stdenv.mkDerivation rec {
     mv $out/README.md $out/share/BambuStudio/README.md
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PC Software for BambuLab's 3D printers";
     homepage = "https://github.com/bambulab/BambuStudio";
     changelog = "https://github.com/bambulab/BambuStudio/releases/tag/v${version}";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       zhaofengli
       dsluijk
     ];
     mainProgram = "bambu-studio";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index 02a542c0f0b0..a6eea7f1cca9 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -76,16 +76,16 @@ rustPlatform.buildRustPackage rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cat(1) clone with syntax highlighting and Git integration";
     homepage = "https://github.com/sharkdp/bat";
     changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
     mainProgram = "bat";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       dywedir
       zowoq
       SuperSandro2000
diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix
index c9272a6e5364..28229158ac3d 100644
--- a/pkgs/by-name/ba/batmon/package.nix
+++ b/pkgs/by-name/ba/batmon/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-0SXb8jBAYKnNFguamSMosPE6gH9aUzydF16w3SLhOU4=";
 
-  meta = with lib; {
+  meta = {
     description = "Interactive batteries viewer";
     longDescription = ''
       An interactive viewer, similar to top, htop and other *top utilities,
@@ -26,10 +26,10 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/6543/batmon/";
     changelog = "https://github.com/6543/batmon/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "batmon";
-    platforms = with platforms; unix ++ windows;
+    platforms = with lib.platforms; unix ++ windows;
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
-    maintainers = with maintainers; [ _6543 ];
+    maintainers = with lib.maintainers; [ _6543 ];
   };
 }
diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix
index f7440cc146c1..825ad6987643 100644
--- a/pkgs/by-name/ba/bazel-buildtools/package.nix
+++ b/pkgs/by-name/ba/bazel-buildtools/package.nix
@@ -34,15 +34,15 @@ buildGoModule rec {
     "-X main.buildScmRevision=${src.rev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps";
     homepage = "https://github.com/bazelbuild/buildtools";
     changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       elasticdog
       uri-canva
     ];
-    teams = [ teams.bazel ];
+    teams = [ lib.teams.bazel ];
   };
 }
diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix
index 51deeed0a6ab..eefeca3b3329 100644
--- a/pkgs/by-name/ba/bazel-remote/package.nix
+++ b/pkgs/by-name/ba/bazel-remote/package.nix
@@ -27,13 +27,13 @@ buildGoModule rec {
     "-X main.gitCommit=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/buchgr/bazel-remote";
     description = "Remote HTTP/1.1 cache for Bazel";
     mainProgram = "bazel-remote";
     changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     teams = [ lib.teams.bazel ];
-    platforms = platforms.darwin ++ platforms.linux;
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix
index a815002957f3..7466305ac09a 100644
--- a/pkgs/by-name/ba/bazelisk/package.nix
+++ b/pkgs/by-name/ba/bazelisk/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
     "-X main.BazeliskVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "User-friendly launcher for Bazel";
     mainProgram = "bazelisk";
     longDescription = ''
@@ -31,7 +31,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/bazelbuild/bazelisk";
     changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ elasticdog ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ elasticdog ];
   };
 }
diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix
index 924bc54d3bf5..8b9ec9e60812 100644
--- a/pkgs/by-name/be/bearer/package.nix
+++ b/pkgs/by-name/be/bearer/package.nix
@@ -34,11 +34,11 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks";
     homepage = "https://github.com/bearer/bearer";
     changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}";
-    license = with licenses; [ elastic20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ elastic20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/be/beatprints/package.nix b/pkgs/by-name/be/beatprints/package.nix
index 90e90c64d91e..2e58e86b7c8b 100644
--- a/pkgs/by-name/be/beatprints/package.nix
+++ b/pkgs/by-name/be/beatprints/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     spotipy
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Create eye-catching, Pinterest-style music posters effortlessly";
     longDescription = ''
       Create eye-catching, Pinterest-style music posters effortlessly. BeatPrints integrates with Spotify and LRClib API to help you design custom posters for your favorite tracks or albums. 🍀
@@ -44,8 +44,8 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://beatprints.readthedocs.io";
     changelog = "https://github.com/TrueMyst/BeatPrints/releases/tag/v${version}";
     mainProgram = "beatprints";
-    license = licenses.cc-by-nc-sa-40;
-    maintainers = with maintainers; [ DataHearth ];
-    platforms = platforms.all;
+    license = lib.licenses.cc-by-nc-sa-40;
+    maintainers = with lib.maintainers; [ DataHearth ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/be/beluga/package.nix b/pkgs/by-name/be/beluga/package.nix
index 09d31d35607a..5b276d278aa8 100644
--- a/pkgs/by-name/be/beluga/package.nix
+++ b/pkgs/by-name/be/beluga/package.nix
@@ -36,12 +36,12 @@ ocamlPackages.buildDunePackage rec {
     cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Functional language for reasoning about formal systems";
     homepage = "https://complogic.cs.mcgill.ca/beluga";
     changelog = "https://github.com/Beluga-lang/Beluga/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.bcdarwin ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.bcdarwin ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix
index 8b569e27bcb9..7f47611c10c5 100644
--- a/pkgs/by-name/bi/bigquery-emulator/package.nix
+++ b/pkgs/by-name/bi/bigquery-emulator/package.nix
@@ -33,12 +33,12 @@ buildGoModule.override
 
     doCheck = false;
 
-    meta = with lib; {
+    meta = {
       description = "BigQuery emulator server implemented in Go.";
       homepage = "https://github.com/goccy/bigquery-emulator";
       changelog = "https://github.com/goccy/pname/releases/tag/v${version}";
-      license = licenses.mit;
-      maintainers = with maintainers; [ tarantoj ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ tarantoj ];
       mainProgram = "bigquery-emulator";
     };
   }
diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix
index db5c85034295..f317b1f80eec 100644
--- a/pkgs/by-name/bi/biodiff/package.nix
+++ b/pkgs/by-name/bi/biodiff/package.nix
@@ -26,11 +26,11 @@ rustPlatform.buildRustPackage rec {
   buildNoDefaultFeatures = true;
   buildFeatures = [ "wfa2" ];
 
-  meta = with lib; {
+  meta = {
     description = "Hex diff viewer using alignment algorithms from biology";
     homepage = "https://github.com/8051Enthusiast/biodiff";
     changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG";
-    license = licenses.mit;
-    maintainers = with maintainers; [ newam ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ newam ];
   };
 }
diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix
index 8bb1180a8fa2..9a751950ed02 100644
--- a/pkgs/by-name/bi/bird-lg/package.nix
+++ b/pkgs/by-name/bi/bird-lg/package.nix
@@ -27,12 +27,12 @@ let
 
       inherit modRoot vendorHash;
 
-      meta = with lib; {
+      meta = {
         description = "Bird Looking Glass";
         homepage = "https://github.com/xddxdd/bird-lg-go";
         changelog = "https://github.com/xddxdd/bird-lg-go/releases/tag/v${version}";
-        license = licenses.gpl3Plus;
-        maintainers = with maintainers; [
+        license = lib.licenses.gpl3Plus;
+        maintainers = with lib.maintainers; [
           tchekda
           e1mo
         ];
diff --git a/pkgs/by-name/bi/bird2/package.nix b/pkgs/by-name/bi/bird2/package.nix
index 080045ffcaa3..eb908401a6a7 100644
--- a/pkgs/by-name/bi/bird2/package.nix
+++ b/pkgs/by-name/bi/bird2/package.nix
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
 
   passthru.tests = nixosTests.bird;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
     description = "BIRD Internet Routing Daemon";
     homepage = "https://bird.network.cz";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ herbetom ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ herbetom ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix
index 9a397106203d..39b44aa73bbe 100644
--- a/pkgs/by-name/bi/bird3/package.nix
+++ b/pkgs/by-name/bi/bird3/package.nix
@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
 
   passthru.tests = nixosTests.bird;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
     description = "BIRD Internet Routing Daemon";
     homepage = "https://bird.nic.cz/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ herbetom ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ herbetom ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix
index 23bb6bb4bde5..34942572c5b1 100644
--- a/pkgs/by-name/bl/blackbox-terminal/package.nix
+++ b/pkgs/by-name/bl/blackbox-terminal/package.nix
@@ -106,16 +106,16 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [ "-Dblackbox_is_flatpak=false" ];
 
-  meta = with lib; {
+  meta = {
     description = "Beautiful GTK 4 terminal";
     mainProgram = "blackbox";
     homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
     changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       chuangzhu
       linsui
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix
index 7a090a02da59..615fd2a1fd17 100644
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -94,12 +94,12 @@ stdenv.mkDerivation rec {
     wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/blueman-project/blueman";
     description = "GTK-based Bluetooth Manager";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     changelog = "https://github.com/blueman-project/blueman/releases/tag/${version}";
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with lib.maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index 46d9f0f64ece..c9fbbdf5c48c 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "TUI-based bluetooth connection manager";
     longDescription = ''
       Bluetuith can transfer files via OBEX, perform authenticated pairing,
@@ -38,11 +38,11 @@ buildGoModule (finalAttrs: {
       devices. The TUI has mouse support.
     '';
     homepage = "https://github.com/darkhz/bluetuith";
-    changelog = "https://github.com/darkhz/bluetuith/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    changelog = "https://github.com/darkhz/bluetuith/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
     mainProgram = "bluetuith";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       pyrox0
       katexochen
     ];
diff --git a/pkgs/by-name/bl/bluewalker/package.nix b/pkgs/by-name/bl/bluewalker/package.nix
index c8bbe1bce5ba..637e1cf43d74 100644
--- a/pkgs/by-name/bl/bluewalker/package.nix
+++ b/pkgs/by-name/bl/bluewalker/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple command line Bluetooth LE scanner";
     homepage = "https://gitlab.com/jtaimisto/bluewalker";
     changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ cimm ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ cimm ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bo/bom/package.nix b/pkgs/by-name/bo/bom/package.nix
index b9dbc8eb97e0..48f8f841985f 100644
--- a/pkgs/by-name/bo/bom/package.nix
+++ b/pkgs/by-name/bo/bom/package.nix
@@ -60,12 +60,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kubernetes-sigs/bom";
     changelog = "https://github.com/kubernetes-sigs/bom/releases/tag/v${version}";
     description = "Utility to generate SPDX-compliant Bill of Materials manifests";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ developer-guy ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ developer-guy ];
     mainProgram = "bom";
   };
 }
diff --git a/pkgs/by-name/bo/bomber-go/package.nix b/pkgs/by-name/bo/bomber-go/package.nix
index 579f0c7d276f..eca18afedbdd 100644
--- a/pkgs/by-name/bo/bomber-go/package.nix
+++ b/pkgs/by-name/bo/bomber-go/package.nix
@@ -26,12 +26,12 @@ buildGoModule rec {
     "-skip=TestEnrich" # Requires network access
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to scans Software Bill of Materials (SBOMs) for vulnerabilities";
     homepage = "https://github.com/devops-kung-fu/bomber";
     changelog = "https://github.com/devops-kung-fu/bomber/releases/tag/v${version}";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     mainProgram = "bomber";
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/bo/boofuzz/package.nix b/pkgs/by-name/bo/boofuzz/package.nix
index 22a8a0d26859..9063a65785ab 100644
--- a/pkgs/by-name/bo/boofuzz/package.nix
+++ b/pkgs/by-name/bo/boofuzz/package.nix
@@ -57,12 +57,12 @@ python3.pkgs.buildPythonApplication rec {
     "boofuzz"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Network protocol fuzzing tool";
     mainProgram = "boo";
     homepage = "https://github.com/jtpereyda/boofuzz";
     changelog = "https://github.com/jtpereyda/boofuzz/blob/v${version}/CHANGELOG.rst";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 7ed428798bde..fd31acb3d4a1 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
     wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line interface to CloudFoundry BOSH";
     homepage = "https://bosh.io";
     changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ris ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ris ];
     mainProgram = "bosh";
   };
 }
diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix
index fa832eb72b7c..11e55fb718c3 100644
--- a/pkgs/by-name/bo/boundary/package.nix
+++ b/pkgs/by-name/bo/boundary/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://boundaryproject.io/";
     changelog = "https://github.com/hashicorp/boundary/blob/v${version}/CHANGELOG.md";
     description = "Enables identity-based access management for dynamic infrastructure";
@@ -67,13 +67,13 @@ stdenv.mkDerivation rec {
       and resilient. It can run in clouds, on-prem, secure enclaves and more,
       and does not require an agent to be installed on every end host.
     '';
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.bsl11;
-    maintainers = with maintainers; [
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [
       jk
       techknowlogick
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "boundary";
   };
 }
diff --git a/pkgs/by-name/br/breads-ad/package.nix b/pkgs/by-name/br/breads-ad/package.nix
index 3f897bf10806..83d446a62fd5 100644
--- a/pkgs/by-name/br/breads-ad/package.nix
+++ b/pkgs/by-name/br/breads-ad/package.nix
@@ -29,12 +29,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to evaluate Active Directory Security";
     homepage = "https://github.com/oppsec/breads";
     changelog = "https://github.com/oppsec/breads/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "breads-ad";
   };
 }
diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix
index 2a7bdc0ee24d..4d8317550801 100644
--- a/pkgs/by-name/br/brev-cli/package.nix
+++ b/pkgs/by-name/br/brev-cli/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
     mv $out/bin/brev-cli $out/bin/brev
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Connect your laptop to cloud computers";
     mainProgram = "brev";
     homepage = "https://github.com/brevdev/brev-cli";
     changelog = "https://github.com/brevdev/brev-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
   };
 }
diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix
index 611d7146bae7..f5044812fd43 100644
--- a/pkgs/by-name/br/browsr/package.nix
+++ b/pkgs/by-name/br/browsr/package.nix
@@ -85,12 +85,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_textual_app_context_path"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File explorer in your terminal";
     mainProgram = "browsr";
     homepage = "https://juftin.com/browsr";
     changelog = "https://github.com/juftin/browsr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ca/cadaver/package.nix b/pkgs/by-name/ca/cadaver/package.nix
index d6138c3ff272..398dece270f5 100644
--- a/pkgs/by-name/ca/cadaver/package.nix
+++ b/pkgs/by-name/ca/cadaver/package.nix
@@ -31,13 +31,13 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line WebDAV client";
     homepage = "https://notroj.github.io/cadaver/";
     changelog = "https://github.com/notroj/cadaver/blob/${version}/NEWS";
-    maintainers = with maintainers; [ ianwookim ];
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux ++ freebsd ++ openbsd;
+    maintainers = with lib.maintainers; [ ianwookim ];
+    license = lib.licenses.gpl2Plus;
+    platforms = with lib.platforms; linux ++ freebsd ++ openbsd;
     mainProgram = "cadaver";
   };
 }
diff --git a/pkgs/by-name/ca/caerbannog/package.nix b/pkgs/by-name/ca/caerbannog/package.nix
index f83bf38ec907..e9e10e55dc0c 100644
--- a/pkgs/by-name/ca/caerbannog/package.nix
+++ b/pkgs/by-name/ca/caerbannog/package.nix
@@ -51,12 +51,12 @@ python3.pkgs.buildPythonApplication rec {
     pygobject3
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Mobile-friendly Gtk frontend for password-store";
     mainProgram = "caerbannog";
     homepage = "https://sr.ht/~craftyguy/caerbannog/";
     changelog = "https://git.sr.ht/~craftyguy/caerbannog/refs/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index 3731792b8b48..d465097d050e 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.hostPlatform.isDarwin;
   checkTarget = "test";
 
-  meta = with lib; {
+  meta = {
     description = "Open source implementation of the actor model in C++";
     homepage = "http://actor-framework.org/";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
     changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bobakker
       tobim
     ];
diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix
index a9ebf1dcba98..bcdb14ea1a96 100644
--- a/pkgs/by-name/ca/caffeine-ng/package.nix
+++ b/pkgs/by-name/ca/caffeine-ng/package.nix
@@ -82,13 +82,13 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     mainProgram = "caffeine";
-    maintainers = with maintainers; [ marzipankaiser ];
+    maintainers = with lib.maintainers; [ marzipankaiser ];
     description = "Status bar application to temporarily inhibit screensaver and sleep mode";
     homepage = "https://codeberg.org/WhyNotHugo/caffeine-ng";
     changelog = "https://codeberg.org/WhyNotHugo/caffeine-ng/src/tag/v${version}/CHANGELOG.rst";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ca/calcurse/package.nix b/pkgs/by-name/ca/calcurse/package.nix
index 6820b0cbedab..944b7c5ef7f7 100644
--- a/pkgs/by-name/ca/calcurse/package.nix
+++ b/pkgs/by-name/ca/calcurse/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     patchPythonScript $out/bin/calcurse-caldav
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Calendar and scheduling application for the command line";
     longDescription = ''
       calcurse is a calendar and scheduling application for the command line. It helps
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://calcurse.org/";
     changelog = "https://git.calcurse.org/calcurse.git/plain/CHANGES.md?h=v${version}";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.matthiasbeyer ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.matthiasbeyer ];
   };
 }
diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 1da114cbfed4..aa44bf6eead4 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
   # At least one test is outdated
   #doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "RTSP stream access tool";
     homepage = "https://github.com/Ullaakut/cameradar";
     changelog = "https://github.com/Ullaakut/cameradar/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     # Upstream issue, doesn't build with latest curl, see
     # https://github.com/Ullaakut/cameradar/issues/320
     # https://github.com/andelf/go-curl/issues/84
diff --git a/pkgs/by-name/ca/cansina/package.nix b/pkgs/by-name/ca/cansina/package.nix
index 4e6064a1f925..66eae0ecf48f 100644
--- a/pkgs/by-name/ca/cansina/package.nix
+++ b/pkgs/by-name/ca/cansina/package.nix
@@ -29,12 +29,12 @@ python3.pkgs.buildPythonApplication rec {
     "cansina"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Web Content Discovery Tool";
     homepage = "https://github.com/deibit/cansina";
     changelog = "https://github.com/deibit/cansina/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cansina";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index ca43b5ba79cb..5df8284c775c 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -28,15 +28,15 @@ rustPlatform.buildRustPackage rec {
     ZSTD_SYS_USE_PKG_CONFIG = true;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo plugin to generate list of all licenses for a crate";
     homepage = "https://github.com/EmbarkStudios/cargo-about";
     changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       evanjs
       figsoda
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index 278182395abf..6b34ad8ae1dc 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -33,16 +33,16 @@ rustPlatform.buildRustPackage rec {
   # The tests require network access which is not available in sandboxed Nix builds.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Audit Cargo.lock files for crates with security vulnerabilities";
     mainProgram = "cargo-audit";
     homepage = "https://rustsec.org";
     changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       basvandijk
       figsoda
       jk
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 964b74826047..dd6cbc0d0e48 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -58,12 +58,12 @@ rustPlatform.buildRustPackage rec {
     "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for installing rust binaries as an alternative to building from source";
     mainProgram = "cargo-binstall";
     homepage = "https://github.com/cargo-bins/cargo-binstall";
     changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix
index 5062f8730f8f..8ce9fcd547ed 100644
--- a/pkgs/by-name/ca/cargo-binutils/package.nix
+++ b/pkgs/by-name/ca/cargo-binutils/package.nix
@@ -16,18 +16,18 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-QdW0HiVhKFuXj7hWZw1lkrFmvVIqbeMKRF2qnBX9wRI=";
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
     longDescription = ''
       In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. fenix or rust-overlay)
     '';
     homepage = "https://github.com/rust-embedded/cargo-binutils";
     changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       stupremee
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix
index 7cd88d36d85a..3624b19e5388 100644
--- a/pkgs/by-name/ca/cargo-c/package.nix
+++ b/pkgs/by-name/ca/cargo-c/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
     inherit rav1e;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to build and install C-ABI compatible dynamic and static libraries";
     longDescription = ''
       Cargo C-ABI helpers. A cargo applet that produces and installs a correct
@@ -60,8 +60,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/lu-zero/cargo-c";
     changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       cpu
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-clone/package.nix b/pkgs/by-name/ca/cargo-clone/package.nix
index 976846a2920d..bbcdf021a999 100644
--- a/pkgs/by-name/ca/cargo-clone/package.nix
+++ b/pkgs/by-name/ca/cargo-clone/package.nix
@@ -31,16 +31,16 @@ rustPlatform.buildRustPackage rec {
   # requires internet access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to fetch the source code of a Rust crate";
     mainProgram = "cargo-clone";
     homepage = "https://github.com/janlikar/cargo-clone";
     changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
       janlikar
diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix
index 70ecd4445845..e0236a966699 100644
--- a/pkgs/by-name/ca/cargo-cross/package.nix
+++ b/pkgs/by-name/ca/cargo-cross/package.nix
@@ -32,15 +32,15 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Zero setup cross compilation and cross testing";
     homepage = "https://github.com/cross-rs/cross";
     changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ otavio ];
+    maintainers = with lib.maintainers; [ otavio ];
     mainProgram = "cross";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index 56d9951cb20a..73d187923c05 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec {
       # assumes the target is x86_64-unknown-linux-gnu
       "--skip simple_project::it_checks_okay_project_correctly";
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to check rust documentation for broken links";
     homepage = "https://github.com/deadlinks/cargo-deadlinks";
     changelog = "https://github.com/deadlinks/cargo-deadlinks/blob/${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       newam
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 6e8cf25fc729..8d065e935b82 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -35,16 +35,16 @@ rustPlatform.buildRustPackage rec {
   # tests require internet access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cargo plugin for linting your dependencies";
     mainProgram = "cargo-deny";
     homepage = "https://github.com/EmbarkStudios/cargo-deny";
     changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
       jk
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index a8310189dc1e..ab3e9c9eb947 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-crdRRlRi3H8j/ojGH+oqmaeSS8ee8dUALorZPWE/j1Y=";
 
-  meta = with lib; {
+  meta = {
     description = "Help computing optimal include directives for your Cargo.toml manifest";
     mainProgram = "cargo-diet";
     homepage = "https://github.com/the-lean-crate/cargo-diet";
     changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix
index ac2195ee3cb0..4a634bf4c5f4 100644
--- a/pkgs/by-name/ca/cargo-docset/package.nix
+++ b/pkgs/by-name/ca/cargo-docset/package.nix
@@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to generate a Dash/Zeal docset for your Rust packages";
     mainProgram = "cargo-docset";
     homepage = "https://github.com/Robzz/cargo-docset";
     changelog = "https://github.com/Robzz/cargo-docset/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       colinsane
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index 385328f1b2d2..d551fce1c0fb 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -30,15 +30,15 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false; # integration tests depend on changing cargo config
 
-  meta = with lib; {
+  meta = {
     description = "Utility for managing cargo dependencies from the command line";
     homepage = "https://github.com/killercup/cargo-edit";
     changelog = "https://github.com/killercup/cargo-edit/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       figsoda
       gerschtli
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 44d329130cdc..76738b936e28 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-4HH25MEj3iCrm9iCW8vWVMDou/F3YidRIWDH0m5FTaY=";
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";
     changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       xrelkd
     ];
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 668174e7aede..23582ad3c2bf 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -71,16 +71,16 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to generate a new Rust project by leveraging a pre-existing git repository as a template";
     mainProgram = "cargo-generate";
     homepage = "https://github.com/cargo-generate/cargo-generate";
     changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       turbomack
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index df9814680e37..5bff041d9852 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -19,15 +19,15 @@ rustPlatform.buildRustPackage rec {
   # some necessary files are absent in the crate version
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand to provide various options useful for testing and continuous integration";
     mainProgram = "cargo-hack";
     homepage = "https://github.com/taiki-e/cargo-hack";
     changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 0cb1c621bf54..2b90c750b2c8 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -29,13 +29,13 @@ rustPlatform.buildRustPackage rec {
     "--skip=env::test_get_cargo_workspace_manifest_dir"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand for snapshot testing";
     mainProgram = "cargo-insta";
     homepage = "https://github.com/mitsuhiko/insta";
     changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       figsoda
       oxalica
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 21527f9b2e59..fad103ebb5b3 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
   buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise
   doCheck = false; # Check phase tries to query crates.io
 
-  meta = with lib; {
+  meta = {
     description = "Build tool for the Leptos web framework";
     mainProgram = "cargo-leptos";
     homepage = "https://github.com/leptos-rs/cargo-leptos";
     changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ benwis ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ benwis ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 949d6ecfd317..168f11fc140e 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "cli" ];
 
-  meta = with lib; {
+  meta = {
     description = "Self-contained Cargo.lock parser with graph analysis";
     mainProgram = "cargo-lock";
     homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock";
     changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index 71ef2c04fe79..7a268ba39902 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec {
   #   https://travis-ci.org/sagiegurari/cargo-make
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Rust task runner and build tool";
     homepage = "https://github.com/sagiegurari/cargo-make";
     changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       figsoda
       xrelkd
     ];
diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index d76f344a63a6..4b6eb80123f6 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ];
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand for displaying when Rust dependencies are out of date";
     mainProgram = "cargo-outdated";
     homepage = "https://github.com/kbknapp/cargo-outdated";
     changelog = "https://github.com/kbknapp/cargo-outdated/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       ivan
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 2003550946e9..e179d9307c5a 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec {
   # Tests fail
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations";
     mainProgram = "cargo-public-api";
     homepage = "https://github.com/Enselic/cargo-public-api";
     changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index 5594a8602be1..1f72395db33c 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -16,12 +16,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8=";
 
-  meta = with lib; {
+  meta = {
     description = "Cargo command to create the README.md from your crate's documentation";
     mainProgram = "cargo-rdme";
     homepage = "https://github.com/orium/cargo-rdme";
     changelog = "https://github.com/orium/cargo-rdme/blob/v${version}/release-notes.md";
-    license = with licenses; [ mpl20 ];
-    maintainers = with maintainers; [ GoldsteinE ];
+    license = with lib.licenses; [ mpl20 ];
+    maintainers = with lib.maintainers; [ GoldsteinE ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 8d755e78ef27..e866adbec781 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -44,16 +44,16 @@ rustPlatform.buildRustPackage rec {
   # disable vendored-libgit2 and vendored-openssl
   buildNoDefaultFeatures = true;
 
-  meta = with lib; {
+  meta = {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';
     mainProgram = "cargo-release";
     homepage = "https://github.com/crate-ci/cargo-release";
     changelog = "https://github.com/crate-ci/cargo-release/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       gerschtli
     ];
diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix
index 1e1218aa0957..f723a11f2ffb 100644
--- a/pkgs/by-name/ca/cargo-run-bin/package.nix
+++ b/pkgs/by-name/ca/cargo-run-bin/package.nix
@@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec {
   # multiple impurities in tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions";
     mainProgram = "cargo-bin";
     homepage = "https://github.com/dustinblackman/cargo-run-bin";
     changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       mightyiam
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 9294970a3ae8..9cfb0546a5f3 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -38,15 +38,15 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand showing the assembly, LLVM-IR and MIR generated for Rust code";
     homepage = "https://github.com/pacak/cargo-show-asm";
     changelog = "https://github.com/pacak/cargo-show-asm/blob/${version}/Changelog.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       oxalica
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index ae77b19ed36b..3884d4d3ec9a 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-nQ1g0rBWx7yHQO9U/J0/XI76quEAvpCyhZDcTJKYYXo=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";
     mainProgram = "cargo-sort";
     homepage = "https://github.com/devinr528/cargo-sort";
     changelog = "https://github.com/devinr528/cargo-sort/blob/v${version}/changelog.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index e253a5be5d1c..74cc763fd7a2 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec {
     "--skip=tests::e2e::issue_226"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Checks rust documentation for spelling and grammar mistakes";
     mainProgram = "cargo-spellcheck";
     homepage = "https://github.com/drahnr/cargo-spellcheck";
     changelog = "https://github.com/drahnr/cargo-spellcheck/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       newam
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
index f80d99c916e6..20c97887676f 100644
--- a/pkgs/by-name/ca/cargo-sync-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix
@@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-A1LZKENNOcgUz6eacUo9WCKIZWA7dJa0zuZrgzRr/Js=";
 
-  meta = with lib; {
+  meta = {
     description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation";
     mainProgram = "cargo-sync-readme";
     homepage = "https://github.com/phaazon/cargo-sync-readme";
     changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       b4dm4n
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index 60a15283ddd7..0caf6b7bec2b 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-9p5IfGfOWyDanaUt1h6bnq4mDxp+VdU4scNdWGRiWYE=";
 
-  meta = with lib; {
+  meta = {
     description = "Graph the number of crates that depend on your crate over time";
     mainProgram = "cargo-tally";
     homepage = "https://github.com/dtolnay/cargo-tally";
     changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix
index 19b9758d1eee..781a5f3bb6b8 100644
--- a/pkgs/by-name/ca/cargo-toml-lint/package.nix
+++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix
@@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ymf91oCLOY5vo1pncCT83j3k8wyLEwAl3/8lnAyPdzI=";
 
-  meta = with lib; {
+  meta = {
     description = "Simple linter for Cargo.toml manifests";
     mainProgram = "cargo-toml-lint";
     homepage = "https://github.com/fuellabs/cargo-toml-lint";
     changelog = "https://github.com/fuellabs/cargo-toml-lint/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       mitchmindtree
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index d59ff0f0ac72..ae4f18708aa6 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -58,17 +58,17 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
-  meta = with lib; {
+  meta = {
     description = "GUI for Cargo";
     mainProgram = "cargo-ui";
     homepage = "https://github.com/slint-ui/cargo-ui";
     changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
       gpl3Only
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 034b7544eed2..2055f9a621b5 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -63,12 +63,12 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cargo subcommand for checking and applying updates to installed executables";
     homepage = "https://github.com/nabijaczleweli/cargo-update";
     changelog = "https://github.com/nabijaczleweli/cargo-update/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       gerschtli
       Br1ght0ne
       johntitor
diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index 59befd9ae071..1a0330e8d9e0 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     LIBSSH2_SYS_USE_PKG_CONFIG = true;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for managing cargo workspaces and their crates, inspired by lerna";
     longDescription = ''
       A tool that optimizes the workflow around cargo workspaces with
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/pksunkara/cargo-workspaces";
     changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       macalinao
       matthiasbeyer
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 856ef613ceaa..3832271ed291 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${zig}/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to compile Cargo projects with zig as the linker";
     mainProgram = "cargo-zigbuild";
     homepage = "https://github.com/messense/cargo-zigbuild";
     changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ca/cariddi/package.nix b/pkgs/by-name/ca/cariddi/package.nix
index ccfb76d9c86c..c0c5f7ce4c54 100644
--- a/pkgs/by-name/ca/cariddi/package.nix
+++ b/pkgs/by-name/ca/cariddi/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Crawler for URLs and endpoints";
     homepage = "https://github.com/edoardottt/cariddi";
     changelog = "https://github.com/edoardottt/cariddi/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cariddi";
   };
 }
diff --git a/pkgs/by-name/ca/cascadia-code/package.nix b/pkgs/by-name/ca/cascadia-code/package.nix
index 6537e3a013be..d90c981f65d5 100644
--- a/pkgs/by-name/ca/cascadia-code/package.nix
+++ b/pkgs/by-name/ca/cascadia-code/package.nix
@@ -33,12 +33,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
     homepage = "https://github.com/microsoft/cascadia-code";
-    changelog = "https://github.com/microsoft/cascadia-code/raw/v${version}/FONTLOG.txt";
-    license = licenses.ofl;
-    maintainers = with maintainers; [ ryanccn ];
-    platforms = platforms.all;
+    changelog = "https://github.com/microsoft/cascadia-code/raw/v${finalAttrs.version}/FONTLOG.txt";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ ryanccn ];
+    platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/cd/cdecrypt/package.nix b/pkgs/by-name/cd/cdecrypt/package.nix
index e74a63e04b4c..91ce7bc654eb 100644
--- a/pkgs/by-name/cd/cdecrypt/package.nix
+++ b/pkgs/by-name/cd/cdecrypt/package.nix
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
     install -Dm755 cdecrypt $out/bin/cdecrypt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Utility that decrypts Wii U NUS content files";
     mainProgram = "cdecrypt";
     homepage = "https://github.com/VitaSmith/cdecrypt";
     changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ hughobrien ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ hughobrien ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix
index 9190ae9696ca..7e4488c0a1ae 100644
--- a/pkgs/by-name/cd/cdk-go/package.nix
+++ b/pkgs/by-name/cd/cdk-go/package.nix
@@ -21,12 +21,12 @@ buildGoModule rec {
   # At least one test is outdated
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Container penetration toolkit";
     homepage = "https://github.com/cdk-team/CDK";
     changelog = "https://github.com/cdk-team/CDK/releases/tag/v${version}";
-    license = with licenses; [ gpl2Only ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl2Only ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cdk";
     broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
   };
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 938ac9acdbef..ad40764e26d7 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
       --replace-fail "TestCheckDNSResponse" "SkipTestCheckDNSResponse"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect various technology for a given IP address";
     homepage = "https://github.com/projectdiscovery/cdncheck";
     changelog = "https://github.com/projectdiscovery/cdncheck/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cdncheck";
   };
 }
diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix
index b11bb02e4cf2..46d7367b4c63 100644
--- a/pkgs/by-name/ce/cent/package.nix
+++ b/pkgs/by-name/ce/cent/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to handle Nuclei community templates";
     homepage = "https://github.com/xm1k3/cent";
     changelog = "https://github.com/xm1k3/cent/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "cent";
   };
 }
diff --git a/pkgs/by-name/ce/cero/package.nix b/pkgs/by-name/ce/cero/package.nix
index 77c88389a9c2..ade109dc9694 100644
--- a/pkgs/by-name/ce/cero/package.nix
+++ b/pkgs/by-name/ce/cero/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Tests are comparing output
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Scrape domain names from SSL certificates of arbitrary hosts";
     homepage = "https://github.com/glebarez/cero";
     changelog = "https://github.com/glebarez/cero/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cero";
   };
 }
diff --git a/pkgs/by-name/ch/chain-bench/package.nix b/pkgs/by-name/ch/chain-bench/package.nix
index 3bcbe63a2955..e46c05ba6767 100644
--- a/pkgs/by-name/ch/chain-bench/package.nix
+++ b/pkgs/by-name/ch/chain-bench/package.nix
@@ -40,7 +40,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/aquasecurity/chain-bench";
     changelog = "https://github.com/aquasecurity/chain-bench/releases/tag/v${version}";
     description = "Open-source tool for auditing your software supply chain stack for security compliance based on a new CIS Software Supply Chain benchmark";
@@ -53,7 +53,7 @@ buildGoModule rec {
       hackers and protect your sensitive data and customer trust, you need to
       ensure your code is compliant with your organization's policies.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/ch/changelogger/package.nix b/pkgs/by-name/ch/changelogger/package.nix
index 75f4e32ce76b..593f0a39bb80 100644
--- a/pkgs/by-name/ch/changelogger/package.nix
+++ b/pkgs/by-name/ch/changelogger/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
       --zsh <($out/bin/changelogger completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to manage your changelog file in Markdown";
     homepage = "https://github.com/MarkusFreitag/changelogger";
     changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tomsiewert ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomsiewert ];
     mainProgram = "changelogger";
   };
 }
diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index dee815b93261..ca9913242849 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -35,13 +35,13 @@ buildGoModule rec {
       --zsh <($out/bin/changie completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Automated changelog tool for preparing releases with lots of customization options";
     mainProgram = "changie";
     homepage = "https://changie.dev";
     changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix
index 983709dd0fb4..d3a5d44bb67b 100644
--- a/pkgs/by-name/ch/chaos/package.nix
+++ b/pkgs/by-name/ch/chaos/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to communicate with Chaos DNS API";
     homepage = "https://github.com/projectdiscovery/chaos-client";
     changelog = "https://github.com/projectdiscovery/chaos-client/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "chaos";
   };
 }
diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix
index d5da8ac2253c..c6e45464d7ec 100644
--- a/pkgs/by-name/ch/charm-freeze/package.nix
+++ b/pkgs/by-name/ch/charm-freeze/package.nix
@@ -23,13 +23,13 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to generate images of code and terminal output";
     mainProgram = "freeze";
     homepage = "https://github.com/charmbracelet/freeze";
     changelog = "https://github.com/charmbracelet/freeze/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       caarlos0
       maaslalani
     ];
diff --git a/pkgs/by-name/ch/charm/package.nix b/pkgs/by-name/ch/charm/package.nix
index 908df7793a2d..0f787108760b 100644
--- a/pkgs/by-name/ch/charm/package.nix
+++ b/pkgs/by-name/ch/charm/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Manage your charm account on the CLI";
     homepage = "https://github.com/charmbracelet/charm";
     changelog = "https://github.com/charmbracelet/charm/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ penguwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ penguwin ];
     mainProgram = "charm";
   };
 }
diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix
index 219492583f40..6f5ccb4f6396 100644
--- a/pkgs/by-name/ch/checkip/package.nix
+++ b/pkgs/by-name/ch/checkip/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Requires network
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool that checks an IP address using various public services";
     homepage = "https://github.com/jreisinger/checkip";
     changelog = "https://github.com/jreisinger/checkip/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "checkip";
   };
 }
diff --git a/pkgs/by-name/ch/checkmate/package.nix b/pkgs/by-name/ch/checkmate/package.nix
index 573323dd27c7..4fadc4269d3a 100644
--- a/pkgs/by-name/ch/checkmate/package.nix
+++ b/pkgs/by-name/ch/checkmate/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  meta = with lib; {
+  meta = {
     description = "Pluggable code security analysis tool";
     mainProgram = "checkmate";
     homepage = "https://github.com/adedayo/checkmate";
     changelog = "https://github.com/adedayo/checkmate/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 96ee86a8bf83..0a4e982acc8f 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -179,7 +179,7 @@ python3.pkgs.buildPythonApplication rec {
     chmod +x $out/bin/checkov
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Static code analysis tool for infrastructure-as-code";
     homepage = "https://github.com/bridgecrewio/checkov";
     changelog = "https://github.com/bridgecrewio/checkov/releases/tag/${version}";
@@ -187,8 +187,8 @@ python3.pkgs.buildPythonApplication rec {
       Prevent cloud misconfigurations during build-time for Terraform, Cloudformation,
       Kubernetes, Serverless framework and other infrastructure-as-code-languages.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       anhdle14
       fab
     ];
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index 4c63aa50be43..b9b24bc01892 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_cli_"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Check Have I Been Pwned and see if it's time for you to change passwords";
     homepage = "https://github.com/brycx/checkpwn";
     changelog = "https://github.com/brycx/checkpwn/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "checkpwn";
   };
 }
diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index 30360005a572..4eba309ae90a 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Checks Java source against a coding standard";
     mainProgram = "checkstyle";
     longDescription = ''
@@ -38,9 +38,9 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://checkstyle.org/";
     changelog = "https://checkstyle.org/releasenotes.html#Release_${version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ pSub ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ pSub ];
     platforms = jre.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix
index e1113fbebe08..6742b32ed5a0 100644
--- a/pkgs/by-name/ch/cheese/package.nix
+++ b/pkgs/by-name/ch/cheese/package.nix
@@ -109,13 +109,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/cheese";
     changelog = "https://gitlab.gnome.org/GNOME/cheese/-/blob/${version}/NEWS?ref_type=tags";
     description = "Take photos and videos with your webcam, with fun graphical effects";
     mainProgram = "cheese";
-    maintainers = with maintainers; [ aleksana ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ aleksana ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix
index b1ea2ba7875a..880ad8adc26a 100644
--- a/pkgs/by-name/ch/cherrybomb/package.nix
+++ b/pkgs/by-name/ch/cherrybomb/package.nix
@@ -16,12 +16,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4=";
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications";
     mainProgram = "cherrybomb";
     homepage = "https://github.com/blst-security/cherrybomb";
     changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix
index f5aabdd2a7d9..9ebca5d016d6 100644
--- a/pkgs/by-name/ch/chisel/package.nix
+++ b/pkgs/by-name/ch/chisel/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   # Tests require access to the network
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "TCP/UDP tunnel over HTTP";
     longDescription = ''
       Chisel is a fast TCP/UDP tunnel, transported over HTTP, secured via
@@ -36,7 +36,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/jpillora/chisel";
     changelog = "https://github.com/jpillora/chisel/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/cl/clair/package.nix b/pkgs/by-name/cl/clair/package.nix
index fc020d500d9a..1ea22716e0ca 100644
--- a/pkgs/by-name/cl/clair/package.nix
+++ b/pkgs/by-name/cl/clair/package.nix
@@ -45,11 +45,11 @@ buildGoModule rec {
       }"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Vulnerability Static Analysis for Containers";
     homepage = "https://github.com/quay/clair";
     changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/cl/clairvoyance/package.nix b/pkgs/by-name/cl/clairvoyance/package.nix
index 4e93632a0a2c..986f22edecf2 100644
--- a/pkgs/by-name/cl/clairvoyance/package.nix
+++ b/pkgs/by-name/cl/clairvoyance/package.nix
@@ -46,12 +46,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_probe_typename"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to obtain GraphQL API schemas";
     mainProgram = "clairvoyance";
     homepage = "https://github.com/nikitastupin/clairvoyance";
     changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 894aa3e34bd5..05b2129ab61c 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -46,12 +46,12 @@ buildNpmPackage rec {
       --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/CleverCloud/clever-tools";
     changelog = "https://github.com/CleverCloud/clever-tools/blob/${version}/CHANGELOG.md";
     description = "Deploy on Clever Cloud and control your applications, add-ons, services from command line";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "clever";
-    teams = [ teams.clevercloud ];
+    teams = [ lib.teams.clevercloud ];
   };
 }
diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix
index 482a230e06ef..ab5303e5d991 100644
--- a/pkgs/by-name/cl/clj-kondo/package.nix
+++ b/pkgs/by-name/cl/clj-kondo/package.nix
@@ -21,13 +21,13 @@ buildGraalvmNativeImage rec {
     "--no-fallback"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Linter for Clojure code that sparks joy";
     homepage = "https://github.com/clj-kondo/clj-kondo";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.epl10;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.epl10;
     changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jlesquembre
       bandresen
     ];
diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix
index 6f44e5b9928d..eee267c6bdef 100644
--- a/pkgs/by-name/cl/cljfmt/package.nix
+++ b/pkgs/by-name/cl/cljfmt/package.nix
@@ -33,13 +33,13 @@ buildGraalvmNativeImage rec {
     command = "cljfmt --version";
   };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "cljfmt";
     description = "Tool for formatting Clojure code";
     homepage = "https://github.com/weavejester/cljfmt";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.epl10;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.epl10;
     changelog = "https://github.com/weavejester/cljfmt/blob/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ sg-qwt ];
+    maintainers = with lib.maintainers; [ sg-qwt ];
   };
 }
diff --git a/pkgs/by-name/cl/cloud-custodian/package.nix b/pkgs/by-name/cl/cloud-custodian/package.nix
index 32c2ce5cba80..bfd0f20b40ec 100644
--- a/pkgs/by-name/cl/cloud-custodian/package.nix
+++ b/pkgs/by-name/cl/cloud-custodian/package.nix
@@ -45,12 +45,12 @@ python3.pkgs.buildPythonApplication rec {
     $out/bin/custodian --help
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Rules engine for cloud security, cost optimization, and governance";
     homepage = "https://cloudcustodian.io";
     changelog = "https://github.com/cloud-custodian/cloud-custodian/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bhipple ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bhipple ];
     mainProgram = "custodian";
   };
 }
diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 8fd36de84f8a..dd69eb54ae2c 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -42,16 +42,16 @@ rustPlatform.buildRustPackage rec {
     "vmm" # /dev/kvm
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
     description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM";
     changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       bsd3
     ];
     mainProgram = "cloud-hypervisor";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       offline
       qyliss
     ];
diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index b24e1aaa58ad..de5d9e0710b0 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
     wrapProgram $out/bin/cloud-nuke --set-default DISABLE_TELEMETRY true
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gruntwork-io/cloud-nuke";
     description = "Tool for cleaning up your cloud accounts by nuking (deleting) all resources within it";
     mainProgram = "cloud-nuke";
     changelog = "https://github.com/gruntwork-io/cloud-nuke/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
index 8bdae4ce9b3f..59097f80307d 100644
--- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion { package = cloudflare-dynamic-dns; };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/Zebradil/cloudflare-dynamic-dns/blob/${version}/CHANGELOG.md";
     description = "Dynamic DNS client for Cloudflare";
     homepage = "https://github.com/Zebradil/cloudflare-dynamic-dns";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "cloudflare-dynamic-dns";
-    maintainers = [ maintainers.zebradil ];
+    maintainers = [ lib.maintainers.zebradil ];
   };
 }
diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index 76c098576006..be176f3ba897 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -77,13 +77,13 @@ buildGoModule rec {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client";
     homepage = "https://www.cloudflare.com/products/tunnel";
     changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}";
-    license = licenses.asl20;
-    platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+    maintainers = with lib.maintainers; [
       bbigras
       enorris
       thoughtpolice
diff --git a/pkgs/by-name/cl/cloudfox/package.nix b/pkgs/by-name/cl/cloudfox/package.nix
index 01e00de947a4..bf60a1c86973 100644
--- a/pkgs/by-name/cl/cloudfox/package.nix
+++ b/pkgs/by-name/cl/cloudfox/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Some tests are failing because of wrong filename/path
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for situational awareness of cloud penetration tests";
     homepage = "https://github.com/BishopFox/cloudfox";
     changelog = "https://github.com/BishopFox/cloudfox/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cloudfox";
   };
 }
diff --git a/pkgs/by-name/cl/cloudhunter/package.nix b/pkgs/by-name/cl/cloudhunter/package.nix
index b6a4c79e17bd..a175b24bfe41 100644
--- a/pkgs/by-name/cl/cloudhunter/package.nix
+++ b/pkgs/by-name/cl/cloudhunter/package.nix
@@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cloud bucket scanner";
     mainProgram = "cloudhunter";
     homepage = "https://github.com/belane/CloudHunter";
     changelog = "https://github.com/belane/CloudHunter/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index 74372b7a2ae0..af10f9c3bf07 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for listing assets from multiple cloud providers";
     homepage = "https://github.com/projectdiscovery/cloudlist";
     changelog = "https://github.com/projectdiscovery/cloudlist/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cloudlist";
   };
 }
diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix
index 5e30337695fe..b8125b3d7cbb 100644
--- a/pkgs/by-name/cl/cloudrecon/package.nix
+++ b/pkgs/by-name/cl/cloudrecon/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to find assets from certificates";
     homepage = "https://github.com/g0ldencybersec/CloudRecon";
     changelog = "https://github.com/g0ldencybersec/CloudRecon/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cloudrecon";
   };
 }
diff --git a/pkgs/by-name/cl/cloudsmith-cli/package.nix b/pkgs/by-name/cl/cloudsmith-cli/package.nix
index 7eef1ae64902..130676bcc1dc 100644
--- a/pkgs/by-name/cl/cloudsmith-cli/package.nix
+++ b/pkgs/by-name/cl/cloudsmith-cli/package.nix
@@ -81,13 +81,13 @@ python3.pkgs.buildPythonApplication rec {
     cd "$out"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://help.cloudsmith.io/docs/cli/";
     description = "Cloudsmith Command Line Interface";
     mainProgram = "cloudsmith";
     changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md";
-    maintainers = [ ];
-    license = licenses.asl20;
-    platforms = with platforms; unix;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.asl20;
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/cm/cmark-gfm/package.nix b/pkgs/by-name/cm/cmark-gfm/package.nix
index 48c1b6ec8b3b..645a7aabfbce 100644
--- a/pkgs/by-name/cm/cmark-gfm/package.nix
+++ b/pkgs/by-name/cm/cmark-gfm/package.nix
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C";
     mainProgram = "cmark-gfm";
     homepage = "https://github.com/github/cmark-gfm";
     changelog = "https://github.com/github/cmark-gfm/raw/${version}/changelog.txt";
-    maintainers = with maintainers; [ cyplo ];
-    platforms = platforms.unix;
-    license = licenses.bsd2;
+    maintainers = with lib.maintainers; [ cyplo ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/by-name/cm/cmark/package.nix b/pkgs/by-name/cm/cmark/package.nix
index 690f3cbe3aaf..09ab6e6f9d93 100644
--- a/pkgs/by-name/cm/cmark/package.nix
+++ b/pkgs/by-name/cm/cmark/package.nix
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
       export ${lib_path}=$(readlink -f ./src)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "CommonMark parsing and rendering library and program in C";
     mainProgram = "cmark";
     homepage = "https://github.com/commonmark/cmark";
     changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt";
-    maintainers = [ maintainers.michelk ];
-    platforms = platforms.all;
-    license = licenses.bsd2;
+    maintainers = [ lib.maintainers.michelk ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index a73b10d0a012..351d3c6e6238 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cloud-native, graph-based asset inventory";
     longDescription = ''
       cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of
@@ -33,7 +33,7 @@ buildGoModule rec {
     '';
     homepage = "https://mondoo.com/cnquery";
     changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}";
-    license = licenses.bsl11;
-    maintainers = with maintainers; [ mariuskimmina ];
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [ mariuskimmina ];
   };
 }
diff --git a/pkgs/by-name/co/cobra-cli/package.nix b/pkgs/by-name/co/cobra-cli/package.nix
index e17156a45a5e..11b8b80e98c1 100644
--- a/pkgs/by-name/co/cobra-cli/package.nix
+++ b/pkgs/by-name/co/cobra-cli/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
       --prefix PATH : ${go}/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cobra CLI tool to generate applications and commands";
     mainProgram = "cobra-cli";
     homepage = "https://github.com/spf13/cobra-cli/";
     changelog = "https://github.com/spf13/cobra-cli/releases/tag/${version}";
-    license = licenses.afl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.afl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index bb017ebf0fef..a4302b7b62eb 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -39,13 +39,13 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "pages";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       laurent-f1z1
       christoph-heiss
     ];
-    license = licenses.eupl12;
+    license = lib.licenses.eupl12;
     homepage = "https://codeberg.org/Codeberg/pages-server";
     description = "Static websites hosting from Gitea repositories";
     changelog = "https://codeberg.org/Codeberg/pages-server/releases/tag/v${version}";
diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix
index 110f262805ca..0ef2581ad3ad 100644
--- a/pkgs/by-name/co/codechecker/package.nix
+++ b/pkgs/by-name/co/codechecker/package.nix
@@ -110,19 +110,19 @@ python3Packages.buildPythonApplication rec {
     }
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Ericsson/codechecker";
     changelog = "https://github.com/Ericsson/codechecker/releases/tag/v${version}";
     description = "Analyzer tooling, defect database and viewer extension for the Clang Static Analyzer and Clang Tidy";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       llvm-exception
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       zebreus
       felixsinger
     ];
     mainProgram = "CodeChecker";
-    platforms = platforms.darwin ++ platforms.linux;
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/co/coercer/package.nix b/pkgs/by-name/co/coercer/package.nix
index c5f63e35efd4..1d88309a9106 100644
--- a/pkgs/by-name/co/coercer/package.nix
+++ b/pkgs/by-name/co/coercer/package.nix
@@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec {
     rm Coercer.py
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to automatically coerce a Windows server";
     homepage = "https://github.com/p0dalirius/Coercer";
     changelog = "https://github.com/p0dalirius/Coercer/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "coercer";
   };
 }
diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix
index 26d3d9eb6ba8..9fe336fb1c6f 100644
--- a/pkgs/by-name/co/coinlive/package.nix
+++ b/pkgs/by-name/co/coinlive/package.nix
@@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Live cryptocurrency prices CLI";
     homepage = "https://github.com/mayeranalytics/coinlive";
     changelog = "https://github.com/mayeranalytics/coinlive/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "coinlive";
   };
 }
diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix
index 45ca63918896..5f1ce29d72d9 100644
--- a/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec {
     command = "commitmsgfmt -V";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.com/mkjeldsen/commitmsgfmt";
     changelog = "https://gitlab.com/mkjeldsen/commitmsgfmt/-/raw/v${version}/CHANGELOG.md";
     description = "Formats commit messages better than fmt(1) and Vim";
     mainProgram = "commitmsgfmt";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mmlb ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mmlb ];
   };
 }
diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix
index 1e574f50eb65..c3e6502e1e90 100644
--- a/pkgs/by-name/co/commix/package.nix
+++ b/pkgs/by-name/co/commix/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Automated Command Injection Exploitation Tool";
     mainProgram = "commix";
     homepage = "https://github.com/commixproject/commix";
     changelog = "https://github.com/commixproject/commix/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix
index 3b2ce0093d42..d88f930b29a5 100644
--- a/pkgs/by-name/co/comodoro/package.nix
+++ b/pkgs/by-name/co/comodoro/package.nix
@@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/comodoro completion zsh)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI to manage your time";
     homepage = "https://github.com/pimalaya/comodoro";
     changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ soywod ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ soywod ];
     mainProgram = "comodoro";
   };
 }
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 7dbfa6951bd2..57c09318b152 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE=";
 
-  meta = with lib; {
+  meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
     mainProgram = "comrak";
     homepage = "https://github.com/kivikakk/comrak";
     changelog = "https://github.com/kivikakk/comrak/blob/v${version}/changelog.txt";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
       figsoda
       kivikakk
     ];
diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix
index ebf74e92eb16..84db874f792b 100644
--- a/pkgs/by-name/co/conkeyscan/package.nix
+++ b/pkgs/by-name/co/conkeyscan/package.nix
@@ -57,12 +57,12 @@ python.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "conkeyscan" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to scan Confluence for keywords";
     homepage = "https://github.com/CompassSecurity/conkeyscan";
     changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "conkeyscan";
   };
 }
diff --git a/pkgs/by-name/co/conpass/package.nix b/pkgs/by-name/co/conpass/package.nix
index f690bc8c62e1..97227fa361c6 100644
--- a/pkgs/by-name/co/conpass/package.nix
+++ b/pkgs/by-name/co/conpass/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "conpass" ];
 
-  meta = with lib; {
+  meta = {
     description = "Continuous password spraying tool";
     homepage = "https://github.com/login-securite/conpass";
     changelog = "https://github.com/login-securite/conpass/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "conpass";
   };
 }
diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index ff04f86b7aef..698edd0fd940 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -50,13 +50,13 @@ buildGoModule rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for service discovery, monitoring and configuration";
     changelog = "https://github.com/hashicorp/consul/releases/tag/v${version}";
     homepage = "https://www.consul.io/";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = licenses.bsl11;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [
       adamcstephens
       pradeepchhetri
       vdemeester
diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix
index 5ac86025b6bb..a8b4ee852d4c 100644
--- a/pkgs/by-name/co/container2wasm/package.nix
+++ b/pkgs/by-name/co/container2wasm/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "cmd/c2w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Container to WASM converter";
     homepage = "https://github.com/ktock/container2wasm";
     changelog = "https://github.com/ktock/container2wasm/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "c2w";
   };
 }
diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix
index c7f1c7af4d85..f7f8bcbe45ad 100644
--- a/pkgs/by-name/co/copilot-cli/package.nix
+++ b/pkgs/by-name/co/copilot-cli/package.nix
@@ -45,12 +45,12 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Build, Release and Operate Containerized Applications on AWS";
     homepage = "https://github.com/aws/copilot-cli";
     changelog = "https://github.com/aws/copilot-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jiegec ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jiegec ];
     mainProgram = "copilot";
   };
 }
diff --git a/pkgs/by-name/co/coreth/package.nix b/pkgs/by-name/co/coreth/package.nix
index b033e6a5b642..d59c6e6e7e68 100644
--- a/pkgs/by-name/co/coreth/package.nix
+++ b/pkgs/by-name/co/coreth/package.nix
@@ -35,11 +35,11 @@ buildGoModule rec {
 
   postInstall = "mv $out/bin/{plugin,evm}";
 
-  meta = with lib; {
+  meta = {
     description = "Code and wrapper to extract Ethereum blockchain functionalities without network/consensus, for building custom blockchain services";
     homepage = "https://github.com/ava-labs/coreth";
     changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index 9bd5ea132869..26cd5ab12e56 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
 
   passthru.tests.coturn = nixosTests.coturn;
 
-  meta = with lib; {
+  meta = {
     description = "TURN server";
     homepage = "https://coturn.net/";
     changelog = "https://github.com/coturn/coturn/blob/${version}/ChangeLog";
-    license = with licenses; [ bsd3 ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = with lib.licenses; [ bsd3 ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     broken = stdenv.hostPlatform.isDarwin; # 2018-10-21
   };
 }
diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index c459e6555e63..ad852eb5ed1d 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -28,12 +28,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Bitmap programming font optimized for coziness";
     homepage = "https://github.com/slavfox/cozette";
     changelog = "https://github.com/slavfox/Cozette/blob/v.${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ brettlyons ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ brettlyons ];
   };
 }
diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index cc3d961d8149..e3c7c5df79a4 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simplistic yet fancy CPU architecture fetching tool";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/Dr-Noob/cpufetch";
     changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${version}";
-    maintainers = with maintainers; [ devhell ];
+    maintainers = with lib.maintainers; [ devhell ];
     mainProgram = "cpufetch";
   };
 }
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index 5a8c587433fc..abe49481d7d9 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform, fast, compression and decompression tool";
     homepage = "https://github.com/sstadick/crabz";
     changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       unlicense # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "crabz";
   };
 }
diff --git a/pkgs/by-name/cr/crcpp/package.nix b/pkgs/by-name/cr/crcpp/package.nix
index 89b9d4a7d56c..fc6610307e90 100644
--- a/pkgs/by-name/cr/crcpp/package.nix
+++ b/pkgs/by-name/cr/crcpp/package.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/d-bahr/CRCpp";
     changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}";
     description = "Easy to use and fast C++ CRC library";
-    platforms = platforms.all;
-    maintainers = [ ];
-    license = licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index aed51f14a953..00ea2fb0161e 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -40,12 +40,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.crossplane.io/";
     changelog = "https://github.com/crossplane/crossplane/releases/tag/v${version}";
     description = "Utility to make using Crossplane easier";
     mainProgram = "crossplane";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ selfuryon ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ selfuryon ];
   };
 }
diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix
index bd1003ab8647..e1d6b54bfc4e 100644
--- a/pkgs/by-name/cr/crosswords/package.nix
+++ b/pkgs/by-name/cr/crosswords/package.nix
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
     libipuz
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Crossword player and editor for GNOME";
     homepage = "https://gitlab.gnome.org/jrb/crosswords";
     changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "crosswords";
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index eccca789cecd..dac2621c3506 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -62,7 +62,7 @@ buildGoModule rec {
     fi
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://crowdsec.net/";
     changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}";
     description = "CrowdSec is a free, open-source and collaborative IPS";
@@ -77,8 +77,8 @@ buildGoModule rec {
       etc.) while the aggressive IP can be sent to CrowdSec for curation before
       being shared among all users to further improve everyone's security.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       jk
       urandom
     ];
diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix
index ec21ea35a5b7..15b96802f5de 100644
--- a/pkgs/by-name/cr/crun/package.nix
+++ b/pkgs/by-name/cr/crun/package.nix
@@ -85,13 +85,13 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) podman; };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/containers/crun/releases/tag/${version}";
     description = "Fast and lightweight fully featured OCI runtime and C library for running containers";
     homepage = "https://github.com/containers/crun";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.podman ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.podman ];
     mainProgram = "crun";
   };
 }
diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix
index b6563a677939..583852811605 100644
--- a/pkgs/by-name/cr/cryfs/package.nix
+++ b/pkgs/by-name/cr/cryfs/package.nix
@@ -90,16 +90,16 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cryptographic filesystem for the cloud";
     homepage = "https://www.cryfs.org/";
     changelog = "https://github.com/cryfs/cryfs/raw/${version}/ChangeLog.txt";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
       peterhoeg
       c0bw3b
       sigmasquadron
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix
index bc819b64064f..a1655acfed86 100644
--- a/pkgs/by-name/cy/cyberchef/package.nix
+++ b/pkgs/by-name/cy/cyberchef/package.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     mv * "$out/share/cyberchef"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cyber Swiss Army Knife for encryption, encoding, compression and data analysis";
     homepage = "https://gchq.github.io/CyberChef";
     changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ sebastianblunt ];
-    license = licenses.asl20;
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ sebastianblunt ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix
index 603ba9d47881..c7272287c111 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@@ -29,14 +29,14 @@ buildDotnetModule rec {
       --replace-fail 'net6.0' 'net8.0'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions";
     homepage = "https://github.com/CycloneDX/cyclonedx-cli";
     changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}";
-    maintainers = with maintainers; [ thillux ];
-    teams = [ teams.cyberus ];
-    license = licenses.asl20;
-    platforms = with platforms; (linux ++ darwin);
+    maintainers = with lib.maintainers; [ thillux ];
+    teams = [ lib.teams.cyberus ];
+    license = lib.licenses.asl20;
+    platforms = with lib.platforms; (linux ++ darwin);
     mainProgram = "cyclonedx";
   };
 }
diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix
index 924a520e9acd..dd06d5551158 100644
--- a/pkgs/by-name/da/dalfox/package.nix
+++ b/pkgs/by-name/da/dalfox/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for analysing parameter and XSS scanning";
     homepage = "https://github.com/hahwul/dalfox";
     changelog = "https://github.com/hahwul/dalfox/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dalfox";
   };
 }
diff --git a/pkgs/by-name/da/darkstat/package.nix b/pkgs/by-name/da/darkstat/package.nix
index a32cde36fbcf..d5efe788aa35 100644
--- a/pkgs/by-name/da/darkstat/package.nix
+++ b/pkgs/by-name/da/darkstat/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Network statistics web interface";
     longDescription = ''
       Captures network traffic, calculates statistics about usage, and serves
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://unix4lyfe.org/darkstat";
     changelog = "https://github.com/emikulic/darkstat/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    platforms = with platforms; unix;
+    license = lib.licenses.gpl2Only;
+    platforms = with lib.platforms; unix;
     mainProgram = "darkstat";
   };
 }
diff --git a/pkgs/by-name/da/darktile/package.nix b/pkgs/by-name/da/darktile/package.nix
index c2e7928fbdad..a26a97ea8ad1 100644
--- a/pkgs/by-name/da/darktile/package.nix
+++ b/pkgs/by-name/da/darktile/package.nix
@@ -42,15 +42,15 @@ buildGoModule rec {
 
   passthru.tests.test = nixosTests.terminal-emulators.darktile;
 
-  meta = with lib; {
+  meta = {
     description = "GPU rendered terminal emulator designed for tiling window managers";
     homepage = "https://github.com/liamg/darktile";
     downloadPage = "https://github.com/liamg/darktile/releases";
     changelog = "https://github.com/liamg/darktile/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
     badPlatforms = [ "aarch64-linux" ];
-    maintainers = with maintainers; [ mikaelfangel ];
+    maintainers = with lib.maintainers; [ mikaelfangel ];
     mainProgram = "darktile";
   };
 }
diff --git a/pkgs/by-name/da/das/package.nix b/pkgs/by-name/da/das/package.nix
index fdda321b0990..4635b60bd565 100644
--- a/pkgs/by-name/da/das/package.nix
+++ b/pkgs/by-name/da/das/package.nix
@@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "das" ];
 
-  meta = with lib; {
+  meta = {
     description = "Divide full port scan results and use it for targeted Nmap runs";
     homepage = "https://github.com/snovvcrash/DivideAndScan";
     changelog = "https://github.com/snovvcrash/DivideAndScan/releases/tag/v${version}";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "das";
   };
 }
diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix
index efdc7eaa41e9..e76f011d9ff7 100644
--- a/pkgs/by-name/da/dasel/package.nix
+++ b/pkgs/by-name/da/dasel/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Query and update data structures from the command line";
     longDescription = ''
       Dasel (short for data-selector) allows you to query and modify data structures using selector strings.
@@ -55,8 +55,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/TomWright/dasel";
     changelog = "https://github.com/TomWright/dasel/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "dasel";
-    maintainers = with maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
   };
 }
diff --git a/pkgs/by-name/da/databricks-sql-cli/package.nix b/pkgs/by-name/da/databricks-sql-cli/package.nix
index 8393de6e9999..325013e75059 100644
--- a/pkgs/by-name/da/databricks-sql-cli/package.nix
+++ b/pkgs/by-name/da/databricks-sql-cli/package.nix
@@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI for querying Databricks SQL";
     mainProgram = "dbsqlcli";
     homepage = "https://github.com/databricks/databricks-sql-cli";
     changelog = "https://github.com/databricks/databricks-sql-cli/releases/tag/v${version}";
-    license = licenses.databricks;
-    maintainers = with maintainers; [ kfollesdal ];
+    license = lib.licenses.databricks;
+    maintainers = with lib.maintainers; [ kfollesdal ];
   };
 }
diff --git a/pkgs/by-name/da/datree/package.nix b/pkgs/by-name/da/datree/package.nix
index e1a33be5eca5..a30726b53ca5 100644
--- a/pkgs/by-name/da/datree/package.nix
+++ b/pkgs/by-name/da/datree/package.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
     command = "datree version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to ensure K8s manifests and Helm charts follow best practices";
     mainProgram = "datree";
     longDescription = ''
@@ -54,8 +54,8 @@ buildGoModule rec {
     '';
     homepage = "https://datree.io/";
     changelog = "https://github.com/datreeio/datree/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       azahi
       jceb
     ];
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index cbd651e68ee7..de06c7b1c428 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform AV1 decoder focused on speed and correctness";
     longDescription = ''
       The goal of this project is to provide a decoder for most platforms, and
@@ -85,8 +85,8 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}";
     # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS
-    license = licenses.bsd2;
-    platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix
index ab4f7a1cda83..f26826a44ab5 100644
--- a/pkgs/by-name/db/dbmate/package.nix
+++ b/pkgs/by-name/db/dbmate/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Database migration tool";
     mainProgram = "dbmate";
     homepage = "https://github.com/amacneil/dbmate";
     changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ manveru ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ manveru ];
   };
 }
diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix
index ea3ec3fbb439..c88618290d3c 100644
--- a/pkgs/by-name/de/debootstrap/package.nix
+++ b/pkgs/by-name/de/debootstrap/package.nix
@@ -96,13 +96,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://salsa.debian.org/installer-team/debootstrap/-/blob/${version}/debian/changelog";
     description = "Tool to create a Debian system in a chroot";
     homepage = "https://wiki.debian.org/Debootstrap";
-    license = licenses.mit;
-    maintainers = with maintainers; [ marcweber ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.linux;
     mainProgram = "debootstrap";
   };
 }
diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix
index 84e659b6f96e..7972037fad9c 100644
--- a/pkgs/by-name/de/deckmaster/package.nix
+++ b/pkgs/by-name/de/deckmaster/package.nix
@@ -36,13 +36,13 @@ buildGoModule rec {
       --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Application to control your Elgato Stream Deck on Linux";
     mainProgram = "deckmaster";
     homepage = "https://github.com/muesli/deckmaster";
     changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 9ad0a6215929..4df4d0922678 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -59,12 +59,12 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_diff_real_files"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/dandavison/delta";
     description = "Syntax-highlighting pager for git";
     changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       zowoq
       SuperSandro2000
       figsoda
diff --git a/pkgs/by-name/de/denaro/package.nix b/pkgs/by-name/de/denaro/package.nix
index c1a1e6cdc10d..442593fbb582 100644
--- a/pkgs/by-name/de/denaro/package.nix
+++ b/pkgs/by-name/de/denaro/package.nix
@@ -63,16 +63,16 @@ buildDotnetModule rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Personal finance manager for GNOME";
     homepage = "https://github.com/nlogozzo/NickvisionMoney";
     mainProgram = "NickvisionMoney.GNOME";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       chuangzhu
       kashw2
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix
index 6ac13b00831c..722907bd4493 100644
--- a/pkgs/by-name/de/dendrite/package.nix
+++ b/pkgs/by-name/de/dendrite/package.nix
@@ -65,12 +65,12 @@ buildGoModule rec {
     ];
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://element-hq.github.io/dendrite";
     description = "Second-generation Matrix homeserver written in Go";
     changelog = "https://github.com/element-hq/dendrite/releases/tag/v${version}";
-    license = licenses.agpl3Plus;
-    teams = [ teams.matrix ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Plus;
+    teams = [ lib.teams.matrix ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix
index 71c36fda3ddc..10bcae2eea10 100644
--- a/pkgs/by-name/de/dep-scan/package.nix
+++ b/pkgs/by-name/de/dep-scan/package.nix
@@ -64,12 +64,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_query_metadata2"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Security and risk audit tool based on known vulnerabilities, advisories, and license limitations for project dependencies";
     homepage = "https://github.com/owasp-dep-scan/dep-scan";
     changelog = "https://github.com/owasp-dep-scan/dep-scan/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dep-scan";
   };
 }
diff --git a/pkgs/by-name/de/dependency-track-exporter/package.nix b/pkgs/by-name/de/dependency-track-exporter/package.nix
index 85c4084984e6..5b7cfdb47c32 100644
--- a/pkgs/by-name/de/dependency-track-exporter/package.nix
+++ b/pkgs/by-name/de/dependency-track-exporter/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Helper to export Prometheus metrics for Dependency-Track";
     homepage = "https://github.com/jetstack/dependency-track-exporter";
     changelog = "https://github.com/jetstack/dependency-track-exporter/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dependency-track-exporter";
   };
 }
diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix
index 4d9c6020eac8..bd5e7010be7c 100644
--- a/pkgs/by-name/de/depotdownloader/package.nix
+++ b/pkgs/by-name/de/depotdownloader/package.nix
@@ -23,11 +23,11 @@ buildDotnetModule rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Steam depot downloader utilizing the SteamKit2 library";
     changelog = "https://github.com/SteamRE/DepotDownloader/releases/tag/DepotDownloader_${version}";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.babbaj ];
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.babbaj ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix
index 954327c155c7..f31536d0d3cc 100644
--- a/pkgs/by-name/de/desync/package.nix
+++ b/pkgs/by-name/de/desync/package.nix
@@ -20,13 +20,13 @@ buildGoModule rec {
   # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Content-addressed binary distribution system";
     mainProgram = "desync";
     longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness";
     homepage = "https://github.com/folbricht/desync";
     changelog = "https://github.com/folbricht/desync/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ chaduffy ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ chaduffy ];
   };
 }
diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix
index d1954757b40e..074af5591d80 100644
--- a/pkgs/by-name/de/devhelp/package.nix
+++ b/pkgs/by-name/de/devhelp/package.nix
@@ -80,13 +80,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "API documentation browser for GNOME";
     mainProgram = "devhelp";
     homepage = "https://apps.gnome.org/Devhelp/";
     changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl3Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/de/devpi-client/package.nix b/pkgs/by-name/de/devpi-client/package.nix
index ef2584ab99e9..074c39d973e3 100644
--- a/pkgs/by-name/de/devpi-client/package.nix
+++ b/pkgs/by-name/de/devpi-client/package.nix
@@ -69,12 +69,12 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Client for devpi, a pypi index server and packaging meta tool";
     homepage = "http://doc.devpi.net";
     changelog = "https://github.com/devpi/devpi/blob/client-${version}/client/CHANGELOG";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       lewo
       makefu
     ];
diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix
index 6b14032d6476..617568f34472 100644
--- a/pkgs/by-name/de/devspace/package.nix
+++ b/pkgs/by-name/de/devspace/package.nix
@@ -33,11 +33,11 @@ buildGoModule rec {
     package = devspace;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster";
     homepage = "https://devspace.sh/";
     changelog = "https://github.com/devspace-sh/devspace/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ darkonion0 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ darkonion0 ];
   };
 }
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index c44c10b68fd9..81da5329a39d 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -315,7 +315,7 @@ python.pkgs.buildPythonApplication rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Perform in-depth comparison of files, archives, and directories";
     longDescription = ''
       diffoscope will try to get to the bottom of what makes files or directories
@@ -329,13 +329,13 @@ python.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://diffoscope.org/";
     changelog = "https://diffoscope.org/news/diffoscope-${version}-released/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       dezgeg
       danielfullmer
       raitobezarius
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "diffoscope";
   };
 }
diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix
index 959fca388c00..93ecb7c364bc 100644
--- a/pkgs/by-name/di/dinish/package.nix
+++ b/pkgs/by-name/di/dinish/package.nix
@@ -25,13 +25,13 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/playbeing/dinish";
     changelog = "https://github.com/playbeing/dinish/blob/v${version}/FONTLOG.txt";
     description = "Modern computer font inspired by DIN 1451";
     longDescription = "DINish is one of many modern computer fonts that were inspired by the lettering of the German Autobahn road signs. It is professionally designed, and usable for body text and captions, even spreadsheets. Its unadorned style is easy to read, and although it is close to a century old maintains a fresh look.";
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ vji ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ vji ];
   };
 }
diff --git a/pkgs/by-name/di/discocss/package.nix b/pkgs/by-name/di/discocss/package.nix
index 353b9b7a798d..c2ae554b59ad 100644
--- a/pkgs/by-name/di/discocss/package.nix
+++ b/pkgs/by-name/di/discocss/package.nix
@@ -34,13 +34,13 @@ stdenvNoCC.mkDerivation rec {
       ln -s ${discord}/share/* $out/share
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Tiny Discord css-injector";
     changelog = "https://github.com/mlvzk/discocss/releases/tag/v${version}";
     homepage = "https://github.com/mlvzk/discocss";
-    license = licenses.mpl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mlvzk ];
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ mlvzk ];
     mainProgram = "discocss";
   };
 }
diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix
index 985fd506bd60..ca7b2f78aa66 100644
--- a/pkgs/by-name/di/discordchatexporter-cli/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix
@@ -35,13 +35,13 @@ buildDotnetModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to export Discord chat logs to a file";
     homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
     mainProgram = "discordchatexporter-cli";
   };
 }
diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
index 836913be9ff7..e15363b51eb7 100644
--- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix
+++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix
@@ -35,12 +35,12 @@ buildDotnetModule rec {
     updateScript = ./updater.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to export Discord chat logs to a file (GUI version)";
     homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
-    maintainers = with maintainers; [ willow ];
+    maintainers = with lib.maintainers; [ willow ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "discordchatexporter";
   };
diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix
index 0acf92585bf5..95872ce78de1 100644
--- a/pkgs/by-name/di/distribution/package.nix
+++ b/pkgs/by-name/di/distribution/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit to pack, ship, store, and deliver container content";
     longDescription = ''
       Distribution is a Open Source Registry implementation for storing and distributing container
@@ -44,10 +44,10 @@ buildGoModule (finalAttrs: {
       or running a simple private registry.
     '';
     homepage = "https://distribution.github.io/distribution/";
-    changelog = "https://github.com/distribution/distribution/releases/tag/v${version}";
-    license = licenses.asl20;
+    changelog = "https://github.com/distribution/distribution/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ katexochen ];
     mainProgram = "registry";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index 1feb042f3e59..46a3a530c126 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for exploring each layer in a docker image";
     mainProgram = "dive";
     homepage = "https://github.com/wagoodman/dive";
     changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/by-name/do/docker-compose-language-service/package.nix b/pkgs/by-name/do/docker-compose-language-service/package.nix
index 412836babbbd..d01d9991b545 100644
--- a/pkgs/by-name/do/docker-compose-language-service/package.nix
+++ b/pkgs/by-name/do/docker-compose-language-service/package.nix
@@ -17,12 +17,12 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-G1X9WrnwN6wM9S76PsGrPTmmiMBUKu4T2Al3HH3Wo+w=";
 
-  meta = with lib; {
+  meta = {
     description = "Language service for Docker Compose documents";
     homepage = "https://github.com/microsoft/compose-language-service";
     changelog = "https://github.com/microsoft/compose-language-service/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "docker-compose-langserver";
   };
 }
diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix
index c059f8204d6a..d3f80cbc20ca 100644
--- a/pkgs/by-name/do/docker-credential-gcr/package.nix
+++ b/pkgs/by-name/do/docker-credential-gcr/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Docker credential helper for GCR (https://gcr.io) users";
     longDescription = ''
       docker-credential-gcr is Google Container Registry's Docker credential
@@ -51,8 +51,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr";
     changelog = "https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       suvash
       anthonyroussel
     ];
diff --git a/pkgs/by-name/do/docker-slim/package.nix b/pkgs/by-name/do/docker-slim/package.nix
index b0e24cdf81f7..e2102287523d 100644
--- a/pkgs/by-name/do/docker-slim/package.nix
+++ b/pkgs/by-name/do/docker-slim/package.nix
@@ -44,12 +44,12 @@ buildGoModule rec {
     wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Minify and secure Docker containers";
     homepage = "https://slimtoolkit.org/";
     changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       mbrgm
     ];
diff --git a/pkgs/by-name/do/dockle/package.nix b/pkgs/by-name/do/dockle/package.nix
index b917461c7bd8..543b327e839f 100644
--- a/pkgs/by-name/do/dockle/package.nix
+++ b/pkgs/by-name/do/dockle/package.nix
@@ -45,7 +45,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://containers.goodwith.tech";
     changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}";
     description = "Container Image Linter for Security";
@@ -55,7 +55,7 @@ buildGoModule rec {
       Helping build the Best-Practice Docker Image.
       Easy to start.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/do/dontgo403/package.nix b/pkgs/by-name/do/dontgo403/package.nix
index 74a4a4859371..503b5afe4317 100644
--- a/pkgs/by-name/do/dontgo403/package.nix
+++ b/pkgs/by-name/do/dontgo403/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to bypass 40X response codes";
     mainProgram = "nomore403";
     homepage = "https://github.com/devploit/dontgo403";
     changelog = "https://github.com/devploit/dontgo403/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index 0b8925b6bd16..98d95c51098a 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -63,12 +63,12 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "TUI todo manager";
     homepage = "https://github.com/dooit-org/dooit";
     changelog = "https://github.com/dooit-org/dooit/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       khaneliman
       wesleyjrz
       kraanzu
diff --git a/pkgs/by-name/do/doq/package.nix b/pkgs/by-name/do/doq/package.nix
index 3a490905102b..a0608db8cb7b 100644
--- a/pkgs/by-name/do/doq/package.nix
+++ b/pkgs/by-name/do/doq/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "doq" ];
 
-  meta = with lib; {
+  meta = {
     description = "Docstring generator for Python";
     homepage = "https://github.com/heavenshell/py-doq";
     changelog = "https://github.com/heavenshell/py-doq/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ natsukium ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "doq";
   };
 }
diff --git a/pkgs/by-name/do/dos2unix/package.nix b/pkgs/by-name/do/dos2unix/package.nix
index cd35d1d5fd8c..dfcd01b957e1 100644
--- a/pkgs/by-name/do/dos2unix/package.nix
+++ b/pkgs/by-name/do/dos2unix/package.nix
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
   ];
   makeFlags = [ "prefix=${placeholder "out"}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Convert text files with DOS or Mac line breaks to Unix line breaks and vice versa";
     homepage = "https://waterlan.home.xs4all.nl/dos2unix.html";
     changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ c0bw3b ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ c0bw3b ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/do/dotool/package.nix b/pkgs/by-name/do/dotool/package.nix
index 7cbadfcbee34..231b314baadd 100644
--- a/pkgs/by-name/do/dotool/package.nix
+++ b/pkgs/by-name/do/dotool/package.nix
@@ -49,11 +49,11 @@ buildGoModule rec {
     installManPage doc/dotool.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command to simulate input anywhere";
     homepage = "https://git.sr.ht/~geb/dotool";
     changelog = "https://git.sr.ht/~geb/dotool/tree/${version}/item/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dit7ya ];
   };
 }
diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix
index 9d36c5295b2d..945e5a185b9e 100644
--- a/pkgs/by-name/dy/dynamips/package.nix
+++ b/pkgs/by-name/dy/dynamips/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cisco router emulator";
     longDescription = ''
       Dynamips is an emulator computer program that was written to emulate Cisco
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/GNS3/dynamips";
     changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "dynamips";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       primeos
       anthonyroussel
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/dy/dyndnsc/package.nix b/pkgs/by-name/dy/dyndnsc/package.nix
index 262817426bd5..50735f10845d 100644
--- a/pkgs/by-name/dy/dyndnsc/package.nix
+++ b/pkgs/by-name/dy/dyndnsc/package.nix
@@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec {
   # Allow tests that bind or connect to localhost on macOS.
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic DNS update client with support for multiple protocols";
     longDescription = ''
       Dyndnsc is a command line client for sending updates to Dynamic
@@ -62,9 +62,9 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://github.com/infothrill/python-dyndnsc";
     changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "dyndnsc";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ec/ec2stepshell/package.nix b/pkgs/by-name/ec/ec2stepshell/package.nix
index 760b873fd97c..1dc461c0e402 100644
--- a/pkgs/by-name/ec/ec2stepshell/package.nix
+++ b/pkgs/by-name/ec/ec2stepshell/package.nix
@@ -37,12 +37,12 @@ python3.pkgs.buildPythonApplication rec {
     "ec2stepshell"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "AWS post-exploitation tool";
     mainProgram = "ec2stepshell";
     homepage = "https://github.com/saw-your-packet/EC2StepShell";
     changelog = "https://github.com/saw-your-packet/EC2StepShell/blob/${version}/CHANGELOG.txt";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index 30fcdddd6406..ddf1b2ec3f89 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -26,13 +26,13 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS";
     homepage = "https://github.com/aws/amazon-ecs-agent";
     changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "agent";
   };
 }
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 1f2875e14bcd..3515d43f81a0 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -43,12 +43,12 @@ buildGoModule rec {
       --zsh  <($out/bin/eksctl completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI for Amazon EKS";
     homepage = "https://github.com/weaveworks/eksctl";
     changelog = "https://github.com/eksctl-io/eksctl/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       xrelkd
       Chili-Man
     ];
diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix
index 5760df0650fb..c32b54a724fc 100644
--- a/pkgs/by-name/el/elan/package.nix
+++ b/pkgs/by-name/el/elan/package.nix
@@ -81,15 +81,15 @@ rustPlatform.buildRustPackage rec {
     $out/bin/elan completions zsh >  "$out/share/zsh/site-functions/_elan"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Small tool to manage your installations of the Lean theorem prover";
     homepage = "https://github.com/leanprover/elan";
     changelog = "https://github.com/leanprover/elan/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "elan";
   };
 }
diff --git a/pkgs/by-name/el/elasticsearch-curator/package.nix b/pkgs/by-name/el/elasticsearch-curator/package.nix
index ab135355eba8..3525200ddbf1 100644
--- a/pkgs/by-name/el/elasticsearch-curator/package.nix
+++ b/pkgs/by-name/el/elasticsearch-curator/package.nix
@@ -78,11 +78,11 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Curate, or manage, your Elasticsearch indices and snapshots";
     homepage = "https://github.com/elastic/curator";
     changelog = "https://github.com/elastic/curator/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       Elasticsearch Curator helps you curate, or manage, your Elasticsearch
       indices and snapshots by:
@@ -96,6 +96,6 @@ python3.pkgs.buildPythonApplication rec {
       * Perform various actions on the items which remain in the actionable list.
     '';
     mainProgram = "curator";
-    maintainers = with maintainers; [ basvandijk ];
+    maintainers = with lib.maintainers; [ basvandijk ];
   };
 }
diff --git a/pkgs/by-name/el/elfinfo/package.nix b/pkgs/by-name/el/elfinfo/package.nix
index 7f34cccaa11b..eae88f1df817 100644
--- a/pkgs/by-name/el/elfinfo/package.nix
+++ b/pkgs/by-name/el/elfinfo/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "Small utility for showing information about ELF files";
     mainProgram = "elfinfo";
     homepage = "https://elfinfo.roboticoverlords.org/";
     changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 5359f06a457f..c04e2888a891 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -55,16 +55,16 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     description = "Embedded Linux Library";
     longDescription = ''
       The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems.
     '';
     changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       mic92
       dtzWill
     ];
diff --git a/pkgs/by-name/en/enc/package.nix b/pkgs/by-name/en/enc/package.nix
index eab08379eb98..124ab7d13688 100644
--- a/pkgs/by-name/en/enc/package.nix
+++ b/pkgs/by-name/en/enc/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
       --zsh <($out/bin/enc completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/life4/enc";
     changelog = "https://github.com/life4/enc/releases/tag/v${version}";
     description = "Modern and friendly alternative to GnuPG";
@@ -50,7 +50,7 @@ buildGoModule rec {
       Our goal was to make encryption available to all engineers without the need to learn a lot of new words, concepts,
       and commands. It is the most beginner-friendly CLI tool for encryption, and keeping it that way is our top priority.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ rvnstn ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ rvnstn ];
   };
 }
diff --git a/pkgs/by-name/en/endlessh-go/package.nix b/pkgs/by-name/en/endlessh-go/package.nix
index 59ef7f8b973d..ddfc693f2f6c 100644
--- a/pkgs/by-name/en/endlessh-go/package.nix
+++ b/pkgs/by-name/en/endlessh-go/package.nix
@@ -29,12 +29,12 @@ buildGoModule rec {
     inherit (nixosTests) endlessh-go;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of endlessh exporting Prometheus metrics";
     homepage = "https://github.com/shizunge/endlessh-go";
     changelog = "https://github.com/shizunge/endlessh-go/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ azahi ];
     mainProgram = "endlessh-go";
   };
 }
diff --git a/pkgs/by-name/en/endlessh/package.nix b/pkgs/by-name/en/endlessh/package.nix
index 6a95fe42d23b..01bc2ab030f6 100644
--- a/pkgs/by-name/en/endlessh/package.nix
+++ b/pkgs/by-name/en/endlessh/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "SSH tarpit that slowly sends an endless banner";
     homepage = "https://github.com/skeeto/endlessh";
     changelog = "https://github.com/skeeto/endlessh/releases/tag/${version}";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ azahi ];
-    platforms = platforms.unix;
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ azahi ];
+    platforms = lib.platforms.unix;
     mainProgram = "endlessh";
   };
 }
diff --git a/pkgs/by-name/en/engelsystem/package.nix b/pkgs/by-name/en/engelsystem/package.nix
index 49fa0c5e69ed..65e241e8133d 100644
--- a/pkgs/by-name/en/engelsystem/package.nix
+++ b/pkgs/by-name/en/engelsystem/package.nix
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
 
   passthru.tests = nixosTests.engelsystem;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}";
     description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
     homepage = "https://engelsystem.de";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     mainProgram = "migrate";
-    maintainers = [ ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/en/entr/package.nix b/pkgs/by-name/en/entr/package.nix
index 810426a1ea58..030b655478f3 100644
--- a/pkgs/by-name/en/entr/package.nix
+++ b/pkgs/by-name/en/entr/package.nix
@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
 
   TARGET_OS = stdenv.hostPlatform.uname.system;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://eradman.com/entrproject/";
     description = "Run arbitrary commands when files change";
     changelog = "https://github.com/eradman/entr/raw/${version}/NEWS";
-    license = licenses.isc;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.isc;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       pSub
       synthetica
     ];
diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
index 120c580e1666..ef6e5d47cdff 100644
--- a/pkgs/by-name/en/enum4linux-ng/package.nix
+++ b/pkgs/by-name/en/enum4linux-ng/package.nix
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
   # It's only a script and not a Python module. Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Windows/Samba enumeration tool";
     longDescription = ''
       enum4linux-ng.py is a rewrite of Mark Lowe's enum4linux.pl, a tool for
@@ -38,8 +38,8 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/cddmp/enum4linux-ng";
     changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "enum4linux-ng";
   };
 }
diff --git a/pkgs/by-name/en/enumerepo/package.nix b/pkgs/by-name/en/enumerepo/package.nix
index c3b74c083c64..cdf874e6ee44 100644
--- a/pkgs/by-name/en/enumerepo/package.nix
+++ b/pkgs/by-name/en/enumerepo/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to list all public repositories for (valid) GitHub usernames";
     mainProgram = "enumerepo";
     homepage = "https://github.com/trickest/enumerepo";
     changelog = "https://github.com/trickest/enumerepo/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix
index 8578b8307378..9642777a249a 100644
--- a/pkgs/by-name/en/envio/package.nix
+++ b/pkgs/by-name/en/envio/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     installManPage man/*.1
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://envio-cli.github.io/home";
     changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md";
     description = "Modern and secure CLI tool for managing environment variables";
@@ -47,11 +47,11 @@ rustPlatform.buildRustPackage rec {
       switch between different configurations and apply them to their current
       environment.
     '';
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ afh ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ afh ];
   };
 }
diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix
index 0246405d0bbf..ee15b1bc04a6 100644
--- a/pkgs/by-name/en/envoy/package.nix
+++ b/pkgs/by-name/en/envoy/package.nix
@@ -297,13 +297,13 @@ buildBazelPackage rec {
         '';
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://envoyproxy.io";
     changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}";
     description = "Cloud-native edge and service proxy";
     mainProgram = "envoy";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lukegb ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lukegb ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix
index 266144cd4808..d39566ee01e8 100644
--- a/pkgs/by-name/es/espflash/package.nix
+++ b/pkgs/by-name/es/espflash/package.nix
@@ -50,15 +50,15 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py";
     homepage = "https://github.com/esp-rs/espflash";
     changelog = "https://github.com/esp-rs/espflash/blob/v${version}/CHANGELOG.md";
     mainProgram = "espflash";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
 }
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 3bae9a97cb27..3568e5a6bacd 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -159,15 +159,15 @@ python.pkgs.buildPythonApplication rec {
     tests = { inherit (nixosTests) esphome; };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/esphome/esphome/releases/tag/${version}";
     description = "Make creating custom firmwares for ESP32/ESP8266 super easy";
     homepage = "https://esphome.io/";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # The C++/runtime codebase of the ESPHome project (file extensions .c, .cpp, .h, .hpp, .tcc, .ino)
       gpl3Only # The python codebase and all other parts of this codebase
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       hexa
     ];
     mainProgram = "esphome";
diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
index 094497db1697..65f20ed602f3 100644
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ b/pkgs/by-name/eu/eureka-ideas/package.nix
@@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec {
 
   useNextest = true;
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to input and store your ideas without leaving the terminal";
     homepage = "https://github.com/simeg/eureka";
     changelog = "https://github.com/simeg/eureka/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "eureka";
   };
 }
diff --git a/pkgs/by-name/fa/fable/package.nix b/pkgs/by-name/fa/fable/package.nix
index 5d7244f21ba4..3cf318c5350e 100644
--- a/pkgs/by-name/fa/fable/package.nix
+++ b/pkgs/by-name/fa/fable/package.nix
@@ -17,14 +17,14 @@ buildDotnetGlobalTool (finalAttrs: {
     version = "[37m${finalAttrs.version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fable is an F# to JavaScript compiler";
     mainProgram = "fable";
     homepage = "https://github.com/fable-compiler/fable";
-    changelog = "https://github.com/fable-compiler/fable/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/fable-compiler/fable/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       anpin
       mdarocha
     ];
diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix
index 509ac9b29a0d..52c07f58d726 100644
--- a/pkgs/by-name/fa/faketty/package.nix
+++ b/pkgs/by-name/fa/faketty/package.nix
@@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec {
     patchShebangs tests/test.sh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Wrapper to execute a command in a pty, even if redirecting the output";
     homepage = "https://github.com/dtolnay/faketty";
     changelog = "https://github.com/dtolnay/faketty/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "faketty";
   };
 }
diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix
index a60e95aab5f5..e21cdff03bb0 100644
--- a/pkgs/by-name/fa/fangfrisch/package.nix
+++ b/pkgs/by-name/fa/fangfrisch/package.nix
@@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Update and verify unofficial Clam Anti-Virus signatures";
     homepage = "https://github.com/rseichter/fangfrisch";
     changelog = "https://github.com/rseichter/fangfrisch/blob/${version}/CHANGELOG.rst";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ happysalada ];
     mainProgram = "fangfrisch";
   };
 }
diff --git a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
index 9de101c70582..88f6e8b7bef8 100644
--- a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
+++ b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
@@ -70,12 +70,12 @@ python3.pkgs.buildPythonApplication rec {
     "faraday_agent_dispatcher"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to send result from tools to the Faraday Platform";
     homepage = "https://github.com/infobyte/faraday_agent_dispatcher";
     changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "faraday-dispatcher";
   };
 }
diff --git a/pkgs/by-name/fa/faraday-cli/package.nix b/pkgs/by-name/fa/faraday-cli/package.nix
index f522e9877480..8cb975539443 100644
--- a/pkgs/by-name/fa/faraday-cli/package.nix
+++ b/pkgs/by-name/fa/faraday-cli/package.nix
@@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "faraday_cli" ];
 
-  meta = with lib; {
+  meta = {
     description = "Command Line Interface for Faraday";
     homepage = "https://github.com/infobyte/faraday-cli";
     changelog = "https://github.com/infobyte/faraday-cli/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "faraday-cli";
   };
 }
diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix
index c7f5ba6068a0..2d10599e80c4 100644
--- a/pkgs/by-name/fa/fastjet-contrib/package.nix
+++ b/pkgs/by-name/fa/fastjet-contrib/package.nix
@@ -48,12 +48,12 @@ stdenv.mkDerivation rec {
     make fragile-shared-install
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Third party extensions for FastJet";
     homepage = "http://fastjet.fr/";
     changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ veprbl ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ veprbl ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix
index a4ff5c299fc2..3b510c25507b 100644
--- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix
+++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) fastnetmon-advanced; };
 
-  meta = with lib; {
+  meta = {
     description = "High performance DDoS detector / sensor - commercial edition";
     homepage = "https://fastnetmon.com";
     changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    teams = [ teams.wdz ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    teams = [ lib.teams.wdz ];
+    license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix
index be0327dcc688..fd34b610cf17 100644
--- a/pkgs/by-name/fc/fcft/package.nix
+++ b/pkgs/by-name/fc/fcft/package.nix
@@ -84,18 +84,18 @@ stdenv.mkDerivation rec {
     onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://codeberg.org/dnkl/fcft";
     changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}";
     description = "Simple library for font loading and glyph rasterization";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       fionera
       sternenseemann
     ];
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       zlib
     ];
-    platforms = with platforms; linux;
+    platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/by-name/fe/fead/package.nix b/pkgs/by-name/fe/fead/package.nix
index 254638e9125d..00a617f3933d 100644
--- a/pkgs/by-name/fe/fead/package.nix
+++ b/pkgs/by-name/fe/fead/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
   # The package has no tests.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Advert generator from web feeds";
     homepage = "https://trong.loang.net/~cnx/fead";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     changelog = "https://trong.loang.net/~cnx/fead/tag?h=${version}";
-    maintainers = with maintainers; [ McSinyx ];
+    maintainers = with lib.maintainers; [ McSinyx ];
     mainProgram = "fead";
   };
 }
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 96d7ee142fd4..bee6b0ee8841 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -145,15 +145,15 @@ buildNpmPackage {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Full-featured Subsonic/Jellyfin compatible desktop music player";
     homepage = "https://github.com/jeffvli/feishin";
     changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}";
-    sourceProvenance = with sourceTypes; [ fromSource ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
     mainProgram = "feishin";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       onny
       jlbribeiro
     ];
diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix
index b303ecccfc93..2b27a061e56a 100644
--- a/pkgs/by-name/fe/felix-fm/package.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -50,12 +50,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Tui file manager with vim-like key mapping";
     homepage = "https://github.com/kyoheiu/felix";
     changelog = "https://github.com/kyoheiu/felix/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "fx";
   };
 }
diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix
index f27ea5128db4..4db055530ed9 100644
--- a/pkgs/by-name/fe/fend/package.nix
+++ b/pkgs/by-name/fe/fend/package.nix
@@ -93,12 +93,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Arbitrary-precision unit-aware calculator";
     homepage = "https://github.com/printfn/fend";
     changelog = "https://github.com/printfn/fend/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       djanatyn
       liff
     ];
diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix
index 7a1c31602b2e..10aae1c770e0 100644
--- a/pkgs/by-name/fe/fernglas/package.nix
+++ b/pkgs/by-name/fe/fernglas/package.nix
@@ -72,13 +72,13 @@ rustPlatform.buildRustPackage rec {
     popd
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Looking glass for your network using BGP and BMP as data source";
     homepage = "https://wobcom.github.io/fernglas/";
     changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}";
-    license = licenses.eupl12;
-    platforms = platforms.linux;
-    teams = [ teams.wdz ];
+    license = lib.licenses.eupl12;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.wdz ];
     mainProgram = "fernglas";
   };
 }

From 09dcf6b2f10f24ed7b9c07d24ae8fc79487dfbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Tue, 3 Jun 2025 18:36:58 +0800
Subject: [PATCH 0822/1497] base16-builder: remove

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 doc/release-notes/rl-2511.section.md          |    2 +
 pkgs/misc/base16-builder/default.nix          |    9 -
 pkgs/misc/base16-builder/generate.sh          |    7 -
 .../node-packages-generated.nix               | 1925 -----------------
 pkgs/misc/base16-builder/node-packages.json   |    3 -
 pkgs/misc/base16-builder/node-packages.nix    |   33 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    2 -
 8 files changed, 3 insertions(+), 1979 deletions(-)
 delete mode 100644 pkgs/misc/base16-builder/default.nix
 delete mode 100755 pkgs/misc/base16-builder/generate.sh
 delete mode 100644 pkgs/misc/base16-builder/node-packages-generated.nix
 delete mode 100644 pkgs/misc/base16-builder/node-packages.json
 delete mode 100644 pkgs/misc/base16-builder/node-packages.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 8672b0c2ec61..f739ba9cd1f5 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -15,6 +15,8 @@
 
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
+- `base16-builder` node package has been removed due to lack of upstream maintenance.
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/misc/base16-builder/default.nix b/pkgs/misc/base16-builder/default.nix
deleted file mode 100644
index 5830a86fb9a2..000000000000
--- a/pkgs/misc/base16-builder/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, pkgs }:
-
-let
-  nodePackages = import ./node-packages.nix {
-    inherit pkgs;
-    inherit (stdenv.hostPlatform) system;
-  };
-in
-nodePackages.base16-builder
diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh
deleted file mode 100755
index af6e7ee4e1f7..000000000000
--- a/pkgs/misc/base16-builder/generate.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
-exec node2nix --nodejs-18 \
-     --input node-packages.json \
-     --output node-packages-generated.nix \
-     --composition node-packages.nix \
-     --node-env ./../../development/node-packages/node-env.nix \
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
deleted file mode 100644
index 9b6e2cca1133..000000000000
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ /dev/null
@@ -1,1925 +0,0 @@
-# This file has been generated by node2nix 1.11.1. Do not edit!
-
-{
-  nodeEnv,
-  fetchurl,
-  fetchgit,
-  nix-gitignore,
-  stdenv,
-  lib,
-  globalBuildInputs ? [ ],
-}:
-
-let
-  sources = {
-    "@mapbox/node-pre-gyp-1.0.10" = {
-      name = "_at_mapbox_slash_node-pre-gyp";
-      packageName = "@mapbox/node-pre-gyp";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz";
-        sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==";
-      };
-    };
-    "abbrev-1.1.1" = {
-      name = "abbrev";
-      packageName = "abbrev";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
-        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
-      };
-    };
-    "agent-base-6.0.2" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz";
-        sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==";
-      };
-    };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==";
-      };
-    };
-    "ansi-regex-5.0.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz";
-        sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==";
-      };
-    };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==";
-      };
-    };
-    "any-promise-0.1.0" = {
-      name = "any-promise";
-      packageName = "any-promise";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz";
-        sha512 = "lqzY9o+BbeGHRCOyxQkt/Tgvz0IZhTmQiA+LxQW8wSNpcTbj8K+0cZiSEvbpNZZP9/11Gy7dnLO3GNWUXO4d1g==";
-      };
-    };
-    "aproba-2.0.0" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz";
-        sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==";
-      };
-    };
-    "are-we-there-yet-2.0.0" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz";
-        sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==";
-      };
-    };
-    "argparse-1.0.10" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
-        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
-      };
-    };
-    "array-find-index-1.0.2" = {
-      name = "array-find-index";
-      packageName = "array-find-index";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";
-        sha512 = "M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==";
-      };
-    };
-    "balanced-match-1.0.2" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz";
-        sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
-      };
-    };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha512 = "u9JPc+sK+tsB7uH0870GNESSm2I005T9nE9fug2X/6COxMJ9qXmSducVSFt5f3xdZgR/PtKXVJTxN296cMCP6w==";
-      };
-    };
-    "brace-expansion-1.1.11" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
-      };
-    };
-    "bulk-replace-0.0.1" = {
-      name = "bulk-replace";
-      packageName = "bulk-replace";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz";
-        sha512 = "IxLEnfsCYLjlpf6mG7SWpWgA4A8IAT5dAX3FxXHFn+6FTLf3ums771elQ74sj1BCOVanBf6esu0rEC6zgwfmIg==";
-      };
-    };
-    "camelcase-2.1.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
-        sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==";
-      };
-    };
-    "camelcase-keys-2.1.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
-        sha512 = "bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==";
-      };
-    };
-    "capture-stack-trace-1.0.2" = {
-      name = "capture-stack-trace";
-      packageName = "capture-stack-trace";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz";
-        sha512 = "X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==";
-      };
-    };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
-      };
-    };
-    "chownr-2.0.0" = {
-      name = "chownr";
-      packageName = "chownr";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz";
-        sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==";
-      };
-    };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==";
-      };
-    };
-    "color-support-1.1.3" = {
-      name = "color-support";
-      packageName = "color-support";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz";
-        sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
-      };
-    };
-    "commander-1.1.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
-        sha512 = "71Rod2AhcH3JhkBikVpNd0pA+fWsmAaVoti6OR38T76chA7vE3pSerS0Jor4wDw+tOueD2zLVvFOw5H0Rcj7rA==";
-      };
-    };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
-      };
-    };
-    "configstore-2.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
-        sha512 = "BOCxwwxF5WPspp1OBq9j0JLyL5JgJOTssz9PdOHr8VWjFijaC3PpjU48vFEX3uxx8sTusnVQckLbNzBq6fmkGw==";
-      };
-    };
-    "console-control-strings-1.1.0" = {
-      name = "console-control-strings";
-      packageName = "console-control-strings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
-        sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==";
-      };
-    };
-    "core-util-is-1.0.3" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz";
-        sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==";
-      };
-    };
-    "create-error-class-3.0.2" = {
-      name = "create-error-class";
-      packageName = "create-error-class";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz";
-        sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==";
-      };
-    };
-    "currently-unhandled-0.4.1" = {
-      name = "currently-unhandled";
-      packageName = "currently-unhandled";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz";
-        sha512 = "/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==";
-      };
-    };
-    "debug-4.3.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz";
-        sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
-      };
-    };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
-      };
-    };
-    "deep-extend-0.6.0" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
-        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
-      };
-    };
-    "delegates-1.0.0" = {
-      name = "delegates";
-      packageName = "delegates";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
-        sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
-      };
-    };
-    "detect-libc-2.0.1" = {
-      name = "detect-libc";
-      packageName = "detect-libc";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz";
-        sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==";
-      };
-    };
-    "dot-prop-3.0.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
-        sha512 = "k4ELWeEU3uCcwub7+dWydqQBRjAjkV9L33HjVRG5Xo2QybI6ja/v+4W73SRi8ubCqJz0l9XsTP1NbewfyqaSlw==";
-      };
-    };
-    "duplexer2-0.1.4" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
-        sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==";
-      };
-    };
-    "ejs-2.7.4" = {
-      name = "ejs";
-      packageName = "ejs";
-      version = "2.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
-        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
-      };
-    };
-    "emoji-regex-8.0.0" = {
-      name = "emoji-regex";
-      packageName = "emoji-regex";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz";
-        sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
-      };
-    };
-    "encoding-0.1.13" = {
-      name = "encoding";
-      packageName = "encoding";
-      version = "0.1.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz";
-        sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==";
-      };
-    };
-    "error-ex-1.3.2" = {
-      name = "error-ex";
-      packageName = "error-ex";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
-        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
-      };
-    };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==";
-      };
-    };
-    "esprima-4.0.1" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
-        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
-      };
-    };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha512 = "4XwZ1k4rgoF3Yap59MyXFmiUh2zu9fht32NYPSRYwLv4o8BWHxi60I1VH5kHje14qGMoS3qyfHQUsN16ROOugQ==";
-      };
-    };
-    "find-up-1.1.2" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
-        sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==";
-      };
-    };
-    "fs-minipass-2.1.0" = {
-      name = "fs-minipass";
-      packageName = "fs-minipass";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz";
-        sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==";
-      };
-    };
-    "fs-promise-0.3.1" = {
-      name = "fs-promise";
-      packageName = "fs-promise";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz";
-        sha512 = "JjkAd4+JaA8VTL1vmX54f7xz6AgBZ9VA6mXlIvN8eJMJGZMVyJ6fdRyjwCP0pIuEkWkM0XcbVz/4F6sFu7OdQg==";
-      };
-    };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==";
-      };
-    };
-    "function-bind-1.1.1" = {
-      name = "function-bind";
-      packageName = "function-bind";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
-        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
-      };
-    };
-    "gauge-3.0.2" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz";
-        sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
-      };
-    };
-    "get-stdin-4.0.1" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-        sha512 = "F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==";
-      };
-    };
-    "glob-7.2.3" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz";
-        sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
-      };
-    };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha512 = "1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==";
-      };
-    };
-    "graceful-fs-4.2.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz";
-        sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==";
-      };
-    };
-    "has-1.0.3" = {
-      name = "has";
-      packageName = "has";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
-        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
-      };
-    };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==";
-      };
-    };
-    "has-unicode-2.0.1" = {
-      name = "has-unicode";
-      packageName = "has-unicode";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
-        sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==";
-      };
-    };
-    "hepburn-1.2.0" = {
-      name = "hepburn";
-      packageName = "hepburn";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hepburn/-/hepburn-1.2.0.tgz";
-        sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA==";
-      };
-    };
-    "hosted-git-info-2.8.9" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "2.8.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz";
-        sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";
-      };
-    };
-    "https-proxy-agent-5.0.1" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz";
-        sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==";
-      };
-    };
-    "iconv-lite-0.6.3" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz";
-        sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==";
-      };
-    };
-    "imurmurhash-0.1.4" = {
-      name = "imurmurhash";
-      packageName = "imurmurhash";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==";
-      };
-    };
-    "indent-string-2.1.0" = {
-      name = "indent-string";
-      packageName = "indent-string";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
-        sha512 = "aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==";
-      };
-    };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==";
-      };
-    };
-    "inherits-2.0.4" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
-      };
-    };
-    "ini-1.3.8" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
-        sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
-      };
-    };
-    "is-arrayish-0.2.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
-        sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==";
-      };
-    };
-    "is-core-module-2.12.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz";
-        sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==";
-      };
-    };
-    "is-finite-1.1.0" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
-        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
-      };
-    };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==";
-      };
-    };
-    "is-fullwidth-code-point-3.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
-        sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
-      };
-    };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==";
-      };
-    };
-    "is-obj-1.0.1" = {
-      name = "is-obj";
-      packageName = "is-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
-        sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==";
-      };
-    };
-    "is-redirect-1.0.0" = {
-      name = "is-redirect";
-      packageName = "is-redirect";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-        sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==";
-      };
-    };
-    "is-retry-allowed-1.2.0" = {
-      name = "is-retry-allowed";
-      packageName = "is-retry-allowed";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
-        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
-      };
-    };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==";
-      };
-    };
-    "is-utf8-0.2.1" = {
-      name = "is-utf8";
-      packageName = "is-utf8";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
-        sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==";
-      };
-    };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
-      };
-    };
-    "js-yaml-3.14.1" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
-        sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
-      };
-    };
-    "keypress-0.1.0" = {
-      name = "keypress";
-      packageName = "keypress";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
-        sha512 = "x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA==";
-      };
-    };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha512 = "8925wFYLfWBciewimt0VmDyYw0GFCRcbFSTrZGt4JgQ7lh5jb/kodMlUt0uMaxXdRKVi+7F3ib30N7fTv83ikw==";
-      };
-    };
-    "limax-1.7.0" = {
-      name = "limax";
-      packageName = "limax";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz";
-        sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA==";
-      };
-    };
-    "load-json-file-1.1.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
-        sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==";
-      };
-    };
-    "loud-rejection-1.6.0" = {
-      name = "loud-rejection";
-      packageName = "loud-rejection";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz";
-        sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==";
-      };
-    };
-    "lowercase-keys-1.0.1" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
-        sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
-      };
-    };
-    "lru-cache-6.0.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz";
-        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
-      };
-    };
-    "make-dir-3.1.0" = {
-      name = "make-dir";
-      packageName = "make-dir";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz";
-        sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==";
-      };
-    };
-    "map-obj-1.0.1" = {
-      name = "map-obj";
-      packageName = "map-obj";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-        sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==";
-      };
-    };
-    "meow-3.7.0" = {
-      name = "meow";
-      packageName = "meow";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
-        sha512 = "TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==";
-      };
-    };
-    "minimatch-3.1.2" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz";
-        sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
-      };
-    };
-    "minimist-1.2.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz";
-        sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
-      };
-    };
-    "minipass-3.3.6" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "3.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz";
-        sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==";
-      };
-    };
-    "minipass-5.0.0" = {
-      name = "minipass";
-      packageName = "minipass";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz";
-        sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==";
-      };
-    };
-    "minizlib-2.1.2" = {
-      name = "minizlib";
-      packageName = "minizlib";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz";
-        sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==";
-      };
-    };
-    "mkdirp-0.5.6" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz";
-        sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==";
-      };
-    };
-    "mkdirp-1.0.4" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
-        sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
-      };
-    };
-    "ms-2.1.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
-        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
-      };
-    };
-    "node-addon-api-3.2.1" = {
-      name = "node-addon-api";
-      packageName = "node-addon-api";
-      version = "3.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz";
-        sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==";
-      };
-    };
-    "node-fetch-2.6.10" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "2.6.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz";
-        sha512 = "5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==";
-      };
-    };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha512 = "1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==";
-      };
-    };
-    "nodejieba-2.5.2" = {
-      name = "nodejieba";
-      packageName = "nodejieba";
-      version = "2.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.2.tgz";
-        sha512 = "ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg==";
-      };
-    };
-    "nopt-5.0.0" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz";
-        sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
-      };
-    };
-    "normalize-package-data-2.5.0" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
-        sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
-      };
-    };
-    "npmlog-5.0.1" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz";
-        sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==";
-      };
-    };
-    "object-assign-4.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
-      };
-    };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
-      };
-    };
-    "open-0.0.5" = {
-      name = "open";
-      packageName = "open";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz";
-        sha512 = "+X/dJYLapVO1VbC620DhtNZK9U4/kQVaTQp/Gh7cb6UTLYfGZzzU2ZXkWrOA/wBrf4UqAFwtLqXYTxe4tSnWQQ==";
-      };
-    };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==";
-      };
-    };
-    "osenv-0.1.5" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
-        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
-      };
-    };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha512 = "PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==";
-      };
-    };
-    "parse-json-2.2.0" = {
-      name = "parse-json";
-      packageName = "parse-json";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
-        sha512 = "QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==";
-      };
-    };
-    "path-exists-2.1.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
-        sha512 = "yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==";
-      };
-    };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
-      };
-    };
-    "path-parse-1.0.7" = {
-      name = "path-parse";
-      packageName = "path-parse";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz";
-        sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
-      };
-    };
-    "path-type-1.1.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
-        sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==";
-      };
-    };
-    "pify-2.3.0" = {
-      name = "pify";
-      packageName = "pify";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
-        sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==";
-      };
-    };
-    "pinkie-2.0.4" = {
-      name = "pinkie";
-      packageName = "pinkie";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-        sha512 = "MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==";
-      };
-    };
-    "pinkie-promise-2.0.1" = {
-      name = "pinkie-promise";
-      packageName = "pinkie-promise";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==";
-      };
-    };
-    "pinyin-2.11.2" = {
-      name = "pinyin";
-      packageName = "pinyin";
-      version = "2.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pinyin/-/pinyin-2.11.2.tgz";
-        sha512 = "tAWDBcowj09j/vLUjty98nVqrbTVNhutf1VcyID4p0sxTFPzRyXw7n7Ic0HQwBdWFIWrrDP8bYiT64gaT6h3gA==";
-      };
-    };
-    "prepend-http-1.0.4" = {
-      name = "prepend-http";
-      packageName = "prepend-http";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
-        sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==";
-      };
-    };
-    "process-nextick-args-2.0.1" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
-      };
-    };
-    "rc-1.2.8" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
-        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
-      };
-    };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==";
-      };
-    };
-    "read-pkg-1.1.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-        sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==";
-      };
-    };
-    "read-pkg-up-1.0.1" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-        sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==";
-      };
-    };
-    "readable-stream-2.3.8" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "2.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz";
-        sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==";
-      };
-    };
-    "readable-stream-3.6.2" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "3.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz";
-        sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==";
-      };
-    };
-    "redent-1.0.0" = {
-      name = "redent";
-      packageName = "redent";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
-        sha512 = "qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==";
-      };
-    };
-    "registry-auth-token-3.4.0" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
-        sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
-      };
-    };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==";
-      };
-    };
-    "repeating-2.0.1" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==";
-      };
-    };
-    "resolve-1.22.3" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.22.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz";
-        sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==";
-      };
-    };
-    "rimraf-3.0.2" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
-      };
-    };
-    "safe-buffer-5.1.2" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
-      };
-    };
-    "safe-buffer-5.2.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
-        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
-      };
-    };
-    "safer-buffer-2.1.2" = {
-      name = "safer-buffer";
-      packageName = "safer-buffer";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
-        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
-      };
-    };
-    "semver-5.7.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
-        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
-      };
-    };
-    "semver-6.3.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "6.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
-        sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
-      };
-    };
-    "semver-7.5.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "7.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz";
-        sha512 = "+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==";
-      };
-    };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha512 = "gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw==";
-      };
-    };
-    "set-blocking-2.0.0" = {
-      name = "set-blocking";
-      packageName = "set-blocking";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
-        sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==";
-      };
-    };
-    "signal-exit-3.0.7" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz";
-        sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
-      };
-    };
-    "slide-1.1.6" = {
-      name = "slide";
-      packageName = "slide";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        sha512 = "NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==";
-      };
-    };
-    "spdx-correct-3.2.0" = {
-      name = "spdx-correct";
-      packageName = "spdx-correct";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz";
-        sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==";
-      };
-    };
-    "spdx-exceptions-2.3.0" = {
-      name = "spdx-exceptions";
-      packageName = "spdx-exceptions";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
-        sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
-      };
-    };
-    "spdx-expression-parse-3.0.1" = {
-      name = "spdx-expression-parse";
-      packageName = "spdx-expression-parse";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
-        sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
-      };
-    };
-    "spdx-license-ids-3.0.13" = {
-      name = "spdx-license-ids";
-      packageName = "spdx-license-ids";
-      version = "3.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz";
-        sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==";
-      };
-    };
-    "speakingurl-14.0.1" = {
-      name = "speakingurl";
-      packageName = "speakingurl";
-      version = "14.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz";
-        sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==";
-      };
-    };
-    "sprintf-js-1.0.3" = {
-      name = "sprintf-js";
-      packageName = "sprintf-js";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
-        sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==";
-      };
-    };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==";
-      };
-    };
-    "string-width-4.2.3" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz";
-        sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
-      };
-    };
-    "string_decoder-1.1.1" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
-        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
-      };
-    };
-    "string_decoder-1.3.0" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
-        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
-      };
-    };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==";
-      };
-    };
-    "strip-ansi-6.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz";
-        sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==";
-      };
-    };
-    "strip-bom-2.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
-        sha512 = "kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==";
-      };
-    };
-    "strip-indent-1.0.1" = {
-      name = "strip-indent";
-      packageName = "strip-indent";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
-        sha512 = "I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==";
-      };
-    };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==";
-      };
-    };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==";
-      };
-    };
-    "supports-preserve-symlinks-flag-1.0.0" = {
-      name = "supports-preserve-symlinks-flag";
-      packageName = "supports-preserve-symlinks-flag";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz";
-        sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
-      };
-    };
-    "tar-6.1.14" = {
-      name = "tar";
-      packageName = "tar";
-      version = "6.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz";
-        sha512 = "piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==";
-      };
-    };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha512 = "3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==";
-      };
-    };
-    "tr46-0.0.3" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz";
-        sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==";
-      };
-    };
-    "trim-newlines-1.0.0" = {
-      name = "trim-newlines";
-      packageName = "trim-newlines";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
-        sha512 = "Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==";
-      };
-    };
-    "unzip-response-1.0.2" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha512 = "pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==";
-      };
-    };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha512 = "Gjt2a7j+qL2wvazHPSkWZOay4NfZe7WpV63OtrKbK6Uxyta0U1aS7f++XSNpljIinKYLC8wrNfPHYkPmV5AhbQ==";
-      };
-    };
-    "url-parse-lax-1.0.0" = {
-      name = "url-parse-lax";
-      packageName = "url-parse-lax";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz";
-        sha512 = "BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==";
-      };
-    };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
-      };
-    };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha512 = "FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==";
-      };
-    };
-    "validate-npm-package-license-3.0.4" = {
-      name = "validate-npm-package-license";
-      packageName = "validate-npm-package-license";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
-        sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
-      };
-    };
-    "webidl-conversions-3.0.1" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz";
-        sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==";
-      };
-    };
-    "whatwg-url-5.0.0" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz";
-        sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==";
-      };
-    };
-    "wide-align-1.1.5" = {
-      name = "wide-align";
-      packageName = "wide-align";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz";
-        sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==";
-      };
-    };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha512 = "r5vvGtqsHUHn98V0jURY4Ts86xJf6+SzK9rpWdV8/73nURB3WFPIHd67aOvPw2fSuunIyHjAUqiJ2TY0x4E5gw==";
-      };
-    };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
-      };
-    };
-    "write-file-atomic-1.3.4" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
-        sha512 = "SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==";
-      };
-    };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha512 = "NF1pPn594TaRSUO/HARoB4jK8I+rWgcpVlpQCK6/6o5PHyLUt2CSiDrpUZbQ6rROck+W2EwF8mBJcTs+W98J9w==";
-      };
-    };
-    "yallist-4.0.0" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
-        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
-      };
-    };
-  };
-in
-{
-  base16-builder = nodeEnv.buildNodePackage {
-    name = "base16-builder";
-    packageName = "base16-builder";
-    version = "1.3.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/base16-builder/-/base16-builder-1.3.0.tgz";
-      sha512 = "fXzZ8Pn1mVA0POzZJ1tQzFHlHdVHpR+z31xlbECEy+7yW3jdkYvFtZl9V0SPJSwkOA5aPQALqi4rM0BCtJiAVA==";
-    };
-    dependencies = [
-      sources."@mapbox/node-pre-gyp-1.0.10"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."any-promise-0.1.0"
-      sources."aproba-2.0.0"
-      sources."are-we-there-yet-2.0.0"
-      sources."argparse-1.0.10"
-      sources."array-find-index-1.0.2"
-      sources."balanced-match-1.0.2"
-      (
-        sources."boxen-0.3.1"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-            sources."string-width-1.0.2"
-          ];
-        }
-      )
-      sources."brace-expansion-1.1.11"
-      sources."bulk-replace-0.0.1"
-      sources."camelcase-2.1.1"
-      sources."camelcase-keys-2.1.0"
-      sources."capture-stack-trace-1.0.2"
-      sources."chalk-1.1.3"
-      sources."chownr-2.0.0"
-      sources."code-point-at-1.1.0"
-      sources."color-support-1.1.3"
-      sources."commander-1.1.1"
-      sources."concat-map-0.0.1"
-      (
-        sources."configstore-2.1.0"
-        // {
-          dependencies = [
-            sources."mkdirp-0.5.6"
-          ];
-        }
-      )
-      sources."console-control-strings-1.1.0"
-      sources."core-util-is-1.0.3"
-      sources."create-error-class-3.0.2"
-      sources."currently-unhandled-0.4.1"
-      sources."debug-4.3.4"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.6.0"
-      sources."delegates-1.0.0"
-      sources."detect-libc-2.0.1"
-      sources."dot-prop-3.0.0"
-      (
-        sources."duplexer2-0.1.4"
-        // {
-          dependencies = [
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."ejs-2.7.4"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."error-ex-1.3.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."filled-array-1.1.0"
-      sources."find-up-1.1.2"
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs-promise-0.3.1"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
-      (
-        sources."gauge-3.0.2"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."get-stdin-4.0.1"
-      sources."glob-7.2.3"
-      (
-        sources."got-5.7.1"
-        // {
-          dependencies = [
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."graceful-fs-4.2.11"
-      sources."has-1.0.3"
-      sources."has-ansi-2.0.0"
-      sources."has-unicode-2.0.1"
-      sources."hepburn-1.2.0"
-      sources."hosted-git-info-2.8.9"
-      sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.6.3"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-2.1.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.12.0"
-      sources."is-finite-1.1.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-npm-1.0.0"
-      sources."is-obj-1.0.1"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
-      sources."isarray-1.0.0"
-      sources."js-yaml-3.14.1"
-      sources."keypress-0.1.0"
-      sources."latest-version-2.0.0"
-      sources."limax-1.7.0"
-      sources."load-json-file-1.1.0"
-      sources."loud-rejection-1.6.0"
-      sources."lowercase-keys-1.0.1"
-      sources."lru-cache-6.0.0"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.0"
-          ];
-        }
-      )
-      sources."map-obj-1.0.1"
-      sources."meow-3.7.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."ms-2.1.2"
-      sources."node-addon-api-3.2.1"
-      sources."node-fetch-2.6.10"
-      sources."node-status-codes-1.0.0"
-      sources."nodejieba-2.5.2"
-      sources."nopt-5.0.0"
-      (
-        sources."normalize-package-data-2.5.0"
-        // {
-          dependencies = [
-            sources."semver-5.7.1"
-          ];
-        }
-      )
-      sources."npmlog-5.0.1"
-      sources."number-is-nan-1.0.1"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."open-0.0.5"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      (
-        sources."package-json-2.4.0"
-        // {
-          dependencies = [
-            sources."semver-5.7.1"
-          ];
-        }
-      )
-      sources."parse-json-2.2.0"
-      sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-type-1.1.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pinyin-2.11.2"
-      sources."prepend-http-1.0.4"
-      sources."process-nextick-args-2.0.1"
-      sources."rc-1.2.8"
-      (
-        sources."read-all-stream-3.1.0"
-        // {
-          dependencies = [
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-3.6.2"
-      sources."redent-1.0.0"
-      sources."registry-auth-token-3.4.0"
-      sources."registry-url-3.1.0"
-      sources."repeating-2.0.1"
-      sources."resolve-1.22.3"
-      sources."rimraf-3.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.5.0"
-      (
-        sources."semver-diff-2.1.0"
-        // {
-          dependencies = [
-            sources."semver-5.7.1"
-          ];
-        }
-      )
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."slide-1.1.6"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.3.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.13"
-      sources."speakingurl-14.0.1"
-      sources."sprintf-js-1.0.3"
-      (
-        sources."string-width-4.2.3"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-indent-1.0.1"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."tar-6.1.14"
-      sources."timed-out-3.1.3"
-      sources."tr46-0.0.3"
-      sources."trim-newlines-1.0.0"
-      sources."unzip-response-1.0.2"
-      sources."update-notifier-0.6.3"
-      sources."url-parse-lax-1.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-2.0.3"
-      sources."validate-npm-package-license-3.0.4"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wide-align-1.1.5"
-      (
-        sources."widest-line-1.0.0"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-            sources."string-width-1.0.2"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."yallist-4.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Base16 Builder is a nimble command-line tool that generates themes for your favourite programs.";
-      homepage = "https://github.com/base16-builder/base16-builder#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-}
diff --git a/pkgs/misc/base16-builder/node-packages.json b/pkgs/misc/base16-builder/node-packages.json
deleted file mode 100644
index 3266c128bc4e..000000000000
--- a/pkgs/misc/base16-builder/node-packages.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-    "base16-builder"
-]
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
deleted file mode 100644
index 5c07f7cffc9e..000000000000
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file has been generated by node2nix 1.11.1. Do not edit!
-
-{
-  pkgs ? import <nixpkgs> {
-    inherit system;
-  },
-  system ? builtins.currentSystem,
-  nodejs ? pkgs."nodejs_20",
-}:
-
-let
-  nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs)
-      stdenv
-      lib
-      runCommand
-      writeTextFile
-      writeShellScript
-      ;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages-generated.nix {
-  inherit (pkgs)
-    fetchurl
-    nix-gitignore
-    stdenv
-    lib
-    fetchgit
-    ;
-  inherit nodeEnv;
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 58fd81d447cf..615cc704d698 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -331,6 +331,7 @@ mapAliases {
   badtouch = authoscope; # Project was renamed, added 20210626
   badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
   baget = throw "'baget' has been removed due to being unmaintained";
+  base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
   bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c32d2f97c2..594f9a6d0bb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1891,8 +1891,6 @@ with pkgs;
     libssl = openssl;
   };
 
-  base16-builder = callPackage ../misc/base16-builder { };
-
   babelfish = callPackage ../shells/fish/babelfish.nix { };
 
   bat-extras = recurseIntoAttrs (lib.makeScope newScope (callPackage ../tools/misc/bat-extras { }));

From d1ff75196d6484561179387566b08c8f6be38d11 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jun 2025 14:57:39 +0200
Subject: [PATCH 0823/1497] pretix: expose as python module to local package
 set

This allows consuming pretix as a library for tests.
---
 pkgs/by-name/pr/pretix/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 6900d84dbc47..8743450e547d 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -7,6 +7,7 @@
   python3,
   gettext,
   nixosTests,
+  pretix,
   plugins ? [ ],
 }:
 
@@ -35,6 +36,7 @@ let
         };
       };
 
+      pretix = self.toPythonModule pretix;
       pretix-plugin-build = self.callPackage ./plugin-build.nix { };
     };
   };

From bd1e4e641940958a030e7adc11f696fc57ff73e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:03:47 +0000
Subject: [PATCH 0824/1497] cargo-modules: 0.24.0 -> 0.24.1

---
 pkgs/by-name/ca/cargo-modules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index 1e44adb6cc0e..f580869d1b7b 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -6,17 +6,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = "cargo-modules";
     tag = "v${version}";
-    hash = "sha256-MJswCl5eJjKarB2ufeNLQL0ZPDaRPpX6OGOqszG+a0g=";
+    hash = "sha256-VApgcyG2wKZ2kXHvToWfFi/YM0Q0Ebw2G1RJfmMrGuI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-N1Bj0fqyirp51DNsrZEtRGOSUPS1YNbk+O3kdboQ+TQ=";
+  cargoHash = "sha256-kKYB6Dvvw/DkMJ0q9PPltZMBgGQJ50L7MXFOVjkHSEM=";
 
   checkFlags = [
     "--skip=cfg_test::with_tests::smoke"

From d1539817a480b2adff5e24a40c20763884ccf00c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:07:57 +0000
Subject: [PATCH 0825/1497] octave: 10.1.0 -> 10.2.0

---
 pkgs/development/interpreters/octave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 0107a5872693..39e4b213e3b8 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -97,12 +97,12 @@ let
   allPkgs = pkgs;
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "10.1.0";
+  version = "10.2.0";
   pname = "octave";
 
   src = fetchurl {
     url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-rtRJy6N5/B4Rhuw/w8luCGB4knj7yCOuLOvmA0Q0S3g=";
+    sha256 = "sha256-B/ttkznS81BzXJFnG+jodNFgAYzGtoj579nVWNI39p8=";
   };
 
   postPatch = ''

From 073e616f6cf398051fc41731c3084e4df27c3bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:08:56 +0000
Subject: [PATCH 0826/1497] typos-lsp: 0.1.37 -> 0.1.38

---
 pkgs/by-name/ty/typos-lsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 3aaf61196e42..013cbbb5d5e7 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.37";
+  version = "0.1.38";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-+G4jOoC8AdCE5tEb7qN8cord/pe8Qsa/U1YpL0fWSeo=";
+    hash = "sha256-WzQh+XGROekMzjnR292REI0S1hhaxSHYNWbtwPHy/tA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-D3XmCPQYBbr5OwY62xigtYnHATSePZQnkGoUZWqGMR8=";
+  cargoHash = "sha256-TDcf8AyvpgpVUC5Pw2y+N6ZBhnimrpt39appwZAE8T0=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From 661d65c871072ae7f7d316ce897ffd6a10cb078d Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 15:13:12 +0200
Subject: [PATCH 0827/1497] mopidy-tidal: 0.3.2 -> 0.3.9; fetchPypi ->
 fetchFromGitHub

---
 pkgs/applications/audio/mopidy/tidal.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix
index 5548130665cb..5c1bc69a6ffd 100644
--- a/pkgs/applications/audio/mopidy/tidal.nix
+++ b/pkgs/applications/audio/mopidy/tidal.nix
@@ -1,20 +1,25 @@
 {
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
   mopidy,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-Tidal";
-  version = "0.3.2";
+  version = "0.3.9";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ekqhzKyU2WqTOeRR1ZSZA9yW3UXsLBsC2Bk6FZrQgmc=";
+  src = fetchFromGitHub {
+    owner = "tehkillerbee";
+    repo = "mopidy-tidal";
+    rev = "v${version}";
+    hash = "sha256-RFhuxsb6nQPYxkaeAEABQdCwjbmnOw5pnmYnx6gNCcg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ python3Packages.poetry-core ];
+
+  dependencies = [
     mopidy
     python3Packages.tidalapi
   ];

From 887b9f48160b7b39445808556a9da17cc6c9777c Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Mon, 2 Jun 2025 07:45:25 +0200
Subject: [PATCH 0828/1497] pretix.plugins.sepadebit: init at 2.6.0

---
 .../pr/pretix/plugins/sepadebit/package.nix   | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix

diff --git a/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix
new file mode 100644
index 000000000000..d5ad04b3da56
--- /dev/null
+++ b/pkgs/by-name/pr/pretix/plugins/sepadebit/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pretix-plugin-build,
+  setuptools,
+
+  # dependencies
+  django-localflavor,
+  sepaxml,
+
+  # tests
+  django-scopes,
+  pretix,
+  pytest-django,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pretix-sepadebit";
+  version = "2.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pretix";
+    repo = "pretix-sepadebit";
+    tag = "v${version}";
+    hash = "sha256-o4HVPuSpYIFjxmYuL+IsJJDkv+4ARuvaDqPjxWxlhMg=";
+  };
+
+  build-system = [
+    pretix-plugin-build
+    setuptools
+  ];
+
+  dependencies = [
+    django-localflavor
+    sepaxml
+  ];
+
+  pythonImportsCheck = [
+    "pretix_sepadebit"
+  ];
+
+  nativeCheckInputs = [
+    django-scopes
+    pretix
+    pytest-django
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=pretix.testutils.settings
+  '';
+
+  meta = with lib; {
+    description = "Plugin to receive payments via SEPA direct debit";
+    homepage = "https://github.com/pretix/pretix-sepadebit";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bbenno ];
+  };
+}

From d7edbf55054079d26cb29965848382ca47324f2a Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 15:14:41 +0200
Subject: [PATCH 0829/1497] mopidy-tidal: remove usage of with lib; add
 changelog

---
 pkgs/applications/audio/mopidy/tidal.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix
index 5c1bc69a6ffd..90e27bf0f441 100644
--- a/pkgs/applications/audio/mopidy/tidal.nix
+++ b/pkgs/applications/audio/mopidy/tidal.nix
@@ -31,10 +31,11 @@ python3Packages.buildPythonApplication rec {
 
   pytestFlagsArray = [ "tests/" ];
 
-  meta = with lib; {
+  meta = {
     description = "Mopidy extension for playing music from Tidal";
     homepage = "https://github.com/tehkillerbee/mopidy-tidal";
-    license = licenses.mit;
+    changelog = "https://github.com/tehkillerbee/mopidy-tidal/releases/tag/v${version}";
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 2f08dad0d10c6a41a6a9a70215cbe5da29262e17 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 15:16:03 +0200
Subject: [PATCH 0830/1497] mopidy: remove usage of with lib;

---
 pkgs/applications/audio/mopidy/mopidy.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index d839daaaa437..32e9e00d468f 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -75,12 +75,12 @@ pythonPackages.buildPythonApplication rec {
     inherit (nixosTests) mopidy;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.mopidy.com/";
     description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more";
     mainProgram = "mopidy";
-    license = licenses.asl20;
-    maintainers = [ maintainers.fpletz ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.fpletz ];
     hydraPlatforms = [ ];
   };
 }

From 9d3368c4b1ed900d13069d0afc2c29d5c5b2471e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:19:06 +0000
Subject: [PATCH 0831/1497] qpwgraph: 0.9.2 -> 0.9.3

---
 pkgs/applications/audio/qpwgraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix
index d221a81617ac..31295e4d3071 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-SCco66Czu8dW7iSSX/exhIlOXS+ayCwGUuCfJuUCRjM=";
+    sha256 = "sha256-6aJymZjuUMezEbOosveXyiY7y+XgGk3E8Dd4tb8UyrU=";
   };
 
   nativeBuildInputs = [

From b5d7937b88d9b9f2e0f33951ed03bf43270cfb3d Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Mon, 5 May 2025 15:22:37 +0100
Subject: [PATCH 0832/1497] linuxPackages.mwprocapture: 1.3.0.4390 -> 1.3.4418
 #403297

Version V1.3.0.4390 of mwprocapture (the Linux driver for the Magewell Pro Capture family) FTBFS when building against Linux 6.12 or newer.

Magewell offer a revised driver. This pull request updates the driver version to 1.3.4418 to address this issue. *Note the version numbering has changed in this release*.

Vendor change log:
- Fix the compatibility issue of the kernel driver for RHEL9.4.
- Add the preset function for contrast/brightness/saturation/hue values.
- Support the installation of drivers in a Secure Boot environment.

Tested using a Magewell Pro Capture Dual HDMI (11080) and Magewell Pro Capture Quad HDMI (11100). This fixes #403297
---
 pkgs/os-specific/linux/mwprocapture/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index 28c2e11e429c..9dfc04ede158 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -18,12 +18,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mwprocapture";
-  subVersion = "4390";
-  version = "1.3.0.${subVersion}-${kernel.version}";
+  subVersion = "1.3.4418";
+  version = "${subVersion}-${kernel.version}";
 
   src = fetchurl {
     url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";
-    sha256 = "sha256-a2cU7PYQh1KR5eeMhMNx2Sc3HHd7QvCG9+BoJyVPp1Y=";
+    sha256 = "sha256-ZUqJkARhaMo9aZOtUMEdiHEbEq10lJO6MkGjEDnfx1g=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -65,11 +65,12 @@ stdenv.mkDerivation rec {
       "$out"/bin/mwcap-info
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.magewell.com/";
     description = "Linux driver for the Magewell Pro Capture family";
-    license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ flexiondotorg ];
-    platforms = platforms.linux;
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    platforms = lib.platforms.linux;
+    broken = lib.versionAtLeast kernel.version "6.15";
   };
 }

From a07abda0915f4914d0d3c7a1d00d60c0db2700b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:42:41 +0000
Subject: [PATCH 0833/1497] jwx: 3.0.1 -> 3.0.2

---
 pkgs/by-name/jw/jwx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index ce64a516a332..8a1861eb8f6d 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZVI32z1hUquDUWdaLZGtI0PncboVHx2FJ3BB4MAhX0w=";
+    hash = "sha256-IKMTRgxqGZkYK5WVWUjIrjed6ukphHzbmtXOwoJSkRo=";
   };
 
-  vendorHash = "sha256-vyqsUZ7IxXI6LZKrSOPxheE/IISKRC0wXB7+xj51xLM=";
+  vendorHash = "sha256-mqPlub5JbD7dcMHi72xda72HQJF57uqzHaJzYOQNk+Q=";
 
   sourceRoot = "${finalAttrs.src.name}/cmd/jwx";
 

From e7e8d41986d58eacf75068008cce1b8de9787480 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:48:34 +0000
Subject: [PATCH 0834/1497] kubectl-view-allocations: 0.21.1 -> 0.21.2

---
 .../networking/cluster/kubectl-view-allocations/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
index 23496281ce2f..0f5924487a47 100644
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubectl-view-allocations";
-  version = "0.21.1";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "davidB";
     repo = "kubectl-view-allocations";
     tag = version;
-    hash = "sha256-1bE2idLPok6YmB1qyTDQmBg+uzc6/Sza75dSN7QpEcI=";
+    hash = "sha256-WIByZc2B38NC+kp0ODQjYS81R7vX60A2aoVaE86w/NQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QAjANg8os3RID0Lrl7qGEvxT/1i8UBwVfK0G4PHwrXA=";
+  cargoHash = "sha256-aSI5SN0RujHVq7VNNsV6m3KnQqVTWyqfLmGHhwH/3ig=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From a5a21518f549f1dd02f26259fa3ca19e94a21fe6 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 1 Jun 2025 21:54:49 +0200
Subject: [PATCH 0835/1497] lux-cli: 0.5.3 -> 0.6.0

---
 pkgs/by-name/lu/lux-cli/package.nix      | 13 +++++++++----
 pkgs/development/lua-modules/lux-lua.nix | 14 ++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index d45fed718e9f..56dc3fdade1f 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -1,11 +1,11 @@
 {
+  fetchFromGitHub,
   gnupg,
   gpgme,
   installShellFiles,
   lib,
   libgit2,
   libgpg-error,
-  luaPackages,
   luajit,
   makeWrapper,
   nix,
@@ -17,13 +17,18 @@
 rustPlatform.buildRustPackage rec {
   pname = "lux-cli";
 
-  version = "0.5.3";
+  version = "0.6.0";
 
-  src = luaPackages.lux-lua.src;
+  src = fetchFromGitHub {
+    owner = "nvim-neorocks";
+    repo = "lux";
+    tag = "v0.6.0";
+    hash = "sha256-bGG/W0ESiBAorcZrc34JrIF7pPAKatqOCeE8/jM9t7g=";
+  };
 
   buildAndTestSubdir = "lux-cli";
   useFetchCargoVendor = true;
-  cargoHash = luaPackages.lux-lua.cargoHash;
+  cargoHash = "sha256-UXiEicwQ/GnKAel3PlgpoZBfHNURmRi+Urjszlwz8mU=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index f06833173c1e..361fe5fdf558 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -1,5 +1,4 @@
 {
-  fetchFromGitHub,
   gnupg,
   gpgme,
   isLuaJIT,
@@ -7,6 +6,7 @@
   libgit2,
   libgpg-error,
   lua,
+  lux-cli,
   nix,
   openssl,
   pkg-config,
@@ -20,22 +20,16 @@ in
 rustPlatform.buildRustPackage rec {
   pname = "lux-lua";
 
-  version = "0.1.6";
+  version = lux-cli.version;
 
-  src = fetchFromGitHub {
-    owner = "nvim-neorocks";
-    repo = "lux";
-    # NOTE: Lux's tags represent the lux-cli version, which may differ from the lux-lua version
-    tag = "v0.5.3";
-    hash = "sha256-iiXPLm05HsenB6I8aLiFjRMkziQ0khlSWvvskvVwuDA=";
-  };
+  src = lux-cli.src;
 
   buildAndTestSubdir = "lux-lua";
   buildNoDefaultFeatures = true;
   buildFeatures = [ luaFeature ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-S3dcjFDVwvdUFpRjHhJRPjEluRxWi+XSxN5mj1WP26A=";
+  cargoHash = lux-cli.cargoHash;
 
   nativeBuildInputs = [
     pkg-config

From 7303eab2fece54285a7af1489f26f6037731429b Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 3 Jun 2025 14:22:59 +0200
Subject: [PATCH 0836/1497] ayugram-desktop: 5.12.3 -> 5.14.3

---
 pkgs/by-name/ay/ayugram-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix
index fcc983e3ab73..8374b8407a40 100644
--- a/pkgs/by-name/ay/ayugram-desktop/package.nix
+++ b/pkgs/by-name/ay/ayugram-desktop/package.nix
@@ -13,13 +13,13 @@ telegram-desktop.override {
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (
     finalAttrs: previousAttrs: {
       pname = "ayugram-desktop-unwrapped";
-      version = "5.12.3";
+      version = "5.14.3";
 
       src = fetchFromGitHub {
         owner = "AyuGram";
         repo = "AyuGramDesktop";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-Zjik+9J0YtabVW1VEkJr/Bl3SIakVQ8EiTLYm28rEIk=";
+        hash = "sha256-cirUnGtjEc8aQzXH0r5kVhobEqf63eoZ17Gg99e+FCQ=";
         fetchSubmodules = true;
       };
 

From 14320399a81358f8fd17977f8a4aabb104c7c661 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 3 Jun 2025 14:26:24 +0200
Subject: [PATCH 0837/1497] materialgram: 5.12.5.1 -> 5.14.3.1

---
 pkgs/by-name/ma/materialgram/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix
index 11263148c813..ef699ae5d390 100644
--- a/pkgs/by-name/ma/materialgram/package.nix
+++ b/pkgs/by-name/ma/materialgram/package.nix
@@ -11,13 +11,13 @@ telegram-desktop.override {
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (
     finalAttrs: previousAttrs: {
       pname = "materialgram-unwrapped";
-      version = "5.12.5.1";
+      version = "5.14.3.1";
 
       src = fetchFromGitHub {
         owner = "kukuruzka165";
         repo = "materialgram";
         rev = "refs/tags/v${finalAttrs.version}";
-        hash = "sha256-l6pVqmz8rfNhta2nCJISLl/nZqoSDBD3QrskmmhoQM4=";
+        hash = "sha256-wnhEnhNeuY7eRvmsDnpZ2CiKHXFvgIYpZp2ftjq54/Q=";
         fetchSubmodules = true;
       };
 

From 6648c5f4c0cd54ff0ed91f1faad8c24afecea726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 13:56:59 +0000
Subject: [PATCH 0838/1497] ffizer: 2.13.2 -> 2.13.3

---
 pkgs/by-name/ff/ffizer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index dbcd7a4f2b72..6cd1b410aa32 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ffizer";
-  version = "2.13.2";
+  version = "2.13.3";
 
   buildFeatures = [ "cli" ];
 
@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec {
     owner = "ffizer";
     repo = "ffizer";
     rev = version;
-    hash = "sha256-GL1tdWOcbdybPayfShoGnxHsqYi8p+DZ6Eo/8bvWElE=";
+    hash = "sha256-S5iF2xjOw1g6scxUMGn6ghr3iASlLlz6IUYjsLo1wRk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5hsJ6eMiUPOqAzW1bdXTGTP5tY6VM2tTdySpkJl6pAY=";
+  cargoHash = "sha256-VYjxSZUFgdrYiL0yzHVLH3MgUx4geypxDV2h8lpqc0o=";
 
   nativeBuildInputs = [
     pkg-config

From e5d08f251abf14fd10f8d772278f446fee852a82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 14:02:31 +0000
Subject: [PATCH 0839/1497] sbt: 1.10.11 -> 1.11.1

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 1c23ceaaf378..eafda766ba6c 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.10.11";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
-    hash = "sha256-UDSmSEG4qc+1KjQeRbAd8rjC/6qH2NKw/jPEzcq9jww=";
+    hash = "sha256-pVTTb93SZ3q81VsKPw3OA6tJTjUK4y2ik252whHYXuQ=";
   };
 
   postPatch = ''

From e61bb30305eaa4ba193dbd09a6895c6a92958cd5 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 3 Jun 2025 16:15:50 +0200
Subject: [PATCH 0840/1497] treewide: remove with lib Part 2

---
 pkgs/by-name/fi/fiano/package.nix             |  6 ++---
 pkgs/by-name/fi/fiche/package.nix             |  8 +++---
 pkgs/by-name/fi/fierce/package.nix            |  6 ++---
 pkgs/by-name/fi/fim-rs/package.nix            |  6 ++---
 pkgs/by-name/fi/findomain/package.nix         |  6 ++---
 pkgs/by-name/fi/fingerprintx/package.nix      |  6 ++---
 pkgs/by-name/fi/firecracker/package.nix       |  6 ++---
 pkgs/by-name/fl/flare-floss/package.nix       |  6 ++---
 pkgs/by-name/fl/flavours/package.nix          |  6 ++---
 pkgs/by-name/fl/flip-link/package.nix         |  6 ++---
 pkgs/by-name/fl/flycast/package.nix           |  8 +++---
 pkgs/by-name/fo/foliate/package.nix           |  6 ++---
 pkgs/by-name/fo/fortune-kind/package.nix      |  8 +++---
 pkgs/by-name/fo/four-in-a-row/package.nix     |  8 +++---
 pkgs/by-name/fr/fractal/package.nix           |  8 +++---
 pkgs/by-name/fr/frawk/package.nix             |  6 ++---
 pkgs/by-name/fr/fre/package.nix               |  6 ++---
 pkgs/by-name/fr/freenukum/package.nix         |  6 ++---
 pkgs/by-name/fr/freetds/package.nix           |  8 +++---
 pkgs/by-name/fr/frotz/package.nix             |  8 +++---
 pkgs/by-name/ga/galene/package.nix            |  8 +++---
 pkgs/by-name/ga/galer/package.nix             |  6 ++---
 pkgs/by-name/ga/gallia/package.nix            |  8 +++---
 pkgs/by-name/ga/gam/package.nix               |  6 ++---
 pkgs/by-name/ga/game-rs/package.nix           |  8 +++---
 pkgs/by-name/ga/gato/package.nix              |  6 ++---
 pkgs/by-name/gc/gcli/package.nix              |  8 +++---
 pkgs/by-name/gc/gcp-scanner/package.nix       |  6 ++---
 pkgs/by-name/gc/gcsfuse/package.nix           |  6 ++---
 pkgs/by-name/ge/geary/package.nix             |  8 +++---
 pkgs/by-name/ge/genact/package.nix            |  6 ++---
 pkgs/by-name/ge/gerbera/package.nix           |  8 +++---
 pkgs/by-name/gh/gh-i/package.nix              |  6 ++---
 pkgs/by-name/gh/gh/package.nix                |  6 ++---
 pkgs/by-name/gh/ghauri/package.nix            |  6 ++---
 pkgs/by-name/gh/ghostie/package.nix           |  6 ++---
 pkgs/by-name/gh/ghostunnel/package.nix        |  6 ++---
 pkgs/by-name/gh/ghunt/package.nix             |  6 ++---
 pkgs/by-name/gi/girsh/package.nix             |  6 ++---
 pkgs/by-name/gi/git-cliff/package.nix         |  6 ++---
 pkgs/by-name/gi/git-gr/package.nix            |  6 ++---
 .../git-interactive-rebase-tool/package.nix   |  6 ++---
 pkgs/by-name/gi/git-mit/package.nix           |  6 ++---
 pkgs/by-name/gi/git-nomad/package.nix         |  6 ++---
 pkgs/by-name/gi/git-releaser/package.nix      |  6 ++---
 pkgs/by-name/gi/git-stack/package.nix         |  6 ++---
 pkgs/by-name/gi/git-together/package.nix      |  6 ++---
 pkgs/by-name/gi/gitcs/package.nix             |  6 ++---
 .../gi/gitea-actions-runner/package.nix       |  6 ++---
 pkgs/by-name/gi/gitg/package.nix              |  8 +++---
 pkgs/by-name/gi/github-runner/package.nix     | 10 +++----
 pkgs/by-name/gi/gitlab-pages/package.nix      |  6 ++---
 pkgs/by-name/gi/gitleaks/package.nix          |  6 ++---
 pkgs/by-name/gi/gitls/package.nix             |  6 ++---
 pkgs/by-name/gi/gittuf/package.nix            |  6 ++---
 pkgs/by-name/gi/gitversion/package.nix        |  8 +++---
 pkgs/by-name/gl/glasskube/package.nix         |  6 ++---
 pkgs/by-name/gl/glitter/package.nix           |  6 ++---
 pkgs/by-name/gl/glow/package.nix              |  6 ++---
 pkgs/by-name/go/go-bindata/package.nix        |  6 ++---
 pkgs/by-name/go/go-camo/package.nix           |  6 ++---
 pkgs/by-name/go/go-cve-search/package.nix     |  6 ++---
 pkgs/by-name/go/go-dork/package.nix           |  6 ++---
 pkgs/by-name/go/go-exploitdb/package.nix      |  6 ++---
 pkgs/by-name/go/go-licenses/package.nix       |  6 ++---
 pkgs/by-name/go/go-secdump/package.nix        |  6 ++---
 pkgs/by-name/go/go-swagger/package.nix        |  6 ++---
 pkgs/by-name/go/go2rtc/package.nix            |  6 ++---
 pkgs/by-name/go/go2tv/package.nix             |  6 ++---
 pkgs/by-name/go/go365/package.nix             |  6 ++---
 pkgs/by-name/go/goaccess/package.nix          |  8 +++---
 pkgs/by-name/go/gobgpd/package.nix            |  6 ++---
 pkgs/by-name/go/goblob/package.nix            |  6 ++---
 pkgs/by-name/go/gobuster/package.nix          |  6 ++---
 pkgs/by-name/go/godns/package.nix             |  6 ++---
 pkgs/by-name/go/godspeed/package.nix          |  8 +++---
 pkgs/by-name/go/goeland/package.nix           |  6 ++---
 pkgs/by-name/go/gogup/package.nix             |  6 ++---
 pkgs/by-name/go/golangci-lint/package.nix     |  6 ++---
 pkgs/by-name/go/gomtree/package.nix           |  6 ++---
 .../by-name/go/google-guest-agent/package.nix |  8 +++---
 pkgs/by-name/go/goresym/package.nix           |  6 ++---
 pkgs/by-name/go/gorilla-cli/package.nix       |  6 ++---
 pkgs/by-name/go/goss/package.nix              |  8 +++---
 pkgs/by-name/go/gotestfmt/package.nix         |  6 ++---
 pkgs/by-name/go/gotestwaf/package.nix         |  6 ++---
 pkgs/by-name/go/gotosocial/package.nix        |  6 ++---
 pkgs/by-name/go/goverview/package.nix         |  6 ++---
 pkgs/by-name/go/govulncheck/package.nix       |  6 ++---
 .../gr/grafana-dash-n-grab/package.nix        |  6 ++---
 pkgs/by-name/gr/grafana-loki/package.nix      |  6 ++---
 pkgs/by-name/gr/granted/package.nix           |  6 ++---
 pkgs/by-name/gr/graphinder/package.nix        |  6 ++---
 pkgs/by-name/gr/greenmask/package.nix         |  6 ++---
 pkgs/by-name/gr/grex/package.nix              |  6 ++---
 pkgs/by-name/gr/grpc/package.nix              |  8 +++---
 pkgs/by-name/gu/guix/package.nix              |  8 +++---
 pkgs/by-name/gu/gum/package.nix               |  6 ++---
 .../ha/ha-mqtt-discoverable-cli/package.nix   |  6 ++---
 pkgs/by-name/ha/halloy/package.nix            |  6 ++---
 pkgs/by-name/ha/haveged/package.nix           | 10 +++----
 pkgs/by-name/ha/hayagriva/package.nix         |  6 ++---
 pkgs/by-name/he/hednsextractor/package.nix    |  6 ++---
 pkgs/by-name/he/helm-ls/package.nix           |  6 ++---
 pkgs/by-name/he/hevea/package.nix             |  8 +++---
 pkgs/by-name/he/hex/package.nix               |  6 ++---
 pkgs/by-name/he/heygpt/package.nix            |  6 ++---
 pkgs/by-name/hi/hilbish/package.nix           |  6 ++---
 pkgs/by-name/hi/himalaya/package.nix          |  6 ++---
 pkgs/by-name/ho/hors/package.nix              |  6 ++---
 pkgs/by-name/hy/hyperfine/package.nix         |  6 ++---
 pkgs/by-name/ic/icoextract/package.nix        |  6 ++---
 pkgs/by-name/im/imaginary/package.nix         |  6 ++---
 pkgs/by-name/im/imdshift/package.nix          |  6 ++---
 pkgs/by-name/im/immer/package.nix             |  8 +++---
 pkgs/by-name/in/inferno/package.nix           |  6 ++---
 pkgs/by-name/in/inform6/package.nix           |  6 ++---
 pkgs/by-name/in/infra/package.nix             |  6 ++---
 pkgs/by-name/in/infracost/package.nix         |  6 ++---
 pkgs/by-name/in/inih/package.nix              |  8 +++---
 pkgs/by-name/in/initool/package.nix           |  6 ++---
 pkgs/by-name/in/innernet/package.nix          |  6 ++---
 pkgs/by-name/in/inql/package.nix              |  6 ++---
 pkgs/by-name/in/insomnia/package.nix          |  6 ++---
 .../intel-compute-runtime-legacy1/package.nix |  6 ++---
 .../in/intel-compute-runtime/package.nix      |  6 ++---
 pkgs/by-name/in/intel-gpu-tools/package.nix   |  6 ++---
 .../by-name/in/intel-media-driver/package.nix |  8 +++---
 pkgs/by-name/in/interactsh/package.nix        |  6 ++---
 pkgs/by-name/in/intermodal/package.nix        |  6 ++---
 pkgs/by-name/ir/ircdog/package.nix            |  6 ++---
 pkgs/by-name/ir/irqbalance/package.nix        |  8 +++---
 pkgs/by-name/ir/irrd/package.nix              |  6 ++---
 pkgs/by-name/ja/jaeles/package.nix            |  6 ++---
 pkgs/by-name/ja/janus-gateway/package.nix     |  8 +++---
 pkgs/by-name/ji/jigdo/package.nix             |  8 +++---
 pkgs/by-name/ji/jira-cli-go/package.nix       |  6 ++---
 .../by-name/ji/jitterentropy-rngd/package.nix | 10 +++----
 pkgs/by-name/ju/jumpy/package.nix             |  6 ++---
 pkgs/by-name/ju/just/package.nix              |  6 ++---
 pkgs/by-name/ka/kafkactl/package.nix          |  6 ++---
 pkgs/by-name/ka/kalker/package.nix            |  6 ++---
 pkgs/by-name/ka/karate/package.nix            |  6 ++---
 pkgs/by-name/ka/karmor/package.nix            |  6 ++---
 pkgs/by-name/ka/katana/package.nix            |  6 ++---
 pkgs/by-name/kd/kdigger/package.nix           |  6 ++---
 .../kd/kdsingleapplication/package.nix        |  8 +++---
 pkgs/by-name/ke/kea/package.nix               |  8 +++---
 pkgs/by-name/ke/keedump/package.nix           |  6 ++---
 pkgs/by-name/ke/keepassxc-go/package.nix      |  6 ++---
 pkgs/by-name/ke/keepwn/package.nix            |  6 ++---
 pkgs/by-name/ke/kent/package.nix              |  8 +++---
 pkgs/by-name/ki/kickstart/package.nix         |  6 ++---
 pkgs/by-name/ki/kics/package.nix              |  6 ++---
 pkgs/by-name/ki/kikit/solidpython/default.nix |  6 ++---
 pkgs/by-name/ki/kitty-img/package.nix         |  6 ++---
 pkgs/by-name/km/kmon/package.nix              |  8 +++---
 pkgs/by-name/ko/ko/package.nix                |  6 ++---
 pkgs/by-name/ko/konstraint/package.nix        |  6 ++---
 pkgs/by-name/ko/kor/package.nix               |  6 ++---
 pkgs/by-name/ko/koreader/package.nix          |  8 +++---
 pkgs/by-name/ku/kube-bench/package.nix        |  6 ++---
 pkgs/by-name/ku/kube-capacity/package.nix     |  6 ++---
 pkgs/by-name/ku/kube-linter/package.nix       |  8 +++---
 pkgs/by-name/ku/kube-score/package.nix        |  6 ++---
 pkgs/by-name/ku/kubeaudit/package.nix         |  6 ++---
 pkgs/by-name/ku/kubecfg/package.nix           |  6 ++---
 pkgs/by-name/ku/kubeclarity/package.nix       |  6 ++---
 pkgs/by-name/ku/kubecolor/package.nix         |  6 ++---
 pkgs/by-name/ku/kubectl-doctor/package.nix    |  6 ++---
 pkgs/by-name/ku/kubectl-example/package.nix   |  6 ++---
 pkgs/by-name/ku/kubectl-explore/package.nix   |  6 ++---
 pkgs/by-name/ku/kubectl-images/package.nix    |  6 ++---
 pkgs/by-name/ku/kubectl-ktop/package.nix      |  6 ++---
 pkgs/by-name/ku/kubectl-neat/package.nix      |  6 ++---
 pkgs/by-name/ku/kubectl-tree/package.nix      |  6 ++---
 .../ku/kubectl-view-secret/package.nix        |  6 ++---
 pkgs/by-name/ku/kubefirst/package.nix         |  6 ++---
 pkgs/by-name/ku/kubeone/package.nix           |  6 ++---
 .../ku/kubernetes-code-generator/package.nix  |  6 ++---
 .../kubernetes-controller-tools/package.nix   |  6 ++---
 pkgs/by-name/ku/kubescape/package.nix         |  6 ++---
 pkgs/by-name/ku/kubeseal/package.nix          |  6 ++---
 pkgs/by-name/ku/kubesec/package.nix           |  6 ++---
 pkgs/by-name/ku/kubeshark/package.nix         |  6 ++---
 pkgs/by-name/ku/kubestroyer/package.nix       |  6 ++---
 pkgs/by-name/la/lapce/package.nix             |  6 ++---
 pkgs/by-name/la/lasso/package.nix             |  8 +++---
 pkgs/by-name/le/lean/package.nix              |  8 +++---
 pkgs/by-name/le/ledfx/package.nix             |  6 ++---
 pkgs/by-name/le/ledger-autosync/package.nix   |  6 ++---
 pkgs/by-name/le/ledger/package.nix            |  8 +++---
 pkgs/by-name/le/leetgo/package.nix            |  6 ++---
 pkgs/by-name/le/legba/package.nix             |  6 ++---
 pkgs/by-name/le/legitify/package.nix          |  6 ++---
 pkgs/by-name/le/lemmeknow/package.nix         |  6 ++---
 pkgs/by-name/le/lemmy-help/package.nix        |  6 ++---
 pkgs/by-name/le/level-zero/package.nix        |  8 +++---
 pkgs/by-name/li/libaom/package.nix            |  8 +++---
 pkgs/by-name/li/libavif/package.nix           |  8 +++---
 .../li/libayatana-appindicator/package.nix    | 10 +++----
 .../li/libayatana-indicator/package.nix       |  8 +++---
 pkgs/by-name/li/libcyaml/package.nix          |  6 ++---
 pkgs/by-name/li/libeduvpn-common/package.nix  |  8 +++---
 pkgs/by-name/li/libgcrypt/package.nix         |  8 +++---
 pkgs/by-name/li/libgedit-amtk/package.nix     |  8 +++---
 pkgs/by-name/li/libglvnd/package.nix          |  8 +++---
 pkgs/by-name/li/libgpg-error/package.nix      |  8 +++---
 pkgs/by-name/li/libhugetlbfs/package.nix      | 14 +++++-----
 pkgs/by-name/li/libical/package.nix           |  8 +++---
 pkgs/by-name/li/libipuz/package.nix           |  8 +++---
 pkgs/by-name/li/libkqueue/package.nix         |  8 +++---
 pkgs/by-name/li/libmbim/package.nix           |  8 +++---
 pkgs/by-name/li/libosinfo/package.nix         |  8 +++---
 pkgs/by-name/li/libplacebo/package.nix        |  8 +++---
 pkgs/by-name/li/libplacebo_5/package.nix      |  8 +++---
 pkgs/by-name/li/libpsl/package.nix            |  8 +++---
 pkgs/by-name/li/libqmi/package.nix            |  8 +++---
 .../libre-graph-api-cpp-qt-client/package.nix |  8 +++---
 pkgs/by-name/li/librsync/package.nix          |  6 ++---
 pkgs/by-name/li/libsndfile/package.nix        |  8 +++---
 pkgs/by-name/li/libspelling/package.nix       | 10 +++----
 pkgs/by-name/li/libtasn1/package.nix          |  6 ++---
 pkgs/by-name/li/libtins/package.nix           |  4 +--
 pkgs/by-name/li/libtomcrypt/package.nix       |  8 +++---
 pkgs/by-name/li/libudev-zero/package.nix      | 10 +++----
 pkgs/by-name/li/libuninameslist/package.nix   |  8 +++---
 pkgs/by-name/li/liburcu/package.nix           | 26 +++++++++----------
 pkgs/by-name/li/libvirt/package.nix           |  8 +++---
 pkgs/by-name/li/libvpx/package.nix            |  8 +++---
 pkgs/by-name/li/license-scanner/package.nix   |  6 ++---
 pkgs/by-name/li/lightsoff/package.nix         |  8 +++---
 pkgs/by-name/li/ligolo-ng/package.nix         |  4 +--
 pkgs/by-name/li/likwid/package.nix            |  8 +++---
 pkgs/by-name/li/lil-pwny/package.nix          |  6 ++---
 pkgs/by-name/li/link-grammar/package.nix      |  8 +++---
 pkgs/by-name/li/linkchecker/package.nix       |  6 ++---
 pkgs/by-name/li/linux-router/package.nix      |  8 +++---
 pkgs/by-name/li/listenbrainz-mpd/package.nix  |  6 ++---
 pkgs/by-name/li/listmonk/package.nix          |  6 ++---
 pkgs/by-name/li/listmonk/stuffbin.nix         |  6 ++---
 pkgs/by-name/li/litecli/package.nix           |  6 ++---
 pkgs/by-name/li/livi/package.nix              |  8 +++---
 pkgs/by-name/lo/lokinet/package.nix           |  6 ++---
 pkgs/by-name/lo/loramon/package.nix           |  6 ++---
 pkgs/by-name/lu/luabridge/package.nix         |  8 +++---
 pkgs/by-name/lu/lubelogger/package.nix        |  8 +++---
 pkgs/by-name/lu/ludusavi/package.nix          |  6 ++---
 pkgs/by-name/lu/luigi/package.nix             |  6 ++---
 pkgs/by-name/lu/lux/package.nix               |  6 ++---
 pkgs/by-name/ma/macchina/package.nix          |  6 ++---
 pkgs/by-name/ma/macs2/package.nix             |  6 ++---
 pkgs/by-name/ma/maelstrom-clj/package.nix     | 10 +++----
 pkgs/by-name/ma/magic-wormhole-rs/package.nix |  6 ++---
 pkgs/by-name/ma/mailhog/package.nix           |  6 ++---
 pkgs/by-name/ma/maim/package.nix              |  4 +--
 pkgs/by-name/ma/mainsail/package.nix          |  8 +++---
 pkgs/by-name/ma/malwoverview/package.nix      |  6 ++---
 pkgs/by-name/ma/mantra/package.nix            |  6 ++---
 pkgs/by-name/ma/mapcidr/package.nix           |  6 ++---
 .../ma/markdown-anki-decks/package.nix        |  8 +++---
 pkgs/by-name/ma/marker/package.nix            |  8 +++---
 pkgs/by-name/ma/martian-mono/package.nix      |  8 +++---
 pkgs/by-name/ma/masscan/package.nix           |  8 +++---
 pkgs/by-name/ma/massdns/package.nix           | 10 +++----
 .../ma/matrix-appservice-irc/package.nix      |  8 +++---
 .../ma/matrix-synapse-unwrapped/package.nix   |  8 +++---
 .../plugins/s3-storage-provider.nix           |  6 ++---
 pkgs/by-name/mc/mcfly/package.nix             |  6 ++---
 pkgs/by-name/me/med/package.nix               |  8 +++---
 pkgs/by-name/me/mediawriter/package.nix       |  6 ++---
 pkgs/by-name/me/melt/package.nix              |  6 ++---
 pkgs/by-name/me/menyoki/package.nix           |  6 ++---
 pkgs/by-name/me/mercure/package.nix           |  8 +++---
 pkgs/by-name/me/mermerd/package.nix           |  6 ++---
 pkgs/by-name/me/metabigor/package.nix         |  6 ++---
 pkgs/by-name/me/metacity/package.nix          |  8 +++---
 pkgs/by-name/mi/microbin/package.nix          |  6 ++---
 pkgs/by-name/mi/millet/package.nix            |  8 +++---
 .../by-name/mi/minetest-mapserver/package.nix |  8 +++---
 pkgs/by-name/mi/minify/package.nix            |  6 ++---
 pkgs/by-name/mi/minigalaxy/package.nix        |  8 +++---
 pkgs/by-name/mi/minijinja/package.nix         |  6 ++---
 pkgs/by-name/mi/miniserve/package.nix         |  6 ++---
 pkgs/by-name/mi/misconfig-mapper/package.nix  |  6 ++---
 pkgs/by-name/mi/mitmproxy2swagger/package.nix |  6 ++---
 pkgs/by-name/ml/mlkit/package.nix             |  8 +++---
 pkgs/by-name/ml/mlxbf-bootctl/package.nix     |  6 ++---
 .../package.nix                               |  8 +++---
 pkgs/by-name/mo/mockgen/package.nix           |  6 ++---
 pkgs/by-name/mo/mockoon/package.nix           |  8 +++---
 pkgs/by-name/mo/mommy/package.nix             |  8 +++---
 pkgs/by-name/mo/monsoon/package.nix           |  6 ++---
 pkgs/by-name/my/mydumper/package.nix          |  6 ++---
 pkgs/by-name/my/myks/package.nix              | 10 +++----
 pkgs/by-name/na/naabu/package.nix             |  6 ++---
 pkgs/by-name/na/namespace-cli/package.nix     |  6 ++---
 pkgs/by-name/na/nanodbc/package.nix           |  6 ++---
 pkgs/by-name/na/nats-kafka/package.nix        |  6 ++---
 pkgs/by-name/na/nats-server/package.nix       |  6 ++---
 pkgs/by-name/na/nats-top/package.nix          |  6 ++---
 pkgs/by-name/na/natscli/package.nix           |  6 ++---
 pkgs/by-name/ne/neatvnc/package.nix           |  8 +++---
 pkgs/by-name/ne/nebula/package.nix            |  6 ++---
 pkgs/by-name/ne/neon/package.nix              |  6 ++---
 pkgs/by-name/ne/netclient/package.nix         |  6 ++---
 pkgs/by-name/ne/netop/package.nix             |  8 +++---
 pkgs/by-name/ne/neverest/package.nix          |  6 ++---
 pkgs/by-name/ne/newman/package.nix            |  6 ++---
 pkgs/by-name/ne/next-ls/package.nix           |  6 ++---
 pkgs/by-name/nf/nfdump/package.nix            |  8 +++---
 pkgs/by-name/nf/nfpm/package.nix              |  6 ++---
 pkgs/by-name/ni/nikto/package.nix             |  8 +++---
 pkgs/by-name/ni/nil/package.nix               |  6 ++---
 pkgs/by-name/ni/nix-du/package.nix            |  8 +++---
 pkgs/by-name/ni/nix-template/package.nix      |  6 ++---
 pkgs/by-name/ni/nix-weather/package.nix       |  8 +++---
 pkgs/by-name/no/noaa-apt/package.nix          |  8 +++---
 pkgs/by-name/no/node-manta/package.nix        |  6 ++---
 .../no/node-problem-detector/package.nix      |  6 ++---
 pkgs/by-name/no/nodenv/package.nix            |  8 +++---
 pkgs/by-name/no/nofi/package.nix              |  8 +++---
 pkgs/by-name/no/nomore403/package.nix         |  6 ++---
 pkgs/by-name/no/normcap/package.nix           |  6 ++---
 pkgs/by-name/no/noseyparker/package.nix       |  6 ++---
 pkgs/by-name/no/nostr-rs-relay/package.nix    |  6 ++---
 326 files changed, 1101 insertions(+), 1101 deletions(-)

diff --git a/pkgs/by-name/fi/fiano/package.nix b/pkgs/by-name/fi/fiano/package.nix
index 3f09e5af9c40..8106ecd3a987 100644
--- a/pkgs/by-name/fi/fiano/package.nix
+++ b/pkgs/by-name/fi/fiano/package.nix
@@ -34,11 +34,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Go-based tools for modifying UEFI firmware";
     homepage = "https://github.com/linuxboot/fiano";
     changelog = "https://github.com/linuxboot/fiano/blob/v${version}/RELEASES.md";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.jmbaur ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.jmbaur ];
   };
 }
diff --git a/pkgs/by-name/fi/fiche/package.nix b/pkgs/by-name/fi/fiche/package.nix
index 4361019d55f7..5fff1716c7c6 100644
--- a/pkgs/by-name/fi/fiche/package.nix
+++ b/pkgs/by-name/fi/fiche/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command line pastebin for sharing terminal output";
     longDescription = ''
       Fiche is a command line pastebin server for sharing terminal output.
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
 
     homepage = "https://github.com/solusipse/fiche";
     changelog = "https://github.com/solusipse/fiche/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.pinpox ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pinpox ];
+    platforms = lib.platforms.all;
     mainProgram = "fiche";
   };
 }
diff --git a/pkgs/by-name/fi/fierce/package.nix b/pkgs/by-name/fi/fierce/package.nix
index 684acc2d3f2e..f05642069021 100644
--- a/pkgs/by-name/fi/fierce/package.nix
+++ b/pkgs/by-name/fi/fierce/package.nix
@@ -27,12 +27,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "fierce" ];
 
-  meta = with lib; {
+  meta = {
     description = "DNS reconnaissance tool for locating non-contiguous IP space";
     homepage = "https://github.com/mschwager/fierce";
     changelog = "https://github.com/mschwager/fierce/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ c0bw3b ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ c0bw3b ];
     mainProgram = "fierce";
   };
 }
diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix
index 1c43375c7f37..dd3e2abc9ee6 100644
--- a/pkgs/by-name/fi/fim-rs/package.nix
+++ b/pkgs/by-name/fi/fim-rs/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
   # There is a failure while the binary is checked
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Host-based file integrity monitoring tool";
     longDescription = ''
       FIM is a File Integrity Monitoring tool that tracks any event over your
@@ -56,8 +56,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/Achiefs/fim";
     changelog = "https://github.com/Achiefs/fim/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "fim";
   };
 }
diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 7df036a80722..d7be3bbaa8a9 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
     installManPage findomain.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fastest and cross-platform subdomain enumerator";
     homepage = "https://github.com/Findomain/Findomain";
     changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       figsoda
     ];
diff --git a/pkgs/by-name/fi/fingerprintx/package.nix b/pkgs/by-name/fi/fingerprintx/package.nix
index fac358d9d74d..5c8d147a70e1 100644
--- a/pkgs/by-name/fi/fingerprintx/package.nix
+++ b/pkgs/by-name/fi/fingerprintx/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Standalone utility for service discovery on open ports";
     mainProgram = "fingerprintx";
     homepage = "https://github.com/praetorian-inc/fingerprintx";
     changelog = "https://github.com/praetorian-inc/fingerprintx/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix
index eb2423910fec..2761076b4730 100644
--- a/pkgs/by-name/fi/firecracker/package.nix
+++ b/pkgs/by-name/fi/firecracker/package.nix
@@ -83,14 +83,14 @@ rustPlatform.buildRustPackage rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Secure, fast, minimal micro-container virtualization";
     homepage = "http://firecracker-microvm.io";
     changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
     mainProgram = "firecracker";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       usertam
       thoughtpolice
       qjoly
diff --git a/pkgs/by-name/fl/flare-floss/package.nix b/pkgs/by-name/fl/flare-floss/package.nix
index 8e7936346d76..3477b0506a4c 100644
--- a/pkgs/by-name/fl/flare-floss/package.nix
+++ b/pkgs/by-name/fl/flare-floss/package.nix
@@ -61,12 +61,12 @@ python3.pkgs.buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Automatically extract obfuscated strings from malware";
     homepage = "https://github.com/mandiant/flare-floss";
     changelog = "https://github.com/mandiant/flare-floss/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "floss";
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix
index 2abafb852874..a9c815e19f86 100644
--- a/pkgs/by-name/fl/flavours/package.nix
+++ b/pkgs/by-name/fl/flavours/package.nix
@@ -32,12 +32,12 @@ rustPlatform.buildRustPackage rec {
       --bash <($out/bin/flavours --completions bash)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Easy to use base16 scheme manager/builder that integrates with any workflow";
     homepage = "https://github.com/Misterio77/flavours";
     changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       moni
       misterio77
     ];
diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index adc4dea819d1..3e211e8c6745 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -29,16 +29,16 @@ rustPlatform.buildRustPackage rec {
     "--skip should_verify_memory_layout"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Adds zero-cost stack overflow protection to your embedded programs";
     mainProgram = "flip-link";
     homepage = "https://github.com/knurling-rs/flip-link";
     changelog = "https://github.com/knurling-rs/flip-link/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       FlorianFranzen
       newam
     ];
diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix
index 442521bf21f0..0f08b2b02ada 100644
--- a/pkgs/by-name/fl/flycast/package.nix
+++ b/pkgs/by-name/fl/flycast/package.nix
@@ -53,13 +53,13 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/flycast --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/flyinghead/flycast";
     changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}";
     description = "Multi-platform Sega Dreamcast, Naomi and Atomiswave emulator";
     mainProgram = "flycast";
-    license = licenses.gpl2Only;
-    platforms = platforms.unix;
-    maintainers = [ ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix
index d48cede3b2be..c1d379b0a1c3 100644
--- a/pkgs/by-name/fo/foliate/package.nix
+++ b/pkgs/by-name/fo/foliate/package.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
     webkitgtk_6_0
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple and modern GTK eBook reader";
     homepage = "https://johnfactotum.github.io/foliate";
     changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       onny
       aleksana
     ];
diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix
index 7f7ce4993ff7..87bf5a8b006e 100644
--- a/pkgs/by-name/fo/fortune-kind/package.nix
+++ b/pkgs/by-name/fo/fortune-kind/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
       ln -s fortune-kind $out/bin/fortune
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Kinder, curated fortune, written in rust";
     longDescription = ''
       Historically, contributions to fortune-mod have had a less-than ideal
@@ -70,9 +70,9 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/cafkafk/fortune-kind";
     changelog = "https://github.com/cafkafk/fortune-kind/releases/tag/v${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "fortune-kind";
-    maintainers = with maintainers; [ cafkafk ];
-    platforms = platforms.unix ++ platforms.windows;
+    maintainers = with lib.maintainers; [ cafkafk ];
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 }
diff --git a/pkgs/by-name/fo/four-in-a-row/package.nix b/pkgs/by-name/fo/four-in-a-row/package.nix
index 9b77539522bd..332d3178b182 100644
--- a/pkgs/by-name/fo/four-in-a-row/package.nix
+++ b/pkgs/by-name/fo/four-in-a-row/package.nix
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "four-in-a-row"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/four-in-a-row";
     changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${version}/NEWS?ref_type=tags";
     description = "Make lines of the same color to win";
     mainProgram = "four-in-a-row";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index f2aab7a59bf5..29dd523723e3 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -107,13 +107,13 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Matrix group messaging app";
     homepage = "https://gitlab.gnome.org/GNOME/fractal";
     changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
-    license = licenses.gpl3Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
     mainProgram = "fractal";
   };
 }
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index 4c5870fe2690..c74296f90f6b 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -43,15 +43,15 @@ rustPlatform.buildRustPackage rec {
   # depends on cpu instructions that may not be available on builders
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Small programming language for writing short programs processing textual data";
     mainProgram = "frawk";
     homepage = "https://github.com/ezrosent/frawk";
     changelog = "https://github.com/ezrosent/frawk/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index ddf57d3fd792..a97505486e3e 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-07qKG4ju2UOkTcgWAl2U0uqQZyiosK1UH/M2BvwMAaU=";
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for tracking your most-used directories and files";
     homepage = "https://github.com/camdencheek/fre";
     changelog = "https://github.com/camdencheek/fre/blob/${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ gaykitty ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "fre";
   };
 }
diff --git a/pkgs/by-name/fr/freenukum/package.nix b/pkgs/by-name/fr/freenukum/package.nix
index 92d77091b6b2..f0bd4d96892f 100644
--- a/pkgs/by-name/fr/freenukum/package.nix
+++ b/pkgs/by-name/fr/freenukum/package.nix
@@ -70,12 +70,12 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Clone of the original Duke Nukum 1 Jump'n Run game";
     homepage = "https://salsa.debian.org/silwol/freenukum";
     changelog = "https://salsa.debian.org/silwol/freenukum/-/blob/v${version}/CHANGELOG.md";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix
index 03568ea850f6..a5d5d4d0dab2 100644
--- a/pkgs/by-name/fr/freetds/package.nix
+++ b/pkgs/by-name/fr/freetds/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
     homepage = "https://www.freetds.org";
     changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}";
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl2;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/fr/frotz/package.nix b/pkgs/by-name/fr/frotz/package.nix
index e90f43beca2a..1b30be141957 100644
--- a/pkgs/by-name/fr/frotz/package.nix
+++ b/pkgs/by-name/fr/frotz/package.nix
@@ -48,16 +48,16 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://davidgriffith.gitlab.io/frotz/";
     changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS";
     description = "Z-machine interpreter for Infocom games and other interactive fiction";
     mainProgram = "frotz";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       nicknovitski
       ddelabru
     ];
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix
index 10d89c331ece..a593b4e2f588 100644
--- a/pkgs/by-name/ga/galene/package.nix
+++ b/pkgs/by-name/ga/galene/package.nix
@@ -38,14 +38,14 @@ buildGoModule rec {
     tests.vm = nixosTests.galene.basic;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Videoconferencing server that is easy to deploy, written in Go";
     homepage = "https://github.com/jech/galene";
     changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
     teams = [ lib.teams.ngi ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       rgrunbla
       erdnaxe
     ];
diff --git a/pkgs/by-name/ga/galer/package.nix b/pkgs/by-name/ga/galer/package.nix
index af801aaf3bc1..169379e32177 100644
--- a/pkgs/by-name/ga/galer/package.nix
+++ b/pkgs/by-name/ga/galer/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-BS7ZUq8/swZpTaYGjiF5OuZXQpoosZ3mdF9v1euijxo=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to fetch URLs from HTML attributes";
     homepage = "https://github.com/dwisiswant0/galer";
     changelog = "https://github.com/dwisiswant0/galer/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "galer";
   };
 }
diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix
index ae405bce0130..a729c2e14d37 100644
--- a/pkgs/by-name/ga/gallia/package.nix
+++ b/pkgs/by-name/ga/gallia/package.nix
@@ -46,15 +46,15 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "gallia" ];
 
-  meta = with lib; {
+  meta = {
     description = "Extendable Pentesting Framework for the Automotive Domain";
     homepage = "https://github.com/Fraunhofer-AISEC/gallia";
     changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       fab
       rumpelsepp
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ga/gam/package.nix b/pkgs/by-name/ga/gam/package.nix
index 3e2783dafa9a..9081375e3f3a 100644
--- a/pkgs/by-name/ga/gam/package.nix
+++ b/pkgs/by-name/ga/gam/package.nix
@@ -63,13 +63,13 @@ python3.pkgs.buildPythonApplication rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line management for Google Workspace";
     mainProgram = "gam";
     homepage = "https://github.com/GAM-team/GAM/wiki";
     changelog = "https://github.com/GAM-team/GAM/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ thanegill ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thanegill ];
   };
 
 }
diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix
index 2c22af0be73b..6a54fabeb7bd 100644
--- a/pkgs/by-name/ga/game-rs/package.nix
+++ b/pkgs/by-name/ga/game-rs/package.nix
@@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec {
 
   propagatedBuildInputs = [ steam-run ];
 
-  meta = with lib; {
+  meta = {
     description = "Minimal CLI game launcher for linux";
     homepage = "https://github.com/amanse/game-rs";
     changelog = "https://github.com/Amanse/game-rs/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ amanse ];
-    platforms = platforms.linux;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ amanse ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ga/gato/package.nix b/pkgs/by-name/ga/gato/package.nix
index fb1737ac2306..0aa5231a95fd 100644
--- a/pkgs/by-name/ga/gato/package.nix
+++ b/pkgs/by-name/ga/gato/package.nix
@@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec {
     "gato"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "GitHub Self-Hosted Runner Enumeration and Attack Tool";
     homepage = "https://github.com/praetorian-inc/gato";
     changelog = "https://github.com/praetorian-inc/gato/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gato";
   };
 }
diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index 077afdb30a99..75822b7be633 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [ curl ];
 
-  meta = with lib; {
+  meta = {
     description = "Portable Git(Hub|Lab|ea) CLI tool";
     homepage = "https://herrhotzenplotz.de/gcli/";
     changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/${version}";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     mainProgram = "gcli";
-    maintainers = with maintainers; [ kenran ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ kenran ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gc/gcp-scanner/package.nix b/pkgs/by-name/gc/gcp-scanner/package.nix
index b0d33520cdf0..ef5fbeff3114 100644
--- a/pkgs/by-name/gc/gcp-scanner/package.nix
+++ b/pkgs/by-name/gc/gcp-scanner/package.nix
@@ -46,12 +46,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_acceptance"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Comprehensive scanner for Google Cloud";
     homepage = "https://github.com/google/gcp_scanner";
     changelog = "https://github.com/google/gcp_scanner/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gcp-scanner";
   };
 }
diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 0b858888eee5..d7c918125704 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -44,12 +44,12 @@ buildGoModule rec {
     ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
   '';
 
-  meta = with lib; {
+  meta = {
     description = "User-space file system for interacting with Google Cloud Storage";
     homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
     changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
     # internal/cache/file/downloader/job.go:386:77: undefined: syscall.O_DIRECT
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix
index 1ee4d48bb8d8..9602715f550f 100644
--- a/pkgs/by-name/ge/geary/package.nix
+++ b/pkgs/by-name/ge/geary/package.nix
@@ -151,12 +151,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/geary";
     changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${version}/NEWS?ref_type=tags";
     description = "Mail client for GNOME 3";
-    teams = [ teams.gnome ];
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 00ecfe4e5c55..f08fd9956b34 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -32,12 +32,12 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/genact --print-completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nonsense activity generator";
     homepage = "https://github.com/svenstaro/genact";
     changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "genact";
   };
 }
diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix
index f24956165ee8..9165d79a5033 100644
--- a/pkgs/by-name/ge/gerbera/package.nix
+++ b/pkgs/by-name/ge/gerbera/package.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) mediatomb; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.gerbera.io/";
     changelog = "https://github.com/gerbera/gerbera/releases/tag/v${version}";
     description = "UPnP Media Server for 2024";
@@ -174,9 +174,9 @@ stdenv.mkDerivation rec {
       It allows to stream your digital media through your home network and consume it on all kinds
       of UPnP supporting devices.
     '';
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ardumont ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ardumont ];
+    platforms = lib.platforms.linux;
     mainProgram = "gerbera";
   };
 }
diff --git a/pkgs/by-name/gh/gh-i/package.nix b/pkgs/by-name/gh/gh-i/package.nix
index c4dbf1ba6aef..1e60413c9aef 100644
--- a/pkgs/by-name/gh/gh-i/package.nix
+++ b/pkgs/by-name/gh/gh-i/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   ldflags = [ "-s" ];
 
-  meta = with lib; {
+  meta = {
     description = "Search github issues interactively";
     changelog = "https://github.com/gennaro-tedesco/gh-i/releases/tag/v${version}";
     homepage = "https://github.com/gennaro-tedesco/gh-i";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ phanirithvij ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "gh-i";
   };
 }
diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 92d59c9793f1..6a529469cca2 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -55,12 +55,12 @@ buildGoModule rec {
     package = gh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "GitHub CLI tool";
     homepage = "https://cli.github.com/";
     changelog = "https://github.com/cli/cli/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "gh";
-    maintainers = with maintainers; [ zowoq ];
+    maintainers = with lib.maintainers; [ zowoq ];
   };
 }
diff --git a/pkgs/by-name/gh/ghauri/package.nix b/pkgs/by-name/gh/ghauri/package.nix
index 4fb194efd5fb..e44a0ea0b4a4 100644
--- a/pkgs/by-name/gh/ghauri/package.nix
+++ b/pkgs/by-name/gh/ghauri/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
     "ghauri"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for detecting and exploiting SQL injection security flaws";
     homepage = "https://github.com/r0oth3x49/ghauri";
     changelog = "https://github.com/r0oth3x49/ghauri/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ghauri";
   };
 }
diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix
index 8c80579becf7..98d8a0a2b74e 100644
--- a/pkgs/by-name/gh/ghostie/package.nix
+++ b/pkgs/by-name/gh/ghostie/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Github notifications in your terminal";
     homepage = "https://github.com/attriaayush/ghostie";
     changelog = "https://github.com/attriaayush/ghostie/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthiasbeyer ];
     broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin;
     mainProgram = "ghostie";
   };
diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index 4ad5562b358c..f99f296c8bbc 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
     podman = nixosTests.podman-tls-ghostunnel;
   };
 
-  meta = with lib; {
+  meta = {
     description = "TLS proxy with mutual authentication support for securing non-TLS backend applications";
     homepage = "https://github.com/ghostunnel/ghostunnel#readme";
     changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       roberth
       mjm
     ];
diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix
index 975774ff09fa..0d2eb24d1b92 100644
--- a/pkgs/by-name/gh/ghunt/package.nix
+++ b/pkgs/by-name/gh/ghunt/package.nix
@@ -54,12 +54,12 @@ python3.pkgs.buildPythonApplication rec {
     "ghunt"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Offensive Google framework";
     mainProgram = "ghunt";
     homepage = "https://github.com/mxrch/ghunt";
     changelog = "https://github.com/mxrch/GHunt/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/gi/girsh/package.nix b/pkgs/by-name/gi/girsh/package.nix
index f819fa2ea7fe..4f6c64d0abdb 100644
--- a/pkgs/by-name/gi/girsh/package.nix
+++ b/pkgs/by-name/gi/girsh/package.nix
@@ -26,11 +26,11 @@ buildGoModule rec {
     mv $out/bin/src $out/bin/$pname
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Automatically spawn a reverse shell fully interactive for Linux or Windows victim";
     homepage = "https://github.com/nodauf/Girsh";
     changelog = "https://github.com/nodauf/Girsh/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index b6bcbfacd1bc..971f0b6de6ba 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec {
     installManPage $OUT_DIR/git-cliff.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Highly customizable Changelog Generator that follows Conventional Commit specifications";
     homepage = "https://github.com/orhun/git-cliff";
     changelog = "https://github.com/orhun/git-cliff/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       siraben
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix
index 025572e8e2d6..d7e82c61246f 100644
--- a/pkgs/by-name/gi/git-gr/package.nix
+++ b/pkgs/by-name/gi/git-gr/package.nix
@@ -54,12 +54,12 @@ rustPlatform.buildRustPackage {
       --zsh <(${gitGr} completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/9999years/git-gr";
     changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}";
     description = "Gerrit CLI client";
-    license = [ licenses.mit ];
-    maintainers = [ maintainers._9999years ];
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers._9999years ];
     mainProgram = "git-gr";
   };
 
diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
index 729f87171641..dcca6d51b660 100644
--- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
+++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
@@ -22,12 +22,12 @@ rustPlatform.buildRustPackage rec {
   preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
   postCheck = "unset GIRT_BUILD_GIT_HASH";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";
     description = "Native cross platform full feature terminal based sequence editor for git interactive rebase";
     changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       zowoq
       ma27
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 26cf93af31c2..7706e16ab98b 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -44,11 +44,11 @@ rustPlatform.buildRustPackage {
     LIBGIT2_NO_VENDOR = 1;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Minimalist set of hooks to aid pairing and link commits to issues";
     homepage = "https://github.com/PurpleBooth/git-mit";
     changelog = "https://github.com/PurpleBooth/git-mit/releases/tag/v${version}";
-    license = licenses.cc0;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix
index 296bac2ec541..4f0ec8fdaa0c 100644
--- a/pkgs/by-name/gi/git-nomad/package.nix
+++ b/pkgs/by-name/gi/git-nomad/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [ git ];
 
-  meta = with lib; {
+  meta = {
     description = "Synchronize work-in-progress git branches in a light weight fashion";
     homepage = "https://github.com/rraval/git-nomad";
     changelog = "https://github.com/rraval/git-nomad/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ rraval ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ rraval ];
     mainProgram = "git-nomad";
   };
 }
diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix
index 9d3d9d1d45ce..07e3f33ab573 100644
--- a/pkgs/by-name/gi/git-releaser/package.nix
+++ b/pkgs/by-name/gi/git-releaser/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for creating Git releases based on Semantic Versioning";
     homepage = "https://github.com/git-releaser/git-releaser";
     changelog = "https://github.com/git-releaser/git-releaser/releases/tag/v${version}";
-    maintainers = with maintainers; [ jakuzure ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ jakuzure ];
+    license = lib.licenses.asl20;
     mainProgram = "git-releaser";
   };
 }
diff --git a/pkgs/by-name/gi/git-stack/package.nix b/pkgs/by-name/gi/git-stack/package.nix
index 594b42141002..af3c00c1beb1 100644
--- a/pkgs/by-name/gi/git-stack/package.nix
+++ b/pkgs/by-name/gi/git-stack/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     package = git-stack;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Stacked branch management for Git";
     homepage = "https://github.com/gitext-rs/git-stack";
     changelog = "https://github.com/gitext-rs/git-stack/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ stehessel ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ stehessel ];
     mainProgram = "git-stack";
   };
 }
diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix
index e2a04faa8292..21338cb8113c 100644
--- a/pkgs/by-name/gi/git-together/package.nix
+++ b/pkgs/by-name/gi/git-together/package.nix
@@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM=";
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/kejadlen/git-together/releases/tag/v${version}";
     description = "Better commit attribution while pairing without messing with your git workflow";
     homepage = "https://github.com/kejadlen/git-together";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sentientmonkey ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sentientmonkey ];
     mainProgram = "git-together";
   };
 }
diff --git a/pkgs/by-name/gi/gitcs/package.nix b/pkgs/by-name/gi/gitcs/package.nix
index eec5ebc7203b..16f1fa33a471 100644
--- a/pkgs/by-name/gi/gitcs/package.nix
+++ b/pkgs/by-name/gi/gitcs/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   ldflags = [ "-s" ];
 
-  meta = with lib; {
+  meta = {
     description = "Scan local git repositories and generate a visual contributions graph";
     changelog = "https://github.com/knbr13/gitcs/releases/tag/v${version}";
     homepage = "https://github.com/knbr13/gitcs";
-    license = licenses.mit;
-    maintainers = with maintainers; [ phanirithvij ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "gitcs";
   };
 }
diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix
index d84c0de480b2..6b2300e74186 100644
--- a/pkgs/by-name/gi/gitea-actions-runner/package.nix
+++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix
@@ -31,10 +31,10 @@ buildGo123Module rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     mainProgram = "act_runner";
-    maintainers = with maintainers; [ techknowlogick ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ techknowlogick ];
+    license = lib.licenses.mit;
     changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${version}";
     homepage = "https://gitea.com/gitea/act_runner";
     description = "Runner for Gitea based on act";
diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix
index 7208eaed291c..d641024dcb1b 100644
--- a/pkgs/by-name/gi/gitg/package.nix
+++ b/pkgs/by-name/gi/gitg/package.nix
@@ -89,16 +89,16 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/gitg";
     changelog = "https://gitlab.gnome.org/GNOME/gitg/-/blob/v${version}/NEWS?ref_type=tags";
     description = "GNOME GUI client to view git repositories";
     mainProgram = "gitg";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       domenkozar
       Luflosi
     ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 70513147d8bc..1178318630aa 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -335,12 +335,12 @@ buildDotnetModule (finalAttrs: {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
-    changelog = "https://github.com/actions/runner/releases/tag/v${version}";
+  meta = {
+    changelog = "https://github.com/actions/runner/releases/tag/v${finalAttrs.version}";
     description = "Self-hosted runner for GitHub Actions";
     homepage = "https://github.com/actions/runner";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       veehaitch
       kfollesdal
       aanderse
@@ -352,6 +352,6 @@ buildDotnetModule (finalAttrs: {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 5ddb95744cfc..0ad880d2b1fc 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
   vendorHash = "sha256-BjCwPt1duDINHP7L0qT2KNTjOZ62bWgVij88ztjjyPg=";
   subPackages = [ "." ];
 
-  meta = with lib; {
+  meta = {
     description = "Daemon used to serve static websites for GitLab users";
     mainProgram = "gitlab-pages";
     homepage = "https://gitlab.com/gitlab-org/gitlab-pages";
     changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    teams = [ teams.gitlab ];
+    license = lib.licenses.mit;
+    teams = [ lib.teams.gitlab ];
   };
 }
diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix
index b286dc45285b..a533cecbe514 100644
--- a/pkgs/by-name/gi/gitleaks/package.nix
+++ b/pkgs/by-name/gi/gitleaks/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Scan git repos (or files) for secrets";
     longDescription = ''
       Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
@@ -54,8 +54,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/zricethezav/gitleaks";
     changelog = "https://github.com/zricethezav/gitleaks/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gitleaks";
   };
 }
diff --git a/pkgs/by-name/gi/gitls/package.nix b/pkgs/by-name/gi/gitls/package.nix
index c66244ed4f00..09886223cdb2 100644
--- a/pkgs/by-name/gi/gitls/package.nix
+++ b/pkgs/by-name/gi/gitls/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tools to enumerate git repository URL";
     homepage = "https://github.com/hahwul/gitls";
     changelog = "https://github.com/hahwul/gitls/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gitls";
   };
 }
diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix
index 2b3e8a6d6df6..1287222fb96e 100644
--- a/pkgs/by-name/gi/gittuf/package.nix
+++ b/pkgs/by-name/gi/gittuf/package.nix
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   postInstall = "rm $out/bin/cli"; # remove gendoc cli binary
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/gittuf/gittuf/blob/v${version}/CHANGELOG.md";
     description = "Security layer for Git repositories";
     homepage = "https://gittuf.dev";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "gittuf";
-    maintainers = with maintainers; [ flandweber ];
+    maintainers = with lib.maintainers; [ flandweber ];
   };
 }
diff --git a/pkgs/by-name/gi/gitversion/package.nix b/pkgs/by-name/gi/gitversion/package.nix
index c3bb70497f5e..943aa50eaa2c 100644
--- a/pkgs/by-name/gi/gitversion/package.nix
+++ b/pkgs/by-name/gi/gitversion/package.nix
@@ -10,13 +10,13 @@ buildDotnetGlobalTool rec {
 
   nugetHash = "sha256-gtkD+egl9zAfJ4ZsOwb7u82IhBabjBFxU+nv9yQ1HHQ=";
 
-  meta = with lib; {
+  meta = {
     description = "From git log to SemVer in no time";
     homepage = "https://gitversion.net/";
     changelog = "https://github.com/GitTools/GitVersion/releases/tag/${version}";
     downloadPage = "https://github.com/GitTools/GitVersion";
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.windows ++ platforms.darwin;
-    maintainers = with maintainers; [ acesyde ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ acesyde ];
   };
 }
diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix
index 82d84da2b35e..215314695487 100644
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@@ -77,12 +77,12 @@ buildGo123Module rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "The missing Package Manager for Kubernetes featuring a GUI and a CLI";
     homepage = "https://github.com/glasskube/glasskube";
     changelog = "https://github.com/glasskube/glasskube/releases/tag/v${version}";
-    maintainers = with maintainers; [ jakuzure ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ jakuzure ];
+    license = lib.licenses.asl20;
     mainProgram = "glasskube";
   };
 }
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index c7f5633a021b..29e0f75ca8b2 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
     "runs_correctly"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Git wrapper that allows you to compress multiple commands into one";
     homepage = "https://github.com/milo123459/glitter";
     changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "glitter";
   };
 }
diff --git a/pkgs/by-name/gl/glow/package.nix b/pkgs/by-name/gl/glow/package.nix
index efde1323898c..32a6467d33cb 100644
--- a/pkgs/by-name/gl/glow/package.nix
+++ b/pkgs/by-name/gl/glow/package.nix
@@ -36,12 +36,12 @@ buildGoModule rec {
       --zsh <($out/bin/glow completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Render markdown on the CLI, with pizzazz!";
     homepage = "https://github.com/charmbracelet/glow";
     changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       penguwin
     ];
diff --git a/pkgs/by-name/go/go-bindata/package.nix b/pkgs/by-name/go/go-bindata/package.nix
index 49aee51386ae..2d2a89572d0b 100644
--- a/pkgs/by-name/go/go-bindata/package.nix
+++ b/pkgs/by-name/go/go-bindata/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kevinburke/go-bindata";
     changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md";
     description = "Small utility which generates Go code from any file, useful for embedding binary data in a Go program";
     mainProgram = "go-bindata";
-    maintainers = [ ];
-    license = licenses.cc0;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.cc0;
   };
 }
diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index 542ac4689de1..e32a442178df 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -43,12 +43,12 @@ buildGo124Module rec {
     rm pkg/camo/proxy_{,filter_}test.go
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Camo server is a special type of image proxy that proxies non-secure images over SSL/TLS";
     homepage = "https://github.com/cactus/go-camo";
     changelog = "https://github.com/cactus/go-camo/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "go-camo";
-    maintainers = with maintainers; [ viraptor ];
+    maintainers = with lib.maintainers; [ viraptor ];
   };
 }
diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix
index a39abcfd17cb..483c8a7414e7 100644
--- a/pkgs/by-name/go/go-cve-search/package.nix
+++ b/pkgs/by-name/go/go-cve-search/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   # Tests requires network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight CVE search tool";
     mainProgram = "go-cve-search";
     longDescription = ''
@@ -29,7 +29,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/s-index/go-cve-search";
     changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/go/go-dork/package.nix b/pkgs/by-name/go/go-dork/package.nix
index 88c68b8bff3a..fab1792841f2 100644
--- a/pkgs/by-name/go/go-dork/package.nix
+++ b/pkgs/by-name/go/go-dork/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-6V58RRRPamBMDAf0gg4sQMQkoD5dWauCFtPrwf5EasI=";
 
-  meta = with lib; {
+  meta = {
     description = "Dork scanner";
     homepage = "https://github.com/dwisiswant0/go-dork";
     changelog = "https://github.com/dwisiswant0/go-dork/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "go-dork";
   };
 }
diff --git a/pkgs/by-name/go/go-exploitdb/package.nix b/pkgs/by-name/go/go-exploitdb/package.nix
index 5478e49bb8c7..755df12c593e 100644
--- a/pkgs/by-name/go/go-exploitdb/package.nix
+++ b/pkgs/by-name/go/go-exploitdb/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X=github.com/vulsio/go-exploitdb/config.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for searching Exploits from Exploit Databases, etc";
     mainProgram = "go-exploitdb";
     homepage = "https://github.com/vulsio/go-exploitdb";
     changelog = "https://github.com/vulsio/go-exploitdb/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix
index c4c506e0621c..2115c76f3a8a 100644
--- a/pkgs/by-name/go/go-licenses/package.nix
+++ b/pkgs/by-name/go/go-licenses/package.nix
@@ -51,12 +51,12 @@ buildGoModule rec {
   # Tests require internet connection
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/google/go-licenses/releases/tag/v${version}";
     description = "Reports on the licenses used by a Go package and its dependencies";
     mainProgram = "go-licenses";
     homepage = "https://github.com/google/go-licenses";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ Luflosi ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
 }
diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix
index e469550907b2..9ed58c7babbc 100644
--- a/pkgs/by-name/go/go-secdump/package.nix
+++ b/pkgs/by-name/go/go-secdump/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to remotely dump secrets from the Windows registry";
     homepage = "https://github.com/jfjallid/go-secdump";
     changelog = "https://github.com/jfjallid/go-secdump/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "go-secdump";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix
index 80d7aaf63cd2..66ec2adea344 100644
--- a/pkgs/by-name/go/go-swagger/package.nix
+++ b/pkgs/by-name/go/go-swagger/package.nix
@@ -28,12 +28,12 @@ buildGoModule rec {
     "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Golang implementation of Swagger 2.0, representation of your RESTful API";
     homepage = "https://github.com/go-swagger/go-swagger";
     changelog = "https://github.com/go-swagger/go-swagger/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kalbasit ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kalbasit ];
     mainProgram = "swagger";
   };
 }
diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix
index 451d1698abdf..a19fe12fd187 100644
--- a/pkgs/by-name/go/go2rtc/package.nix
+++ b/pkgs/by-name/go/go2rtc/package.nix
@@ -26,12 +26,12 @@ buildGoModule rec {
 
   doCheck = false; # tests fail
 
-  meta = with lib; {
+  meta = {
     description = "Ultimate camera streaming application with support RTSP, RTMP, HTTP-FLV, WebRTC, MSE, HLS, MJPEG, HomeKit, FFmpeg, etc";
     homepage = "https://github.com/AlexxIT/go2rtc";
     changelog = "https://github.com/AlexxIT/go2rtc/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "go2rtc";
   };
 }
diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix
index f7ded32020b6..140791789301 100644
--- a/pkgs/by-name/go/go2tv/package.nix
+++ b/pkgs/by-name/go/go2tv/package.nix
@@ -45,12 +45,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cast media files to UPnP/DLNA Media Renderers and Smart TVs";
     homepage = "https://github.com/alexballas/go2tv";
     changelog = "https://github.com/alexballas/go2tv/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gdamjan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gdamjan ];
     mainProgram = pname;
   };
 }
diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix
index fe041e6edf22..66cd80a2463a 100644
--- a/pkgs/by-name/go/go365/package.nix
+++ b/pkgs/by-name/go/go365/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     mv $out/bin/Go365 $out/bin/$pname
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Office 365 enumeration tool";
     homepage = "https://github.com/optiv/Go365";
     changelog = "https://github.com/optiv/Go365/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "Go365";
   };
 }
diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix
index c017143fb1aa..c3a8865f9b92 100644
--- a/pkgs/by-name/go/goaccess/package.nix
+++ b/pkgs/by-name/go/goaccess/package.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  meta = with lib; {
+  meta = {
     description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
     homepage = "https://goaccess.io";
     changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ederoyd46 ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ederoyd46 ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "goaccess";
   };
 }
diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix
index b4142da76fd4..e2c3b6640aa1 100644
--- a/pkgs/by-name/go/gobgpd/package.nix
+++ b/pkgs/by-name/go/gobgpd/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
 
   passthru.tests = { inherit (nixosTests) gobgpd; };
 
-  meta = with lib; {
+  meta = {
     description = "BGP implemented in Go";
     mainProgram = "gobgpd";
     homepage = "https://osrg.github.io/gobgp/";
     changelog = "https://github.com/osrg/gobgp/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ higebu ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ higebu ];
   };
 }
diff --git a/pkgs/by-name/go/goblob/package.nix b/pkgs/by-name/go/goblob/package.nix
index 311f40e4b21c..0b3bd8eb34af 100644
--- a/pkgs/by-name/go/goblob/package.nix
+++ b/pkgs/by-name/go/goblob/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Enumeration tool for publicly exposed Azure Storage blobs";
     mainProgram = "goblob";
     homepage = "https://github.com/Macmod/goblob";
     changelog = "https://github.com/Macmod/goblob/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/go/gobuster/package.nix b/pkgs/by-name/go/gobuster/package.nix
index 58cd4d20c09c..3dc22d2d4bb6 100644
--- a/pkgs/by-name/go/gobuster/package.nix
+++ b/pkgs/by-name/go/gobuster/package.nix
@@ -22,13 +22,13 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
     mainProgram = "gobuster";
     homepage = "https://github.com/OJ/gobuster";
     changelog = "https://github.com/OJ/gobuster/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       fab
       pamplemousse
     ];
diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix
index 2be81152c9a5..b05e9da48fd9 100644
--- a/pkgs/by-name/go/godns/package.nix
+++ b/pkgs/by-name/go/godns/package.nix
@@ -54,12 +54,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic DNS client tool supports AliDNS, Cloudflare, Google Domains, DNSPod, HE.net & DuckDNS & DreamHost, etc";
     homepage = "https://github.com/TimothyYe/godns";
     changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ yinfeng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ yinfeng ];
     mainProgram = "godns";
   };
 }
diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix
index 397792c0b2c1..f07e8209dcd7 100644
--- a/pkgs/by-name/go/godspeed/package.nix
+++ b/pkgs/by-name/go/godspeed/package.nix
@@ -25,13 +25,13 @@ buildGoModule rec {
     mv $out/bin/GodSpeed $out/bin/${pname}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Manager for reverse shells";
     homepage = "https://github.com/redcode-labs/GodSpeed";
     changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    teams = [ teams.redcodelabs ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    teams = [ lib.teams.redcodelabs ];
     mainProgram = "godspeed";
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index 6df11f8aedb5..b9bf7fc535c6 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
     "-X github.com/slurdge/goeland/version.GitCommit=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Alternative to rss2email written in golang with many filters";
     mainProgram = "goeland";
     longDescription = ''
@@ -34,7 +34,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/slurdge/goeland";
     changelog = "https://github.com/slurdge/goeland/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = [ maintainers.sweenu ];
+    license = with lib.licenses; [ mit ];
+    maintainers = [ lib.maintainers.sweenu ];
   };
 }
diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index 6d2d7d63e9c6..8eb9ea131201 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X github.com/nao1215/gup/internal/cmdinfo.Version=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Update binaries installed by 'go install' with goroutines";
     changelog = "https://github.com/nao1215/gup/blob/v${version}/CHANGELOG.md";
     homepage = "https://github.com/nao1215/gup";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ phanirithvij ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "gup";
   };
 }
diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 627ba5afccd8..19522d6d5b0a 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -36,13 +36,13 @@ buildGo124Module rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast linters Runner for Go";
     homepage = "https://golangci-lint.run/";
     changelog = "https://github.com/golangci/golangci-lint/blob/v${version}/CHANGELOG.md";
     mainProgram = "golangci-lint";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       mic92
     ];
diff --git a/pkgs/by-name/go/gomtree/package.nix b/pkgs/by-name/go/gomtree/package.nix
index 3e06b58fad51..44b0e48e4d8f 100644
--- a/pkgs/by-name/go/gomtree/package.nix
+++ b/pkgs/by-name/go/gomtree/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-X main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File systems verification utility and library, in likeness of mtree(8)";
     changelog = "https://github.com/vbatts/go-mtree/releases/tag/v${version}";
     homepage = "https://github.com/vbatts/go-mtree";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ phanirithvij ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "gomtree";
   };
 }
diff --git a/pkgs/by-name/go/google-guest-agent/package.nix b/pkgs/by-name/go/google-guest-agent/package.nix
index 9f1ae222b1d3..9c2f5877df70 100644
--- a/pkgs/by-name/go/google-guest-agent/package.nix
+++ b/pkgs/by-name/go/google-guest-agent/package.nix
@@ -56,12 +56,12 @@ buildGoModule rec {
       --prefix PATH ":" "$binPath"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Guest Agent for Google Compute Engine";
     homepage = "https://github.com/GoogleCloudPlatform/guest-agent";
     changelog = "https://github.com/GoogleCloudPlatform/guest-agent/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ abbradar ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix
index e498701b9707..ef6767ca1c65 100644
--- a/pkgs/by-name/go/goresym/package.nix
+++ b/pkgs/by-name/go/goresym/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Go symbol recovery tool";
     mainProgram = "GoReSym";
     homepage = "https://github.com/mandiant/GoReSym";
     changelog = "https://github.com/mandiant/GoReSym/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pyrox0 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
   };
 }
diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix
index 58d362fe9351..6081e3c16023 100644
--- a/pkgs/by-name/go/gorilla-cli/package.nix
+++ b/pkgs/by-name/go/gorilla-cli/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
   # no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "LLMs for your CLI";
     homepage = "https://github.com/gorilla-llm/gorilla-cli";
     changelog = "https://github.com/gorilla-llm/gorilla-cli/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ happysalada ];
     mainProgram = "gorilla";
   };
 }
diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix
index d488354e526e..f081c5ab3801 100644
--- a/pkgs/by-name/go/goss/package.nix
+++ b/pkgs/by-name/go/goss/package.nix
@@ -60,7 +60,7 @@ buildGoModule rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/goss-org/goss/";
     changelog = "https://github.com/goss-org/goss/releases/tag/v${version}";
     description = "Quick and easy server validation";
@@ -69,13 +69,13 @@ buildGoModule rec {
       It eases the process of writing tests by allowing the user to generate tests from the current system state.
       Once the test suite is written they can be executed, waited-on, or served as a health endpoint.
     '';
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "goss";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       hyzual
       jk
       anthonyroussel
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/go/gotestfmt/package.nix b/pkgs/by-name/go/gotestfmt/package.nix
index 8c4cdb33c2ec..11e83c3e8747 100644
--- a/pkgs/by-name/go/gotestfmt/package.nix
+++ b/pkgs/by-name/go/gotestfmt/package.nix
@@ -17,11 +17,11 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "Go test output for humans";
     homepage = "https://github.com/gotesttools/gotestfmt";
     changelog = "https://github.com/GoTestTools/gotestfmt/releases/tag/v${version}";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/go/gotestwaf/package.nix b/pkgs/by-name/go/gotestwaf/package.nix
index 31fe0ced6279..32aa1f97acb1 100644
--- a/pkgs/by-name/go/gotestwaf/package.nix
+++ b/pkgs/by-name/go/gotestwaf/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for API and OWASP attack simulation";
     homepage = "https://github.com/wallarm/gotestwaf";
     changelog = "https://github.com/wallarm/gotestwaf/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gotestwaf";
   };
 }
diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 5a4af08568e0..d7821d720792 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -62,7 +62,7 @@ buildGoModule rec {
 
   passthru.tests.gotosocial = nixosTests.gotosocial;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gotosocial.org";
     changelog = "https://codeberg.org/superseriousbusiness/gotosocial/releases/tag/v${version}";
     description = "Fast, fun, ActivityPub server, powered by Go";
@@ -73,7 +73,7 @@ buildGoModule rec {
       advertised to! A light-weight alternative to Mastodon
       and Pleroma, with support for clients!
     '';
-    maintainers = with maintainers; [ blakesmith ];
-    license = licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ blakesmith ];
+    license = lib.licenses.agpl3Only;
   };
 }
diff --git a/pkgs/by-name/go/goverview/package.nix b/pkgs/by-name/go/goverview/package.nix
index 01d008a2c09d..a7571f4680c1 100644
--- a/pkgs/by-name/go/goverview/package.nix
+++ b/pkgs/by-name/go/goverview/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to get an overview of the list of URLs";
     mainProgram = "goverview";
     homepage = "https://github.com/j3ssie/goverview";
     changelog = "https://github.com/j3ssie/goverview/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/go/govulncheck/package.nix b/pkgs/by-name/go/govulncheck/package.nix
index 1b252daa3f31..61e8f0a3ddf2 100644
--- a/pkgs/by-name/go/govulncheck/package.nix
+++ b/pkgs/by-name/go/govulncheck/package.nix
@@ -37,7 +37,7 @@ buildGo124Module rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck";
     downloadPage = "https://github.com/golang/vuln";
     changelog = "https://github.com/golang/vuln/releases/tag/v${version}";
@@ -64,8 +64,8 @@ buildGo124Module rec {
       example, a dependency with a Windows-specific vulnerability will not be
       reported for a Linux build.
     '';
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [
       jk
       SuperSandro2000
     ];
diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
index da38fab5e604..5ba8447d0892 100644
--- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
+++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
@@ -28,11 +28,11 @@ buildGoModule rec {
   # you don't have grafana running.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     homepage = "https://github.com/esnet/gdg";
-    teams = [ teams.bitnomial ];
+    teams = [ lib.teams.bitnomial ];
     mainProgram = "gdg";
     changelog = "https://github.com/esnet/gdg/releases/tag/v${version}";
   };
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 69f76cdf2946..2e854d8e18b2 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -69,16 +69,16 @@ buildGoModule rec {
       "-X ${t}.Revision=unknown"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Like Prometheus, but for logs";
     mainProgram = "promtail";
-    license = with licenses; [
+    license = with lib.licenses; [
       agpl3Only
       asl20
     ];
     homepage = "https://grafana.com/oss/loki/";
     changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       willibutz
       globin
       mmahut
diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 011b085eae94..f9eaa9665285 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -85,12 +85,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Easiest way to access your cloud";
     homepage = "https://github.com/common-fate/granted";
     changelog = "https://github.com/common-fate/granted/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       jlbribeiro
     ];
   };
diff --git a/pkgs/by-name/gr/graphinder/package.nix b/pkgs/by-name/gr/graphinder/package.nix
index d982f1a1f65a..04a7dbe29dff 100644
--- a/pkgs/by-name/gr/graphinder/package.nix
+++ b/pkgs/by-name/gr/graphinder/package.nix
@@ -47,12 +47,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_is_gql_endpoint"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to find GraphQL endpoints using subdomain enumeration";
     mainProgram = "graphinder";
     homepage = "https://github.com/Escape-Technologies/graphinder";
     changelog = "https://github.com/Escape-Technologies/graphinder/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index 177d4fecddd3..48daf3df6d10 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
       --replace-fail "TestS3Storage" "SkipTestS3Storage"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL database anonymization tool";
     homepage = "https://github.com/GreenmaskIO/greenmask";
     changelog = "https://github.com/GreenmaskIO/greenmask/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "greenmask";
   };
 }
diff --git a/pkgs/by-name/gr/grex/package.nix b/pkgs/by-name/gr/grex/package.nix
index 9cc22a265e50..f2da1206551e 100644
--- a/pkgs/by-name/gr/grex/package.nix
+++ b/pkgs/by-name/gr/grex/package.nix
@@ -23,13 +23,13 @@ rustPlatform.buildRustPackage rec {
     $out/bin/grex --help > /dev/null
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for generating regular expressions from user-provided test cases";
     homepage = "https://github.com/pemistahl/grex";
     changelog = "https://github.com/pemistahl/grex/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "grex";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       mfrw
     ];
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 55f55853d9c4..9dd9fcbd8829 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -129,12 +129,12 @@ stdenv.mkDerivation rec {
     inherit arrow-cpp;
   };
 
-  meta = with lib; {
+  meta = {
     description = "C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lnl7 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lnl7 ];
     homepage = "https://grpc.io/";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     changelog = "https://github.com/grpc/grpc/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 82a824e4e2d0..e72bc7ef46cf 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
     inherit (nixosTests) guix;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Functional package manager with a Scheme interface";
     longDescription = ''
       GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof.
@@ -176,13 +176,13 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.gnu.org/software/guix";
     changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "guix";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cafkafk
       foo-dogsquared
       hpfr
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index 65cb469ecc50..934638da0d6e 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -44,12 +44,12 @@ buildGoModule rec {
       --zsh <($out/bin/gum completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tasty Bubble Gum for your shell";
     homepage = "https://github.com/charmbracelet/gum";
     changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maaslalani ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ maaslalani ];
     mainProgram = "gum";
   };
 }
diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
index c727bcde08c9..031005fc54c3 100644
--- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "ha_mqtt_discoverable_cli" ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI for creating Home Assistant compatible MQTT entities that will be automatically discovered";
     homepage = "https://github.com/unixorn/ha-mqtt-discoverable-cli";
     changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "hmd";
   };
 }
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index ebab765aeb55..4c9f4dc3986a 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -109,12 +109,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "IRC application";
     homepage = "https://github.com/squidowl/halloy";
     changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       fab
       iivusly
       ivyfanchiang
diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix
index 266c31d2fe4f..9a79a483b442 100644
--- a/pkgs/by-name/ha/haveged/package.nix
+++ b/pkgs/by-name/ha/haveged/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Simple entropy daemon";
     mainProgram = "haveged";
     longDescription = ''
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/jirka-h/haveged";
     changelog = "https://raw.githubusercontent.com/jirka-h/haveged/v${version}/ChangeLog";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ domenkozar ];
-    platforms = platforms.unix;
-    badPlatforms = platforms.darwin; # fails to build since v1.9.15
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ domenkozar ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.darwin; # fails to build since v1.9.15
   };
 }
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 5ecfdfa22a9c..1372250ab462 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -27,15 +27,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=csl::tests::test_csl"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Work with references: Literature database management, storage, and citation formatting";
     homepage = "https://github.com/typst/hayagriva";
     changelog = "https://github.com/typst/hayagriva/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "hayagriva";
   };
 }
diff --git a/pkgs/by-name/he/hednsextractor/package.nix b/pkgs/by-name/he/hednsextractor/package.nix
index 8fbefeaa9ccf..6f6911783089 100644
--- a/pkgs/by-name/he/hednsextractor/package.nix
+++ b/pkgs/by-name/he/hednsextractor/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool suite for hunting suspicious targets, expose domains and phishing discovery";
     homepage = "https://github.com/HuntDownProject/HEDnsExtractor";
     changelog = "https://github.com/HuntDownProject/HEDnsExtractor/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "hednsextractor";
   };
 }
diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix
index 9664e81c5c44..57e1c6582ef9 100644
--- a/pkgs/by-name/he/helm-ls/package.nix
+++ b/pkgs/by-name/he/helm-ls/package.nix
@@ -41,12 +41,12 @@ buildGoModule rec {
     command = "helm_ls version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Language server for Helm";
     changelog = "https://github.com/mrjosh/helm-ls/releases/tag/v${version}";
     homepage = "https://github.com/mrjosh/helm-ls";
-    license = licenses.mit;
-    maintainers = with maintainers; [ stehessel ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ stehessel ];
     mainProgram = "helm_ls";
   };
 }
diff --git a/pkgs/by-name/he/hevea/package.nix b/pkgs/by-name/he/hevea/package.nix
index eb01837e6803..0fb630a81fa6 100644
--- a/pkgs/by-name/he/hevea/package.nix
+++ b/pkgs/by-name/he/hevea/package.nix
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Quite complete and fast LATEX to HTML translator";
     homepage = "https://hevea.inria.fr/";
     changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES";
-    license = licenses.qpl;
-    maintainers = with maintainers; [ pSub ];
-    platforms = with platforms; unix;
+    license = lib.licenses.qpl;
+    maintainers = with lib.maintainers; [ pSub ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix
index b85d1d3836e8..69df5f8eedc9 100644
--- a/pkgs/by-name/he/hex/package.nix
+++ b/pkgs/by-name/he/hex/package.nix
@@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec {
     version = "hx ${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Futuristic take on hexdump, made in Rust";
     homepage = "https://github.com/sitkevij/hex";
     changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}";
     mainProgram = "hx";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix
index fce8cc8469f4..cfb7c5d1eab1 100644
--- a/pkgs/by-name/he/heygpt/package.nix
+++ b/pkgs/by-name/he/heygpt/package.nix
@@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec {
   OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
   OPENSSL_DIR = "${lib.getDev openssl}";
 
-  meta = with lib; {
+  meta = {
     description = "Simple command-line interface for ChatGPT API";
     homepage = "https://github.com/fuyufjh/heygpt";
     changelog = "https://github.com/fuyufjh/heygpt/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "heygpt";
-    maintainers = with maintainers; [ aldoborrero ];
+    maintainers = with lib.maintainers; [ aldoborrero ];
   };
 }
diff --git a/pkgs/by-name/hi/hilbish/package.nix b/pkgs/by-name/hi/hilbish/package.nix
index 39a0dadb9d1a..f9bbbeabe87a 100644
--- a/pkgs/by-name/hi/hilbish/package.nix
+++ b/pkgs/by-name/hi/hilbish/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
     cp -r nature $out/share/hilbish/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactive Unix-like shell written in Go";
     mainProgram = "hilbish";
     changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}";
     homepage = "https://github.com/Rosettea/Hilbish";
-    maintainers = with maintainers; [ moni ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ moni ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 404813aa2de7..c1be11d43712 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -84,13 +84,13 @@ rustPlatform.buildRustPackage {
       installShellCompletion "$out"/share/completions/himalaya.{bash,fish,zsh}
     '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI to manage emails";
     mainProgram = "himalaya";
     homepage = "https://github.com/pimalaya/himalaya";
     changelog = "https://github.com/pimalaya/himalaya/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       soywod
       yanganto
     ];
diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix
index c1ed13853000..6ac204ff49dc 100644
--- a/pkgs/by-name/ho/hors/package.nix
+++ b/pkgs/by-name/ho/hors/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
   # requires network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Instant coding answers via the command line";
     mainProgram = "hors";
     homepage = "https://github.com/windsoilder/hors";
     changelog = "https://github.com/WindSoilder/hors/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index 6b2f2b68e900..81f0caa749b5 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -29,15 +29,15 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/build/hyperfine-*/out/_hyperfine
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line benchmarking tool";
     homepage = "https://github.com/sharkdp/hyperfine";
     changelog = "https://github.com/sharkdp/hyperfine/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       thoughtpolice
     ];
diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix
index 8565bff672fd..0c671cd7658c 100644
--- a/pkgs/by-name/ic/icoextract/package.nix
+++ b/pkgs/by-name/ic/icoextract/package.nix
@@ -35,12 +35,12 @@ python3Packages.buildPythonApplication rec {
     install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extract icons from Windows PE files";
     homepage = "https://github.com/jlu5/icoextract";
     changelog = "https://github.com/jlu5/icoextract/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       bryanasdev000
       donovanglover
     ];
diff --git a/pkgs/by-name/im/imaginary/package.nix b/pkgs/by-name/im/imaginary/package.nix
index 0ca8eb5448c2..222899c264d1 100644
--- a/pkgs/by-name/im/imaginary/package.nix
+++ b/pkgs/by-name/im/imaginary/package.nix
@@ -42,12 +42,12 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://fly.io/docs/app-guides/run-a-global-image-service";
     changelog = "https://github.com/h2non/imaginary/releases/tag/v${version}";
     description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       dotlambda
       urandom
     ];
diff --git a/pkgs/by-name/im/imdshift/package.nix b/pkgs/by-name/im/imdshift/package.nix
index d195f281f2f5..457e6294f3ef 100644
--- a/pkgs/by-name/im/imdshift/package.nix
+++ b/pkgs/by-name/im/imdshift/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     "IMDShift"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to migrate workloads to IMDSv2";
     mainProgram = "imdshift";
     homepage = "https://github.com/ayushpriya10/IMDShift";
     changelog = "https://github.com/ayushpriya10/IMDShift/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/im/immer/package.nix b/pkgs/by-name/im/immer/package.nix
index 53c3ce4cba1c..d2b5caf584ea 100644
--- a/pkgs/by-name/im/immer/package.nix
+++ b/pkgs/by-name/im/immer/package.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Postmodern immutable and persistent data structures for C++ — value semantics at scale";
     homepage = "https://sinusoid.es/immer";
     changelog = "https://github.com/arximboldi/immer/releases/tag/v${version}";
-    license = licenses.boost;
-    maintainers = with maintainers; [ sifmelcara ];
-    platforms = platforms.all;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ sifmelcara ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 27bc9f6a4419..4e7455c55b7a 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -29,11 +29,11 @@ rustPlatform.buildRustPackage rec {
     "--skip=flamegraph_multiple_base_symbol"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Port of parts of the flamegraph toolkit to Rust";
     homepage = "https://github.com/jonhoo/inferno";
     changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md";
-    license = licenses.cddl;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.cddl;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/in/inform6/package.nix b/pkgs/by-name/in/inform6/package.nix
index 24e69caa231f..9336a8f20f33 100644
--- a/pkgs/by-name/in/inform6/package.nix
+++ b/pkgs/by-name/in/inform6/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "PREFIX=${placeholder "out"}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Interactive fiction compiler and libraries";
     longDescription = ''
       Inform 6 is a C-like programming language for writing interactive fiction
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gitlab.com/DavidGriffith/inform6unix";
     changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS";
-    license = licenses.artistic2;
+    license = lib.licenses.artistic2;
     maintainers = with lib.maintainers; [ ddelabru ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/in/infra/package.nix b/pkgs/by-name/in/infra/package.nix
index e63a583ac38d..3920a0bb2a9e 100644
--- a/pkgs/by-name/in/infra/package.nix
+++ b/pkgs/by-name/in/infra/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Infra manages access to infrastructure such as Kubernetes";
     homepage = "https://github.com/infrahq/infra";
     changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md";
-    license = licenses.elastic20;
-    maintainers = with maintainers; [ peterromfeldhk ];
+    license = lib.licenses.elastic20;
+    maintainers = with lib.maintainers; [ peterromfeldhk ];
     mainProgram = "infra";
   };
 }
diff --git a/pkgs/by-name/in/infracost/package.nix b/pkgs/by-name/in/infracost/package.nix
index ab848711f600..c318fbf8dae0 100644
--- a/pkgs/by-name/in/infracost/package.nix
+++ b/pkgs/by-name/in/infracost/package.nix
@@ -61,7 +61,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://infracost.io";
     changelog = "https://github.com/infracost/infracost/releases/tag/v${version}";
     description = "Cloud cost estimates for Terraform in your CLI and pull requests";
@@ -70,8 +70,8 @@ buildGoModule rec {
       This helps developers, DevOps et al. quickly see the cost breakdown and
       compare different deployment options upfront.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       davegallant
       jk
       kashw2
diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix
index 955216bdbe0d..bdc673ccbef1 100644
--- a/pkgs/by-name/in/inih/package.nix
+++ b/pkgs/by-name/in/inih/package.nix
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple .INI file parser in C, good for embedded systems";
     homepage = "https://github.com/benhoyt/inih";
     changelog = "https://github.com/benhoyt/inih/releases/tag/r${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ TredwellGit ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ TredwellGit ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/in/initool/package.nix b/pkgs/by-name/in/initool/package.nix
index 12c7a2409453..a0c882074f98 100644
--- a/pkgs/by-name/in/initool/package.nix
+++ b/pkgs/by-name/in/initool/package.nix
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     inherit (mlton.meta) platforms;
 
     description = "Manipulate INI files from the command line";
     mainProgram = "initool";
     homepage = "https://github.com/dbohdan/initool";
-    license = licenses.mit;
-    maintainers = with maintainers; [ e1mo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ e1mo ];
     changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix
index 52108501c237..0dbc42711705 100644
--- a/pkgs/by-name/in/innernet/package.nix
+++ b/pkgs/by-name/in/innernet/package.nix
@@ -60,12 +60,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Private network system that uses WireGuard under the hood";
     homepage = "https://github.com/tonarino/innernet";
     changelog = "https://github.com/tonarino/innernet/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       tomberek
       _0x4A6F
     ];
diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix
index 29f3968f216d..3da2eb9991b0 100644
--- a/pkgs/by-name/in/inql/package.nix
+++ b/pkgs/by-name/in/inql/package.nix
@@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec {
     "inql"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Security testing tool for GraphQL";
     mainProgram = "inql";
     homepage = "https://github.com/doyensec/inql";
     changelog = "https://github.com/doyensec/inql/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix
index f7c7ecf4537e..163779868119 100644
--- a/pkgs/by-name/in/insomnia/package.nix
+++ b/pkgs/by-name/in/insomnia/package.nix
@@ -27,18 +27,18 @@ let
       }
       .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
-  meta = with lib; {
+  meta = {
     homepage = "https://insomnia.rest";
     description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage.";
     mainProgram = "insomnia";
     changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = [
       "aarch64-darwin"
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       markus1189
       kashw2
       DataHearth
diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
index a4640733e400..0b9069dd744e 100644
--- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
     rev-prefix = "24.35.30872.";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL with support for Gen8, Gen9 and Gen11 GPUs";
     mainProgram = "ocloc";
     homepage = "https://github.com/intel/compute-runtime";
     changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ fleaz ];
+    maintainers = with lib.maintainers; [ fleaz ];
   };
 }
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 071715a4b08f..6bc5b5ef524c 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -69,16 +69,16 @@ stdenv.mkDerivation rec {
       $out/lib/intel-opencl/libigdrcl.so
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer";
     mainProgram = "ocloc";
     homepage = "https://github.com/intel/compute-runtime";
     changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 73e521dcfeba..8f65c53c9254 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -98,15 +98,15 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "bindnow" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${version}/NEWS";
     homepage = "https://drm.pages.freedesktop.org/igt-gpu-tools/";
     description = "Tools for development and testing of the Intel DRM driver";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index dea1d295f683..95cde6fcc531 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     inherit (pkgsi686Linux) intel-media-driver;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
     longDescription = ''
       The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API)
@@ -81,11 +81,11 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/intel/media-driver";
     changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       bsd3
       mit
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/pkgs/by-name/in/interactsh/package.nix b/pkgs/by-name/in/interactsh/package.nix
index 55dbde69955c..101e2ddf9398 100644
--- a/pkgs/by-name/in/interactsh/package.nix
+++ b/pkgs/by-name/in/interactsh/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   # Test files are not part of the release tarball
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Out of bounds interaction gathering server and client library";
     longDescription = ''
       Interactsh is an Open-Source Solution for Out of band Data Extraction,
@@ -35,7 +35,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/interactsh";
     changelog = "https://github.com/projectdiscovery/interactsh/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hanemile ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hanemile ];
   };
 }
diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix
index 6bea24f23585..d7b8c7aa04a4 100644
--- a/pkgs/by-name/in/intermodal/package.nix
+++ b/pkgs/by-name/in/intermodal/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
       --zsh  <($out/bin/imdl completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "User-friendly and featureful command-line BitTorrent metainfo utility";
     homepage = "https://github.com/casey/intermodal";
     changelog = "https://github.com/casey/intermodal/releases/tag/v${version}";
-    license = licenses.cc0;
-    maintainers = with maintainers; [
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       xrelkd
     ];
diff --git a/pkgs/by-name/ir/ircdog/package.nix b/pkgs/by-name/ir/ircdog/package.nix
index e3ef62028fb7..7321f637e9bd 100644
--- a/pkgs/by-name/ir/ircdog/package.nix
+++ b/pkgs/by-name/ir/ircdog/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes";
     mainProgram = "ircdog";
     homepage = "https://github.com/ergochat/ircdog";
     changelog = "https://github.com/ergochat/ircdog/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/by-name/ir/irqbalance/package.nix b/pkgs/by-name/ir/irqbalance/package.nix
index 3b62b7f45950..c1837d0e7e96 100644
--- a/pkgs/by-name/ir/irqbalance/package.nix
+++ b/pkgs/by-name/ir/irqbalance/package.nix
@@ -49,12 +49,12 @@ stdenv.mkDerivation rec {
       --replace-fail ' $IRQBALANCE_ARGS' ""
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Irqbalance/irqbalance";
     changelog = "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}";
     description = "Daemon to help balance the cpu load generated by interrupts across all of a systems cpus";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ moni ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ moni ];
   };
 }
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index 0c17dffbcffa..4db3072fd18e 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -174,11 +174,11 @@ py.pkgs.buildPythonPackage rec {
     "test_050_non_json_response"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://irrd.readthedocs.io/en/v${version}/releases/";
     description = "Internet Routing Registry database server, processing IRR objects in the RPSL format";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/irrdnet/irrd";
-    teams = [ teams.wdz ];
+    teams = [ lib.teams.wdz ];
   };
 }
diff --git a/pkgs/by-name/ja/jaeles/package.nix b/pkgs/by-name/ja/jaeles/package.nix
index 24fe58d2a16e..83e27cba2d2e 100644
--- a/pkgs/by-name/ja/jaeles/package.nix
+++ b/pkgs/by-name/ja/jaeles/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
   # Tests want to download signatures
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for automated Web application testing";
     mainProgram = "jaeles";
     homepage = "https://github.com/jaeles-project/jaeles";
     changelog = "https://github.com/jaeles-project/jaeles/releases/tag/beta-v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index fe9f92b04d68..5d9190b8a95b 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -98,12 +98,12 @@ stdenv.mkDerivation rec {
     moveToOutput etc "$doc"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "General purpose WebRTC server";
     homepage = "https://janus.conf.meetecho.com/";
     changelog = "https://github.com/meetecho/janus-gateway/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/by-name/ji/jigdo/package.nix b/pkgs/by-name/ji/jigdo/package.nix
index aa0db0209160..5d73d8c58f61 100644
--- a/pkgs/by-name/ji/jigdo/package.nix
+++ b/pkgs/by-name/ji/jigdo/package.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Download utility that can fetch files from several sources simultaneously";
     homepage = "https://www.einval.com/~steve/software/jigdo/";
     changelog = "https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=blob;f=changelog;hb=refs/tags/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ wegank ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ wegank ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ji/jira-cli-go/package.nix b/pkgs/by-name/ji/jira-cli-go/package.nix
index bf9d519ef8b9..a5cc5c1e27a1 100644
--- a/pkgs/by-name/ji/jira-cli-go/package.nix
+++ b/pkgs/by-name/ji/jira-cli-go/package.nix
@@ -60,12 +60,12 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Feature-rich interactive Jira command line";
     homepage = "https://github.com/ankitpokhrel/jira-cli";
     changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       bryanasdev000
       anthonyroussel
     ];
diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
index 184688d8972d..909783746da2 100644
--- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix
+++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix
@@ -26,16 +26,16 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = ''A random number generator, which injects entropy to the kernel'';
     homepage = "https://github.com/smuellerDD/jitterentropy-rngd";
     changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}";
     license = [
-      licenses.gpl2Only
-      licenses.bsd3
+      lib.licenses.gpl2Only
+      lib.licenses.bsd3
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ thillux ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ thillux ];
     mainProgram = "jitterentropy-rngd";
   };
 }
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index 5c2ac20a8e82..ebca0dc9095c 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -74,15 +74,15 @@ rustPlatform.buildRustPackage rec {
       --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tactical 2D shooter played by up to 4 players online or on a shared screen";
     mainProgram = "jumpy";
     homepage = "https://fishfight.org/";
     changelog = "https://github.com/fishfolk/jumpy/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index a75945415d7a..29d2b6246674 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -108,12 +108,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/casey/just";
     changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md";
     description = "Handy way to save and run project-specific commands";
-    license = licenses.cc0;
-    maintainers = with maintainers; [
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [
       xrelkd
       jk
     ];
diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 1f44ad1d3794..e69f2e5f04ef 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/deviceinsight/kafkactl";
     changelog = "https://github.com/deviceinsight/kafkactl/blob/v${version}/CHANGELOG.md";
     description = "Command Line Tool for managing Apache Kafka";
@@ -32,7 +32,7 @@ buildGoModule rec {
       - Configuration of different contexts
       - directly access kafka clusters inside your kubernetes cluster
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ grburst ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ grburst ];
   };
 }
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index be92531e950c..6850f7e00632 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
 
   env.CARGO_FEATURE_USE_SYSTEM_LIBS = "1";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kalker.strct.net";
     changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}";
     description = "Command line calculator";
@@ -57,8 +57,8 @@ rustPlatform.buildRustPackage rec {
       A command line calculator that supports math-like syntax with user-defined
       variables, functions, derivation, integration, and complex numbers
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       lovesegfault
     ];
diff --git a/pkgs/by-name/ka/karate/package.nix b/pkgs/by-name/ka/karate/package.nix
index 571fc2aa47ea..782ef91e23cf 100644
--- a/pkgs/by-name/ka/karate/package.nix
+++ b/pkgs/by-name/ka/karate/package.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "API Test Automation Made Simple";
     mainProgram = "karate";
     longDescription = ''
@@ -37,8 +37,8 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://github.com/karatelabs/karate";
     changelog = "https://github.com/karatelabs/karate/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.kephasp ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.kephasp ];
     platforms = jre.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix
index 972884bf1bac..351e8acdb350 100644
--- a/pkgs/by-name/ka/karmor/package.nix
+++ b/pkgs/by-name/ka/karmor/package.nix
@@ -47,13 +47,13 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Client tool to help manage KubeArmor";
     mainProgram = "karmor";
     homepage = "https://kubearmor.io";
     changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       urandom
       kashw2
     ];
diff --git a/pkgs/by-name/ka/katana/package.nix b/pkgs/by-name/ka/katana/package.nix
index a48cc34f4365..0b2dd9112339 100644
--- a/pkgs/by-name/ka/katana/package.nix
+++ b/pkgs/by-name/ka/katana/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Next-generation crawling and spidering framework";
     homepage = "https://github.com/projectdiscovery/katana";
     changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "katana";
   };
 }
diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix
index 62c5b159052e..11e01070670f 100644
--- a/pkgs/by-name/kd/kdigger/package.nix
+++ b/pkgs/by-name/kd/kdigger/package.nix
@@ -58,7 +58,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/quarkslab/kdigger";
     changelog = "https://github.com/quarkslab/kdigger/releases/tag/v${version}";
     description = "In-pod context discovery tool for Kubernetes penetration testing";
@@ -69,8 +69,8 @@ buildGoModule rec {
       plugins called buckets to facilitate pentesting Kubernetes from inside a
       pod.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix
index cbf7906a0d0f..41eb66cbe351 100644
--- a/pkgs/by-name/kd/kdsingleapplication/package.nix
+++ b/pkgs/by-name/kd/kdsingleapplication/package.nix
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DKDSingleApplication_QT6=true" ];
   dontWrapQtApps = true;
 
-  meta = with lib; {
+  meta = {
     description = "KDAB's helper class for single-instance policy applications";
     homepage = "https://www.kdab.com/";
-    maintainers = with maintainers; [ hellwolf ];
-    platforms = platforms.unix;
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ hellwolf ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
     changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 842543c95206..b16752118d77 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     # error: implicit instantiation of undefined template 'std::char_traits<unsigned char>'
     broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://downloads.isc.org/isc/kea/${version}/Kea-${version}-ReleaseNotes.txt";
@@ -112,9 +112,9 @@ stdenv.mkDerivation rec {
       use by enterprises and service providers, either as is or with
       extensions and modifications.
     '';
-    license = licenses.mpl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       fpletz
       hexa
     ];
diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix
index f8820753b397..5032db796eb9 100644
--- a/pkgs/by-name/ke/keedump/package.nix
+++ b/pkgs/by-name/ke/keedump/package.nix
@@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ogfLMkTzGwYADDfn05IOXiOSJzk5iN2GJ6kaT9L9sqM=";
 
-  meta = with lib; {
+  meta = {
     description = "PoC KeePass master password dumper";
     homepage = "https://github.com/ynuwenhof/keedump";
     changelog = "https://github.com/ynuwenhof/keedump/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "keedump";
   };
 }
diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix
index fac1d231a96e..1dd136b4b0c6 100644
--- a/pkgs/by-name/ke/keepassxc-go/package.nix
+++ b/pkgs/by-name/ke/keepassxc-go/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
       --zsh <($out/bin/keepassxc-go completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Library and basic CLI tool to interact with KeepassXC via unix socket";
     homepage = "https://github.com/MarkusFreitag/keepassxc-go";
     changelog = "https://github.com/MarkusFreitag/keepassxc-go/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ xgwq ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xgwq ];
     mainProgram = "keepassxc-go";
   };
 }
diff --git a/pkgs/by-name/ke/keepwn/package.nix b/pkgs/by-name/ke/keepwn/package.nix
index dfa1d681b243..f3a55b50c1be 100644
--- a/pkgs/by-name/ke/keepwn/package.nix
+++ b/pkgs/by-name/ke/keepwn/package.nix
@@ -38,12 +38,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "keepwn" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to automate KeePass discovery and secret extraction";
     homepage = "https://github.com/Orange-Cyberdefense/KeePwn";
     changelog = "https://github.com/Orange-Cyberdefense/KeePwn/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "keepwn";
   };
 }
diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix
index f343084bdc56..c716287b77e4 100644
--- a/pkgs/by-name/ke/kent/package.nix
+++ b/pkgs/by-name/ke/kent/package.nix
@@ -85,12 +85,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities";
     homepage = "http://genome.ucsc.edu";
     changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ scalavision ];
-    platforms = platforms.linux;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ scalavision ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index 464de7d1ec80..c78f19d0139e 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Scaffolding tool to get new projects up and running quickly";
     homepage = "https://github.com/Keats/kickstart";
     changelog = "https://github.com/Keats/kickstart/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gaelreyrol ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gaelreyrol ];
     mainProgram = "kickstart";
   };
 }
diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix
index 5755e2574946..89faa04c7072 100644
--- a/pkgs/by-name/ki/kics/package.nix
+++ b/pkgs/by-name/ki/kics/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
     command = "kics version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to check for vulnerabilities and other issues";
     longDescription = ''
       Find security vulnerabilities, compliance issues, and
@@ -46,8 +46,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/Checkmarx/kics";
     changelog = "https://github.com/Checkmarx/kics/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ patryk4815 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ patryk4815 ];
     mainProgram = "kics";
   };
 }
diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix
index 26ebeebb3e03..e7b183d86f8f 100644
--- a/pkgs/by-name/ki/kikit/solidpython/default.nix
+++ b/pkgs/by-name/ki/kikit/solidpython/default.nix
@@ -51,11 +51,11 @@ buildPythonPackage rec {
     "solid"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python interface to the OpenSCAD declarative geometry language";
     homepage = "https://github.com/SolidCode/SolidPython";
     changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}";
-    maintainers = with maintainers; [ jfly ];
-    license = licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ jfly ];
+    license = lib.licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix
index e4bdd7549eb3..bc31236a27c6 100644
--- a/pkgs/by-name/ki/kitty-img/package.nix
+++ b/pkgs/by-name/ki/kitty-img/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-KSNl/SpqcgMaKbkBfNtR7M8+B1clPauYi7NlP+f5Pd0=";
 
-  meta = with lib; {
+  meta = {
     description = "Print images inline in kitty";
     homepage = "https://git.sr.ht/~zethra/kitty-img";
     changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ gaykitty ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "kitty-img";
   };
 }
diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 6222a438ad23..06a7bba72e7a 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -30,13 +30,13 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/../completions/_kmon
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linux Kernel Manager and Activity Monitor";
     homepage = "https://github.com/orhun/kmon";
     changelog = "https://github.com/orhun/kmon/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix
index 16a4fbda5483..10a03be43251 100644
--- a/pkgs/by-name/ko/ko/package.nix
+++ b/pkgs/by-name/ko/ko/package.nix
@@ -62,7 +62,7 @@ buildGoModule rec {
       --zsh <($out/bin/ko completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ko-build/ko";
     changelog = "https://github.com/ko-build/ko/releases/tag/v${version}";
     description = "Build and deploy Go applications";
@@ -73,8 +73,8 @@ buildGoModule rec {
       ko builds images by effectively executing go build on your local machine, and as such doesn't require docker to be installed. This can make it a good fit for lightweight CI/CD use cases.
       ko makes multi-platform builds easy, produces SBOMs by default, and includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       nickcao
       jk
       vdemeester
diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix
index 22897ace00d0..eaa0899ff2bf 100644
--- a/pkgs/by-name/ko/konstraint/package.nix
+++ b/pkgs/by-name/ko/konstraint/package.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/plexsystems/konstraint";
     changelog = "https://github.com/plexsystems/konstraint/releases/tag/v${version}";
     description = "Policy management tool for interacting with Gatekeeper";
@@ -53,7 +53,7 @@ buildGoModule rec {
       Gatekeeper. Automatically copy Rego to the ConstraintTemplate. Automatically update all ConstraintTemplates with
       library changes. Enable writing the same policies for Conftest and Gatekeeper.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index a449704d27ca..3007eb00f265 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Golang Tool to discover unused Kubernetes Resources";
     homepage = "https://github.com/yonahd/kor";
     changelog = "https://github.com/yonahd/kor/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
     mainProgram = "kor";
   };
 }
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index 993331c2784c..d8fee487a22a 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -98,19 +98,19 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/koreader/koreader";
     changelog = "https://github.com/koreader/koreader/releases/tag/v${version}";
     description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
     mainProgram = "koreader";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
       "aarch64-linux"
       "armv7l-linux"
       "x86_64-linux"
     ];
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       contrun
       neonfuz
       liberodark
diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index a721d942b887..331295e9d383 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -44,12 +44,12 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/aquasecurity/kube-bench";
     changelog = "https://github.com/aquasecurity/kube-bench/releases/tag/v${version}";
     description = "Checks whether Kubernetes is deployed according to security best practices as defined in the CIS Kubernetes Benchmark";
     mainProgram = "kube-bench";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/ku/kube-capacity/package.nix b/pkgs/by-name/ku/kube-capacity/package.nix
index 3c4124ab17e0..b5f969cb7929 100644
--- a/pkgs/by-name/ku/kube-capacity/package.nix
+++ b/pkgs/by-name/ku/kube-capacity/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A=";
 
-  meta = with lib; {
+  meta = {
     description = "A simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster";
     mainProgram = "kube-capacity";
     homepage = "https://github.com/robscott/kube-capacity";
     changelog = "https://github.com/robscott/kube-capacity/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
   };
 }
diff --git a/pkgs/by-name/ku/kube-linter/package.nix b/pkgs/by-name/ku/kube-linter/package.nix
index 7ea0b65a581f..ceff52574dc9 100644
--- a/pkgs/by-name/ku/kube-linter/package.nix
+++ b/pkgs/by-name/ku/kube-linter/package.nix
@@ -42,16 +42,16 @@ buildGoModule rec {
     command = "kube-linter version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Static analysis tool that checks Kubernetes YAML files and Helm charts";
     homepage = "https://kubelinter.io";
     changelog = "https://github.com/stackrox/kube-linter/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       mtesseract
       stehessel
       Intuinewin
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ku/kube-score/package.nix b/pkgs/by-name/ku/kube-score/package.nix
index 121aab8da2b8..bf7da4c54f97 100644
--- a/pkgs/by-name/ku/kube-score/package.nix
+++ b/pkgs/by-name/ku/kube-score/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes object analysis with recommendations for improved reliability and security";
     mainProgram = "kube-score";
     homepage = "https://github.com/zegl/kube-score";
     changelog = "https://github.com/zegl/kube-score/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ j4m3s ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ j4m3s ];
   };
 }
diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix
index 57564d5ecd5a..af518877178c 100644
--- a/pkgs/by-name/ku/kubeaudit/package.nix
+++ b/pkgs/by-name/ku/kubeaudit/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
   # Tests require a running Kubernetes instance
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Audit tool for Kubernetes";
     homepage = "https://github.com/Shopify/kubeaudit";
     changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "kubeaudit";
   };
 }
diff --git a/pkgs/by-name/ku/kubecfg/package.nix b/pkgs/by-name/ku/kubecfg/package.nix
index 721f31daac8f..1eb5cac7ac93 100644
--- a/pkgs/by-name/ku/kubecfg/package.nix
+++ b/pkgs/by-name/ku/kubecfg/package.nix
@@ -32,13 +32,13 @@ buildGoModule rec {
       --zsh  <($out/bin/kubecfg completion --shell=zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for managing Kubernetes resources as code";
     mainProgram = "kubecfg";
     homepage = "https://github.com/kubecfg/kubecfg";
     changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       benley
       qjoly
     ];
diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix
index 6decbb4f611e..09f87bec89c3 100644
--- a/pkgs/by-name/ku/kubeclarity/package.nix
+++ b/pkgs/by-name/ku/kubeclarity/package.nix
@@ -45,7 +45,7 @@ buildGoModule rec {
     mv $out/bin/cli $out/bin/kubeclarity
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes runtime scanner";
     mainProgram = "kubeclarity";
     longDescription = ''
@@ -56,7 +56,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/openclarity/kubeclarity";
     changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix
index a27ee83fb0aa..15aa4a760d6f 100644
--- a/pkgs/by-name/ku/kubecolor/package.nix
+++ b/pkgs/by-name/ku/kubecolor/package.nix
@@ -50,13 +50,13 @@ buildGoModule rec {
     echo 'compdef kubecolor=kubectl' >> $out/share/zsh/site-functions/_kubecolor
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Colorizes kubectl output";
     mainProgram = "kubecolor";
     homepage = "https://github.com/kubecolor/kubecolor";
     changelog = "https://github.com/kubecolor/kubecolor/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       ivankovnatsky
       SuperSandro2000
       applejag
diff --git a/pkgs/by-name/ku/kubectl-doctor/package.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix
index 039a55757193..6ed00a2babff 100644
--- a/pkgs/by-name/ku/kubectl-doctor/package.nix
+++ b/pkgs/by-name/ku/kubectl-doctor/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
     mv $out/bin/{cmd,kubectl-doctor}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "kubectl cluster triage plugin for k8s";
     mainProgram = "kubectl-doctor";
     homepage = "https://github.com/emirozer/kubectl-doctor";
     changelog = "https://github.com/emirozer/kubectl-doctor/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.zimbatm ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.zimbatm ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-example/package.nix b/pkgs/by-name/ku/kubectl-example/package.nix
index 9cbc1e666820..4eda8e132611 100644
--- a/pkgs/by-name/ku/kubectl-example/package.nix
+++ b/pkgs/by-name/ku/kubectl-example/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "kubectl plugin for retrieving resource example YAMLs";
     mainProgram = "kubectl-example";
     homepage = "https://github.com/seredot/kubectl-example";
     changelog = "https://github.com/seredot/kubectl-example/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix
index 3607a5c4dd32..0b1b70886dc1 100644
--- a/pkgs/by-name/ku/kubectl-explore/package.nix
+++ b/pkgs/by-name/ku/kubectl-explore/package.nix
@@ -18,12 +18,12 @@ buildGoModule rec {
   vendorHash = "sha256-vCL+gVf0BCqsdRU2xk1Xs3FYcKYB1z2wLpZ3TvYmJdc=";
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Better kubectl explain with the fuzzy finder";
     mainProgram = "kubectl-explore";
     homepage = "https://github.com/keisku/kubectl-explore";
     changelog = "https://github.com/keisku/kubectl-explore/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.koralowiec ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.koralowiec ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-images/package.nix b/pkgs/by-name/ku/kubectl-images/package.nix
index 55d0f7e01a3e..b3741f73144d 100644
--- a/pkgs/by-name/ku/kubectl-images/package.nix
+++ b/pkgs/by-name/ku/kubectl-images/package.nix
@@ -21,12 +21,12 @@ buildGoModule rec {
     mv $out/bin/cmd $out/bin/kubectl-images
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Show container images used in the cluster";
     mainProgram = "kubectl-images";
     homepage = "https://github.com/chenjiandongx/kubectl-images";
     changelog = "https://github.com/chenjiandongx/kubectl-images/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-ktop/package.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix
index bfcedb7a34e6..1cb63d82254b 100644
--- a/pkgs/by-name/ku/kubectl-ktop/package.nix
+++ b/pkgs/by-name/ku/kubectl-ktop/package.nix
@@ -30,11 +30,11 @@ buildGoModule rec {
     ln -s $out/bin/ktop $out/bin/kubectl-ktop
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Top-like tool for your Kubernetes clusters";
     homepage = "https://github.com/vladimirvivien/ktop";
     changelog = "https://github.com/vladimirvivien/ktop/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-neat/package.nix b/pkgs/by-name/ku/kubectl-neat/package.nix
index 0514ef5c6df5..6143adaa92cf 100644
--- a/pkgs/by-name/ku/kubectl-neat/package.nix
+++ b/pkgs/by-name/ku/kubectl-neat/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     sed 's,#!/bin/bash,#!${bash}/bin/bash,' -i test/kubectl-stub
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Clean up Kubernetes yaml and json output to make it readable";
     mainProgram = "kubectl-neat";
     homepage = "https://github.com/itaysk/kubectl-neat";
     changelog = "https://github.com/itaysk/kubectl-neat/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.koralowiec ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.koralowiec ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-tree/package.nix b/pkgs/by-name/ku/kubectl-tree/package.nix
index 206c72dad906..cec2001c70ee 100644
--- a/pkgs/by-name/ku/kubectl-tree/package.nix
+++ b/pkgs/by-name/ku/kubectl-tree/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA=";
 
-  meta = with lib; {
+  meta = {
     description = "kubectl plugin to browse Kubernetes object hierarchies as a tree";
     mainProgram = "kubectl-tree";
     homepage = "https://github.com/ahmetb/kubectl-tree";
     changelog = "https://github.com/ahmetb/kubectl-tree/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/ku/kubectl-view-secret/package.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
index 678adba5d354..5711591b3862 100644
--- a/pkgs/by-name/ku/kubectl-view-secret/package.nix
+++ b/pkgs/by-name/ku/kubectl-view-secret/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     mv $out/bin/cmd $out/bin/kubectl-view-secret
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes CLI plugin to decode Kubernetes secrets";
     mainProgram = "kubectl-view-secret";
     homepage = "https://github.com/elsesiy/kubectl-view-secret";
     changelog = "https://github.com/elsesiy/kubectl-view-secret/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.sagikazarmark ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.sagikazarmark ];
   };
 }
diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index 2d087078cb90..35d0ab6c2c07 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch";
     mainProgram = "kubefirst";
     homepage = "https://github.com/konstructio/kubefirst/";
     changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ qjoly ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ qjoly ];
   };
 }
diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index 82c9d1841aed..ab7832161756 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -42,11 +42,11 @@ buildGoModule rec {
     command = "kubeone version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments";
     homepage = "https://kubeone.io/";
     changelog = "https://github.com/kubermatic/kubeone/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lblasc ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lblasc ];
   };
 }
diff --git a/pkgs/by-name/ku/kubernetes-code-generator/package.nix b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
index aa21573cc988..57eba675f606 100644
--- a/pkgs/by-name/ku/kubernetes-code-generator/package.nix
+++ b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
@@ -22,11 +22,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kubernetes/code-generator";
     changelog = "https://github.com/kubernetes/code-generator/releases/tag/v${version}";
     description = "Kubernetes code generation";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
index ab7595d98ece..31322c65353b 100644
--- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
+++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
@@ -31,11 +31,11 @@ buildGoModule rec {
     "cmd/helpgen"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools to use with the Kubernetes controller-runtime libraries";
     homepage = "https://github.com/kubernetes-sigs/controller-tools";
     changelog = "https://github.com/kubernetes-sigs/controller-tools/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ michojel ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ michojel ];
   };
 }
diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index 175f4a157e44..691a34aa4e8c 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -68,7 +68,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for testing if Kubernetes is deployed securely";
     homepage = "https://github.com/kubescape/kubescape";
     changelog = "https://github.com/kubescape/kubescape/releases/tag/v${version}";
@@ -83,8 +83,8 @@ buildGoModule rec {
       time. Kubescape integrates natively with other DevOps tools, including
       Jenkins, CircleCI and Github workflows.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       fab
       jk
     ];
diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix
index 8855283133c2..8e35335b8ea2 100644
--- a/pkgs/by-name/ku/kubeseal/package.nix
+++ b/pkgs/by-name/ku/kubeseal/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     "-X main.VERSION=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes controller and tool for one-way encrypted Secrets";
     mainProgram = "kubeseal";
     homepage = "https://github.com/bitnami-labs/sealed-secrets";
     changelog = "https://github.com/bitnami-labs/sealed-secrets/blob/v${version}/RELEASE-NOTES.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ groodt ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ groodt ];
   };
 }
diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix
index e134d1472fa1..05add02663f5 100644
--- a/pkgs/by-name/ku/kubesec/package.nix
+++ b/pkgs/by-name/ku/kubesec/package.nix
@@ -46,13 +46,13 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Security risk analysis tool for Kubernetes resources";
     mainProgram = "kubesec";
     homepage = "https://github.com/controlplaneio/kubesec";
     changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       fab
       jk
     ];
diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index d0b56e31724e..cdc603164520 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -59,18 +59,18 @@ buildGoModule rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/kubeshark/kubeshark/releases/tag/v${version}";
     description = "API Traffic Viewer for Kubernetes";
     mainProgram = "kubeshark";
     homepage = "https://kubeshark.co/";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     longDescription = ''
       The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network,
       Think TCPDump and Wireshark re-invented for Kubernetes
       capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters.
     '';
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bryanasdev000
       qjoly
     ];
diff --git a/pkgs/by-name/ku/kubestroyer/package.nix b/pkgs/by-name/ku/kubestroyer/package.nix
index b952d3ba3b28..15e34ba82b7a 100644
--- a/pkgs/by-name/ku/kubestroyer/package.nix
+++ b/pkgs/by-name/ku/kubestroyer/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes exploitation tool";
     homepage = "https://github.com/Rolix44/Kubestroyer";
     changelog = "https://github.com/Rolix44/Kubestroyer/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "kubestroyer";
   };
 }
diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix
index ed189a4a0142..cc2c3d60723d 100644
--- a/pkgs/by-name/la/lapce/package.nix
+++ b/pkgs/by-name/la/lapce/package.nix
@@ -99,12 +99,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Lightning-fast and Powerful Code Editor written in Rust";
     homepage = "https://github.com/lapce/lapce";
     changelog = "https://github.com/lapce/lapce/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ elliot ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ elliot ];
     mainProgram = "lapce";
   };
 }
diff --git a/pkgs/by-name/la/lasso/package.nix b/pkgs/by-name/la/lasso/package.nix
index a7a7afa7fa8e..d50f4bcf2f27 100644
--- a/pkgs/by-name/la/lasso/package.nix
+++ b/pkgs/by-name/la/lasso/package.nix
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
                 --prefix=$out
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://lasso.entrouvert.org/";
     description = "Liberty Alliance Single Sign-On library";
     changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ womfoo ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ womfoo ];
   };
 }
diff --git a/pkgs/by-name/le/lean/package.nix b/pkgs/by-name/le/lean/package.nix
index 3fea79131f4f..a7b856e2da8f 100644
--- a/pkgs/by-name/le/lean/package.nix
+++ b/pkgs/by-name/le/lean/package.nix
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
       --replace "greadlink" "${coreutils}/bin/readlink"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Automatic and interactive theorem prover";
     homepage = "https://leanprover.github.io/";
     changelog = "https://github.com/leanprover-community/lean/blob/v${version}/doc/changes.md";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       thoughtpolice
     ];
   };
diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix
index 5863c004a677..eec01ffeaa81 100644
--- a/pkgs/by-name/le/ledfx/package.nix
+++ b/pkgs/by-name/le/ledfx/package.nix
@@ -64,12 +64,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Network based LED effect controller with support for advanced real-time audio effects";
     homepage = "https://github.com/LedFx/LedFx";
     changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
-    license = licenses.gpl3Only;
-    teams = [ teams.c3d2 ];
+    license = lib.licenses.gpl3Only;
+    teams = [ lib.teams.c3d2 ];
     mainProgram = "ledfx";
   };
 }
diff --git a/pkgs/by-name/le/ledger-autosync/package.nix b/pkgs/by-name/le/ledger-autosync/package.nix
index 16c273f75a78..4083a7cd6b46 100644
--- a/pkgs/by-name/le/ledger-autosync/package.nix
+++ b/pkgs/by-name/le/ledger-autosync/package.nix
@@ -33,11 +33,11 @@ python3Packages.buildPythonApplication rec {
     python3Packages.pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/egh/ledger-autosync";
     changelog = "https://github.com/egh/ledger-autosync/releases/tag/v${version}";
     description = "OFX/CSV autosync for ledger and hledger";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ eamsden ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ eamsden ];
   };
 }
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index ab0bac61435d..219de9e88678 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -108,19 +108,19 @@ stdenv.mkDerivation rec {
     installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Double-entry accounting system with a command-line reporting interface";
     mainProgram = "ledger";
     homepage = "https://www.ledger-cli.org/";
     changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     longDescription = ''
       Ledger is a powerful, double-entry accounting system that is accessed
       from the UNIX command-line. This may put off some users, as there is
       no flashy UI, but for those who want unparalleled reporting access to
       their data, there really is no alternative.
     '';
-    platforms = platforms.all;
-    maintainers = with maintainers; [ jwiegley ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ jwiegley ];
   };
 }
diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix
index 8293ff5bd89a..ebd872598035 100644
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
       --zsh <($out/bin/leetgo completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "A command-line tool for LeetCode";
     homepage = "https://github.com/j178/leetgo";
     changelog = "https://github.com/j178/leetgo/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Ligthiago ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Ligthiago ];
     mainProgram = "leetgo";
   };
 }
diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix
index f6802c334951..16403691e1aa 100644
--- a/pkgs/by-name/le/legba/package.nix
+++ b/pkgs/by-name/le/legba/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
   # Paho C test fails due to permission issue
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Multiprotocol credentials bruteforcer / password sprayer and enumerator";
     homepage = "https://github.com/evilsocket/legba";
     changelog = "https://github.com/evilsocket/legba/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ mikaelfangel ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ mikaelfangel ];
     mainProgram = "legba";
   };
 }
diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix
index 7e081b441238..64008abcbef7 100644
--- a/pkgs/by-name/le/legitify/package.nix
+++ b/pkgs/by-name/le/legitify/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     rm e2e/e2e_test.go # tests requires network
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
     homepage = "https://github.com/Legit-Labs/legitify";
     changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "legitify";
   };
 }
diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix
index 516f15f75143..82fb18915b8f 100644
--- a/pkgs/by-name/le/lemmeknow/package.nix
+++ b/pkgs/by-name/le/lemmeknow/package.nix
@@ -16,12 +16,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-65PPIYfwVO8O4K8yr499vRQScpAREiBZ8O0rrDMCXB8=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to identify anything";
     homepage = "https://github.com/swanandx/lemmeknow";
     changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       Br1ght0ne
     ];
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 5e4d0d09e11e..dabb5f487b08 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZuLbdsZadEkY5M4LoHBn6gnKYklVbXpRa60EocYUH+A=";
 
-  meta = with lib; {
+  meta = {
     description = "CLI for generating vim help docs from emmylua comments";
     longDescription = ''
       `lemmy-help` is an emmylua parser as well as a CLI which takes that parsed tree and converts it into vim help docs.
     '';
     homepage = "https://github.com/numToStr/lemmy-help";
     changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ figsoda ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "lemmy-help";
   };
 }
diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 533c63879f9c..214052fae46f 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
     inherit intel-compute-runtime openvino;
   };
 
-  meta = with lib; {
+  meta = {
     description = "oneAPI Level Zero Specification Headers and Loader";
     homepage = "https://github.com/oneapi-src/level-zero";
     changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ziguana ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.ziguana ];
   };
 }
diff --git a/pkgs/by-name/li/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix
index 8e6b7d0fe83c..5d22aa36fbe2 100644
--- a/pkgs/by-name/li/libaom/package.nix
+++ b/pkgs/by-name/li/libaom/package.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Alliance for Open Media AV1 codec library";
     longDescription = ''
       Libaom is the reference implementation of the AV1 codec from the Alliance
@@ -127,13 +127,13 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://aomedia.org/av1-features/get-started/";
     changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       primeos
       kiloreux
       dandellion
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     outputsToInstall = [ "bin" ];
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix
index b6855d280c1d..79640fb74d30 100644
--- a/pkgs/by-name/li/libavif/package.nix
+++ b/pkgs/by-name/li/libavif/package.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
         --set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile}
     '';
 
-  meta = with lib; {
+  meta = {
     description = "C implementation of the AV1 Image File Format";
     longDescription = ''
       Libavif aims to be a friendly, portable C implementation of the
@@ -128,8 +128,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/AOMediaCodec/libavif";
     changelog = "https://github.com/AOMediaCodec/libavif/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ mkg20001 ];
-    platforms = platforms.all;
-    license = licenses.bsd2;
+    maintainers = with lib.maintainers; [ mkg20001 ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/by-name/li/libayatana-appindicator/package.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix
index 86eb9214c197..7814147dd3b2 100644
--- a/pkgs/by-name/li/libayatana-appindicator/package.nix
+++ b/pkgs/by-name/li/libayatana-appindicator/package.nix
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
     "-DENABLE_BINDINGS_MONO=False"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Ayatana Application Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog";
     license = [
-      licenses.lgpl3Plus
-      licenses.lgpl21Plus
+      lib.licenses.lgpl3Plus
+      lib.licenses.lgpl21Plus
     ];
-    maintainers = [ maintainers.nickhu ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.nickhu ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix
index 852c61d3ea13..4314031deed8 100644
--- a/pkgs/by-name/li/libayatana-indicator/package.nix
+++ b/pkgs/by-name/li/libayatana-indicator/package.nix
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ayatana Indicators Shared Library";
     homepage = "https://github.com/AyatanaIndicators/libayatana-indicator";
     changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.nickhu ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.nickhu ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libcyaml/package.nix b/pkgs/by-name/li/libcyaml/package.nix
index beb458f400fc..89f0525be200 100644
--- a/pkgs/by-name/li/libcyaml/package.nix
+++ b/pkgs/by-name/li/libcyaml/package.nix
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/tlsa/libcyaml";
     description = "C library for reading and writing YAML";
     changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md";
-    license = licenses.isc;
-    platforms = platforms.unix;
+    license = lib.licenses.isc;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix
index a511858b0a5b..e38f20f5f825 100644
--- a/pkgs/by-name/li/libeduvpn-common/package.nix
+++ b/pkgs/by-name/li/libeduvpn-common/package.nix
@@ -27,15 +27,15 @@ buildGoModule rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://raw.githubusercontent.com/eduvpn/eduvpn-common/${version}/CHANGES.md";
     description = "Code to be shared between eduVPN clients";
     homepage = "https://github.com/eduvpn/eduvpn-common";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       benneti
       jwijenbergh
     ];
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 4ac7d48213e2..45453918cf99 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -101,12 +101,12 @@ stdenv.mkDerivation rec {
     inherit gnupg libotr rsyslog;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gnu.org/software/libgcrypt/";
     changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=${pname}.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}";
     description = "General-purpose cryptographic library";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
-    maintainers = [ ];
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix
index 141cdc97aecc..3b866ffba3f1 100644
--- a/pkgs/by-name/li/libgedit-amtk/package.nix
+++ b/pkgs/by-name/li/libgedit-amtk/package.nix
@@ -73,15 +73,15 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk";
     changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags";
     description = "Actions, Menus and Toolbars Kit for GTK applications";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       manveru
       bobby285271
     ];
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libglvnd/package.nix b/pkgs/by-name/li/libglvnd/package.nix
index 25e2f60d4403..665a7bb1fdb6 100644
--- a/pkgs/by-name/li/libglvnd/package.nix
+++ b/pkgs/by-name/li/libglvnd/package.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit (addDriverRunpath) driverLink; };
 
-  meta = with lib; {
+  meta = {
     description = "GL Vendor-Neutral Dispatch library";
     longDescription = ''
       libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API
@@ -102,16 +102,16 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd:
     changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       bsd1
       bsd3
       gpl3Only
       asl20
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212
     badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix
index 140d15a2c380..7ccc35a08d09 100644
--- a/pkgs/by-name/li/libgpg-error/package.nix
+++ b/pkgs/by-name/li/libgpg-error/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (
 
     doCheck = true; # not cross
 
-    meta = with lib; {
+    meta = {
       homepage = "https://www.gnupg.org/software/libgpg-error/index.html";
       changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}";
       description = "Small library that defines common error values for all GnuPG components";
@@ -85,9 +85,9 @@ stdenv.mkDerivation (
         Daemon and possibly more in the future.
       '';
 
-      license = licenses.lgpl2Plus;
-      platforms = platforms.all;
-      maintainers = [ ];
+      license = lib.licenses.lgpl2Plus;
+      platforms = lib.platforms.all;
+      maintainers = with lib.maintainers; [ ];
     };
   }
   // genPosixLockObjOnlyAttrs
diff --git a/pkgs/by-name/li/libhugetlbfs/package.nix b/pkgs/by-name/li/libhugetlbfs/package.nix
index 581f6abf4689..348a33c81add 100644
--- a/pkgs/by-name/li/libhugetlbfs/package.nix
+++ b/pkgs/by-name/li/libhugetlbfs/package.nix
@@ -57,16 +57,16 @@ stdenv.mkDerivation rec {
     "install-docs"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/libhugetlbfs/libhugetlbfs";
     changelog = "https://github.com/libhugetlbfs/libhugetlbfs/blob/${version}/NEWS";
     description = "library and utilities for Linux hugepages";
-    maintainers = with maintainers; [ qyliss ];
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    badPlatforms = flatten [
-      systems.inspect.platformPatterns.isStatic
-      systems.inspect.patterns.isMusl
+    maintainers = with lib.maintainers; [ qyliss ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    badPlatforms = lib.flatten [
+      lib.systems.inspect.platformPatterns.isStatic
+      lib.systems.inspect.patterns.isMusl
     ];
   };
 }
diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix
index b774a2207631..6015ecb0a668 100644
--- a/pkgs/by-name/li/libical/package.nix
+++ b/pkgs/by-name/li/libical/package.nix
@@ -117,11 +117,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/libical/libical";
     description = "Open Source implementation of the iCalendar protocols";
-    changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt";
-    license = licenses.mpl20;
-    platforms = platforms.unix;
+    changelog = "https://github.com/libical/libical/raw/v${finalAttrs.version}/ReleaseNotes.txt";
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libipuz/package.nix b/pkgs/by-name/li/libipuz/package.nix
index 38761b128834..f1c62f408693 100644
--- a/pkgs/by-name/li/libipuz/package.nix
+++ b/pkgs/by-name/li/libipuz/package.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     json-glib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for parsing .ipuz puzzle files";
     homepage = "https://gitlab.gnome.org/jrb/libipuz";
     changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${version}/NEWS.md?ref_type=tags";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix
index cfb21e6906b7..68dc890b7082 100644
--- a/pkgs/by-name/li/libkqueue/package.nix
+++ b/pkgs/by-name/li/libkqueue/package.nix
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "kqueue(2) compatibility library";
     homepage = "https://github.com/mheily/libkqueue";
     changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog";
-    license = licenses.bsd2;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix
index 3fa0d2212ce6..8a3467f987dc 100644
--- a/pkgs/by-name/li/libmbim/package.nix
+++ b/pkgs/by-name/li/libmbim/package.nix
@@ -70,12 +70,12 @@ stdenv.mkDerivation rec {
       build-aux/mbim-codegen/mbim-codegen
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/wiki/Software/libmbim/";
     description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
     changelog = "https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/raw/${version}/NEWS";
-    teams = [ teams.freedesktop ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
+    teams = [ lib.teams.freedesktop ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix
index c48b1d2c739a..e0dd3c439ee5 100644
--- a/pkgs/by-name/li/libosinfo/package.nix
+++ b/pkgs/by-name/li/libosinfo/package.nix
@@ -84,12 +84,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";
     homepage = "https://libosinfo.org/";
     changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index 23fd2f5878c3..b535c4c3a68e 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
       --replace 'python_env.append' '#'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Reusable library for GPU-accelerated video/image rendering primitives";
     longDescription = ''
       Reusable library for GPU-accelerated image/view processing primitives and
@@ -96,8 +96,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://code.videolan.org/videolan/libplacebo";
     changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ primeos ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ primeos ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix
index e8a2bf3f66b0..a7e3c38a9a3b 100644
--- a/pkgs/by-name/li/libplacebo_5/package.nix
+++ b/pkgs/by-name/li/libplacebo_5/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       --replace 'python_env.append' '#'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Reusable library for GPU-accelerated video/image rendering primitives";
     longDescription = ''
       Reusable library for GPU-accelerated image/view processing primitives and
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://code.videolan.org/videolan/libplacebo";
     changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ primeos ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ primeos ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix
index ed1287203225..d738a00d7283 100644
--- a/pkgs/by-name/li/libpsl/package.nix
+++ b/pkgs/by-name/li/libpsl/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "C library for the Publix Suffix List";
     longDescription = ''
       libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
@@ -94,10 +94,10 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://rockdaboot.github.io/libpsl/";
     changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS";
-    license = licenses.mit;
-    maintainers = [ maintainers.c0bw3b ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.c0bw3b ];
     mainProgram = "psl";
-    platforms = platforms.unix ++ platforms.windows;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [ "libpsl" ];
   };
 }
diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix
index 9f1f8986ff4a..b57bba62a4b2 100644
--- a/pkgs/by-name/li/libqmi/package.nix
+++ b/pkgs/by-name/li/libqmi/package.nix
@@ -94,12 +94,12 @@ stdenv.mkDerivation rec {
       build-aux/qmi-codegen/qmi-codegen
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
     description = "Modem protocol helper library";
-    teams = [ teams.freedesktop ];
-    platforms = platforms.linux;
-    license = with licenses; [
+    teams = [ lib.teams.freedesktop ];
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [
       # Library
       lgpl2Plus
       # Tools
diff --git a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
index f9230dac9edd..caff75ff35b1 100644
--- a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
+++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ qt6.qtbase ];
   dontWrapQtApps = true;
 
-  meta = with lib; {
+  meta = {
     description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API";
     homepage = "https://owncloud.org";
-    maintainers = with maintainers; [ hellwolf ];
-    platforms = platforms.unix;
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ hellwolf ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.asl20;
     changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/li/librsync/package.nix b/pkgs/by-name/li/librsync/package.nix
index 02efdd531fa1..37816931bdf8 100644
--- a/pkgs/by-name/li/librsync/package.nix
+++ b/pkgs/by-name/li/librsync/package.nix
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of the rsync remote-delta algorithm";
     homepage = "https://librsync.sourceforge.net/";
     changelog = "https://github.com/librsync/librsync/releases/tag/v${version}";
-    license = licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     mainProgram = "rdiff";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix
index 583cecb84572..c1f6242f9d27 100644
--- a/pkgs/by-name/li/libsndfile/package.nix
+++ b/pkgs/by-name/li/libsndfile/package.nix
@@ -94,13 +94,13 @@ stdenv.mkDerivation rec {
     lame = (lame.override { sndfileFileIOSupport = true; });
   };
 
-  meta = with lib; {
+  meta = {
     description = "C library for reading and writing files containing sampled sound";
     homepage = "https://libsndfile.github.io/libsndfile/";
     changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${version}";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ lovek323 ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ lovek323 ];
+    platforms = lib.platforms.all;
 
     longDescription = ''
       Libsndfile is a C library for reading and writing files containing
diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix
index 56ed10dbf688..66c7ac8b7ea0 100644
--- a/pkgs/by-name/li/libspelling/package.nix
+++ b/pkgs/by-name/li/libspelling/package.nix
@@ -64,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
     packageName = "libspelling";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Spellcheck library for GTK 4";
     homepage = "https://gitlab.gnome.org/GNOME/libspelling";
-    license = licenses.lgpl21Plus;
-    changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${version}/NEWS";
-    maintainers = with maintainers; [ chuangzhu ];
-    teams = [ teams.gnome ];
+    license = lib.licenses.lgpl21Plus;
+    changelog = "https://gitlab.gnome.org/GNOME/libspelling/-/raw/${finalAttrs.version}/NEWS";
+    maintainers = with lib.maintainers; [ chuangzhu ];
+    teams = [ lib.teams.gnome ];
   };
 })
diff --git a/pkgs/by-name/li/libtasn1/package.nix b/pkgs/by-name/li/libtasn1/package.nix
index badcca121580..c8e506d2bd53 100644
--- a/pkgs/by-name/li/libtasn1/package.nix
+++ b/pkgs/by-name/li/libtasn1/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     inherit gnutls samba qemu;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gnu.org/software/libtasn1/";
     description = "ASN.1 library";
     longDescription = ''
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
       other packages.  The goal of this implementation is to be highly
       portable, and only require an ANSI C89 platform.
     '';
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
     changelog = "https://gitlab.com/gnutls/libtasn1/-/blob/v${version}/NEWS";
   };
 }
diff --git a/pkgs/by-name/li/libtins/package.nix b/pkgs/by-name/li/libtins/package.nix
index 20a14280cb7b..00c7a33339f3 100644
--- a/pkgs/by-name/li/libtins/package.nix
+++ b/pkgs/by-name/li/libtins/package.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "tests test";
 
-  meta = with lib; {
+  meta = {
     description = "High-level, multiplatform C++ network packet sniffing and crafting library";
     homepage = "https://libtins.github.io/";
     changelog = "https://raw.githubusercontent.com/mfontanini/libtins/v${version}/CHANGES.md";
     license = lib.licenses.bsd2;
-    maintainers = with maintainers; [ fdns ];
+    maintainers = with lib.maintainers; [ fdns ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/libtomcrypt/package.nix b/pkgs/by-name/li/libtomcrypt/package.nix
index 35bb906ee2a2..198328869b05 100644
--- a/pkgs/by-name/li/libtomcrypt/package.nix
+++ b/pkgs/by-name/li/libtomcrypt/package.nix
@@ -46,15 +46,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Fairly comprehensive, modular and portable cryptographic toolkit";
     homepage = "https://www.libtom.net/LibTomCrypt/";
     changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes";
-    license = with licenses; [
+    license = with lib.licenses; [
       publicDomain
       wtfpl
     ];
-    maintainers = [ ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libudev-zero/package.nix b/pkgs/by-name/li/libudev-zero/package.nix
index 104c80c498f9..8d7630fe6bf2 100644
--- a/pkgs/by-name/li/libudev-zero/package.nix
+++ b/pkgs/by-name/li/libudev-zero/package.nix
@@ -31,16 +31,16 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/illiliti/libudev-zero";
     description = "Daemonless replacement for libudev";
-    changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}";
-    maintainers = with maintainers; [
+    changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${finalAttrs.version}";
+    maintainers = with lib.maintainers; [
       qyliss
       shamilton
     ];
-    license = licenses.isc;
+    license = lib.licenses.isc;
     pkgConfigModules = [ "libudev" ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix
index a1df422c7183..6b3f185916c8 100644
--- a/pkgs/by-name/li/libuninameslist/package.nix
+++ b/pkgs/by-name/li/libuninameslist/package.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     autoreconfHook
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/fontforge/libuninameslist/";
     changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog";
     description = "Library of Unicode names and annotation data";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ erictapen ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ erictapen ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix
index 2308f77b58a6..3e79567280db 100644
--- a/pkgs/by-name/li/liburcu/package.nix
+++ b/pkgs/by-name/li/liburcu/package.nix
@@ -25,24 +25,24 @@ stdenv.mkDerivation rec {
   preCheck = "patchShebangs tests/unit";
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Userspace RCU (read-copy-update) library";
     homepage = "https://lttng.org/urcu";
     changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog";
-    license = licenses.lgpl21Plus;
+    license = lib.licenses.lgpl21Plus;
     # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h
-    platforms = intersectLists platforms.unix (
-      platforms.x86
-      ++ platforms.power
-      ++ platforms.s390
-      ++ platforms.arm
-      ++ platforms.aarch64
-      ++ platforms.mips
-      ++ platforms.m68k
-      ++ platforms.riscv
-      ++ platforms.loongarch64
+    platforms = lib.intersectLists lib.platforms.unix (
+      lib.platforms.x86
+      ++ lib.platforms.power
+      ++ lib.platforms.s390
+      ++ lib.platforms.arm
+      ++ lib.platforms.aarch64
+      ++ lib.platforms.mips
+      ++ lib.platforms.m68k
+      ++ lib.platforms.riscv
+      ++ lib.platforms.loongarch64
     );
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = [ lib.maintainers.bjornfor ];
   };
 
 }
diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index 1acf1f761392..496834f8cf5e 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -407,13 +407,13 @@ stdenv.mkDerivation rec {
 
   passthru.tests.libvirtd = nixosTests.libvirtd;
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes";
     homepage = "https://libvirt.org/";
     changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       fpletz
       globin
       lovesegfault
diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix
index a891f9b2dea5..aa6da1a76a12 100644
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@@ -258,12 +258,12 @@ stdenv.mkDerivation rec {
     ffmpeg = ffmpeg.override { withVpx = true; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "WebM VP8/VP9 codec SDK";
     homepage = "https://www.webmproject.org/";
     changelog = "https://github.com/webmproject/libvpx/raw/v${version}/CHANGELOG";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ codyopel ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ codyopel ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/license-scanner/package.nix b/pkgs/by-name/li/license-scanner/package.nix
index 758c5abf7823..ddcf401b0593 100644
--- a/pkgs/by-name/li/license-scanner/package.nix
+++ b/pkgs/by-name/li/license-scanner/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM=";
 
-  meta = with lib; {
+  meta = {
     description = "Utility that provides an API and CLI to identify licenses and legal terms";
     mainProgram = "license-scanner";
     homepage = "https://github.com/CycloneDX/license-scanner";
     changelog = "https://github.com/CycloneDX/license-scanner/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix
index da5a5a3f4304..077faeca7565 100644
--- a/pkgs/by-name/li/lightsoff/package.nix
+++ b/pkgs/by-name/li/lightsoff/package.nix
@@ -56,13 +56,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "lightsoff"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/lightsoff";
     changelog = "https://gitlab.gnome.org/GNOME/lightsoff/-/blob/${version}/NEWS?ref_type=tags";
     description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
     mainProgram = "lightsoff";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index 82de56dc8708..85f863763255 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -30,10 +30,10 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tunneling/pivoting tool that uses a TUN interface";
     homepage = "https://github.com/tnpitsecurity/ligolo-ng";
     changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
   };
 }
diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix
index f21d7482ceb5..ae9e838bd3c3 100644
--- a/pkgs/by-name/li/likwid/package.nix
+++ b/pkgs/by-name/li/likwid/package.nix
@@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://hpc.fau.de/research/tools/likwid/";
     changelog = "https://github.com/RRZE-HPC/likwid/releases/tag/v${version}";
     description = "Performance monitoring and benchmarking suite";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     # Might work on ARM by appropriately setting COMPILER in config.mk
-    platforms = intersectLists platforms.linux platforms.x86;
-    maintainers = [ maintainers.vbgl ];
+    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
+    maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "likwid-perfctr";
   };
 }
diff --git a/pkgs/by-name/li/lil-pwny/package.nix b/pkgs/by-name/li/lil-pwny/package.nix
index 052b52d906ab..d4d7ef083153 100644
--- a/pkgs/by-name/li/lil-pwny/package.nix
+++ b/pkgs/by-name/li/lil-pwny/package.nix
@@ -23,12 +23,12 @@ python3.pkgs.buildPythonApplication rec {
     "lil_pwny"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Offline auditing of Active Directory passwords";
     mainProgram = "lil-pwny";
     homepage = "https://github.com/PaperMtn/lil-pwny";
     changelog = "https://github.com/PaperMtn/lil-pwny/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/li/link-grammar/package.nix b/pkgs/by-name/li/link-grammar/package.nix
index 25a97d0a6df5..2ddba52abde6 100644
--- a/pkgs/by-name/li/link-grammar/package.nix
+++ b/pkgs/by-name/li/link-grammar/package.nix
@@ -62,13 +62,13 @@ let
           '';
     };
 
-    meta = with lib; {
+    meta = {
       description = "Grammar Checking library";
       homepage = "https://www.abisource.com/projects/link-grammar/";
       changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
-      license = licenses.lgpl21Only;
-      maintainers = with maintainers; [ jtojnar ];
-      platforms = platforms.unix;
+      license = lib.licenses.lgpl21Only;
+      maintainers = with lib.maintainers; [ jtojnar ];
+      platforms = lib.platforms.unix;
     };
   };
 
diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix
index b69cba9700b4..12f5b5d6fef3 100644
--- a/pkgs/by-name/li/linkchecker/package.nix
+++ b/pkgs/by-name/li/linkchecker/package.nix
@@ -53,13 +53,13 @@ python3.pkgs.buildPythonApplication rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Check websites for broken links";
     mainProgram = "linkchecker";
     homepage = "https://linkcheck.github.io/linkchecker/";
     changelog = "https://github.com/linkchecker/linkchecker/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       peterhoeg
       tweber
     ];
diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix
index 6891749480f4..ba90165b2404 100644
--- a/pkgs/by-name/li/linux-router/package.nix
+++ b/pkgs/by-name/li/linux-router/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
       makeWrapper $out/.bin-wrapped/lnxrouter $out/bin/lnxrouter --prefix PATH : ${binPath}
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/garywill/linux-router";
     description = "Set Linux as router / Wifi hotspot / proxy in one command";
     longDescription = ''
@@ -107,9 +107,9 @@ stdenv.mkDerivation rec {
       - Compatible with NetworkManager (automatically set interface as unmanaged)
     '';
     changelog = "https://github.com/garywill/linux-router/releases/tag/${version}";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ x3ro ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ x3ro ];
+    platforms = lib.platforms.linux;
     mainProgram = "lnxrouter";
   };
 }
diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix
index 63ac2e3b1040..30463a280140 100644
--- a/pkgs/by-name/li/listenbrainz-mpd/package.nix
+++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix
@@ -63,12 +63,12 @@ rustPlatform.buildRustPackage rec {
     installManPage listenbrainz-mpd.1
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd";
     changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md";
     description = "ListenBrainz submission client for MPD";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ DeeUnderscore ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ DeeUnderscore ];
     mainProgram = "listenbrainz-mpd";
   };
 }
diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix
index ba73f3ceb1f7..4feb68fd142c 100644
--- a/pkgs/by-name/li/listmonk/package.nix
+++ b/pkgs/by-name/li/listmonk/package.nix
@@ -57,12 +57,12 @@ buildGoModule rec {
     tests = { inherit (nixosTests) listmonk; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "High performance, self-hosted, newsletter and mailing list manager with a modern dashboard";
     mainProgram = "listmonk";
     homepage = "https://github.com/knadh/listmonk";
     changelog = "https://github.com/knadh/listmonk/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ raitobezarius ];
+    license = lib.licenses.agpl3Only;
   };
 }
diff --git a/pkgs/by-name/li/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix
index 44234a418076..84b799a7a295 100644
--- a/pkgs/by-name/li/listmonk/stuffbin.nix
+++ b/pkgs/by-name/li/listmonk/stuffbin.nix
@@ -23,11 +23,11 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
     homepage = "https://github.com/knadh/stuffbin";
     changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ raitobezarius ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix
index cece9764e1b5..2c283055f828 100644
--- a/pkgs/by-name/li/litecli/package.nix
+++ b/pkgs/by-name/li/litecli/package.nix
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
     "test_auto_escaped_col_names"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line interface for SQLite";
     mainProgram = "litecli";
     longDescription = ''
@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://litecli.com";
     changelog = "https://github.com/dbcli/litecli/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ Scriptkiddi ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ Scriptkiddi ];
   };
 }
diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix
index 9c9b528abeeb..0ceea80f2d53 100644
--- a/pkgs/by-name/li/livi/package.nix
+++ b/pkgs/by-name/li/livi/package.nix
@@ -45,13 +45,13 @@ stdenv.mkDerivation rec {
   ];
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/guidog/livi";
     changelog = "https://gitlab.gnome.org/guidog/livi/-/blob/v${version}/NEWS?ref_type=tags";
     description = "Small video player targeting mobile devices (also named μPlayer)";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     mainProgram = "livi";
-    maintainers = with maintainers; [ mksafavi ];
+    maintainers = with lib.maintainers; [ mksafavi ];
   };
 }
diff --git a/pkgs/by-name/lo/lokinet/package.nix b/pkgs/by-name/lo/lokinet/package.nix
index 6d4b4b6bf58f..e9a143f3c6d1 100644
--- a/pkgs/by-name/lo/lokinet/package.nix
+++ b/pkgs/by-name/lo/lokinet/package.nix
@@ -68,11 +68,11 @@ stdenv.mkDerivation rec {
     "-DWITH_SETCAP=OFF"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Anonymous, decentralized and IP based overlay network for the internet";
     homepage = "https://lokinet.org/";
     changelog = "https://github.com/oxen-io/lokinet/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wyndon ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ wyndon ];
   };
 }
diff --git a/pkgs/by-name/lo/loramon/package.nix b/pkgs/by-name/lo/loramon/package.nix
index fc8729442716..a5c45f9b4df3 100644
--- a/pkgs/by-name/lo/loramon/package.nix
+++ b/pkgs/by-name/lo/loramon/package.nix
@@ -24,12 +24,12 @@ python3.pkgs.buildPythonApplication rec {
     pyserial
   ];
 
-  meta = with lib; {
+  meta = {
     description = "LoRa packet sniffer for RNode hardware";
     mainProgram = "loramon";
     homepage = "https://github.com/markqvist/LoRaMon";
     changelog = "https://github.com/markqvist/LoRaMon/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ erethon ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ erethon ];
   };
 }
diff --git a/pkgs/by-name/lu/luabridge/package.nix b/pkgs/by-name/lu/luabridge/package.nix
index 4dd60b10cba5..5a04966bf9d4 100644
--- a/pkgs/by-name/lu/luabridge/package.nix
+++ b/pkgs/by-name/lu/luabridge/package.nix
@@ -25,12 +25,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight, dependency-free library for binding Lua to C++";
     homepage = "https://github.com/vinniefalco/LuaBridge";
     changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md";
-    platforms = platforms.unix;
-    license = licenses.mit;
-    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix
index a1adfb2babbe..c8da3311fa57 100644
--- a/pkgs/by-name/lu/lubelogger/package.nix
+++ b/pkgs/by-name/lu/lubelogger/package.nix
@@ -28,7 +28,7 @@ buildDotnetModule rec {
 
   executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
 
-  meta = with lib; {
+  meta = {
     description = "Vehicle service records and maintainence tracker";
     longDescription = ''
       A self-hosted, open-source, unconventionally-named vehicle maintenance records and fuel mileage tracker.
@@ -37,9 +37,9 @@ buildDotnetModule rec {
     '';
     homepage = "https://lubelogger.com";
     changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lyndeno ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lyndeno ];
     mainProgram = "CarCareTracker";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix
index fa5a42cbe05f..c2684d04f69f 100644
--- a/pkgs/by-name/lu/ludusavi/package.nix
+++ b/pkgs/by-name/lu/ludusavi/package.nix
@@ -117,12 +117,12 @@ rustPlatform.buildRustPackage rec {
         "''${gappsWrapperArgs[@]}"
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Backup tool for PC game saves";
     homepage = "https://github.com/mtkennerly/ludusavi";
     changelog = "https://github.com/mtkennerly/ludusavi/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       pasqui23
       megheaiulian
     ];
diff --git a/pkgs/by-name/lu/luigi/package.nix b/pkgs/by-name/lu/luigi/package.nix
index 6d26a4808c8d..8e6aebdf037e 100644
--- a/pkgs/by-name/lu/luigi/package.nix
+++ b/pkgs/by-name/lu/luigi/package.nix
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   # This enables accessing modules stored in cwd
   makeWrapperArgs = [ "--prefix PYTHONPATH . :" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python package that helps you build complex pipelines of batch jobs";
     longDescription = ''
       Luigi handles dependency resolution, workflow management, visualization,
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/spotify/luigi";
     changelog = "https://github.com/spotify/luigi/releases/tag/${version}";
-    license = [ licenses.asl20 ];
-    maintainers = [ maintainers.bhipple ];
+    license = [ lib.licenses.asl20 ];
+    maintainers = [ lib.maintainers.bhipple ];
   };
 }
diff --git a/pkgs/by-name/lu/lux/package.nix b/pkgs/by-name/lu/lux/package.nix
index 6510caf5e25e..c81e21a9cc65 100644
--- a/pkgs/by-name/lu/lux/package.nix
+++ b/pkgs/by-name/lu/lux/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
 
   doCheck = false; # require network
 
-  meta = with lib; {
+  meta = {
     description = "Fast and simple video download library and CLI tool written in Go";
     homepage = "https://github.com/iawia002/lux";
     changelog = "https://github.com/iawia002/lux/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ galaxy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ galaxy ];
     mainProgram = "lux";
   };
 }
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index f6005277dff6..ec28bd8fbbbd 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     installManPage doc/macchina.{1,7}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast, minimal and customizable system information fetcher";
     homepage = "https://github.com/Macchina-CLI/macchina";
     changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
       _414owen
       figsoda
     ];
diff --git a/pkgs/by-name/ma/macs2/package.nix b/pkgs/by-name/ma/macs2/package.nix
index 78b26e441784..fb98d61fb957 100644
--- a/pkgs/by-name/ma/macs2/package.nix
+++ b/pkgs/by-name/ma/macs2/package.nix
@@ -50,12 +50,12 @@ python311.pkgs.buildPythonPackage rec {
 
   pythonImportsCheck = [ "MACS2" ];
 
-  meta = with lib; {
+  meta = {
     description = "Model-based Analysis for ChIP-Seq";
     mainProgram = "macs2";
     homepage = "https://github.com/macs3-project/MACS/";
     changelog = "https://github.com/macs3-project/MACS/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ gschwartz ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ gschwartz ];
   };
 }
diff --git a/pkgs/by-name/ma/maelstrom-clj/package.nix b/pkgs/by-name/ma/maelstrom-clj/package.nix
index be251bcabe68..0c9920460360 100644
--- a/pkgs/by-name/ma/maelstrom-clj/package.nix
+++ b/pkgs/by-name/ma/maelstrom-clj/package.nix
@@ -45,14 +45,14 @@ stdenv.mkDerivation rec {
     graphviz
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Workbench for writing toy implementations of distributed systems";
     homepage = "https://github.com/jepsen-io/maelstrom";
     changelog = "https://github.com/jepsen-io/maelstrom/releases/tag/${version}";
     mainProgram = "maelstrom";
-    sourceProvenance = [ sourceTypes.binaryBytecode ];
-    license = licenses.epl10;
-    maintainers = [ maintainers.emilioziniades ];
-    platforms = platforms.linux ++ platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.emilioziniades ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
index 9125fe5b0378..64dd4a7cc99c 100644
--- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix
+++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/wormhole-rs completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of Magic Wormhole, with new features and enhancements";
     homepage = "https://github.com/magic-wormhole/magic-wormhole.rs";
     changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md";
-    license = licenses.eupl12;
-    maintainers = with maintainers; [
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [
       zeri
       piegames
     ];
diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix
index 26bfa337c934..ddfc7a54753d 100644
--- a/pkgs/by-name/ma/mailhog/package.nix
+++ b/pkgs/by-name/ma/mailhog/package.nix
@@ -34,15 +34,15 @@ buildGoModule rec {
     inherit (nixosTests) mailhog;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Web and API based SMTP testing";
     mainProgram = "MailHog";
     homepage = "https://github.com/mailhog/MailHog";
     changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       disassembler
       jojosch
     ];
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index 431fc3d774d0..8e6af15c623b 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "maim";
     inherit (src.meta) homepage;
     description = "Command-line screenshot utility";
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}";
     platforms = lib.platforms.all;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix
index 8083e0147e4a..8768dd0935b8 100644
--- a/pkgs/by-name/ma/mainsail/package.nix
+++ b/pkgs/by-name/ma/mainsail/package.nix
@@ -34,13 +34,13 @@ buildNpmPackage rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Web interface for managing and controlling 3D printers with Klipper";
     homepage = "https://docs.mainsail.xyz";
     changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       shhht
       lovesegfault
       wulfsta
diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix
index f613631919b4..cb3aab996add 100644
--- a/pkgs/by-name/ma/malwoverview/package.nix
+++ b/pkgs/by-name/ma/malwoverview/package.nix
@@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec {
     "malwoverview"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for threat hunting and gathering intel information from various sources";
     homepage = "https://github.com/alexandreborges/malwoverview";
     changelog = "https://github.com/alexandreborges/malwoverview/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "malwoverview.py";
   };
 }
diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix
index 9f7c23b559ac..fb4716103863 100644
--- a/pkgs/by-name/ma/mantra/package.nix
+++ b/pkgs/by-name/ma/mantra/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool used to hunt down API key leaks in JS files and pages";
     homepage = "https://github.com/MrEmpy/Mantra";
     changelog = "https://github.com/MrEmpy/Mantra/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mantra";
   };
 }
diff --git a/pkgs/by-name/ma/mapcidr/package.nix b/pkgs/by-name/ma/mapcidr/package.nix
index 3ca5dd65ca98..c48039ae0492 100644
--- a/pkgs/by-name/ma/mapcidr/package.nix
+++ b/pkgs/by-name/ma/mapcidr/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     "cmd/mapcidr"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Small utility program to perform multiple operations for a given subnet/CIDR ranges";
     longDescription = ''
       mapCIDR is developed to ease load distribution for mass scanning
@@ -30,8 +30,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/mapcidr";
     changelog = "https://github.com/projectdiscovery/mapcidr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hanemile ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hanemile ];
     mainProgram = "mapcidr";
   };
 }
diff --git a/pkgs/by-name/ma/markdown-anki-decks/package.nix b/pkgs/by-name/ma/markdown-anki-decks/package.nix
index 69d53183abce..4ceabbdf2415 100644
--- a/pkgs/by-name/ma/markdown-anki-decks/package.nix
+++ b/pkgs/by-name/ma/markdown-anki-decks/package.nix
@@ -39,13 +39,13 @@ python3.pkgs.buildPythonApplication rec {
     "markdown_anki_decks"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to convert Markdown files into Anki Decks";
     homepage = "https://github.com/lukesmurray/markdown-anki-decks";
     changelog = "https://github.com/lukesmurray/markdown-anki-decks/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ totoroot ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ totoroot ];
+    platforms = lib.platforms.unix;
     mainProgram = "mdankideck";
   };
 }
diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix
index 990f016b9311..861456103f01 100644
--- a/pkgs/by-name/ma/marker/package.nix
+++ b/pkgs/by-name/ma/marker/package.nix
@@ -51,15 +51,15 @@ stdenv.mkDerivation rec {
     meson rewrite kwargs set project / version '${version}'
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://fabiocolacio.github.io/Marker/";
     description = "Markdown editor for the Linux desktop made with GTK3";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       trepetti
       aleksana
     ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}";
     mainProgram = "marker";
   };
diff --git a/pkgs/by-name/ma/martian-mono/package.nix b/pkgs/by-name/ma/martian-mono/package.nix
index 3b42445e2f2d..1d81abb109c6 100644
--- a/pkgs/by-name/ma/martian-mono/package.nix
+++ b/pkgs/by-name/ma/martian-mono/package.nix
@@ -28,12 +28,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free and open-source monospaced font from Evil Martians";
     homepage = "https://github.com/evilmartians/mono";
     changelog = "https://github.com/evilmartians/mono/raw/v${version}/Changelog.md";
-    license = licenses.ofl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ma/masscan/package.nix b/pkgs/by-name/ma/masscan/package.nix
index c067e1ac54dc..a89cf351475e 100644
--- a/pkgs/by-name/ma/masscan/package.nix
+++ b/pkgs/by-name/ma/masscan/package.nix
@@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
     $out/bin/masscan --selftest
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast scan of the Internet";
     mainProgram = "masscan";
     homepage = "https://github.com/robertdavidgraham/masscan";
     changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ rnhmjoj ];
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ rnhmjoj ];
   };
 }
diff --git a/pkgs/by-name/ma/massdns/package.nix b/pkgs/by-name/ma/massdns/package.nix
index 1f6d19fcaeb2..8ee4306d127a 100644
--- a/pkgs/by-name/ma/massdns/package.nix
+++ b/pkgs/by-name/ma/massdns/package.nix
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Resolve large amounts of domain names";
     homepage = "https://github.com/blechschmidt/massdns";
     changelog = "https://github.com/blechschmidt/massdns/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ geoffreyfrogeye ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ geoffreyfrogeye ];
     mainProgram = "massdns";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     # error: use of undeclared identifier 'MSG_NOSIGNAL'
-    badPlatforms = platforms.darwin;
+    badPlatforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
index 51ad3bd89545..ff937c86c511 100644
--- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
@@ -89,13 +89,13 @@ stdenv.mkDerivation {
   passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/matrix-org/matrix-appservice-irc/releases/tag/${version}";
     description = "Node.js IRC bridge for Matrix";
     mainProgram = "matrix-appservice-irc";
-    maintainers = with maintainers; [ rhysmdnz ];
+    maintainers = with lib.maintainers; [ rhysmdnz ];
     homepage = "https://github.com/matrix-org/matrix-appservice-irc";
-    license = licenses.asl20;
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index e61711ebe1f0..a5e3f1d6f921 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -180,12 +180,12 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://matrix.org";
     changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}";
     description = "Matrix reference homeserver";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ sumnerevans ];
-    teams = [ teams.matrix ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ sumnerevans ];
+    teams = [ lib.teams.matrix ];
   };
 }
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
index 82a8d0046b3e..01e80eba9d66 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix
@@ -52,12 +52,12 @@ buildPythonPackage rec {
     "s3_storage_provider"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Synapse storage provider to fetch and store media in Amazon S3";
     mainProgram = "s3_media_upload";
     homepage = "https://github.com/matrix-org/synapse-s3-storage-provider";
     changelog = "https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix
index 104592c80cc3..7547619282b6 100644
--- a/pkgs/by-name/mc/mcfly/package.nix
+++ b/pkgs/by-name/mc/mcfly/package.nix
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-9oNfXNQywvgTREa0G1UbId4ezLSCem4IBkqE5X234hE=";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cantino/mcfly";
     description = "Upgraded ctrl-r where history results make sense for what you're working on right now";
     changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt";
-    license = licenses.mit;
-    maintainers = [ maintainers.melkor333 ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.melkor333 ];
     mainProgram = "mcfly";
   };
 }
diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix
index 23811de16cbf..42a74e0790b1 100644
--- a/pkgs/by-name/me/med/package.nix
+++ b/pkgs/by-name/me/med/package.nix
@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
     find . -type f -exec sed -i "s|/opt/med|$out/share/med|g" {} +
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GUI game memory scanner and editor";
     homepage = "https://github.com/allencch/med";
     changelog = "https://github.com/allencch/med/releases/tag/${version}";
-    maintainers = with maintainers; [ zebreus ];
-    platforms = platforms.linux;
-    license = licenses.bsd3;
+    maintainers = with lib.maintainers; [ zebreus ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd3;
     mainProgram = "med";
   };
 }
diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index a127b4263d4f..4fd9019fc85b 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
     xz
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to write images files to portable media";
     homepage = "https://github.com/FedoraQt/MediaWriter";
     changelog = "https://github.com/FedoraQt/MediaWriter/releases/tag/${version}";
-    license = licenses.lgpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.lgpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mediawriter";
   };
 }
diff --git a/pkgs/by-name/me/melt/package.nix b/pkgs/by-name/me/melt/package.nix
index 39284acc1522..1b59bd84a078 100644
--- a/pkgs/by-name/me/melt/package.nix
+++ b/pkgs/by-name/me/melt/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Backup and restore Ed25519 SSH keys with seed words";
     mainProgram = "melt";
     homepage = "https://github.com/charmbracelet/melt";
     changelog = "https://github.com/charmbracelet/melt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ penguwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ penguwin ];
   };
 }
diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix
index 54c629ade471..e8670c61d43c 100644
--- a/pkgs/by-name/me/menyoki/package.nix
+++ b/pkgs/by-name/me/menyoki/package.nix
@@ -50,12 +50,12 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion completions/menyoki.{bash,fish,zsh}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Screen{shot,cast} and perform ImageOps on the command line";
     homepage = "https://menyoki.cli.rs/";
     changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "menyoki";
   };
 }
diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix
index 4bbb56d8a15a..3eb34b67f8e9 100644
--- a/pkgs/by-name/me/mercure/package.nix
+++ b/pkgs/by-name/me/mercure/package.nix
@@ -42,13 +42,13 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open, easy, fast, reliable and battery-efficient solution for real-time communications";
     homepage = "https://github.com/dunglas/mercure";
     changelog = "https://github.com/dunglas/mercure/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ gaelreyrol ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ gaelreyrol ];
+    platforms = lib.platforms.unix;
     mainProgram = "mercure";
   };
 }
diff --git a/pkgs/by-name/me/mermerd/package.nix b/pkgs/by-name/me/mermerd/package.nix
index cd0fe6f6bde5..43338f67d5c3 100644
--- a/pkgs/by-name/me/mermerd/package.nix
+++ b/pkgs/by-name/me/mermerd/package.nix
@@ -36,12 +36,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Create Mermaid-Js ERD diagrams from existing tables";
     mainProgram = "mermerd";
     homepage = "https://github.com/KarnerTh/mermerd";
     changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ austin-artificial ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ austin-artificial ];
   };
 }
diff --git a/pkgs/by-name/me/metabigor/package.nix b/pkgs/by-name/me/metabigor/package.nix
index 2034a9c91aaf..bdddbad8e083 100644
--- a/pkgs/by-name/me/metabigor/package.nix
+++ b/pkgs/by-name/me/metabigor/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Disabled for now as there are some failures ("undefined:")
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to perform OSINT tasks";
     homepage = "https://github.com/j3ssie/metabigor";
     changelog = "https://github.com/j3ssie/metabigor/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "metabigor";
   };
 }
diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix
index 4cb4054d2fa5..f1406de7b9cc 100644
--- a/pkgs/by-name/me/metacity/package.nix
+++ b/pkgs/by-name/me/metacity/package.nix
@@ -64,12 +64,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Window manager used in Gnome Flashback";
     homepage = "https://gitlab.gnome.org/GNOME/metacity";
     changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl2;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index dc44e039ccd7..65406cbc4349 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -74,12 +74,12 @@ rustPlatform.buildRustPackage rec {
     RUSTONIG_SYSTEM_LIBONIG = true;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tiny, self-contained, configurable paste bin and URL shortener written in Rust";
     homepage = "https://github.com/szabodanika/microbin";
     changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       dit7ya
       figsoda
     ];
diff --git a/pkgs/by-name/mi/millet/package.nix b/pkgs/by-name/mi/millet/package.nix
index da0694ebe84f..0a55e505990c 100644
--- a/pkgs/by-name/mi/millet/package.nix
+++ b/pkgs/by-name/mi/millet/package.nix
@@ -32,15 +32,15 @@ rustPlatform.buildRustPackage rec {
     "millet-ls"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Language server for Standard ML";
     homepage = "https://github.com/azdavis/millet";
     changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md";
     license = [
-      licenses.mit # or
-      licenses.asl20
+      lib.licenses.mit # or
+      lib.licenses.asl20
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "millet-ls";
   };
 }
diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix
index 46ab3f8b3254..f64d4fe658c2 100644
--- a/pkgs/by-name/mi/minetest-mapserver/package.nix
+++ b/pkgs/by-name/mi/minetest-mapserver/package.nix
@@ -17,16 +17,16 @@ buildGoModule rec {
 
   vendorHash = "sha256-sPqwY3c/ehrrP6aeUyRUMqCpHqBErwIXUlgoX0P99/w=";
 
-  meta = with lib; {
+  meta = {
     description = "Realtime mapserver for minetest";
     mainProgram = "mapserver";
     homepage = "https://github.com/minetest-mapserver/mapserver/blob/master/readme.md";
     changelog = "https://github.com/minetest-mapserver/mapserver/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       cc-by-sa-30
     ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ gm6k ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gm6k ];
   };
 }
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 7332ee4a394d..695615cac367 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -44,13 +44,13 @@ buildGoModule rec {
     installShellCompletion --cmd minify --bash cmd/minify/bash_completion
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Go minifiers for web formats";
     homepage = "https://go.tacodewolff.nl/minify";
     downloadPage = "https://github.com/tdewolff/minify";
     changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gaelreyrol ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gaelreyrol ];
     mainProgram = "minify";
   };
 }
diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix
index 020788f0cc30..8faa61133772 100644
--- a/pkgs/by-name/mi/minigalaxy/package.nix
+++ b/pkgs/by-name/mi/minigalaxy/package.nix
@@ -70,13 +70,13 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sharkwouter.github.io/minigalaxy/";
     changelog = "https://github.com/sharkwouter/minigalaxy/blob/${version}/CHANGELOG.md";
     downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
     description = "Simple GOG client for Linux";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index e35a49ab22e5..05557b6f36ea 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = "--bin minijinja-cli";
 
-  meta = with lib; {
+  meta = {
     description = "Command Line Utility to render MiniJinja/Jinja2 templates";
     homepage = "https://github.com/mitsuhiko/minijinja";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ psibi ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ psibi ];
     changelog = "https://github.com/mitsuhiko/minijinja/blob/${version}/CHANGELOG.md";
     mainProgram = "minijinja-cli";
   };
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 36b2f3f5e609..70196d7d6bcc 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -49,12 +49,12 @@ rustPlatform.buildRustPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";
     changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ figsoda ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "miniserve";
   };
 }
diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index 11e667800d73..0f6d90286079 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to uncover security misconfigurations on popular third-party services";
     homepage = "https://github.com/intigriti/misconfig-mapper";
     changelog = "https://github.com/intigriti/misconfig-mapper/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "misconfig-mapper";
   };
 }
diff --git a/pkgs/by-name/mi/mitmproxy2swagger/package.nix b/pkgs/by-name/mi/mitmproxy2swagger/package.nix
index 6e579bf0f42f..e820824fc9c2 100644
--- a/pkgs/by-name/mi/mitmproxy2swagger/package.nix
+++ b/pkgs/by-name/mi/mitmproxy2swagger/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "mitmproxy2swagger" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to automagically reverse-engineer REST APIs";
     homepage = "https://github.com/alufers/mitmproxy2swagger";
     changelog = "https://github.com/alufers/mitmproxy2swagger/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mitmproxy2swagger";
   };
 }
diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix
index 2d82d7ff2204..f2f1d05163b0 100644
--- a/pkgs/by-name/ml/mlkit/package.nix
+++ b/pkgs/by-name/ml/mlkit/package.nix
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Standard ML Compiler and Toolkit";
     homepage = "https://elsman.com/mlkit/";
     changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ athas ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ athas ];
   };
 }
diff --git a/pkgs/by-name/ml/mlxbf-bootctl/package.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix
index 1356457380a5..624c510eef39 100644
--- a/pkgs/by-name/ml/mlxbf-bootctl/package.nix
+++ b/pkgs/by-name/ml/mlxbf-bootctl/package.nix
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
     install -D mlxbf-bootctl $out/bin/mlxbf-bootctl
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Control BlueField boot partitions";
     homepage = "https://github.com/Mellanox/mlxbf-bootctl";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     changelog = "https://github.com/Mellanox/mlxbf-bootctl/releases/tag/${pname}-${version}";
     # This package is supposed to only run on a BlueField. Thus aarch64-linux
     # is the only relevant platform.
     platforms = [ "aarch64-linux" ];
-    maintainers = with maintainers; [ nikstur ];
+    maintainers = with lib.maintainers; [ nikstur ];
   };
 }
diff --git a/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix b/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
index 4decc3c6dd99..3847221a8fac 100644
--- a/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
+++ b/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = pname; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Mobile broadband service provider database";
     homepage = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
     changelog = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.publicDomain;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/mo/mockgen/package.nix b/pkgs/by-name/mo/mockgen/package.nix
index 866109dd7826..c2cfda64ce40 100644
--- a/pkgs/by-name/mo/mockgen/package.nix
+++ b/pkgs/by-name/mo/mockgen/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "GoMock is a mocking framework for the Go programming language";
     homepage = "https://github.com/uber-go/mock";
     changelog = "https://github.com/uber-go/mock/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bouk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bouk ];
     mainProgram = "mockgen";
   };
 }
diff --git a/pkgs/by-name/mo/mockoon/package.nix b/pkgs/by-name/mo/mockoon/package.nix
index d4ab6f5675e2..377119b31a18 100644
--- a/pkgs/by-name/mo/mockoon/package.nix
+++ b/pkgs/by-name/mo/mockoon/package.nix
@@ -29,17 +29,17 @@ appimageTools.wrapType2 {
       --replace 'Exec=AppRun' 'Exec=${pname}'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Easiest and quickest way to run mock APIs locally";
     longDescription = ''
       Mockoon is the easiest and quickest way to run mock APIs locally.
       No remote deployment, no account required, free and open-source.
     '';
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     homepage = "https://mockoon.com";
     changelog = "https://github.com/mockoon/mockoon/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "mockoon";
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix
index 133b80438ca6..91565fe829d3 100644
--- a/pkgs/by-name/mo/mommy/package.nix
+++ b/pkgs/by-name/mo/mommy/package.nix
@@ -46,13 +46,13 @@ stdenv.mkDerivation rec {
     ''}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "mommy's here to support you, in any shell, on any system~ ❤️";
     homepage = "https://github.com/FWDekker/mommy";
     changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md";
-    license = licenses.unlicense;
-    platforms = platforms.all;
-    maintainers = [ ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "mommy";
   };
 }
diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix
index fc0cb5fe1cc2..503274acd88f 100644
--- a/pkgs/by-name/mo/monsoon/package.nix
+++ b/pkgs/by-name/mo/monsoon/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   # Tests fails on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
+  meta = {
     description = "Fast HTTP enumerator";
     mainProgram = "monsoon";
     longDescription = ''
@@ -30,7 +30,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/RedTeamPentesting/monsoon";
     changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index 61d6d21556b4..87bb340bbbec 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -111,13 +111,13 @@ stdenv.mkDerivation rec {
     version = "myloader v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "High-performance MySQL backup tool";
     homepage = "https://github.com/mydumper/mydumper";
     changelog = "https://github.com/mydumper/mydumper/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       izorkin
       michaelglass
     ];
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 06ba5735ce25..15269e675472 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -44,14 +44,14 @@ buildGoModule rec {
       --fish <($out/bin/myks completion fish)
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/mykso/myks/blob/v${version}/CHANGELOG.md";
     description = "Configuration framework for Kubernetes applications";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/mykso/myks";
-    maintainers = [
-      maintainers.kbudde
-      maintainers.zebradil
+    maintainers = with lib.maintainers; [
+      lib.maintainers.kbudde
+      lib.maintainers.zebradil
     ];
     mainProgram = "myks";
   };
diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix
index 234079b3fb6d..1255a198b1d3 100644
--- a/pkgs/by-name/na/naabu/package.nix
+++ b/pkgs/by-name/na/naabu/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "Fast SYN/CONNECT port scanner";
     longDescription = ''
       Naabu is a port scanning tool written in Go that allows you to enumerate
@@ -44,8 +44,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/naabu";
     changelog = "https://github.com/projectdiscovery/naabu/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "naabu";
   };
 }
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 616dcb8b3e4e..432d1cabf173 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -29,10 +29,10 @@ buildGoModule rec {
     "-X namespacelabs.dev/foundation/internal/cli/version.Tag=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     mainProgram = "nsc";
-    maintainers = with maintainers; [ techknowlogick ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ techknowlogick ];
+    license = lib.licenses.asl20;
     changelog = "https://github.com/namespacelabs/foundation/releases/tag/v${version}";
     homepage = "https://github.com/namespacelabs/foundation";
     description = "Command line interface for the Namespaces platform";
diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index 18691cb6fe35..dcad1610d292 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
     else
       [ "-DBUILD_SHARED_LIBS=ON" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nanodbc/nanodbc";
     changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md";
     description = "Small C++ wrapper for the native C ODBC API";
-    license = licenses.mit;
-    maintainers = [ maintainers.bzizou ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bzizou ];
   };
 }
diff --git a/pkgs/by-name/na/nats-kafka/package.nix b/pkgs/by-name/na/nats-kafka/package.nix
index a7f2e54c2914..16dc1f679eea 100644
--- a/pkgs/by-name/na/nats-kafka/package.nix
+++ b/pkgs/by-name/na/nats-kafka/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "NATS to Kafka Bridging";
     mainProgram = "nats-kafka";
     homepage = "https://github.com/nats-io/nats-kafka";
     changelog = "https://github.com/nats-io/nats-kafka/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ misuzu ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ misuzu ];
   };
 }
diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index 06d81da7c492..52b9397339d5 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -22,13 +22,13 @@ buildGoModule rec {
 
   passthru.tests.nats = nixosTests.nats;
 
-  meta = with lib; {
+  meta = {
     description = "High-Performance server for NATS";
     mainProgram = "nats-server";
     homepage = "https://nats.io/";
     changelog = "https://github.com/nats-io/nats-server/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       swdunlop
       derekcollison
     ];
diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix
index 08a828613d09..c34e140dc21b 100644
--- a/pkgs/by-name/na/nats-top/package.nix
+++ b/pkgs/by-name/na/nats-top/package.nix
@@ -32,12 +32,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "top-like tool for monitoring NATS servers";
     homepage = "https://github.com/nats-io/nats-top";
     changelog = "https://github.com/nats-io/nats-top/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nats-top";
   };
 }
diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix
index 9de7c83dd3f8..23f7c5b6be0c 100644
--- a/pkgs/by-name/na/natscli/package.nix
+++ b/pkgs/by-name/na/natscli/package.nix
@@ -36,12 +36,12 @@ buildGoModule rec {
 
   versionCheckProgram = "${placeholder "out"}/bin/nats";
 
-  meta = with lib; {
+  meta = {
     description = "NATS Command Line Interface";
     homepage = "https://github.com/nats-io/natscli";
     changelog = "https://github.com/nats-io/natscli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nats";
   };
 }
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index 97773ec7a34c..a500f7e1d0f6 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "VNC server library";
     longDescription = ''
       This is a liberally licensed VNC server library that's intended to be
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/any1/neatvnc";
     changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }
diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix
index c6adb5462402..e9a0013e3d04 100644
--- a/pkgs/by-name/ne/nebula/package.nix
+++ b/pkgs/by-name/ne/nebula/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
     inherit (nixosTests) nebula;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Overlay networking tool with a focus on performance, simplicity and security";
     longDescription = ''
       Nebula is a scalable overlay networking tool with a focus on performance,
@@ -48,8 +48,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/slackhq/nebula";
     changelog = "https://github.com/slackhq/nebula/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       numinit
     ];
diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix
index a0646d91e211..b9c45165e8ec 100644
--- a/pkgs/by-name/ne/neon/package.nix
+++ b/pkgs/by-name/ne/neon/package.nix
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit compressionSupport sslSupport; };
 
-  meta = with lib; {
+  meta = {
     description = "HTTP and WebDAV client library";
     mainProgram = "neon-config";
     homepage = "https://notroj.github.io/neon/";
     changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS";
-    platforms = platforms.unix;
-    license = licenses.lgpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl2;
   };
 }
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index 5d2d1f5d17b2..e4a2d4f52a74 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
 
   hardeningEnabled = [ "pie" ];
 
-  meta = with lib; {
+  meta = {
     description = "Automated WireGuard® Management Client";
     mainProgram = "netclient";
     homepage = "https://netmaker.io";
     changelog = "https://github.com/gravitl/netclient/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ wexder ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ wexder ];
   };
 }
diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix
index 623d95c21be9..9004449e7216 100644
--- a/pkgs/by-name/ne/netop/package.nix
+++ b/pkgs/by-name/ne/netop/package.nix
@@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-WGwtRMARwRvcUflN3JYL32aib+IG1Q0j0D9BEfaiME4=";
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/ZingerLittleBee/netop/raw/v${version}/CHANGELOG.md";
     description = "Network monitor using bpf";
     homepage = "https://github.com/ZingerLittleBee/netop";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "netop";
-    maintainers = [ maintainers.marcusramberg ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.marcusramberg ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index fd45a8ee81cd..df08830242d0 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -54,12 +54,12 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/neverest completion zsh)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI to synchronize, backup and restore emails";
     mainProgram = "neverest";
     homepage = "https://pimalaya.org/neverest/cli/v${version}/";
     changelog = "https://git.sr.ht/~soywod/neverest-cli/tree/v${version}/item/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ soywod ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ soywod ];
   };
 }
diff --git a/pkgs/by-name/ne/newman/package.nix b/pkgs/by-name/ne/newman/package.nix
index 2ff02ca5660f..38487cf1c39c 100644
--- a/pkgs/by-name/ne/newman/package.nix
+++ b/pkgs/by-name/ne/newman/package.nix
@@ -19,12 +19,12 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.getpostman.com";
     description = "Command-line collection runner for Postman";
     mainProgram = "newman";
     changelog = "https://github.com/postmanlabs/newman/releases/tag/v${version}";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ freezeboy ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix
index 59ae21a50839..68e9f96d9510 100644
--- a/pkgs/by-name/ne/next-ls/package.nix
+++ b/pkgs/by-name/ne/next-ls/package.nix
@@ -34,13 +34,13 @@ beamPackages.mixRelease rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.elixir-tools.dev/next-ls/";
     changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}";
     description = "The language server for Elixir that just works";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "nextls";
-    maintainers = [ maintainers.adamcstephens ];
+    maintainers = [ lib.maintainers.adamcstephens ];
     platforms = beamPackages.erlang.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix
index 67dd1ffd8bbe..c5cf9f6ba504 100644
--- a/pkgs/by-name/nf/nfdump/package.nix
+++ b/pkgs/by-name/nf/nfdump/package.nix
@@ -50,15 +50,15 @@ stdenv.mkDerivation rec {
     "--enable-nfpcapd"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools for working with netflow data";
     longDescription = ''
       nfdump is a set of tools for working with netflow data.
     '';
     homepage = "https://github.com/phaag/nfdump";
     changelog = "https://github.com/phaag/nfdump/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ takikawa ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ takikawa ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index 9caf82dc8492..cab71f76e9a7 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -41,15 +41,15 @@ buildGoModule rec {
         --zsh  <(${emulator} $out/bin/nfpm completion zsh)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple deb and rpm packager written in Go";
     homepage = "https://github.com/goreleaser/nfpm";
     changelog = "https://github.com/goreleaser/nfpm/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       techknowlogick
       caarlos0
     ];
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     mainProgram = "nfpm";
   };
 }
diff --git a/pkgs/by-name/ni/nikto/package.nix b/pkgs/by-name/ni/nikto/package.nix
index f82cf130f2b1..fb5fb4ff09b3 100644
--- a/pkgs/by-name/ni/nikto/package.nix
+++ b/pkgs/by-name/ni/nikto/package.nix
@@ -59,13 +59,13 @@ stdenv.mkDerivation rec {
       --prefix PERL5LIB : $PERL5LIB
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Web server scanner";
     mainProgram = "nikto";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "https://cirt.net/Nikto2";
     changelog = "https://github.com/sullo/nikto/releases/tag/${version}";
-    maintainers = with maintainers; [ shamilton ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ shamilton ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index 2847bac37ecc..46c5296d8d55 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Yet another language server for Nix";
     homepage = "https://github.com/oxalica/nil";
     changelog = "https://github.com/oxalica/nil/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       oxalica
     ];
diff --git a/pkgs/by-name/ni/nix-du/package.nix b/pkgs/by-name/ni/nix-du/package.nix
index cb9ea6f585bf..a8e3d4cdd12f 100644
--- a/pkgs/by-name/ni/nix-du/package.nix
+++ b/pkgs/by-name/ni/nix-du/package.nix
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to determine which gc-roots take space in your nix store";
     homepage = "https://github.com/symphorien/nix-du";
-    license = licenses.lgpl3Only;
-    maintainers = [ maintainers.symphorien ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl3Only;
+    maintainers = [ lib.maintainers.symphorien ];
+    platforms = lib.platforms.unix;
     mainProgram = "nix-du";
     changelog = "https://github.com/symphorien/nix-du/blob/v${version}/CHANGELOG.md";
   };
diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix
index e81ac8de681d..1241566de275 100644
--- a/pkgs/by-name/ni/nix-template/package.nix
+++ b/pkgs/by-name/ni/nix-template/package.nix
@@ -47,12 +47,12 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/nix-template completions zsh)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Make creating nix expressions easy";
     homepage = "https://github.com/jonringer/nix-template/";
     changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}";
-    license = licenses.cc0;
-    maintainers = [ ];
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "nix-template";
   };
 }
diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix
index fa4ad7a7a722..ad43b5ecfd34 100644
--- a/pkgs/by-name/ni/nix-weather/package.nix
+++ b/pkgs/by-name/ni/nix-weather/package.nix
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
   # be able to find updates through repology and we need this.
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Check Cache Availablility of NixOS Configurations";
     longDescription = ''
       Fast rust tool to check availability of your entire system in caches. It
@@ -71,12 +71,12 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://git.fem.gg/cafkafk/nix-weather";
     changelog = "https://git.fem.gg/cafkafk/nix-weather/releases/tag/v${version}";
-    license = licenses.eupl12;
+    license = lib.licenses.eupl12;
     mainProgram = "nix-weather";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cafkafk
       freyacodes
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/no/noaa-apt/package.nix b/pkgs/by-name/no/noaa-apt/package.nix
index 3329748531eb..73ccce50b181 100644
--- a/pkgs/by-name/no/noaa-apt/package.nix
+++ b/pkgs/by-name/no/noaa-apt/package.nix
@@ -56,15 +56,15 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/ar.com.mbernardi.noaa-apt.svg
   '';
 
-  meta = with lib; {
+  meta = {
     description = "NOAA APT image decoder";
     homepage = "https://noaa-apt.mbernardi.com.ar/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       trepetti
       tmarkus
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}";
     mainProgram = "noaa-apt";
   };
diff --git a/pkgs/by-name/no/node-manta/package.nix b/pkgs/by-name/no/node-manta/package.nix
index a096217d73de..60edd7e1d6ea 100644
--- a/pkgs/by-name/no/node-manta/package.nix
+++ b/pkgs/by-name/no/node-manta/package.nix
@@ -48,12 +48,12 @@ buildNpmPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Manta Object-Storage Client CLIs and Node.js SDK";
     homepage = "https://github.com/TritonDataCenter/node-manta";
     changelog = "https://github.com/TritonDataCenter/node-manta/blob/v${version}/CHANGES.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ teutat3s ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ teutat3s ];
     mainProgram = "mls";
   };
 }
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index c4c65c1ca5e8..f01d81d5bce7 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -41,11 +41,11 @@ buildGoModule rec {
     "-X k8s.io/node-problem-detector/pkg/version.version=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Various problem detectors running on the Kubernetes nodes";
     homepage = "https://github.com/kubernetes/node-problem-detector";
     changelog = "https://github.com/kubernetes/node-problem-detector/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lbpdt ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lbpdt ];
   };
 }
diff --git a/pkgs/by-name/no/nodenv/package.nix b/pkgs/by-name/no/nodenv/package.nix
index 89c6a6a89aa2..ba7447b0cc26 100644
--- a/pkgs/by-name/no/nodenv/package.nix
+++ b/pkgs/by-name/no/nodenv/package.nix
@@ -34,13 +34,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Manage multiple NodeJS versions";
     mainProgram = "nodenv";
     homepage = "https://github.com/nodenv/nodenv/";
     changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ alexnortung ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ alexnortung ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix
index 5082cbe0d6d5..93c548228d5a 100644
--- a/pkgs/by-name/no/nofi/package.nix
+++ b/pkgs/by-name/no/nofi/package.nix
@@ -23,15 +23,15 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];
 
-  meta = with lib; {
+  meta = {
     description = "Interruption-free notification system for Linux";
     homepage = "https://github.com/ellsclytn/nofi/";
     changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md";
     license = [
-      licenses.asl20 # or
-      licenses.mit
+      lib.licenses.asl20 # or
+      lib.licenses.mit
     ];
     mainProgram = "nofi";
-    maintainers = [ maintainers.magnetophon ];
+    maintainers = [ lib.maintainers.magnetophon ];
   };
 }
diff --git a/pkgs/by-name/no/nomore403/package.nix b/pkgs/by-name/no/nomore403/package.nix
index 413ead27a00c..6458db0005ea 100644
--- a/pkgs/by-name/no/nomore403/package.nix
+++ b/pkgs/by-name/no/nomore403/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-X=main.BuildDate=1970-01-01T00:00:00Z"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to bypass 403/40X response codes";
     homepage = "https://github.com/devploit/nomore403";
     changelog = "https://github.com/devploit/nomore403/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nomore403";
   };
 }
diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index c4c17deb190e..9dac2ad18be9 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -217,12 +217,12 @@ ps.buildPythonApplication rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "OCR powered screen-capture tool to capture information instead of images";
     homepage = "https://dynobo.github.io/normcap/";
     changelog = "https://github.com/dynobo/normcap/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       cafkafk
       pbsds
     ];
diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix
index fe9cebb960c6..69b5249e3975 100644
--- a/pkgs/by-name/no/noseyparker/package.nix
+++ b/pkgs/by-name/no/noseyparker/package.nix
@@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec {
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     description = "Find secrets and sensitive information in textual data";
     mainProgram = "noseyparker";
     homepage = "https://github.com/praetorian-inc/noseyparker";
     changelog = "https://github.com/praetorian-inc/noseyparker/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
   };
 }
diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
index f73007bf9a08..f4d73ca1ccbe 100644
--- a/pkgs/by-name/no/nostr-rs-relay/package.nix
+++ b/pkgs/by-name/no/nostr-rs-relay/package.nix
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
     protobuf
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Nostr relay written in Rust";
     homepage = "https://sr.ht/~gheartsfield/nostr-rs-relay/";
     changelog = "https://github.com/scsibug/nostr-rs-relay/releases/tag/${version}";
-    maintainers = with maintainers; [ jurraca ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ jurraca ];
+    license = lib.licenses.mit;
   };
 }

From ee47a957cd0de465e1a7ec065703ae087247891f Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 3 Jun 2025 16:17:41 +0200
Subject: [PATCH 0841/1497] foot: remove with lib;

---
 pkgs/by-name/fo/foot/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index 65a67a135016..7a4e90148999 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -220,16 +220,16 @@ stdenv.mkDerivation {
     });
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://codeberg.org/dnkl/foot/";
     changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}";
     description = "Fast, lightweight and minimalistic Wayland terminal emulator";
-    license = licenses.mit;
-    maintainers = [
-      maintainers.sternenseemann
-      maintainers.abbe
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      sternenseemann
+      abbe
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "foot";
   };
 }

From d00c99a117ed3f1e6dc9db30382713d61b3a638e Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 3 Jun 2025 16:52:35 +0200
Subject: [PATCH 0842/1497] gamescope: 3.16.10 -> 3.16.11

---
 pkgs/by-name/ga/gamescope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 26c47796dcdc..f373a4cce8d5 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -49,14 +49,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gamescope";
-  version = "3.16.10";
+  version = "3.16.11";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "gamescope";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-MZhIsnSp2uGMQds5zEhF8WZgGNHDGH+3A2TGjB6Vn10=";
+    hash = "sha256-Hj/o5QcjCtMoteKOFU9uZmPIQ28ZlM83BT4MAQTmqQQ=";
   };
 
   patches = [

From 4c902775b8f7ec478ab210531681897bd2294cb9 Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 3 Jun 2025 20:40:14 +0530
Subject: [PATCH 0843/1497] nixos/limine: make the install script more resilent
 (#413390)

---
 .../boot/loader/limine/limine-install.py      | 24 ++++++++++++++++---
 .../system/boot/loader/limine/limine.nix      |  3 +++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index d46f8c914859..384584f05db0 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -6,6 +6,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 import datetime
 import hashlib
 import json
+import ctypes
 import os
 import psutil
 import re
@@ -19,6 +20,7 @@ import textwrap
 limine_dir = None
 can_use_direct_paths = False
 install_config = json.load(open('@configPath@', 'r'))
+libc = ctypes.CDLL("libc.so.6")
 
 
 def config(*path: List[str]) -> Optional[Any]:
@@ -232,7 +234,7 @@ def option_from_config(name: str, config_path: List[str], conversion: Callable[[
     return ''
 
 
-def main():
+def install_bootloader() -> None:
     global limine_dir
 
     boot_fs = None
@@ -337,9 +339,12 @@ def main():
 
     config_file += config('extraEntries')
 
-    with open(config_file_path, 'w') as file:
+    with open(f"{config_file_path}.tmp", 'w') as file:
         file.truncate()
         file.write(config_file.strip())
+        file.flush()
+        os.fsync(file.fileno())
+    os.rename(f"{config_file_path}.tmp", config_file_path)
 
     paths[config_file_path] = True
 
@@ -483,4 +488,17 @@ def main():
         if not paths[path]:
             os.remove(path)
 
-main()
+def main() -> None:
+    try:
+        install_bootloader()
+    finally:
+        # Since fat32 provides little recovery facilities after a crash,
+        # it can leave the system in an unbootable state, when a crash/outage
+        # happens shortly after an update. To decrease the likelihood of this
+        # event sync the efi filesystem after each update.
+        rc = libc.syncfs(os.open(f"{config('efiMountPoint')}", os.O_RDONLY))
+        if rc != 0:
+            print(f"could not sync {config('efiMountPoint')}: {os.strerror(rc)}", file=sys.stderr)
+
+if __name__ == '__main__':
+    main()
diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index 956aa09a131d..c56474969fcd 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -438,11 +438,14 @@ in
         wantedBy = [ "fwupd.service" ];
         partOf = [ "fwupd.service" ];
         before = [ "fwupd.service" ];
+
+        unitConfig.ConditionPathIsDirectory = "/var/lib/sbctl";
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
           RuntimeDirectory = "fwupd-efi";
         };
+
         script = ''
           cp ${config.services.fwupd.package.fwupd-efi}/libexec/fwupd/efi/fwupd*.efi /run/fwupd-efi/
           chmod +w /run/fwupd-efi/fwupd*.efi

From f9f715bf71897164b216a43a0afe1733afbdd8fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 15:13:26 +0000
Subject: [PATCH 0844/1497] openvswitch: 3.5.0 -> 3.5.1

---
 pkgs/by-name/op/openvswitch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index fc95eed3e8bc..e9fa46d811e1 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "openvswitch";
     repo = "ovs";
     tag = "v${version}";
-    hash = "sha256-fEntEZHmQX78XZZic9hFr07PWC2RQIpuCfb1FYX3hd0=";
+    hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
   };
 
   outputs = [

From a0f732926b11eb558d1e801c9107b91222224791 Mon Sep 17 00:00:00 2001
From: samfundev <samdinner@hotmail.com>
Date: Sun, 1 Jun 2025 18:01:32 -0400
Subject: [PATCH 0845/1497] grayjay: 5 -> 7

---
 pkgs/by-name/gr/grayjay/deps.json   | 307 +++-------------------------
 pkgs/by-name/gr/grayjay/package.nix |  31 +--
 2 files changed, 44 insertions(+), 294 deletions(-)

diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json
index d525290b1b91..37e2160290d4 100644
--- a/pkgs/by-name/gr/grayjay/deps.json
+++ b/pkgs/by-name/gr/grayjay/deps.json
@@ -34,15 +34,25 @@
     "version": "1.11.58",
     "hash": "sha256-VCrBPH6Waw3LmZEKStBSd5uSH2vicndwYazYX6IdnYE="
   },
+  {
+    "pname": "HtmlAgilityPack",
+    "version": "1.5.1",
+    "hash": "sha256-Jr+DOYzDaJrGRYUZ13zrz/6I2cCh6B+0etWPvPYkJU8="
+  },
   {
     "pname": "libsodium",
     "version": "1.0.20",
     "hash": "sha256-BsitQQnUSm1YupzI5N/LFx0kPFdk1FP8VdM1S3uttvs="
   },
   {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "9.0.0",
-    "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U="
+    "pname": "Microsoft.AspNetCore.App.Ref",
+    "version": "8.0.16",
+    "hash": "sha256-nV9G5UWIh4A/4vsgmARABY9lM2nzpWevsETKuHfhz9o="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
+    "version": "8.0.16",
+    "hash": "sha256-QcnhPjQNVZGAyh5O74sV94u3DHCQDHjg5U2CXrTykw4="
   },
   {
     "pname": "Microsoft.ClearScript.Core",
@@ -104,11 +114,6 @@
     "version": "4.3.0",
     "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
   },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.7.0",
-    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
-  },
   {
     "pname": "Microsoft.Data.Sqlite",
     "version": "8.0.1",
@@ -130,20 +135,25 @@
     "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4="
   },
   {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
+    "pname": "Microsoft.NETCore.App.Host.linux-x64",
+    "version": "8.0.16",
+    "hash": "sha256-j1xxV7RXTrmmqHEaEXtPAz2FQoQiK7RO7a7GRwKCW90="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Ref",
+    "version": "8.0.16",
+    "hash": "sha256-ARNf4NsLtYpChsiMv015znXluW7EDWnnw+32I1lu7zU="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
+    "version": "8.0.16",
+    "hash": "sha256-rDkCCwXkHMDQAQj33BDPitTucHYPx3V85kE9L+CwSRA="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
     "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
-  },
   {
     "pname": "Microsoft.NETCore.Targets",
     "version": "1.1.0",
@@ -174,11 +184,6 @@
     "version": "4.3.0",
     "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
-  {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "5.0.0",
-    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
-  },
   {
     "pname": "MSTest.TestAdapter",
     "version": "2.2.10",
@@ -229,26 +234,11 @@
     "version": "4.3.0",
     "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
   },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
-  },
   {
     "pname": "runtime.any.System.Globalization",
     "version": "4.3.0",
     "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
   },
-  {
-    "pname": "runtime.any.System.Globalization.Calendars",
-    "version": "4.3.0",
-    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
-  },
   {
     "pname": "runtime.any.System.IO",
     "version": "4.3.0",
@@ -259,11 +249,6 @@
     "version": "4.3.0",
     "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
   },
-  {
-    "pname": "runtime.any.System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
-  },
   {
     "pname": "runtime.any.System.Reflection.Primitives",
     "version": "4.3.0",
@@ -279,36 +264,16 @@
     "version": "4.3.0",
     "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
   },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
-  },
   {
     "pname": "runtime.any.System.Text.Encoding",
     "version": "4.3.0",
     "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
   },
-  {
-    "pname": "runtime.any.System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
-  },
   {
     "pname": "runtime.any.System.Threading.Tasks",
     "version": "4.3.0",
     "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
   },
-  {
-    "pname": "runtime.any.System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
-  },
   {
     "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
@@ -329,21 +294,6 @@
     "version": "4.3.0",
     "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
   },
-  {
-    "pname": "runtime.native.System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
-  },
-  {
-    "pname": "runtime.native.System.Net.Http",
-    "version": "4.3.0",
-    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
-  },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
@@ -359,11 +309,6 @@
     "version": "4.3.0",
     "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
   },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
-  },
   {
     "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
@@ -389,36 +334,11 @@
     "version": "4.3.0",
     "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
   },
-  {
-    "pname": "runtime.unix.Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
-  },
-  {
-    "pname": "runtime.unix.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
-  },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
     "version": "4.3.0",
     "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
   },
-  {
-    "pname": "runtime.unix.System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
-  },
   {
     "pname": "runtime.unix.System.Private.Uri",
     "version": "4.3.0",
@@ -454,16 +374,6 @@
     "version": "4.3.0",
     "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
   },
-  {
-    "pname": "System.Buffers",
-    "version": "4.3.0",
-    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.5.1",
-    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
-  },
   {
     "pname": "System.Collections",
     "version": "4.0.11",
@@ -519,21 +429,11 @@
     "version": "4.3.0",
     "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "4.3.0",
-    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
-  },
   {
     "pname": "System.Diagnostics.TextWriterTraceListener",
     "version": "4.3.0",
     "hash": "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU="
   },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
-  },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.3.0",
@@ -574,11 +474,6 @@
     "version": "4.3.0",
     "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
   },
-  {
-    "pname": "System.Globalization.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
-  },
   {
     "pname": "System.IO",
     "version": "4.1.0",
@@ -599,21 +494,11 @@
     "version": "4.3.0",
     "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
     "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
   },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
-  },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
@@ -649,26 +534,11 @@
     "version": "4.5.3",
     "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
-  },
   {
     "pname": "System.Net.Http",
     "version": "4.3.0",
     "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
   },
-  {
-    "pname": "System.Net.NameResolution",
-    "version": "4.3.0",
-    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
-  },
   {
     "pname": "System.Net.Primitives",
     "version": "4.3.0",
@@ -679,11 +549,6 @@
     "version": "4.3.0",
     "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
-  },
   {
     "pname": "System.ObjectModel",
     "version": "4.0.12",
@@ -709,36 +574,6 @@
     "version": "4.3.0",
     "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.3.0",
-    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.3.0",
-    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.3.0",
-    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
-  },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.0.1",
@@ -754,21 +589,11 @@
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
-  },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
@@ -794,16 +619,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.3",
-    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0",
-    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.1.0",
@@ -814,21 +629,11 @@
     "version": "4.3.0",
     "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
-  },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
     "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
@@ -859,41 +664,16 @@
     "version": "4.3.0",
     "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="
   },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "5.0.0",
-    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
-  },
-  {
-    "pname": "System.Security.Claims",
-    "version": "4.3.0",
-    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
-  },
   {
     "pname": "System.Security.Cryptography.Algorithms",
     "version": "4.3.0",
     "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
   },
-  {
-    "pname": "System.Security.Cryptography.Cng",
-    "version": "4.3.0",
-    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
-  },
-  {
-    "pname": "System.Security.Cryptography.Csp",
-    "version": "4.3.0",
-    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
-  },
   {
     "pname": "System.Security.Cryptography.Encoding",
     "version": "4.3.0",
     "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
   },
-  {
-    "pname": "System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
-  },
   {
     "pname": "System.Security.Cryptography.Primitives",
     "version": "4.3.0",
@@ -904,21 +684,6 @@
     "version": "4.3.0",
     "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
   },
-  {
-    "pname": "System.Security.Principal",
-    "version": "4.3.0",
-    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.3.0",
-    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "5.0.0",
-    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
-  },
   {
     "pname": "System.Text.Encoding",
     "version": "4.0.11",
@@ -979,26 +744,6 @@
     "version": "4.3.0",
     "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
-  },
-  {
-    "pname": "System.Threading.ThreadPool",
-    "version": "4.3.0",
-    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
-  },
   {
     "pname": "System.Threading.Timer",
     "version": "4.3.0",
diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix
index 52ee039d8c9a..c29973c50aa1 100644
--- a/pkgs/by-name/gr/grayjay/package.nix
+++ b/pkgs/by-name/gr/grayjay/package.nix
@@ -32,15 +32,16 @@
   libgcc,
   krb5,
   wrapGAppsHook3,
+  _experimental-update-script-combinators,
 }:
 let
-  version = "5";
+  version = "7";
   src = fetchFromGitLab {
     domain = "gitlab.futo.org";
     owner = "videostreaming";
     repo = "Grayjay.Desktop";
     tag = version;
-    hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg=";
+    hash = "sha256-EaAMkYbQwj0IXDraRZHqvdK19SlyKtXfqkIOGzkiY7Q=";
     fetchSubmodules = true;
     fetchLFS = true;
   };
@@ -60,7 +61,7 @@ let
     '';
   };
 in
-buildDotnetModule {
+buildDotnetModule (finalAttrs: {
   pname = "grayjay";
 
   inherit version src frontend;
@@ -113,7 +114,8 @@ buildDotnetModule {
 
   nugetDeps = ./deps.json;
 
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
 
   executables = [ "Grayjay" ];
 
@@ -164,14 +166,17 @@ buildDotnetModule {
     libsecret
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--subpackage"
-      "frontend"
-      "--url"
-      "https://github.com/futo-org/Grayjay.Desktop"
-    ];
-  };
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "frontend"
+        "--url"
+        "https://github.com/futo-org/Grayjay.Desktop"
+      ];
+    })
+    (finalAttrs.passthru.fetch-deps)
+  ];
 
   meta = {
     description = "Cross-platform application to stream and download content from various sources";
@@ -188,4 +193,4 @@ buildDotnetModule {
     platforms = [ "x86_64-linux" ];
     mainProgram = "Grayjay";
   };
-}
+})

From 025a8628bfeb46783d5ac9e588af777e47f058e6 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 11 Mar 2025 23:16:47 +0000
Subject: [PATCH 0846/1497] nixosTests.openssh: Added SFTP testcase

---
 nixos/tests/openssh.nix | 57 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 5f2b3e7969d1..a59f49312c23 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -224,6 +224,32 @@ in
         ];
       };
 
+    server-sftp =
+      { pkgs, ... }:
+      {
+        services.openssh = {
+          enable = true;
+          extraConfig = ''
+            Match Group sftponly
+              ChrootDirectory /srv/sftp
+              ForceCommand internal-sftp
+          '';
+        };
+
+        users.groups = {
+          sftponly = { };
+        };
+        users.users = {
+          alice = {
+            isNormalUser = true;
+            createHome = false;
+            group = "sftponly";
+            shell = "/run/current-system/sw/bin/nologin";
+            openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
+          };
+        };
+      };
+
     client =
       { ... }:
       {
@@ -244,6 +270,7 @@ in
     server_match_rule.wait_for_unit("sshd", timeout=30)
     server_no_openssl.wait_for_unit("sshd", timeout=30)
     server_no_pam.wait_for_unit("sshd", timeout=30)
+    server_sftp.wait_for_unit("sshd", timeout=30)
 
     server_lazy.wait_for_unit("sshd.socket", timeout=30)
     server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30)
@@ -351,6 +378,36 @@ in
             timeout=30
         )
 
+    with subtest("sftp"):
+        server_sftp.succeed(
+          "mkdir -p /srv/sftp/uploads"
+        )
+        server_sftp.succeed(
+          "chown alice:sftponly /srv/sftp/uploads"
+        )
+        server_sftp.succeed(
+          "chmod 0755 /srv/sftp/uploads"
+        )
+
+        client.succeed(
+            "cat ${snakeOilPrivateKey} > privkey.snakeoil"
+        )
+        client.succeed("chmod 600 privkey.snakeoil")
+
+        client.succeed(
+            "echo 'hello-sftp-world' > test-file"
+        )
+        client.succeed(
+            "echo 'put test-file uploads/' > put-batch-file"
+        )
+
+        client.succeed(
+            "sftp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil -b put-batch-file alice@server-sftp",
+            timeout=30
+        )
+
+        server_sftp.wait_for_file("/srv/sftp/uploads/test-file")
+
     # None of the per-connection units should have failed.
     server_lazy.fail("systemctl is-failed 'sshd@*.service'")
   '';

From 9b9b529bfa166922a672c7c13ffe872475d90ed1 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Tue, 3 Jun 2025 17:05:44 +0200
Subject: [PATCH 0847/1497] matrix-synapse: 1.130.0 -> 1.131.0

Relase notes: https://github.com/element-hq/synapse/releases/tag/v1.131.0
Full changelog: https://github.com/element-hq/synapse/compare/v1.130.0...v1.131.0
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index e61711ebe1f0..ab54f87cef24 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.130.0";
+  version = "1.131.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k=";
+    hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
+    hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
   };
 
   postPatch = ''

From 9f4e4bf579b0abc884dc6dcd7ac2ee0faa937741 Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Tue, 3 Jun 2025 15:11:42 +0300
Subject: [PATCH 0848/1497] hqplayer-desktop: 5.8.2-25 -> 5.13.0-35

---
 pkgs/applications/audio/hqplayer-desktop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix
index 8dd61ab808f4..36fc6235dad5 100644
--- a/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/pkgs/applications/audio/hqplayer-desktop/default.nix
@@ -22,15 +22,15 @@
 }:
 
 let
-  version = "5.8.2-25";
+  version = "5.13.0-35";
   srcs = {
     aarch64-linux = fetchurl {
       url = "https://signalyst.com/bins/bookworm/hqplayer5desktop_${version}_arm64.deb";
-      hash = "sha256-t3aiEkxl5fP5yup2l/iuLqZhltIjo4Ahe8EUg52lOLQ=";
+      hash = "sha256-ofS+EDNHKv94GSi9DrZPUhosAZsjSuP8rQghldKZmkU=";
     };
     x86_64-linux = fetchurl {
       url = "https://signalyst.com/bins/noble/hqplayer5desktop_${version}_amd64.deb";
-      hash = "sha256-kDNVR8HkMogbdk5+eRszpyLeuE+vO3ynDS+TmCWYZ2Y=";
+      hash = "sha256-ej4H7SuDMkihlJsHcvPIFSGghyqCvVY/7LbCdq6lky4=";
     };
   };
 in

From c22c4b0dd830a92217d5159d3b8d07f86090e47d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 3 Jun 2025 15:59:53 +0000
Subject: [PATCH 0849/1497] xfce.xfce4-windowck-plugin: 0.6.0 -> 0.6.1

https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/compare/xfce4-windowck-plugin-0.6.0...xfce4-windowck-plugin-0.6.1
---
 .../xfce/panel-plugins/xfce4-windowck-plugin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
index 409f196e9b34..638db060387b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-windowck-plugin";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "mirror://xfce/src/panel-plugins/xfce4-windowck-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-windowck-plugin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-dJeSszth86ICe2VHBW5JOYqNajPgeg66hYOvnF9hdj8=";
+    hash = "sha256-Ay4wXXTxe9ZbKL0mDPGS/PiqDfM9EWCH5IX9E2i3zzk=";
   };
 
   strictDeps = true;

From b248d347c5ef333efb1447061a50a826e8c43e5b Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Sun, 1 Jun 2025 17:12:00 +0200
Subject: [PATCH 0850/1497] buffer: 0.9.10 -> 0.10.0

---
 pkgs/by-name/bu/buffer/package.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix
index c3c04a12a985..6dd991fa261b 100644
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
+  cargo,
   desktop-file-utils,
   fetchFromGitLab,
-  gobject-introspection,
   gtk4,
   gtksourceview5,
   libadwaita,
@@ -10,29 +10,37 @@
   meson,
   ninja,
   pkg-config,
-  python3,
+  rustPlatform,
+  rustc,
   stdenv,
   wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffer";
-  version = "0.9.10";
+  version = "0.10.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "cheywood";
     repo = "buffer";
     tag = finalAttrs.version;
-    hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g=";
+    hash = "sha256-81riamRKzV4wXVTXkp1ngO/5mG7leRJMw/r2DDHl8LU=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src pname version;
+    hash = "sha256-fwXeXaoC/Uh9eMEkRjhpAouxOrlRWX2n2r4pgIe83S0=";
   };
 
   nativeBuildInputs = [
+    cargo
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
     pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
     wrapGAppsHook4
   ];
 
@@ -41,19 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
     libadwaita
     libspelling
-    (python3.withPackages (
-      ps: with ps; [
-        pygobject3
-      ]
-    ))
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix PYTHONPATH : "$out/${python3.sitePackages}"
-    )
-  '';
-
   meta = {
     description = "Minimal editing space for all those things that don't need keeping";
     homepage = "https://gitlab.gnome.org/cheywood/buffer";

From adad603923fe4c9f9ea6ac9e454005cc2958a113 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Tue, 3 Jun 2025 18:20:31 +0200
Subject: [PATCH 0851/1497] ungoogled-chromium: 137.0.7151.55-1 ->
 137.0.7151.68-1

https://chromereleases.googleblog.com/2025/06/stable-channel-update-for-desktop.html

This update includes 3 security fixes. Google is aware that an exploit
for CVE-2025-5419 exists in the wild.

CVEs:
CVE-2025-5419 CVE-2025-5068
---
 .../networking/browsers/chromium/info.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 5a20483448ed..d5dad782046f 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -797,7 +797,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "137.0.7151.55",
+    "version": "137.0.7151.68",
     "deps": {
       "depot_tools": {
         "rev": "1fcc527019d786502b02f71b8b764ee674a40953",
@@ -808,16 +808,16 @@
         "hash": "sha256-+nKP2hBUKIqdNfDz1vGggXSdCuttOt0GwyGUQ3Z1ZHI="
       },
       "ungoogled-patches": {
-        "rev": "137.0.7151.55-1",
-        "hash": "sha256-m8un3k5gz8nqQIvulvV2yhY/TQZ7wcp1zwQmtqjbCEw="
+        "rev": "137.0.7151.68-1",
+        "hash": "sha256-oPYNvnBuBKBb1SRNQkQeApmPVDoV+bFVjCh9HKa4A8o="
       },
       "npmHash": "sha256-I6MsfAhrLRmgiRJ13LSejfy2N63C3Oug5tOOXA622j4="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "254bc711794d7ad269495f3d419a209935b78cad",
-        "hash": "sha256-dB81lgjgVK0qXWgAddB7G4L7rsJpZp+0VsjDKvGugEs=",
+        "rev": "2989ffee9373ea8b8623bd98b3cb350a8e95cadc",
+        "hash": "sha256-lPmmXVCNUa9of8d52hUejImPSEfOz7v7PlovZS4cfIE=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1037,8 +1037,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "a54ed1df191a9e2aff2e9ef453ee6fdc959dd125",
-        "hash": "sha256-E6sx2ioDZRWJljbS17ztRwz+gsDhIHiluvkUx1rRZcw="
+        "rev": "fdc8ca697612f90e7ddf2621dffbc43733d2d238",
+        "hash": "sha256-jKYldgZJwJeTQavmcM9enTdGN8+zt/EG7K1E9wQYIBA="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1587,8 +1587,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "44fdd9108308773dd3f4fa040de5f4f75edf671f",
-        "hash": "sha256-BkLOmb97p2NcAIuQiDjIoVAe49h9iv79rC5G8wyD1as="
+        "rev": "e398f9bf6d5c8a768ab736f46146d7349cf31547",
+        "hash": "sha256-cJx8IgUB3UA3jEPvb5aDvHLYmAnHydK1qR11q6Y5PnA="
       }
     }
   }

From d6843fce63831d50fc12ea711dc631cf5d3d1f91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 16:32:34 +0000
Subject: [PATCH 0852/1497] mold: 2.39.1 -> 2.40.0

---
 pkgs/by-name/mo/mold/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix
index 07161835189e..55e8c6f8a052 100644
--- a/pkgs/by-name/mo/mold/package.nix
+++ b/pkgs/by-name/mo/mold/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mold";
-  version = "2.39.1";
+  version = "2.40.0";
 
   src = fetchFromGitHub {
     owner = "rui314";
     repo = "mold";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uC6oakFfF0tpSiBeps5IO41Khk7VyCMSZhVh2Gmwlyc=";
+    hash = "sha256-8EqAgdlvg7BSCTmMubqbq2t77xGcUI2RWEw2iuK5UXo=";
   };
 
   nativeBuildInputs = [

From 91129dac068ebdf5afda91c3760fe2f9f7d8c2e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 16:34:34 +0000
Subject: [PATCH 0853/1497] libretro.swanstation: 0-unstable-2025-01-17 ->
 0-unstable-2025-05-26

---
 pkgs/applications/emulators/libretro/cores/swanstation.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix
index 3e8041379e41..47d74a9bed5c 100644
--- a/pkgs/applications/emulators/libretro/cores/swanstation.nix
+++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "swanstation";
-  version = "0-unstable-2025-01-17";
+  version = "0-unstable-2025-05-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "swanstation";
-    rev = "10af0c78ba0e3516e70f4ed7c6020827bdb2647e";
-    hash = "sha256-xxyWvsDF3FXTaP7GOGr9Zym0DgNZKJ4x9BDUgDzcHYA=";
+    rev = "05cee5f56c37eaa3a243e0906d2082b025598056";
+    hash = "sha256-Cwf6hZKl+rE00C0rFq7VhTj3qG4rszQ+8qZQMZ+H7e8=";
   };
 
   extraNativeBuildInputs = [ cmake ];

From 7ba5f4e34a450c8819aae1a337ce04105a7e5260 Mon Sep 17 00:00:00 2001
From: Michael Evans <michaelgrahamevans@gmail.com>
Date: Tue, 3 Jun 2025 18:41:36 +0200
Subject: [PATCH 0854/1497] exercise-timer: 1.8.1 -> 1.8.4

---
 pkgs/by-name/ex/exercise-timer/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix
index e13af3153f58..13b3b1baf32b 100644
--- a/pkgs/by-name/ex/exercise-timer/package.nix
+++ b/pkgs/by-name/ex/exercise-timer/package.nix
@@ -20,18 +20,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exercise-timer";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "mfep";
     repo = "exercise-timer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY=";
+    hash = "sha256-KiKTZUlcgQcVJwjCZRi1spjJjAT/aH0PUOB+Qt1jKTc=";
+    fetchLFS = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-fmY89VGv9tSMaILFnAVTAyp9PWGsvSCZ/9DfF5LI3xM=";
+    hash = "sha256-Z02tnOavpfv+dNk9p1h/+A0TlBtB0BVxLsEKvhFpkbc=";
   };
 
   nativeBuildInputs = [

From c532ad970597a24356bcbeb9cc08873a79efecac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 16:41:50 +0000
Subject: [PATCH 0855/1497] python3Packages.asf-search: 8.2.3 -> 8.3.4

---
 pkgs/development/python-modules/asf-search/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix
index e7428da5d02d..65cd8a9c255a 100644
--- a/pkgs/development/python-modules/asf-search/default.nix
+++ b/pkgs/development/python-modules/asf-search/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "asf-search";
-  version = "8.2.3";
+  version = "8.3.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "asfadmin";
     repo = "Discovery-asf_search";
     tag = "v${version}";
-    hash = "sha256-K1aGkI5lBw2HmLAeCNqcpgsDG/fAoi7l1RTBxziJBL8=";
+    hash = "sha256-MzHE3PNoV8SCGaajeSqdHaJwk7BuNiaP77YHo9soQO8=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From f57d039efab4b5bd1fccb91501340536fe810319 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 16:55:18 +0000
Subject: [PATCH 0856/1497] talosctl: 1.10.2 -> 1.10.3

---
 pkgs/by-name/ta/talosctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix
index 3636cf56306f..213c188b8e2d 100644
--- a/pkgs/by-name/ta/talosctl/package.nix
+++ b/pkgs/by-name/ta/talosctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${version}";
-    hash = "sha256-8qruYf59oFvLO892T89GbayTpq9V1J+Tu08jgIaod18=";
+    hash = "sha256-smqQBFm33uTgK4RGtiu9wlgbHkt8jw7zeiVGWsHG/8s=";
   };
 
-  vendorHash = "sha256-sRa8P6vGjXg3fL4f3CFjtaTvESP8DPd7/E98Z+7i0mw=";
+  vendorHash = "sha256-fDKCozvQ1dPM0DFS7DysZ1DHryj3se1bmaLb+3B0kxo=";
 
   ldflags = [
     "-s"

From b168f6ad5d46d1c39ea8b34ef80d4ac72a9f58ab Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 3 Jun 2025 09:48:45 -0700
Subject: [PATCH 0857/1497] python3Packages.anthropic: 0.51.0 -> 0.52.2

changelog: https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.52.2

diff: https://github.com/anthropics/anthropic-sdk-python/compare/v0.51.0...v0.52.2
---
 pkgs/development/python-modules/anthropic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index 2bbe891870ef..de7f25e359e7 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.51.0";
+  version = "0.52.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     tag = "v${version}";
-    hash = "sha256-gD3qZpPKtKZtuoGqnKVgFp0gCxpL0Aq5NGFCMk+z3cQ=";
+    hash = "sha256-vCIS2NDsScKESfYFHDTSRLb9ZhUsrEPHyfuubrbc+44=";
   };
 
   postPatch = ''

From e6254ef6863cff8de07aebb1538a4bd62e0f6801 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:02:02 +0200
Subject: [PATCH 0858/1497] _1oom: fix update script

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 2dfd5476c152..0e5740abc2f5 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
       HACKING NEWS PHILOSOPHY README.md doc/*.txt
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "f"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = with lib; {
     homepage = "https://github.com/1oom-fork/1oom";

From c2149ed037468a49e2a6ff0fc88d0258c1b6bc92 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:04:00 +0200
Subject: [PATCH 0859/1497] _1oom: 1.11.2 -> 1.11.6

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 0e5740abc2f5..360a4d720bb4 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "1oom";
-  version = "1.11.2";
+  version = "1.11.6";
 
   src = fetchFromGitHub {
     owner = "1oom-fork";
     repo = "1oom";
     tag = "v${version}";
-    hash = "sha256-xvVl/XzOnItIvW0T3RpQ4tswqANHGWFvwnoY0+uHhx8=";
+    hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 6451c665db7c9ab5512a50c40229a124abf0eb19 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:04:12 +0000
Subject: [PATCH 0860/1497] firefox-devedition-unwrapped: 140.0b3 -> 140.0b4

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index b8b4443fe0ef..cd1f7f72219f 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "140.0b3";
+  version = "140.0b4";
   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 = "f7e2382ba9ad9a6fbea4a99ab541a4b70dcc4dd78d52230f5e600e9812eb796c890d424805b9c4d2ad7c981e3e509d654e9ae4e4c79c6a50880388e1b4c83bbe";
+    sha512 = "bc71e5183b7f527f006b82ba729cb9556a0c756059025392d31ace1e3e49c0a48f5f7c8b64615353c7ae72ab67eb77212f3b573ea06a278f806328093d1424a4";
   };
 
   meta = {

From 2393f60be3160d761e1702ab281ef0fbf7d89160 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:04:35 +0000
Subject: [PATCH 0861/1497] firefox-beta-unwrapped: 140.0b3 -> 140.0b4

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 3dd7f5a0cceb..6133d8c87ebf 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = pname;
-  version = "140.0b3";
+  version = "140.0b4";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "282b30284e9efa3909e1c1e8b01fd3c8ce5083668a01dea53487aa00d89734889e033051de3ce9aa66d7a84f4d4ac1c6e558fa4e3efe1e51077fc0831e989129";
+    sha512 = "ec3d3377db8629742d428cceded3c7c92ba952f1b9cb6a15eae7f053213c3a377287a577c33b291a5e4d3cbbf918be52a31c3f4ac5f6d06c1f5edfc6312656fe";
   };
 
   meta = {

From 96605eadcd28496a9af76a5a290826293b0afb1f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:05:11 +0000
Subject: [PATCH 0862/1497] firefox-devedition-bin-unwrapped: 140.0b3 ->
 140.0b4

---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index 784facf25911..f67bffe378d7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b3";
+  version = "140.0b4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "bb3f74c91d3b6e87f8446317f52676c307d2ae6fe4b28e0ce0a736460a12b316";
+      sha256 = "ed1554afe2f6f16e43600abc464a5093f9668cbe2c2f9ff2c2a5c7751924dfcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "3c742108cc29a6d065b8296b4d9a71470703e88a62a611366448390868dbf77d";
+      sha256 = "2c42439d6d8aebb5e9cd5a7a662d181fa421a6baca7288492bf22f1f919001f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "6bf6ded7f7d9dfc3e01c02155f1b6e49ca6a1bcb4742ac99b533f0c050c4813f";
+      sha256 = "413ccf730b5429950731693c968f1839c9c84772c62e2d06c9e93e1724015230";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "29df6cebc687ed6b776b715d315b11c00f551c62641b6d55e080ee2d2ad21eb6";
+      sha256 = "f99f746fb9d1996cc2aec0881c78d01d871d5c0feae57ac07f2a81cf4b295247";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "7b54f6306df1d779f7c692c4cbf1060cc0f443c9234d0aecb09e1bc78e1de22c";
+      sha256 = "becb101ca6fbcf2452ff5d025524b465815ebebb3507f3f2f24c42ef1e2cd2cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "45e2236c7e83eda417a0245f80601eaf087e8f310ba676761a8ed288faa46fbc";
+      sha256 = "1c8ce7b3c1a3d0fe79f2039d0386cc8bfb36583331db2e76d4fef0e36fe3dd01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7e46760ae218ca80e46c522a434ddc271032f0b889b13dd4073b5d93fbba5f6c";
+      sha256 = "0e24d3516d2a464e9bbf4b575c8f3ab54c724102c89d19890c3a629e3d53d4aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d11e32569be7aeafba8311125bb3e780d368884da19aaf361f96715598e50af3";
+      sha256 = "d7184793c5aaf2d53a15de10f97a3f74a04f47a17a4864a3ab0fdd082d14c8ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "f307138cb195a25fccfad8690cd9df89ed8628e9b231fa2b21dd1a656d74e5a4";
+      sha256 = "5b29c8c9dea8541a00c94b35af1b05681b3f7e5533f50724bbcdfad23fe4b374";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "5b4c27e5808a1d19b510d5a931717ac55293a6cc02252f4c270bc0777e64595f";
+      sha256 = "90e8da40dc2fad16a3fcee7fd04e7d8b9507dd0bbeb343f1feb5cead4351a53f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "8ca82eddb17ecb7a541164be9a734b54f44e6feeea1e3462aa20fffee1467af5";
+      sha256 = "a2aca9afe6c3bc00d0f3c885a29d4ad6537a5a9f9e34bec196592c8c18d7fd09";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "8e0e1e0f6aa9c491c6c25bb4d8e6c854f586a3a9a0440543cadfcb09143d1086";
+      sha256 = "5d4bc97a8726f34b93d1c066e7417904be8017e209a912eb08116d97a21d4350";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "101b5dc2694ce773c9d628706645bc27cf608345a1b8bf3894353764c1a13864";
+      sha256 = "2a33c442ae382b834a78ee4358f0771bb6edd5c6382ec9f298861a2eca11b79e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "028afcc9ed2a40bf4535ee2bf331b36574dc159409b32b412748b2157bc2aced";
+      sha256 = "e0d45404dee8ee5bdf301fbafd876d6a20597d0bf52a7765aaa5069115825f3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "730515c63ad7fbd3543dcfae768a2495ada40402d78c44c3463965af3878a01f";
+      sha256 = "892e04a3707da1bcf31d1b7ebf3ca896e4eb28e833fde42c0c86d1d6bc4f7ad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "fb73eaa612722e786bdcaf323bf6aff9103e0456b6f8287405d6ebb5f92d5fdb";
+      sha256 = "51251020df6ef2436f91994c7bd6760bc27ce79f24f4044dc27ea35a827508df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "3e8c814920f3877ec2f64fb717485c00afa09c9643b9db8a5607aa8d1e8c5838";
+      sha256 = "d0a7f95babaf32f19267f36a1553159a340187deb131a8c68c6807e15afeca32";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "2f2dd73b28f425a3754cbb684c16ba1a9c60b30381bf4736d2bf7ef7fc37d445";
+      sha256 = "df0c0ab4772c2004be8fb9f1db5ca8d00ed2ef4217c60138db991c2b5dbbe439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "2825a53c1b516060f4bcb833576fe1f76ad33000508ff32a87e7c00848f75d92";
+      sha256 = "af4a92e19e01ab664e26b7c59fe34a230f4dd3bfcc4bca59d1d71a46936d7800";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2afe5eb918e04946370312bca943c95dc61e325bc377b1505d187e08e0c93dce";
+      sha256 = "ece534644114af64ee062608aeb0d04c7fedacde76c80ace8931692a89213015";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "119a7459fca0b0b7c628bc92768094a4a3fb3b178d22e68e85b976c69b55b766";
+      sha256 = "494aa1d40b6faa19bf16be5f75a8eaec0b6903e22a3b85bf6db969815c67e744";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "b0d8aff50786434a3b6b80edff341d41d9ed818304d751edd7c7d53170648260";
+      sha256 = "8cb6a84fb9fcc27115de62396eff3a24de1b4eb87fdbba649536d4a877bb9e90";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "8f54302d625b89f1db74c8f3d5025ffe8971e3a43b39a3cecd7c32c37f3b4725";
+      sha256 = "4e7af27ab23d6b5da4cef54989c510612f55ec058f53106b1f51152b25db4d9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "4529ff104a621c97840449faab5b03fb8f3916997423ee63db602225c8372ec9";
+      sha256 = "fd5a6ab7fc1748b1444f655ceafe5fb83441baa6ad70b10aed44a2e973dc7f33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9a0e3cd09ad714af64d65afae373ef239f9c4c469d6293d3c57d8abfb1b3027c";
+      sha256 = "16a4e466fc24c65736ebbf83ac2cba1fdc0f74ca28a10faf0c5748776bf0c1f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "03c07d9194c3ee8fe333277c6db6aedbb31a5fe7de6fc220ef874ca01ccc38fc";
+      sha256 = "9750c945c67f351ac9a8d5be40cefee79f4dd6974cfdcd5f1f7162da8d2466f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "8f78062de562b3ad21380d2f83025d9becdeb690067e349e2f4a8d91444c929e";
+      sha256 = "f174e7a9ad5d95dabede5e2339b1750c6f85e2bb0d1f8dc654d242ba00b39c00";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "fadb26f00d4242ab739c7a7882694334334f2f302daafd6cc27f1501cacc7b09";
+      sha256 = "b9257a36159ad9e65fde2e5580efafa722600d6a27ac2996fbba49fb2fbe0c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a7914688687d6af80ace9d06f25c94c61de73b2503cc159218d7aaf72e32d033";
+      sha256 = "d1c583e56238a293e1fbe9eebfb6cbdc33eafec1c5286ff5765debd2f68b0ce4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "c6f2b792311d762f65705850224ed4c602506d015e09f8a7111600228f9d1b62";
+      sha256 = "def0cd7abfc22a6f60927bd232ac93d504ddb26e3e4983d9708e31b7341db75a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "03ea78dba2c87986d50969b290efad780cda9489446f85ac1ba2bb0ad6296288";
+      sha256 = "44e74ebd3258cc16be4e2d9f6718b08e7e6c60f0239f990006727c42662d925f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "ea9c38f732307ad4754efe2c226339f89c0c6b5769e5fc268a72ffae7cde9ac7";
+      sha256 = "bde7c76e9728ba604b297d6924034983f7846077daba3fa959710bbd18f3e525";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "c531eb2057c40f2d455f14436e6cf16a034cf49a1b4b90c5faba395914c03128";
+      sha256 = "e71fe4950ab0395cadce49dc7774940ff126476004155270de788660963af6d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "4708706d7c14f88d3817396b707efbb6d2f1e89a86a883ee4696f1cbbefdb16d";
+      sha256 = "73d3bcd3efa9828c4c46dab307ea2fb7478700a8a4746aa81d35e31d969756ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "839db9631d3c62afb20e01021f6b40a0e363a0769b3aaa8ada93a54a6e7eeb59";
+      sha256 = "e81e8ad39b55548bc88666bb7adc03ce18fc5ba57d31c0d94c90202897e29cc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "da0eaeba745c98c328dfdffbbcdb736592e2d954cdb4fdd7cfb118022cf41589";
+      sha256 = "c064a6fdb1b474f9cce223691e216a9a232041326b1ef1dc47175c406e7619b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "f6450fe5f26a8982d203f40ede0c4078616aa64b4e38cdc3469d0761c66b6a42";
+      sha256 = "09fd356ab21d082b7b2ca96ac05bbc8691e0b833a96cd20e01058228506fba7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f8ed572d188f31f3eed7611e066d5cc69cc3bedb7343f363636d69de90d7232d";
+      sha256 = "2c2128f710ef3ff6d462c9420d1e0080a280fbe74279b99fd48f90b607b43dce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "c6b70f14ef92d23bb6cebbf5dcaf02109de4c394aa1cafc31e40debbcbb1bff5";
+      sha256 = "8bd114ad5da25dbd4672519939d39e1b865abcdb64d672f51a66b7ffbdadb68d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "8dd15122d585c9fdf62e8e621f57aa23a836735c2d9c4fb9fafae0b70f6df657";
+      sha256 = "8af55045fcf0f4f28f1ce09e5a540c6a28ac2f7040a0f41599298fdbc898a750";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "601ac9297c27b22c4cd98418dda1c74aeddf053370e23b81350f36a0b205f0e2";
+      sha256 = "a05701804e12296468c1c5b0f41352117c3564e81987d9f085a1a5aa21ff8345";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e824e40a538a6a0edde1829356553068adc5e45ca374ac85872f08db0e6486c2";
+      sha256 = "569bfc9273743adf40a346f9d921ea9828e1356d384969287dca95d4f008d7a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "d6702ab83ff039ebb36fe821f2d709db2931ac4eb548962b040efc198e259733";
+      sha256 = "07b8ba1226e79cc94cd081d7a845b9d2f19960cd622cb1b09f7e03bd2ae07bf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "7bfca4956e083d6f38d3933ab86a10148e0cc03778c3b2f6c9e3d61612a99b1c";
+      sha256 = "212bdc93f22821083001f8e605fcc3bb898a2af5aa03adcfe5361f72461142c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "eba453fc2a0e9aec31ba386075e7f7cf242f4fb2833405c8afe698541d636b4d";
+      sha256 = "7d4ea28a2c6adaf9e71f4694d35f7aece693b6f4e3634ce21df45e7c0c0145dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "f9fac27391f5153cb58d346b82bc4573fd57d5c7ed07e7b72c6a11e7acfc2ac8";
+      sha256 = "9165f21b67d2714d2704f23c93026c1ceecca3db09faaec9782640fef16cbc0b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1ffeb772517aa1e6f9e6f08d555af0971c4b9fcf3cb8bfc5bebaf29a338cda4e";
+      sha256 = "ce04cecbfcac04037bce64d5cd06995416cbfd4232dae04515fd0edf8a1fb6eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "1aa3caf5120a9820b9edcacb6298c878581caf93b302ac4220e4728ede2ccf8d";
+      sha256 = "241daa6215d95180879c077a94733058d804e9b08aa285f50a07362e95955fce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "2980f208cf2aa93820ae71ac0b2e6fdde04f1415696d3f567df0493a24808450";
+      sha256 = "563114161ebad123b8c98d53fd45dc4f42a36c43699b476039fc136503f4a3d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "183bb6118e8662225778d20e17913afa0879940a5999a0460bf9ba9ae68d5f2b";
+      sha256 = "aceeaea1d110c7404eb6514dc2c0bb498cfc0f7dc01fe49b3b28362672adacb9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "f416fe140d45ed47aa0c02360293d523aafb1492807685b3cc2dc4bc09420272";
+      sha256 = "9f723893095f114ad85e1efeb8241018e77fe2c67c130d7c1e3528347d83e7df";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "b6a34c1e539480a7b8ca0c4bd090860b5015a34640682b160a39d69cdb5673c3";
+      sha256 = "3e4c5d1b66bf80cf6c60c30394852c4413157bfe00c04648dabec7d461d83685";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "793231033ad0ad9fcce4e8aa4ee879cc17633141e1c20a1fe90882206725df95";
+      sha256 = "39c96201f2965d1c4e04bb7e10b380d2fba4466545c6f7ed6065466edeb796cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "087e30c622398a27a3e347f9f459e6848c20f2597cfa4c4c98c8fec80693f656";
+      sha256 = "785ed68e6de6fe0c683b424aa985649e0057bcceb3fff29389df590662019b6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "52b8b0c10f32c536812c0cf845c41d7c95c4b8c8f9d9a3dede5d825f1ec8c0f1";
+      sha256 = "ed6314351021e49aa00ea3121545d17b884d0a016b210e80ae4a0426ff5089f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "4e7fcf965198dd9baee10c5b63dcea3216d1a2b83c020983dae93cdf5ced4d0b";
+      sha256 = "03af2b330ca148cd24a5155fbc31f331b4cc849dc65fc92aa566652a692118ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "a89e05fc8332f57dbf410ba11decf426bf10f3b71e1163956f7f7c404da51d6d";
+      sha256 = "5af858ea0c84882e6f432ce0cb49b890dd9dbfc77f7f0a1df3e9dceb2a055857";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "4ca7970f60c7a95fd5c58f53cf68906034ef1ca262927eb73cb1cb0d216500fb";
+      sha256 = "e05d5fbf17993d217ee9c87935181540b1fb3fae861e9c9432c677a144d6d5a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "748419cd7a0dd5581c7d47834eac40137230b2f463fda146719101f01c664336";
+      sha256 = "ff343e1471223c89b91b7dd5ec432517907cc3e2f7abfb4652a3fcb6c327ff39";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "0bbb8a4755356624b4aa9eedf6c483ff6dac7117ad1eceeac01a85960c9b8f02";
+      sha256 = "7b200ec16524ca006ecbe4a9110a1c18d7d795e71be1f46d402f494de194c3f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "391c3656a3656666d85f84b2130ec5946bea5b70e409bf500ded2f375944a683";
+      sha256 = "ec4214a35bfa6fadef80a22a68f74bfa493d98f2a1c9ac56d795ddab892e1154";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "07dd87129e2c65cc05f8c300b4e2d9ad23f6dc3e3a9f7cc0b7851b4cfbf23808";
+      sha256 = "12224a1d1326bb76fccecdc44ef10b943a348c5db0b0986fe1f973a515496c23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "143796cc2bbc47cd13ca690b3c3538f0699a677d9019bb05d613543fb8d5723f";
+      sha256 = "8caa52f7d7eba810af4ee5fe666a0f8b42f06178a048b9c3df552d60de229512";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f6af941b3f4acfb38e6ada2fe3f79ec1c8870c70420ad3e1ef21247fa4970225";
+      sha256 = "2ec5bd3d8077427e6f897f24a65dd0795106b41c53f869e198c473d80f9a1187";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "cbe571d5680cc82942da8c7271c2a3432198664338680ae39d436823f526bd55";
+      sha256 = "43e005ebbc0e36c28beeb7459e4332f258a5ed4c7782ac1edfe9e667f0f27320";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "279bc36eb72990932f211ea33903708d883481df7167a84b87e8f2c6153f575b";
+      sha256 = "22e97b6b60c15ebd0aecd0d4c4add317cc33f60a05cbfcb7e2cbbf415b740fca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "311345680b6d327992c6e18c26e6d38dffc07b85194c8a7d3b9b2fc49989c755";
+      sha256 = "1e16445ab882842732731a9c03d68a6c1f2141ee2a78a00d2cec4d8310361657";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8c67cfc7478113cd961771ef3c0d2be125c64f002dc10458bef7f17d83543fee";
+      sha256 = "da05f794f09e9c91b7b0abb0d446ff0d93d4e21ec9519464a29d39d8025e9144";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2831b4d2d63a1e3029bc8a29b4cf35b011a43ee46b2d2ab8ab50abbc16d95d82";
+      sha256 = "2d1b1f7ef8610cc251c1555218babc2d93e8189088dc00fd5c64d76e5d1b1524";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "79cdcdad5622b3a3ac4742b8021146554e7f6a6f1cd86a6c48b7e9505f85e0dc";
+      sha256 = "89ea5fa03cc3ad404bdcf4a8586daa44a9de04552be5618f5fca1cd033572832";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "a21f05f7753ca70cd08d60ebad30cdeb32e64e135a401072f415fd76599e9606";
+      sha256 = "4722a3918593e032bd846f1ffd00e432014e84afc4f65b84d40b6345972456d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "eeebfc01a29a2bd07adc10f4921adc892e558b1704cc4d8f0d739ebb715ad90f";
+      sha256 = "5dc3a51b9d3b63be9c55ee7fa3e6bc489fec279c1cdda3fb7a905d2b892bc236";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "a90b73e1e8857201a633d70e520796b6db1f52f6ef5e59cbd76b39d491a02179";
+      sha256 = "47c5182687c634fe5d71bd4e4de4fa564fb1c5e11cdc1e1909c61ef4887ae64e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "f4bb8f65e03fedb3b17771d55c4c0906e2902f1dfa6a93d8d0c7a7f2a32990a8";
+      sha256 = "ac74c82c721cd6690cbc5d684b684f9b8856ee369f6336a582a7afaa70796ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "3b0e0ccea7d9cef4a3fe1daff20d1e3902b9efeb08c8a9aa406ca2be2602de48";
+      sha256 = "c0b3597bdb10e90649b0d4d7f7021fae07540f59b8ff001c37e3384ca191a290";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2571da74920d477bf003120dc5a654544037374d0373697417433f6caf82ded5";
+      sha256 = "bbf4412b492a5aa9c69a24e98549cf58715174dc7a5332ad68e7057096c57712";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "030badf2ca2e23a9a475c1327c50547c7284eef1597a615caa8409c492b66bc8";
+      sha256 = "a9760586112083eb36a80ad983ba2b2871d9388567de54786a074639ad1e60d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "85c67e09291d12003e6460059537e24d037a955e9f3a747b1adddcce9826d2dc";
+      sha256 = "66207f430c6ca2ec178d749c1a73950b13d4532f455303689cb6f333dd42d534";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "ef28329016e4f2cb0ada2aa55e915bc1bf5b4be18c837fb7cdf029e445fff7f6";
+      sha256 = "39a81cdcab313029ef8517a8c5ba99ee00bad85eb0d8bcb4e474e978bec531b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "d033ac9b10892677a03d6988c2eeb0812da47dab91b82f4c6b4a47748fe9078a";
+      sha256 = "dc12f5de8d130e29ed6afdd973999f02d64a7e24a0319b4315dacd284411cbb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "a44e640322041416b8f74ecf4b775bd83e420d27b42bc7c601a3e8388935106d";
+      sha256 = "882a0fe884852ae0674e504385801f5d37bc385f750cba7a657cce3b5208b915";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "05607a7cc2d353b5b2a2dd969fce56a4665d1096b9f1e9210618a071be495a23";
+      sha256 = "ea153b3fc99a99391cefd60bd1ad85c7f20d8ab75c8ede046400ba11cc84270a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "26e27c88122c2f5ea3f6ade3c6dcfb8f2c9b24f9a81a5ec5df4b02efb07a1553";
+      sha256 = "8bf2a2bd7162e0d77975ca84e90a11e5e3a3768dc6f2aa514ae337c6297234e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3797ca5f36bda1fa5a44da7dd5dd44d8a139cdedf2a7d29477450a54d0e8a47b";
+      sha256 = "e84d6fc022ba4073b8fe718b97bd24f2a4607aa2373bfed8d5e3342392378d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d8bcb22d5e108eafb114e8c1ad2b7e00817227a9ad012132a2cdc04628e1fbcb";
+      sha256 = "288cab80c8fc5f4d86c11e3a2eb7b709c7c83b1a9bb0af6277270e5de2c1a3a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "331c9cc72370af2514dfa9ad7596cedadcaa868d9536d4946812cdbf4c492d91";
+      sha256 = "01ac1ac79660e7881254e734b5fdd27bca4d5e4ca59edb9596f7e06351d70ac6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f05ef459482485ab76693e9cdec8d5c0a5e97f3185f103801c3041e8719a17bc";
+      sha256 = "fb3785faf424ced77ad426ca57af0f3e012a95369b1d21c2e45a0ee20b141513";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "c564461b75d461ebd1cec29ef55fb9afbe6477032027e6c42696d7174c5a7508";
+      sha256 = "fdd59c366029567c7304766df55c1b26cf343ea894ce860c09c9b6fc7de2d329";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "d54288f9a2da27cb4d384ff8375608ba4fe367c98870cc5ce3f9df910178d8ed";
+      sha256 = "a134efee05e83eab94598023c344f8a5d1689577e3a502394207404c31f9e617";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "caf68d1283bc14b907b77cc8a25d84188209401ab723f37dcec1a0f05812d140";
+      sha256 = "d9435ca50da4cccea83236810861f171b82c226e309cfcdc4bc482cc7700824f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "bf49e26c1082e3413fae86190646f46d66db7d39d93e9a3685812d526e136ff4";
+      sha256 = "c39704e465a36dca6aab92f286212be3bf19d3bb13ffd9beb116c082a93d5b5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "970548c941dbee501ccafd78d8634a0e1a542fd9af2bad3ae114bf91d7bea2cf";
+      sha256 = "8f7399c91dace4831a8ee9e8577cc1c5a4f6adf03dca99727b4a02dd75e3fd44";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "a45a478b45c9843a9132ae8a302a196936ca976f4266da357c3c4577f7235d22";
+      sha256 = "0272f94a2af35c3b1c119f840f773048172216512d413fc96bac3000d700af47";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "82f642d104b0c23499d0052caf2266fba054d29f69623d21a6bf8ec8884f8435";
+      sha256 = "651df98e8048a27031bd7a3e2fc831f730a096b353c8ee4bc122dbb2efa9f9b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "bb413e267dfe2a90ab6ac139cbf277a0a02f937918be3d004cb3231b7148f5d0";
+      sha256 = "3cf549f861a4116de29a557bb156c20ac00fe4c74b3d7d34ee034c58d93e02c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "aeb33928b53ba8a8a32e147a85588ae49d9bd284dfc14f86976d37def2b6efc5";
+      sha256 = "e95c80ae3cde23c2e5c46d275a3cf7fc7eafff7501e36f8eed75c35715099a82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ec630f7e731bcc4b4bd8a25cfbf1de8671f2635eedbb5af3a649cdd81c7a07af";
+      sha256 = "5a449bbdcc17018e4ab397da53fb494088822785ad12a8cecedbf29b3f4ab469";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "44ed4d0fb735987ce4545ef1b5b3b9682580a5380ba11926ebdc6dc37c50eafb";
+      sha256 = "83bc6404434776cdfffe5dbb881ae129c770105199db75d93cb548e6d8e1b786";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "911e95a576aa3263f96772c4902ab20411ec07e958db87a409f3b13f7dfcb938";
+      sha256 = "03e14237adb3018e6f87a8c5f5f8958027de62bc61ae13d32f243416be24f8a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "06d4ddff9472adb30394fbd615d6865ca97efed1cbc4df760e2512af606582a8";
+      sha256 = "4b894630987ede195b9cefd5d1820dee6947b90059e852ab3af121edb26c23a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "359c74677ee36bbb05b610c16b9bdef325214d908ab6d3bc8452f48581be354e";
+      sha256 = "21ec74dba16ce06e4801454ff7f12a08776eb51f811395910f5db5ef86c476ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "9a4f770e862f9adfccd8894bcd25d528753712f95a4a1d08c2bc02468b199e5b";
+      sha256 = "c6b51c4b57e7930133f9b787a771f6ffbc07557c039f94c5e897b338a9429379";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "bbe5ed8be757ba3da19a1f67e41817684dbb0be5494d7bff79da53370c158934";
+      sha256 = "58cb18063b47f3fb738769a9384adb48f5ac31350209328f013a683f4bf55736";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "2f5d0939b594d6e1545c729fb154bf48aedc522d5d000489880c746e80d4bedf";
+      sha256 = "ba1ea1cb0fc6050123edbaf5c49211c8ee2c897fb01cebd85092d3802ad90007";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "adcf63fd00fe53ee56901a570ba6c8520e844f8e29e3dc3f45e389df1fa075a9";
+      sha256 = "a9b39fedc4a4fbd62a8a2ff8c56bee38c2785c5172a6017da1b01efca8e79981";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "29c0f898c8e45fe1f1b86e959c0881d0123f4cc3f9c6942fc5e9e776afefca2f";
+      sha256 = "b70844ad6f608cc3f9d212929e4e278ab86eb7a0ee6933ac73a4673a54979533";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "70f34c3c1bc6f4151a2b00372b8cbebf7a5a8ac7f671de68e14f13fe6b9c042f";
+      sha256 = "a3964ca7ef4331a9dfc59a2782ba02695e63698200920435b34cfb5d2a91b74c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "1bcb73e4f19995c8404e9bfc3d1463f5fe38da1d0a42cba2cf05d554d0c82c9e";
+      sha256 = "7953ed51d14b92a69ef579e9d36f0abdcf9e8e29e3e87f9c098605e520dbbb92";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "73ce010c00e10e630cfee1935ea038f6938623ae8e705edc2d65b2821d301ef4";
+      sha256 = "e306ba790d170ce433de39816ee322200d9332d9e4b4a3200233c77aed23fd46";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "3e88c90944e72a6f69a583cfa79637cefe8707f268013d67128b201f7f975082";
+      sha256 = "c95ff9d17f160b66e5d98b50cc9e3e23cb602e96535a20dc6d106648b634af5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "6f3e2829f93ee12e727b6e0bb0819212e06e49f089be627f213dada909d69439";
+      sha256 = "7612be680b6232be9bf25f44e9878d705da84d9c06f689ce39b704cd5b467a3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "8ecc981475148fd74bdcdb50e2beb1718f562087202dc7a940eabefb3aef51ad";
+      sha256 = "0ff1f5370c1c3ca852880b85bb5b0274a86a2129769b63dcec7dfe2c0dc24d01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "45979503bb0596668ed7f8946cf0d4cb88518862b538ad97c60795a8c31a0b6f";
+      sha256 = "5cfb59c58c42c84b8b27eb764ba734513e3943182de27a924bfd9886fffcd7bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "9ecd5a38c385219847134169839e72a61b266fc065f6a9299649fa3afe82942c";
+      sha256 = "82b6944f76105800a44cd0a6cc734a41901c84afdf504d32ffcee1ea6930302e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "5def0002175b68518305b15adc03b87dffd3249ee73ae79d384e3a6c68ff7a9f";
+      sha256 = "b431b242cf9ca2c894cc1ea30efd512c2aa390da9a4ac03ebceb019b8dfe07ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "eaace9c3e8cd44549fcd91a207a1762b426a77eb5d299ccd0f7e619021f382b4";
+      sha256 = "ab394498f4a9557cdca2b060e458c65d93cb95441464b36dd6131e3690d9edf0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "cfbfd5f3372ecc352a55a64844984ad93d2a756bdfcb822f9333f5a739659f31";
+      sha256 = "04d17aafda6d62a9c3a225fd6136d1ed6f97d2a09f2580cf947f434f8ff1b63c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "0b7e0c0bc0f5f679eafcb89f3a22bb153ccf3bec2c439b86ea17ecc23d604528";
+      sha256 = "5286ed9fcd63351bea906c7b24b33398492bc2b8fe6e6ec0b07946f88630243f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "aae377897d7da3520d8f9baf4e318cb45fd40df79139095d7c8afd49396b7d2b";
+      sha256 = "cb83d8e01aba72c385dd9b9cc4a2a5fd791533481d9bddf32eb8b0245701adbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "644debcd7c8e8317e03ed1ee62ee3c9d83c7d253d4f7e90599004dc41d09e2b1";
+      sha256 = "48b9bbfd7985809559b801353e104ec5ab56654a0141e23e04220ed851705ed9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "0f53204b76af95ea05659875470512488e86850adcd8fff704c6c6e328549326";
+      sha256 = "b6b189a3c7b2fe43dce76e1021f96e45417d462847a743a1e77b683266aafcc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "57a567b97d77cc6ba5514731ea0023e6df7024e3fbe7d919237c326158081fb5";
+      sha256 = "11fa034d78efe86b64d6d06902d4e4e2bc65ca3ad26f9d4921ea58cb09984876";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "d113a78e8660fe9372a68567dadf5b7097a5e650764848fac93d50feaf24f8a5";
+      sha256 = "31f822245236d5176e4b03ff56b1c65a40ba7bb466410aea2b118776f710aec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "990dda380aad36bcf0b84e9f78579df2bed59f534f2e57d0f6ea065aa652acff";
+      sha256 = "38fc5dc95972a11cd02b1c081ee321716a42e98ec6ef7e3f435d4b1221bf2ce1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "a616cdf4a9363eac7349d90a3a1eb4a488f6114997073dee901c1d5804418cc6";
+      sha256 = "0fef7f42cae9c59916fa6057d364d708c802a1f94941f90caaacb3035296e544";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "8fc9253f882b22e0ba78979b0540998bf042239a5a34ab7e574529d3f057c607";
+      sha256 = "13669006bc1b4910b522c29ff090f2678be9fa240f4f267616af593c10ef462f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "0f685452bdfcc638f70c363a5461aa46dfac06f5f4e42cd8c4f1c74b72c1a696";
+      sha256 = "9e7e27590c325c569d52230fc011cae9e9ac01bb812e2e18e5f0267fe55a2918";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "41bcd6cbcb68a993ced21131e1f7a4642f8625fed0c58109f420bbbff64d852a";
+      sha256 = "e6c051adaecd6f60d1fc4709d9303cf466024be18742966edbaf43a36789999c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "af25ac96f6c46a25745d832863b556ce634dbb8f77c40ddc9d3afd005ea28b49";
+      sha256 = "b8517c7afbc67ead810e626fa1ea48f1684e19d6dcd662798725b8b892bde6b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d0201178c6f4b96cc311d142488c0ac4b19d72733249a3656cb3b174ff959a98";
+      sha256 = "c4c0b29a4a060a0c8af8629adf6ca0ff2976f78cc64aec6fb008b87858e273e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "3fb7c4a44ef36efb56ca313f3bd10a0464bd08428cb6d1a709c0cdf558ae07cf";
+      sha256 = "49b3abcab9b709150d6e972049f2b6de488c46a12419ea9f1f6197f66e91e8b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "93961bbdecfd176f097095ba7703fb9ef3cec8d604dd9a012ba4c1bb07e841fd";
+      sha256 = "75a4e80ebf1b76c63552b333d09d2955dcb96695c3a2a1ce4e1c1923f088fb1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "4617edf681e734a814dbbf668092e0a427862dba8fa7bbcfcc6c8b6869ea0bd8";
+      sha256 = "8ea8d99a94ebc7b8f42d8e10bd95842bbfdd536482efcc122b81be83cdcf3735";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "a579ae841de8e29069ba0edc59efbe6430ffd8f13dea1d69ab1592affd9bc871";
+      sha256 = "e6bef39a4ecd26f015a73c01e16a3c7002ea10940b656c44d143718f0142fe10";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "bc4c4b4f4e01ea125d4141de08c2aa7716b87bdb41566c023dd0e3686dee88cd";
+      sha256 = "d10e07baef739462e5416f0b274e5ad28ee3d80b46baa1a6fa3cb58ff60ee058";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "26b27149b6d4a5960e3d59575e7ca1ed6cbd91dc67c818b7b83fceea42c21dac";
+      sha256 = "e49ff3f9972a37af4c5e9b63004ba1830c52f6857731c698d3c865e54be1afc5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "477523d6453d808db5d378b62f33c0417ff3595b942945dcec1686942c1aa87f";
+      sha256 = "f994e1c351ea6baf9a180f78815c64279c9012de3a5081f0556979834e626d3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "3a720b45d5411dc9f83143ec80c70909b013acbb6165fc072887edef1de33705";
+      sha256 = "5d3b63899668bb1c644e0c4c99bf12ebdc0537ae9c3b7254b109f79d45861f8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "7436081cc81d5b0e54560404d8e4c0bdbd5ab91456aba97b8841f29c02608f9c";
+      sha256 = "b1200734203936c991271a16d46be20e4142ad5ac3f86b37c1dac8aa93d57957";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "feaa4b8a1e69bfac278bce8e7ec4baf3a18438fabb2634229b449f4a6a8071e7";
+      sha256 = "1b56d9d55166127ebfc90662ce1165ca70f47aa44efe41fa43f5bd78e82a7d61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "f8ed901391214851f1a82bef8659c54596b9dbd221e5845a9b81e40f46d3dd25";
+      sha256 = "2a822268acefc09e5ba26dee73982de407c4d9aac8c8abe9621c487245654571";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "bb166811df4e679eee8aa0e371de27c8473308f3f24d6a4e91310f2700f6a10a";
+      sha256 = "81e91beebc926105e03b1866b83d4558c89220e2281a5d1ad5ecfbf384529ee3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "9175d366055317304a7af2250fd25fea929314fc360787403b486400bdd1018e";
+      sha256 = "fc0ea462b9700642e36ca02589e84be42bdd1943bc014fd1fc3f2601d076e6a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "c147e7fc02111c32bb0845e8bebbe4be7f6e009c82d9b75c3ca62830fb4c0c95";
+      sha256 = "32917a5d626a841856998e2596691b20e86d2e18dc4417f553966b8e4738681d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "dfc43c4a430407d78b62b1148d6fa2b4aed91899bc337e1f4b879608b43afa70";
+      sha256 = "d34160eb61dfd9095fbf5c576e787da856815b4510e8d80d1f3e9a948032f7b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c8422bf72d6683c4088949622e765d5ad4da33d60dd94ef6ee435935060d22a8";
+      sha256 = "51828123c95c9d6cc2e36ca3c2c411e7919d7f5555f36674b6f804ab262e4d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d867c871b0bb1fd87395696dd4be6f4c4264e39ebec31f702f8d94331845fa69";
+      sha256 = "3c4c02943f7a6c60a0a7c87158e03747d4a9e44f1e49cab054b7d35811cfb4f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "cf63b5e01ef1abde07f4c3a729263c4591c38ec20ec5b63da41c322fb9c0d40d";
+      sha256 = "2885f4677dd03b444a4eec840cebfb9e8bca4b1f091c155e9370b30c9bcbaa41";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "bc5bf7b0485bf4c10c8db8347aae430b8817628c3d681069ba932a6f1d57ebec";
+      sha256 = "4a0aacef612ee558547ea65b43d461ae4f1e4484d8f1b1f08d1e0e1123c39a11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "c4d9b7c8eabd96bb7aa4a7931f8c824f8697defabf3bc58e9005ec35f932c5fa";
+      sha256 = "756af49598e57e4e604b9d7ae3420fc1d1f92520e9387e769ec32dbf7b88e799";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "5b7a33988ce0ec4c4cd1a76b19e52584bb90c558e53f0659b0821e17c3b0fa40";
+      sha256 = "4c21904867ebbcf124d66a611454c9170f4974c4056edbe7b85fccc530a89821";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "957752a35e35370f60a905a49a52356c50faeefcd786c2b9287e5b70c0e31a5d";
+      sha256 = "20b890969b74c69d5b08b5249a2c90abd35e209bc0f604c501c666a8698525bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "3c51a6c0cebc848f0995fdfaf09e7f2d9f22070d7f1dd21f3b80512efd053dbd";
+      sha256 = "0a9a6a5847f6e941d5e4dd1dc005811950b136d9f603aaf4cf7137ef254fa72e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "4f51222201514d7ba5ea82b106879275c193b2efa4bdd33ff1a7794c1e51a165";
+      sha256 = "31dba20ca0561d706ed27a981578c2009ec7b16e34747b203f032e94ee7c58e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "edde8d936d28d02514a05418571fb94fc8ac6d7b6391ac7527e04145e7f639ce";
+      sha256 = "1fea25b831a12066f42dc06a6b266de967eabd096c313d07f13cc70723a2cac4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "bdc2d130e7fdd4ec2524537038a1f6f4959417565a0c382af7d882bd8cdafdbc";
+      sha256 = "3a1d9c4bc047759380d0b32c379d21ca79dbfc583548fd8f7c8f04a09bec6a01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "dbe8a9ebccb41f1b2651518baab3ee626c955b2c499ad059803c8f8360d857c3";
+      sha256 = "9983545d86d35e4e7550edc155a58ff2109daec31f8221c3f4f6bf39a2e5e6f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "f21596ce29b3e5cce2aef7a6bdcbf53886e09ca1eb8288a4192f0bc74a6cf31d";
+      sha256 = "888ca132a30e062cfca97fd1583ac5c67bc74b6ec24d988ea37ba55af2a79843";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "51f013bb4d063cb177a6427c603f7bc6b9b6363549fc7b15088e872078b4adc7";
+      sha256 = "311fba327c8c69382296a0aa25ac374c50b179e297a255b69b3699d5a4c45a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "109270210f06933d1fcf140c5771c281b21dd91ce31f116774f990da2483ff3f";
+      sha256 = "6ca08c6ce3c707130fee2a835b151dc49b2d7f36f4bb520cfa9390bc7c415731";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "fd8790433e4b98e959d409ae606388106c86d7c2a039445fbc3e82a8e382fec8";
+      sha256 = "df91e05dbcb7e0d0ee071a98716df1406a13f31e1e35aab9861aa4fabde2b19a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "da2c6890c5cb79d4a122f4b550e7cfec38920c2976ad3ac155d6d735ab0de102";
+      sha256 = "d2e4f16f289dc27c5e86260ca43fbded3d9e72d53b287994868e0e8aa61b90c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "c92278eb5526b2ec381e394bee7229c0a5f7177c6516059cd8dc2636f0d99bb9";
+      sha256 = "5fe6fec4ab706cb36f18a0106052189e0d4003ff30b2fae3f2f686cba43dc03e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "e4d1a0820c21a00722a5b41df3c559b318108281e6fb552d51320fbf6d7bab54";
+      sha256 = "cf3ff655c1dccd8760eced7c80afd3a56c55b7ebfc9b0fc9dcf0f44511265bfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "119900c5589efbba5c192da8ea7d770dd9184932da0c4bbb6d3213a358c1c055";
+      sha256 = "4d0da6a59535c9c1411b6f6aa55a7302eed58cd2f53f0ff53e04a192cb8b6103";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "66a8229b2dd946d4396b3ccd2af55fcab0dcec3468ee2b334e2ad2a2029cbe34";
+      sha256 = "34c88897c19103f20389bde6c25e0a63a2501d95b51b2e3d4c361afae7c7fa97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "215a550a78d4656fde841d2baf4083e3f90a9954fd99ed55c82e5392577de31d";
+      sha256 = "086fe715d88df9c1a7c0248427f15ad667ef21d63778294b2034e5e6e8b6e705";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "e4579d6e87b52b690e0fbbf71af53402a9261ab5556ce1284051639a9da2d215";
+      sha256 = "f0b76fa4dca799e4a6dc301e121d9d665921b57d2b5a6e2f4930ed238db1da97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "a051053384c01772340ac9cae9c377d97a6ab59e627f5f1e8c1b8fa2768c92e6";
+      sha256 = "3db95dcaa7e87cff94f840755ed3c2c044d087e7efc9e4e0e66656def33d0658";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "693c42f47289df67ccfdcce9a3d0da796d8ebe84639cd90c14db5af434f13013";
+      sha256 = "772ddc3bda37a90f96ebf2c0031f6b382e1551b46b24636fb1fdf327438e6bc3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "5532fcebc2aee242934b40e084e2b8c8f29fbce387bed373bd25564489bedf77";
+      sha256 = "52cfa752621f9671ca20ff58f17daf8231b6b25fdd93a0ab7089ee9ba30545c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "50292d5b83535f8ff85f2eeb184eef5abf684cc2698766d7454f2a0e1e9297ba";
+      sha256 = "0f0da43087dde742473ae10ce9aaaf698a82ecd7f6934a22115eeedd25d9f096";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "7ae1beeb5c4062d8407e811432eac653615f830d35a90dd8217d31fc98caeaf3";
+      sha256 = "59c4b11f86d1699f696d820a7b7f188744a4b05ed8969b16e4e275994e885592";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c47af05a8d08e396de06697f09e7978eac8fe2c2267187a6337dd124ed5a8f77";
+      sha256 = "e00b35803b0327542c1b8205bae4cd92a0f4d0996d04f6d0e102271def7faba7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "e05f6d2e4f8489507eb087558a11d59e478f7fd0c9bf6ad4279960e065588fac";
+      sha256 = "8a608042c8e0bc3b680c43a17f2c2056e33e7ec08786925e84e78770d2dd56f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "8ae07d27437f29333b9e0e90e17240db50edd1fb148da4d6a5cebef31e6cd826";
+      sha256 = "e53f0c8f5f95aa91285ecec905eb0f4319241c6d0213fc18005be9a6b217e856";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "2921ad599cad7a906d9e58cf0822d96eb074915c1729579345426ce0aeca94ce";
+      sha256 = "4c9776ae68caff9fb70b72f4bdeb11479cae6de27e2a55d8cb861b741b753155";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e02b76f0e858bbc91b90cea52f4385d26e96cb9e1394b765d09310830974029f";
+      sha256 = "065aea6a7a7557aa03eca1448b98a1f6d28d63623dc20d6c5a2f810ffb034009";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6fc5c8e17bc5e2fe3fa47e68bfc095e131c491c9db572731ac31a8477a9571ab";
+      sha256 = "c32c420d584098f614af1009dd6bc9ea2b90447c2681684f36ce16824113ba28";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "7da9cacabac3247e5e64a0a29932b61c6c7b57028464e3c5d73b9523b48f42af";
+      sha256 = "2bfbab38ec47b41af7b52a712aa1e8ee8530834f186147ea3ec4d96da3f75538";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "fb4ecb61c01b11286b1ceeee25720e85a579ee60b4d3be319b8dc4a8c8d51354";
+      sha256 = "dee5070ffc55dc9ea07db4f2fcef6f0114e919b744f077d083a07db56df140cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "935dff48a2d0c0e5ebaa866c9d3fb7f6e8020afe6abb4a29efb2fb5f9ff56d7f";
+      sha256 = "508d7612dfcd6b021b8491b4a81a5554e333bc09c499076807c55fb8d855c840";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e74d5c2e9ea815c3665eddb06d556581365b827c0c5020db818afcebd0935921";
+      sha256 = "fd658e1c2470ab0428e55d045ff28b5b84b1b598064104184bdc2d4a5d3c9435";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "b32f8f8d8a5ab761cf49edeb3272e1348a3afc3304024e208156455068be7bee";
+      sha256 = "40e764c31003d7d14040eaa0c414c1ceee0a189cecaad1340e3979c6e8357c15";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "ccc9aca453f15affe6b2568a5e99f513ecae3e53c3c6d65c2656d4fcc3f5a692";
+      sha256 = "775c2ba89716d160f918d14f2b0308ec36d82f62891444fa8900f404928f9c0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "742dc2b55ccf1f8edf25b238e2a296f0ab93f8391c7ef7f59f8051bc22638284";
+      sha256 = "307088fdb23dc49e94125b291c489c94c24852a7a9183bef7c24e0c6021dfe51";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "bf44954dc276d5c3713f692d1e95f4abd7fb9b6038a06da6e3adbef9fd7afec1";
+      sha256 = "4e44491b0516f11d1bad2a5bdf3a36d6a910b686d2b41461c41eaba11c96d337";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "6a8e296c807ece35c0cdc25ccfe8bbc920cb8db884d528e7abbfe6d7a01fe498";
+      sha256 = "9298a06871c2f64c7ef8f1431a414c9618c6bb1fb7ddfd8bd7c44b05db7100e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "99303596de408afb5a9a7495841e7a4849e6cbdad6486f03d7ddd8e2478ae939";
+      sha256 = "31c4d00e0fa5f40b595601ebca3d6915a1063f0c54c4a5d4e6a38f200e682452";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "672ce8ba090be9d2eab274bbc6f6209035891a2142891996f84f5ffa340b21b9";
+      sha256 = "4bec7611e461fddbbdb227fddfbd9a75b385159e21b2cae079f90d4f08ca7e91";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "feb4a6af8546de1d53d8f69a3f72ea96f30dc3ff73846a86c92ebe603836e8ec";
+      sha256 = "cb0ec16d9499c30569efd03432a54afd2d5fba3814b4bcb8910ba2f15e72f0b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "d2c4a0d99a6c2442da50c2ee1af11a7d324e822fa4671d19db11a30c51f56f23";
+      sha256 = "b5499e418ce022f9c586a02304632099a40c24d1c85ce4e0c860cb62e549cb07";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "99ba555f100864b97986e92fef81ff241926047361f7da3c4cc903fcd49910c8";
+      sha256 = "8ae42a4880e83ac18d95b4fe6b7291bbd6edd0a6712849ad0a7e773c93b63576";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "585bba59996f2db750fab194186aae4f8ddf830de6e02fb903002b9e26899ec9";
+      sha256 = "e9d5dcf1e96a856e72911d6d236d05defc9f8a0a9c6681846bd3fa7dec7ed0e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "6b27c5273af61abb038a30b5c1f13458c6fa887998b33226dada878b8a089fad";
+      sha256 = "73f95036c7f4582ab186f759580217094ae41a25bbd73b04114665ba62743414";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "d858fb1c0c0e699b02bff7da2561b8c47f8e85b8d7cc5be1880711e902a28df7";
+      sha256 = "de64c2f0db63b483c120fd86628e7a1de36f291944d5496a94d76cd62605bf1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "eb204c1e397ea6832a60948f9a66b56d89270fef2c3953bdfda9815dc6ed86f7";
+      sha256 = "8d6d26d45c5daaeea7f7997d066bee1d8bf543fe16364c19d12430ce53b8d47c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "0f942450baa484c2902471e623966dbae50f8e11c2980fba116b9d7fc594b50a";
+      sha256 = "a0334ec1f4e48340e43e9a7440a59df4977f6794b354ee1b9eee76a89c48171d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "25be16633f1503c90fcb001f2b126fc62feea6e299bb2d5d9b54d5947eaa1b65";
+      sha256 = "42d65c749b7fedda87b79b2f29c30e603b6971e42f909ae43aa3d59d2210a162";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "a147c51fc3f14e9e2f23a2f2c0213134b3661c6d4e3ae2efb6ee70cb6a56106d";
+      sha256 = "6b9aca59b26d720fe0aafb8d5ae8be6c1c16985ace64c4e795b6b85f4cc6fb24";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "dd80282fe69e3dca44211bb2304b70b92247b0b888f6c4a36f605dec8c0f7031";
+      sha256 = "3a30933f5c7e041bf47dea561c20456c47324b1abfbf21f57c1d07c7df7617ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "9f73de9442ad1aff0e1818b4e5d17d3121f2b2895b3186cafdc553355afb8f33";
+      sha256 = "6b22217611fcd94531655d79f0f75ce39ab8e7165dea079d82e5f396102db1d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "62f156b335177c4b866cfa9cd4c8a69d551b7502daa7b7e8de7c6f2df3bf43e1";
+      sha256 = "528d077a9927444f97f9038dfc189b1ce8c5c1df9fca970c6fc7cfa821398cac";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "eb956b5ab8350f2be647e5986e37b25513e6ecf72489cdd55412c21e6f369496";
+      sha256 = "265dd3d23420ec4769c5922bbe385cec8c44ea282673fcfe772292523befa44e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "47e7cef2c8a721287927fc756e078c6c7e22737d857d99e5f6584b8b98b0d8f3";
+      sha256 = "71acb38bd43c8f8bde7dad6b9a23d34559f7a7d0c369f7e85b3cd32d13b44a71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "7e31b87ff566892a14b0fb2ec227b28a281c38a41c82b00c1c0372825dd5c146";
+      sha256 = "879603c78d95d245b4efe4cfb1362c57042a1fd56aeda5be0b3af15a28f788c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "3387f9e12b9b3d67732873942fd0c6cb93de46d9876daeeef57e3ccb731c256c";
+      sha256 = "a7e501acd0069fb355d5bc55e0d60e578122e8f08d90b064ace8d13bf4127ea1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "c44171556bdbe1526866137d37a7ef25bd2d5320d8d89478dfd62561b6540c26";
+      sha256 = "3edc1c94431ab99d9e9f9e6380fbf29523bfc560bdc398d40e0bb84436167db2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "c6db4cbc69e2ad5d632c43855241bff3669e9cebcbb9b9e843e2e505c9b51065";
+      sha256 = "bf641e4e3fcb50a2720828c68dd823ce804cb8ba1a19197b153c7b243aa73c10";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "bb96da12a2b3ce4e9840a69c9cf04dd44371567435f3a3b32d9aa84a50022d7e";
+      sha256 = "ec1c54d5165736d52fc882c22f04df0b9a82a3d5cb005d39a970f94dc352a6fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "ad799375ecddca509884aebe1d6451348658071e15f3a48655f2266dda8cc486";
+      sha256 = "074fe462785332a3c2e2f3d8a5d0ce22d13a640b9e8d0acc98d3ee1647c44240";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "7e873555eeff30625be0bd276ebe0891a664a93033fa932df5e1020a2614de77";
+      sha256 = "b3ebe88576c6d0c609a7a42783f5e90f9e3961ecc21e6bf0eee1244490111791";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "0049c3cb02b2bcd53bde4ebfcbc6ee83d7810bafc27ac42436174ca8dbc89ca6";
+      sha256 = "645a471bc45c54f63be87d6a1a3ea5ae5f424bf32b7f9b472437464240c21ec5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "2ddaa5e9eb35ebab4bdd1335a336f1d26293f0eb84d0523992c1cd1762d50ebf";
+      sha256 = "c8f85a2504587fd939057432ed8e7735a1ba0371894624a54c6d6fa8b2fc8788";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "c59773d2590d548949a8e7faa40eaacf0fc02a7d3c8773a8a3a9e7f42ebcf9fb";
+      sha256 = "53832bb8bb533abdff06a5465aa932a0abe4241b7bc9cdbaaf6ca4f21b320240";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "590ef978da456874f975d304321bdad7be2dc0c05c182f2dd0df3db5b778cb0b";
+      sha256 = "f419664ce76ee1caf1ad5d6e4c3c469c3647a5b649a729db98535dd25d614aee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "cfa92aa57589089c654e359c673b20542e842559eb9ee0d141bc4cb5040a8880";
+      sha256 = "ed84c36ab94648dcbe89993fde2ebb9a5f888d9cb83da3912a60ef7c68f676fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "454184c456b455cbfd4174b32a1af69aa61cf8d03c52beb30c44c407707e14e9";
+      sha256 = "f51810d7120309d7907ce365a3ca7889ccd2cca40078fdf339c723bf00cc9cc6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "d96acaa36c3c1bfb20f15d8f6f9e3ca6772dc6463dd9b79a8156f6288622e1e1";
+      sha256 = "a6b2ec151b6e56d010635b3edb5fd23659ee5eac7b14caf4e7a9107a05049cf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "ccc48b287e6916c3e1eb0fc9fe99cc0b57e152a18697ef404f69cf10e12ae11d";
+      sha256 = "f281b21314debf2f7911a55f1a03a7d18d15800e598dd0d227d51fbc0686bb1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "fe6a598ee9852fc78e161363419988572220bf5274548d8808032a770202eaed";
+      sha256 = "df68b5f0652248f01854a273564a97009e5323107be4f0643af0d1e274d01ca7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "666fabaabacdffeb54b23e96553f4ba154d423d1cf86492b664de9220e8113e8";
+      sha256 = "4b8eb5be13009cc0f26f6145d6a424e6063f21cfcc70c58fc0ad0e3b29113846";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "e1446c20e9f53545db9e3a602573e07bb2c5944a44815a4ebdb7e8ca7bafaf26";
+      sha256 = "a43ef915b3c408f6072266f3b97ac02b3f27bd10b8ba1e2ec27e43a3a3d480e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "a689221b405f94bec20a779817e3c1cc871d9d94d5b1957080cc8cafd4ea7ba9";
+      sha256 = "c9dca2e0fae1bb033049ced050256a63a90158a60c8b42609dbd11081bfe8ec3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "c6922652b164a79cea4a0c17af82a436a2c776f8447bedfa662d1e74e3d3a0f7";
+      sha256 = "07cea557c54f2033f36f5f084d06575b6f55e8cf2f8af9ec333ec2487b96fcf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "7d42e3baa362000b5445069e7563fa1d5c8b8bb775590423269e74de3f36c216";
+      sha256 = "1dcd0eba988414a72a17218a05bf2fe6f5ab1af26dd1ae07bac72d9af2f4f502";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "75420edaf831b15860e3e78dad64e280463e04cdf671eb0ffb8016c3bd1ab4f2";
+      sha256 = "aade344b8c7db7a3fafaa67245d7d38d7470c7b9d0c94978b7bd3c36a2127571";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "10b686fbee88fb4a1ec5acb9329785291a591c27215f6b937360f98d519d089e";
+      sha256 = "e45fda7738885e6aeb3141e8b1eda1e8c962dcc6cb9c5254d0e20921f066e4ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "a1b5c903435a501a196882445546fe52b3866573c36206dfe6235c64a7334e30";
+      sha256 = "314382f39fa55784648cc1dd0daca9e1f0a650f8d598591c8a54172d016f9945";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "658a0728a5ae42ce59cbe5783aa8392cbd0c7687df22973558b052a4b2e8b166";
+      sha256 = "d6539e43fe59d660b33ed528d093379123e00ac0d90c2eab8da087cdd594eb53";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "7495b7e1968ec676c847c03596baa508dc51bd718533887374a753c721e16b6d";
+      sha256 = "0cc4e43a4b4158a381856a1bfa861e062a273ef408e2c8083331ec4bb902b97e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "6ae1058ebd39b8294bef8a1c532ac6d9400cc5271ee7efc1b964aaad39ad5081";
+      sha256 = "4aa6e06b29aa104b47a7bb7216035ede7b686850b7cdfe12ad9dea0df40daa01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "439ab7bab00c10785aac645684460c619418e2a96b2b9c799a9d0bd9a1165e49";
+      sha256 = "0e2d72cdf607a7db275a1b19b42a0fec0192fb5ca0fd6d46a0a433d009f64c0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "8a08c217f062a333478aa5642e3c8d7f1f1927827db8190a0f910f5cae6e332d";
+      sha256 = "a79ee5bdd66012e6d6fff63303ff62279befe9d363f97a93e0e65b2b1689ac61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "357458f42be8175279ba09e7e1a8c598233399bddca2fc0f1cdb731389648a54";
+      sha256 = "8f571465035cf972bfc0f2527ef62fd6f7bab7642208f52fa48c49b53c2597b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "c5679d961ac0d133dd54d040b25b6bce0ae3e6bf54bbb80b63e1cd4283a41ede";
+      sha256 = "c345cbe1a1756e0f77a4ad911852f48a225e963ee7594925c89d4b3c8cc8ecf1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "c54defcf01f5ff63b2c9718bc26660089abe0230b3808f492f55e1e25403ebcf";
+      sha256 = "40da9c11b36069fa939b531d9de251e511ef3745e94c23031de3741cd447daab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "9caa213108d214bd1b37e6cc1f367b29e093fcb98f1f010c8cb68a25c6149457";
+      sha256 = "7716c5668458c2f39fb90816dd1f7eec3f54b9774567d4743e9e1f1364870388";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "8be2a4279373bbe9c74b28175a53f6082cccfbea5918bae208be0c6b6b888944";
+      sha256 = "41ae7a385cd6ffc6fa05d4088b9ee9b956e5485810d165a5f1001c2ffaeca01a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "9267835f4f5512068ad3ef87b8fa75bfba26db4e2c0d8f6f1e37ef86f17317e9";
+      sha256 = "1ea2ee87f0d0c94f8868b119d2d424bb3b830565875e48ccfc1e91e4973f9eb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "43b1b42524d772baa72ee7ef0c8b6322949fb2b64796ffbed4fd097a6f2328a6";
+      sha256 = "d43424b5efe10b2b0e65c0feb5239bd647af086605d918f91d3b2dee7c13adc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "385c966b1eb1d2af7a038af9e3aef4323949d431b0f09e4cce3ed5e045b0728a";
+      sha256 = "6d024e0bf0dc906e6cbf93391ad26824947a90c084243ec77c305366755ae76b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "c0f1ea44c17e2eba13f8c6529b39da7da2bb1f8d5f0c8b9b0b41be53c04ace58";
+      sha256 = "87d7b52ab1ac75fb33de8e13a3df94ddd9231645179070900f16107934b2b6ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "e3857c858010c4a0e23b1b4d77ee74e398ed68d0285797e8e5f5b677f8271aa6";
+      sha256 = "956d2b67600153073c8d20bab2cd4b2b0ce954a33923a86ba6b48c186e0741b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "5c097ed389da49c71e6165c6735db6b7195cd52e113d8c1e7f6078105f594565";
+      sha256 = "27e6131bcfe6325ec8d058063dff15f75f7c66f79d15013628684a914a9e49ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "d63959887d0efeaca0d34c731230c23be012b0a0ebcf1c1f9b23a2164c1f5051";
+      sha256 = "ef710f084aae6cf3b2fda3a9e0d017a0bf959960337d4ddee5097d3dd406debe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b6e876dd0f29e081ccbce9abb08a7338a6add3ef6c52fb43859933461cc422f4";
+      sha256 = "28ccc4ca0e116dc69ee73dd76da61d32fbf8b67042896f6776ee156cf05e6e86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "f150fa1887b7547429d67bf465e18ed9ba35a0eb7b05f98a4f5d87673596d8b8";
+      sha256 = "ab26a9a8bcd33bcce2a3347c034b49bac859747b6d2bd51f3ed9ac5206e6fef3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "76d0f4825b8bcfb9d6d66860cdf8ae0b9c47933037586d896f8f2df752c0cadf";
+      sha256 = "cd45abdfd476d38451a97677654ef53f5d987d1acc1225cfff18fe4d8d600b8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "c34b67aa88aa37d0a2e680a7e12e6f61933885f3855f85a7219d3ae2a05174d8";
+      sha256 = "4951c793afba243271ba640eec8b7351e16b04e9fc49975f3f97844447e21e27";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "e80a11c6d279f403e7b4486183e22341904627cdfbe6913731b0d9680a27c624";
+      sha256 = "26881be6be8d8502b8a3cfe2889172bb7b06dcc86cb822805a09fa2e8d839217";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "a19774b3a61039debdd0ecdf1e0eb52880406127728b49eeeb2b557674e26288";
+      sha256 = "af29ec58b423ddcf5ece496b28a11f014619a0e091066bda01495db3c63e88a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "667c51cf291606b1da0964d03bf990d5a8583359b01260ce4d55492a5be04229";
+      sha256 = "1d202708d4a46499ea91fcb225514966b5c4f099549e014874a93969eae96048";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "3399278865cab1ae01fae526ca2e7184a1edb3337d1d4fdf39d035f5ae05d35d";
+      sha256 = "8569d38bc4ce56749462b7db17b82b8059a6efca1744b8295439735f4825951d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "258714f0352e26cf4824a129414cb4d73ebf9a196a1e07606fdd512a73643e1d";
+      sha256 = "2718544968fb71d1e7645d8c353e9b909ae7caf0768ae9efae6202681d378026";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "60e0e2590c0a46f183991e9b34b055f148cc9e9611460e4e28574b50775b7e17";
+      sha256 = "3048c7a981a59ed35530e882704ca28e57545f63036fa0500309872cb90041f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "275184c50ebcb1ed872f468f76ac7db657b83e099c58adbe68bab8d8859854aa";
+      sha256 = "47a2136e5d24befe2d7250fc917d838294d3d3d0ce67bbdfc12ed52cb13c5820";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "50d0351a67bbbe93bb224bd470c6e300c319ff73f51891d0f40e33f2e12c1105";
+      sha256 = "c691c79991add05818169ec0762c71e83704aa26d518fa960d6760e1c4935630";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "abf5e0c2f1db38f2295223d9bc6835d2250ddc511d1a6373193cab58eb8b5bef";
+      sha256 = "5d5e32cd2dbca632b2af119af427b15c1e0ff201b945b6cacb961ae2092f2b88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "1e216572e181b2182b4a2e4320675c2ac6d523f27f35227b17772b1454e5ce3b";
+      sha256 = "04564d398f617497e6503cd81095c3d9994f1decea0e99a86347dbdea3ec8373";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "48e8817330d41757d848a69f95e3a89a0b405f46cef54f61541b2cee47910098";
+      sha256 = "4c0ee1b602a71b6c2edb5b4d2cc7dee2c92f5cf2100c3211a1cd4747dfbc3cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "24182bdda0438cc4efb50d9ece8d737cf05e1711d15e871c21dd4049200a064f";
+      sha256 = "3f4f5c974a2f82a8eb24eacc80dd43dd6888687d7b33b709a75dfa028ca0ab61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "4792c242e54c336a33fca76299a712a2ec05196081dc6758f39f07b7e18ef183";
+      sha256 = "b2831008cf28a63f2ef589f6eb9af55b796deffecdb7d5b6ba283820fb303eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "cb4a05aea03ed789617c032dcb2669c6c1d4c3692cbde750a1994fc641c4f013";
+      sha256 = "e2a06611817017184cb75cbb999cd51ca4854e14585b5be643afa6fbd976391f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "f3964c38e58615d0eb7d0150e0c6920a90788f1477fefd2d762556a174662838";
+      sha256 = "dd60b5542bc5ad651fe6c9113f1379e34773a57e85306bb98bdda2738cf4fac1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "91d419c2bfa9a03abd18e603158f416ef2fa023b29de4e926bacc5ca1feb9946";
+      sha256 = "d9dbf35f5982441c0f46af3ab76523d1012d117fb6dd23e45437c23ba30ea196";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "a4829aa251cdc8c4873870cf85ce889a088a7f60a669ecac6302f818de2677e1";
+      sha256 = "c24ddb01ca378672832eb5cf8e95bb78f6d5cab3266fa67070441e808db98439";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "571039c86835ace41507fbb7e88fb808bab9a3cdba86ecca36a705076f1be6ff";
+      sha256 = "d97f6661efd9f853c0a0e33b8a3c346866594bea9490bbfc4d0506aad919b62c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "5af4d3f08a05a7fd321678d6f5407ca0b885e72c45b320b8c7a6a7658e127e6d";
+      sha256 = "35a07a397fb9daef535f2f8753261ed318f4a775f8e15e266af0942761acf2fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "84bc3e41e4e72b8202eec681520edcd1fcacdcc20dd256ae26280f0136620da9";
+      sha256 = "72d8acaf044201716007c6c189222020002d9a4016f4a3d253a91d64ca798783";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "c99a18fcb63f901cf4d5cad5ee1278895afa4b9ef8d7cb7e0ac0e084e0d25f3c";
+      sha256 = "07a733a01b0825331ef5c8d107f194345e0afd157ae123f4e2e234029ce03903";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "816e39b1c3539e771d8f4d7098dfee49595a0432edf8c76a3766d3b1869ac710";
+      sha256 = "23fd5336cf74966635ee1bb595d10766751251e018039fe97062f92dd28701f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "1d8ebc6580cbbe03afc5070228f40a5bf928f9edf904605856ba9c1df81fa665";
+      sha256 = "225de7dede580be0c8ddfbe8a497af052c424b464ba606e11effb2a0258aaafa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "ffa903ab76a6dfeda4cf863fbb7248b4a428d03e686d21790c4647d43653975e";
+      sha256 = "caeed5870902eabacc4b44398dbc9d8f1e7a94af15de1988d7d269004806559d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "1c46c79761fa30948b364396d28fdec00628c21e46400e4c812f5433c8fec7e8";
+      sha256 = "878938c66ba82f4b8598e3aa74b6dc9a8285e16d6287bbe760425dff2e6aee33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "efd8f41921db93f5d83e10ad7398d393502c650494dde02349434f3f94b245d5";
+      sha256 = "1213e2a2226aedad71b543e1914151cf085c3186c447e6001c9ebf9b5644da35";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "64bd9c1af3f0695122df345a86d98da74b4edd4dc6e033882d31358be30cfc36";
+      sha256 = "7141be31170e77c199c7e88a85b640a0aa9fbf3a87a6502bffdd7b95975e3fa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "a221d10e8b373bfcb179bb36cd6d0c27779dde66ca5d9fcb89ffe637f1898d8c";
+      sha256 = "f6128d1579be2067e2547f8eb1828a56e6dd6f29258b87e363d5105b7cebc4ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "1b5b0f70cb9db3d3e8a4d6c3712ae8e3f406511ee9fb5c8e2433261c9d46b417";
+      sha256 = "9ef2b8cd01242d32f2cb0adf5a7bc310be21f4ba1cae3529cb64da75531d9792";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "26182efcafdcdf9dcfaa020f299559d7fcd3ebba62cac5c4622efebfe3435174";
+      sha256 = "24b50d061bd46d7cccc128b562491e878e67e929f45fc986071d7e8c75585fd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "953111cc9b2ae344a6082e95f80960a0bdce0c3b5eb4d667d5b8d749e77b97f5";
+      sha256 = "5f138469c44a462d84ecdf70f4d76b9bf09509c0888588cd74240d93a0a65ddf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "7f52eb2eae1b2f27db938474c0710c28dd7cc5366e88abe37b2f51c644675b1b";
+      sha256 = "34770ca741c4dc609deb69f606cf227b8abe1c5559c30b4743b03d1fd6bd4e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "7cd6928d0c0cedc76c06946c0329a13515016e486ad634c9eda1c184215999a1";
+      sha256 = "bf0dc41307da0ae66fa013d17e619776ce796301e7c1c3e16adcdf5290d43ce9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "0509df8f6e67bf3f0ba3eaa5cdc7f09d2ed52edc2016ba17bdec5dca37dc0215";
+      sha256 = "f26a609c8e2dddec77a8d3cddc09fbf03abb9a6f8ff282a155fd0e35778e52f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "e90d7babeac42128b88966c89bc27ddcb782bdb11cad278cd844f486da9cb1a0";
+      sha256 = "b2535743683e89e58aa9aaed48621553afadd994f6ee1edd020e829abe7a1efe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "12520f1d6e4a8d4385dc44e8b0455c0946159793adc05ca2e6bdeccd331741a0";
+      sha256 = "2731fbe959da7f15a27e3a675fe80b0d54bcae316672035c415376660f8c60f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "ab879762439cabdf676f74ce07fe7ce3303f97a59f3758ebcdd3e139bb6188a5";
+      sha256 = "c75fe5891b84c8fcffa4d43093d6c71092741bb60ce3bbb0875067ccb08801d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "412edadc539d8999a707a81591537f0565a26f50ca566581687c2e01d186fd95";
+      sha256 = "c4862d30d0cf9450be66cc38213d90c300196bf98b361bfb39fc9d1c4748b2b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "6b03c01a8dbaa8e25dcbfe16b45e75c4c0607edfeb1b8378b6218d9c989fe2e8";
+      sha256 = "1702eda3a78cffb1df602d1443fa885a575382b5f5b27fbde44fe26b4b3ca7c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "aa9843e770e2ff34c12a21f58cc74025ec2a2fe506f5ec5d1ed39e2a71ef5e99";
+      sha256 = "57dac174f3a82d01f4ddabc28ab47d063f6cff823bf96394aa15b84acc026f03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "0c03dc82f8fe84ad296e928046762f33cba7929cfacc20e58ac3682f641a715b";
+      sha256 = "02aa9292bc7bb008ce7b3a4c71b7418578c58b45a86397375263ae004c6bdc3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "825e766cb6204232462edec2ec637fe3620e021382b7ece7f79122194404f85e";
+      sha256 = "bda64253568603f6bc9edea913748bcee053ff0ff95ea0e7b1fe52960e234f24";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "3dab1ce01cbf1e4b051dd0be1cefca6bc6921ea35a28767a9619915bf3fae1a7";
+      sha256 = "92fbca93a60dc3f35da2427b2a89185efe0090306df4cace4c025683e13ab7ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "9936b4edb5afbc133854bd323ecb9f6de75589903db65b444579139184fe3ed0";
+      sha256 = "ee6be5ad07e13e990c448e19b43a244a15bdd7ea59375ff4ad894ec75dd639bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "855d718f0519c19c86380fa72ec6aa0aaf9f82d806fe32bd0b94a2f34f27278c";
+      sha256 = "fc481f234c13d42a06dcb6d32a7d092e12113ba15535844a781bf49ed7149781";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "80e7aa6114c2f8be68a1efc6c73c0b39f0c00679db5f16e8fab65c54c74d2569";
+      sha256 = "082bb72187b9ecd8911051c27a0357ad83fc859a351bc6f48fec4d61961e9b68";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "bcc4e2f3fbba6bc6f01a2453165219ce02eb24852d89b0720ec457396f6d0cf0";
+      sha256 = "13303d06a49825000e7368e8416e38fcbc41f8c9f795b2af6bf836b4f7c65915";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "4fa638bb86d4c154a9c98d712641f93cd20b87d57320e39fb0632f64bebed14c";
+      sha256 = "351c468bb51665019393083c834ffb5903b1fbebdbda2560fa233db179bee441";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "c36363ce1af201aa457d8a230fd75a5129707ffb75b2c84ad4dd0341314a3df3";
+      sha256 = "f1b2dd8e921d8eebc6bd10b22aca1ce4a48818dba830cae131cf8fe7704e7c6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "b87af873d33da71a73bfa3e0523b0f9651df8921afa3c8671d73a33ac4925346";
+      sha256 = "8e5dacac1a85e5d6aaccd9939aec63143d1688a657e5dc5f0f4ebfe1094acbe5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "a7fff70158702ede22335388e1e695f5e7086d4617fc868f7f2c85957820a50e";
+      sha256 = "14ea2292bc55272d784a0f7d8dc8827502f352665c8652d4251f83cd3e2a6fbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "ae65ea701ac7c4d71d7de0d175ca2886002704c66a9540af81c92c9fea1edb61";
+      sha256 = "3e834c1967efc38e6377fb6e91a40e258b4d3e99561e7d06e7239da0b6db0e6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "3740e4f2065cbc1cf8e5dd413fb9fb1d735e83f28e036cc70dd17a592a4314db";
+      sha256 = "0cc79f9b74dc4b8bc52a004e6a299dc7c3067edf51af894a9ef93ff865375daf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "7f12a9f9e7fbadc91f363259ab25efdd0eb0e7efe876961c5a55d04528a0a8ca";
+      sha256 = "ff89b979a9bb6e97b71386c492d0e3ae05097cd21ca4388f6db28ba441bee705";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "430cb9447c248f780752109176652be758e11ae8be6697d9887b427a93d7f4f8";
+      sha256 = "69943a4fdb5137baa73fd3c884cc7d2c4c8d3d3c42103fdb4590aec34206df15";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "69cbdc59a993867bda380c425cb8817cd332d9527a234530d418a3390d89571a";
+      sha256 = "0c6b0bb20622e3e181148deecd505c22ce7d3eb70cb3bf89fc234ccdd84384bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "63fcd5c3aa54cddc831ff612e5a4a81a2d0dbed209884c2f245f1a36daed2cf6";
+      sha256 = "fb13b9888715720ceca991f449e47ed05154f29f080bfe4c99ee494ac92cf86d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "df7072dca96da6164e8ce0b523eb0f09b5f68a11d53bd9eab0c81ee158e823e8";
+      sha256 = "fa37aa2739232658cb0d947f15ba2839c8b28debb0d3bafae1805a8fc065580a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "5bc5002bf66948e837eaf42a0b397766416f14c539ab1684e1400b2febb59b5d";
+      sha256 = "7d300dfc2bf2effa515b05c7e8f51c9c3388024a311c6da9fed1d463bd1946f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "b91a4b800d350b018789a6cb08bbeb6e557ef492b79f03c2479fa931eb5eba55";
+      sha256 = "fcc7f8310a689c595c387709685af98b4acc71d02ebf83b4b88a5747d15e7bec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "4cf3232c157eab869704d49f8215f1096f421aa58a5a2653ee6fe186375118f6";
+      sha256 = "92b2731ca8e8590d7f5c69e48ee196f4a0a34dceaac8eafc3773c15f7fee1d77";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "26b0318f7d6b8e6d4512fbca50df1b0848ac6df708eadb6d35ff557214bed2a3";
+      sha256 = "ca7e1a463cd090e64e798b6f6563e9751b1aa2d4b1227c500bb111c53b3fdee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "3de6a419eeaf8e2b7abd6204856604d52dafbe9457a261d99258a34fd9883d34";
+      sha256 = "f6944b6bd4b086efa5b60a0605709adc737ba1a4ecfa4e689e124331465eff76";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "506566a4074aa217fe718145d68f5792310816bef7d03412796925eb2f497b2b";
+      sha256 = "e834ba503dc7fdbdbdf69a516126cb16cdb089eddd1b2773e00c5cc0ff4d7658";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "6b4d36108ea50db402e5dde3722c251150037c49e13dce7067119029d831ab38";
+      sha256 = "dd4a9c7d87b2e1af7f87b083910682967cafac68aa1c4c87f6b6dcc69bd0836c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "ed5f409da41108e7315499580a848fbc38b6795dbbb4873c1a49b654d3ebcdb0";
+      sha256 = "e6c157e53ef0eabe645ede759f83bcb1e55d3d7da09fb29044edd7e1fd139de0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "3d89876f2a64a0a089c835efc068cafa8f0611a393bfda1e700fe174ad97ea67";
+      sha256 = "28d50138cca863ee4716f7be693950e468f5442b770dce389081caadb4e86fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "951a928b96768e9223a5cbf15000e6492b6af0fdbdd57ac04a9485dc90750a34";
+      sha256 = "d16a2cfd1bf7602c22153b7de4b7f74485aaf78b09526985390f4d35783134cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "b0850a643f67d4f426cc4da800265476ceb3073be86a236e2390209a839f6580";
+      sha256 = "2e9649b9ea8d6da502ce86fcb6a9ed70a4472b58ec7f7a85ea7116c455b8744f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "b4eaa6d28e13ac082207160093c89de7338194f821d4568a8d48be94e6029cd7";
+      sha256 = "c566fa2adbbfacdb9779a99a7f925e5a6aa8be78afee2fcc9d082806a7a2998f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "16aa9aa41615fa318661e5ad4cb44993edd8ada4c8a8a5ee6ea2d2ccfd80e4e6";
+      sha256 = "c082e76a703f1d228f45199c0d37f17334720affdf83b9860b538b4fe0381f11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "3943715885230fe7fb60b63dae1d6b970ce075f4ede2888d6bc04600afa0cb1e";
+      sha256 = "ffe9b9bfa9742d259b1da9675005c21a1018d865fc33eb3006a9757b7af9d9cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0cfd7036ffce0e751df720c2fdc47461904eb75316040237ffa9ec65869e2171";
+      sha256 = "d6b872285b7db3d977d06e37926250a0d142869c95d60673da38caaadafe6626";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "88f59df2a7c7f13766f7ecadd41c27502bc7b1194c29aa700e319e268123e469";
+      sha256 = "e37322b24fe1d3248871314095726a8ee53616b102ddb12be11857fb9fb0c72a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "fd1a8b3fe4094b98de891b401fea4eb082a82e0c207ac79fa430624f2d7e3de8";
+      sha256 = "7859f61b331dd65d9f1e3b10919a9d442cdf8f1edf5419944a5a9ef92428e133";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "58ded2505aeeffc23007086e8fa183db81b7a1319a48ee00743aba222f82c43c";
+      sha256 = "7b50efe8bbafe360ceab31db923c61d196402f499bc86d2f402c11b879580581";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "62dc719f46113287868cb898f29b2390ff2ad889613ab7b7cecb15b7c14c020a";
+      sha256 = "29f7864de3051dc8c63458a4291a03f5cab7c4f1cfcd038cd4cc097300d3fa32";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "da379eccd174c83b80a88d08f31069b61a687f3bf97536fbaa9815314191a766";
+      sha256 = "5487cbd69515dde8e0205aaa6a8439e13e330ca55869a45f4d3b781d2d4b04f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "1e21eef746d5a3fac0bed5fdb3f536e705b947796331af0faaa40b7480e6b7bd";
+      sha256 = "f7c76d6d24897905a6578d58f19645b197d9d646bea1c9bcb499bbbeddd8e965";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "cf0551a0409ed7283baf68707ec51312a170faab606c9da859143f7e114884fc";
+      sha256 = "abf69c3363150980bd1c1a84cd3bdf2d39e4715805f11256a1db38e99e431bcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "a2ef452fff308991e1c18d2ce14d62c2b8ae51b6a57e4c12d04159ccb625bb8e";
+      sha256 = "cb9c91e78b00589aa06286af20540e0fb7fd99e045a602aa49353db5de84ae07";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "36655b97674d1d06d4beaa9ea6e4a62b9ce8918cde026e3a62d5b72cb8f23d40";
+      sha256 = "41074b15a8244ec003bde022c29f8bdfd9cc07b7761af8840380c5cd8deb07ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "c264873f843cc4b622a6f21d9608879b317975a06cbb7bf067eb0d67abcab6d6";
+      sha256 = "2b92b43fd83c02243e91d4be7a0a4f32b1ce5ab3f43d2eb98a177ea3fa8c0bde";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "c70701849574b48d56bccff74d68f61d00728021110b5a66fe6c9cd534e8dd43";
+      sha256 = "5b4f1f32ed3ad38bc47b04faf68944b9c2eb04f85ac3b6f3653b526fb59dfdfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "b03e20dcbd79468005bfb5deee8d888aa11d5707d0d9568f8abcfd8d1014adad";
+      sha256 = "603f2ea427bfdfe79bc7087ea3774a4a1deeb8e446f53ea5483e3180e452d59a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "af7fb0e75d98fabea29580ee313ed18f49062917d73e272b16812c7ad1ba35e3";
+      sha256 = "6364d2a4b7ea39d89f654abaae3a291577e74c8b0b764fbaabcbe0992f583159";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "d62b8c0c305ca45ec857f026bc27157482474be06ab3b13180cbe3dfda7e676d";
+      sha256 = "b1690c817759405a79cbc6a50d616fbccde39cc0d99779ee4753603917c1e37e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "595b01bea796801dd3b35256110290a2c746836a57e8a2c7690986bcb96209e2";
+      sha256 = "30b75291e563af62919b75273f442884c9a262fb2a4de542d53027de223f720c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4c8f36075976c6de8345bfb7716be26e12bb620d273bff2f951530adfa5b1d3b";
+      sha256 = "2b338cf87087b7a4cd172b72a62a52507076088c0dcae1a9f63fe6c4722a6d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "cbeedab2fc5fe6c563f49d198aba79007a8e149422e046a2b2ad540d18a80e49";
+      sha256 = "5b1a5509577f307b24065b7f4e88c103306b9937c4d98e49cb9aba97abf2d3a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "1820073e2ee74a85a7811e2cf6e8208aac984304e3a060006a4a9c6092357677";
+      sha256 = "cd5b37a95f414be5af6217ab5dcf983a7ffdcfa78e013b9216ed57f3f9d2a224";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "35b4de1b611bcb11ab46567d8cbc5eb369f12ca6455823115cd0c6c3d0a28f29";
+      sha256 = "866b567cb5471d434dddbcb58260291b99a322f67b6e203086762083f1967e7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "df3c9b89144194e4b20244ef8d42b6a2f1b075f5b0afbaacda153af2aff45df3";
+      sha256 = "f5393dcdbdb367bfaf0e1e47ce2a445add9fa265abb87a0c324daceec3a1d0fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "b198f7fc147179514be0ebaaa726cd66fce74cfde162d2d32e1756ee20f7d903";
+      sha256 = "e4ef81af4c352ac12a5a3fb3dd5a34dad3c9acf3ac639e20141694da8fbe8ec6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "73abfe375f5f858e82a9aa737f7c07b471f47a21adc861cd7d48643afb6f24dd";
+      sha256 = "54be4106d429b1df2ef2d5e3861712f69ec348b47f9bb2565c191762beab8945";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "28bc935a00b9ffd14077aaf3917e4a8595ae3c629f08af32aab3000504130e3d";
+      sha256 = "ee229ef6fa1fe743d5364914c990172e39a9500c2968afc646bacf14a3eb8742";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "efca639b23420c79025a977d033a0490ef5577ec993527e9e5780567cbecaf77";
+      sha256 = "1164bff45a4c75283d70a1dfebf12dd0729275a1135be9710830f7a8eb28521b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "c689143914019a0c824d5b9ebe079d3d0e42a6f8e61083e873c3b5aeae272e1f";
+      sha256 = "1317610e3c18cdbd81c9712cf7e6c3ae589952911347c027d3d3a271ff9b9f97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "e1abb457c9f144a16baaa01e10c4f3ef1d8d55cfa7c10fe32030af14a889dae6";
+      sha256 = "5ed49bb2afa8c6e8197a20576e97957f0688c144605a5f1c35ebed14f7a1fc41";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "810bdc63fb5527aae67c2039a87ff1cabc5d0af1d81d0a38e5dd6eaf87e4c38d";
+      sha256 = "3e4ac33879e91fa422d741f477e7c66f947041999732c5d7b7740f2abdc5bb86";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "fe8dd8d001ea4ef3ae6d570f177fab07cf66968ca0218c328401030ff673ec46";
+      sha256 = "94f832c1a5a952823ed1571ea3deaf3a9d115b837114a60e13732de0b8211f5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "b97ea559a077fb24f54ee38b78524d054610f6ddb2dbaf01e0b9efac5aa35073";
+      sha256 = "8e2cfbf7c7e015886592a9983390c56fd251ace396bba5f34b3a2593255b1161";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "971d6761f8ede73878b1fe75d5ac054187b4039bd36f462a3120c06c5ae2cc62";
+      sha256 = "e48b5b93adf00da2e4a3ce0b4ec9afa2db03e962287d346de188df2c0d6133b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "f4c952b27fe8eb5d5aca66ce987ee7fea9fa6a34b4effa1199e29d13dcb8c11a";
+      sha256 = "7ab6ff54701b53b258bdb5bd1ab9679cf9acca9c987830d17246dae5d9f141fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "bd292cfd5c8dd4134a9f00de09230d76924ae1353ac5b11d51a11ac94208d93d";
+      sha256 = "eec1b7f5d3274267d5c25b7aa3b774bf1b44d15801568c60cfe082064d7372b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "2576beffeed165a63ab65d4abd5890f26b6e5af32b32e9f4cdd4dd0773b605e2";
+      sha256 = "6347058b34660f414784b5f2782bcef72dbd6349461c4a2f0988cce9b9af6793";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "06af1775920044c5faa89624a1009eeb8e5d9ca7bfcb3502c0ce1b8d38192e11";
+      sha256 = "6772fdc20c9a174d0e411c57ae3a383fcc840225e6c3c65b052ca54ac2369621";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "240e6519207b2b9402c2fa66a5837e97f04cd7c6ea421a81e0b3b23fed7ea51b";
+      sha256 = "a4a4e7a132bddc604ea0b9b323339a730b58fdaa2a1c0c7f06f610149c9a4c58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e4613a65d2abd33e2eaf260c41a82cf3d1201ed0a11693676d53e448832fd1f3";
+      sha256 = "e6e3f759fa1aa68736b851ae6438ca4eeb7513e7a0e993cb2774c52ed1f2e294";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "0d5cd0c510d67dd6c672f43105a1d503dddb724f665eb483a35f83e082106bb0";
+      sha256 = "a0f8f2af64f04e6ba51a082860eb699902e5f5bc27dd995b9b97501d5bc7e0c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a95390e3725fe01ad9baaade9021a418372bea41125c5cccba6f37a5251f61b1";
+      sha256 = "3c248f77a15e06c4222760c2dc89d6a8b3f5d2e39772fbd503f35d6fd05aecaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "faa01d4c9385d3f975fbc79ba7aafe59029e90fd128b03fdc1850752e3ddd507";
+      sha256 = "81a45186f076deb52152488cf38b4852b2e0b69e0e6838dc63345587d8d61e88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "89442f6b6c6a414a909eea9df7d5d1a37e5879532b4d9fe61e94fdb51529084b";
+      sha256 = "84163f185798fc4975e974b3abc617cb04de4e0fcd0494536a9a51efbf8dba23";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "20ab995aaa826d58223435f3317d8de817a165c9a5440f68e90e1a74e8cf6881";
+      sha256 = "66dc5ac5244e54c22f4ad71bc4653dd416f087008657f16d60d13ef031f96bcb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "8c79bd0ff6a8ef9f30312ff49bd40e5b000343203849ba0e633369ec6873b297";
+      sha256 = "93436870b3cde5355505738fe2ff850d28632223eb4a872c4767961a422c8e3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "8aa7056147c69bcba2d2c141be79ee89092d6af7c57bb50703260e97d7b1cf03";
+      sha256 = "955cec843ecc4360288a573888b15a257f75f39459157dd844208b012cbf8699";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "99adc3223525a2901b09d0502a90ab9c0105ac9a961941133e18adb020a4fdf8";
+      sha256 = "c42535a9c379574d411cce6d4fd5830ccd77ac7b6c849aeba68436bdf82c1186";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "a2ee8a7df24b872daadf4706ae669bf038dabea9fe1abe2d65ce9ae9a3ff1924";
+      sha256 = "470bd5f04da762cf04914613dd6eec4c13c08fa47ad066ab7f078ae4867a2de1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "3392374665a21108f4649c07b6617cf7f7340be0890ebd6e9e254c9a88efbb0f";
+      sha256 = "47ddaf3acc3f3f19479f59d5fa10493376a53d00543fbbaa9822388ad99740e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "637b76a242d6470597e7e6c35775b9989235819c2d4388d908ca09fbd14a004e";
+      sha256 = "2bdb8c87690c79515d28433f8a740bef9c6b65cdade4d34d6614bcb37c50b743";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "413a76f4bb5d2c9b32cae19eca2576bf35f3d63df59c44d5b6d99edbba2700f3";
+      sha256 = "eaa7cf469fe18e1af5f2ee1556f91061986bf78a86ba90b6c7b7ccbb65c6b419";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "7cca5cc2d2efb1f3f083fa4e953202b8108bdd735eb9ae26d71a6a3beacfe2b7";
+      sha256 = "2732019664cc9a05c401f690ee8b719dceac32d6ed9266d7ba325d9fe52fb85a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "102223dddd89fa88ea6cac413c9154863d3be3dbe1063633d977b01c71d180c0";
+      sha256 = "7e91bb6d012fd9536dd78297686a4812dfd9c4f74b6ba2c4c97311d479b76509";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "61ae243ff4451c581d74ce6f98486d5089bd130e415a6921c972fd5db935121c";
+      sha256 = "83d5c8477be5836b515e0b535c29f7e47a1633ed3464deb57eb882d167d6732a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "f251c9b9cd5295325884989dd91bd91fcd4eacb69381cda3430ffeec4352ab25";
+      sha256 = "4760c1beef65c7eac0af3722d9f57ab285d7e61c9313683a8c658fbdcc8db359";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "58e3a5927e3cf8d53cf4dd83141562b2fc6957e9725d619fa25e40196d90a232";
+      sha256 = "85b109d9732666dccd91e987409f50832cddaf2e26d56adc9a8abb50fb086b33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "3543c215c31dae3e64dd6dc58661158b8148a64aef0e0f2eb5b6da4fc75f7fb3";
+      sha256 = "26626d2859d869ad67b8a99f9d0143a307a2998f941b0d8ffbc1b2c10c5d3aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "5be9073b97c6be9ac49214b170408b563a05a1330d7008a7fc5828fba34254df";
+      sha256 = "51b8a1f43bc4fbf15a5723094f7f7b328da5a015751ec0691c98d4d2ce9f16ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "90a95fba1b9684b72b11ed5e2455b2880a49ee38af0578238eca50f0f64f5c86";
+      sha256 = "a5a71e4caf90caa0d06bc4e25e1871165c9ebe8e710fabb2d52090cb823e5ead";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "1d1eb37923276bb744e7317e5a13f754c1c40dcfdde803836096bbab4ad1b73c";
+      sha256 = "99c12506e095e94890dd10e684d0ca942809a3a37e2650efa72ae87e65e7b45c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "2f0fbf132c1bf3020c25b0b4a5d3819c7a8976050a13a78a2ac1a2a7a8d90639";
+      sha256 = "212018c48731d2ca8668642d2c050300a41c08d2a7abf5cdaa2b185dd9c3dcec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "dbb1b75a4504cd974330b831cf101780479e89128226b3201f835182501a20a8";
+      sha256 = "a25b7e77f2d00bbf1d09cf3b70e8117de7a7ca8f561fe4baf15efa699a5c3d52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "be7accef05071d1e3a3eb91c651a2a230a15a6a34f0b631dbb23dff4ab04c48d";
+      sha256 = "e10958a717fa15b696221f011ca5bfe9b6e18d6956ef82fa0ed6bc760cb18ec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "3fc7184d29e01e8d35fe15593b51ac1e2aebafb81efbd0f5f9439c88de92dd43";
+      sha256 = "8d7639036da625e60f72e51fce640bd2a447059f8fbf6a6b7209cf1d3a74e63f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "bc5bef76b02704e9bddc7789cf2613619b05bb8ef60c468d908a2718f70cdac3";
+      sha256 = "498405a39a28c87cb46f2012b09124e51a3f99e25fe9498c1241594ecbfbf302";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "dc6bd8c1566a001a96d09d363b409e4fe1c4789c68b790c1ae3fcfca78c5bd61";
+      sha256 = "29e979cd4639b9bbe6e9e44b79b5173a8f488286382533bb8cb815e4182af549";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "538a52ac76c407170f20b8205fe8d9c8d87e0994b0ab317adbdaddd318f59603";
+      sha256 = "7e8f046e1b7446b15cba2e35a03b978b7308436176babd5ae284e318ee5367ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "ab2083bb3f0792c9992c06e9f36301d32303d03018e23f0637ddde9be3e25e24";
+      sha256 = "7ed54fe5b147236c4be842c04a8341bbcfce15d21b457b516c4ae7f5f36aa34c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "b9c56f2c5e09fd688cbbdcf3ebc99b4b7f057ab481c1fae0a7a2e5861b7dd762";
+      sha256 = "5d4ee58fda8829d630ed0e6f4db3a45d0d45c26043d7899110939ecb00646a05";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "58b8d7fc66556775aae57b4e94c4ec634715b82aa2315af59ca22f398d82ad02";
+      sha256 = "596172e11688ca78f9fe5da998723cd63f9772262457db36a2f5fddc0ee614f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "de930af4f10e568f0fea89b8e13db00022b1e2ae2feba92f4b83bd7dcf578a39";
+      sha256 = "9830062f46a64e15681d39a5432a63cbc3175947df962e90f58d8c97d410e9fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "636f7e563a3ada0c596f75098ba74880d75e579b70aef876aa8f030066a694d6";
+      sha256 = "99f5c37cf3fb9a2918e760ebbc77e5423903479cc77a869c600320a365e877f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "856d81557b6acd1e238c04dbd8efcbbd0fac05d31df38ca1b6dc05e0b4823920";
+      sha256 = "1b3a3b8456a571948a6b0c15860b9931d66cc04740f653db136331b8ab0d8cdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "757fde5c9c72658729bdaf03fdeab06606c83286ed06c6a17d5c9c034ccc491b";
+      sha256 = "82ecd81aefd3a2e3ad39fa20bb733f4547fc32673e030456e31a28e6329365b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "99ffa29be7c64059386d15ce600fb52f72a3e8a98291f88858092b7577153a69";
+      sha256 = "125a5c6aa708de9b9c709860c2ea74dab9ba51f40f87faff801f7cb217151a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "1e15320ded4438a36166e85fdc57b2101c4a1ae4c2790f9dfaf4a2d623c72cdf";
+      sha256 = "35b4afe46484cb8ca9093d38fc155948474c80538c3b1721ce67eff9518c3993";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "f102f3daa8d5b231a6d3c88692e676f7a776a7bec7867a3130edb7664d694416";
+      sha256 = "d84dfbef368b9b990726e5ee5fc8ad3437696d11747f74f5301d5a52fe2ebb5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "f64c48c0376bc7a3fb78401cde45da6f384938a3cf8dc728afe5f79450f28f7d";
+      sha256 = "74a2a1162ce5703807114d2c3a727db10d74367f22a97866b084e23293ea116d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "28b94d98a68653139e4920a428915cfecd230d933d8276122907b98b08880e4e";
+      sha256 = "fbe97f24739b24899b666a04b6e5513a1b03358bdf9d3622947da78013d39b80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "3c1aeb66d18f386fdce26b76dd6165b1aba5d3abffbe50518a7bb98cad0b260a";
+      sha256 = "66516cc17b46140a59e08dec29b65a2c7abc3812279edb25f0f88b94740fae16";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "0bfd5977424a287b4dd5b33d3d06ef7a46eab14b9528b4faab9ac5624bcf5a15";
+      sha256 = "27143f96bc4a02a09b2b86d46b4322d1dd76cfea719c65e81f19666baf239210";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c7b00d9601e0dd1b58cb239a243a9814694517bd72654598c9b1cccbf057fad5";
+      sha256 = "8179a2e47faaba8943871443550f2d562a1e409c2af660f4adc93d3bf85ee810";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "19a06f0ef997df9fe9231393e2641f162b473eef0973c35428ff1c9acf68e790";
+      sha256 = "11a536ccb269258bfdf6810d86135cb8d5802071eb659886a2aff7e63ba2f5f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "147e73c10914893790ef2f07929b9b448114f9b6decd42be231883c1b8fc4a98";
+      sha256 = "46f88c04e1e7f2eb41344aae1f7d2ef6f0d49385c8c6a9aacf370a4f32632e6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "b7fd70dba59b97246f2a69815b63f3984fbcd0551174bbaa9ba6c767b81a1f65";
+      sha256 = "07fd992c396199a92b09c93f7478411b788fb132bd2df4446a38ec6e0cf1960f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "bd812c4b22b71be191a17936371f18ee6a1ffc97a1afe88dd1c3f4b5c0aaa9c9";
+      sha256 = "e19dda81f715feaf6011d7f59033df2565db0ec623b7ceccd75538cb3dd7098f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "ad42340b285bd9aa28bf5f568d2f559cc2525eb4d3c76750766742503208fe23";
+      sha256 = "3fbf0c116482cb641b30db94ecba745df05a419f85eeb0c09180582baf5bb072";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "1e1325a80bbec8eaa0d0fff8d0fc09adab19c43e51160dc041702768eba63220";
+      sha256 = "0e906f32a4ad896f80bdafc28a4cf86579de2ddb5c19dc7dc5a430f58ba68d2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "fc9f36a9269c990feaba9621dfed49d9df96f0fe20155884e90807ae9d7225b8";
+      sha256 = "491126108cebab75a43eeb1fcf8e6a4659960055798488c469b2167956f4d6d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "af8210bf82898991fd9da3f8e539e09aa6a3995665cbe049558bc9245640e0be";
+      sha256 = "67f143f0d7d62772815a7554e74baff5f5fcbe51a58f1f095ec248ee3971cf97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "ebe8c62854e34ea685d7a49864504faac27453d21c76dad92d96e2eb6f7b6cfc";
+      sha256 = "cd905f3ceff4c7894aa299562fbf495051760af5b600ff35f0d1ef88fdbe2187";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "7035c1f5ce6358fa450ac6de572b08907a8bb4df4849008fb35e8f492c3cf622";
+      sha256 = "8b50ad669970fa040a3c12156c24903c3b6a885ad7cc886ef7a25507ac27f202";
     }
   ];
 }

From 2cb9a14a8724805f56e1736a1ecc85fc6750d365 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 3 Jun 2025 17:05:31 +0000
Subject: [PATCH 0863/1497] firefox-beta-bin-unwrapped: 140.0b3 -> 140.0b4

---
 .../browsers/firefox-bin/beta_sources.nix     | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 95231f18b01d..8f9940e790b2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b3";
+  version = "140.0b4";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "87c1f8aa057b132bdf97b81aa911cde1b76df420f4319052dac1fb36f73aeaa7";
+      sha256 = "79c4bae3ab2ecc83eaaaab31104e117ba66ad82abc4dfae2f5ec76dde47f51ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "995fb3776e849a87271df8f7967fff46febbb57ac4e513e520fe2790947e8e04";
+      sha256 = "699a969d7ab130bc9bda98abf1e5ff47b77dd6de0cbdb0c1201f465ba8cee7e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "a3daa36f2d0477ff3bf8af4df84b1bbd6d001093b1b7453489486efabfc1c0c9";
+      sha256 = "68f2fd1f33a6fd473c53cf0e3574e780cfa9a28c298d2733813676d71650e6ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "36bb911e75abad10dd74d9d1aa541ee8b34f7918f5867acbfeb2682386d1b875";
+      sha256 = "16d9b35f06fb47a74a778d64cf7abe219a3624ca4732287970ce9f109cfa688c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3df5f717c4ba64c88fcf873e01a667dc72ec006be98e4ccdf776381fb5c2999f";
+      sha256 = "8063552de94d50d73b2adfe01eed122e50c399aeacf4944769e27ac51af5ca5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "0fbc914fed6b0344f6701dda29c92a613650987a9c5c3b6cc6f5f99f1d77df47";
+      sha256 = "f54d622ba71e419a329768ac346d4469cffcac4b8077d686902ab254b7d5ac1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "0e07670b6e2f0912d3c7c599b7db147212b0cad36737681d8012f2dca7d8c22e";
+      sha256 = "827a6e56ff56d907d4bfe825322564c31b690058a18b835f73612384f388645d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7d96d3e05a94d268accf129fe008688fe492472ae1edbb8eb50fc29f7c899be9";
+      sha256 = "f4a9493a0ff3e35a9a0e73de70d7e5a681de1ef14e031320015cd0cd15d52145";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "0788fda0e35abb70344cc4030bb54af725ec4dc3725f8ebc12df70ceeb860fdb";
+      sha256 = "0ec9de4c5276ef24b3d0531f4964cc01bb3d1c4d44530de59ead8a4ff804f42f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "5a45b3c49e0ccd7314881494d825badb16372fda7bb94fd704b8eb49fe9492c3";
+      sha256 = "d6a1163df76100d1995929bcbce45aad6db99f600d29e93a7610662185ffdcb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "e4dd687373bf633cfde18764d9b424ac245349925a7fdb5a45fd1698b8ed1164";
+      sha256 = "00eec200da5859ff0c4ea01c582c12dc3610b4216876bda9e08bbe41f3d7719a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "f4dd916b333e0abc0551d7651156e94cdf31049d7fe7e51b2f46f877066fc144";
+      sha256 = "a73eeae5de570615e3de64949de40a6a149dbf0450170686342ef48fc330da48";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "020a985e9841238d683fa817e26f1791ea60946701c91e8eab3def9c2db23278";
+      sha256 = "532184e6c74f6de599e29360f5b2fcb7c68032fc48101296e13a4bed5e8500ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "542b5987fb29f278c2d1c0451053a37874f8a9ee1c80a3e2d818821b740a465c";
+      sha256 = "1fb82efc4e4f0b5e626c133bb17fa57ee54ff00916d306e66a96943d594b0da6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "390df2e96d9b0f2c6a5c5ef01b9f4790e0d65a5bd559bcd7b5645e632fe05b6c";
+      sha256 = "d12c2f7e5c102a83995aec62fe69db2c1f9895b9680cdb2df6bdbfc03d622631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "a0cd0379ffe29c33eb1f34dce54f56e9c6801cf25378633e4c3cf9a0badfae22";
+      sha256 = "479ccceda72ad7f2e2d0056545878f43ecd72ff834b09b7ef7e342955eaf83c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "582033616abeaa16914802635720708294de44afb42c118098b5d30a3df96968";
+      sha256 = "0ad71e504abe067cb52d68d88916be3393913c2f1978eb98dd48f94ab6daf4f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "e05ae143147e96e5b5c686813f8284640b193b12fa1ecc878a033d7a6b62572a";
+      sha256 = "40ab7b73e1d433eeeae0c8b5fa5c032d14182bc526cbde7b4efc2e32c275a3b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "bf11f20d86bd8c8fec4a4d9fa14adfba00e9bce9b40f9a899a0fe8cafdfaa89e";
+      sha256 = "cd782ee1d65b7fd5952e30c6c2c285215f7043f37b9ae3bb0aa51d6056b6a824";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "f4758465dedcc1a1abbef1dfbfa1c1a0e630714eddfa98038826033f7baaddca";
+      sha256 = "19736769c65ceff853bfe9c4fd6541c2e30e13166dffd707a1a96077da5bee1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "75949735b5d56b36a143410517d109d55139bd670d505d0b467288094ccd34bb";
+      sha256 = "8880c95c0d00a51cd65829ddf5eca2ae9bd0f6a7e995d1d532224c223beb4a70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "e81b992506abce52d839623334376229a35659699c8770516b3c7e34d810ead7";
+      sha256 = "56c46be9058e82aaa046788499c0c6e96c48cbeb0a05a47b907772b2c73122a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c1428da2dfc7a16deb7b9570fcccba94c13158373a359804233a4b5f330746a0";
+      sha256 = "40820674c78e05b1413458c2844e874c8521670780fdb4489e62379a42fba704";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "54790c6e1050b34d380e6daf96f387379aa825249af5889c71752eb728ecb10d";
+      sha256 = "3d444671937f8438ad98b3bf2ee935233a8025c0bd7de8a916be3d1806168222";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "d4dc96fba97c8f0c96ec5d596aaf6e30fe5f467399b59307ba1e91b5471979d5";
+      sha256 = "640d6480bc2680609dde51a76e512c8e9d1d8bcc93b75af239f254b824a0b330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "c9888370387548a0c7b26facd131e8effc9b43bf27d4d2ad31cec12c3e39eecd";
+      sha256 = "7a430e844e216eba749d2e65cdd5f698ea5e450e018e1a217b993c97c375ebbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "6fd830a501cebe0dd6a005cc00eb326cc82c30f38836da4ba46a79be13401377";
+      sha256 = "1905f4a96c7de86f9b024d41ba07758e478f55c43d16bbb817c9b8e36b544e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "0f65338c18d4cd2bc4fc5b4eecaf62d759e532059588a920ce19de13d941ec7a";
+      sha256 = "d7eb82b97a007de775afc9055e33b7b8dbf51947567fe3b1a6e37e2b8765c4a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "904917e0115be1015954139ddf50395ec69e297082bd37f14a280415471116cb";
+      sha256 = "aa3921d10df3e89d33375ae23b32a668e78c22c30fff3e546957d75c815d1ba1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "9e03aeda162aa17a17eb3336e430dffbc415685cd211aadfc43a5f616c8e8758";
+      sha256 = "b678e517a072e9aa3a585acb027a59b3f18d0e4e132ce03cba26c8d5598ca04d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "6054bf75fad6b65c29b2f7c4e223df75f02b5ccabceb86b9c5e5e42b741f7bfd";
+      sha256 = "e23cedbe5d62203347749feaf3ad189b19593be7d328519296d727c142b07774";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "ebea919c503fc4523e1c594216ce8079316c9d377ba9bae6a6729ee3182c9df3";
+      sha256 = "a2867f278763c04b7d1bc50bdd4dd5ea49be62bba9986740b680cddf6f2b458b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "3126d98ccd0c5f16b77a71ad4c11423482cd5c7d8f7d10f7828e9e6d11e0f461";
+      sha256 = "a9758c8d99ea549fb056bfba4f74d70824105bb5f999343347d661f4ccd53283";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "9ddfee47dd74850d20f7aa87cbf92b46ff237d0a934d871025b92a364b2cb4c6";
+      sha256 = "12616ac5602bfcce857eccdd7ac50a98bac7bc9d5c6510ac49ab4627d6c762ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "05025972440fdc4087266a88d02e6968b52a43ff6d77f0190a659eac6ae816c4";
+      sha256 = "a6b9aaa2fa7f8c25efcf338bef0bb98d57535c9ba7d0c99775b2b6cd0c44f15d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "4243921762a60f5ce51e7737b6d3fe9bcc4dfea67c9198a1b917290efba9d0f2";
+      sha256 = "13a13fa59708aae286e6f99cbb301334ed082f94995454ff8f333c88c214f67d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "71a26a2fbaaf721ea307a8c3a8b083ef70077765f3a7278d25385b531ac315dc";
+      sha256 = "abf292f9c8a74e8f342c1e573441c5f2ed93a646e308131c098634f0e8403fdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "c44b110b0fc96d3826103b0799bbd3df88cee0c8972f7e60f556590e053d9636";
+      sha256 = "7ae719127ba74d411a09704cc68801ba147aa46a599f75da4e1a1d99c0bbb4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a6707479746e71d8c3d5af40500433c2290fce9d2ff98bd3ecd89bdbb9cd182c";
+      sha256 = "16391a560e0766f246ec605d5761f5445a9186118d4b9b154c5aa76d2694dde7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "d2dcd4701b0563af8825c3eb3aa22ffd2702d9a8458cd0ed4896a9bf57c0d291";
+      sha256 = "88acc62bd18a767e3ace84d758359fd2e3483cced4b47376bb4b62abf0607fcc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "eec813b14a376b6f0e7c251ada0e972fbaae06db077e1e5ad63f5a069c81ad97";
+      sha256 = "00e7bbaa43437143c28ee9c0c661ed7c30a4ad887a5de6a99b53d036f8ba28db";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e3952c61718e26ea8f9aeb73a3b8146bd0163aa87388db2f518e997aed1163a1";
+      sha256 = "88442ae052ba3e93b65d7d878c5628e852f25f192b987a0dec40bb7775fff789";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "b00059920c29e3e11dbb2fe3051acee804dda39838706a65c3716bdccabf7e9b";
+      sha256 = "c64522ad816a1b8f298b141bc545895f17aa495b3c227d377ae4bc89cd01ace8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "d77d3d50678d17098e9996edb0642bd8e6a1ccb983ea68e376d59e2ae0529779";
+      sha256 = "dda7aebbb74867704f5b4cbd2fba4a5f5d2974543c48faa4e634f746c08fd653";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "45e839005799d5bdbcbed3869680da6ca0ad42c3f9932b61e0f8e3fbc0316fee";
+      sha256 = "3ccf8a34bbad1bb4efc5fcf12aa203d7098c22654910e068e8af92c9a21056b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "2c655b6b1e91265befe5f7c1745a9ea8f4a97f6995ed2f4c4b3eede9fd07c8a5";
+      sha256 = "4b4d9c7965fc90649ea66f91d04f885c180c6127ea9ab8685b2229f148497a20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "bcc23fec185ab50660111850185ad9caeafabc056a77e6b8d99e12962da030ec";
+      sha256 = "e68ad63527eab5b51274d5b23a4e1487b01e46da6f58f933f1afcd3347eb32e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "c70ac08f5d1ac3c2175b5c1f0fed88564a8fc921771e0cb6082bfe9502f08407";
+      sha256 = "5546814c18755b68c3eff2903599e1a8c9612ec8d13b1989ebe8db66c2331adc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "b77533733de76fde27cdcb220f2f4c985784aeeb65456a8aa4f22689d1a78633";
+      sha256 = "98eb4c8c3a34600d34fbbf41abe853390193396044e02f8faa2b841576730eb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "e8d28dfed20bc64fdb431c6149c8f46a1601dcdb7c198e6aaac3bc26849ed564";
+      sha256 = "4ce9326633f6965b19cb116bb084af2376b79723e3aa2125f6108127ce797c8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "aa7017e3cc75ee281523f109c5a804a2686cb2d120af07f639cbe6e0b529f95b";
+      sha256 = "1633f576551a196695492299d9cc6c654b7a6fc436ece013c0052d0d59b18fd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "aac539dc6adaed5e46f5dc180e6d5df7e58e7d06c9b3eb8840f67bb3005a3d1b";
+      sha256 = "4fa482c73b534fdf8da15d9f242c319742373aba34cd2033d890c2e10ff1a952";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "dca7592228e259a535805f0b40473448dbf5406f8bec1a313ae39621ba3a22e4";
+      sha256 = "8d35d90b1a228b3a93dae95913a3a246824f9fef9ddddf226d1d45dbb5f52cf3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "02cea8e48adce2143ffa78f564da31a26355572df7bf1a379e743a7ec4949a90";
+      sha256 = "39e2c59bcc692622d37813b2c6dbdb53322217759bb36adb3c40e564fb633816";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "12e9811a0fb02ff7c52790d2fdfd116e2232fc6788cfd84e9d52009ab480d846";
+      sha256 = "5bfbfe860b5594b35583dc219524119d449ce843058c2416966923db02a37b4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "fbde93d1aad4c0cd059b14ae9ae0bd1ccf95374009aaafe68e830007b4cf496a";
+      sha256 = "dc60d8f33da1bf2131700143f92c45c407db0c72198a9eeb30be6c50ed219fd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "975aaf5d7a139ea4ecb3d92b2cff56373a63069e7735478eafa596e1dca2a7d6";
+      sha256 = "f9de9ea646106410dac113ed8a43f7fe5d8b2ab78f8cbad800c7e06f39dea83f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "6c43fd5ae7e8d8af3e87940dfb49a6183c540fc18e98fcfe00ffce137b5682af";
+      sha256 = "046fe9882ebbe7a16b9c4e3a46881d3d58e524903e69025b41d4cf5ddfc39cb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "da9bf66ee9231718bcbcbf16662b631984b75bb73bef82e58d1442560a2c0232";
+      sha256 = "c3f54a55d3bca2b3d16bb808161b31759a045624fe3828fa4dc00d4395b6e934";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "c8f018f9494291e01e4dedd3dc0e496c1c4fc4d346896f5225972d182f231c57";
+      sha256 = "cc6c6f218dd93c702840afbf6b4947fe25f9a3ce6f1f0c3d6c53612f5ffdea6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "6a46324a4abedeea12aaeeb6f88af8b0277af5863a4977f06c33a0df7d3a9f3f";
+      sha256 = "6413e4d6878ed2cf612f8562f4d7a87b572b44a861b98def88932f5261d4532a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "b1f2fc79baff629f24d0ae75fb8b29559a607b8b1434d745e8b9b5ab0c40ef14";
+      sha256 = "f193552cc2c671273e2ceff6d63b721d994905232b1ebeb2272406d11f7c2631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "04eceab79c3d3156fb27968108abbe0d7b0f01608f788eed474512bb82412fd8";
+      sha256 = "de2083da32a191962280df959e5f2bdf5a9cd1bfd5e619236052225b2c4432b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "17e8527080d60c18a363ced9e36548ed5bf575e8ad62bf5c397cf26fe06cb078";
+      sha256 = "060c67fc339f7ca5685524c6164b1b23783c5959bc1ee88947ed5d646a4469bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "19e137672d04c8eefff895b9c434a5b940c881aca4669b5f31947081c202c476";
+      sha256 = "cd1b449874fcef63e5e7366c26c88096121212ea92cc1a20b8d0cefe3d1ab6f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "97deb521ad609263c0dbe13458c4500021422a4f3bc84bbdd2a1aa290d288abf";
+      sha256 = "afe1046c6fe6d1ba75b57520d2162e23e190d7eaebd41bf4f8b3b9cb435e34ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "717d6e19cd002fc19208cf2506f2d4508561316f759154ff212928a20a44a195";
+      sha256 = "5b5b6cd0004f7ace163588b162dd2ff7ddb08064e5bf2e4ee6c73a5d855c3944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "765d8adf054295479e63d40fead98656d3d672bb7f4a42a8dc9c0cd5e8c29815";
+      sha256 = "60a452998b7797a259080a39ce7900aa45a3ec92e09933d3eebd654cd2d9cdf5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "74d183d64ed423bc1dea8972a4f32378aded5c733b6f58a1e6d178f49024f7c4";
+      sha256 = "b1cc96a175d3377eaf6ad67f3737d08b5fdf45e54312d0147448167753e0b413";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "883fe66e83b2af674d9596a52910f28703548bd7c0615e15587a980a93d38c16";
+      sha256 = "44839b3805ab01d637a5adc270e9e86086f96b7b947162039f6ce356c7e98d99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "ee586be768d0035a681acf83b5c68cc1c5cab04054afe8deb141a4c9f21d2890";
+      sha256 = "3ee9443ed3a85a3b4c2a22db5ee258bfc21ae8785675ed5b11ee8d5563cd16f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c65c7e68fb0ccf5b01bf17aee844c4e4ecf5192a630a2b4e2bb30de5752a9f9d";
+      sha256 = "30270dbb80419f92173ab90c2b99269dcdc5052a94efd1bed12b223d68ec0fc8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "a097d98e98410dff2c051bd1d9a2667d54da22df0a1578c0d558e028835dd372";
+      sha256 = "e22b7b27b89cecfd7866648ba16db249f8b53856bc9e49e7d722ab006c61a052";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "788048f852dd4f215dcca69d6e658e75bf52fa9a2bdc7118b27d47025343d55a";
+      sha256 = "9592fbe56057246e6519641e4ce97d727e894cd70fab2aa91aa63196e13535da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "b691ae86cfc7a1d4d22a25c04d84e89e3b616970012559bc182225539af0a92b";
+      sha256 = "15e0f382c19db6af473d49dbdfb48c2b8891255cf7b85694f1c0ef12620c4bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "b9f502952d67e13bec4a5d4c7a780ed5f06c628463cb6c4a3c5b70febb2724f4";
+      sha256 = "480b8d1c13c8a647feb799366c91c9223a3b3afc32e6e758d7edb57d016fb4cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "daa5e9adffeff031b2bd764802482730cb37335a6a4b5ba011e708ebe39f771c";
+      sha256 = "983807e6ee0951ff1cb56518a5d4c764a204616a6826381e43dba49f8c398836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "3a2ebe89dc72f8b6988fb6742340623423df9d166030ed691c884d013de0fa83";
+      sha256 = "3be3f00cece3378b9afb0364339527d6f2cad06c73cbf095a4c6fe34a0f7171f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "db27ece945871d6f988ae710daf52874e4d6cbe03eb950c4a4faeff6d67bd9b1";
+      sha256 = "780c0e439a16d97b5a0a4e8dbf21695b18316083496655d89ca7c15762d30ca1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "976b40edd9700fbc012b55584824c77b4839be8cc2269dc8a178c6b2b3e57041";
+      sha256 = "394998ba5da43c7ffdb36ba640f3657e286faeb09b4895171c689a70aa0357ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "e7d94105a1bbfbb30d220e7b10b6c59118a7556541bb2a25ba4aa3b454827841";
+      sha256 = "c6f7172c8ae66768a8c1c8ec1237d50c1409952abd90f5c7baa6b0c2db35c94b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "cc38654e9236e9dfc8b58e3795c9d347447f3832c8d5b6d50afbfc1298c1c996";
+      sha256 = "51e4555381d62f4eabcdb45817fd91cd025eca458a175c8c9a9927f3c8eea624";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "12e95e82e29358039287da28a81a7f90d9d6dc7262f0f2aa541253856931eab6";
+      sha256 = "9ef1756da491f25f7357deb640604f470a3a159211f0ea1ac4c31a657a26b1e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "bc6c1f3f4a8540baaa764aa34d571bb5743e2364cebd49d3326ddb01ba6b20cc";
+      sha256 = "62d5913ad935a30f8b6536231a747b54b69f81681f81468a5ddbd5daabe10431";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d949c0da8ab52490c03fb8577dcd10a96cdf68378b4a70d5fd9ac28f6cb660e9";
+      sha256 = "df3ac2759b995a974762a94018ae6c7c142209e7fd12be96186eaf56b5447d50";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "fb531412139967abb42c99a5a68fad323892b6101953e8e6207d45b9f62a6f94";
+      sha256 = "a107def094ebf1d6bd77b05c153747fc058f3fcced730aa5513a8a33a2f34ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "a04d2d0347fb2761ad58b85304e0f8f9ffd343366608fd17cf687c2d53e61009";
+      sha256 = "1ec6bb2204b6e25e1cef465abb74ea115914d1ec179006f4ff9ab8d5cfa95b05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "ae8abbd42e9dd09213511f359d0a069e8f58b8fb8b1139600fe678cc437e7fa1";
+      sha256 = "47ef089aae34922e892e5e24fc31f0a9ed0dadad427834d46e96dbd189236a1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "9939bccff2b5b00e0da9764d0d859eb17dc68477553c61c3bf8a3dd632779638";
+      sha256 = "c3ea0cb6a2f1430d1f96ae5a3bee2083b265936ec9a5625ffcd31c91c542ad01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "844ea991305f8b946b0c5ac059788ed661abb033016e8c2e096d872784ecf20e";
+      sha256 = "0a8274d9d638706a05dbb5573191fb5c604da633a39a3065dc46e75b50bfe595";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "bb21e776ffa953c82444f34ae9f81d06fa8d725c5a86e5b85b25d4171ce6079f";
+      sha256 = "9de2c77e2cfc1cb33de926f2f0af656369071ce896086c39b0f6e823802c5651";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "2f3d94b992a2a89169cb3628eb807967c0f4b02fb25c14ee7f9ea925c4d78e85";
+      sha256 = "ccdf9edaa6d7642a066800f5edee083c92303473ea9eeafd04e17505367ce082";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "cf58b75d8a9f1a4b8dd702a5dc4f3b8fb676e0f1c0d8949b445cef0aede13586";
+      sha256 = "ca2deb4e79e3ed447e0b62c678dfba1bc3d47749d983e478f98eef8f075eeea8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "8cb619b4d8caa1a6e492b8b2815b4c41a25fe3b6f53852d99ca55da56fab8815";
+      sha256 = "24b5c9689dc2958f4607932614f9d3ac97286248d932bbe43574c71425126eee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e5b39883c5e0a906873f4af0e8d6a630337d05467759741276077b70deeaa23a";
+      sha256 = "278381e636f98ec68c9ed75c721cff588f2e291a1611386db6b4f0038cfa7403";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "a19d8f0262019768cbc61edbe3ce7b5eb69571b5ca1c5cc9736025f10e6250ec";
+      sha256 = "5d4d4db5dcd4428e7ab6d351d4a1e6fdb7f6f327d031ec045f1e0572f39569be";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "4525800927692a4230034a5ac44351b87857e5292e5bec60aa478d52f55c0606";
+      sha256 = "1f7ed2ac92af2d802e743433d6d8bb501057a019770178afc4f83d9382f082ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "fad4ca04ddb978bfb405ef496cecfc54e0f59ad5cfe0adefe9f79bd55da6dc9a";
+      sha256 = "941d716e18c08961041052a3e3ce47b8b927e3c2ff4e2d02aa377e18c3ee9899";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "9098b78744b8b8af558fd4edbab5be3a573048405b05376d0a08a9d2282784c9";
+      sha256 = "542417ee58e5997d60c3eaba77f3e1d7be9f5bef5f4d96e3ca9252988a1dd4ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "cc10fc7919e04a0401f910ed84092e8eeb8f926c2410c4ab2a9feb34b0a1fd80";
+      sha256 = "d501faabcda4703590242da47168bd90c1ba5b8ccf53573ea92d4ee150c60347";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "a9c75ada1290493a0f1265d47ed584dd5fe4c6ff3d763baee03d5c6741775394";
+      sha256 = "c0aade40862694b4eefc2e1b138e28802bf72e7ca99a9aa77dff668140c0f8f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "0423bc10bc9f1affe9c4a54387c9c06d003fa5d600c42e351cccd1b94c096a13";
+      sha256 = "d6acae4e60b6b50f05a17630e45da73dbe2ff691ec216c0368493efd44c4b978";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-x86_64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "e07202200f0f41d691d8d4a4225b332b51fd00c14af0e5c2c61c1317938a69bd";
+      sha256 = "7493a417c1d4cca1bcbfcd782d8b5d0d4ba3817b18bc7598544e7ca1b9f5c06f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "3c3f09f172315420d76a89352cf556095d3120cc8fce3384b825680978682886";
+      sha256 = "3be76f9194d24421ce986d088a4e54f38a9e934a272f62c6aa6e9bef9a09a666";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "eaedf8f14d1a89141cfdd02d1331982d57c283810229f1bc4a2add6acf47a7dc";
+      sha256 = "a8eb60898c425fd996b02c304d495668b283dcf763c034c30c19841b71fe5be3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "52d635cf3d2cb3fe60f2f5a120714c011b6c5ddf46715450102d457fc9962318";
+      sha256 = "6722650b3809255e939976cda6f6a15b6c1b88e0a3fb2143ce14f05bc1748001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "893cad4f3e9ff8f6eb46861c17873d29ce07cecab1a52c666f3af91ac94b0f4a";
+      sha256 = "96246f81a7d0678bb32714ba376bbb2834f989eb7418d4edd1827d4511e344a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "c7981fccfb22d3afb4e36e34ca11629bbb064b2256d297e0717dd7a7c76ef502";
+      sha256 = "ccedf416b838286c42ffa27534d9328916a5d51d7897a8f9f9f0914b317ecf9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "a1192052f0a9dfc637fe6dfea16b4bcc4a1e7a6881d025efcbe65f4dd4a49027";
+      sha256 = "0efad9674c64ee1f67f930b46266124d3c0e1b4220522700a89ce8e2abdd133b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "575d234e0d09dc61dd7eb2574b0db946b866472e31f45e80c6af90c99dd83cf6";
+      sha256 = "fe4d45528436e5a6eb6d6cbe692974a8e07f3d7721bf2bf9f3aba2bd4c40a685";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "39c2fc75618ea33423a5ae0c606d416484c0c6bceb82f6ca79e12e26efb23220";
+      sha256 = "793c784ffd98c017155376f029e5270a5d2c5195e017ebaabee330031b5281ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "c92ac4831df0e4e4f8af68ddcb82d3bae98505845f04bfd39bb3e573639d648d";
+      sha256 = "52e39351fb98bbdebd22764b77c420a2778adcb6ee6fa9c82845c4cddb4a48cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "39c3b934fe6bb0eb593d52fc17983994a680261e74f5764c9cf2dd5e0ecc0527";
+      sha256 = "fa0707853f1b21e708b627a58127efa6848935bdfb071bd9dfa34cc712c544a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "dd4b8a6c02cbe11536ef7de6d1ea64bb17eb16806aa6dcf838847f7b2649ba22";
+      sha256 = "038c08de66a19e28293dc5ad8ab5ff099a653fe11e66a50f117b09201b0487cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "3a43a9986e3bafbcb8c59904f8de749cd9a8e11a5a6424780c1db1f75e57a152";
+      sha256 = "893d8ccd8276108f74802b6ade3aeaa182d35f24a7d4f59f73f7d9f0083e5374";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "0e11daa82aa4663c1d07f96fa68cdd7e06d404ac372887e510173db91456203b";
+      sha256 = "89cf5bb8d68c2e396fc3459d708ecf561d2ab58dee924f81034ecff6a9a58f89";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "d3558555d2e55d4089a224c6f49cc9d4ae60cc5b55b95ea29b131f53e9516693";
+      sha256 = "6dc7a40dc583ad71310ca5844563298d68b2f4dfe6160d77323bee582ed70054";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "a6c2c7db6633d6fe5fd24ee17efb6cff59e00959fa0226234bc90805247fe0bb";
+      sha256 = "0bb58b90686bafd341991a97b4006417970684d0c82b542718e539c12ec11768";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "59c697c88dcf4658cd4ea85d5c110239b786df15d84e21006c3ae9254d932122";
+      sha256 = "d704d90a4b3063f983651d777064c9d705d9deedb1e0f69428687d8d383762ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "42c2bd817b7f337146f52c00b3671ddbc48f4a1b39bbece4e9fbcd3a97545e33";
+      sha256 = "5675f10f6fda9082aacb42895dfcf0f78e6e53c649b2a620fadffd92db731b4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c8a4c21ce54d08d9539d2dedbc14a108842c401354e59b2a2e3f79f0322305e1";
+      sha256 = "a3b2053b85e7ec3046c2f4f2e437c685fc5d4ead7dcfdce1ba40e1560251317e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "7eab0cdf71a1571227b505450ed7af7d5605c306116a1fdb92697e2a5653afa7";
+      sha256 = "c3a198d51af7a9f1301b85d586ac61c0afd8b1243656e36de880d14c2bf51ce7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f903fe1eb373a4ef6160aa6137f7081f52c2134301b807417c4a9fbd66cc3ad2";
+      sha256 = "7921f62be7826f76229007503e8e27915b7d682346baf5bcf6149dedd4a921c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "b9718d0a1333f27862797531fc96a410d28f483537f9eb23d8c42ce5abe755b9";
+      sha256 = "ba39324c5662162aa1674d7cab7d4edf6fb02fd05bb99b2b0fb3f0d1fe7ecf71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "cf2534426f9b5fce7e8aa5fc301c3e59b4e1718fb87a9b2737f9d04de1011a8a";
+      sha256 = "02c2bc0cfa15192edb33b22834b678c9a8d99372cbd028d48a190113b8f93d7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "71ae3e6d03e16c80d8f7f41e79954a4dfb9aaac6df0bc04264672cf4027b0488";
+      sha256 = "45a4c9e6e1f2119bbccf4e2bb5a285ee5fb2c9003adbf15931f4c6f781d67c2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "651ea1186149d9cd455c0b9dbc7c2c7dc70a46963d5690a576acc59cba6e56c7";
+      sha256 = "5caa0619cf07394e3ac1c68a8348ff7f47aaee9587fcd0a50c4346215617b5cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "d11382ca1dc4b707c5330b06cc9e951bdcaeea3846516195f52027e2c557bbbd";
+      sha256 = "d224e1606ccb29e5f73626cdfca835d01ede2f4b746de8b139308665bae59f71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "9e26cf06cc5e01059711dd2d79dc25cf8635b28d17eba1f0d08c25eb61305a01";
+      sha256 = "343b33976f5db469de0eb6b025be4d5373191c9b7173d16d89a1dbb2cee118e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "164c2f0347d9244651104c835d75d9f4093218a0f67ea7709cb1f4162ee294d5";
+      sha256 = "0462fcae5b37d56c6b5a0a537aae8dd5f8909eb9014824450179c9440fcf9451";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "bd092ea5d5dd484a092605d72fce5358e86537e89a9a7a8974dd6576b02c8bf4";
+      sha256 = "51cc0b92eb8c5948cd8f1ad2c2b0cbc6484f1de3da813761d48717f1a8b198c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "3d19ddfefeabd49b3703fcfb0708bb6a46b19ad8bda204f91d4901e059b4d5ad";
+      sha256 = "02def4898b2b63c80c5acf9e4265b84875645f309d6954518fae3767f419ea18";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "b02d55efc88c1b8348dd719a599b568363db17923d5fcfb26952d551940557a3";
+      sha256 = "39fa560b9fadfbf7f29d1e0352f60109ea9edd25f341542a0965bf9d6912baff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "043510f251a179077cb270d628d9cca62785f746668c5bf8291ad8907b624b2b";
+      sha256 = "e9685986383fc1a660d1548d0e86e1f6d6b24997dab0bb6cbcffdae57aec743d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "8f52a213ab4f324f5fd94ba105c2c1e9970d69af93b2f9b30311a8bd7da615d8";
+      sha256 = "43805aadb07a9df678c40e29b4581a1a21adae6540a979a180acbd005ad66505";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "efae201318b19f549e69cb5aa4f59dc1bc87d682b40362203e25a5c1371b6d2f";
+      sha256 = "42ff002d3533302a4005e45d21c1fb4d2bb33dd34da84f376e0215afeae40ee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "e43116b71ad9f1b9158187c3a4299c36e5719da985d00be7a871bdeada36b192";
+      sha256 = "daf13073c63bbb8f1c83e64f7ae8238105f0b24490492bb171381b8359835ba4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "23740807dd3b010a48486200bfa8ed888beb9b4e0aafa83b241409954f93365f";
+      sha256 = "b77e8cd7d890e59391cb0901c428b3af4285d46a8b7b97395256b7211688d445";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "49063a53eb3ad9f9c62c859211bd19a9ac55f2b60a277e27bc1d82297e919f19";
+      sha256 = "b29253db8b87cab953abf1381155f8cfa055103720c4252ff4383b0d0bc9b24a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "0deb27c1880f256fef7916633f78423128b1a8ff76a977bfcc265dfa77173a0a";
+      sha256 = "3a73a2bd7d32be4e6ec2bb41bb3b910ed41ecaa678f26cb6283c7c4bf9c1115a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "c3ce807880680a92dfef22fdb9cb8e638dc686a59049c6cf01efab4ac3732ce2";
+      sha256 = "c7d7266fc4f89031ed171dbca0ec522631d4052f21fee6189edf5b25b3253b23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "a978a9abb6a675968285efaa76ed1ea89e8741c071ff976ded923e83e242f75d";
+      sha256 = "0705bf96b77ec990537b154dfe739bae3f86db9526ff66eaa9c65e4a21b1e927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "40d423c64850455905b955f9c84c0aceff20e79a469a654bb04722d1bf04c928";
+      sha256 = "052a95f7cbe122fa15f11b6b6aff20a681dc9f8f17ccf58b3627a6f4eab36122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "bf94bab9f91d5ea82131e43ed3d432b0261e3b2090c2d2db95fb035e4e961346";
+      sha256 = "a37cb18d401f9dea9e1f3d6200297133653982d2e29f68babde5178b13092820";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "db191d3e2a3fff647a1bf9a955075919de5cb5a376a4a1474a8adac44c3df841";
+      sha256 = "de6d96dd60e87f374535095d01d00cebf5d76002c151318a524711482f05d4e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "c6a51b472c569cda3b50d7dc9e9d0a36cf820a8a788a8b5b4cdb582f175e7ce5";
+      sha256 = "1dbdb7f28f064e171bb25121f84b3d677e2a0e9825547577dea168e45101408b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "54aca88fb64a6b5141746ad4da23b081a482d94e04a7517b9c731340fa5440df";
+      sha256 = "f8851d7d962ef0cc5b45129b30eec0cb4906ae790b2e4a04171b6aafb1a423ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "6c586090e9fe87bc44892ac85637ad540ab5d5e158c17c5f14c68f9f63ee3a74";
+      sha256 = "a8075b7c3682a5c21f0723466e2bc1ff1a87f1648af55b979284564a86591827";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "dea07e07f30d00b08c14b7dbabf5a38cd7911923808cf9224293d32921c2a65a";
+      sha256 = "8562d9f2effeb5c63c99de48586412b1952054f1d35341a960d3c1b68da98a1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "5d5fe665856bd0790e63edd43651ff9754608ef8fbaab38a8cae31a1252d1751";
+      sha256 = "13e5bae04b5f2a30fe58e46263618f093efd3e457d1cddc6096148dfe602a2a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "e90c989cc7c7b8eada6272566265c263eebba4cbab6e258e0d5a2d431b1dd7da";
+      sha256 = "91d6a400ac1c0ee6845677c526ff1c179b369f107ff36535765293b44f1ac43d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "5482412883d928072d3a0e334213199e947cc03fd3db6fc598f7a915976dbbf6";
+      sha256 = "eb086df64f9f18ed83e29b57a897d3652fce933b92e9db72472ef2c7cb36497a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "5684323f967b0edcb1de2199f1ac3d15730bf87b19a0091776b5dabae99c3c1c";
+      sha256 = "3cbfe061954939a9f3d90f790612b921eb644bf792b2ca0cbaaa77b1054b8ca4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "12df3e97e46b5b6291f6317c827381635cc1916c042aa18a3da928646c3298b2";
+      sha256 = "ea608343fba2138887a168ad3251493dea1f537e08745f3108f6962364d47f34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "208ab74c7967a65a4b73edf57d9d8189341007554e6aa75906df6255505b984f";
+      sha256 = "5977a78da473ce233e8d48034f6a04ac519888189cd4f4b3bf314ead6a7b74e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "5f193f7cb6008dfa55e7f2fcfa914c13d44a5d27dd18c291932d913a049d3c54";
+      sha256 = "d4874532ae1e9afe9b4c77ba064cec618cb48c8d90d6e5941fecde77c37c29d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "616a5fae71e292e4cfadf83c670879a5436337d859bcdb693498f2318a33e9e0";
+      sha256 = "0a453f53f7e88968f09c8697193aaadf2a0e7036d8a8ed01c7b54b38e61fd8a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "7e90e3cf6ef7db5c534474a4b7eb458582c914814f5ab3e9faede1aeaedf288f";
+      sha256 = "62279adb30aa4c792beef58eff120112fa9151abd1f74bf40d6f2cd097d453b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "638c185fe326bdbc6e122fa900ed54600abede47bbc702b4c2aeace7fe81ea59";
+      sha256 = "8bfb8f1af400e143c3f795aeecbec5652d9cde304a6551e5bfcbf7cb2a8cc676";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "4f1bce2457170735ca89a1fdd49355b3ce66862eb25c4650018f29786a3e628c";
+      sha256 = "5b1ed6ee0e97d89cc83bf4f8408b409f5e0aeda5b68dbf7fbe2d9867cfc8f4d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "912d16eb2952971879b9a4a12d5bc0596bd26a3a446a0836d644d95322c0d88f";
+      sha256 = "04747f583bf7cf9035a52e584ca76c84798830ccc74c8f6faa46a5af4df74011";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "c9d88715308eb1dc9a7408e70d791619b96bfeb513a497264bbe4b35a2a6c21a";
+      sha256 = "432359d0dfcafeabdb98e7baead22a23c1e9a2e30ad6cdba88fd7f2fbfc9ba8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "2a04604e7455fe01534470c36a35fdec6b833c6fbf37a415ad65a2a33ac685eb";
+      sha256 = "3aaf5547d7a0e5cb1fe120de403650a682579540cd4411d113bed81c9e0ee781";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "a820fa038bd93794e06cf1e42a69759bbf6cde44196d1103fe7f877602510f8b";
+      sha256 = "2af656a600c244eb615b21e204336bd28549648dc1af363e08ffb8802565f9b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "b6417ebc9f7f9f811346bcd013c65ae873bd3b2671d6a0c25f02c9d1fdf15f8e";
+      sha256 = "c0c62629f81a5bb1e1ec256269b2285bbaef67caec7d1c4b8ad8102a72abf180";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "d9600fee7682011fa3eae2b090b50d67bab743c0393c5deff03c5667fa11f78f";
+      sha256 = "dab2b1103c27706124fe8f4f8ff059baf21151cf0e50f8fce2ce40788545a5cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "faffaf6851c21ebd1181c93772f912709bf81ab59b795cf4eb7201a162aedda4";
+      sha256 = "4c4872d23b305cc66b7efcd0d36065ad3aefedf0e0fc53f05881c3708be5782a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "97f5cea2c18b3e07388496fc45126dca7bf58a837eccb14385b2b29701d11108";
+      sha256 = "900e5e7cdb64fc9e1dd966d1fbdcbe2c8086c1ab2be54d2d9f1c2fddb0673cef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "9205b0871af11b98e802ca77f3c8504894cac12cbf1cbfa502767eb975eec6c0";
+      sha256 = "1299f2becf8ab50225fb68d18d1345754d43334d30aa5f3500d674278208b777";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "449ad603575859ce4627e743d808e5ffbfd2d595c1d492fa764a8cf059816b7f";
+      sha256 = "cf41fc923f63a7f1a4bf720cb3a8fa1595ef92d121d729d7e902cffefaa852fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ad5fa26a8566c22f9efd33ca0268736d4a38ffa3309fdf21f98c0a29f60462ad";
+      sha256 = "84b2cbff63025fab413175ad49c47ea734f0823b8eeee7676789f9c27bb9de23";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "1bd652bbb01825a9ad3efc7991fe315dff9fdc3596d197c413658c055f97efbf";
+      sha256 = "818e77d80fd86e8e27460b8f629f05215c985a80a275f30f3864821d6619db30";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "79732be6d97e6f7fb812da0a718998bde7808f571d5a57fd8042d5b33584b79b";
+      sha256 = "5636ac4f5757edde5867ad0d186e6d779dde239fc302962b7f257a5428a5a87c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "85076e967a48f3ba02fd785adbba0af0f6525c133efbda4a3884b5110c4d2a7c";
+      sha256 = "b033beca5afb4fb0c8715d29f2d9e6b0bdb2115d63ff8d5552adc1ebb86f18e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "eef5081b1c72402758b244d7bfe7d1aeec301ccb2b3f1436fe8fac2ed5c8fa22";
+      sha256 = "afeb6ddc491281c001dc98c177bb19120d46fe3d738f777daa2f9c0582faa828";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "eaf150b7ea5496a4cd7648da0ecf507091ba7b4412a037db6ea48dc5614fd6f7";
+      sha256 = "b0d75cf5e760cd505c397dff4fcaafd8f0bed1b416c40beeaa297912b1110f44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "81f6ab621772995f3bb3492695e32eaac1d667142e7bd4f6de0bb8825ed5b48c";
+      sha256 = "e1c7cbe5bc38bbeed8cd3abd05ef956366e2f398b70e42b3007342a4e61760bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "f26cd0a09eecdafbac993a9e305f3ec9969906cd06fdff5f5101dce71b7b48f4";
+      sha256 = "ab26f4fb5846a8eca415748e69dc37f33a6d3ab91ff0db384d627553a69fe9a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "6513741a8ac710a7016a33b3e3c00969954db50e3c2ddfa4a2debb5992e4c8ac";
+      sha256 = "483e633f4e2922e521c0492d47d420fcb5a1ff7209d7f42c58952c5e7705fb44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "325d70559d8be33846c519a9aeda98d2a42651daaf9c12602d1d29059029a6b5";
+      sha256 = "dcd3441f6f5a9390407f2794f8d747511215246f5c9a85ac4d6b704bd4bbff9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "6ab0592eb32fdd72b6e5ac121199d2c7c46320b2e3215fa043112c8c60b72396";
+      sha256 = "1fa56ccd4d66542467487d17ee7e95f847f0920774692a03da8cc14f1cf2ac70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "7202e3e121225c034724e67f2bd1d0f5dc1359c5c316e76fb45e1522d975a2e2";
+      sha256 = "d626a423d3d02011a9a5090633595add37d6c99fc741ec96a1a66761312bc1ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "a3cfd6eabb41224e3a7ff23b19c2bfe3bee8b662c259eac3ff504d9dd371e4d5";
+      sha256 = "3d8c5bc791c943e82b678918f3459471a3ababef8e44e9ee4257f036b552b813";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "10b49deeca01bf571c8de9a49f18f51bd761d1eef4a00b15eb8740c734a69962";
+      sha256 = "980d3542c6c25d306e1b24404731554d4a21157eb1bf5fc17ab31949d2e5e563";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "ea6a2c21f49066ff5bd7e45d7e5cbb6fa1eb737ed111e2fadc325da659cb3e50";
+      sha256 = "055076bedecfbf77818bc70c0d69b6deacc4ac9f015bc419738b1dfbb499e6ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "0f2421d1617932b5a17c158ca04b01e820c2adb6c7eda9d6f54e7b22e99ded02";
+      sha256 = "72856c1bfacaf66461ea1cef6cbe5481787751674e6a79b89997aaa23880ab52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "654864b81f5abf3518f67787d5d9e404e3d5462953916649f3ada78f5ec8e3ab";
+      sha256 = "366b072e83d350147ef916e8386db402e0dd2ac0d086d7b1242f8dfd91c00cc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "e7b42884848ddf9b32783020eb41c6e616c46a7b4b46bd1e2d32c99c78842bac";
+      sha256 = "3d4a4fea98df1c0013371f96db1e95d3b8266a5a773cb2ecc4f58ab7d4522c27";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d82fb6ce158e37cbd74971d6a9cfe6c57004614c3f406f817f342c1f523b6c2a";
+      sha256 = "195ebd91159fc04d11a34801d7b0871b5b998f401e8c4e3cc516113bf067b7c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "028c133c6823549f499b1a079d07052c50f890c5f431412e856e6e9b52fa6797";
+      sha256 = "95431dd518de2fe5a679e8635f6e3cdfa3ae99d7b42eb93ef8591b6bb5ee0d1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "8e7eea05f48a536dab3b6924dada5d4f0fa11ccf6a691d993f84ffbb0dd8e8ad";
+      sha256 = "5cc49bda64618b9e07ad9d1b6af8625bc3a7ca158467ec880836bd20a2a08dbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "e5c40fb83fc68718a38411bf8dd17172546c89328e8a352b6aa4ad81d8946963";
+      sha256 = "f6d2d95427f8eb184d600b101e0bd3ab78580f837765eee297c022cd2e603433";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "b2ca1cc8d20926557240946aa9ca432c1b24162d8c26be088f95c98a0e2a2697";
+      sha256 = "f5ef3477f4fdd8708908b2cf41486c0083ee9724d6f313cb28f24abf3f26a156";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "8a3d7b4669dae9648ac2f06a03781578f6803a241fbc5183499fa18a29f46fac";
+      sha256 = "f41f2fdd0d2cdfb76eb440e8ea7756368ddc4285736bfe604c65b03df42061ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "a65218675b9e62e2a2e72c8bd7a3a78a56cab0ce91426f623b6e6afdea1a04df";
+      sha256 = "815ea87b2552b0c6093bf6dbaec6dfc660d3625f44f2bf042b5869e42c23e25e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "9ddb3cae1f4d999d1a7840e019867f1554995cc8bef0a1aa8ac90ba547972722";
+      sha256 = "a58b8c1730cd066c5dfc26e8d2d4d3b6557a72a0c680e4163c43279c671c5ec4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "a1455aec73754985d65d7b28ffe2897ee9bbde55506fd6d9772277b5346f4092";
+      sha256 = "817db84221e7361a7c932d0880c6e82aa7a64552931e015c4c4694c1ab9ea253";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9fbfd677f9a807daba18eb008a183fdf63cad7d42f42cf10311593ccf1e4af93";
+      sha256 = "909252098ca36f93de56732fd0762fdd041657559d42a7200c821115b38980aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "57a19f4b076bf14db8a83e96559c937e7e848d95621aebc04f8009d614312bfb";
+      sha256 = "e1c4ad015d1e3565c4435e769bc59d5bff953f719123a330f8e37c43833881a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "ce745304c9068082289893584e10855f022e0b55b974088cd4d2f2d177e949a7";
+      sha256 = "0e31db03a117def0867bcf5d3e1acc7ebaff9daf4325cf3be548e72bb09057e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "b5fa6ae252d2a39f002d9f61bfca5f4c44322f134f82f6d75736197207ac93ba";
+      sha256 = "63ef448ad869a987cb0e7756f25e81e7d1c6bc083048e7eb49dbf5100626879c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "d17c250ae08b958bf0c9a3be3953133af69e88855c38dabd5a1f9281ae675b93";
+      sha256 = "77d9943bb83a8b1b42f448b0e3e0c3cee11a1ea0bb1dae18ba52c52ed5a7d7df";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "45ba1505cc8b64e55ad518c1138e115c7f01c9572a13c2dd07970a479005cd39";
+      sha256 = "c47d720da1f5aeae9d8429ed71f1044275888751a0c217a6a534e61e9f4dfdec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "bc0aea632a700251fbd0359f8fef1b152a86fcad15707b4fb4bcb055c7755c50";
+      sha256 = "8f4530d50019aeedf2d059135acc6ed42147f86d98ee7defaee5ae2d826c4821";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "4f31a97f9a0eb5677de689c839e61989d40856244d5239707378e5e01fcf0ea6";
+      sha256 = "59f60c919eb0d331166eeb9d76449c0a57593e82061a9d3319d680253ecaa503";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-i686/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "cd397ce84153a60c04457fef2edd31b648eb71476598aca12ff59ddd4f09fe7b";
+      sha256 = "c6c71d581e46b18e48fa76699835ae7bdbb11033366674f9e1d2be0cfcab80bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ach/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "ca1d393c3f6d8f0b483256bb4dcbbfd87c3e73320acd272125db6a252d225690";
+      sha256 = "241018608d47cb0d022e323e968922b082acd7064b3ca8e7bafe665ff23c9b3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/af/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "904ce80c145a1d3230081bd7883d2c5e57ed02660b2404bfce3943df0561104f";
+      sha256 = "f8ae5994e39898cf2611db052640f7eff4425c5c7d94107491173f900245df32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/an/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "a994667975cc8c14d5b768d238a151506e9c9a2bdf6dafa73feba9e43aeab57c";
+      sha256 = "4a18c94a3ec5544664a89c9cedd5e25c5b15ff41cce68890a7f2036a720c9b1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ar/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "2a9798d1ef0a04664ab9c2683f7fd509c4da5d8129d769c781077c6d45dcc37e";
+      sha256 = "3478f78815017cb30bff0946399ddddd15f90a739213c4e54f8e09602c76df83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ast/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "e862943c675f5853709fdf1ca14d2ac28cf732d90d782bd9bada809556f1b654";
+      sha256 = "fec697046bdc9c5edfda4ab3f6df1df84819a3ea7b46250f20722b05ea356dc1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/az/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "c3e0a2cc6ae0646a5c7497e96b7b47947354f984ba733672fa38a7c14eed8856";
+      sha256 = "78a68fba1f9dfec4510bb2cd493d82fcac31801bb7bb5718f8afeb57940870c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/be/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "bd197bc761ba7d16d74ec1eb11f6eb0ea6122919ffba3a775690e3db029e471e";
+      sha256 = "8e27d99cdad038331140386da3749f2c85afd5cffdf8afdf9b35a735027a690d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "6dacd9985823ce3ae329eac3fc97530fa405737cac7115a3b56ec6a0db04cfb7";
+      sha256 = "fa1e2d472ace070d1dc8beabf7cddf85b571957c453ccf8cd08ea14ee213761a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "22e0bf169370241de826f2f882c987f01e5cee823dc303d0122e04a210d2b781";
+      sha256 = "bf8b652eef9f6fe89adf3cab9639b59cd2ce5009c31f690923a09ae399b68570";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/br/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "d3e532791588565ca5aa5dd892cb72298c34efd9a9d07e3b2e89c5df23d41fe6";
+      sha256 = "fa245862a996f8023b25035e2176e54047af8d333912a89be7faca81908a4604";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/bs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "9358ea0b92e59d528873a99bc452bd30c88a2943d23edcd71d47c3dd5521313e";
+      sha256 = "34976543a5bc5d9558d8e725391b22805dcf8b8797cf6a54701cee7328106550";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca-valencia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "133b4c9ec4c86a88203c251a5c54e312024d5def03e60e75c80ddbf7868fffaa";
+      sha256 = "8a9a04837e328286f8128f9b744d274d98f7db5762c244f9294e0f9fe7766731";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ca/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "b4a6e4975dd731eff8f7a70f1b9fbfc33dcc53f76efa3061232df7b0270f803a";
+      sha256 = "384a1314de0b0c566fdfe39c2a74905f972a624fa434359dd6914e7224d95641";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cak/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "9c647560a9a1f5012002cdf619f50e10c8f16b8e03e37d34a2aa312f714f9ae2";
+      sha256 = "ffd23426e799190a55d6e2db09f3ab1ad9512a8fdf11a065ced8eda4715198c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "5b81394b51d29a85677439bf4f91794b1daf5b878e920d1c0e6913fdb8c3fd73";
+      sha256 = "779085fadd246044b587c08ff4ed2397215a97b0d0ca4a5a3df70142bf75e43a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/cy/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "f0e9b6ab15dfeba4e41ac3e540c02917d8b30213fe2a5fa234a43a9bf9580d33";
+      sha256 = "be7161a550b8698b20cc2a5005a0c6656a10ae2685c5ad52d5133da4d7812f76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/da/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "fcad12e84319527cfc25f53192cdfadf51703ae1ab721f05c5f70817586f0626";
+      sha256 = "2f524f76f90fca51a39a3d8c574c50aaf7cef68e276431966ca616c40212a964";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/de/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "805b6c414e6a56ff4fcb3d2fff4cb2ff62105e1f3c5476ea61981916111652bd";
+      sha256 = "8ebe0cdd840bc6ef9e3f2a5801a6308d35d265ca32eeb54db6ae863216a10b5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/dsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "d9a0dc6db5f1a21ef94101b6ddf1e1c644d88f639b9cf1f4baf3d82759914b61";
+      sha256 = "72b2c42048b933c29410db5ab1cf3b83f1b9d89a5b1130777598bc8572437bac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/el/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "109873f011ac29c4bdc78f27e8a13541aa1b11175b29401197ed3d3512dec72f";
+      sha256 = "138e9495ccf965c528ad0c2482b11557c6ff0ab4723332bbdd37bd2ce1afbe72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-CA/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "ab9ed750e684fd405ac3a797e4fb60ead2c64c39aa53d6742e0259930d371adb";
+      sha256 = "fe569caab44348927473fcca363e859f3ac3ba1eff752abd9978e9e0cccc397d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-GB/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "c7c9bc00cb6cfe8dc9c4875b049a13d0655c00a3ff171c5647f5bedef107e7ea";
+      sha256 = "c069247ef7744b71547ba952b2d332563bb0bed5ee4c33a5bab20c8f0b71156e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/en-US/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "39261cfe396d7359aebaf6b5f3becd3bdb5c43b292869f544a88e801443c9efb";
+      sha256 = "e91834ae34ef10d436a22795b4d5716df01a31c83fdefd8cf22a62deb4dc26c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eo/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "75179c336ad589676d93d8dd6daa084c82573a621e69e3e8cbd09679c5f00755";
+      sha256 = "b2626c8d82f90f958e39c6fc8fdd11e0e477e54c0fa770b8642ea4eacc5c145e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-AR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "88ca0c23ae377fbea842073192f89fcbe2319ff4944ade3311c722370c166aa1";
+      sha256 = "20bbd71dda6392b8e296d36f27be410e2bb831bccad9a6eb520b3ef3a8eadf2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-CL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "32b6911754837cb979fec837168963f25590d19adc87ca84c3ee0634bc1797a8";
+      sha256 = "47492d04205be6c535209513f64b9c0896a3a786c5af3e87add57425e95d2a04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-ES/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ae81dada372a60bdfa0f6c48a988c42f23165e1d1c8cee3c7958c95b64c87d2a";
+      sha256 = "f1504517f6e874ae5c73cc73fda5763b692d403be5b2d6a3c5fdebca847dd044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/es-MX/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "c8171810252614f5cbc162b5f4dfe3afd897a8d9beec4978126909bad3f76bea";
+      sha256 = "9e8fae58eebc5fd0fc212ed66ed63add5408730de3b360020ea39ee3c67e70a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/et/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "76fd0607c61228898b9568987523b4a8e1f5a3b15a4b2859296c0e23c4e59585";
+      sha256 = "c9256db0e31b1d836cb4ad7d45c9289d45dc05853a0883071103b581743645b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/eu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "16205f39cffe37ce480d45e17d266c4bbc3ab1844ce2ea2e04485ddfcb647120";
+      sha256 = "a85b68a93d51c3c42343a7038ac72d4ee3b0847aee312a3f720899abc3b30961";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fa/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "36b1c98577255d88e2f7b01c88cdb1414b2016fa520aae459b66aa47b10f8996";
+      sha256 = "44ee01aa1e8c1ef973cdb2b28916635fef9bb81a7dbb7e735e055aac02f65007";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ff/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "2988f2897ef2c643cdfcd79dce0c126c24fccf6e9810aa58776d91a1baf1b453";
+      sha256 = "0dc1f2c9223adfbff26376aa55fa858ea89e04fcb4f3326b115bc6f9cd0f1791";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "c8dd76d403209b965f430d3251df3fe9800535074f3ed1c8d1ec3c49a0ef92ea";
+      sha256 = "43c5253851fc94038a7b8c922660651f43484d70cc54d22dc0f521fb978e76b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "7d43f4e963244761ce06e827776dc3037060457f15d806d248e406222b732d03";
+      sha256 = "eaed4f0100d898555c1f2bfab43592648342b9be1a712602c43929a77f61f67c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "75fa230906c272d17bccc003d3bd605a16ac21825812a964c78ca6e839365447";
+      sha256 = "e74ce591b238c6a6754180aaf8eec4701206c84204b2792e505d3b065235be10";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/fy-NL/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "7b40e7c98e5bca1e7a503303d6d47160243bfc81991301c401da056f506469cc";
+      sha256 = "15309be99c0df4c8bf23ac5387e8ba6c15b2051e54a331a943c4cc54959e645f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ga-IE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "c2fea5545eb58658a6c3e8ef751b1c18372edb052bb66694b13f09fa0044fe1e";
+      sha256 = "0b7d2969509f650aa4e725d38022ec61633e89d5b325075be3eb97649abf58f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gd/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "d8894d4118e625b7ed8125621e58b561657f03915a7e4acc464c06e2c948f043";
+      sha256 = "9f28a60ecd9e6eee111df4b57b437739a77a55276d9fb66d2191c4fb0a0b9886";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "59cee79cd1d2b593b3ab607d7e56314188f2f9d21aa2eafc4e3da19b27e7cd5a";
+      sha256 = "d561f29fa446a9541f43651f439cde9a4c7c5dd7a4fe7d8dbb41e7dcc1aa351f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "9570e9cd008c221d4587ee0ab740a98b74da2e74f2ade874eb96051c7319f60e";
+      sha256 = "84415639e92579f37ecd8598d2757a3a49aa8c81287c3d8c5b653e489e5e41a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/gu-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b0ff6954af3e48e2fe996e38bfe72f060f17a7596640b5653893bdee6ee05f24";
+      sha256 = "d05bd65e0115b4dd204833e980928e8f409e79fbad11cf003c22863775e41b14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/he/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "61db85d5f194b2d6b797765180135949e683142e24a7c2f10872132a3acafeba";
+      sha256 = "3dc2d50792fe1ecf2248f243da773da783df54c039ef6f47e316caec33353f51";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hi-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "e5c4e8fb08e6a36ee6c72dc0c4aadb5312e04f91cacf3679c89b7963c8d05541";
+      sha256 = "e8004158a6a24786c3ce373e43c9d9cab82142bb7d2eae9fd187f8be3e315606";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "85fb4cf83ac75fd1a0e7f44b73f64e4bfa61899df78f0318370f6d232fafa063";
+      sha256 = "c0c047431c8ae0786a77b3934f47b9b5723028e028ce487a895f997fc7ca40ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hsb/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "05be655775adb1b4e113e047cc9188e7eefc78a4558f87a8176193697138c687";
+      sha256 = "12d757bb7689211acc5a9bf7380eb4b8f659dc5e797a16481ff43d19252670a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hu/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "566fb0b2e78f693ffdfb6b5990bebf7e84fcca396026b11678b8c613673364b7";
+      sha256 = "21e08a716cd14ae2ddd8797cecd3a387d6a69f1725283da9dab778cee0ac5a96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/hy-AM/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "6e51cf2be81bd264143fe6d05f5dd0806456a111cb989b130fde546d2e561fcb";
+      sha256 = "cf0ec104784fa1f8b0965ccb54476021b0aa553fa61f76258ccc0838af3fdc58";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ia/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "74af672f73f85d2e7bffbfa346153358fc8418d0eb5a732d86aaf1be0b3627f9";
+      sha256 = "d398f24f832df11e54319485990d6b0763b88018e4942734f97eb6aa1027ab14";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/id/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "1b37065b20cdcc2e7d7793f77fa71fd846779c4ebcd68f489461489b165ba1b8";
+      sha256 = "66300532e61904c2ec3b38654fa5c04fc77132264560651eb47d08505f92aa93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/is/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "782622a22fb4cac4e967c3d7c934c1fa0fc7e9734e8d4fe6738abeedad7b4188";
+      sha256 = "905759bb5644dba6962cac36370c8092c8b4d940dd0fd811d89f2633d8278375";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/it/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "a1c05f3d29b77c3274b65f20bfe0a0a7662133382a2080394cfdba0366cdef01";
+      sha256 = "090d658b0d9883ae4cb030efbae33dcad50cec614cc4df645d9d578f8f3d9f78";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ja/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "a010cfc3fba7877b33666db790d020c13014b98bc6567d9f3c5274d9705681b8";
+      sha256 = "498c93faff28cdf519c68228a929538a6d86722aa23cf77c65b9a6bc9eec6cde";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ka/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "1c1beaa5d438a6214dc75ccf5100982ae415d814d5589f6d19c75f3edc8a2fd3";
+      sha256 = "6a7219133dc2cd5828fca8c47c8918960078a1edb04e5d0f130572802228d8f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kab/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "5db404895a198a93cadabd73b3e8b7b9707c9b631169a69268799aba8a2e50b5";
+      sha256 = "61bf24a6f254d3a290207fd3c2578d3fe0968ac6af729c5468952c7508e60f32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "115ea1a7775f678f6c60342149993c98f107cab03e10b47ceee913a45f66f311";
+      sha256 = "c390e1a6bea9f444984fc78ac8b321c1f7a629540716f311677ce31ae853f52e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/km/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "de7a2faadd3072d434f8c5bd1fe62e23616c4097d5286801669ab6db27143332";
+      sha256 = "f37ca60447383abbef2720253a82d551a906b0e358c404480e94b8e69dbcd92a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/kn/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "713a1bf13d20796677cf3b4712da2e8f45fe01ae8d2428a48aede0ddf0d57cf3";
+      sha256 = "a5069cf01bfb68e73a524638cbb8fc435e54cf874369c0ae8199e724dcbd96eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ko/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "e7642bae7805a364e3189c67143c9935188936925fbf5b9a0210141ed64a7587";
+      sha256 = "af9ba9b7c6e825b6fbd57cd1b2d015f6ca9ddde361d643d1fe520b7869e21221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lij/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "9f65891d625c585c1515a005ce35b6de04c201428c1352efd9215fa033bdcf07";
+      sha256 = "271945a88d4fc02733fa3de327e613d822445f18c70601f43bf503dc4bb76076";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lt/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "3ca4a021fe1782414512fa7610d0eb5f3ace978373632c6a6f4d618c7afb7645";
+      sha256 = "6e822b90f21a571e72b01c353b0d2371ce0e0e788382c5cb9fbd558869f0abee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/lv/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "e73d4256ae749209e41861c3bd20de05c5c50035f760c2c9355320d795e1e99d";
+      sha256 = "840962acfde031c9bf7ac3be1e491444ea5dec8f4fde6eb018376dc39e2beb73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "508698c697ab258dfa923e5f63749569f87c070f2cdbc26ee0bc0a36b1996259";
+      sha256 = "f1d13371556a0fb39f65e2e327eb87a0abed3d550988faa5a06785145693326e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/mr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "99e9e06270e56262f4fc4a95e6dbfb15ba918e57a964b4fadeec2ad7af4829be";
+      sha256 = "ece70d221688bc7e21b28d849a75fc827f892195ad2ce0eba0851edf5a458ae4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ms/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "c9c3935bb6814e5dbbbd980a4487d1dcffeba62f14e3e907f38e07dfaae4822a";
+      sha256 = "2ebac815285a5fee53d0038f7504acf772775b76e9c142825d9d38d406abbf1a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/my/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "ca0ec2bdd803a7d0f61a135ea61d706394877508f32c645acb014f52bf4c4a33";
+      sha256 = "f17264509af2285d77811bb37e04a78ba50795cc7ca9d7315ecf0b657063b02f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nb-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "c74cfbcfcb0a8b50c18f0d0da54d4855d1326aa72718dfa73614ffc276fe07da";
+      sha256 = "be7310e5f244efd65bd649ec6a87831d74f275d9d47f9fa3af413562e1f520bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ne-NP/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f6e88a6e38af551c2ec786e2941c9a23451d236bfc9fc7411fd61d58ef02a93d";
+      sha256 = "f2490420afc5dfcf52ebe57bcce39f3a4884dea697f244a6bb1c5ad59f4318f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "2a3dfe87d3b94479282f1bd8b700ff91df1d414ed4d9fc3733533f1db7ae2d5f";
+      sha256 = "a6cd59a175f6406118408261f6294124a7441e17847a5ec818747a79b5cfc044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/nn-NO/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "fbe5608bfeea90d66f0d4f4c9dc8fe012cee2e0a664dc1eda948660e8e71a7fe";
+      sha256 = "a55c303f21439df3d7a93fb093b70b13bbd0c310d381132f1d3a0e3eb55b7edc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/oc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "36e7cfea755d82e8a210841c94c0a95bfee4a7a69cb9464726b08de103f86a01";
+      sha256 = "24e06d73859e511ec57f291bd2516492e5a30e28455a16e24eda79e186d4e484";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pa-IN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "8c5885c4df9b41f70336217ebdc28d4e640dd99731def0546dd0e34879fd1f65";
+      sha256 = "01658567d989c0427da0ed91c633d770ed281855f1dcf9eacfc8a9d4e1c4a61d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "24740a98cac566ddbaeac20d6e16d6fa715c63e703cb9b39be40b8cf9a9b18c9";
+      sha256 = "66661a57a4177366c8e50a5a9ed1c75e56d36aec6f1a11c9db167084ea23bae8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-BR/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "cf51d2981a09199f6091cae1242c73560b1aceeaf04207175fc64e546ccc3396";
+      sha256 = "a563cf71764b735541cc1c7ea937819c7edaeaadc14cbfff3739c1ac3e16d6bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/pt-PT/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "2b3cb182d876a304b386f1c091c96be21416b93dcae669a9cc93f19d65741585";
+      sha256 = "7abe6b559e61fa1fe77b9cb91c647378db6b5a45957ee03259cf9ff7f783800a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/rm/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "914f3b9c41e9cf814ba31a671809f4d2daec6c77ea80e70e808f0ad7beee88d3";
+      sha256 = "9e6b92cb0b7f3ff8fd449b4a96d8b13f7eebe3f3113c98fa94eddb0a4121ebae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ro/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "da7893ed953bf77fd859ffaa542a7cd4ad52357fa5797d0b3c2f31d0395b9720";
+      sha256 = "38e9fa5a6953c89263feeca394a71efc409c4c9f785f34550decbba2cbc18c63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ru/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "bcfedd95d87f9e1bcbde13380f811a59ce5330f0b47668920f0d7319b3c8171f";
+      sha256 = "f9fcbe379df93978d282f531609abfbc710054bc4c1461ac9fbd80a9c9b15ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sat/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "d36f47b320f19627ae570e7e004d87226687c469d9de70508c721d0e8d0d132c";
+      sha256 = "5f609b6774298690551bb08643d3e13733e2081fe108834908ea4f744f865fab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sc/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "34440b5887d66dfba85fa9fe431d2b30b963125d211518e2dc001b1749711f1f";
+      sha256 = "4ac4a80995702ccb10076113ef853d614ebd5d8321f336d670f2d7443b4301d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sco/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "b3c82d814a526e801d2e4cab78b273e69238808bd1a11cb6edb12f730bc1d435";
+      sha256 = "2ac20c11a5333d3d6c61acbcc4f651e5fdda00faf85126dbe224d961506d063c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/si/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "32517ad2aa826fd61b2b8450f5da35ebc38b189465d3bf6bbc36797d39e2edb2";
+      sha256 = "c41d50301986acd685f22891df7003e6758ffd8b6e88b999e96e2600262cc03d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "c90574e5cd3d2fb46cc800d6ab278e5377c921501ed36cf24d509387a1f5cf67";
+      sha256 = "cd8fb4a85e71d82519a3d0bcf5f8502c84bded00029ee9f1a1ffcd40cdf0f0f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/skr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "cab10bad18edfad2e656545add6001aff47cc80c551c99dd4b3d4da639854d27";
+      sha256 = "5d86ae9529ea78a30b437eb85a3fc230162a62ac287ee16d4a2118d380b04f6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "a6cec788ebd392dbe0702b21fdb8ef0e35ca6ba2f0d8a9131e7f12fc10741154";
+      sha256 = "f9b3bc5c542d63952ac4fc287d6d19239fd5b14d2bfb550eb868fe2bf84ad9d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/son/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "e52956217c7c3ee45e7f4233beb469cd26fd379785d25c799f0c498664236862";
+      sha256 = "146bcb03804707694ff45463fa78e3b33b0ef1e4c29e8c879171cd8495f2b506";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sq/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "e06b5bfa27235106a82513ac24070c2a08841751b6a2121d6e24cba96a2079a7";
+      sha256 = "2a888fb0dc58d32d0682333b55b3fe84f79a2a3af9538fb26504745adfa04411";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "29202d10e74d780a567bf5a6c68d49824723e910c755a4c5687bdd5b03dce536";
+      sha256 = "59a955e11e42f8a72274274c341a7b191ed1dc7bb3f6755ed127ecc13207735a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/sv-SE/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "37e53d6d434776d3d99356a408d4fb4887c080476d1f6c30e1e8fb744a61d521";
+      sha256 = "fcc9eaa8966ef2fab3befa7bb962513f15e43b8f35035db6b31cdcf517fd4a73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/szl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "66a989f4abed1ce9cbedb76a4d9d9e5d4f5f8a13311da63576531fb99678553a";
+      sha256 = "7e5e7210213bcc5686701b258ef1b8feb95257dd23761d72a32bd22fe454d7bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ta/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "945ed46a39471bc841582e54a7d1d0a9c9aa142071d7285973768f29fe089432";
+      sha256 = "ff668385625e513b54d37fbcbd1acdf9981c408b9b94f4029fcd09a1c2176b5c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/te/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "ccb22037cb8be01a0814daf27c3a53e49cafcd148f686dae99df59a93a0cf00a";
+      sha256 = "e02f9fdd62addb35ac5b762050be969602555389507046d9faf5fa7329ab4823";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tg/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "256cef45a12bb6635a74553c4e0666837ca801fbc0b2c3472cd3d322d4dd71d9";
+      sha256 = "30e5a40d34e1d99a3b8837ba126c781f71073015129d851fe1fb56eec39377bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/th/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "3c07a430511b639288beb38a5396c9bf47e0035af9d9809105d412c1a1348fe7";
+      sha256 = "a7a947887fad3a4d8ef01dab58cdbc067981dcc9d7459df5d60bc656d5e2497f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tl/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "8c13b2df39361cb03719249be3a1ee25ce2b76fb24e427a40577efa49165b492";
+      sha256 = "a7be643c4803c4cc96b84618c35b1c922bef223585a75f18b8349752cb975296";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/tr/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "0481e7ab0f1a35659b669aa97a6c6fcd976b6d7654aa2e7c4ab19f1f12e45b71";
+      sha256 = "19e5d98f276f5635841c87e6c8023e72acd60bd756ed8cfddaa0f2781fe1818f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/trs/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "2f42057e425350ab0c570638de750efa9a0d72cbe2f54270bcccf84832673596";
+      sha256 = "564791342249ef49da8ae779e84a013c834f0881c4acf7ed9d948b8f50d89c8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uk/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "b1905f0d4cf2005cfb2043fa93201ccb5a5cdb6735d0e0ad7abf3a33d5d1383f";
+      sha256 = "215715aeb75eac4285b506b3a576f358c9c49b487c124c6da4f62c6c75c171cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/ur/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "d2a04cd00dcc36383febec0aa54e5dfb829b0957c46cb73a98b75fa9426c5825";
+      sha256 = "9a0aba63bf9b643d94b85f21e05b817aacacd46e74531c1de2771962b47e234c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/uz/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "c8574ade0135845ff83bb0e4cda0889018e504182c75c255dbd58219d1b2a35a";
+      sha256 = "395c7875c568318821381aea1a879e63e477ee281eb3f071bd26ee43a5f803e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/vi/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "707d5664f07614223f01de9d5bdf4b9e9da56094b8f7b86c0db95fb2b3165574";
+      sha256 = "be24eaa206c9e1685a068f44547603770de6f623a3701edec12fe8289fc425b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/xh/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "2412b00ddda9df5fbfd19b61a1d38eb859287ae0fe7702bd78f508fcaa6788dd";
+      sha256 = "3b0d01efdd7cac99912ee95dd058a0a115e7f0dacccfa948b0a56e4a9fbf88f5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-CN/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "1404f86ca8c153daa32aaa64f2762e530f54da743dbd088a4ac269710b735bd7";
+      sha256 = "08de3ee0eb0cfaacd24a525ebc645e3a3ebe8b7b4ec2bb25a1f9afab20c65ba9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/linux-aarch64/zh-TW/firefox-140.0b3.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "43b9ffa8ba86eb6087dd7c4e7a876caf8817958691591adcf70e2d55c47ff927";
+      sha256 = "be9a2ec30189f97b100dc683e61c6484aad2830b1ba1263a043ed5e6e9a3afed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ach/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "f8f307c3ae6b6ec25ff249cd9a244c5f37c724f93d4c69fd0f1a2df9e5ac370b";
+      sha256 = "7011b99f89c7c60f226f115896cad9e68d5cbaeca7a819684f85d8b071595c76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/af/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "81fb685411cac7060c66d52089c36e35385d3b29b250847a3c120096c0c26517";
+      sha256 = "2c3e99a5d7c10303a21aae63646ee282ab113392ed786697bfab38a5ad486773";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/an/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "e4e627d9d160d2edae3b40f30aff3e2e8001bf92e3cda600c4a7990c7329edea";
+      sha256 = "2c656ae52400af6838b92d40968452d7d61d520746363e5a53a54048e382c4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ar/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "12c23cfbe39e045769232288bfde570ca4736003e1fb79d54d254859a5414398";
+      sha256 = "5bc54dd06348de5a8ffda4f2fdd1223c78532a31041a7a6e28a3dccac2f57e06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ast/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "1b94a5428889e602826e387c2c92242aca7c9cd5f8ef6faacb77cd6748e61fa1";
+      sha256 = "054584aa35018c91369ba1e53675333debe62c8c10fb34b27fd9233869330cfa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/az/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "dffdd05848f2dd592bb449c98333817fc0b47f53823e2139bb4ce908668d7461";
+      sha256 = "665f07436f9d3da77906c250a390d07fadc472d9014bf708c4b76e4787aee258";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/be/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "3343fcaf79d016a39fe7b53e4558b77dfddbb2c837cfa213375de1242bc55e7c";
+      sha256 = "c9934c38c43f95da6d3a5ed936b39f0a33399dc805dc26a357423a6d76082527";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "9a561c7716e48b632f9f6893380a8d4abda5175e2d4f6e77b17a56d1b7709ab4";
+      sha256 = "ce43e7486523ea791a3410b23d6445ac4742bdfc17f4dff7fef166c9dfb74fc7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "788a256ef5bc70861d84b0e54fe06f8877dcfd325ab6a4e87748c6ae5ea230f3";
+      sha256 = "82f8fd00def7073356e6091e759cb14bce43d1e808118deeedd35c3c9e52442b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/br/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "fc113a5fb3d3e04f5ae6ae2c9430f024b57f7dcce688b412042df3d808f4d9e1";
+      sha256 = "b4dacee5016f58f013682c8979db040c62c0430517f796934928e3d3758f93fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/bs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "1f4e0e5ad0644c6cdedeb4cb98bbefc5963e91e1a2b7d94875a6a7c331dabd81";
+      sha256 = "94061d43536184681a280e8439b05f0a5d035aac89cebc28021750818ac2e912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca-valencia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "659c2b8c92033241ac3d4c0ae0574ed9d451d613da73266196f8b72b7f7267e8";
+      sha256 = "eef766eb8aa3a35ec8b56cbe5bcdb3a1a6b452bc2d7b6922de7dab7735267bdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ca/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "018db90dfb122a6623398aec698eb8b75d242da2d1f04c16dc1e8c61b3b7729e";
+      sha256 = "d4e684531c5ac1410eeb5454448e61fdc037a768df6355084a9383a560400dab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cak/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "ac8c6b24f2dd76d4afc789404737c9cf86a4b12a86b9a72e8ae6522459af8f2d";
+      sha256 = "64ed36ea6ac02037d431b10790ec589a54bc0855b41f40729cc2f0dd1b5735da";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "cae8956a1b6be0bcc22d406eef7a1d27012e31dcbd3340b03c8ccd923ec43d64";
+      sha256 = "df4e1c59384368749ade8227c196346925c49673d9460b25b0b2f63f7b5d77c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/cy/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "a3bc30cc4d9109bda4ee5cda25a7563fbf6251e2a8bdb85c9921ec2ae7b67581";
+      sha256 = "7be81560ab2efa8961f8283bf9ae41b78e9bfecb4fc062bb5a370b691b6e69c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/da/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "5519c55dd95147ba7924d7eaf64f43672b3e5d0af3c356215e1f4f3a9b8384e0";
+      sha256 = "84658e5fea8ba57840788c7d4bdf7ea2600fbea63a7b4c4a2339e70c81f0570d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/de/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a449db92f8e9238184aca1afa2714ead4eee5c957d8064b85a06ee28ae71ebe5";
+      sha256 = "7b18cf594122f970a0e54bd404c92a509134003a48dc238669b93e22207b2301";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/dsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "08d0480a1ef2a1fb17eb48369fd4fa9d0ec5a9a53346822a7e8ebf160e7eb3b6";
+      sha256 = "5eaf65eff742646d55df43fe7cf2c2a64b920203a566c8e781eebac4162348aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/el/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "84b4fd07308ea4fae6c0293d54e6d98482d65e72c3e832732676424c0d959c62";
+      sha256 = "d45c6ff3e7303e12f87b5d6b049653c9ae1a5516784703514f91959fdab73d70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-CA/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "e887c18a43b67075de0950fbee2ceab00d3dec82c7581921daa61291fd9a1f15";
+      sha256 = "6375d180427113749371732054557dcc40e7d90e7a0207bcdb9306468a211021";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-GB/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "e7eb6732d1e971838d7cd2aa953fad9a60fa40bab42f0d0fb5777a7c6ba93099";
+      sha256 = "185dc01cd6183516cab7f175982bc0de5ece04605077c2775a1f670e5360172e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/en-US/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "81e8db159fff06cc947413698ed7e1a28cfde271ab4758844f25ce42d4b04699";
+      sha256 = "dce036c33d4749910cc2d87ce4c6786f7538a83dfe22f1ae1f9bfd17d4a23523";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eo/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "dc6152d2c34ba3c831bfc0059393e3688ba1bc7c6bce7fd7667b5429dc34d4f3";
+      sha256 = "287ecfcbed7e32717ee2fc2940f40ec38612a14965f6c24ee6c48aaf9e2d3dac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-AR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "ff2cc539f933981687541f36aa33c9c0f50fe024a570ad5ef956a848c1d03986";
+      sha256 = "f0ab0790375fb20a4b99ee6fd99af0191442ef8d251711bed2796f4dd6fd8caf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-CL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "2ee8c11f6cc821e7b5cf04a8171031efcc035b319ef668f05e1219cfeaae06de";
+      sha256 = "26154d26c371d0de08f5e5bef5661972b6b13c4e94e285d51cf776fc77c4300e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-ES/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "9cccd63e810c6dc2485c819c9ca575d071d278c25d303c7e06644f3f1afd8b4b";
+      sha256 = "921969d77ee23e539e68a079742bfca9bd0a749af53befc3b42849ee9abf0b34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/es-MX/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "5f16013792bab14181e8d945e63b28cac4ad2d449001b4013d37719f1185cd29";
+      sha256 = "9dbe72025242d5510d023c190c38c5966ca986f0b06200e3797e06da48c67a93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/et/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "b8353d19f3e7db6828d8f9c525af0493912b7e7fef0edf4376c49804fbf16f17";
+      sha256 = "4e4895663ae7c07d9bcb8c56478cb7a07e8573acee7cc1f451ed777b1fd2776b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/eu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "4c5c47c1a5985c1bf4fa1a377cf8e35eb9942fd6c1d9fe9b62e1ba4a69d81911";
+      sha256 = "1e0ce31608914502e0101246e059da95f83f05303f5a6b2646e7595e0b008bd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fa/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "3ee414921a5d45ddea0ac1426a41e97ccfdbb01524fe1f56dd29a39cbf239fc5";
+      sha256 = "529cc279815596836eeee0240db66fc3b4132d5d462c58a8caf0d3cfc6777f1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ff/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "e0fb0c4432c152102cbba9478661870d9c6ca704b9b1b712287f07f13ee53f85";
+      sha256 = "1aff9b2159f017763c1c3add776bee0b13d30e56c5d89b1364b9ad362a5c8b73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "fd4d87e350a76e4b27a1a7137372776878b079f61fa8652372edfe274082fffc";
+      sha256 = "a70fdfb3abb400bf51d186d8c4a609f25ee0da2d29d9c26f93a1cdfc7b755c47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "bef5925b6ccbb6540fb223042acce4613f7f51a937f7d9214313521b16920978";
+      sha256 = "f7f6396a4a0a892db2e566f35c41d2b327956d4a7afa137c559c06a237f2e040";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "ba7b39bced83e20ac07b045cc0f34bfd6635a211309441c6133c86907742bc13";
+      sha256 = "c863d7680e463d3948316b98bcdfc17b9dc2e72012fb7d8d242789271b94b581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/fy-NL/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "c691224f862a2ba7306bbf30252c6c69dfa9317d251d025c07c69e5bb8362ed8";
+      sha256 = "6dac9e3b8abbc4667041767b43229188ec1a47244189ff0c742220bfc14ed298";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ga-IE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2c0aa58a2950d25e376e2850b91cde4d14e3d1fc346f79e87e0dfe514002f0a0";
+      sha256 = "2974969a324c77ec27ac89e769891b56bc4a89ddeaf3bc049fad077d38b3de76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gd/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "92ac30054f35f414d8c1c9d4f5da9c47d45e7276c81399526fcf3025f16f7e7d";
+      sha256 = "c9177b756cc02ff1c708bc7f13516c8794ec871589a0838df5681dd14611b717";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "bbbfad7dab740d3ed8de731dedfd6e490a5e67a2015bda75b453f4505f0d3e21";
+      sha256 = "3625754df8b228d7f8b51bbafdddc6648c4b7b78d16d287fd6c648bde449e899";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "052f306c7cb17c95f31e433b609126639952699974da2cae143b21fe84fc805b";
+      sha256 = "b2e5bdb585f18fbc0933a4b782edcd08513d606afb1d2686705ee7fabf66987d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/gu-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "1dd713964bdbf17f6475e54ff32c3742e3c1637444695e0c61100f21fbdad168";
+      sha256 = "7e0a44037cbf60148bec07d2c8f0bf78079b80692da2230ae2158a090d48b785";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/he/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "2f36e822da58f09ec8f2d18c2de8cc33b4208db066aaf3753dca426f121a8108";
+      sha256 = "920ade68106d20857e5af7b064c3d97d8661818be36bada7a21d6f89682db91a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hi-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "6fc182be1a8a96dd5a5dab5edf9bcd6272709f5954c0b97fc6f0390f56fe5ac2";
+      sha256 = "cbdfb08d1cde45a370bde21191eb901c1b7a9e08bcf29c94fbe728182a8c2992";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "51146afa8f1a8c7c04f0b8e629f1dfad49622c024df2380af012f5b9466e0c21";
+      sha256 = "7b3c21df86b3cc960cfcb948284f042b68e367f8b3a28ffcadb7258a8538d6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hsb/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "a5ace3b21b9ecc94fb5449f38e70d463cbace509a240062985a5a0ad1f6dab33";
+      sha256 = "0dddbcdd417f10b2d2e576346c313dd325b170cebb478827ee3f19154aa2e3f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hu/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "d67467bf4cc780c6aa8ead5dc362b88a4e1839fdcd4e059c94c53ec851a711be";
+      sha256 = "6aa34847a12eab43aa04ca1ee27c5edd5562a5e916fe47a64a5a469b46201e3e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/hy-AM/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "6a3c5095e3402fac2eb4d4b39b605312e723e608510c0417f278a393af12bf51";
+      sha256 = "4f723e805556cca933b97981871c1e1408cfbd766b15037981af9deddd041fb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ia/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "bf271c5ece7ee47055fbc6eb8d34fa9736afa4e7408f7345ef352d4ed2d0a4d1";
+      sha256 = "9ad43eff14c069d7ef7f27e2b47fd4713af832410c579868293ee7f78cc8c07b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/id/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "41301f061f84a594cbfc28dcbd87aa9bc714a384ee41f4b766186d17c8207b9f";
+      sha256 = "3176ea295423ecd71a466a79e9657fea751e6d8c71db66a0709168556f8eae45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/is/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "27592a8d3eef8a9d252927f64fba236cf6b7d420eb1e3f5501b6efa366f79691";
+      sha256 = "9cf0acbdb7c99914542941333fd1fbe108fed41f46af9fbefaf0a480adc0564b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/it/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "20e01876b7a2eda3a586bbd658d04672e400e2c0207083620a2ea2910b71a9f8";
+      sha256 = "5e345715eba89bc244e16c73dacc522a3b83e9ec3f99ae072945b18cfa904f5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ja-JP-mac/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a140e19cb6c43f334d416494e3faf181c3c3d09933b25e8bea3d8671c768e384";
+      sha256 = "308d2c19609ed3874fe8cd3619602d606356ed55c4ca0f1fca1dede932c19e79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ka/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "75eaf79b48b1b2640cdf39c4b75b4c6f44c69ea289909bb6a85392e40a7023dd";
+      sha256 = "d0ebffe428b05422977dac4bf3380c3e57a0ed42d7a4110699ec4b92fe168bce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kab/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "076aea0ff89b228814d74860b3139a8694c5b660a09f000c07bf7925b15f0a5a";
+      sha256 = "e0002e9e16c91d5b8a9ea7d3de83799bbd77e6c23aee05759052e8d6303e01bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "9852eddf1ab5078e8dff92699ecebff9d7fa7e4466de87ba090e5d71e4415b57";
+      sha256 = "efff905c517fbdb1b3a1171b3114790cda03acb4002c9653070092149b92bc8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/km/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "860b3a552f2f47b1188e1f77da82a1805af2437c43b2b6b9a6b600cd36681136";
+      sha256 = "473c31374b6d982e61d75cb3974e20bcbd13c4613bcfddfea50aa43418903f54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/kn/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "8d85e36fb0c36243f6c97e8211fa92b16da0e3afbe3a91ebec3baf10546fe938";
+      sha256 = "9436efdd09ef9eaaf104d90426cb091e1bc217468bd66cffcb7d91f8d2758f07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ko/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "7bfbba2a109c1494dab5e65e67490280d66c2a6a6b739641e2b78ffff8d81276";
+      sha256 = "9973a287baaa00930831a865beb370faee052f7ea486c728f2ed13060ff3280c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lij/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "bc752a6c3416a2e60365931d1363e87a432e3f7cf4ec1be8d24bd26eeda5cf6b";
+      sha256 = "f4c9678e933e440751b97f35b6e04941d9ce76b5869d45748b91df8336155274";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lt/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "148ed3dae888edfbe5c8a7c47431fd1ec0477af9d56e7e2d519abb50dd940002";
+      sha256 = "ddb021dca21e65e30012aab734d160118b26c3542fc3afff2db857dbda216221";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/lv/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "14a68b53617eaf2d1e78ad934e1c927c8dfec155e0f239289d262073664365c9";
+      sha256 = "f63120daedf1ea0648de93f9178db541fed0144508ad5fddb3e512f32369c3b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "e1695c52a02f2b051de16ab2b7952895bfed6b23b6e440ae308daf31ae6f3580";
+      sha256 = "9501890bd79ddda990d8023a787efda67acb7d42e5283bd354ecd89d7a5e5546";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/mr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "464bdb5629c5da032248eaedf583c6d2c14654b8e2f919d06edc9a1fd429246c";
+      sha256 = "ba43292eb30482a03f83a4fde41e63accf37ea30b89fc8b4350a2ddf94572af0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ms/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "d65005ab7af62c83662a07aaeb7d4d57e07ee81a0c9db7e87fe2fa1620260434";
+      sha256 = "84ce117ea9b6703b743d70c85dcb679bfdf3652d5f2e5d765f4437873a979223";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/my/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "5d39e9cbdab4e72fb66df452ab1de1dec8d7e6f29fb4f2d1c562efacc5d2c691";
+      sha256 = "ed8c07f47e46998bf072d6d0db2a677326bb56e55d56197ded040b34cbc4a63d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nb-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "e56923023c4fe6fc25731dbf551f21f9636bcc6d1a8359e2121a6589c4db5ab2";
+      sha256 = "676be48e68f893f271c5db650d11cd17bf323157907e2176a76d97053d9a35c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ne-NP/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "31c9d56a2776ebe63eacf955e46df7065b3e97f99f554fdb1a627767b1324f62";
+      sha256 = "fdc56c722f0509cc1f99bf4d7759faedfdb8d5f74ebbc41fd604cbc85f5de4ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b5541303b09157e6979f5368c2840c51dab29ff841f02b9dc0bee9813a918060";
+      sha256 = "f908f97357b129f8ddd56da82b17da273dabab6fec022823bea2976645331860";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/nn-NO/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7fb516ececa5f586536f8811490b7e71e1e5af25d5884d70334d6f403ee0f362";
+      sha256 = "3d38846a8f6ee404b6f5e55121f3c6a40b278cb4a224859c95e191f614741cfe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/oc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "a55a0693d6b7f39053db3741befbc445c820ca547f42b7c295971d81a795b152";
+      sha256 = "c2db065e02821b6abe15a8448bf45f07ab842ccb3d14504f52ff15cdcf786879";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pa-IN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "6689f4363099fbd3a01f809b1439554ca08f0f404ff8a769e45ef84c1f404666";
+      sha256 = "f6774c2c7f78362beef99450be1865f5ab9a0681fd41a18403e916c31c9538b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "c084fd8619af8ea6c72d7cd44bb20a9d4f058d3dc082fab5f868e48671d1aac2";
+      sha256 = "cc14ee424433ab322b17058ea8719ba9368ff5e7a91d2f691a92dc1d13964f11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-BR/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "2291d282eaa74bdfb225d2f48e968eed1a48808bb6a7eb08290f6e7889a02036";
+      sha256 = "20db9ade31f00b3aae5fcb9fe71d63c31d31520f31a0e87644b34cc0a8c928bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/pt-PT/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "2dff246a5a5cedfa71b5d22fb7db891bf27e8835970ac21adeaecf73a384835f";
+      sha256 = "15d5a45a13311a67f86fb9814e1ac49f5090933f1110ca0ccc1f5bf51d4312e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/rm/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "ddd1cf01753ce22f577ebed4693fee2352b208d5c522e131f225fc3238bd8e2b";
+      sha256 = "07452f83b2a572e0c536e0a08aec5146aca7fef1a162d0d14ce49aa4b2032fae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ro/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "321ce0a38b5ec5a5cc81b2b62f8cdb4c48db017accec3ee887b79f5bb1e99c27";
+      sha256 = "98500565dda18961b9e35a4ed0a16a0c7cec95a72bfcfc43c86b4f31a32e1074";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ru/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "771e6eea536f0fe44c213c03adbfda1126e077b04a3400fcef152e952db62f6b";
+      sha256 = "f85319ac38fb8be330bb80e6b1e5fc781d8aad2f8a6a300e1c85916f0baf7c62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sat/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "564202f15ded2336241f1baeecc251842e608f24e8923c9212e3b78d14b8604f";
+      sha256 = "5cc725cf1112960bccdee3d5f8ffb1a8fa7d62cdb50aeeea5becff34bd971320";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sc/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "6e6598ff2ac53d8c1fc9e63bd9393703b59cf26b8ab4abe011d9b501a17eaeec";
+      sha256 = "7770966f953067fd4170aeb4bc0d3be8deb405f74e2129abca7253e792f69b3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sco/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "99f6c0d9c7301dbd8a58ae03458bcf5d093a54ad30e2960aa0fbe02c81656dc4";
+      sha256 = "e10ae6867387b2306b2ceb74e136d28ca332a9573d2d16d10ea8d4ccde9cf85d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/si/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "df763722f9a8c41d15f06f8dbf23eaeb868566488feecf396686daf08073433a";
+      sha256 = "d3e02db688b3093c05b7efdaadcef600f956a614572504489e4d69cc975c8a08";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "afc30e2f4beab9c64ff597178558a0c28da0c53f311b4f3cd70516ed84ec4c80";
+      sha256 = "28b1b6fa00da50a5717bdf35bd98af2ed217fcb6d6f782865d7d9bd0acbeb7c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/skr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "0cf03ef8ccf6889ea45d5c3c01bf0f8538280ad0a0b4ba0d62d0cb880fa70079";
+      sha256 = "fd1ad12da34e3bbbb9fdfcd64c2369a3b26ea9f6ec034673fcf0235d8627765d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "c43cb64d9398081fd7b5253d7cfcf4cf2f187f3b6df55558370e08a49da606f5";
+      sha256 = "1b418886de3282ff93ee5ccce0e359b5c5d94de3a3cf6fc85f5342d9f18e80ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/son/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "09b827b23e0578dc465b1e33c2c35ad611665c8487e6b37671f7c2a27a09ea60";
+      sha256 = "ab8f032f880c20a83bd6e4a64740122567a48084ab973ec4f708539009d8afdf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sq/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "9dcb230c1b926cbd53b5474007148b254a3063b3893cd0bb6e297314e264916e";
+      sha256 = "f1ed88be1dc9ef4a5dd873f615c7008e87122f690a0ca8f2c4435c8c07266423";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8538c307eda6362bbb88b300f74a6db401d969a6a90cf6c0c0f515aed07e5078";
+      sha256 = "8c76f294b168a7089308b5370b46eb507853964c43e33058d3ff5b0a9cb94a74";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/sv-SE/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "4885cf3ba66f3e9f562349bfe9dae07d54331a13d8ec55dc875f51d18ba5c410";
+      sha256 = "33067551aad68665fbafab6357ace0debe78032fa1a9a63b2c7f5c35aee6cd6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/szl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "17441b0d020fa3d308294563475e6195f143997e0b978a3ede06f68f05ebfd43";
+      sha256 = "cabd50959911a80e1a663327564d546753b6f053a3147d5e5238713f54c930fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ta/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "4f81bf6a7ad7dc6f9dfd50c985156e94d28edde7e2b1d2517786d155c6132bf7";
+      sha256 = "55c572220f5e0d0c16b5314e8429a221b668d6b05bd21d1410deb850a20587c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/te/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "56a4a194e1dfc3a1abf7b9c28cdc1fd4f5613658d80c1801425e8e32dce4abd0";
+      sha256 = "dd24dff0bf95f49d5415e541596e2b832481cf9fda89d4a978ce8e3c40690647";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tg/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "104a63204b38ab9d82c80e788750a9ca2553000e2084b01d7d8c0227e5777e51";
+      sha256 = "4b628008a8536fd67cf6e403fd9f771f765994e172c228bdf214ec73d7b483b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/th/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "9a05c4049d84f7f6b0172195f34a98f69aeacdd5a5d80d935fad49052bb8d759";
+      sha256 = "edda1adddebf16eb8ccd31d08fdf77f7f4d349c57dccbd29c98998831f3405a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tl/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "3b24fa93c80889bdfe3375340f33d7220800c48256509dcb86366d9c274a4226";
+      sha256 = "5c9cf0f10257b5788edab5298069a66157be9b740a618c22b6e6f7b6495aee05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/tr/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "e4ea76861425944db62f6befd078d75308d493a85162f1211f9081a95e9c9317";
+      sha256 = "23d6fe36c78458a9c20baca7f9f559c2044e02a7d0298994ae3fce29846a6cbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/trs/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "6caf872e4204661d93f98c1f6c83ed04f506b387d416e89937e45d6413b9af1e";
+      sha256 = "da3998812d320ea6242a345a239ead76b5e08a479a758fd0769918461c6a89e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uk/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "7364e3a29e2b412e705779342341028abec59f9e88f80ae98d036e362cdb56da";
+      sha256 = "02faddd1b0b5b79211c36438a2ce47238231c11dcf675d65974b8478f7f16818";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/ur/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "7d2cb1a3a42b1c5e4fd70b38683243bea376a7f8a44719d96ed1ce0c2ddde982";
+      sha256 = "bf9846f9ef42b29670ac7a578afe0d0daff713cbe2dcea8fc80e937f753dd284";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/uz/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "66cd768b169964d3509bf2f6de345ba12944498206857161a1afda4e35bd7876";
+      sha256 = "dca6f4b4b872c20d9ba2c1b42a2a02e6ae5a70df363fe0f12a3509e6fbc05ee9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/vi/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "c978392a737c19328f374e018ebbce779f61ed3e7b7f61d549fc9d3dcf1bf92e";
+      sha256 = "bdbf2095fcd35554cd83ed9a115d6037e24487861ed8746d3b3285735d5518ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/xh/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "780f47c26ac2f447758a27396d9f5e4dfe979037a3471a9e5dfda36b2db05c9c";
+      sha256 = "86496e2fa6591ff5218eb4a7187b5cd303c86e6dc6d6bf9cc32e20aa6b199d77";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-CN/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "4530f0a24d355a124470f9bb913e4664785fda206b449ceb5ff4679277396f4d";
+      sha256 = "8ab9a64b3733fd391678c47a2307d44205a9ae67aad5895aa11ceb73eeccf6ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b3/mac/zh-TW/Firefox%20140.0b3.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "26191d7fd1fb4083f4bf79e5287c47f024606786a56c6f87cfaf4a12e5b93ffe";
+      sha256 = "a1e2692eb4a0a728b051a9f6c3998b7f87b0e118133fb94b069f582c0eb463e9";
     }
   ];
 }

From 1412c4c7ba4ec484080e8b58255a5265f73e6866 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 17:06:36 +0000
Subject: [PATCH 0864/1497] ddns-go: 6.9.3 -> 6.9.5

---
 pkgs/by-name/dd/ddns-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index e390d5c7a1f3..b3a1f333f843 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.9.3";
+  version = "6.9.5";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-SvhfrVdVn5hvtnDWLg6tdv8wXicUBt3U0CjseJLPbVY=";
+    hash = "sha256-FwLS233yGPXzBfHscJV4JCNqJru0hOAA808DVis4V0s=";
   };
 
   vendorHash = "sha256-RPYjw4G1jfsrge1eXKdQ6RdNL7srjagUY14GzXBJvpI=";

From e2530c17470db205d877145a8276639413918d49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 17:08:01 +0000
Subject: [PATCH 0865/1497] jumppad: 0.20.0 -> 0.20.1

---
 pkgs/by-name/ju/jumppad/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix
index 07166a513a97..840d60ab6f1b 100644
--- a/pkgs/by-name/ju/jumppad/package.nix
+++ b/pkgs/by-name/ju/jumppad/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "jumppad";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
     rev = version;
-    hash = "sha256-g46sbsAa0c7smCDMDLhGIJ8KlpEH9gHSV4/uRLQjxL8=";
+    hash = "sha256-K+HWXtuKe0g8K3SpfbHgKzuTxiz68MSvzeI07fm0O4U=";
   };
-  vendorHash = "sha256-ZYcjlOt0y5fhbMmxTgr8vAFO8vhqLDTNKonYf0f1J58=";
+  vendorHash = "sha256-mr7Rnqp2rPIeW9oqNMbxc0SR+l8pPhKm6jk6EEycpRQ=";
 
   subPackages = [ "." ];
 

From 278663212dccc634579470c17bf811b0d8fb1e06 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:08:10 +0200
Subject: [PATCH 0866/1497] _1oom: enable parallel building

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 360a4d720bb4..9cbe274038e2 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
     allegro

From f92176411587dfd0946be858500ee7784e2024b5 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 3 Jun 2025 19:14:44 +0200
Subject: [PATCH 0867/1497] maintainers: update _6543 by adding matrix contact

Signed-off-by: 6543 <6543@obermui.de>
---
 maintainers/maintainer-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c36617bbaf80..1c400fe9e2dd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -265,6 +265,7 @@
   };
   _6543 = {
     email = "6543@obermui.de";
+    matrix = "@marddl:obermui.de";
     github = "6543";
     githubId = 24977596;
     name = "6543";

From 957775802e3c9aecd8d7312bc652e8209a4352d9 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:16:23 +0200
Subject: [PATCH 0868/1497] _1oom: drop SDL dependencies

They are ignored in favor of the SDL2.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 9cbe274038e2..6e4aa7d59504 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -9,8 +9,6 @@
   libGLU,
   libX11,
   libXext,
-  SDL,
-  SDL_mixer,
   SDL2,
   SDL2_mixer,
   readline,
@@ -36,8 +34,6 @@ stdenv.mkDerivation rec {
     libGLU
     libX11
     libXext
-    SDL
-    SDL_mixer
     SDL2
     SDL2_mixer
     readline

From 1c8fc0ed66c2e83d530fbcdcf8bb1468e6be5b6d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:09:11 +0200
Subject: [PATCH 0869/1497] _1oom: enable strict deps

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 6e4aa7d59504..9c06bfa0c86a 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -25,9 +25,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
   };
 
+  strictDeps = true;
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+    SDL2
+  ];
   buildInputs = [
     allegro
     libsamplerate

From 3b4f21beac1472f26dfaee39e58020b8dfa11e78 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:23:42 -0400
Subject: [PATCH 0870/1497] veilid: 0.4.6 -> 0.4.7

---
 pkgs/by-name/ve/veilid/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix
index 50829eaca45e..77dc996b04fe 100644
--- a/pkgs/by-name/ve/veilid/package.nix
+++ b/pkgs/by-name/ve/veilid/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veilid";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = "veilid";
     rev = "v${version}";
-    hash = "sha256-bKll7VB6LjkmmhN5lmjcSeP2zZbyWnl4XiZbZe3tKgg=";
+    hash = "sha256-SEmXZvv6951Ln87/sRQwr4FgGRSvowGyeyApfF+JnJ4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-505gf4P/Hlo8KFynhAQdBagzEqGXhydhTTknat/jWmk=";
+  cargoHash = "sha256-2fZAds4wNLd/mWh7EWpP2hqspBfAtTHIEe+dFag7Lw4=";
 
   nativeBuildInputs = [
     capnproto

From e562293f050b023d3426f64c09f58530aec0ef8f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:10:52 +0200
Subject: [PATCH 0871/1497] _1oom: switch to finalAttrs pattern

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 9c06bfa0c86a..ab4e1edc5580 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -14,14 +14,14 @@
   readline,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "1oom";
   version = "1.11.6";
 
   src = fetchFromGitHub {
     owner = "1oom-fork";
     repo = "1oom";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
   };
 
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    install -d $doc/share/doc/${pname}
-    install -t $doc/share/doc/${pname} \
+    install -d $doc/share/doc/1oom
+    install -t $doc/share/doc/1oom \
       HACKING NEWS PHILOSOPHY README.md doc/*.txt
   '';
 
@@ -58,10 +58,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/1oom-fork/1oom";
-    changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${version}";
+    changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${finalAttrs.version}";
     description = "Master of Orion (1993) game engine recreation; a more updated fork";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = [ ];
   };
-}
+})

From 8a40bf8fb1c48c7145afbff4e511134835de9c19 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:21:48 +0200
Subject: [PATCH 0872/1497] _1oom: remove unused build inputs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index ab4e1edc5580..7b685f8a037a 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -6,9 +6,7 @@
   autoreconfHook,
   allegro,
   libsamplerate,
-  libGLU,
   libX11,
-  libXext,
   SDL2,
   SDL2_mixer,
   readline,
@@ -35,9 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     allegro
     libsamplerate
-    libGLU
     libX11
-    libXext
     SDL2
     SDL2_mixer
     readline

From 4873085fdeb1d84dfc300da384f109d8ee13b5b7 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:25:01 +0200
Subject: [PATCH 0873/1497] _1oom: remove 'with lib;' from meta

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 7b685f8a037a..652188c396a2 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -52,12 +52,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/1oom-fork/1oom";
     changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${finalAttrs.version}";
     description = "Master of Orion (1993) game engine recreation; a more updated fork";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 })

From 2a495be3d3afac302e2ac41547e384f24a1a7be2 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 19:26:43 +0200
Subject: [PATCH 0874/1497] _1oom: add marcin-serwin to maintainers

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/_1/_1oom/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix
index 652188c396a2..1c9a9675ee5d 100644
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Master of Orion (1993) game engine recreation; a more updated fork";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
   };
 })

From 0b53077f973b4cbd51e8f7a1a3a222bfe9bd9230 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 3 Jun 2025 19:37:08 +0200
Subject: [PATCH 0875/1497] gpu-viewer: 3.12 -> 3.13

Diff: https://github.com/arunsivaramanneo/gpu-viewer/compare/refs/tags/v3.12...refs/tags/v3.13

Changelog: https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v3.13
---
 pkgs/by-name/gp/gpu-viewer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix
index ebc91e8e9d7f..f726b77f1c9f 100644
--- a/pkgs/by-name/gp/gpu-viewer/package.nix
+++ b/pkgs/by-name/gp/gpu-viewer/package.nix
@@ -29,14 +29,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gpu-viewer";
-  version = "3.12";
+  version = "3.13";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "arunsivaramanneo";
     repo = "gpu-viewer";
     tag = "v${version}";
-    hash = "sha256-wVgAAKqlf5mtj2u+DsRPvYeVta7wAr+eCXVM1c/l6bo=";
+    hash = "sha256-0owVFnAy2jncNzcWma8vLAAXWOZJ7d56yfn5fr2c2lU=";
   };
 
   nativeBuildInputs = [

From f422e1b13d3c9017fa78082bd75a13eee29ba614 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 3 Jun 2025 19:44:43 +0200
Subject: [PATCH 0876/1497] gdal: fix tests with proj 9.6.1

---
 pkgs/by-name/gd/gdal/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 5283408003d8..609ce18ba532 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   useMinimalFeatures ? false,
   useArmadillo ? (!useMinimalFeatures),
@@ -92,6 +93,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng=";
   };
 
+  patches = [
+    # https://github.com/OSGeo/gdal/issues/12511
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/1dd320b086606958fe970457a0640bdc4c4d494a.patch";
+      hash = "sha256-SXlNjgR4q7i3PrFfh/wzEFMrSGHQuB+ecXbGJgsROe0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/6da26aec591656f97fd882b07d37c21aabd06373.patch";
+      hash = "sha256-s70j/S9YKGRqxwrabsV3ePeGSsnDh/ouGLtLEm+z0lU=";
+    })
+  ];
+
   nativeBuildInputs =
     [
       bison

From a714c291e04a18a610c2d646e9bfed99d80bff17 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 4 Jun 2025 01:47:17 +0800
Subject: [PATCH 0877/1497] uv: 0.7.9 -> 0.7.10

---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 44459e7caa5b..495c48f73f87 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.9";
+  version = "0.7.10";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-Q2HOR8kpHuCB4c61vS0yojyue5tYNCHpx/NuG0HGHl4=";
+    hash = "sha256-NdePwYsAIphAJxtD+sCC7vSouWt+i+uPEp+b0zRlLg0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-oIgvufZsS65gL0SL8WQggjZ3UFPDfEpf0yM+kkkUiqg=";
+  cargoHash = "sha256-vPs6VwhnMsnoTpktdLlOdYcw1X35xN/alwZ5zEyHmEY=";
 
   buildInputs = [
     rust-jemalloc-sys

From 47a1afc2e9e320b09887d7e6bdb44e4cf692c98f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 17:48:11 +0000
Subject: [PATCH 0878/1497] sioyek: 2.0.0-unstable-2025-05-23 ->
 2.0.0-unstable-2025-05-30

---
 pkgs/by-name/si/sioyek/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index a44e9826df8d..0cd41434b56f 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sioyek";
-  version = "2.0.0-unstable-2025-05-23";
+  version = "2.0.0-unstable-2025-05-30";
 
   src = fetchFromGitHub {
     owner = "ahrm";
     repo = "sioyek";
-    rev = "d73a2fcd74c0a119c397372a79aeea628205d4a7";
-    hash = "sha256-ZKAv/G/Bgb3lxEx+WRupTBxo4Gf5yFbZ+siNyz5lABY=";
+    rev = "43402f6207f241ea0bb2854dfd9159e175649921";
+    hash = "sha256-mB7vBnvSrQdrPO4yLKRmDvYfuDOCfOshV64cAVGsdDU=";
   };
 
   buildInputs =

From f2b0caeab6851a2136c295bb1ce14508fc75e175 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:59:23 +0530
Subject: [PATCH 0879/1497] miniupnpc: 2.3.2 -> 2.3.3

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/mi/miniupnpc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index 2078657acda4..08a98bbe4c00 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "miniupnpc";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "miniupnp";
     repo = "miniupnp";
     tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-Fjd4JPk6Uc7cPPQu9NiBv82XArd11TW+7sTL3wC9/+s=";
+    hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s=";
   };
 
   sourceRoot = "${src.name}/miniupnpc";

From 937f8bf22420e27f54f0caff2a3b82adb2d62f23 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:44:38 +0530
Subject: [PATCH 0880/1497] miniupnpc: fix external-ip command

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/mi/miniupnpc/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index 08a98bbe4c00..da622d060320 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     mv $out/bin/upnpc-* $out/bin/upnpc
     mv $out/bin/upnp-listdevices-* $out/bin/upnp-listdevices
     mv $out/bin/external-ip.sh $out/bin/external-ip
+    chmod +x $out/bin/external-ip
+    patchShebangs $out/bin/external-ip
+    substituteInPlace $out/bin/external-ip \
+      --replace-fail "upnpc" $out/bin/upnpc
   '';
 
   __darwinAllowLocalNetworking = true;

From 21205258f5bb0a07cd397b7384c3c283455eda59 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 3 Jun 2025 19:59:37 +0530
Subject: [PATCH 0881/1497] miniupnpc: finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/mi/miniupnpc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index da622d060320..d49f0c77a468 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -7,18 +7,18 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "miniupnpc";
   version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "miniupnp";
     repo = "miniupnp";
-    tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
     hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s=";
   };
 
-  sourceRoot = "${src.name}/miniupnpc";
+  sourceRoot = "${finalAttrs.src.name}/miniupnpc";
 
   nativeBuildInputs = [ cmake ];
 
@@ -58,4 +58,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsd3;
     mainProgram = "upnpc";
   };
-}
+})

From 228d26d7a23ca296826062a7d43f8fa0c24fdf97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 17:56:30 +0000
Subject: [PATCH 0882/1497] vault: 1.19.4 -> 1.19.5

---
 pkgs/by-name/va/vault/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index eb560c67b588..891c9d16be2a 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.19.4";
+  version = "1.19.5";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    hash = "sha256-IF67/aWBUMFjAyC0TloKOJUa3zenk47QaCTBKwOltvw=";
+    hash = "sha256-pj9aaEpXEmBBjJOqdvD2bYip5gg3pUob7gmV8rbhnuo=";
   };
 
-  vendorHash = "sha256-tVCSEqAlyogwFSBWtFEzDl5ziteoBexqQ0xaGmk8F+k=";
+  vendorHash = "sha256-tOGB9psxlgC+h/uJd93tkpDYzi/xIZ25rDMQ4LnX9Pg=";
 
   proxyVendor = true;
 

From 27fcbb07fe26ef0a16c2988a26e53c69449d2888 Mon Sep 17 00:00:00 2001
From: jonasschultheiss <complaint@jonasschultheiss.dev>
Date: Tue, 3 Jun 2025 20:05:44 +0200
Subject: [PATCH 0883/1497] terraform-providers.proxmox: 3.0.1-rc8 ->
 3.0.2-rc01

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ae415610983a..15776641754d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1066,13 +1066,13 @@
     "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg="
   },
   "proxmox": {
-    "hash": "sha256-agupFUy/4D0gJ12AhJDNt0FPnSWM1laBban13z04pPA=",
+    "hash": "sha256-vrlZ2bt2Eczst+Xu5BZZqFp2aJzb1WrHZS/p3f99gRI=",
     "homepage": "https://registry.terraform.io/providers/Telmate/proxmox",
     "owner": "Telmate",
     "repo": "terraform-provider-proxmox",
-    "rev": "v3.0.1-rc8",
+    "rev": "v3.0.2-rc01",
     "spdx": "MIT",
-    "vendorHash": "sha256-LZ3g/UuI+u4ULaM2taso9GgSsmxJICjKhrSaWIL6nCw="
+    "vendorHash": "sha256-H8nmIaBwyBLO61Wys16YZgMHVFcCLe0eP+VbUUMc47c="
   },
   "rabbitmq": {
     "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=",

From 3541fd843a561c7792bebdb49ca9118f1cd3720c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 18:14:38 +0000
Subject: [PATCH 0884/1497] spider: 2.37.79 -> 2.37.91

---
 pkgs/by-name/sp/spider/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index 146baa27c695..f1cdbc4360a5 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spider";
-  version = "2.37.79";
+  version = "2.37.91";
 
   src = fetchFromGitHub {
     owner = "spider-rs";
     repo = "spider";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uYgdYIZ+T5G9TvgFCdErvex9KXN0pJn3MngMKpT/PVo=";
+    hash = "sha256-1WDsvEIoeWOUIN2HbTJeLkTlUgUZhExurPtN7ef/Egs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uJ69BxeYhU/xVTKqOsxoqfS4At9+BtqurJfYUFEnKtA=";
+  cargoHash = "sha256-0DEJltTM8hH5Nsx5j2S9kURO7kLm/Mnv0M/QrarojaU=";
 
   nativeBuildInputs = [
     pkg-config

From f5ec40e3cf4d604d812d34ef6f3b963450d99615 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Tue, 3 Jun 2025 20:20:23 +0200
Subject: [PATCH 0885/1497] audiobookshelf: 2.23.0 -> 2.24.0

---
 pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 84c31d3aac1d..4d0383a553f3 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "077273033657da2345494084dc7a1f399cc1a7ba",
-  "hash": "sha256-6ygJrB7AvOyRLgDrkz/qLXiJXP+0U7uhi1HqZP62+gU=",
-  "version": "2.23.0",
-  "depsHash": "sha256-3ANieZvWxLVDiIZ1oGSB3UQgApZvukXN5OokyUnFyzg=",
-  "clientDepsHash": "sha256-WiMQZwPFo5qTo4kTWZ+LuLKDEorediQ+GhUxAO+nRCc="
+  "rev": "c377b57601f82f76d677b09e6bbabda732c18861",
+  "hash": "sha256-q0Qlslw5e1nHDqLfLi4AvD3vAzoWvz9/0/lMgqn+y8Y=",
+  "version": "2.24.0",
+  "depsHash": "sha256-s4U+Hgace+d+zRaHeJkxh6TWgClY6T+tlmoyZq7L7Rk=",
+  "clientDepsHash": "sha256-fAtr5GW8AInIDgSEjv1JwKW9GNZGYImD3LxerkUqH8k="
 }

From 4a06138baf0ad192b053f7315f5305a1349177c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 3 Jun 2025 20:21:32 +0200
Subject: [PATCH 0886/1497] esphome: 2025.5.1 -> 2025.5.2

https://github.com/esphome/esphome/releases/tag/2025.5.2
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 3568e5a6bacd..da6e54c817bf 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -33,14 +33,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.5.1";
+  version = "2025.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-z4FwymWFjyqNx95r2o7LLCmytRQYkogfCKiUFNyGOuA=";
+    hash = "sha256-p4+OuBGS9OJxxiQ4xOO2WseUrw3yXWyCZn7jilnh06E=";
   };
 
   build-systems = with python.pkgs; [

From 8b3b56a3e284d78474b53a4c60d361443c3556b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 18:23:01 +0000
Subject: [PATCH 0887/1497] abctl: 0.25.0 -> 0.26.0

---
 pkgs/by-name/ab/abctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix
index 968206813bb0..ee6de98ba562 100644
--- a/pkgs/by-name/ab/abctl/package.nix
+++ b/pkgs/by-name/ab/abctl/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "abctl";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "airbytehq";
     repo = "abctl";
     tag = "v${version}";
-    hash = "sha256-ZM0ae4Oiz/q4KSkxVxEXPe6oJa5fsNWzw+fX5hobc1c=";
+    hash = "sha256-FbL9jfTg2wV203XwMTTDgkfjX4+J/aEagIHE/q4sYDs=";
   };
 
   checkFlags =

From 9c3b2e3c887acbb216a6f438ad1169bc5c282ca4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 2 Jun 2025 16:25:20 +0200
Subject: [PATCH 0888/1497] python312Packages.pytensor: 2.31.2 -> 2.31.3

Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.31.2...rel-2.31.3

Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.31.3
---
 pkgs/development/python-modules/pytensor/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 77edafdd0351..c1d7b0e494fb 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.31.2";
+  version = "2.31.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-dFqJm9/77Nelh//1FjLauPAAQSogDa2fd1JJjlVFWsY=";
+    hash = "sha256-tvK8UzJZvX9X2NKgqkyhi0ZzAb38Lu0ULze4L1Z3YfU=";
   };
 
   build-system = [
@@ -133,6 +133,7 @@ buildPythonPackage rec {
     "test_scan_err1"
     "test_scan_err2"
     "test_shared"
+    "test_size_implied_by_broadcasted_parameters"
     "test_solve_triangular_grad"
     "test_structured_add_s_v_grad"
     "test_structureddot_csc_grad"

From dec0fac95227ab8319101b1857933dbb1ae7859e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 18:45:25 +0000
Subject: [PATCH 0889/1497] terraform-providers.akamai: 7.1.0 -> 8.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ae415610983a..15900da27884 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-T2yIUO8DAuUC5s/bBxgsn99fCjJO1y6TzmPTuhT08FY="
   },
   "akamai": {
-    "hash": "sha256-ivIJvWKfL9oYvLZeoErvYKuCZLEwNaZD7jFrIGPlurI=",
+    "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=",
     "homepage": "https://registry.terraform.io/providers/akamai/akamai",
     "owner": "akamai",
     "repo": "terraform-provider-akamai",
-    "rev": "v7.1.0",
+    "rev": "v8.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Sp65odS8Axdv5UpA5j2SXvbC/rfet4GlIawxk054Cs4="
+    "vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
   },
   "alicloud": {
     "hash": "sha256-Jn4VzU6aPhMv6eMmXQ5gD5SA9IZfpmkRKpTrjRGrNF8=",

From 2aab1fc0c38857f964cb50c6c147d1f2f4ce9096 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 3 Mar 2025 05:25:13 +0100
Subject: [PATCH 0890/1497] treewide: use src.name in sourceRoot

---
 pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix      | 2 +-
 pkgs/by-name/au/authentik/package.nix                         | 4 ++--
 pkgs/by-name/bi/bitbox/package.nix                            | 2 +-
 pkgs/by-name/gi/gitaly/git.nix                                | 2 +-
 pkgs/by-name/oh/oh-my-posh/package.nix                        | 2 +-
 pkgs/by-name/op/openfortivpn-webview-qt/package.nix           | 2 +-
 pkgs/by-name/us/usbkvm/package.nix                            | 2 +-
 pkgs/by-name/ze/zerotierone/package.nix                       | 2 +-
 .../python-modules/microsoft-kiota-abstractions/default.nix   | 2 +-
 .../microsoft-kiota-authentication-azure/default.nix          | 2 +-
 .../python-modules/microsoft-kiota-http/default.nix           | 2 +-
 .../microsoft-kiota-serialization-form/default.nix            | 2 +-
 .../microsoft-kiota-serialization-json/default.nix            | 2 +-
 .../microsoft-kiota-serialization-multipart/default.nix       | 2 +-
 .../microsoft-kiota-serialization-text/default.nix            | 2 +-
 pkgs/development/python-modules/pyobjc-core/default.nix       | 2 +-
 .../python-modules/pyobjc-framework-Cocoa/default.nix         | 2 +-
 pkgs/os-specific/linux/ajantv2/default.nix                    | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix
index 9527ed2c651f..a0a3dc97e7cd 100644
--- a/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix
+++ b/pkgs/applications/video/mpv/scripts/mpv-image-viewer.nix
@@ -18,7 +18,7 @@ let
           hash = "sha256-VwIL1529CW9MLK4N9jHHddSSZD5RsJ5bWGWqGJ751C0=";
         };
 
-        sourceRoot = "source/scripts";
+        sourceRoot = "${self.src.name}/scripts";
 
         passthru = {
           updateScript = unstableGitUpdater { };
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 1d7420598522..4832148e226d 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -43,7 +43,7 @@ let
     pname = "authentik-website-deps";
     inherit src version meta;
 
-    sourceRoot = "source/website";
+    sourceRoot = "${src.name}/website";
 
     outputHash = "sha256-AnQpjCoCTzm28Wl/t3YHx0Kl0CuMHL2OgRjRB1Trrsw=";
     outputHashMode = "recursive";
@@ -75,7 +75,7 @@ let
       substituteInPlace package.json --replace-fail 'cross-env ' ""
     '';
 
-    sourceRoot = "source/website";
+    sourceRoot = "${src.name}/website";
 
     buildPhase = ''
       runHook preBuild
diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index 95924f254bbb..963e65c689d3 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     pname = "bitbox-web";
     inherit version;
     inherit src;
-    sourceRoot = "source/frontends/web";
+    sourceRoot = "${src.name}/frontends/web";
     npmDepsHash = "sha256-eazc3OIusY8cbaF8RJOrVcyWPQexcz6lZYLLCpB1mHc=";
     installPhase = "cp -r build $out";
   };
diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
index 654c710d0da8..4d3cc70d938e 100644
--- a/pkgs/by-name/gi/gitaly/git.nix
+++ b/pkgs/by-name/gi/gitaly/git.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     echo -n 'v${version} DEVELOPER=1 DEVOPTS=no-error USE_LIBPCRE=YesPlease NO_PERL=YesPlease NO_EXPAT=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease NO_PYTHON=YesPlease' > source/_build/deps/git-distribution.version
     echo -n 'v${version}' > source/_build/deps/git-distribution/version
   '';
-  sourceRoot = "source";
+  sourceRoot = src.name;
 
   buildFlags = [ "git" ];
 
diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index 4940574315d4..d2751685ca6f 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-bOjIwBPxu/BfRaAcZTXf4xCGvVXnumb2++JZTx7ZG1s=";
 
-  sourceRoot = "source/src";
+  sourceRoot = "${src.name}/src";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix
index 59e8a2576a6e..b51ecd5d7755 100644
--- a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix
+++ b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     rev = "v${version}-electron";
     hash = "sha256-jGDCFdqRfnYwUgVs3KO1pDr52JgkYVRHi2KvABaZFl4=";
   };
-  sourceRoot = "source/openfortivpn-webview-qt";
+  sourceRoot = "${src.name}/openfortivpn-webview-qt";
 
   nativeBuildInputs = [
     qt6Packages.wrapQtAppsHook
diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index f24a2d707a04..3d6988eaffac 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -28,7 +28,7 @@ let
     inherit version;
 
     inherit src;
-    sourceRoot = "source/ms-tools";
+    sourceRoot = "${src.name}/ms-tools";
     vendorHash = null; # dependencies are vendored in the release tarball
 
     buildInputs = [
diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index cf39cf4c7cf0..e6c74f488de1 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    sourceRoot = "source/rustybits";
+    sourceRoot = "${src.name}/rustybits";
     hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ=";
 
     # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged
diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
index 84012235da7f..2abb98854bdf 100644
--- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/abstractions/";
+  sourceRoot = "${src.name}/packages/abstractions/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
index b90aac7a5bde..49a6c420de00 100644
--- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/authentication/azure/";
+  sourceRoot = "${src.name}/packages/authentication/azure/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
index 3134ce73404f..dd0eb55a7dbb 100644
--- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/http/httpx/";
+  sourceRoot = "${src.name}/packages/http/httpx/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
index f0ee6795a957..3436f98d41e6 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/serialization/form/";
+  sourceRoot = "${src.name}/packages/serialization/form/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
index 1aa456403807..d7aef7c3100e 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/serialization/json/";
+  sourceRoot = "${src.name}/packages/serialization/json/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
index 54f9fb76d560..eee939de8263 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/serialization/multipart/";
+  sourceRoot = "${src.name}/packages/serialization/multipart/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
index 25cfd055ac04..4fc7fb84b474 100644
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     hash = "sha256-FUfVkJbpD0X7U7DPzyoh+84Bk7C07iLT9dmbUeliFu8=";
   };
 
-  sourceRoot = "source/packages/serialization/text/";
+  sourceRoot = "${src.name}/packages/serialization/text/";
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix
index 5dd7959940ca..4f5c0f3a1e13 100644
--- a/pkgs/development/python-modules/pyobjc-core/default.nix
+++ b/pkgs/development/python-modules/pyobjc-core/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
   };
 
-  sourceRoot = "source/pyobjc-core";
+  sourceRoot = "${src.name}/pyobjc-core";
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
index 004757337266..e6904460f4d1 100644
--- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
+++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg=";
   };
 
-  sourceRoot = "source/pyobjc-framework-Cocoa";
+  sourceRoot = "${src.name}/pyobjc-framework-Cocoa";
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix
index 47f13f70732f..ba298dc278ee 100644
--- a/pkgs/os-specific/linux/ajantv2/default.nix
+++ b/pkgs/os-specific/linux/ajantv2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name = "ajantv2-module-${libajantv2.version}-${kernel.version}";
 
   inherit (libajantv2) src;
-  sourceRoot = "source/driver/linux";
+  sourceRoot = "${libajantv2.src.name}/driver/linux";
 
   hardeningDisable = [ "pic" ];
 

From 153da4f188004d5a6d94dbc8d76890a618886c2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 18:57:18 +0000
Subject: [PATCH 0891/1497] smug: 0.3.6 -> 0.3.7

---
 pkgs/by-name/sm/smug/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index c7745d1a5cee..61aa2f4a9aa0 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "smug";
-  version = "0.3.6";
+  version = "0.3.7";
 
   subPackages = [ "." ];
 
@@ -15,7 +15,7 @@ buildGoModule rec {
     owner = "ivaaaan";
     repo = "smug";
     rev = "v${version}";
-    sha256 = "sha256-9So81tZwQa3rQYgVO+KjOlTVIzlm/e2K5C/qULZeA7U=";
+    sha256 = "sha256-c4etBWF2NGyHtMLZNISMMjOswCFbbYtpsFuagMW8zeE=";
   };
 
   vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU=";

From 088b1968290a958598381ed32d6545f1e24ccc40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 19:07:46 +0000
Subject: [PATCH 0892/1497] python3Packages.aiocomelit: 0.12.3 -> 1.0.0

---
 pkgs/development/python-modules/aiocomelit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix
index 1ff620b7c7fd..39b1f6deaa42 100644
--- a/pkgs/development/python-modules/aiocomelit/default.nix
+++ b/pkgs/development/python-modules/aiocomelit/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiocomelit";
-  version = "0.12.3";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "chemelli74";
     repo = "aiocomelit";
     tag = "v${version}";
-    hash = "sha256-ZymhYx8uCb7kDcXGz0SQ3rN1ozFYRBtXhS1exMA/8yI=";
+    hash = "sha256-jne+epQQ3fvy1QqAnBcxdihd9/VJkLU5xoiT/WRTMh0=";
   };
 
   build-system = [ poetry-core ];

From 5d56bacb03d1260084bb44257935edef42dc4652 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 3 Jun 2025 21:11:03 +0200
Subject: [PATCH 0893/1497] allegro4: add pkg-config to nativeBuildInputs

pkg-config is used to detect the presence of alsa-lib, without it the
library is not used and thus audio does not work.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/development/libraries/allegro/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index c729bd547ab6..4363edf0a025 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -11,6 +11,7 @@
   libXcursor,
   alsa-lib,
   cmake,
+  pkg-config,
   zlib,
   libpng,
   libvorbis,
@@ -36,7 +37,10 @@ stdenv.mkDerivation rec {
     ./encoding.patch
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = [
     texinfo6_5
     libXext

From e2fcca7ae1483e214051dda096cc46b68532b6b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 19:12:39 +0000
Subject: [PATCH 0894/1497] libretro.dosbox-pure: 0-unstable-2025-05-24 ->
 0-unstable-2025-06-03

---
 pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 33e8066ffb9f..95ddc703f354 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-05-24";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "773f775cb8bd4a79e505413cbe7172ec5de948c1";
-    hash = "sha256-SQjwQhy+/RI0159QMCk04G6AFtBKBushjNWtOXfohps=";
+    rev = "ee1ff009d8edf87c668bc5d1aa6d6f1320b8b654";
+    hash = "sha256-3vIw73T47gTS2A9PBJuZGBNlDiXPNabsj4YopXLMMIY=";
   };
 
   hardeningDisable = [ "format" ];

From f18204075aff28fa8633dee1e46437b3acb9494f Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:16:26 +0200
Subject: [PATCH 0895/1497] =?UTF-8?q?livebook:=200.14.7=20=E2=86=92=200.16?=
 =?UTF-8?q?.1=20https://github.com/livebook-dev/livebook/compare/v0.14.7..?=
 =?UTF-8?q?.v0.16.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/li/livebook/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix      | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index 0a453573929d..9bdef0421da4 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -11,7 +11,7 @@
 }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.14.7";
+  version = "0.16.1";
 
   inherit elixir;
 
@@ -23,13 +23,13 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-8/u/1I3pSfxyF35ZnqClR7FXPL2rhBDdf4w/KUGjVVs=";
+    hash = "sha256-vZFmd9Y5KEnQqzvCmGKGUbY+yR7IEc+0n0sycPDMxa8=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-FrkM82LO7GIFpKQfhlEUrAuKu33BzPBs6OrWW4C6pI0=";
+    hash = "sha256-0gmUCVLrNfcRCPhaXuOfrYW05TDbDN5Zt9IA8OBU8Gc=";
   };
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a77f483bac66..a282e2dad6ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1804,11 +1804,6 @@ with pkgs;
 
   kavita = callPackage ../servers/web-apps/kavita { };
 
-  livebook = callPackage ../by-name/li/livebook/package.nix {
-    elixir = elixir_1_17;
-    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
-  };
-
   pass = callPackage ../tools/security/pass { };
 
   pass-nodmenu = callPackage ../tools/security/pass {

From 8f17b9e5af85759e74f80f59b8e7f91e5a59f928 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 3 Jun 2025 21:22:05 +0200
Subject: [PATCH 0896/1497] pnpm_10: 10.11.0 -> 10.11.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 01950cb9a86e..9634a8d857ef 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -16,8 +16,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.11.0";
-      hash = "sha256-pp6csHfaQZ1H0Y8d1S4gckWynKxuB2rO2+uL47Gme9c=";
+      version = "10.11.1";
+      hash = "sha256-IR6ZkBSElcn8MLflg5b37tqD2SQ+t1QH6k+GUPsWH3w=";
     };
   };
 

From 0b2173118682fda6141d2d39d5e7125c5f369f97 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 3 Jun 2025 21:22:32 +0200
Subject: [PATCH 0897/1497] python313Packages.reflex: 0.7.13 -> 0.7.14

Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.14
---
 pkgs/development/python-modules/reflex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index 9c775e43821d..c6183a2fbe26 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "reflex";
-  version = "0.7.13";
+  version = "0.7.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${version}";
-    hash = "sha256-cspu2bD+ZBr38tRSjpXWYho54Z9NB4sSBAHn/NH11js=";
+    hash = "sha256-yuVBQYP0YlvAIWF/+oSfCLbfj1GLtnYajU3WoolyTjY=";
   };
 
   # 'rich' is also somehow checked when building the wheel,

From 45a971c10b04a3776e1bec5562015121c71a4de9 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:25:19 +0200
Subject: [PATCH 0898/1497] =?UTF-8?q?magnetic-catppuccin-gtk:=200-unstable?=
 =?UTF-8?q?-2024-11-06=20=E2=86=92=200-unstable-2025-04-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
index 7f2dcb4650cc..3e1c98457211 100644
--- a/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
+++ b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
@@ -59,13 +59,13 @@ lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent lib.che
   stdenv.mkDerivation
   {
     pname = "magnetic-${lib.toLower pname}";
-    version = "0-unstable-2024-11-06";
+    version = "0-unstable-2025-04-25";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Catppuccin-GTK-Theme";
-      rev = "be79b8289200aa1a17620f84dde3fe4c3b9c5998";
-      hash = "sha256-QItHmYZpe7BiPC+2CtFwiRXyMTG7+ex0sJTs63xmkAo=";
+      rev = "c961826d027ed93fae12a9a309616e36d140e6b9";
+      hash = "sha256-7F4FrhM+kBFPeLp2mjmYkoDiF9iKDUkC27LUBuFyz7g=";
     };
 
     nativeBuildInputs = [

From 5b77c89ebbabcd381af3b012cee32662c5fee7ee Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:25:44 +0200
Subject: [PATCH 0899/1497] magnetic-catppuccin-gtk: remove usage of with lib;

---
 pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
index 3e1c98457211..b05514106395 100644
--- a/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
+++ b/pkgs/by-name/ma/magnetic-catppuccin-gtk/package.nix
@@ -101,11 +101,11 @@ lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent lib.che
       runHook postInstall
     '';
 
-    meta = with lib; {
+    meta = {
       description = "GTK Theme with Catppuccin colour scheme";
       homepage = "https://github.com/Fausto-Korpsvart/Catppuccin-GTK-Theme";
-      license = licenses.gpl3Only;
-      maintainers = with maintainers; [ icy-thought ];
-      platforms = platforms.all;
+      license = lib.licenses.gpl3Only;
+      maintainers = with lib.maintainers; [ icy-thought ];
+      platforms = lib.platforms.all;
     };
   }

From 08d3f6944a3ce7b8a9b53e43d21a28bd28924a92 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Sat, 28 Dec 2024 13:39:18 -0800
Subject: [PATCH 0900/1497] albyhub: init at 1.17.1

---
 .../al/albyhub/ldk-node-go/default.nix        | 39 ++++++++
 pkgs/by-name/al/albyhub/ldk-node/default.nix  | 48 +++++++++
 pkgs/by-name/al/albyhub/package.nix           | 98 +++++++++++++++++++
 3 files changed, 185 insertions(+)
 create mode 100644 pkgs/by-name/al/albyhub/ldk-node-go/default.nix
 create mode 100644 pkgs/by-name/al/albyhub/ldk-node/default.nix
 create mode 100644 pkgs/by-name/al/albyhub/package.nix

diff --git a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix
new file mode 100644
index 000000000000..e911017b7e5a
--- /dev/null
+++ b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  ldkNode,
+}:
+
+buildGoModule rec {
+  pname = "ldk-node-go";
+  version = "0-unstable-2025-05-21";
+
+  src = fetchFromGitHub {
+    owner = "getAlby";
+    repo = "ldk-node-go";
+    rev = "ca26307fa2d8ee4d30da9affd0b202897f9919f6";
+    hash = "sha256-UdsfN6UL9lKPQSCfF8oA89U0M3pqj/TcFcs01E7WoXs=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  buildInputs = [
+    ldkNode
+  ];
+
+  propagatedBuildInputs = [ ldkNode ];
+
+  meta = {
+    description = "Experimental Go bindings for LDK-node";
+    homepage = "https://github.com/getAlby/ldk-node-go";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bleetube ];
+  };
+}
diff --git a/pkgs/by-name/al/albyhub/ldk-node/default.nix b/pkgs/by-name/al/albyhub/ldk-node/default.nix
new file mode 100644
index 000000000000..99ea24923470
--- /dev/null
+++ b/pkgs/by-name/al/albyhub/ldk-node/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  llvmPackages,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ldk-node";
+  version = "0-unstable-2025-05-21";
+
+  src = fetchFromGitHub {
+    owner = "getAlby";
+    repo = "ldk-node";
+    rev = "9bb381ad38dbaa71e17816738789d993158fc1a2";
+    hash = "sha256-Ie7FOSOd12mwmkEjD4r0p1ZmeYkXm5eN1LlQhWl0VG4=";
+  };
+
+  buildFeatures = [ "uniffi" ];
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-hM6VCU0kIg5ZmJM8C4HoybSc/VXNj6GTE/oFLfqGMcY=";
+
+  # Skip tests because they download bitcoin-core and electrs zip files, and then fail
+  doCheck = false;
+
+  nativeBuildInputs = [
+    cmake
+    llvmPackages.clang
+    rustPlatform.bindgenHook
+  ];
+
+  # Add CFLAGS to suppress the stringop-overflow error during aws-lc-sys compilation.
+  NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow";
+
+  meta = {
+    description = "Embeds the LDK node implementation compiled as shared library objects";
+    homepage = "https://github.com/getAlby/ldk-node";
+    changelog = "https://github.com/getAlby/ldk-node/blob/${src.rev}/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bleetube ];
+  };
+}
diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix
new file mode 100644
index 000000000000..9a6af0077532
--- /dev/null
+++ b/pkgs/by-name/al/albyhub/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  fixup-yarn-lock,
+  nodejs,
+  pkgs,
+  yarn,
+  stdenv,
+  makeWrapper,
+  callPackage,
+  go,
+}:
+
+let
+  ldkNode = callPackage ./ldk-node { };
+  ldkNodeGo = callPackage ./ldk-node-go {
+    inherit ldkNode;
+  };
+
+in
+
+buildGoModule rec {
+  pname = "albyhub";
+  version = "1.17.1";
+
+  src = fetchFromGitHub {
+    owner = "getAlby";
+    repo = "hub";
+    tag = "v${version}";
+    hash = "sha256-ZDTCA3nMJEA8I7PeSgwQAe+wU8Wk0GaH3ItQLzPhOBQ=";
+  };
+
+  vendorHash = "sha256-4e75SqQiRUEEjtDZKDZsGSRavZFh5ulJdMz0Ne7gME0=";
+  proxyVendor = true; # needed for secp256k1-zkp CGO bindings
+
+  nativeBuildInputs = [
+    fixup-yarn-lock
+    nodejs
+    yarn
+    makeWrapper
+  ];
+
+  buildInputs = [
+    ldkNodeGo
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  frontendYarnOfflineCache = fetchYarnDeps {
+    yarnLock = src + "/frontend/yarn.lock";
+    hash = "sha256-SStTJGqeqPvXBKjFMPjKEts+jg6A9Vaqi+rZkr/ytdc=";
+  };
+
+  preBuild = ''
+    export HOME=$TMPDIR
+    pushd frontend
+      fixup-yarn-lock yarn.lock
+      yarn config set yarn-offline-mirror "${frontendYarnOfflineCache}"
+      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
+      patchShebangs node_modules
+      yarn --offline build:http
+    popd
+  '';
+
+  subPackages = [
+    "cmd/http"
+  ];
+
+  ldflags = [
+    "-X github.com/getAlby/hub/version.Tag=v${version}"
+    "-s"
+    "-w"
+  ];
+
+  postInstall = ''
+    mv $out/bin/http $out/bin/albyhub
+  '';
+
+  preFixup = ''
+    patchelf --set-rpath ${
+      lib.makeLibraryPath [
+        ldkNode
+        ldkNodeGo
+        (lib.getLib stdenv.cc.cc)
+      ]
+    } $out/bin/albyhub
+  '';
+
+  meta = {
+    description = "Control lightning wallets over nostr";
+    homepage = "https://github.com/getAlby/hub";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bleetube ];
+    mainProgram = "albyhub";
+  };
+}

From f416162e751013813ad0cf4f3418759a6122f00a Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 4 Jun 2025 01:23:27 +0530
Subject: [PATCH 0901/1497] Revert "nixos/graphical-desktop: add sessions to
 pathsToLink" (#413675)

This reverts commit fbb577d3c5efd3e49bb85b6aa5e70c724a4f873e.

This is already controlled by `services.displayManager.sessionPackages`, as explained in https://github.com/NixOS/nixpkgs/pull/411518#issuecomment-2936523214.

Because of that PR, now xsessions and wayland session desktop files of every packages in `environment.systemPackages` are now being linked to `/run/current-system/sw/share`. This is highly unwanted behaviour.
---
 nixos/modules/services/misc/graphical-desktop.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix
index 42aa44dde0da..7f1e9b39210c 100644
--- a/nixos/modules/services/misc/graphical-desktop.nix
+++ b/nixos/modules/services/misc/graphical-desktop.nix
@@ -45,11 +45,6 @@ in
         nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
         xdg-utils
       ];
-      # needed for some display managers to locate desktop manager sessions
-      pathsToLink = [
-        "/share/xsessions"
-        "/share/wayland-sessions"
-      ];
     };
 
     fonts.enableDefaultPackages = lib.mkDefault true;

From 0c330af623d043ad30eb732b2440111f774e9d86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 19:54:05 +0000
Subject: [PATCH 0902/1497] vault-tasks: 0.11.1 -> 0.11.2

---
 pkgs/by-name/va/vault-tasks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index 711c88a01459..dc817ada9256 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -5,7 +5,7 @@
   nix-update-script,
 }:
 let
-  version = "0.11.1";
+  version = "0.11.2";
 in
 rustPlatform.buildRustPackage {
   pname = "vault-tasks";
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "louis-thevenet";
     repo = "vault-tasks";
     rev = "v${version}";
-    hash = "sha256-7stFa2fLczGyoM/O2S/uKCfjSDyABUw/b3tXp7Olqq8=";
+    hash = "sha256-DcnOuQ37fzLVJOteP7ZiA9IxNAd6lH6zelaO5GCvakk=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-RSW0N0icKAZbh8KQNkI9TgcKwa6hTKjhaJWCGADtfq8=";
+  cargoHash = "sha256-/5CpIPdqIvxwiplMqXZ1J04oQoK9rnzDP1N7ffrbJDk=";
 
   postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
 

From 8b1388d74fa5feb210dbf4999930c2388f4dbc1e Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 1 Jun 2025 21:40:40 +0200
Subject: [PATCH 0903/1497] sauerbraten: fix build

---
 pkgs/by-name/sa/sauerbraten/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix
index 49925da52112..93e8af7faf7a 100644
--- a/pkgs/by-name/sa/sauerbraten/package.nix
+++ b/pkgs/by-name/sa/sauerbraten/package.nix
@@ -8,9 +8,11 @@
   copyDesktopItems,
 
   # buildInputs
+  libGL,
   SDL2,
   SDL2_image,
   SDL2_mixer,
+  xorg,
   zlib,
 
   makeDesktopItem,
@@ -33,9 +35,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    libGL
     SDL2
     SDL2_image
     SDL2_mixer
+    xorg.libX11
     zlib
   ];
 

From e32cdad1e8153475ce0157031dc32e32a2cd23e5 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 3 Jun 2025 13:05:50 -0700
Subject: [PATCH 0904/1497] tscli: init at 0.0.7

---
 pkgs/by-name/ts/tscli/package.nix | 43 +++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/ts/tscli/package.nix

diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix
new file mode 100644
index 000000000000..7573a782e6c1
--- /dev/null
+++ b/pkgs/by-name/ts/tscli/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+buildGoModule rec {
+  pname = "tscli";
+  version = "0.0.7";
+
+  src = fetchFromGitHub {
+    owner = "jaxxstorm";
+    repo = "tscli";
+    tag = "v${version}";
+    hash = "sha256-o08ynbx+Pclme+xS00jx7096D2jHnvJg28UISZayxKY=";
+  };
+
+  vendorHash = "sha256-+4PFwEib/8o+1mk5SOkIZkK7W1elIFToU1DI9P8s1Y8=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-X=github.com/jaxxstorm/tscli/pkg/version.Version=${version}"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tscli \
+      --bash <($out/bin/tscli -k XXX completion bash) \
+      --fish <($out/bin/tscli -k XXX completion fish) \
+      --zsh <($out/bin/tscli -k XXX completion zsh)
+  '';
+
+  meta = {
+    description = "A CLI tool to interact with the Tailscale API";
+    homepage = "https://github.com/jaxxstorm/tscli";
+    changelog = "https://github.com/jaxxstorm/tscli/releases/tag/${src.tag}/CHANGELOG.md";
+    mainProgram = "tscli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ philiptaron ];
+  };
+}

From 7a88ea6f89f43dd13d7c5deccaac638546832570 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 20:20:40 +0000
Subject: [PATCH 0905/1497] vscode-extensions.ms-dotnettools.csdevkit: 1.19.63
 -> 1.20.35

---
 .../extensions/ms-dotnettools.csdevkit/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index c63008ac40e1..b92fd0df4aae 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -16,19 +16,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-XHx64V8JJl+/kb+kkTowu7mE7ysBRhUQJqicxjbHM3k=";
+        hash = "sha256-bpvaGnl6LQaZazuk/xGHxbNUsEMph0tDAaAOBIuikVQ=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-Pm3jUARrH8bksiCpYtUvo0UB3Oq67EjJGYLGLV54rl4=";
+        hash = "sha256-yBT5sAZHXX66vuTDo+opPLBnCX09tBQYscW5LaiS3nU=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-hgd7tpRn2WP0PL4IOpZLL6Uzw1V9rSqlOTDfgFxwWGk=";
+        hash = "sha256-W7qGN3VbS1BJT+887mSqegKheLimYR59gNj7QOZBvyg=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-PQPxwwHbLXa5+p/SfH4IFu/OBEa/1CKdfaM+HAegiDA=";
+        hash = "sha256-OlsoQsA6qHoIwRRVvMpjyO9BOdR63mRcSFkM9i0nFH0=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.19.63";
+    version = "1.20.35";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.

From dd3b6cc7da82a6570f5952b0177c6d1069882387 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 3 Jun 2025 22:27:59 +0200
Subject: [PATCH 0906/1497] python313Packages.mkdocs-rss-plugin: add missing
 dependencies

---
 pkgs/development/python-modules/mkdocs-rss-plugin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
index d21f09234b2e..a49427e0b1a3 100644
--- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     cachecontrol
     gitpython
     mkdocs
-  ];
+  ] ++ cachecontrol.optional-dependencies.filecache;
 
   nativeCheckInputs = [
     feedparser

From 669ac214ede3e82af0722139f36cc858a48c872e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 20:29:08 +0000
Subject: [PATCH 0907/1497] conceal: 0.6.1 -> 0.6.2

---
 pkgs/by-name/co/conceal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix
index 866eb72c001c..8fa83ab69759 100644
--- a/pkgs/by-name/co/conceal/package.nix
+++ b/pkgs/by-name/co/conceal/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "conceal";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "TD-Sky";
     repo = "conceal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kgJcxckXfwnKZ3MyJ+GE1LiQmu9YdfqFrtL9gBJ330E=";
+    hash = "sha256-B6vZ4Xl7H6KOlscys+FT8fMXb0Xrvosr2DXHzvRjLis=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ym/HnUOLIKfCFWgusx92QeQYaNp9tfrhg5V1h02q3e0=";
+  cargoHash = "sha256-aBc9ijRObFi9AyQxSoQZs/3exAzOlYq5uNqFfvjNhvw=";
 
   env.CONCEAL_GEN_COMPLETIONS = "true";
 

From 5e00fc78684c23c5f4a53e376c52f1e069bee7e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 20:29:36 +0000
Subject: [PATCH 0908/1497] cargo-mobile2: 0.20.0 -> 0.20.1

---
 pkgs/by-name/ca/cargo-mobile2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index 7003e539fe32..5ec4c9e830ea 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "cargo-mobile2";
-  version = "0.20.0";
+  version = "0.20.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     owner = "tauri-apps";
     repo = "cargo-mobile2";
     rev = "cargo-mobile2-v${version}";
-    hash = "sha256-7/ol4Jb/2s007LeSMo6YYDT5vipsZZF6O4hfJ7ylHGg=";
+    hash = "sha256-gKqGmd34nNKMc3fl5lMH09oOGnmRaMDBwsbHhAeUMBc=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   # sourceRoot = "${src.name}/tooling/cli";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zSUT2zClpSlBDu6vgMv4TZn9Jp0Ych6EQKo1AwkSMXU=";
+  cargoHash = "sha256-QEZe+7/i0XygXxs7pwdS9WtYbE2pfrUuRQC0dm+WqTo=";
 
   preBuild = ''
     mkdir -p $out/share/

From c35fdf4e31e8237f2136a3de0536f1fe66fb47cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 20:45:30 +0000
Subject: [PATCH 0909/1497] discordo: 0-unstable-2025-05-23 ->
 0-unstable-2025-06-03

---
 pkgs/applications/networking/discordo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix
index 9da33a368231..fe86c17638ca 100644
--- a/pkgs/applications/networking/discordo/default.nix
+++ b/pkgs/applications/networking/discordo/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "discordo";
-  version = "0-unstable-2025-05-23";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = pname;
-    rev = "af2b0995ba6f6f2df8937cf6a6d5bee3adbc0d0c";
-    hash = "sha256-eBdPnpO9fZP7uq2/wVmeMu8Bf9UympsjUHTQlX2XKYw=";
+    rev = "23be8cd23591d3076712dd6c7c0b9e20571e1545";
+    hash = "sha256-hbgCxu48c+glnLN8jEAzFrOwxYxAdap3TaqKKtYtzqE=";
   };
 
-  vendorHash = "sha256-gEwTpt/NPN1+YpTBmW8F34UotowrOcA0mfFgBdVFiTA=";
+  vendorHash = "sha256-Kx0dI53ordvsSY0GCp6H+1XiSBAHXLbcg0tQJVa86uw=";
 
   env.CGO_ENABLED = 0;
 

From dadbfdb3434d86cc5af6ff6d7466f9c6437e6f11 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:01:09 -0400
Subject: [PATCH 0910/1497] python3Packages.staticmap3: init at 0.1.0

new dependency for fittrackee
---
 .../python-modules/staticmap3/default.nix     | 60 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/staticmap3/default.nix

diff --git a/pkgs/development/python-modules/staticmap3/default.nix b/pkgs/development/python-modules/staticmap3/default.nix
new file mode 100644
index 000000000000..765b2ddc2d87
--- /dev/null
+++ b/pkgs/development/python-modules/staticmap3/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cachecontrol,
+  filelock,
+  mypy,
+  pillow,
+  poetry-core,
+  requests,
+  ruff,
+  types-requests,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "staticmap3";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SamR1";
+    repo = "staticmap";
+    tag = "v${version}";
+    hash = "sha256-SMy4yxHA9Z3BFW6kX8vC7WfsmuZMNqocJ9+dJB6zwSs=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    cachecontrol
+    requests
+    pillow
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  optional-dependencies = {
+    filecache = [ filelock ];
+    dev = [
+      mypy
+      ruff
+      types-requests
+    ];
+  };
+
+  pythonImportsCheck = [ "staticmap3" ];
+
+  meta = {
+    description = "Small, python-based library for creating map images with lines and markers";
+    homepage = "https://github.com/SamR1/staticmap";
+    changelog = "https://github.com/SamR1/staticmap/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42bc5b547ae8..c5e1e963ae0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16783,6 +16783,8 @@ self: super: with self; {
 
   staticmap = callPackage ../development/python-modules/staticmap { };
 
+  staticmap3 = callPackage ../development/python-modules/staticmap3 { };
+
   staticvectors = callPackage ../development/python-modules/staticvectors { };
 
   statistics = callPackage ../development/python-modules/statistics { };

From 269aef81ec218058b2d9e73be21ba726452cc7b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 20:52:35 +0000
Subject: [PATCH 0911/1497] terraform-providers.spotinst: 1.220.0 -> 1.220.2

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ae415610983a..78f6edd0cc0c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1246,13 +1246,13 @@
     "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
   },
   "spotinst": {
-    "hash": "sha256-ip+HG6nPd4sYyKDzggR5cfwaQQZI/C9GzT+PvGDO3Dk=",
+    "hash": "sha256-opJqvsqGqsFz2G+5T2JK1tpDxnFmMCxRVrUNYYnuN7s=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.220.0",
+    "rev": "v1.220.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-w3Bg1FpMki8EhkVe1R8QWD91n8tooT+xIvlM50gbcSA="
+    "vendorHash": "sha256-/UoLwkMCY4PsfNITOQBKWT9bKaReaIISqWyYiTS4/64="
   },
   "ssh": {
     "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=",

From 22134f24846848178c9c680a0013992867e4bea0 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 22:19:14 -0400
Subject: [PATCH 0912/1497] python3packages.fitdecode: init at 0.10.0

Adding as requirement for fittrackee
---
 .../python-modules/fitdecode/default.nix      | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/fitdecode/default.nix

diff --git a/pkgs/development/python-modules/fitdecode/default.nix b/pkgs/development/python-modules/fitdecode/default.nix
new file mode 100644
index 000000000000..26897582c6fa
--- /dev/null
+++ b/pkgs/development/python-modules/fitdecode/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "fitdecode";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "polyvertex";
+    repo = "fitdecode";
+    tag = "v${version}";
+    hash = "sha256-pW1PgJGqFL2reOYYfpGnQ4WoYFKGMNY8iQJzyHYOly8=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "fitdecode" ];
+
+  meta = {
+    changelog = "https://github.com/polyvertex/fitdecode/blob/${src.tag}/HISTORY.rst";
+    description = "FIT file parsing and decoding library written in Python3";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/polyvertex/fitdecode";
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5e1e963ae0c..b80cb5bae4d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5021,6 +5021,8 @@ self: super: with self; {
 
   fitbit = callPackage ../development/python-modules/fitbit { };
 
+  fitdecode = callPackage ../development/python-modules/fitdecode { };
+
   fitfile = callPackage ../development/python-modules/fitfile { };
 
   fivem-api = callPackage ../development/python-modules/fivem-api { };

From 88360220fbf88ee292c0e320f61a2d559baddfb7 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:01:56 -0400
Subject: [PATCH 0913/1497] python3Packages.dramatiq-abort: init at 1.2.1

new dependency for pkgs.fittrackee
---
 .../python-modules/dramatiq-abort/default.nix | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/dramatiq-abort/default.nix

diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix
new file mode 100644
index 000000000000..165a209f21ee
--- /dev/null
+++ b/pkgs/development/python-modules/dramatiq-abort/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  gevent,
+  pytestCheckHook,
+  pytest-cov,
+  dramatiq,
+  redis,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "dramatiq-abort";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Flared";
+    repo = "dramatiq-abort";
+    tag = "v${version}";
+    hash = "sha256-i5vL9yjQQambG8m6RDByr7/j8+PhDdLsai3pDrH1A4Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dramatiq
+  ];
+
+  optional-dependencies = {
+    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    gevent = [ gevent ];
+    redis = [ redis ];
+  };
+
+  nativeCheckInputs = [
+    redis
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "dramatiq_abort" ];
+
+  meta = {
+    changelog = "https://github.com/Flared/dramatiq-abort/releases/tag/v${version}";
+    description = "Dramatiq extension to abort message";
+    homepage = "https://github.com/Flared/dramatiq-abort";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ tebriel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b80cb5bae4d7..b661ad82228f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4205,6 +4205,8 @@ self: super: with self; {
 
   dramatiq = callPackage ../development/python-modules/dramatiq { };
 
+  dramatiq-abort = callPackage ../development/python-modules/dramatiq-abort { };
+
   drawille = callPackage ../development/python-modules/drawille { };
 
   drawilleplot = callPackage ../development/python-modules/drawilleplot { };

From a52feb8cf0c53fc77a03aa03e694347c65ace8a6 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:04:08 -0400
Subject: [PATCH 0914/1497] fittrackee: 0.9.10 -> 0.10.2

https://github.com/SamR1/FitTrackee/releases/tag/v0.9.11

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.0

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.1

https://github.com/SamR1/FitTrackee/releases/tag/v0.10.2
---
 pkgs/by-name/fi/fittrackee/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index 08426ae4bccb..a3c857646e63 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -8,14 +8,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "fittrackee";
-  version = "0.9.10";
+  version = "0.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SamR1";
     repo = "FitTrackee";
     tag = "v${version}";
-    hash = "sha256-004M7Uhsl0K8BX19eVU4NrvBeAyUJx/mBlC/R27y9jg=";
+    hash = "sha256-ZCQ4Ft2TSjS62DmGDpQ7gG5Spnf82v82i5nnZtg1UmA=";
   };
 
   build-system = [
@@ -24,9 +24,11 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "authlib"
+    "flask"
     "flask-limiter"
     "flask-migrate"
     "nh3"
+    "lxml"
     "pyopenssl"
     "pytz"
     "sqlalchemy"
@@ -39,6 +41,8 @@ python3Packages.buildPythonApplication rec {
       babel
       click
       dramatiq
+      dramatiq-abort
+      fitdecode
       flask
       flask-bcrypt
       flask-dramatiq
@@ -56,8 +60,9 @@ python3Packages.buildPythonApplication rec {
       pytz
       shortuuid
       sqlalchemy
-      staticmap
+      staticmap3
       ua-parser
+      xmltodict
     ]
     ++ dramatiq.optional-dependencies.redis
     ++ flask-limiter.optional-dependencies.redis;

From a6b441a257eb0aa043c902a4f56832935b7712e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 21:02:20 +0000
Subject: [PATCH 0915/1497] terraform-providers.equinix: 3.8.0 -> 3.9.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ae415610983a..a661177d2a2e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -426,11 +426,11 @@
     "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
   },
   "equinix": {
-    "hash": "sha256-erQUWFpGqnxtU88AaD4Lq0OQyhOg0gXoFBMf6wQC1Fs=",
+    "hash": "sha256-1/cKun6sywQeNE7utWoXt84B3kAk5YOmFTjCatwHrqE=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v3.8.0",
+    "rev": "v3.9.0",
     "spdx": "MIT",
     "vendorHash": "sha256-sjEgBLwk/dYUmq+kL0PtamEukXgC9rzeyTT87HK0Y8E="
   },

From f4249b03a9e53a392b0106a3fce1e1f1346c899d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 3 Jun 2025 21:13:29 +0000
Subject: [PATCH 0916/1497] pocket-id: 1.1.0 -> 1.2.0

---
 pkgs/by-name/po/pocket-id/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index abd96cd6c227..50728a63c42c 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -9,18 +9,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocket-id";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J/s8wpKAU7w8Djtd7rtamCzg/7176W0ybSoAB/vHOjs=";
+    hash = "sha256-LydP89zyqMGpWbC7nEAyPMx0ARDrYh4qL9sH1i8a88M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-jLwuBYiFZhUDIvG5uk78vXmo+wuqkFmyC5lAUZ3vUxU=";
+  vendorHash = "sha256-U7FKU5WkU1EoXav+Q1i04uRSxBux/o4/9UzajT/hV/g=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -42,7 +42,7 @@ buildGoModule (finalAttrs: {
 
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
-    npmDepsHash = "sha256-ykoyJtnqFK1fK60SbzrL7nhRcKYa3qYdHf9kFOC3EwE=";
+    npmDepsHash = "sha256-+KmNWKe5k/WuQL9B6XYZWDCLICyGWIg/vHLZr9T7SOc=";
     npmFlags = [ "--legacy-peer-deps" ];
 
     env.BUILD_OUTPUT_PATH = "dist";

From 2c6220190840eaa8d8088d3b1dd433b241273fa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 21:15:44 +0000
Subject: [PATCH 0917/1497] automatic-timezoned: 2.0.76 -> 2.0.79

---
 pkgs/by-name/au/automatic-timezoned/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 2e34bf2c7144..9229f6a43161 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.76";
+  version = "2.0.79";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${version}";
-    sha256 = "sha256-fObJL4AOVGW/b050kh0/zpAg/BLzLpgop70SgvGqW6E=";
+    sha256 = "sha256-FPSwTtLLf1T4lx4ZmPPa6dnhcI9pBCFjhsABeIccRKk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-msoYCTrBgq4xdQiKRvyyQ5seWceyRBM7StFvJ/8MDJ4=";
+  cargoHash = "sha256-H4bFSqt8hOH6tF2WO1mQqqmbK9U2qlFC+7swz/xj1I8=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

From 259a75fb1fffd1ce6213ae32c2cfdf586ca405eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Mon, 2 Jun 2025 01:20:23 +0200
Subject: [PATCH 0918/1497] nixos/pocket-id: harden after backend-frontend
 merge

---
 nixos/modules/services/security/pocket-id.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix
index 62259a7959a4..c3a93869dd1e 100644
--- a/nixos/modules/services/security/pocket-id.nix
+++ b/nixos/modules/services/security/pocket-id.nix
@@ -174,12 +174,12 @@ in
           CapabilityBoundingSet = "";
           DeviceAllow = "";
           DevicePolicy = "closed";
-          #IPAddressDeny = "any"; # communicates with the frontend
+          #IPAddressDeny = "any"; # provides the service through network
           LockPersonality = true;
           MemoryDenyWriteExecute = true;
           NoNewPrivileges = true;
           PrivateDevices = true;
-          PrivateNetwork = false; # communicates with the frontend
+          PrivateNetwork = false; # provides the service through network
           PrivateTmp = true;
           PrivateUsers = true;
           ProcSubset = "pid";
@@ -191,7 +191,8 @@ in
           ProtectKernelModules = true;
           ProtectKernelTunables = true;
           ProtectProc = "invisible";
-          ProtectSystem = "full"; # needs to write in cfg.dataDir
+          ProtectSystem = "strict";
+          ReadWritePaths = [ cfg.dataDir ];
           RemoveIPC = true;
           RestrictAddressFamilies = [
             "AF_INET"
@@ -212,7 +213,7 @@ in
             "@privileged"
             "@raw-io"
             "@reboot"
-            #"@resources" # vm test segfaults
+            "@resources"
             "@swap"
           ];
           UMask = "0077";

From ac1d175cbcb50dd881f3f5e2b36c13cf89a8bcbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 21:47:56 +0000
Subject: [PATCH 0919/1497] tpnote: 1.25.10 -> 1.25.11

---
 pkgs/by-name/tp/tpnote/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 42f1ef23c9a9..b731a3bab140 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tpnote";
-  version = "1.25.10";
+  version = "1.25.11";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${version}";
-    hash = "sha256-bQGgpO820eCp3J1cwOXfTA61PTekjdRc891L3UyokTk=";
+    hash = "sha256-5YqOOHz4L+kho+08mYQSjcm1SFDeAas+xNaMhuY7H4s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LTNYnETMO/jeByWWsEazfP8nsHaJ6aVeqCVCwtxiQfQ=";
+  cargoHash = "sha256-qYQ6MJQfffiqXyvjZAl1qjbMZYeEw3Dt4uKlaKoh+vQ=";
 
   nativeBuildInputs = [
     cmake

From 106b68293bea3d0e11c799ba97e18bf4e62f0e04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 21:59:01 +0000
Subject: [PATCH 0920/1497] fiddler-everywhere: 6.5.0 -> 6.6.0

---
 pkgs/by-name/fi/fiddler-everywhere/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix
index b3546a6e6c37..d3eaca63a316 100644
--- a/pkgs/by-name/fi/fiddler-everywhere/package.nix
+++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "fiddler-everywhere";
-  version = "6.5.0";
+  version = "6.6.0";
 
   src = fetchurl {
     url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-XEmQeEXqQpVASJ5NJEhZZOkIPbSbj/DOUbfbdAJXSRk=";
+    hash = "sha256-qSQx9uz8P6k/wdPpe7XwhQ6qCZp6IUoLOZnkDWMFS3E=";
   };
 
   appimageContents = appimageTools.extract {

From 0fa2fe7bd743db01fa396ac156a0435b603d3db8 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 3 Jun 2025 16:17:09 -0400
Subject: [PATCH 0921/1497] fittrackee: add tebriel as maintainer

---
 pkgs/by-name/fi/fittrackee/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index a3c857646e63..e2500448837a 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -97,6 +97,9 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/SamR1/FitTrackee";
     changelog = "https://github.com/SamR1/FitTrackee/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ traxys ];
+    maintainers = with lib.maintainers; [
+      tebriel
+      traxys
+    ];
   };
 }

From 37d2287524386df79065285434beb28ae7fd2d84 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Tue, 4 Apr 2023 22:00:15 +0100
Subject: [PATCH 0922/1497] pihole-ftl: init at 6.1

Replace a hardcoded execv with a dynamic execvp to allow the executed program to
live in the Nix store.

Co-Authored-By: JamieMagee <jamie.magee@gmail.com>
Co-Authored-By: nuxeh <1516017+nuxeh@users.noreply.github.com>
---
 pkgs/by-name/pi/pihole-ftl/package.nix |   85 ++
 pkgs/by-name/pi/pihole-ftl/pihole.toml | 1194 ++++++++++++++++++++++++
 sync.sh                                |   10 +
 3 files changed, 1289 insertions(+)
 create mode 100644 pkgs/by-name/pi/pihole-ftl/package.nix
 create mode 100644 pkgs/by-name/pi/pihole-ftl/pihole.toml
 create mode 100755 sync.sh

diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix
new file mode 100644
index 000000000000..2d3add1f70bc
--- /dev/null
+++ b/pkgs/by-name/pi/pihole-ftl/package.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gmp,
+  libidn2,
+  libunistring,
+  mbedtls,
+  ncurses,
+  nettle,
+  readline,
+  xxd,
+  iproute2,
+  ...
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pihole-ftl";
+  version = "6.1";
+
+  src = fetchFromGitHub {
+    owner = "pi-hole";
+    repo = "FTL";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b3/kyDQa6qDK2avvDObWLvwUpAn6TFr1ZBdQC9AZWa4=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    xxd
+  ];
+
+  buildInputs = [
+    gmp
+    libidn2
+    libunistring
+    mbedtls
+    ncurses
+    nettle
+    readline
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "STATIC" stdenv.hostPlatform.isStatic)
+  ];
+
+  postPatch = ''
+    substituteInPlace src/version.c.in \
+      --replace-quiet "@GIT_VERSION@" "v${finalAttrs.version}" \
+      --replace-quiet "@GIT_DATE@" "1970-01-01" \
+      --replace-quiet "@GIT_BRANCH@" "master" \
+      --replace-quiet "@GIT_TAG@" "v${finalAttrs.version}" \
+      --replace-quiet "@GIT_HASH@" "builtfromreleasetarball"
+
+    # Remove hard-coded absolute path to the pihole script, rely on it being provided by $PATH
+    # Use execvp instead of execv so PATH is followed
+    substituteInPlace src/api/action.c \
+      --replace-fail "/usr/local/bin/pihole" "pihole" \
+      --replace-fail "execv" "execvp"
+
+    substituteInPlace src/database/network-table.c \
+      --replace-fail "ip neigh show" "${iproute2}/bin/ip neigh show" \
+      --replace-fail "ip address show" "${iproute2}/bin/ip address show"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm 555 -t $out/bin pihole-FTL
+
+    runHook postInstall
+  '';
+
+  passthru.settingsTemplate = ./pihole.toml;
+
+  meta = {
+    description = "Pi-hole FTL engine";
+    homepage = "https://github.com/pi-hole/FTL";
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [ williamvds ];
+    platforms = lib.platforms.linux;
+    mainProgram = "pihole-FTL";
+  };
+})
diff --git a/pkgs/by-name/pi/pihole-ftl/pihole.toml b/pkgs/by-name/pi/pihole-ftl/pihole.toml
new file mode 100644
index 000000000000..bd00a525758f
--- /dev/null
+++ b/pkgs/by-name/pi/pihole-ftl/pihole.toml
@@ -0,0 +1,1194 @@
+[dns]
+  # Array of upstream DNS servers used by Pi-hole
+  # Example: [ "8.8.8.8", "127.0.0.1#5335", "docker-resolver" ]
+  #
+  # Possible values are:
+  #     array of IP addresses and/or hostnames, optionally with a port (#...)
+  upstreams = []
+
+  # Use this option to control deep CNAME inspection. Disabling it might be beneficial
+  # for very low-end devices
+  CNAMEdeepInspect = true
+
+  # Should _esni. subdomains be blocked by default? Encrypted Server Name Indication
+  # (ESNI) is certainly a good step into the right direction to enhance privacy on the
+  # web. It prevents on-path observers, including ISPs, coffee shop owners and
+  # firewalls, from intercepting the TLS Server Name Indication (SNI) extension by
+  # encrypting it. This prevents the SNI from being used to determine which websites
+  # users are visiting.
+  # ESNI will obviously cause issues for pixelserv-tls which will be unable to generate
+  # matching certificates on-the-fly when it cannot read the SNI. Cloudflare and Firefox
+  # are already enabling ESNI. According to the IEFT draft (link above), we can easily
+  # restore piselserv-tls's operation by replying NXDOMAIN to _esni. subdomains of
+  # blocked domains as this mimics a "not configured for this domain" behavior.
+  blockESNI = true
+
+  # Should we overwrite the query source when client information is provided through
+  # EDNS0 client subnet (ECS) information? This allows Pi-hole to obtain client IPs even
+  # if they are hidden behind the NAT of a router. This feature has been requested and
+  # discussed on Discourse where further information how to use it can be found:
+  # https://discourse.pi-hole.net/t/support-for-add-subnet-option-from-dnsmasq-ecs-edns0-client-subnet/35940
+  EDNS0ECS = true
+
+  # Should FTL hide queries made by localhost?
+  ignoreLocalhost = false
+
+  # Should FTL analyze and show internally generated DNSSEC queries?
+  showDNSSEC = true
+
+  # Should FTL analyze *only* A and AAAA queries?
+  analyzeOnlyAandAAAA = false
+
+  # Controls whether and how FTL will reply with for address for which a local interface
+  # exists. Changing this setting causes FTL to restart.
+  #
+  # Possible values are:
+  #   - "NONE"
+  #       Pi-hole will not respond automatically on PTR requests to local interface
+  #       addresses. Ensure pi.hole and/or hostname records exist elsewhere.
+  #   - "HOSTNAME"
+  #       Serve the machine's hostname. The hostname is queried from the kernel through
+  #       uname(2)->nodename. If the machine has multiple network interfaces, it can
+  #       also have multiple nodenames. In this case, it is unspecified and up to the
+  #       kernel which one will be returned. On Linux, the returned string is what has
+  #       been set using sethostname(2) which is typically what has been set in
+  #       /etc/hostname.
+  #   - "HOSTNAMEFQDN"
+  #       Serve the machine's hostname (see limitations above) as fully qualified domain
+  #       by adding the local domain. If no local domain has been defined (config option
+  #       dns.domain), FTL tries to query the domain name from the kernel using
+  #       getdomainname(2). If this fails, FTL appends ".no_fqdn_available" to the
+  #       hostname.
+  #   - "PI.HOLE"
+  #       Respond with "pi.hole".
+  piholePTR = "PI.HOLE"
+
+  # How should FTL handle queries when the gravity database is not available?
+  #
+  # Possible values are:
+  #   - "BLOCK"
+  #       Block all queries when the database is busy.
+  #   - "ALLOW"
+  #       Allow all queries when the database is busy.
+  #   - "REFUSE"
+  #       Refuse all queries which arrive while the database is busy.
+  #   - "DROP"
+  #       Just drop the queries, i.e., never reply to them at all. Despite "REFUSE"
+  #       sounding similar to "DROP", it turned out that many clients will just
+  #       immediately retry, causing up to several thousands of queries per second. This
+  #       does not happen in "DROP" mode.
+  replyWhenBusy = "ALLOW"
+
+  # FTL's internal TTL to be handed out for blocked queries in seconds. This settings
+  # allows users to select a value different from the dnsmasq config option local-ttl.
+  # This is useful in context of locally used hostnames that are known to stay constant
+  # over long times (printers, etc.).
+  # Note that large values may render whitelisting ineffective due to client-side
+  # caching of blocked queries.
+  blockTTL = 2
+
+  # Array of custom DNS records
+  # Example: hosts = [ "127.0.0.1 mylocal", "192.168.0.1 therouter" ]
+  #
+  # Possible values are:
+  #     Array of custom DNS records each one in HOSTS form: "IP HOSTNAME"
+  hosts = []
+
+  # If set, A and AAAA queries for plain names, without dots or domain parts, are never
+  # forwarded to upstream nameservers
+  domainNeeded = false
+
+  # If set, the domain is added to simple names (without a period) in /etc/hosts in the
+  # same way as for DHCP-derived names
+  expandHosts = false
+
+  # The DNS domain used by your Pi-hole.
+  #
+  # This DNS domain is purely local. FTL may answer queries from its local cache and
+  # configuration but *never* forwards any requests upstream *unless* you have
+  # configured a dns.revServer exactly for this domain. In the latter case, all queries
+  # for this domain are sent exclusively to this server (including reverse lookups).
+  #
+  # For DHCP, this has two effects; firstly it causes the DHCP server to return the
+  # domain to any hosts which request it, and secondly it sets the domain which it is
+  # legal for DHCP-configured hosts to claim. The intention is to constrain hostnames so
+  # that an untrusted host on the LAN cannot advertise its name via DHCP as e.g.
+  # "google.com" and capture traffic not meant for it. If no domain suffix is specified,
+  # then any DHCP hostname with a domain part (ie with a period) will be disallowed and
+  # logged. If a domain is specified, then hostnames with a domain part are allowed,
+  # provided the domain part matches the suffix. In addition, when a suffix is set then
+  # hostnames without a domain part have the suffix added as an optional domain part.
+  # For instance, we can set domain=mylab.com and have a machine whose DHCP hostname is
+  # "laptop". The IP address for that machine is available both as "laptop" and
+  # "laptop.mylab.com".
+  #
+  # You can disable setting a domain by setting this option to an empty string.
+  #
+  # Possible values are:
+  #     <any valid domain>
+  domain = "lan"
+
+  # Should all reverse lookups for private IP ranges (i.e., 192.168.x.y, etc) which are
+  # not found in /etc/hosts or the DHCP leases file be answered with "no such domain"
+  # rather than being forwarded upstream?
+  bogusPriv = true
+
+  # Validate DNS replies using DNSSEC?
+  dnssec = false
+
+  # Interface to use for DNS (see also dnsmasq.listening.mode) and DHCP (if enabled)
+  #
+  # Possible values are:
+  #     a valid interface name
+  interface = ""
+
+  # Add A, AAAA and PTR records to the DNS. This adds one or more names to the DNS with
+  # associated IPv4 (A) and IPv6 (AAAA) records
+  #
+  # Possible values are:
+  #     <name>[,<name>....],[<IPv4-address>],[<IPv6-address>][,<TTL>]
+  hostRecord = ""
+
+  # Pi-hole interface listening modes
+  #
+  # Possible values are:
+  #   - "LOCAL"
+  #       Allow only local requests. This setting accepts DNS queries only from hosts
+  #       whose address is on a local subnet, i.e., a subnet for which an interface
+  #       exists on the server. It is intended to be set as a default on installation,
+  #       to allow unconfigured installations to be useful but also safe from being used
+  #       for DNS amplification attacks if (accidentally) running public.
+  #   - "SINGLE"
+  #       Permit all origins, accept only on the specified interface. Respond only to
+  #       queries arriving on the specified interface. The loopback (lo) interface is
+  #       automatically added to the list of interfaces to use when this option is used.
+  #       Make sure your Pi-hole is properly firewalled!
+  #   - "BIND"
+  #       By default, FTL binds the wildcard address. If this is not what you want, you
+  #       can use this option as it forces FTL to really bind only the interfaces it is
+  #       listening on. Note that this may result in issues when the interface may go
+  #       down (cable unplugged, etc.). About the only time when this is useful is when
+  #       running another nameserver on the same port on the same machine. This may also
+  #       happen if you run a virtualization API such as libvirt. When this option is
+  #       used, IP alias interface labels (e.g. enp2s0:0) are checked rather than
+  #       interface names.
+  #   - "ALL"
+  #       Permit all origins, accept on all interfaces. Make sure your Pi-hole is
+  #       properly firewalled! This truly allows any traffic to be replied to and is a
+  #       dangerous thing to do as your Pi-hole could become an open resolver. You
+  #       should always ask yourself if the first option doesn't work for you as well.
+  #   - "NONE"
+  #       Do not add any configuration concerning the listening mode to the dnsmasq
+  #       configuration file. This is useful if you want to manually configure the
+  #       listening mode in auxiliary configuration files. This option is really meant
+  #       for advanced users only, support for this option may be limited.
+  listeningMode = "LOCAL"
+
+  # Log DNS queries and replies to pihole.log
+  queryLogging = true
+
+  # List of CNAME records which indicate that <cname> is really <target>. If the <TTL> is
+  # given, it overwrites the value of local-ttl
+  #
+  # Possible values are:
+  #     Array of CNAMEs each on in one of the following forms: "<cname>,<target>[,<TTL>]"
+  cnameRecords = []
+
+  # Port used by the DNS server
+  port = 53
+
+  # Reverse server (former also called "conditional forwarding") feature
+  # Array of reverse servers each one in one of the following forms:
+  # "<enabled>,<ip-address>[/<prefix-len>],<server>[#<port>][,<domain>]"
+  #
+  # Individual components:
+  #
+  # <enabled>: either "true" or "false"
+  #
+  # <ip-address>[/<prefix-len>]: Address range for the reverse server feature in CIDR
+  # notation. If the prefix length is omitted, either 32 (IPv4) or 128 (IPv6) are
+  # substituted (exact address match). This is almost certainly not what you want here.
+  # Example: "192.168.0.0/24" for the range 192.168.0.1 - 192.168.0.255
+  #
+  # <server>[#<port>]: Target server to be used for the reverse server feature
+  # Example: "192.168.0.1#53"
+  #
+  # <domain>: Domain used for the reverse server feature (e.g., "fritz.box")
+  # Example: "fritz.box"
+  #
+  # Possible values are:
+  #     array of reverse servers each one in one of the following forms:
+  #     "<enabled>,<ip-address>[/<prefix-len>],<server>[#<port>][,<domain>]", e.g.,
+  #     "true,192.168.0.0/24,192.168.0.1,fritz.box"
+  revServers = []
+
+  [dns.cache]
+    # Cache size of the DNS server. Note that expiring cache entries naturally make room
+    # for new insertions over time. Setting this number too high will have an adverse
+    # effect as not only more space is needed, but also lookup speed gets degraded in the
+    # 10,000+ range. dnsmasq may issue a warning when you go beyond 10,000+ cache entries.
+    size = 10000
+
+    # Query cache optimizer: If a DNS name exists in the cache, but its time-to-live has
+    # expired only recently, the data will be used anyway (a refreshing from upstream is
+    # triggered). This can improve DNS query delays especially over unreliable Internet
+    # connections. This feature comes at the expense of possibly sometimes returning
+    # out-of-date data and less efficient cache utilization, since old data cannot be
+    # flushed when its TTL expires, so the cache becomes mostly least-recently-used. To
+    # mitigate issues caused by massively outdated DNS replies, the maximum overaging of
+    # cached records is limited. We strongly recommend staying below 86400 (1 day) with
+    # this option.
+    # Setting the TTL excess time to zero will serve stale cache data regardless how long
+    # it has expired. This is not recommended as it may lead to stale data being served
+    # for a long time. Setting this option to any negative value will disable this feature
+    # altogether.
+    optimizer = 3600
+
+    # This setting allows you to specify the TTL used for queries blocked upstream. Once
+    # the TTL expires, the query will be forwarded to the upstream server again to check
+    # if the block is still valid. Defaults to caching for one day (86400 seconds).
+    # Setting this value to zero disables caching of queries blocked upstream.
+    upstreamBlockedTTL = 86400
+
+  [dns.blocking]
+    # Should FTL block queries?
+    active = true
+
+    # How should FTL reply to blocked queries?
+    #
+    # Possible values are:
+    #   - "NULL"
+    #       In NULL mode, which is both the default and recommended mode for Pi-hole
+    #       FTLDNS, blocked queries will be answered with the "unspecified address"
+    #       (0.0.0.0 or ::). The "unspecified address" is a reserved IP address specified
+    #       by RFC 3513 - Internet Protocol Version 6 (IPv6) Addressing Architecture,
+    #       section 2.5.2.
+    #   - "IP_NODATA_AAAA"
+    #       In IP-NODATA-AAAA mode, blocked queries will be answered with the local IPv4
+    #       addresses of your Pi-hole. Blocked AAAA queries will be answered with
+    #       NODATA-IPV6 and clients will only try to reach your Pi-hole over its static
+    #       IPv4 address.
+    #   - "IP"
+    #       In IP mode, blocked queries will be answered with the local IP addresses of
+    #       your Pi-hole.
+    #   - "NX"
+    #       In NXDOMAIN mode, blocked queries will be answered with an empty response
+    #       (i.e., there won't be an answer section) and status NXDOMAIN. A NXDOMAIN
+    #       response should indicate that there is no such domain to the client making the
+    #       query.
+    #   - "NODATA"
+    #       In NODATA mode, blocked queries will be answered with an empty response (no
+    #       answer section) and status NODATA. A NODATA response indicates that the domain
+    #       exists, but there is no record for the requested query type.
+    mode = "NULL"
+
+    # Should FTL enrich blocked replies with EDNS0 information?
+    #
+    # Possible values are:
+    #   - "NONE"
+    #       In NONE mode, no additional EDNS information is added to blocked queries
+    #   - "CODE"
+    #       In CODE mode, blocked queries will be enriched with EDNS info-code BLOCKED (15)
+    #   - "TEXT"
+    #       In TEXT mode, blocked queries will be enriched with EDNS info-code BLOCKED (15)
+    #       and a text message describing the reason for the block
+    edns = "TEXT"
+
+  [dns.specialDomains]
+    # Should Pi-hole always reply with NXDOMAIN to A and AAAA queries of
+    # use-application-dns.net to disable Firefox automatic DNS-over-HTTP? This is
+    # following the recommendation on
+    # https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https
+    mozillaCanary = true
+
+    # Should Pi-hole always reply with NXDOMAIN to A and AAAA queries of mask.icloud.com
+    # and mask-h2.icloud.com to disable Apple's iCloud Private Relay to prevent Apple
+    # devices from bypassing Pi-hole? This is following the recommendation on
+    # https://developer.apple.com/support/prepare-your-network-for-icloud-private-relay
+    iCloudPrivateRelay = true
+
+    # Should Pi-hole always reply with NODATA to all queries to zone resolver.arpa to
+    # prevent devices from bypassing Pi-hole using Discovery of Designated Resolvers? This
+    # is based on recommendations at the end of RFC 9462, section 4.
+    designatedResolver = true
+
+    [dns.reply.host]
+      # Use a specific IPv4 address for the Pi-hole host? By default, FTL determines the
+      # address of the interface a query arrived on and uses this address for replying to A
+      # queries with the most suitable address for the requesting client. This setting can
+      # be used to use a fixed, rather than the dynamically obtained, address when Pi-hole
+      # responds to the following names: [ "pi.hole", "<the device's hostname>",
+      # "pi.hole.<local domain>", "<the device's hostname>.<local domain>" ]
+      force4 = false
+
+      # Custom IPv4 address for the Pi-hole host
+      #
+      # Possible values are:
+      #     <valid IPv4 address> or empty string ("")
+      IPv4 = ""
+
+      # Use a specific IPv6 address for the Pi-hole host? See description for the IPv4
+      # variant above for further details.
+      force6 = false
+
+      # Custom IPv6 address for the Pi-hole host
+      #
+      # Possible values are:
+      #     <valid IPv6 address> or empty string ("")
+      IPv6 = ""
+
+    [dns.reply.blocking]
+      # Use a specific IPv4 address in IP blocking mode? By default, FTL determines the
+      # address of the interface a query arrived on and uses this address for replying to A
+      # queries with the most suitable address for the requesting client. This setting can
+      # be used to use a fixed, rather than the dynamically obtained, address when Pi-hole
+      # responds in the following cases: IP blocking mode is used and this query is to be
+      # blocked, regular expressions with the ;reply=IP regex extension.
+      force4 = false
+
+      # Custom IPv4 address for IP blocking mode
+      #
+      # Possible values are:
+      #     <valid IPv4 address> or empty string ("")
+      IPv4 = ""
+
+      # Use a specific IPv6 address in IP blocking mode? See description for the IPv4 variant
+      # above for further details.
+      force6 = false
+
+      # Custom IPv6 address for IP blocking mode
+      #
+      # Possible values are:
+      #     <valid IPv6 address> or empty string ("")
+      IPv6 = ""
+
+  [dns.rateLimit]
+    # Rate-limited queries are answered with a REFUSED reply and not further processed by
+    # FTL.
+    # The default settings for FTL's rate-limiting are to permit no more than 1000 queries
+    # in 60 seconds. Both numbers can be customized independently. It is important to note
+    # that rate-limiting is happening on a per-client basis. Other clients can continue to
+    # use FTL while rate-limited clients are short-circuited at the same time.
+    # For this setting, both numbers, the maximum number of queries within a given time,
+    # and the length of the time interval (seconds) have to be specified. For instance, if
+    # you want to set a rate limit of 1 query per hour, the option should look like
+    # RATE_LIMIT=1/3600. The time interval is relative to when FTL has finished starting
+    # (start of the daemon + possible delay by DELAY_STARTUP) then it will advance in
+    # steps of the rate-limiting interval. If a client reaches the maximum number of
+    # queries it will be blocked until the end of the current interval. This will be
+    # logged to /var/log/pihole/FTL.log, e.g. Rate-limiting 10.0.1.39 for at least 44
+    # seconds. If the client continues to send queries while being blocked already and
+    # this number of queries during the blocking exceeds the limit the client will
+    # continue to be blocked until the end of the next interval (FTL.log will contain
+    # lines like Still rate-limiting 10.0.1.39 as it made additional 5007 queries). As
+    # soon as the client requests less than the set limit, it will be unblocked (Ending
+    # rate-limitation of 10.0.1.39).
+    # Rate-limiting may be disabled altogether by setting both values to zero (this
+    # results in the same behavior as before FTL v5.7).
+    # How many queries are permitted...
+    count = 1000
+
+    # ... in the set interval before rate-limiting?
+    interval = 60
+
+[dhcp]
+  # Is the embedded DHCP server enabled?
+  active = false
+
+  # Start address of the DHCP address pool
+  #
+  # Possible values are:
+  #     <valid IPv4 address> or empty string (""), e.g., "192.168.0.10"
+  start = ""
+
+  # End address of the DHCP address pool
+  #
+  # Possible values are:
+  #     <valid IPv4 address> or empty string (""), e.g., "192.168.0.250"
+  end = ""
+
+  # Address of the gateway to be used (typically the address of your router in a home
+  # installation)
+  #
+  # Possible values are:
+  #     <valid IPv4 address> or empty string (""), e.g., "192.168.0.1"
+  router = ""
+
+  # The netmask used by your Pi-hole. For directly connected networks (i.e., networks on
+  # which the machine running Pi-hole has an interface) the netmask is optional and may
+  # be set to an empty string (""): it will then be determined from the interface
+  # configuration itself. For networks which receive DHCP service via a relay agent, we
+  # cannot determine the netmask itself, so it should explicitly be specified, otherwise
+  # Pi-hole guesses based on the class (A, B or C) of the network address.
+  #
+  # Possible values are:
+  #     <any valid netmask> (e.g., "255.255.255.0") or empty string ("") for
+  #     auto-discovery
+  netmask = ""
+
+  # If the lease time is given, then leases will be given for that length of time. If not
+  # given, the default lease time is one hour for IPv4 and one day for IPv6.
+  #
+  # Possible values are:
+  #     The lease time can be in seconds, or minutes (e.g., "45m") or hours (e.g., "1h")
+  #     or days (like "2d") or even weeks ("1w"). You may also use "infinite" as string
+  #     but be aware of the drawbacks
+  leaseTime = ""
+
+  # Should Pi-hole make an attempt to also satisfy IPv6 address requests (be aware that
+  # IPv6 works a whole lot different than IPv4)
+  ipv6 = false
+
+  # Enable DHCPv4 Rapid Commit Option specified in RFC 4039. Should only be enabled if
+  # either the server is the only server for the subnet to avoid conflicts
+  rapidCommit = false
+
+  # Advertise DNS server multiple times to clients. Some devices will add their own
+  # proprietary DNS servers to the list of DNS servers, which can cause issues with
+  # Pi-hole. This option will advertise the Pi-hole DNS server multiple times to
+  # clients, which should prevent this from happening.
+  multiDNS = false
+
+  # Enable logging for DHCP. This will log all relevant DHCP-related activity, including,
+  # e.g., all the options sent to DHCP clients and the tags used to determine them (if
+  # any). This can be useful for debugging DHCP issues. The generated output is saved to
+  # the file specified by files.log.dnsmasq below.
+  logging = false
+
+  # Ignore unknown DHCP clients.
+  # If this option is set, Pi-hole ignores all clients which are not explicitly
+  # configured through dhcp.hosts. This can be useful to prevent unauthorized clients
+  # from getting an IP address from the DHCP server.
+  # It should be noted that this option is not a security feature, as clients can still
+  # assign themselves an IP address and use the network. It is merely a convenience
+  # feature to prevent unknown clients from getting a valid IP configuration assigned
+  # automatically.
+  # Note that you will need to configure new clients manually in dhcp.hosts before they
+  # can use the network when this feature is enabled.
+  ignoreUnknownClients = false
+
+  # Per host parameters for the DHCP server. This allows a machine with a particular
+  # hardware address to be always allocated the same hostname, IP address and lease time
+  # or to specify static DHCP leases
+  #
+  # Possible values are:
+  #     Array of static leases each on in one of the following forms:
+  #     "[<hwaddr>][,id:<client_id>|*][,set:<tag>][,tag:<tag>][,<ipaddr>][,<hostname>][,<lease_time>][,ignore]"
+  hosts = []
+
+  [ntp.ipv4]
+    # Should FTL act as network time protocol (NTP) server (IPv4)?
+    active = true
+
+    # IPv4 address to listen on for NTP requests
+    #
+    # Possible values are:
+    #     <valid IPv4 address> or empty string ("") for wildcard (0.0.0.0)
+    address = ""
+
+  [ntp.ipv6]
+    # Should FTL act as network time protocol (NTP) server (IPv6)?
+    active = true
+
+    # IPv6 address to listen on for NTP requests
+    #
+    # Possible values are:
+    #     <valid IPv6 address> or empty string ("") for wildcard (::)
+    address = ""
+
+  [ntp.sync]
+    # Should FTL try to synchronize the system time with an upstream NTP server?
+    active = true
+
+    # NTP upstream server to sync with, e.g., "pool.ntp.org". Note that the NTP server
+    # should be located as close as possible to you in order to minimize the time offset
+    # possibly introduced by different routing paths.
+    #
+    # Possible values are:
+    #     valid NTP upstream server
+    server = "pool.ntp.org"
+
+    # Interval in seconds between successive synchronization attempts with the NTP server
+    interval = 3600
+
+    # Number of NTP syncs to perform and average before updating the system time
+    count = 8
+
+    [ntp.sync.rtc]
+      # Should FTL update a real-time clock (RTC) if available?
+      set = false
+
+      # Path to the RTC device to update. Leave empty for auto-discovery
+      #
+      # Possible values are:
+      #     Path to the RTC device, e.g., "/dev/rtc0"
+      device = ""
+
+      # Should the RTC be set to UTC?
+      utc = true
+
+[resolver]
+  # Should FTL try to resolve IPv4 addresses to hostnames?
+  resolveIPv4 = true
+
+  # Should FTL try to resolve IPv6 addresses to hostnames?
+  resolveIPv6 = true
+
+  # Control whether FTL should use the fallback option to try to obtain client names from
+  # checking the network table. This behavior can be disabled with this option.
+  # Assume an IPv6 client without a host names. However, the network table knows -
+  # though the client's MAC address - that this is the same device where we have a host
+  # name for another IP address (e.g., a DHCP server managed IPv4 address). In this
+  # case, we use the host name associated to the other address as this is the same
+  # device.
+  networkNames = true
+
+  # With this option, you can change how (and if) hourly PTR requests are made to check
+  # for changes in client and upstream server hostnames.
+  #
+  # Possible values are:
+  #   - "IPV4_ONLY"
+  #       Do hourly PTR lookups only for IPv4 addresses. This is the new default since
+  #       Pi-hole FTL v5.3.2. It should resolve issues with more and more very
+  #       short-lived PE IPv6 addresses coming up in a lot of networks.
+  #   - "ALL"
+  #       Do hourly PTR lookups for all addresses. This was the default until FTL
+  #       v5.3(.1). It has been replaced as it can create a lot of PTR queries for those
+  #       with many IPv6 addresses in their networks.
+  #   - "UNKNOWN"
+  #       Only resolve unknown hostnames. Already existing hostnames are never refreshed,
+  #       i.e., there will be no PTR queries made for clients where hostnames are known.
+  #       This also means that known hostnames will not be updated once known.
+  #   - "NONE"
+  #       Don't do any hourly PTR lookups. This means we look host names up exactly once
+  #       (when we first see a client) and never again. You may miss future changes of
+  #       host names.
+  refreshNames = "IPV4_ONLY"
+
+[database]
+  # Should FTL load information from the database on startup to be aware of the most
+  # recent history?
+  DBimport = true
+
+  # How long should queries be stored in the database [days]?
+  # Setting this value to 0 will disable the database.
+  maxDBdays = 91
+
+  # How often do we store queries in FTL's database [seconds]?
+  DBinterval = 60
+
+  # Should FTL enable Write-Ahead Log (WAL) mode for the on-disk query database
+  # (configured via files.database)?
+  # It is recommended to leave this setting enabled for performance reasons. About the
+  # only reason to disable WAL mode is if you are experiencing specific issues with it,
+  # e.g., when using a database that is accessed from multiple hosts via a network
+  # share. When this setting is disabled, FTL will use SQLite3's default journal mode
+  # (rollback journal in DELETE mode).
+  useWAL = true
+
+  [database.network]
+    # Should FTL analyze the local ARP cache? When disabled, client identification and the
+    # network table will stop working reliably.
+    parseARPcache = true
+
+    # How long should IP addresses be kept in the network_addresses table [days]? IP
+    # addresses (and associated host names) older than the specified number of days are
+    # removed to avoid dead entries in the network overview table.
+    expire = 91
+
+[webserver]
+  # On which domain is the web interface served?
+  #
+  # Possible values are:
+  #     <valid domain>
+  domain = "pi.hole"
+
+  # Webserver access control list (ACL) allowing for restrictions to be put on the list
+  # of IP addresses which have access to the web server. The ACL is a comma separated
+  # list of IP subnets, where each subnet is prepended by either a - or a + sign. A plus
+  # sign means allow, where a minus sign means deny. If a subnet mask is omitted, such
+  # as -1.2.3.4, this means to deny only that single IP address. If this value is not
+  # set (empty string), all accesses are allowed. Otherwise, the default setting is to
+  # deny all accesses. On each request the full list is traversed, and the last (!)
+  # match wins. IPv6 addresses may be specified in CIDR-form [a:b::c]/64.
+  #
+  # Example 1: acl = "+127.0.0.1,+[::1]"
+  # ---> deny all access, except from 127.0.0.1 and ::1,
+  # Example 2: acl = "+192.168.0.0/16"
+  # ---> deny all accesses, except from the 192.168.0.0/16 subnet,
+  # Example 3: acl = "+[::]/0" ---> allow only IPv6 access.
+  #
+  # Possible values are:
+  #     <valid ACL>
+  acl = ""
+
+  # Ports to be used by the webserver.
+  # Comma-separated list of ports to listen on. It is possible to specify an IP address
+  # to bind to. In this case, an IP address and a colon must be prepended to the port
+  # number. For example, to bind to the loopback interface on port 80 (IPv4) and to all
+  # interfaces port 8080 (IPv4), use "127.0.0.1:80,8080". "[::]:80" can be used to
+  # listen to IPv6 connections to port 80. IPv6 addresses of network interfaces can be
+  # specified as well, e.g. "[::1]:80" for the IPv6 loopback interface. [::]:80 will
+  # bind to port 80 IPv6 only.
+  # In order to use port 80 for all interfaces, both IPv4 and IPv6, use either the
+  # configuration "80,[::]:80" (create one socket for IPv4 and one for IPv6 only), or
+  # "+80" (create one socket for both, IPv4 and IPv6). The '+' notation to use IPv4 and
+  # IPv6 will only work if no network interface is specified. Depending on your
+  # operating system version and IPv6 network environment, some configurations might not
+  # work as expected, so you have to test to find the configuration most suitable for
+  # your needs. In case "+80" does not work for your environment, you need to use
+  # "80,[::]:80".
+  # If the port is TLS/SSL, a letter 's' (secure) must be appended, for example,
+  # "80,443s" will open port 80 and port 443, and connections on port 443 will be
+  # encrypted. For non-encrypted ports, it is allowed to append letter 'r' (as in
+  # redirect). Redirected ports will redirect all their traffic to the first configured
+  # SSL port. For example, if webserver.port is "80r,443s", then all HTTP traffic coming
+  # at port 80 will be redirected to HTTPS port 443.
+  # When specifying 'o' (optional) behind a port, inability to use this port is not
+  # considered an error. For instance, specifying "80o,8080o" will allow the webserver
+  # to listen on either 80, 8080, both or even none of the two ports. This flag may be
+  # combined with 'r' and 's' like "80or,443os,8080,4443s" (80 redirecting to SSL if
+  # available, 443 encrypted if available, 8080 mandatory and unencrypted, 4443
+  # mandatory and encrypted).
+  # If this value is not set (empty string), the web server will not be started and,
+  # hence, the API will not be available.
+  #
+  # Possible values are:
+  #     comma-separated list of <[ip_address:]port>
+  port = "80o,443os,[::]:80o,[::]:443os"
+
+  # Maximum number of worker threads allowed.
+  # The Pi-hole web server handles each incoming connection in a separate thread.
+  # Therefore, the value of this option is effectively the number of concurrent HTTP
+  # connections that can be handled. Any other connections are queued until they can be
+  # processed by a unoccupied thread.
+  # The total number of threads you see may be lower than the configured value as
+  # threads are only created when needed due to incoming connections.
+  # The value 0 means the number of threads is 50 (as per default settings of CivetWeb)
+  # for backwards-compatible behavior.
+  threads = 50
+
+  # Additional HTTP headers added to the web server responses.
+  # The headers are added to all responses, including those for the API.
+  # Note about the default additional headers:
+  # - X-DNS-Prefetch-Control: off: Usually browsers proactively perform domain name
+  # resolution on links that the user may choose to follow. We disable DNS prefetching
+  # here.
+  # - Content-Security-Policy: [...] 'unsafe-inline' is both required by Chart.js
+  # styling some elements directly, and index.html containing some inlined Javascript
+  # code.
+  # - X-Frame-Options: DENY: The page can not be displayed in a frame, regardless of the
+  # site attempting to do so.
+  # - X-Xss-Protection: 0: Disables XSS filtering in browsers that support it. This
+  # header is usually enabled by default in browsers, and is not recommended as it can
+  # hurt the security of the site.
+  # (https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection).
+  # - X-Content-Type-Options: nosniff: Marker used by the server to indicate that the
+  # MIME types advertised in the  Content-Type headers should not be changed and be
+  # followed. This allows to opt-out of MIME type sniffing, or, in other words, it is a
+  # way to say that the webmasters knew what they were doing. Site security testers
+  # usually expect this header to be set.
+  # - Referrer-Policy: strict-origin-when-cross-origin: A referrer will be sent for
+  # same-site origins, but cross-origin requests will send no referrer information.
+  # The latter four headers are set as expected by https://securityheaders.io
+  #
+  # Possible values are:
+  #     array of HTTP headers
+  headers = [
+    "X-DNS-Prefetch-Control: off",
+    "Content-Security-Policy: default-src 'self' 'unsafe-inline';",
+    "X-Frame-Options: DENY",
+    "X-XSS-Protection: 0",
+    "X-Content-Type-Options: nosniff",
+    "Referrer-Policy: strict-origin-when-cross-origin"
+  ]
+
+  # Should the web server serve all files in webserver.paths.webroot directory? If
+  # disabled, only files within the path defined through webserver.paths.webhome and
+  # /api will be served.
+  serve_all = false
+
+  [webserver.session]
+    # Session timeout in seconds. If a session is inactive for more than this time, it will
+    # be terminated. Sessions are continuously refreshed by the web interface, preventing
+    # sessions from timing out while the web interface is open.
+    # This option may also be used to make logins persistent for long times, e.g. 86400
+    # seconds (24 hours), 604800 seconds (7 days) or 2592000 seconds (30 days). Note that
+    # the total number of concurrent sessions is limited so setting this value too high
+    # may result in users being rejected and unable to log in if there are already too
+    # many sessions active.
+    timeout = 1800
+
+    # Should Pi-hole backup and restore sessions from the database? This is useful if you
+    # want to keep your sessions after a restart of the web interface.
+    restore = true
+
+  [webserver.tls]
+    # Path to the TLS (SSL) certificate file. All directories along the path must be
+    # readable and accessible by the user running FTL (typically 'pihole'). This option is
+    # only required when at least one of webserver.port is TLS. The file must be in PEM
+    # format, and it must have both, private key and certificate (the *.pem file created
+    # must contain a 'CERTIFICATE' section as well as a 'RSA PRIVATE KEY' section).
+    # The *.pem file can be created using
+    #     cp server.crt server.pem
+    #     cat server.key >> server.pem
+    # if you have these files instead
+    #
+    # Possible values are:
+    #     <valid TLS certificate file (*.pem)>
+    cert = "/etc/pihole/tls.pem"
+
+  [webserver.paths]
+    # Server root on the host
+    #
+    # Possible values are:
+    #     <valid path>
+    webroot = "/var/www/html"
+
+    # Sub-directory of the root containing the web interface
+    #
+    # Possible values are:
+    #     <valid subpath>, both slashes are needed!
+    webhome = "/admin/"
+
+    # Prefix where the web interface is served
+    # This is useful when you are using a reverse proxy serving the web interface, e.g.,
+    # at http://<ip>/pihole/admin/ instead of http://<ip>/admin/. In this example, the
+    # prefix would be "/pihole". Note that the prefix has to be stripped away by the
+    # reverse proxy, e.g., for traefik:
+    # - traefik.http.routers.pihole.rule=PathPrefix(`/pihole`)
+    # - traefik.http.middlewares.piholehttp.stripprefix.prefixes=/pihole
+    # The prefix should start with a slash. If you don't use a prefix, leave this field
+    # empty. Setting this field to an incorrect value may result in the web interface not
+    # being accessible.
+    # Don't use this setting if you are not using a reverse proxy!
+    #
+    # Possible values are:
+    #     valid URL prefix or empty
+    prefix = ""
+
+  [webserver.interface]
+    # Should the web interface use the boxed layout?
+    boxed = true
+
+    # Theme used by the Pi-hole web interface
+    #
+    # Possible values are:
+    #   - "default-auto"
+    #       Pi-hole auto
+    #   - "default-light"
+    #       Pi-hole day
+    #   - "default-dark"
+    #       Pi-hole midnight
+    #   - "default-darker"
+    #       Pi-hole deep-midnight
+    #   - "high-contrast"
+    #       High-contrast light
+    #   - "high-contrast-dark"
+    #       High-contrast dark
+    #   - "lcars"
+    #       Star Trek LCARS
+    theme = "default-auto"
+
+  [webserver.api]
+    # Number of concurrent sessions allowed for the API. If the number of sessions exceeds
+    # this value, no new sessions will be allowed until the number of sessions drops due
+    # to session expiration or logout. Note that the number of concurrent sessions is
+    # irrelevant if authentication is disabled as no sessions are used in this case.
+    max_sessions = 16
+
+    # Should FTL prettify the API output (add extra spaces, newlines and indentation)?
+    prettyJSON = false
+
+    # API password hash
+    #
+    # Possible values are:
+    #     <valid Pi-hole password hash>
+    pwhash = ""
+
+    # Pi-hole 2FA TOTP secret. When set to something different than "", 2FA authentication
+    # will be enforced for the API and the web interface. This setting is write-only, you
+    # can not read the secret back.
+    #
+    # Possible values are:
+    #     <valid TOTP secret (20 Bytes in Base32 encoding)>
+    totp_secret = ""
+
+    # Pi-hole application password.
+    # After you turn on two-factor (2FA) verification and set up an Authenticator app, you
+    # may run into issues if you use apps or other services that don't support two-step
+    # verification. In this case, you can create and use an app password to sign in. An
+    # app password is a long, randomly generated password that can be used instead of your
+    # regular password + TOTP token when signing in to the API. The app password can be
+    # generated through the API and will be shown only once. You can revoke the app
+    # password at any time. If you revoke the app password, be sure to generate a new one
+    # and update your app with the new password.
+    #
+    # Possible values are:
+    #     <valid Pi-hole password hash>
+    app_pwhash = ""
+
+    # Should application password API sessions be allowed to modify config settings?
+    # Setting this to true allows third-party applications using the application password
+    # to modify settings, e.g., the upstream DNS servers, DHCP server settings, or
+    # changing passwords. This setting should only be enabled if really needed and only if
+    # you trust the applications using the application password.
+    app_sudo = false
+
+    # Should FTL create a temporary CLI password? This password is stored in clear in
+    # /etc/pihole and can be used by the CLI (pihole ...  commands) to authenticate
+    # against the API. Note that the password is only valid for the current session and
+    # regenerated on each FTL restart. Sessions initiated with this password cannot modify
+    # the Pi-hole configuration (change passwords, etc.) for security reasons but can
+    # still use the API to query data and manage lists.
+    cli_pw = true
+
+    # Array of clients to be excluded from certain API responses (regex):
+    # - Query Log (/api/queries)
+    # - Top Clients (/api/stats/top_clients)
+    # This setting accepts both IP addresses (IPv4 and IPv6) as well as hostnames.
+    # Note that backslashes "\" need to be escaped, i.e. "\\" in this setting
+    #
+    # Example: [ "^192\\.168\\.2\\.56$", "^fe80::341:[0-9a-f]*$", "^localhost$" ]
+    #
+    # Possible values are:
+    #     array of regular expressions describing clients
+    excludeClients = []
+
+    # Array of domains to be excluded from certain API responses (regex):
+    # - Query Log (/api/queries)
+    # - Top Clients (/api/stats/top_domains)
+    # Note that backslashes "\" need to be escaped, i.e. "\\" in this setting
+    #
+    # Example: [ "(^|\\.)\\.google\\.de$", "\\.pi-hole\\.net$" ]
+    #
+    # Possible values are:
+    #     array of regular expressions describing domains
+    excludeDomains = []
+
+    # How much history should be imported from the database and returned by the API
+    # [seconds]? (max 24*60*60 = 86400)
+    maxHistory = 86400
+
+    # Up to how many clients should be returned in the activity graph endpoint
+    # (/api/history/clients)?
+    # This setting can be overwritten at run-time using the parameter N. Setting this to 0
+    # will always send all clients. Be aware that this may be challenging for the GUI if
+    # you have many (think > 1.000 clients) in your network
+    maxClients = 10
+
+    # How should the API compute the most active clients? If set to true, the API will
+    # return the clients with the most queries globally (within 24 hours). If set to
+    # false, the API will return the clients with the most queries per time slot
+    # individually.
+    client_history_global_max = true
+
+    # Allow destructive API calls (e.g. deleting all queries, powering off the system, ...)
+    allow_destructive = true
+
+    [webserver.api.temp]
+      # Which upper temperature limit should be used by Pi-hole? Temperatures above this
+      # limit will be shown as "hot". The number specified here is in the unit defined below
+      limit = 60.000000
+
+      # Which temperature unit should be used for temperatures processed by FTL?
+      #
+      # Possible values are:
+      #   - "C"
+      #       Celsius
+      #   - "F"
+      #       Fahrenheit
+      #   - "K"
+      #       Kelvin
+      unit = "C"
+
+[files]
+  # The file which contains the PID of FTL's main process.
+  #
+  # Possible values are:
+  #     <any writable file>
+  pid = "/run/pihole-FTL.pid"
+
+  # The location of FTL's long-term database
+  #
+  # Possible values are:
+  #     <any FTL database>
+  database = "/etc/pihole/pihole-FTL.db"
+
+  # The location of Pi-hole's gravity database
+  #
+  # Possible values are:
+  #     <any Pi-hole gravity database>
+  gravity = "/etc/pihole/gravity.db"
+
+  # A temporary directory where Pi-hole can store files during gravity updates. This
+  # directory must be writable by the user running gravity (typically pihole).
+  #
+  # Possible values are:
+  #     <any existing world-writable writable directory>
+  gravity_tmp = "/tmp"
+
+  # The database containing MAC -> Vendor information for the network table
+  #
+  # Possible values are:
+  #     <any Pi-hole macvendor database>
+  macvendor = "/etc/pihole/macvendor.db"
+
+  # The old config file of Pi-hole used before v6.0
+  #
+  # Possible values are:
+  #     <any Pi-hole setupVars file>
+  setupVars = "/etc/pihole/setupVars.conf"
+
+  # An optional file containing a pcap capture of the network traffic. This file is used
+  # for debugging purposes only. If you don't know what this is, you don't need it.
+  # Setting this to an empty string disables pcap recording. The file must be writable
+  # by the user running FTL (typically pihole). Failure to write to this file will
+  # prevent the DNS resolver from starting. The file is appended to if it already
+  # exists.
+  #
+  # Possible values are:
+  #     <any writable pcap file>
+  pcap = ""
+
+  [files.log]
+    # The location of FTL's log file
+    #
+    # Possible values are:
+    #     <any writable file>
+    ftl = "/var/log/pihole/FTL.log"
+
+    # The log file used by the embedded dnsmasq DNS server
+    #
+    # Possible values are:
+    #     <any writable file>
+    dnsmasq = "/var/log/pihole/pihole.log"
+
+    # The log file used by the webserver
+    #
+    # Possible values are:
+    #     <any writable file>
+    webserver = "/var/log/pihole/webserver.log"
+
+[misc]
+  # Using privacy levels you can specify which level of detail you want to see in your
+  # Pi-hole statistics. Changing this setting will trigger a restart of FTL
+  #
+  # Possible values are:
+  #   - 0
+  #       Don't hide anything, all statistics are available.
+  #   - 1
+  #       Hide domains. This setting disables Top Domains and Top Ads
+  #   - 2
+  #       Hide domains and clients. This setting disables Top Domains, Top Ads, Top
+  #       Clients and Clients over time.
+  #   - 3
+  #       Anonymize everything. This setting disabled almost any statistics and query
+  #       analysis. There will be no long-term database logging and no Query Log. You
+  #       will also loose most regex features.
+  privacylevel = 0
+
+  # During startup, in some configurations, network interfaces appear only late during
+  # system startup and are not ready when FTL tries to bind to them. Therefore, you may
+  # want FTL to wait a given amount of time before trying to start the DNS revolver.
+  # This setting takes any integer value between 0 and 300 seconds. To prevent delayed
+  # startup while the system is already running and FTL is restarted, the delay only
+  # takes place within the first 180 seconds (hard-coded) after booting.
+  delay_startup = 0
+
+  # Set niceness of pihole-FTL. Defaults to -10 and can be disabled altogether by setting
+  # a value of -999. The nice value is an attribute that can be used to influence the
+  # CPU scheduler to favor or disfavor a process in scheduling decisions. The range of
+  # the nice value varies across UNIX systems. On modern Linux, the range is -20 (high
+  # priority = not very nice to other processes) to +19 (low priority).
+  nice = -10
+
+  # Should FTL translate its own stack addresses into code lines during the bug
+  # backtrace? This improves the analysis of crashed significantly. It is recommended to
+  # leave the option enabled. This option should only be disabled when addr2line is
+  # known to not be working correctly on the machine because, in this case, the
+  # malfunctioning addr2line can prevent from generating any backtrace at all.
+  addr2line = true
+
+  # Should FTL load additional dnsmasq configuration files from /etc/dnsmasq.d/?
+  # Warning: This is an advanced setting and should only be used with care.
+  # Incorrectly formatted or config files specifying options which can only be defined
+  # once can result in conflicts with the automatic configuration of Pi-hole (see
+  # /etc/pihole/dnsmasq.conf) and may stop DNS resolution from working.
+  etc_dnsmasq_d = false
+
+  # Additional lines to inject into the generated dnsmasq configuration.
+  # Warning: This is an advanced setting and should only be used with care. Incorrectly
+  # formatted or duplicated lines as well as lines conflicting with the automatic
+  # configuration of Pi-hole can break the embedded dnsmasq and will stop DNS resolution
+  # from working.
+  # Use this option with extra care.
+  #
+  # Possible values are:
+  #     array of valid dnsmasq config line options
+  dnsmasq_lines = []
+
+  # Log additional information about queries and replies to pihole.log
+  # When this setting is enabled, the log has extra information at the start of each
+  # line. This consists of a serial number which ties together the log lines associated
+  # with an individual query, and the IP address of the requestor. This setting is only
+  # effective if dns.queryLogging is enabled, too. This option is only useful for
+  # debugging and is not recommended for normal use.
+  extraLogging = false
+
+  # Put configuration into read-only mode. This will prevent any changes to the
+  # configuration file via the API or CLI. This setting useful when a configuration is
+  # to be forced/modified by some third-party application (like infrastructure-as-code
+  # providers) and should not be changed by any means.
+  readOnly = false
+
+  [misc.check]
+    # Pi-hole is very lightweight on resources. Nevertheless, this does not mean that you
+    # should run Pi-hole on a server that is otherwise extremely busy as queuing on the
+    # system can lead to unnecessary delays in DNS operation as the system becomes less
+    # and less usable as the system load increases because all resources are permanently
+    # in use. To account for this, FTL regularly checks the system load. To bring this to
+    # your attention, FTL warns about excessive load when the 15 minute system load
+    # average exceeds the number of cores.
+    # This check can be disabled with this setting.
+    load = true
+
+    # FTL stores history in shared memory to allow inter-process communication with forked
+    # dedicated TCP workers. If FTL runs out of memory, it cannot continue to work as
+    # queries cannot be analyzed any further. Hence, FTL checks if enough shared memory is
+    # available on your system and warns you if this is not the case.
+    # By default, FTL warns if the shared-memory usage exceeds 90%. You can set any
+    # integer limit between 0 to 100 (interpreted as percentages) where 0 means that
+    # checking of shared-memory usage is disabled.
+    shmem = 90
+
+    # FTL stores its long-term history in a database file on disk. Furthermore, FTL stores
+    # log files. By default, FTL warns if usage of the disk holding any crucial file
+    # exceeds 90%. You can set any integer limit between 0 to 100 (interpreted as
+    # percentages) where 0 means that checking of disk usage is disabled.
+    disk = 90
+
+[debug]
+  # Print debugging information about database actions. This prints performed SQL
+  # statements as well as some general information such as the time it took to store the
+  # queries and how many have been saved to the database.
+  database = false
+
+  # Prints a list of the detected interfaces on the startup of pihole-FTL. Also, prints
+  # whether these interfaces are IPv4 or IPv6 interfaces.
+  networking = false
+
+  # Print information about shared memory locks. Messages will be generated when waiting,
+  # obtaining, and releasing a lock.
+  locks = false
+
+  # Print extensive query information (domains, types, replies, etc.). This has always
+  # been part of the legacy debug mode of pihole-FTL.
+  queries = false
+
+  # Print flags of queries received by the DNS hooks. Only effective when DEBUG_QUERIES
+  # is enabled as well.
+  flags = false
+
+  # Print information about shared memory buffers. Messages are either about creating or
+  # enlarging shmem objects or string injections.
+  shmem = false
+
+  # Print information about garbage collection (GC): What is to be removed, how many have
+  # been removed and how long did GC take.
+  gc = false
+
+  # Print information about ARP table processing: How long did parsing take, whether read
+  # MAC addresses are valid, and if the macvendor.db file exists.
+  arp = false
+
+  # Controls if FTLDNS should print extended details about regex matching into FTL.log.
+  regex = false
+
+  # Print extra debugging information concerning API calls. This includes the request,
+  # the request parameters, and the internal details about how the algorithms decide
+  # which data to present and in what form. This very verbose output should only be used
+  # when debugging specific API issues and can be helpful, e.g., when a client cannot
+  # connect due to an obscure API error. Furthermore, this setting enables logging of
+  # all API requests (auth log) and details about user authentication attempts.
+  api = false
+
+  # Print extra debugging information about TLS connections. This includes the TLS
+  # version, the cipher suite, the certificate chain and much more. This very verbose
+  # output should only be used when debugging specific TLS issues and can be helpful,
+  # e.g., when a client cannot connect due to an obscure TLS error as modern browsers do
+  # not provide much information about the underlying TLS connection and most often give
+  # only very generic error messages without much/any underlying technical information.
+  tls = false
+
+  # Print information about overTime memory operations, such as initializing or moving
+  # overTime slots.
+  overtime = false
+
+  # Print information about status changes for individual queries. This can be useful to
+  # identify unexpected unknown queries.
+  status = false
+
+  # Print information about capabilities granted to the pihole-FTL process. The current
+  # capabilities are printed on receipt of SIGHUP, i.e., the current set of capabilities
+  # can be queried without restarting pihole-FTL (by setting DEBUG_CAPS=true and
+  # thereafter sending killall -HUP pihole-FTL).
+  caps = false
+
+  # Print information about DNSSEC activity
+  dnssec = false
+
+  # FTL uses dynamically allocated vectors for various tasks. This config option enables
+  # extensive debugging information such as information about allocation, referencing,
+  # deletion, and appending.
+  vectors = false
+
+  # Extensive information about hostname resolution like which DNS servers are used in
+  # the first and second hostname resolving tries (only affecting internally generated
+  # PTR queries).
+  resolver = false
+
+  # Print debugging information about received EDNS(0) data.
+  edns0 = false
+
+  # Log various important client events such as change of interface (e.g., client
+  # switching from WiFi to wired or VPN connection), as well as extensive reporting
+  # about how clients were assigned to its groups.
+  clients = false
+
+  # Log information related to alias-client processing.
+  aliasclients = false
+
+  # Log information regarding FTL's embedded event handling queue.
+  events = false
+
+  # Log information about script helpers, e.g., due to dhcp-script.
+  helper = false
+
+  # Print config parsing details
+  config = false
+
+  # Debug monitoring of /etc/pihole filesystem events
+  inotify = false
+
+  # Debug monitoring of the webserver (CivetWeb) events
+  webserver = false
+
+  # Temporary flag that may print additional information. This debug flag is meant to be
+  # used whenever needed for temporary investigations. The logged content may change
+  # without further notice at any time.
+  extra = false
+
+  # Reserved debug flag
+  reserved = false
+
+  # Print information about NTP synchronization
+  ntp = false
+
+  # Print information about netlink communication and parsing
+  netlink = false
+
+  # Set all debug flags at once. This is a convenience option to enable all debug flags
+  # at once. Note that this option is not persistent, setting it to true will enable all
+  # *remaining* debug flags but unsetting it will disable *all* debug flags.
+  all = false
diff --git a/sync.sh b/sync.sh
new file mode 100755
index 000000000000..a72a4defd47d
--- /dev/null
+++ b/sync.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+local_root=~/.config/nix/
+nixpkgs_root="$(dirname "$0")"
+
+cp "$local_root"/modules/pihole-ftl* "$nixpkgs_root"/nixos/modules/services/networking/
+cp "$local_root"/modules/pihole-web* "$nixpkgs_root"/nixos/modules/services/web-apps/
+
+cp -r "$local_root"/pkgs/pihole* "$nixpkgs_root"/pkgs/by-name/pi/
+cp -r "$local_root"/modules/pihole-web* "$nixpkgs_root"/nixos/modules/services/web-apps/

From 0b0066777218ef278546091a78cc173ecaf8be26 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Tue, 4 Apr 2023 22:25:38 +0100
Subject: [PATCH 0923/1497] pihole: init at 6.1

Which is the core admin script for pihole, which modifies the pihole-FTL and
gravity (DNS settings) database.

It requires quite a lot of patching to remove most of the hard-coded absolute
paths, and add the many dependencies the script has.

Patches also remove numerous unnecessary/unsupported operations from the script,
including reinstalling, uninstalling, and updating pihole, pihole-FTL, and
pihole-web.

Some scripts also include the installation scripts for some utilities, so these
utils need to be copied over to the files which are included in the Nix package.
---
 pkgs/by-name/pi/pihole/0001-Remove-sudo.patch |  32 +++
 .../0002-Remove-unsupported-commands.patch    |  67 +++++
 ...ition-of-readonly-variable-utilsfile.patch |  52 ++++
 pkgs/by-name/pi/pihole/package.nix            | 257 ++++++++++++++++++
 4 files changed, 408 insertions(+)
 create mode 100644 pkgs/by-name/pi/pihole/0001-Remove-sudo.patch
 create mode 100644 pkgs/by-name/pi/pihole/0002-Remove-unsupported-commands.patch
 create mode 100644 pkgs/by-name/pi/pihole/0003-Fix-redefinition-of-readonly-variable-utilsfile.patch
 create mode 100644 pkgs/by-name/pi/pihole/package.nix

diff --git a/pkgs/by-name/pi/pihole/0001-Remove-sudo.patch b/pkgs/by-name/pi/pihole/0001-Remove-sudo.patch
new file mode 100644
index 000000000000..f037d2953bea
--- /dev/null
+++ b/pkgs/by-name/pi/pihole/0001-Remove-sudo.patch
@@ -0,0 +1,32 @@
+From a2b3aa45d6e073272608506b1d27e4f43f2b0032 Mon Sep 17 00:00:00 2001
+From: williamvds <william@williamvds.me>
+Date: Sun, 6 Apr 2025 23:00:41 +0100
+Subject: [PATCH 1/3] Remove sudo
+
+Rely on polkit and sensible permissions
+---
+ pihole | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/pihole b/pihole
+index 1d5093c..6afc48a 100755
+--- a/pihole
++++ b/pihole
+@@ -570,14 +570,6 @@ if [[ -z ${USER} ]]; then
+   USER=$(whoami)
+ fi
+ 
+-# Check if the current user is neither root nor pihole and if the command
+-# requires root. If so, exit with an error message.
+-if [[ $EUID -ne 0 && ${USER} != "pihole" && need_root -eq 1 ]];then
+-  echo -e "  ${CROSS} The Pi-hole command requires root privileges, try:"
+-  echo -e "      ${COL_GREEN}sudo pihole $*${COL_NC}"
+-  exit 1
+-fi
+-
+ # Handle redirecting to specific functions based on arguments
+ case "${1}" in
+   "allow" | "allowlist"           ) listFunc "$@";;
+-- 
+2.48.1
+
diff --git a/pkgs/by-name/pi/pihole/0002-Remove-unsupported-commands.patch b/pkgs/by-name/pi/pihole/0002-Remove-unsupported-commands.patch
new file mode 100644
index 000000000000..541d9b487764
--- /dev/null
+++ b/pkgs/by-name/pi/pihole/0002-Remove-unsupported-commands.patch
@@ -0,0 +1,67 @@
+From ab0650484cdd89afb5b60a0a046509ec5ae14375 Mon Sep 17 00:00:00 2001
+From: williamvds <william@williamvds.me>
+Date: Sun, 6 Apr 2025 23:01:30 +0100
+Subject: [PATCH 2/3] Remove unsupported commands
+
+Remove some unsupported maintenance commands, particularly the ones which
+reinstall, update, and uninstall pihole. This is managed by NixOS, after all.
+---
+ pihole | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/pihole b/pihole
+index 6afc48a..cce7c97 100755
+--- a/pihole
++++ b/pihole
+@@ -92,6 +92,7 @@ debugFunc() {
+ }
+ 
+ flushFunc() {
++  unsupportedFunc
+   "${PI_HOLE_SCRIPT_DIR}"/piholeLogFlush.sh "$@"
+   exit 0
+ }
+@@ -102,6 +103,7 @@ arpFunc() {
+ }
+ 
+ updatePiholeFunc() {
++  unsupportedFunc
+   if [ -n "${DOCKER_VERSION}" ]; then
+     unsupportedFunc
+   else
+@@ -137,6 +139,7 @@ chronometerFunc() {
+ 
+ 
+ uninstallFunc() {
++  unsupportedFunc
+   if [ -n "${DOCKER_VERSION}" ]; then
+     unsupportedFunc
+   else
+@@ -405,6 +408,7 @@ tailFunc() {
+ }
+ 
+ piholeCheckoutFunc() {
++  unsupportedFunc
+   if [ -n "${DOCKER_VERSION}" ]; then
+     echo -e "${CROSS} Function not supported in Docker images"
+     echo "Please build a custom image following the steps at"
+@@ -460,13 +464,14 @@ tricorderFunc() {
+ }
+ 
+ updateCheckFunc() {
++  unsupportedFunc
+   "${PI_HOLE_SCRIPT_DIR}"/updatecheck.sh "$@"
+   exit 0
+ }
+ 
+ unsupportedFunc(){
+-  echo "Function not supported in Docker images"
+-  exit 0
++  echo "Function not supported in NixOS"
++  exit 1
+ }
+ 
+ helpFunc() {
+-- 
+2.48.1
+
diff --git a/pkgs/by-name/pi/pihole/0003-Fix-redefinition-of-readonly-variable-utilsfile.patch b/pkgs/by-name/pi/pihole/0003-Fix-redefinition-of-readonly-variable-utilsfile.patch
new file mode 100644
index 000000000000..62c67c026ded
--- /dev/null
+++ b/pkgs/by-name/pi/pihole/0003-Fix-redefinition-of-readonly-variable-utilsfile.patch
@@ -0,0 +1,52 @@
+From cca2f6437e3ba09019b8fcb1986b4558d7c6db4e Mon Sep 17 00:00:00 2001
+From: williamvds <william@williamvds.me>
+Date: Sat, 31 May 2025 13:43:42 +0100
+Subject: [PATCH 3/3] Fix redefinition of readonly variable utilsfile
+
+---
+ advanced/Scripts/api.sh |  2 +-
+ pihole                  | 10 +++-------
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/advanced/Scripts/api.sh b/advanced/Scripts/api.sh
+index 613a8d8..8720043 100755
+--- a/advanced/Scripts/api.sh
++++ b/advanced/Scripts/api.sh
+@@ -19,7 +19,7 @@
+ 
+ TestAPIAvailability() {
+ 
+-    local chaos_api_list authResponse authStatus authData apiAvailable DNSport
++    local chaos_api_list authResponse authStatus authData apiAvailable DNSport utilsfile
+ 
+     # as we are running locally, we can get the port value from FTL directly
+     readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
+diff --git a/pihole b/pihole
+index cce7c97..d63d064 100755
+--- a/pihole
++++ b/pihole
+@@ -16,18 +16,14 @@ readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
+ # error due to modifying a readonly variable.
+ PI_HOLE_BIN_DIR="/usr/local/bin"
+ 
+-readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
+ # shellcheck source=./advanced/Scripts/COL_TABLE
+-source "${colfile}"
++source "${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
+ 
+-readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
+ # shellcheck source=./advanced/Scripts/utils.sh
+-source "${utilsfile}"
++source "${PI_HOLE_SCRIPT_DIR}/utils.sh"
+ 
+-# Source api functions
+-readonly apifile="${PI_HOLE_SCRIPT_DIR}/api.sh"
+ # shellcheck source=./advanced/Scripts/api.sh
+-source "${apifile}"
++source "${PI_HOLE_SCRIPT_DIR}/api.sh"
+ 
+ versionsfile="/etc/pihole/versions"
+ if [ -f "${versionsfile}" ]; then
+-- 
+2.48.1
+
diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
new file mode 100644
index 000000000000..d1c6f575b053
--- /dev/null
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -0,0 +1,257 @@
+{
+  lib,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  installShellFiles,
+  bash,
+  coreutils,
+  curl,
+  dig,
+  gawk,
+  getent,
+  glibc,
+  gnugrep,
+  gnused,
+  iproute2,
+  jq,
+  killall,
+  libidn2,
+  locale,
+  ncurses,
+  netcat,
+  nettools,
+  pihole-ftl,
+  procps,
+  resholve,
+  sqlite,
+  systemd,
+  util-linux,
+  stateDir ? "/etc/pihole",
+  ...
+}:
+
+(resholve.mkDerivation rec {
+  pname = "pihole";
+  version = "6.1";
+
+  src = fetchFromGitHub {
+    owner = "pi-hole";
+    repo = "pi-hole";
+    tag = "v${version}";
+    hash = "sha256-aEnv8Lhb5vf0yDyuriVTaUY1wcdVmTdqoK+KDHvT/Lw=";
+  };
+
+  patches = [
+    # Remove use of sudo in the original script, prefer to use a wrapper
+    ./0001-Remove-sudo.patch
+    # Disable unsupported subcommands, particularly those for imperatively installing/upgrading Pi-hole
+    ./0002-Remove-unsupported-commands.patch
+    # Fix a readonly variable error caused by defining a shadowing local variable
+    ./0003-Fix-redefinition-of-readonly-variable-utilsfile.patch
+  ];
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    installShellFiles
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    readonly scriptsDir=$out/usr/share/pihole
+
+    install -Dm 555 -t $out/bin pihole
+    install -Dm 555 -t $scriptsDir/advanced/Scripts gravity.sh
+
+    # The installation script is sourced by advanced/Scripts/piholeARPTable.sh etc
+    cp --parents -r -t $scriptsDir/ 'automated install/' advanced/{Scripts,Templates}/
+
+    installShellCompletion --bash --name pihole.bash \
+      advanced/bash-completion/pihole
+
+    runHook postInstall
+  '';
+
+  solutions.default =
+    let
+      out = builtins.placeholder "out";
+      scriptsDir = "${out}/usr/share/pihole/advanced/Scripts";
+    in
+    {
+      scripts =
+        let
+          relativeScripts = "usr/share/pihole/advanced/Scripts";
+        in
+        [
+          "bin/pihole"
+          "${relativeScripts}/api.sh"
+          "${relativeScripts}/database_migration/gravity-db.sh"
+          "${relativeScripts}/gravity.sh"
+          "${relativeScripts}/list.sh"
+          "${relativeScripts}/piholeARPTable.sh"
+          "${relativeScripts}/piholeCheckout.sh"
+          "${relativeScripts}/piholeDebug.sh"
+          "${relativeScripts}/piholeLogFlush.sh"
+          "${relativeScripts}/query.sh"
+          "${relativeScripts}/update.sh"
+          "${relativeScripts}/updatecheck.sh"
+          "${relativeScripts}/utils.sh"
+          "${relativeScripts}/version.sh"
+        ];
+      interpreter = lib.getExe bash;
+      inputs = [
+        # TODO: see if these inputs can help resholving
+        "bin"
+        "usr/share/pihole/advanced/Scripts"
+
+        bash
+        coreutils
+        curl
+        dig
+        gawk
+        getent
+        gnugrep
+        gnused
+        iproute2
+        jq
+        killall
+        libidn2
+        locale
+        ncurses
+        netcat
+        nettools
+        pihole-ftl
+        procps
+        sqlite
+        systemd
+        util-linux
+      ];
+      fake = {
+        source = [
+          "/etc/os-release"
+          "/etc/pihole/versions"
+          "/etc/pihole/setupVars.conf"
+        ];
+        external = [
+          # Used by chronometer.sh to get GPU information on Raspberry Pis
+          "sudo"
+          "vcgencmd"
+          # used by the checkout and update scripts, which are patched out
+          "git"
+          "getenforce"
+          "firewall-cmd"
+          # Conditionally used in Docker builds
+          "service"
+          "lighttpd"
+          # Used in piholeLogFlush.sh
+          "/usr/sbin/logrotate"
+          # Used by teleporter in webpage.sh
+          "php"
+        ];
+      };
+      fix = {
+        "$PI_HOLE_BIN_DIR" = [ "${out}/bin" ];
+        "$PI_HOLE_FILES_DIR" = [ "${out}/usr/share/pihole" ];
+        "$PI_HOLE_INSTALL_DIR" = [ scriptsDir ];
+        "$PI_HOLE_LOCAL_REPO" = [ "${out}/usr/share/pihole" ];
+        "$PI_HOLE_SCRIPT_DIR" = [ scriptsDir ];
+        "$colfile" = [ "${scriptsDir}/COL_TABLE" ];
+        "$coltable" = [ "${scriptsDir}/COL_TABLE" ];
+        "$PIHOLE_COLTABLE_FILE" = [ "${scriptsDir}/COL_TABLE" ];
+        "$utilsfile" = [ "${scriptsDir}/utils.sh" ];
+        "$apifile" = [ "${scriptsDir}/api.sh" ];
+        "$piholeGitDir" = [ "${out}/usr/share/pihole" ];
+        "$PIHOLE_COMMAND" = [ "pihole" ];
+      };
+      keep = {
+        source = [
+          "$pihole_FTL" # Global config file
+          "$setupVars" # Global config file
+          "$PIHOLE_SETUP_VARS_FILE"
+          "$versionsfile" # configuration file, doesn't exist on NixOS
+          "${out}/usr/share/pihole/automated install/basic-install.sh"
+          "${scriptsDir}/COL_TABLE"
+          "${scriptsDir}/database_migration/gravity-db.sh"
+          "${scriptsDir}/gravity.sh"
+          "${scriptsDir}/piholeCheckout.sh"
+          "${scriptsDir}/utils.sh"
+          "${scriptsDir}/api.sh"
+          "/etc/os-release"
+          "/etc/pihole/versions"
+          "/etc/pihole/setupVars.conf"
+          "$cachedVersions"
+        ];
+
+        "$PIHOLE_SETUP_VARS_FILE" = true;
+        "$PKG_INSTALL" = true; # System package manager, patched out
+        "$PKG_MANAGER" = true; # System package manager, patched out
+        "$cmd" = true; # ping or ping6
+        "$program_name" = true; # alias for $1
+        "$svc" = true; # dynamic restart command
+        "${out}/bin/pihole" = true;
+        "${scriptsDir}/api.sh" = true;
+        "${scriptsDir}/gravity.sh" = true;
+        "${scriptsDir}/list.sh" = true;
+        "${scriptsDir}/piholeARPTable.sh" = true;
+        "${scriptsDir}/piholeDebug.sh" = true;
+        "${scriptsDir}/piholeLogFlush.sh" = true;
+        "${scriptsDir}/query.sh" = true;
+        "${scriptsDir}/uninstall.sh" = true;
+        "${scriptsDir}/update.sh" = true;
+        "${scriptsDir}/updatecheck.sh" = true;
+        "${scriptsDir}/version.sh" = true;
+
+        # boolean variables
+        "$addmode" = true;
+        "$noReloadRequested" = true;
+        "$oldAvail" = true;
+        "$verbose" = true;
+        "$web" = true;
+        "$wildcard" = true;
+
+        # Note that this path needs to be quoted due to the whitespace.
+        # TODO: raise upstream resholve issue. pihole scripts specify this path
+        # both quoted and escaped. Resholve apparently requires matching the
+        # literal path, so we need to provide a version with and without the
+        # backslash.
+        "'${out}/usr/share/pihole/automated\\ install/basic-install.sh'" = true;
+        "'${out}/usr/share/pihole/automated install/basic-install.sh'" = true;
+
+        "/etc/.pihole" = true; # Patched with an override
+        "/etc/os-release" = true;
+        "/etc/pihole/versions" = true;
+        "/etc/pihole/setupVars.conf" = true;
+      };
+      execer = [
+        "cannot:${pihole-ftl}/bin/pihole-FTL"
+        "cannot:${iproute2}/bin/ip"
+        "cannot:${systemd}/bin/systemctl"
+        "cannot:${glibc.bin}/bin/ldd"
+        "cannot:${out}/bin/pihole"
+      ];
+    };
+
+  meta = {
+    description = "A black hole for Internet advertisements";
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [ williamvds ];
+    platforms = lib.platforms.linux;
+    mainProgram = "pihole";
+  };
+
+  passthru = {
+    stateDir = stateDir;
+  };
+}).overrideAttrs
+  (old: {
+    # Resholve can't fix the hardcoded absolute paths, so substitute them before resholving
+    preFixup =
+      ''
+        scriptsDir=$out/usr/share/pihole
+
+        substituteInPlace $out/bin/pihole $scriptsDir/advanced/Scripts/*.sh \
+          --replace-quiet /etc/.pihole $scriptsDir \
+          --replace-quiet /opt/pihole $scriptsDir/advanced/Scripts
+      ''
+      + old.preFixup;
+  })

From 725597318e658d4ee775579b0036a26a1e12e17e Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Tue, 4 Apr 2023 22:52:20 +0100
Subject: [PATCH 0924/1497] pihole-web: init at 6.1

---
 pkgs/by-name/pi/pihole-web/package.nix | 51 ++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/pi/pihole-web/package.nix

diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix
new file mode 100644
index 000000000000..905987afd989
--- /dev/null
+++ b/pkgs/by-name/pi/pihole-web/package.nix
@@ -0,0 +1,51 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pihole,
+  pihole-ftl,
+  procps,
+  ...
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pihole-web";
+  version = "6.1";
+
+  src = fetchFromGitHub {
+    owner = "pi-hole";
+    repo = "web";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+h4cPDsTAKR8MM+Za0mp2nOX1cHW8LRlFmLqvrBHfbs=";
+  };
+
+  propagatedBuildInputs = [
+    pihole
+    pihole-ftl
+    procps
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share
+    cp -r -t $out/share *.lp img/ scripts/ style/ vendor/
+
+    mkdir -p $out/share/doc/$name/
+    cp README.md $out/share/doc/$name/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Pi-hole web dashboard displaying stats and more";
+    longDescription = ''
+      Pi-hole's Web interface (based off of AdminLTE) provides a central
+      location to manage your Pi-hole and review the statistics generated by
+      FTLDNS.
+    '';
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [ williamvds ];
+    platforms = lib.platforms.linux;
+  };
+})

From 4bdf75f1cb5c2238482ec86b3dadfafb034a0900 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Tue, 4 Apr 2023 23:38:04 +0100
Subject: [PATCH 0925/1497] dnsmasq: pass through config file as an option

So that the pihole module reuse it. pihole-ftl is a fork of dnsmasq and its
configuration file is compatible.
---
 nixos/modules/services/networking/dnsmasq.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 92cd2c7caed7..b345b51d4bda 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -115,6 +115,12 @@ in
         '';
       };
 
+      configFile = lib.mkOption {
+        type = lib.types.package;
+        default = dnsmasqConf;
+        internal = true;
+      };
+
     };
 
   };
@@ -172,7 +178,7 @@ in
       serviceConfig = {
         Type = "dbus";
         BusName = "uk.org.thekelleys.dnsmasq";
-        ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
+        ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${cfg.configFile}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         PrivateTmp = true;
         ProtectSystem = true;

From 8f5d24c1b2a48fc4d304e36b02a595bb8d5b50b9 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Mon, 28 Apr 2025 22:22:01 +0100
Subject: [PATCH 0926/1497] nixos/pihole-ftl: init

Add a module for pihole-ftl, which allows declaratively defining the
pihole.toml config file.

Also provide options for adlists to use, which can be added through the pihole
script (packaged as "pihole"). Other state such as clients and groups require
complex database operations, which is normally performed by the pihole
webapp (packaged as "pihole-web").

Extend the dnsmasq module to avoid duplication, since pihole-ftl is a soft-fork
of dnsmasq which maintains compatibility.

Provide the pihole script in `environment.systemPackages` so pihole-ftl can be
easily administrated.
---
 nixos/doc/manual/redirects.json               |  15 +
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../networking/pihole-ftl-setup-script.nix    |  82 +++
 .../modules/services/networking/pihole-ftl.md | 128 +++++
 .../services/networking/pihole-ftl.nix        | 483 ++++++++++++++++++
 6 files changed, 711 insertions(+)
 create mode 100644 nixos/modules/services/networking/pihole-ftl-setup-script.nix
 create mode 100644 nixos/modules/services/networking/pihole-ftl.md
 create mode 100644 nixos/modules/services/networking/pihole-ftl.nix

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 44ab6c6b860c..080756744e56 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -56,6 +56,12 @@
   "module-services-opencloud-basic-usage": [
     "index.html#module-services-opencloud-basic-usage"
   ],
+  "module-services-networking-pihole-ftl-configuration-inherit-dnsmasq": [
+    "index.html#module-services-networking-pihole-ftl-configuration-inherit-dnsmasq"
+  ],
+  "module-services-networking-pihole-ftl-configuration-multiple-interfaces": [
+    "index.html#module-services-networking-pihole-ftl-configuration-multiple-interfaces"
+  ],
   "module-services-strfry": [
     "index.html#module-services-strfry"
   ],
@@ -1448,6 +1454,15 @@
   "module-services-input-methods-kime": [
     "index.html#module-services-input-methods-kime"
   ],
+  "module-services-networking-pihole-ftl": [
+    "index.html#module-services-networking-pihole-ftl"
+  ],
+  "module-services-networking-pihole-ftl-administration": [
+    "index.html#module-services-networking-pihole-ftl-administration"
+  ],
+  "module-services-networking-pihole-ftl-configuration": [
+    "index.html#module-services-networking-pihole-ftl-configuration"
+  ],
   "ch-profiles": [
     "index.html#ch-profiles"
   ],
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 07322ea56669..ce146d0cdedf 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -13,6 +13,8 @@
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 
+- [Pi-hole](https://pi-hole.net/), a DNS sinkhole for advertisements based on Dnsmasq. Available as [services.pihole-ftl](#opt-services.pihole-ftl.enable), and [services.pihole-web](#opt-services.pihole-web.enable) for the web GUI and API.
+
 - [FileBrowser](https://filebrowser.org/), a web application for managing and sharing files. Available as [services.filebrowser](#opt-services.filebrowser.enable).
 
 - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 79f5c22f5b98..303781f6645e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1268,6 +1268,7 @@
   ./services/networking/pdnsd.nix
   ./services/networking/peroxide.nix
   ./services/networking/picosnitch.nix
+  ./services/networking/pihole-ftl.nix
   ./services/networking/pixiecore.nix
   ./services/networking/pleroma.nix
   ./services/networking/powerdns.nix
diff --git a/nixos/modules/services/networking/pihole-ftl-setup-script.nix b/nixos/modules/services/networking/pihole-ftl-setup-script.nix
new file mode 100644
index 000000000000..50236a9a49e2
--- /dev/null
+++ b/nixos/modules/services/networking/pihole-ftl-setup-script.nix
@@ -0,0 +1,82 @@
+{
+  cfg,
+  config,
+  lib,
+  pkgs,
+}:
+
+let
+  pihole = pkgs.pihole;
+  makePayload =
+    list:
+    builtins.toJSON {
+      inherit (list) type enabled;
+      address = list.url;
+      comment = list.description;
+    };
+  payloads = map makePayload cfg.lists;
+in
+''
+  # Can't use -u (unset) because api.sh uses API_URL before it is set
+  set -eo pipefail
+  pihole="${lib.getExe pihole}"
+  jq="${lib.getExe pkgs.jq}"
+
+  # If the database doesn't exist, it needs to be created with gravity.sh
+  if [ ! -f '${cfg.stateDirectory}'/gravity.db ]; then
+    $pihole -g
+    # Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one
+    ${pkgs.procps}/bin/kill -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
+  fi
+
+  source ${pihole}/usr/share/pihole/advanced/Scripts/api.sh
+  source ${pihole}/usr/share/pihole/advanced/Scripts/utils.sh
+
+  any_failed=0
+
+  addList() {
+    local payload="$1"
+
+    echo "Adding list: $payload"
+    local result=$(PostFTLData "lists" "$payload")
+
+    local error="$($jq '.error' <<< "$result")"
+    if [[ "$error" != "null" ]]; then
+        echo "Error: $error"
+        any_failed=1
+        return
+    fi
+
+    id="$($jq '.lists.[].id?' <<< "$result")"
+    if [[ "$id" == "null" ]]; then
+        any_failed=1
+        error="$($jq '.processed.errors.[].error' <<< "$result")"
+        echo "Error: $error"
+        return
+    fi
+
+    echo "Added list ID $id: $result"
+  }
+
+  for i in 1 2 3; do
+    (TestAPIAvailability) && break
+    echo "Retrying API shortly..."
+    ${pkgs.coreutils}/bin/sleep .5s
+  done;
+
+  LoginAPI
+
+  ${builtins.concatStringsSep "\n" (
+    map (
+      payload:
+      lib.pipe payload [
+        lib.strings.escapeShellArg
+        (payload: "addList ${payload}")
+      ]
+    ) payloads
+  )}
+
+  # Run gravity.sh to load any new lists
+  $pihole -g
+  exit $any_failed
+''
diff --git a/nixos/modules/services/networking/pihole-ftl.md b/nixos/modules/services/networking/pihole-ftl.md
new file mode 100644
index 000000000000..4a1b1f986708
--- /dev/null
+++ b/nixos/modules/services/networking/pihole-ftl.md
@@ -0,0 +1,128 @@
+# pihole-FTL {#module-services-networking-pihole-ftl}
+
+*Upstream documentation*: <https://docs.pi-hole.net/ftldns/>
+
+pihole-FTL is a fork of [Dnsmasq](index.html#module-services-networking-dnsmasq),
+providing some additional features, including an API for analysis and
+statistics.
+
+Note that pihole-FTL and Dnsmasq cannot be enabled at
+the same time.
+
+## Configuration {#module-services-networking-pihole-ftl-configuration}
+
+pihole-FTL can be configured with [{option}`services.pihole-ftl.settings`](options.html#opt-services.pihole-ftl.settings), which controls the content of `pihole.toml`.
+
+The template pihole.toml is provided in `pihole-ftl.passthru.settingsTemplate`,
+which describes all settings.
+
+Example configuration:
+
+```nix
+{
+  services.pihole-ftl = {
+    enable = true;
+    openFirewallDHCP = true;
+    queryLogDeleter.enable = true;
+    lists = [
+      {
+        url = "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts";
+        # Alternatively, use the file from nixpkgs. Note its contents won't be
+        # automatically updated by Pi-hole, as it would with an online URL.
+        # url = "file://${pkgs.stevenblack-blocklist}/hosts";
+        description = "Steven Black's unified adlist";
+      }
+    ];
+    settings = {
+      dns = {
+        domainNeeded = true;
+        expandHosts = true;
+        interface = "br-lan";
+        listeningMode = "BIND";
+        upstreams = [ "127.0.0.1#5053" ];
+      };
+      dhcp = {
+        active = true;
+        router = "192.168.10.1";
+        start = "192.168.10.2";
+        end = "192.168.10.254";
+        leaseTime = "1d";
+        ipv6 = true;
+        multiDNS = true;
+        hosts = [
+          # Static address for the current host
+          "aa:bb:cc:dd:ee:ff,192.168.10.1,${config.networking.hostName},infinite"
+        ];
+        rapidCommit = true;
+      };
+      misc.dnsmasq_lines = [
+        # This DHCP server is the only one on the network
+        "dhcp-authoritative"
+        # Source: https://data.iana.org/root-anchors/root-anchors.xml
+        "trust-anchor=.,38696,8,2,683D2D0ACB8C9B712A1948B27F741219298D0A450D612C483AF444A4C0FB2B16"
+      ];
+    };
+  };
+}
+```
+
+### Inheriting configuration from Dnsmasq {#module-services-networking-pihole-ftl-configuration-inherit-dnsmasq}
+
+If [{option}`services.pihole-ftl.useDnsmasqConfig`](options.html#opt-services.pihole-ftl.useDnsmasqConfig) is enabled, the configuration [options of the Dnsmasq
+module](index.html#module-services-networking-dnsmasq) will be automatically
+used by pihole-FTL. Note that this may cause duplicate option errors
+depending on pihole-FTL settings.
+
+See the [Dnsmasq
+example](index.html#module-services-networking-dnsmasq-configuration-home) for
+an exemplar Dnsmasq configuration. Make sure to set
+[{option}`services.dnsmasq.enable`](options.html#opt-services.dnsmasq.enable) to false and
+[{option}`services.pihole-ftl.enable`](options.html#opt-services.pihole-ftl.enable) to true instead:
+
+```nix
+{
+  services.pihole-ftl = {
+    enable = true;
+    useDnsmasqConfig = true;
+  };
+}
+```
+
+### Serving on multiple interfaces {#module-services-networking-pihole-ftl-configuration-multiple-interfaces}
+
+Pi-hole's configuration only supports specifying a single interface. If you want
+to configure additional interfaces with different configuration, use
+`misc.dnsmasq_lines` to append extra Dnsmasq options.
+
+```nix
+{
+  services.pihole-ftl = {
+    settings.misc.dnsmasq_lines = [
+        # Specify the secondary interface
+        "interface=enp1s0"
+        # A different device is the router on this network, e.g. the one
+        # provided by your ISP
+        "dhcp-option=enp1s0,option:router,192.168.0.1"
+        # Specify the IPv4 ranges to allocate, with a 1-day lease time
+        "dhcp-range=enp1s0,192.168.0.10,192.168.0.253,1d"
+        # Enable IPv6
+        "dhcp-range=::f,::ff,constructor:enp1s0,ra-names,ra-stateless"
+      ];
+    };
+  };
+}
+```
+
+## Administration {#module-services-networking-pihole-ftl-administration}
+
+*pihole command documentation*: <https://docs.pi-hole.net/main/pihole-command>
+
+Enabling pihole-FTL provides the `pihole` command, which can be used to control
+the daemon and some configuration.
+
+Note that in NixOS the script has been patched to remove the reinstallation,
+update, and Dnsmasq configuration commands. In NixOS, Pi-hole's configuration is
+immutable and must be done with NixOS options.
+
+For more convenient administration and monitoring, see [Pi-hole
+Dashboard](#module-services-web-apps-pihole-web)
diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix
new file mode 100644
index 000000000000..45cd2e5f927b
--- /dev/null
+++ b/nixos/modules/services/networking/pihole-ftl.nix
@@ -0,0 +1,483 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with {
+  inherit (lib)
+    elemAt
+    getExe
+    hasAttrByPath
+    mkEnableOption
+    mkIf
+    mkOption
+    strings
+    types
+    ;
+};
+
+let
+  mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
+
+  cfg = config.services.pihole-ftl;
+
+  piholeScript = pkgs.writeScriptBin "pihole" ''
+    sudo=exec
+    if [[ "$USER" != '${cfg.user}' ]]; then
+      sudo='exec /run/wrappers/bin/sudo -u ${cfg.user}'
+    fi
+    $sudo ${getExe cfg.piholePackage} "$@"
+  '';
+
+  settingsFormat = pkgs.formats.toml { };
+  settingsFile = settingsFormat.generate "pihole.toml" cfg.settings;
+in
+{
+  options.services.pihole-ftl = {
+    enable = mkEnableOption "Pi-hole FTL";
+
+    package = lib.mkPackageOption pkgs "pihole-ftl" { };
+    piholePackage = lib.mkPackageOption pkgs "pihole" { };
+
+    privacyLevel = mkOption {
+      type = types.numbers.between 0 3;
+      description = ''
+        Level of detail in generated statistics. 0 enables full statistics, 3
+        shows only anonymous statistics.
+
+        See [the documentation](https://docs.pi-hole.net/ftldns/privacylevels).
+
+        Also see services.dnsmasq.settings.log-queries to completely disable
+        query logging.
+      '';
+      default = 0;
+      example = "3";
+    };
+
+    openFirewallDHCP = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Open ports in the firewall for pihole-FTL's DHCP server.";
+    };
+
+    openFirewallWebserver = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Open ports in the firewall for pihole-FTL's webserver, as configured in `settings.webserver.port`.
+      '';
+    };
+
+    configDirectory = mkOption {
+      type = types.path;
+      default = "/etc/pihole";
+      internal = true;
+      readOnly = true;
+      description = ''
+        Path for pihole configuration.
+        pihole does not currently support any path other than /etc/pihole.
+      '';
+    };
+
+    stateDirectory = mkOption {
+      type = types.path;
+      default = "/var/lib/pihole";
+      description = ''
+        Path for pihole state files.
+      '';
+    };
+
+    logDirectory = mkOption {
+      type = types.path;
+      default = "/var/log/pihole";
+      description = "Path for Pi-hole log files";
+    };
+
+    settings = mkOption {
+      type = settingsFormat.type;
+      description = ''
+        Configuration options for pihole.toml.
+        See the upstream [documentation](https://docs.pi-hole.net/ftldns/configfile).
+      '';
+    };
+
+    useDnsmasqConfig = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Import options defined in [](#opt-services.dnsmasq.settings) via
+        misc.dnsmasq_lines in Pi-hole's config.
+      '';
+    };
+
+    pihole = mkOption {
+      type = types.package;
+      default = piholeScript;
+      internal = true;
+      description = "Pi-hole admin script";
+    };
+
+    lists =
+      let
+        adlistType = types.submodule {
+          options = {
+            url = mkOption {
+              type = types.str;
+              description = "URL of the domain list";
+            };
+            type = mkOption {
+              type = types.enum [
+                "allow"
+                "block"
+              ];
+              default = "block";
+              description = "Whether domains on this list should be explicitly allowed, or blocked";
+            };
+            enabled = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether this list is enabled";
+            };
+            description = mkOption {
+              type = types.str;
+              description = "Description of the list";
+              default = "";
+            };
+          };
+        };
+      in
+      mkOption {
+        type = with types; listOf adlistType;
+        description = "Deny (or allow) domain lists to use";
+        default = [ ];
+        example = [
+          {
+            url = "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts";
+          }
+        ];
+      };
+
+    user = mkOption {
+      type = types.str;
+      default = "pihole";
+      description = "User to run the service as.";
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "pihole";
+      description = "Group to run the service as.";
+    };
+
+    queryLogDeleter = {
+      enable = mkEnableOption ("Pi-hole FTL DNS query log deleter");
+
+      age = mkOption {
+        type = types.int;
+        default = 90;
+        description = ''
+          Delete DNS query logs older than this many days, if
+          [](#opt-services.pihole-ftl.queryLogDeleter.enable) is on.
+        '';
+      };
+
+      interval = mkOption {
+        type = types.str;
+        default = "weekly";
+        description = ''
+          How often the query log deleter is run. See systemd.time(7) for more
+          information about the format.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !config.services.dnsmasq.enable;
+        message = "pihole-ftl conflicts with dnsmasq. Please disable one of them.";
+      }
+
+      {
+        assertion =
+          builtins.length cfg.lists == 0
+          || (
+            (hasAttrByPath [ "webserver" "port" ] cfg.settings)
+            && !builtins.elem cfg.settings.webserver.port [
+              ""
+              null
+            ]
+          );
+        message = ''
+          The Pi-hole webserver must be enabled for lists set in services.pihole-ftl.lists to be automatically loaded on startup via the web API.
+          services.pihole-ftl.settings.port must be defined, e.g. by enabling services.pihole-web.enable and defining services.pihole-web.port.
+        '';
+      }
+
+      {
+        assertion =
+          builtins.length cfg.lists == 0
+          || !(hasAttrByPath [ "webserver" "api" "cli_pw" ] cfg.settings)
+          || cfg.settings.webserver.api.cli_pw == true;
+        message = ''
+          services.pihole-ftl.settings.webserver.api.cli_pw must be true for lists set in services.pihole-ftl.lists to be automatically loaded on startup.
+          This enables an ephemeral password used by the pihole command.
+        '';
+      }
+    ];
+
+    services.pihole-ftl.settings = lib.mkMerge [
+      # Defaults
+      (mkDefaults {
+        misc.readOnly = true; # Prevent config changes via API or CLI by default
+        webserver.port = ""; # Disable the webserver by default
+        misc.privacyLevel = cfg.privacyLevel;
+      })
+
+      # Move state files to cfg.stateDirectory
+      {
+        # TODO: Pi-hole currently hardcodes dhcp-leasefile this in its
+        # generated dnsmasq.conf, and we can't override it
+        misc.dnsmasq_lines = [
+          # "dhcp-leasefile=${cfg.stateDirectory}/dhcp.leases"
+          # "hostsdir=${cfg.stateDirectory}/hosts"
+        ];
+
+        files = {
+          database = "${cfg.stateDirectory}/pihole-FTL.db";
+          gravity = "${cfg.stateDirectory}/gravity.db";
+          macvendor = "${cfg.stateDirectory}/gravity.db";
+          log.ftl = "${cfg.logDirectory}/FTL.log";
+          log.dnsmasq = "${cfg.logDirectory}/pihole.log";
+          log.webserver = "${cfg.logDirectory}/webserver.log";
+        };
+
+        webserver.tls = "${cfg.stateDirectory}/tls.pem";
+      }
+
+      (lib.optionalAttrs cfg.useDnsmasqConfig {
+        misc.dnsmasq_lines = lib.pipe config.services.dnsmasq.configFile [
+          builtins.readFile
+          (lib.strings.splitString "\n")
+          (builtins.filter (s: s != ""))
+        ];
+      })
+    ];
+
+    systemd.tmpfiles.rules = [
+      "d ${cfg.configDirectory} 0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.stateDirectory} 0700 ${cfg.user} ${cfg.group} - -"
+      "d ${cfg.logDirectory} 0700 ${cfg.user} ${cfg.group} - -"
+    ];
+
+    systemd.services = {
+      pihole-ftl =
+        let
+          setupService = config.systemd.services.pihole-ftl-setup.name;
+        in
+        {
+          description = "Pi-hole FTL";
+
+          after = [ "network.target" ];
+          before = [ setupService ];
+
+          wantedBy = [ "multi-user.target" ];
+          wants = [ setupService ];
+
+          environment = {
+            # Currently unused, but allows the service to be reloaded
+            # automatically when the config is changed.
+            PIHOLE_CONFIG = settingsFile;
+
+            # pihole is executed by the /actions/gravity API endpoint
+            PATH = lib.mkForce (
+              lib.makeBinPath [
+                cfg.piholePackage
+              ]
+            );
+          };
+
+          serviceConfig = {
+            Type = "simple";
+            User = cfg.user;
+            Group = cfg.group;
+            AmbientCapabilities = [
+              "CAP_NET_BIND_SERVICE"
+              "CAP_NET_RAW"
+              "CAP_NET_ADMIN"
+              "CAP_SYS_NICE"
+              "CAP_IPC_LOCK"
+              "CAP_CHOWN"
+              "CAP_SYS_TIME"
+            ];
+            ExecStart = "${getExe cfg.package} no-daemon";
+            Restart = "on-failure";
+            RestartSec = 1;
+            # Hardening
+            NoNewPrivileges = true;
+            PrivateTmp = true;
+            PrivateDevices = true;
+            DevicePolicy = "closed";
+            ProtectSystem = "strict";
+            ProtectHome = "read-only";
+            ProtectControlGroups = true;
+            ProtectKernelModules = true;
+            ProtectKernelTunables = true;
+            ReadWritePaths = [
+              cfg.configDirectory
+              cfg.stateDirectory
+              cfg.logDirectory
+            ];
+            RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+            RestrictNamespaces = true;
+            RestrictRealtime = true;
+            RestrictSUIDSGID = true;
+            MemoryDenyWriteExecute = true;
+            LockPersonality = true;
+          };
+        };
+
+      pihole-ftl-setup = {
+        description = "Pi-hole FTL setup";
+        # Wait for network so lists can be downloaded
+        after = [ "network-online.target" ];
+        requires = [ "network-online.target" ];
+        serviceConfig = {
+          Type = "oneshot";
+          User = cfg.user;
+          Group = cfg.group;
+
+          # Hardening
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          DevicePolicy = "closed";
+          ProtectSystem = "strict";
+          ProtectHome = "read-only";
+          ProtectControlGroups = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ReadWritePaths = [
+            cfg.configDirectory
+            cfg.stateDirectory
+            cfg.logDirectory
+          ];
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          MemoryDenyWriteExecute = true;
+          LockPersonality = true;
+        };
+        script = import ./pihole-ftl-setup-script.nix {
+          inherit
+            cfg
+            config
+            lib
+            pkgs
+            ;
+        };
+      };
+
+      pihole-ftl-log-deleter = mkIf cfg.queryLogDeleter.enable {
+        description = "Pi-hole FTL DNS query log deleter";
+        serviceConfig = {
+          Type = "oneshot";
+          User = cfg.user;
+          Group = cfg.group;
+          # Hardening
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          DevicePolicy = "closed";
+          ProtectSystem = "strict";
+          ProtectHome = "read-only";
+          ProtectControlGroups = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ReadWritePaths = [ cfg.stateDirectory ];
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          MemoryDenyWriteExecute = true;
+          LockPersonality = true;
+        };
+        script =
+          let
+            days = toString cfg.queryLogDeleter.age;
+            database = "${cfg.stateDirectory}/pihole-FTL.db";
+          in
+          ''
+            set -euo pipefail
+
+            echo "Deleting query logs older than ${days} days"
+            ${getExe cfg.package} sqlite3 "${database}" "DELETE FROM query_storage WHERE timestamp <= CAST(strftime('%s', date('now', '-${days} day')) AS INT); select changes() from query_storage limit 1"
+          '';
+      };
+    };
+
+    systemd.timers.pihole-ftl-log-deleter = mkIf cfg.queryLogDeleter.enable {
+      description = "Pi-hole FTL DNS query log deleter";
+      before = [
+        config.systemd.services.pihole-ftl.name
+        config.systemd.services.pihole-ftl-setup.name
+      ];
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = cfg.queryLogDeleter.interval;
+        Unit = "pihole-ftl-log-deleter.service";
+      };
+    };
+
+    networking.firewall = lib.mkMerge [
+      (mkIf cfg.openFirewallDHCP {
+        allowedUDPPorts = [ 53 ];
+        allowedTCPPorts = [ 53 ];
+      })
+
+      (mkIf cfg.openFirewallWebserver {
+        allowedTCPPorts = lib.pipe cfg.settings.webserver.port [
+          (lib.splitString ",")
+          (map (
+            port:
+            lib.pipe port [
+              (builtins.split "[[:alpha:]]+")
+              builtins.head
+              lib.toInt
+            ]
+          ))
+        ];
+      })
+    ];
+
+    users.users.${cfg.user} = {
+      group = cfg.group;
+      isSystemUser = true;
+    };
+
+    users.groups.${cfg.group} = { };
+
+    environment.etc."pihole/pihole.toml" = {
+      source = settingsFile;
+      user = cfg.user;
+      group = cfg.group;
+      mode = "400";
+    };
+
+    environment.systemPackages = [ cfg.pihole ];
+
+    services.logrotate.settings.pihole-ftl = {
+      enable = true;
+      files = [ "${cfg.logDirectory}/FTL.log" ];
+    };
+  };
+
+  meta = {
+    doc = ./pihole-ftl.md;
+    maintainers = with lib.maintainers; [ williamvds ];
+  };
+}

From 727fe21d5dce688c64a17359ae2737fb170ca6b6 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Mon, 28 Apr 2025 22:29:05 +0100
Subject: [PATCH 0927/1497] nixos/pihole-web: init

Pihole's dashboard is a web app which visualises statistics from pihole-FTL
(i.e. dnsmasq), shows query logs, and allows configuration.

With this module, configuration is largely declarative and immutable, so
settings can't be changed, but they can be viewed from the webpage.

The admin page also allows regenerating the DNS ("gravity") database.
---
 nixos/doc/manual/redirects.json               |   6 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/pihole-web.md |  19 ++++
 .../modules/services/web-apps/pihole-web.nix  | 104 ++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/pihole-web.md
 create mode 100644 nixos/modules/services/web-apps/pihole-web.nix

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 080756744e56..bde64c2c14e8 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1463,6 +1463,12 @@
   "module-services-networking-pihole-ftl-configuration": [
     "index.html#module-services-networking-pihole-ftl-configuration"
   ],
+  "module-services-web-apps-pihole-web": [
+    "index.html#module-services-web-apps-pihole-web"
+  ],
+  "module-services-web-apps-pihole-web-configuration": [
+    "index.html#module-services-web-apps-pihole-web-configuration"
+  ],
   "ch-profiles": [
     "index.html#ch-profiles"
   ],
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 303781f6645e..bdcf5021282c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1629,6 +1629,7 @@
   ./services/web-apps/photoprism.nix
   ./services/web-apps/phylactery.nix
   ./services/web-apps/pict-rs.nix
+  ./services/web-apps/pihole-web.nix
   ./services/web-apps/pingvin-share.nix
   ./services/web-apps/pixelfed.nix
   ./services/web-apps/plantuml-server.nix
diff --git a/nixos/modules/services/web-apps/pihole-web.md b/nixos/modules/services/web-apps/pihole-web.md
new file mode 100644
index 000000000000..0c6e89276031
--- /dev/null
+++ b/nixos/modules/services/web-apps/pihole-web.md
@@ -0,0 +1,19 @@
+# Pi-hole Web Dashboard {#module-services-web-apps-pihole-web}
+
+The Pi-hole suite provides a web GUI for controlling and monitoring
+[pihole-FTL](index.html#module-services-networking-pihole-ftl).
+
+## Configuration {#module-services-web-apps-pihole-web-configuration}
+
+Example configuration:
+
+```nix
+{
+  services.pihole-web = {
+    enable = true;
+    ports = [ 80 ];
+  };
+}
+```
+
+The dashboard can be configured using [{option}`services.pihole-ftl.settings`](options.html#opt-services.pihole-ftl.settings), in particular the `webserver` subsection.
diff --git a/nixos/modules/services/web-apps/pihole-web.nix b/nixos/modules/services/web-apps/pihole-web.nix
new file mode 100644
index 000000000000..fe62dec6afed
--- /dev/null
+++ b/nixos/modules/services/web-apps/pihole-web.nix
@@ -0,0 +1,104 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.pihole-web;
+in
+{
+  options.services.pihole-web = {
+    enable = lib.mkEnableOption "Pi-hole dashboard";
+
+    package = lib.mkPackageOption pkgs "pihole-web" { };
+
+    hostName = lib.mkOption {
+      type = lib.types.str;
+      description = "Domain name for the website.";
+      default = "pi.hole";
+    };
+
+    ports =
+      let
+        portType = lib.types.submodule {
+          options = {
+            port = lib.mkOption {
+              type = lib.types.port;
+              description = "Port to bind";
+            };
+            optional = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Skip the port if it cannot be bound";
+            };
+            redirectSSL = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Redirect from this port to the first configured SSL port";
+            };
+            ssl = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Serve SSL on the port";
+            };
+          };
+        };
+      in
+      lib.mkOption {
+        type = lib.types.listOf (
+          lib.types.oneOf [
+            lib.types.port
+            lib.types.str
+            portType
+          ]
+        );
+        description = ''
+          Port(s) for the webserver to serve on.
+
+          If provided as a string, optionally append suffixes to control behaviour:
+
+          - `o`: to make the port is optional - failure to bind will not be an error.
+          - `s`: for the port to be used for SSL.
+          - `r`: for a non-SSL port to redirect to the first available SSL port.
+        '';
+        example = [
+          "80r"
+          "443s"
+        ];
+        apply =
+          values:
+          let
+            convert =
+              value:
+              if (builtins.typeOf) value == "int" then
+                toString value
+              else if builtins.typeOf value == "set" then
+                lib.strings.concatStrings [
+                  (toString value.port)
+                  (lib.optionalString value.optional "o")
+                  (lib.optionalString value.redirectSSL "r")
+                  (lib.optionalString value.ssl "s")
+                ]
+              else
+                value;
+          in
+          lib.strings.concatStringsSep "," (map convert values);
+      };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.pihole-ftl.settings.webserver = {
+      domain = cfg.hostName;
+      port = cfg.ports;
+      paths.webroot = "${cfg.package}/share/";
+      paths.webhome = "/";
+    };
+  };
+
+  meta = {
+    doc = ./pihole-web.md;
+    maintainers = with lib.maintainers; [ williamvds ];
+  };
+}

From faa82381b6ae3289be082394d18cda5acde8413e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Jun 2025 00:11:09 +0200
Subject: [PATCH 0928/1497] mediaelch: fix qt6.9 build

---
 pkgs/applications/misc/mediaelch/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index d815c354f8e6..ab3efadfe3c7 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
 
   cmake,
   qttools,
@@ -57,6 +58,14 @@ stdenv.mkDerivation rec {
       qt5compat
     ];
 
+  patches = [
+    # fix from: https://github.com/Komet/MediaElch/pull/1878
+    (fetchpatch {
+      url = "https://github.com/Komet/MediaElch/commit/dbea12fbf2c1fe603819392aa2a181cffa168548.patch";
+      hash = "sha256-Lv6rvjKbRNr5XrdZhPyw4S4RRCOnfAGhWgcSLo0gqS8=";
+    })
+  ];
+
   cmakeFlags = [
     "-DDISABLE_UPDATER=ON"
     "-DUSE_EXTERN_QUAZIP=ON"

From 49611957b542de4dc8a879aaff896642b35d22e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 22:31:04 +0000
Subject: [PATCH 0929/1497] sleek: 0.4.0 -> 0.5.0

---
 pkgs/by-name/sl/sleek/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix
index b5424eb16d67..915bc745521c 100644
--- a/pkgs/by-name/sl/sleek/package.nix
+++ b/pkgs/by-name/sl/sleek/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sleek";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "nrempel";
     repo = "sleek";
     rev = "v${version}";
-    hash = "sha256-U1ujR+6wW3SKUnjqs/+DrEhu0XRBB8hxGC2pxe3LVbw=";
+    hash = "sha256-4op0EqJWRGEQwXu5DjFBM1ia9nKiE5QTg+pbaeg4+ag=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2P47kVNQPksKyWPtk1XEpVEjFfz7cEvWX0VvlT3nKOc=";
+  cargoHash = "sha256-0AB2Z++WnOQ06CkKIHBydgV4VlLGqhlKGAQ0blPOFPo=";
 
   meta = with lib; {
     description = "CLI tool for formatting SQL";

From f8718e792285b3aa16696caf59265a7790f90302 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 22:32:15 +0000
Subject: [PATCH 0930/1497] ghostfolio: 2.162.0 -> 2.165.0

---
 pkgs/by-name/gh/ghostfolio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index fd4951c0a97a..79d23db32cc8 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.162.0";
+  version = "2.165.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-2j7haypj1Bl0T0ppBCo+KDaMup+1dOuI2xouaJuVtec=";
+    hash = "sha256-3pgYRwTsfHbooW1oEw2LTH1DXYrru7F7XPmWPQs1x0o=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-IYHV7PEyfkGtwpROHITulqBEC6NgA5CumIykKtoamU8=";
+  npmDepsHash = "sha256-x/F9fcQBmK6+xL0N38HIBUi+vkvZ3p8rxxqxpnm7p68=";
 
   nativeBuildInputs = [
     prisma

From 3b3cb2b5a27492cf766dd4fc8a6ba4ff4ba15709 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 23:02:35 +0000
Subject: [PATCH 0931/1497] python3Packages.prophet: 1.1.6 -> 1.1.7

---
 pkgs/development/python-modules/prophet/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 710b3e893d72..b2c97deda3c5 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "prophet";
-  version = "1.1.6";
+  version = "1.1.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "prophet";
-    rev = "v${version}";
-    hash = "sha256-vvSn2sVs6KZsTAKPuq9irlHgM1BmpkG8LJbvcu8ohd0=";
+    tag = "v${version}";
+    hash = "sha256-94hxpfpZN3yvDUu+kM7Oc2Yu8+z0Gv6zqYRAwKXgHk4=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -65,7 +65,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "prophet" ];
 
   meta = {
-    changelog = "https://github.com/facebook/prophet/releases/tag/${src.rev}";
+    changelog = "https://github.com/facebook/prophet/releases/tag/${src.tag}";
     description = "Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth";
     homepage = "https://facebook.github.io/prophet/";
     license = lib.licenses.mit;

From 14ec05570d5336bde2bad5ae56416cbb3ef39850 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 09:15:39 +1000
Subject: [PATCH 0932/1497] mergiraf: 0.8.1 -> 0.10.0 (#413571)

https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.9.0
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.10.0
---
 pkgs/by-name/me/mergiraf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index 3642d9f256e3..64df812e3231 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.8.1";
+  version = "0.10.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HtIrl9q64JLV/ufJ2g9OrQDDOkcwvyn4+l6/dUqwXkw=";
+    hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xe+JbXKOfxj0XSUM3zW0cYkWo22nyTOp+mOudv3UbE4=";
+  cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0=";
 
   nativeCheckInputs = [
     git

From f33be428dde34c1b3be8094822ec37016d684133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Jun 2025 23:27:21 +0000
Subject: [PATCH 0933/1497] traefik: 3.4.0 -> 3.4.1

---
 pkgs/by-name/tr/traefik/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index 581d92c0847f..2dbf47816805 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -8,16 +8,16 @@
 
 buildGo124Module (finalAttrs: {
   pname = "traefik";
-  version = "3.4.0";
+  version = "3.4.1";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-9OCrIkeiqX8Kc21wWDy6cuSOw7l27YzgD/u8IiPc70w=";
+    hash = "sha256-cE4Pivu1wUZqd1i+aYZqirNQse1ExgEV6550CawRwJM=";
     stripRoot = false;
   };
 
-  vendorHash = "sha256-KtLWecErTstGpzByzDRvHXdq9qi9L4Q1iIfy0Lx7EOE=";
+  vendorHash = "sha256-eaeuTYjwv4Pa48YZ2yDOIRDRrSSw6fNhJIN8imV5dNM=";
 
   subPackages = [ "cmd/traefik" ];
 

From e81e6ddb2ca673d2522b99eb03a32f21eed99146 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 May 2025 17:57:33 +0000
Subject: [PATCH 0934/1497] terraform-providers.cloudflare: 5.4.0 -> 5.5.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a5b0ef26ff12..a6de3c7d767b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -261,13 +261,13 @@
     "vendorHash": "sha256-f6sqKzoQAUpCDrpQdMuK1SuLTKrd2PUn/J6VuKxXGZI="
   },
   "cloudflare": {
-    "hash": "sha256-LghaF/2lc8EqTDL0s7pGnF4C/4Vx3GjGzOyg9Fl2LbE=",
+    "hash": "sha256-REHAEG7Ux+Twv0kA13NQpthBdb+LulYm0McquE6gL14=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.4.0",
+    "rev": "v5.5.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-C8KtuuNa2N0u1hTfYFhD/H/MwXS8iIx0gXwEo9BLI+Q="
+    "vendorHash": "sha256-PRzjEL+6XIacWmO4jmCOMsbPF+R3l1VMeUKUR7vPMmQ="
   },
   "cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

From 38f42f21d4d67b0efdaf5ee5835774b6d6042985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 02:59:33 +0000
Subject: [PATCH 0935/1497] terraform-providers.vault: 4.8.0 -> 5.0.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a6de3c7d767b..4b1f67ed2b26 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1409,13 +1409,13 @@
     "vendorHash": "sha256-giqZi1CmuyANNwzW+y9BUUUEfBhFZKkVGAvIPVvZnzE="
   },
   "vault": {
-    "hash": "sha256-6gCpXzvF4p2otwo3dJ8c+EvzbsMZfzVZymb41+hEZoM=",
+    "hash": "sha256-Vqnmw69fktBQhSkj/W0legJ4sHOQP9Moqqi6Z5qYFy4=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
     "owner": "hashicorp",
     "repo": "terraform-provider-vault",
-    "rev": "v4.8.0",
+    "rev": "v5.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-5e6WQ0lByT3BWcuJvG/LYRVeiiIYQDkV4A74CJhiUBA="
+    "vendorHash": "sha256-6gWw4ypQZWPX7VC9cZxHiU/KhTYEdMTZ276B9neGAiI="
   },
   "vcd": {
     "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=",

From ddca576c7de9a00ade93e662a5064244e2a52c1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 05:55:21 +0000
Subject: [PATCH 0936/1497] terraform-providers.kubernetes: 2.36.0 -> 2.37.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4b1f67ed2b26..9e06a46dcd94 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -732,13 +732,13 @@
     "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
   },
   "kubernetes": {
-    "hash": "sha256-4ghGJ3yf17PI498bqLFtKHnx7axNMaf4BHUPQqyjvVk=",
+    "hash": "sha256-JUlthPqYTYlsKyPAjyN9N0A0i8aMJh3tAtwH1vHjzJs=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
     "owner": "hashicorp",
     "repo": "terraform-provider-kubernetes",
-    "rev": "v2.36.0",
+    "rev": "v2.37.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-slDHNiH5CTfzzj1y2BOt8JuL2iBS1irSZBIiP/4QDLE="
+    "vendorHash": "sha256-LeMFN4pOJotTTqakEbVelHSTEb4p7CQIuKzeuX3SZUM="
   },
   "launchdarkly": {
     "hash": "sha256-VL0nijqk61EBKLEHW54a3dH/PE5B+9VRoGJ36TJj7ps=",

From 71bac83c300c75a256ae1eb72fb71dd3ec0aa36a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 4 Jun 2025 01:36:12 +0200
Subject: [PATCH 0937/1497] brave: 1.79.118 -> 1.79.119

---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index ce20dd1c2e0a..dc6d4a182a90 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.79.118";
+  version = "1.79.119";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-OI4B6Uu9TtbV58Eq3854cyC57JZ+j7tBZoDk+zHeeWM=";
+      hash = "sha256-tz3pCToOqsO6SAu5NeUSmO0aRe31qw0sK2OxtkrYGlo=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-4lWsD9OfbgOaallAEc8x3zLSFoBAg4UCjBCiDc7ShDs=";
+      hash = "sha256-8uX8byw/rp+yj6Y2qBemEHGwt4CQepWjVD8F9KuJZbI=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-5yOcEerPleZnRynxMAzeiPPmZAfU6O+wqsBfR+NOvUc=";
+      hash = "sha256-ynLMWSWywJbmURBH60Nf7TJFERPNNzcI/wdW8AFk7ZA=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-3q0vV9cAk8TEWluGYyH3FSw4zKHxl2Dn3eCg2pSs3zU=";
+      hash = "sha256-ERhKzzabN3NiJQMaTLxdtHCbPMDbPifG56aBmAgke5o=";
     };
   };
 

From c9d8892370934acf92c8f3ec8d553124df73b915 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 01:43:39 +0200
Subject: [PATCH 0938/1497] python313Packages.pygame-ce: 2.5.3 -> 2.5.4

Changelog: https://github.com/pygame-community/pygame-ce/releases/tag/2.5.4
---
 pkgs/development/python-modules/pygame-ce/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 386fd25c22c8..c677b9a4654a 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -11,6 +11,7 @@
   cython,
   ninja,
   meson-python,
+  pyproject-metadata,
 
   fontconfig,
   freetype,
@@ -29,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "pygame-ce";
-  version = "2.5.3";
+  version = "2.5.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +39,7 @@ buildPythonPackage rec {
     owner = "pygame-community";
     repo = "pygame-ce";
     tag = version;
-    hash = "sha256-Vl9UwCknbMHdsB1wwo/JqybWz3UbAMegIcO0GpiCxig=";
+    hash = "sha256-joMc3QaQNbZ65pBJ7r5D6lWAGW9eM+e0k/ozOHfQL4U=";
     # Unicode files cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
   };
@@ -65,8 +66,10 @@ buildPythonPackage rec {
 
   postPatch =
     ''
+      # "pyproject-metadata!=0.9.1" was pinned due to https://github.com/pygame-community/pygame-ce/pull/3395
       # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
       substituteInPlace pyproject.toml \
+        --replace-fail '"pyproject-metadata!=0.9.1",' '"pyproject-metadata",' \
         --replace-fail '"meson<=1.7.0",' '"meson",' \
         --replace-fail '"meson-python<=0.17.1",' '"meson-python",' \
         --replace-fail '"ninja<=1.12.1",' "" \
@@ -92,6 +95,7 @@ buildPythonPackage rec {
     setuptools
     ninja
     meson-python
+    pyproject-metadata
   ];
 
   buildInputs = [

From 5cc3552e5a7c934491a22139248dd4818654b91a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 00:29:57 +0000
Subject: [PATCH 0939/1497] python3Packages.shiboken6: 6.9.0 -> 6.9.1

---
 pkgs/development/python-modules/shiboken6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 9cce2a77d10b..6aeafa2d10bd 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.0";
+  version = "6.9.1";
 
   src = fetchurl {
     url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MVtzu3Vw1bnmeTqNP6/R0t1/Q9Ne67AdK1VOogaq2I4=";
+    hash = "sha256-BMcSxbkjSt0Nm1qjwBoMrt5kpVtJYSd1H11SojDP90g=";
   };
 
   sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";

From c99304e8618e2447a54e69e1e197e9a128a889c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 00:37:17 +0000
Subject: [PATCH 0940/1497] libsolv: 0.7.32 -> 0.7.33

---
 pkgs/by-name/li/libsolv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix
index 25103bd9523c..cd0b5e0eb43d 100644
--- a/pkgs/by-name/li/libsolv/package.nix
+++ b/pkgs/by-name/li/libsolv/package.nix
@@ -18,14 +18,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.32";
+  version = "0.7.33";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
     rev = version;
-    hash = "sha256-2cvba2S/3CR+3sMLVEnmTxWYTQSAYZoUIoQHr+GZnyY=";
+    hash = "sha256-jOYz0p5oWMnPtQbpkCIUgw6e0W5PfR6teA9IdjYSghk=";
   };
 
   cmakeFlags =

From 3df1f2c566a535a42f66640e02e1fe9f57a262e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 00:45:13 +0000
Subject: [PATCH 0941/1497] static-web-server: 2.36.1 -> 2.37.0

---
 pkgs/by-name/st/static-web-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 83f1cb8cb49d..86fbb36443cc 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.36.1";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = "static-web-server";
     rev = "v${version}";
-    hash = "sha256-labHPDsPRyF/cxHFoOJ5n+tBFn1KF2QdB/hZnDGWf1Q=";
+    hash = "sha256-haQYouLUaDkYo9c0CA07twaEohgmSa2hn8xJevEVNFU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Sri2NTCN5vIf/5KVI+BtyOBAjkXoGpOJjP2iOh/M5NU=";
+  cargoHash = "sha256-1e3of8qC1cJ9ZZt1mrfe10wjkLzUICS25TDu+HfkTyU=";
 
   # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
   preCheck = ''

From 03dc21f498869f157d879a07cc736ff3088d78b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 00:57:28 +0000
Subject: [PATCH 0942/1497] openlibm: 0.8.6 -> 0.8.7

---
 pkgs/by-name/op/openlibm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix
index be0cb6996efc..09f459ca5fcf 100644
--- a/pkgs/by-name/op/openlibm/package.nix
+++ b/pkgs/by-name/op/openlibm/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openlibm";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "JuliaLang";
     repo = "openlibm";
     rev = "v${version}";
-    sha256 = "sha256-HFSRrTdIhbbSyeU/FSo5e2ZI5tff2ZDEFgYcI412ATU=";
+    sha256 = "sha256-fSEszCJ1PXkSydTLk8KAyu7zffUrKf+7a1ZDf3Wl/lE=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From d624852d0cd426d4bfe311390463ccc7250585a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 3 Jun 2025 18:05:30 -0700
Subject: [PATCH 0943/1497] nixos/tests/vaultwarden: fix

---
 nixos/tests/vaultwarden.nix | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix
index ce1e1de21abe..69436044ce47 100644
--- a/nixos/tests/vaultwarden.nix
+++ b/nixos/tests/vaultwarden.nix
@@ -53,45 +53,38 @@ let
               driver = Firefox(options=options)
 
               driver.implicitly_wait(20)
-              driver.get('http://localhost:8080/#/register')
+              driver.get('http://localhost:8080/#/signup')
 
               wait = WebDriverWait(driver, 10)
 
               wait.until(EC.title_contains("Vaultwarden Web"))
 
-              driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_email').send_keys(
+              driver.find_element(By.CSS_SELECTOR, 'input#register-start_form_input_email').send_keys(
                   '${userEmail}'
               )
-              driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_name').send_keys(
+              driver.find_element(By.CSS_SELECTOR, 'input#register-start_form_input_name').send_keys(
                   'A Cat'
               )
-              driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_master-password').send_keys(
+              driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click()
+              driver.find_element(By.CSS_SELECTOR, 'input#input-password-form_new-password').send_keys(
                   '${userPassword}'
               )
-              driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys(
+              driver.find_element(By.CSS_SELECTOR, 'input#input-password-form_confirm-new-password').send_keys(
                   '${userPassword}'
               )
-              if driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').is_selected():
-                  driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').click()
+              if driver.find_element(By.XPATH, '//input[@formcontrolname="checkForBreaches"]').is_selected():
+                  driver.find_element(By.XPATH, '//input[@formcontrolname="checkForBreaches"]').click()
 
               driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click()
 
-              wait.until_not(EC.title_contains("Create account"))
+              wait.until_not(EC.title_contains("Set a strong password"))
 
-              driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click()
+              click_when_unobstructed((By.XPATH, "//button[contains(., 'New item')]"))
 
-              driver.find_element(By.XPATH, '//input[@type="password"]').send_keys(
-                  '${userPassword}'
-              )
-              driver.find_element(By.XPATH, "//button[contains(., 'Log in with master password')]").click()
-
-              click_when_unobstructed((By.CSS_SELECTOR, 'button#newItemDropdown'))
-              driver.find_element(By.XPATH, "//button[contains(., 'Item')]").click()
-
-              driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
+              driver.find_element(By.XPATH, '//input[@formcontrolname="name"]').send_keys(
                   'secrets'
               )
-              driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys(
+              driver.find_element(By.XPATH, '//input[@formcontrolname="password"]').send_keys(
                   '${storedPassword}'
               )
 

From f0238f9ae6e892f227338ea7da43cb9b6f21727f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 01:57:42 +0000
Subject: [PATCH 0944/1497] vscodium: 1.100.23258 -> 1.100.33714

---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index f2c2c072bf92..e72dacf46971 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-6/ECgQbl7r4KI66BApOijIdJJP4nlDEgRE1JEMJcSDk=";
-      x86_64-darwin = "sha256-t68Wkwo6p/S0hTf8BiR95nHC4qOLVtBkU0u3dco+jEc=";
-      aarch64-linux = "sha256-KJ74qd0xOQV9EkoIdWGLCr57ZYJ9U0F2zyW6y9zWSY4=";
-      aarch64-darwin = "sha256-CPPIYDxDiF07SdRaOe2Cp8fl4YvbVPeaVqobo0PZyrY=";
-      armv7l-linux = "sha256-ob2Xlgvsk6KFo9stlmuGTPPRyXQpBUACuq5q48haGxs=";
+      x86_64-linux = "sha256-4zLMqwIFMfeZBuHDmaORx+BK9vqxe0SMwSKUyqVYtb8=";
+      x86_64-darwin = "sha256-RzvRknMzZPdM2sd/nRIYSWN7TUJ/uBl3NL4H3+ckAUI=";
+      aarch64-linux = "sha256-rfsfgWmX24783VM9srcCZHNIeCSV1I9J7NoFjtXqdBc=";
+      aarch64-darwin = "sha256-3fcO8Wy0703j4y2TCe6O5tSuAMSW3kLzxrZ5ztgN9r8=";
+      armv7l-linux = "sha256-7Qk0V7sZeBohqCp1ciEtccGj073ZYXvvLsxMZ40ZqFg=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.100.23258";
+  version = "1.100.33714";
   pname = "vscodium";
 
   executableName = "codium";

From c0bd4813468cda92b87f7581ce271f734e573455 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 02:22:12 +0000
Subject: [PATCH 0945/1497] terraform-providers.spacelift: 1.22.0 -> 1.24.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9e06a46dcd94..3c534ec20752 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1237,13 +1237,13 @@
     "vendorHash": "sha256-K/44Jio2a1kKYuyI6o/5wwMNRaZvx9zrNEC85v56xdU="
   },
   "spacelift": {
-    "hash": "sha256-uRqZ5GRCP+oxm42cVVUdwUUixKLZbqfd6PjohbF7wNQ=",
+    "hash": "sha256-AptuuQV+uswWPU8ltjqSWqkPWTglPrrUkeVafD+RQ0U=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.22.0",
+    "rev": "v1.24.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-oEamCseBGmETqeBLiBHfh81oQNUHWfTrsegkFijvb20="
+    "vendorHash": "sha256-Tft0YjNUtwDH0SliSseXHqMKB2yzQTsAG1Wfc5ihpvE="
   },
   "spotinst": {
     "hash": "sha256-opJqvsqGqsFz2G+5T2JK1tpDxnFmMCxRVrUNYYnuN7s=",

From 585b0ee15019949efbc01610f4636f916a3b5a7e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 02:25:03 +0000
Subject: [PATCH 0946/1497] vscode-extensions.tekumara.typos-vscode: 0.1.37 ->
 0.1.38

---
 .../extensions/tekumara.typos-vscode/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index ee30e36acd11..28025feb27c9 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -14,19 +14,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-130QnFYclUmvlqWZ62g8/rMZsJF43heXi9thp+RHfLo=";
+        hash = "sha256-pEmDg//DyZvSiJdvqlNH7kuK6Dz3w2tpeAPpUTVCraI=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-K+ZfHzxOwp4lTC0929am/KOs8RdVk5MXGP8JTYP7pX4=";
+        hash = "sha256-Vh7VkYH93wVS+WzGsGZ/w+DzbE5Z4y4KFl2SvmAgcVI=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-H4N/nKWwv9IdQkjHeb1Q5VXoNguWXHZkB0s3MCfG17Y=";
+        hash = "sha256-Lmru00/I43IP9Wf3wtXsnh5rlzWPdvMtNImJzN5ELsg=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-WyO18JIs3FCfcHh6p9YvrCk9SX/vSHQM2uI+AL9zFbo=";
+        hash = "sha256-lh7YX65p/88GeAHAAGHovektYci3sXrXgdSyXJwfUF4=";
       };
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # Please update the corresponding binary (typos-lsp)
     # when updating this extension.
     # See pkgs/by-name/ty/typos-lsp/package.nix
-    version = "0.1.37";
+    version = "0.1.38";
     inherit (extInfo) hash arch;
   };
 

From 92471515db3dfead334570d6a27523252c1d1e8c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 2 Jun 2025 22:05:48 -0400
Subject: [PATCH 0947/1497] xchm: enable on darwin

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/by-name/xc/xchm/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix
index 3472dbfa0d57..cc53ca5f208d 100644
--- a/pkgs/by-name/xc/xchm/package.nix
+++ b/pkgs/by-name/xc/xchm/package.nix
@@ -5,6 +5,7 @@
   autoreconfHook,
   wxGTK32,
   chmlib,
+  desktopToDarwinBundle,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,9 +19,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k=";
   };
 
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
+  nativeBuildInputs =
+    [
+      autoreconfHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      desktopToDarwinBundle
+    ];
 
   buildInputs = [
     wxGTK32
@@ -30,7 +35,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-wx-prefix=${wxGTK32}" ];
 
   preConfigure = ''
-    export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2"
+    export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)"
   '';
 
   meta = with lib; {
@@ -38,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/rzvncj/xCHM";
     license = licenses.gpl2;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     mainProgram = "xchm";
   };
 }

From 4aa2ffe45f432e88a5d39e494f9ba7e74f5cb677 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 02:41:19 +0000
Subject: [PATCH 0948/1497] yanic: 1.7.1 -> 1.7.2

---
 pkgs/by-name/ya/yanic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index ba627d664adc..b3897650a14b 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "yanic";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "FreifunkBremen";
     repo = "yanic";
     rev = "v${version}";
-    hash = "sha256-uqmojpwGFs6inhmKIztYlGFvUS8AjQIYTHSkZcGyEUo=";
+    hash = "sha256-tKFveknZitkVFaLTZzT01SJZq1IPQfXQa7UJewjXjwU=";
   };
 
   vendorHash = "sha256-UYrQwOyWlKxDH5hHKAZCxQbO+eA6JsPuG0SbkWMF/HQ=";

From d30b6266a92efea3c4da2a3f3b76a274114b1594 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 02:43:27 +0000
Subject: [PATCH 0949/1497] wizer: 8.0.0 -> 9.0.0

---
 pkgs/by-name/wi/wizer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix
index d3e3d359def4..ec7c66007ca5 100644
--- a/pkgs/by-name/wi/wizer/package.nix
+++ b/pkgs/by-name/wi/wizer/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wizer";
-  version = "8.0.0";
+  version = "9.0.0";
 
   # the crate does not contain files which are necessary for the tests
   # see https://github.com/bytecodealliance/wizer/commit/3a95e27ce42f1fdaef07b52988e4699eaa221e04
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec {
     owner = "bytecodealliance";
     repo = "wizer";
     tag = "v${version}";
-    hash = "sha256-NaYHrjm5CGPWT5Pa1EdXS9fswj5NDWQye2pBQk+PKuk=";
+    hash = "sha256-q7v5LH3dp7qtgQJ3Ovt0fPP5r82cHghX6925TLfmn3o=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-OI7/PLP0Au7FrQ9KUTBTSE9r8kJBA3gbcHe060KALHw=";
+  cargoHash = "sha256-5P8rkwKAVPEJnpk6M7lH6hBOPV1q4+aIghJBbjas4fE=";
 
   cargoBuildFlags = [
     "--bin"

From fc99eb61ebc5c860b01bad1a9044ab31e029f224 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 03:12:59 +0000
Subject: [PATCH 0950/1497] wasm-tools: 1.232.0 -> 1.233.0

---
 pkgs/by-name/wa/wasm-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 0a9877d93599..389f79ea0d72 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.232.0";
+  version = "1.233.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     rev = "v${version}";
-    hash = "sha256-iEHZXxE/cOs438KVXJ5o7+LobrODKtXGt92TPKxtOpU=";
+    hash = "sha256-Xx5ukiMIMQSptEe035Dq6NWidU/MN/Hxg0C0y6aUCJ0=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
   useFetchCargoVendor = true;
-  cargoHash = "sha256-W01pqmqJWwEOLv/ng0ZRFcPpOPO9s0IqcaEM7IN7v9g=";
+  cargoHash = "sha256-OFF8tUZ5Xhc+GQ2v0gYpAogIHeXjYEDxUn+78WsuHHs=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

From e226f2e6cf505e4a22c0c2ce1c4f272fe344759c Mon Sep 17 00:00:00 2001
From: Tyler Hardin <th020394@gmail.com>
Date: Tue, 3 Jun 2025 23:25:29 -0400
Subject: [PATCH 0951/1497] goose-cli: 1.0.23 -> 1.0.24

---
 pkgs/by-name/go/goose-cli/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index cda7b6abd5e1..c724bef476fe 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -26,17 +26,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "goose-cli";
-  version = "1.0.23";
+  version = "1.0.24";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "goose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jdoopa4pbW3MSgbNmNSp47iiXZF8H2GEgyhpkV1cB4A=";
+    hash = "sha256-pkqZZwA25IszAnaW0G5adUI2NIEqqQnTQRqlqHWgJRg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-We2v/U9pK4O7JVXyVDvHwyrujPLp9jL1m4SKcMg/Hvc=";
+  cargoHash = "sha256-Wct5XnBueG58+A4zZpcKy0vA2Kjwmtk505JZKNPFTDQ=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -66,8 +66,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       # Lazy instance has previously been poisoned
       "--skip=jetbrains::tests::test_capabilities"
       "--skip=jetbrains::tests::test_router_creation"
+      "--skip=logging::tests::test_log_file_name::with_session_name_and_error_capture"
       "--skip=logging::tests::test_log_file_name::with_session_name_without_error_capture"
       "--skip=logging::tests::test_log_file_name::without_session_name"
+      "--skip=developer::tests::test_text_editor_str_replace"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       "--skip=providers::gcpauth::tests::test_load_from_metadata_server"

From 200e3374f2b550c996b7beb3119365d1fee13820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 03:52:33 +0000
Subject: [PATCH 0952/1497] dolt: 1.53.6 -> 1.54.1

---
 pkgs/by-name/do/dolt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 053b64ca72dc..eceb9cce4c70 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.53.6";
+  version = "1.54.1";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-T/o4Fdfyq5kK4wG11Gdfa66iHv2Zb58v1geebFk/Ouc=";
+    sha256 = "sha256-VVINhJRws1WEfSld3E0sAE6jJuQWwmiN1JPL1LZ1dLs=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-irMXQGOsTP/zSyVAYOtWex/H1cdNSthuyPbbR5FwCNI=";
+  vendorHash = "sha256-+UHw4cDcgRtzl8TGXLjUbBkUwJFhnuUbrwy1JUbS1ko=";
   proxyVendor = true;
   doCheck = false;
 

From e635e7424d3dc5ddb872c2b8bb963ba5eb0cd6a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 03:57:45 +0000
Subject: [PATCH 0953/1497] linuxPackages.corefreq: 2.0.3 -> 2.0.5

---
 pkgs/os-specific/linux/corefreq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 0fdb0d350cfe..18efe6dae441 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "corefreq";
-  version = "2.0.3";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
     rev = version;
-    hash = "sha256-3XBcSR2Yud7zZnyHE81S99Wq3gVjXUJixIuPOLzMJpE=";
+    hash = "sha256-9RANWw0zdsNFHdHPc0AjPQTZSlaejChsrZmxNXeBzK0=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From e674c64ff98d5af905349712d60d199dd5de3355 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 12:06:05 +0800
Subject: [PATCH 0954/1497] zx: 8.4.1 -> 8.5.4

Diff: https://github.com/google/zx/compare/8.4.1...8.5.4

Changelog: https://github.com/google/zx/releases/tag/8.5.4
---
 pkgs/by-name/zx/zx/package.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix
index a0dd9812b37e..72907cae3321 100644
--- a/pkgs/by-name/zx/zx/package.nix
+++ b/pkgs/by-name/zx/zx/package.nix
@@ -1,12 +1,11 @@
 {
   lib,
   buildNpmPackage,
-  fetchFromGitHub,
-  nix-update-script,
-  versionCheckHook,
-
-  esbuild,
   buildGoModule,
+  fetchFromGitHub,
+  esbuild,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 let
@@ -16,44 +15,45 @@ let
       buildGoModule (
         args
         // rec {
-          version = "0.25.0";
+          version = "0.25.3";
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
-            rev = "v${version}";
-            hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            tag = "v${version}";
+            hash = "sha256-YYwvz6TCLAtVHsmXLGC+L/CQVAy5qSFU6JS1o5O5Zkg=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
         }
       );
   };
 in
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "zx";
-  version = "8.4.1";
+  version = "8.5.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zx";
-    rev = version;
-    hash = "sha256-jajkHUz+3ujKXbcsfN7y3pwHqAofTgdQHEC29srzs1M=";
+    tag = finalAttrs.version;
+    hash = "sha256-328I8SgBIeTCNFH3Ahm9Zb1OCxwGuhWE/iWmDHElbsA=";
   };
 
-  npmDepsHash = "sha256-OZuJ5akf6l+aVfoPNfYjWDLt1kUgZJv0qMpK/uiRl2Y=";
+  npmDepsHash = "sha256-R0pCoITmLQBj0T1iIXXN4clpEKDn9wkG5Ke0AedgnlQ=";
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
 
-  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
-  ESBUILD_BINARY_PATH = lib.getExe esbuild';
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Tool for writing scripts using JavaScript";
     homepage = "https://github.com/google/zx";
-    changelog = "https://github.com/google/zx/releases/tag/${version}";
+    changelog = "https://github.com/google/zx/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jlbribeiro ];
     mainProgram = "zx";
   };
-}
+})

From 539be36978b3254f33309831779bc8494e0183f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 04:08:48 +0000
Subject: [PATCH 0955/1497] infisical: 0.41.1 -> 0.41.7

---
 pkgs/development/tools/infisical/default.nix | 2 +-
 pkgs/development/tools/infisical/hashes.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index 17fe8ebd50cf..7ff1bf3200e6 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -21,7 +21,7 @@ let
   buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
 
   # the version of infisical
-  version = "0.41.1";
+  version = "0.41.7";
 
   # the platform-specific, statically linked binary
   src =
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index b5fb3b0d21c0..cca4a588e106 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
-, "x86_64-linux": "sha256-n8QBsoU3wK/e6winVWXDzJaCxFrzoq/fQNjrX8+jGgw="
-, "x86_64-darwin": "sha256-nayjevXnmnausGLn27Di/SKhaKQnD69XakochGUsdks="
-, "aarch64-linux": "sha256-2uOiieHrajCY/YGWzr6Gwyt8DcSQ+bBgPife9LV3FlY="
-, "aarch64-darwin": "sha256-N1ddjPZlFvuuwapfQnoFwdRYK036ZdS0p/MLbnbOS0g="
+, "x86_64-linux": "sha256-S/HP4IRwwMiJAkS8ciP+dlUEvfu6/lEk/35nfjKGAO8="
+, "x86_64-darwin": "sha256-RXjch0leSexJUvLlPc6gOda27EABX0sx2YzcH23nd3k="
+, "aarch64-linux": "sha256-mQLcGicdDdNx19zSIijQY9W6bdvjgR9NOCWdV88HGuk="
+, "aarch64-darwin": "sha256-pdhKkE3c+h6tSX9J3CxTfPNOp9+PKfy53KWvVV/HU8k="
 }

From cf50c70d073dd0e437b347e6e9a99159855a3fb1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 12:10:31 +0800
Subject: [PATCH 0956/1497] zug: 0.1.0 -> 0.1.1

Diff: https://github.com/arximboldi/zug/compare/v0.1.0...v0.1.1
---
 pkgs/by-name/zu/zug/package.nix | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix
index 5b66fadc505b..e083adf1c493 100644
--- a/pkgs/by-name/zu/zug/package.nix
+++ b/pkgs/by-name/zu/zug/package.nix
@@ -5,39 +5,44 @@
   fetchpatch,
   cmake,
   boost,
+  catch2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zug";
-  version = "0.1.0";
+  version = "0.1.1";
+
   src = fetchFromGitHub {
     owner = "arximboldi";
     repo = "zug";
-    rev = "v${version}";
-    hash = "sha256-7xTMDhPIx1I1PiYNanGUsK8pdrWuemMWM7BW+NQs2BQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Ti0EurhGQgWSXzSOlH9/Zsp6kQ/+qGjWbfHGTPpfehs=";
   };
+
   patches = [
     (fetchpatch {
       url = "https://github.com/arximboldi/zug/commit/c8c74ada30d931e40636c13763b892f20d3ce1ae.patch";
       hash = "sha256-0x+ScRnziBeyHWYJowcVb2zahkcK2qKrMVVk2twhtHA=";
     })
   ];
-  nativeBuildInputs = [
-    cmake
-  ];
+
+  nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     boost
+    catch2
   ];
-  cmakeFlags = [
-    "-Dzug_BUILD_EXAMPLES=OFF"
-  ];
+
+  cmakeFlags = [ "-Dzug_BUILD_EXAMPLES=OFF" ];
+
   preConfigure = ''
     rm BUILD
   '';
-  meta = with lib; {
+
+  meta = {
     homepage = "https://github.com/arximboldi/zug";
     description = "library for functional interactive c++ programs";
-    maintainers = with maintainers; [ nek0 ];
-    license = licenses.boost;
+    maintainers = with lib.maintainers; [ nek0 ];
+    license = lib.licenses.boost;
   };
-}
+})

From 81545df1650395b1bbe7cb2eefb4d002f1a083d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 04:19:29 +0000
Subject: [PATCH 0957/1497] terraform-providers.sumologic: 3.0.12 -> 3.1.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9e06a46dcd94..28c1792d95ef 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1282,13 +1282,13 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic": {
-    "hash": "sha256-gTBgX1QHZz6qpizt2BP7BvE3j92q+dKhKHhP4bCTfvo=",
+    "hash": "sha256-7UjfkRCYay2bHUrnvLbadjSeCrhm6w6RzvRtUznpTDA=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.0.12",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc="
+    "vendorHash": "sha256-jGGdSKXpg/N80lNsHFt1nU1t3oW5uDphGYHhBZmAgxE="
   },
   "sysdig": {
     "hash": "sha256-oJ51syzDKX7ZO8EJ3Ug1JNRO34N0t4Y8CzAszc5apOM=",

From fa0ef07a4437a336f37fcdd51270aafa412482c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 3 Jun 2025 21:24:13 -0700
Subject: [PATCH 0958/1497] python3Packages.python-picnic-api2: 1.3.0 -> 1.3.1

Diff: https://github.com/codesalatdev/python-picnic-api/compare/refs/tags/v1.3.0...refs/tags/v1.3.1

Changelog: https://github.com/codesalatdev/python-picnic-api/releases/tag/v1.3.1
---
 .../development/python-modules/python-picnic-api2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-picnic-api2/default.nix b/pkgs/development/python-modules/python-picnic-api2/default.nix
index 3a0cffd1ef4e..246a2ce8bb54 100644
--- a/pkgs/development/python-modules/python-picnic-api2/default.nix
+++ b/pkgs/development/python-modules/python-picnic-api2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-picnic-api2";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "codesalatdev";
     repo = "python-picnic-api";
     tag = "v${version}";
-    hash = "sha256-lr8xlSu5kvkNNEM22Pc+PFGs4re+Ytw2ct97h6ydY04=";
+    hash = "sha256-xa3Ir3OcePFwXemHSR78HhebtCVPObo9oM0h9K1DIQk=";
   };
 
   build-system = [ hatchling ];

From 39365a03598d3a190628fc04f4cb8f4c72d0da92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 04:50:27 +0000
Subject: [PATCH 0959/1497] airwindows: 0-unstable-2025-05-18 ->
 0-unstable-2025-05-25

---
 pkgs/by-name/ai/airwindows/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 0048aa8be958..4390bbd5e281 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-05-18";
+  version = "0-unstable-2025-05-25";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "083d3d6df8ce3688fb328fd434e27653fa6433b5";
-    hash = "sha256-Pfh+zVsAqlP7aVtzTzdaTDB0E/d3bJrexsFm6n93ABQ=";
+    rev = "751e1d0163a120ef03d8ece3accdcea6d689c1f5";
+    hash = "sha256-jg1BFKtJH7eNmIrIw1o3NAOGnG8VK/Zq4r2wzyx2VYU=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From 4907a2e2b6607566d6f385d601878e187c4e364e Mon Sep 17 00:00:00 2001
From: Mica <paperdigits@users.noreply.github.com>
Date: Tue, 3 Jun 2025 21:52:46 -0700
Subject: [PATCH 0960/1497] art: 1.24.2 -> 1.25.5 (#412709)

* art: 1.24.2 -> 1.25.5

* Update pkgs/by-name/ar/art/package.nix

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>

* Update meta.

---------

Co-authored-by: emaryn <197520219+emaryn@users.noreply.github.com>
---
 pkgs/by-name/ar/art/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 428aaf9d400e..c759e8c713ea 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromBitbucket,
+  fetchFromGitHub,
   cmake,
   pkg-config,
   util-linux,
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "art";
-  version = "1.24.2";
+  version = "1.25.5";
 
-  src = fetchFromBitbucket {
-    owner = "agriggio";
-    repo = "art";
-    rev = version;
-    hash = "sha256-TpjmmDeXuxnlvCimsq6mZZk15VOVU3WGrPd3vmcIClI=";
+  src = fetchFromGitHub {
+    owner = "artpixls";
+    repo = "ART";
+    tag = version;
+    hash = "sha256-lKjYSKjZSJ9HtbmGWFR0bVv6hLnRzpklq2ueWirJ+Nw=";
   };
 
   nativeBuildInputs = [
@@ -105,9 +105,9 @@ stdenv.mkDerivation rec {
   env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux
 
   meta = {
-    description = "A raw converter based on RawTherapee";
-    homepage = "https://bitbucket.org/agriggio/art/";
-    license = lib.licenses.gpl3Only;
+    description = "Raw converter based on RawTherapee";
+    homepage = "https://art.pixls.us";
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "art";
     platforms = lib.platforms.linux;

From 485c551134273bbd5d1d7a7e8e6185ff4db29512 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 04:53:06 +0000
Subject: [PATCH 0961/1497] atmos: 1.176.0 -> 1.178.0

---
 pkgs/by-name/at/atmos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index a27b93c0c89a..6d0c4361ab78 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "atmos";
-  version = "1.176.0";
+  version = "1.178.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = "atmos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dqCjbaGDIbJyi44OFz4Xuu5fy0jJp1URidO2EV6pD4U=";
+    hash = "sha256-5rChYMwRtJt6jvgzJoU7OkgheJML2vgY/NhJsSE/KCI=";
   };
 
-  vendorHash = "sha256-fk74wLJuRVtw/mOyI2GIyXcX/cC/VX6Bx1rDRFsz95M=";
+  vendorHash = "sha256-0vHX4P33o6HMQ9k4Awd9+sDoLhbq/8YzrW7dkUeoR7Y=";
 
   ldflags = [
     "-s"

From b64be5af0eabf1aeca0317df811bcb3588b1db26 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:53:18 +0800
Subject: [PATCH 0962/1497] zlint: 3.6.4 -> 3.6.6

Diff: https://github.com/zmap/zlint/compare/refs/tags/v3.6.4...refs/tags/v3.6.6

Changelog: https://github.com/zmap/zlint/releases/tag/v3.6.6
---
 pkgs/by-name/zl/zlint/package.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/zl/zlint/package.nix b/pkgs/by-name/zl/zlint/package.nix
index 3268ecc734c2..1368ef17f563 100644
--- a/pkgs/by-name/zl/zlint/package.nix
+++ b/pkgs/by-name/zl/zlint/package.nix
@@ -6,34 +6,33 @@
   zlint,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "zlint";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zlint";
-    tag = "v${version}";
-    hash = "sha256-FFgBRuNvm4Cnjls9y+L256vMGGNu10x7Vh+V9HBon70=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-e17cMR2Zlhramv7RG3oriWTDR+UBjXUl+t8lZtqc34Q=";
   };
 
   modRoot = "v3";
 
-  vendorHash = "sha256-RX7B9RyNmEO9grMR9Mqn1jXDH5sgT0QDvdhXgY1HYtQ=";
+  vendorHash = "sha256-AdJxcJ/qjY6lzoK4PGNjR+7lYAypgCOk6Nt5sqP+ayA=";
 
   postPatch = ''
     # Remove a package which is not declared in go.mod.
     rm -rf v3/cmd/genTestCerts
+    rm -rf v3/cmd/gen_test_crl
   '';
 
-  excludedPackages = [
-    "lints"
-  ];
+  excludedPackages = [ "lints" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
   passthru.tests.version = testers.testVersion {
@@ -41,7 +40,7 @@ buildGoModule rec {
     command = "zlint -version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "X.509 Certificate Linter focused on Web PKI standards and requirements";
     longDescription = ''
       ZLint is a X.509 certificate linter written in Go that checks for
@@ -49,8 +48,8 @@ buildGoModule rec {
       requirements (e.g. CA/Browser Forum Baseline Requirements).
     '';
     homepage = "https://github.com/zmap/zlint";
-    changelog = "https://github.com/zmap/zlint/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ baloo ];
+    changelog = "https://github.com/zmap/zlint/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ baloo ];
   };
-}
+})

From e79889978afb66e778cb16787673366050ead461 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 06:07:39 +0000
Subject: [PATCH 0963/1497] spedread: 2.4.7-fixed -> 2.5.1

---
 pkgs/by-name/sp/spedread/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix
index 050a2461e252..d3953b306ec0 100644
--- a/pkgs/by-name/sp/spedread/package.nix
+++ b/pkgs/by-name/sp/spedread/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spedread";
-  version = "2.4.7-fixed";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "Darazaki";
     repo = "Spedread";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wbSayADL2J+GEJWreiyTWtgXjdXC1bloRq1iHRS0VFc=";
+    hash = "sha256-0VQdiosYd4HBFM1A9jvtQulvgiRwMoClXAVwLhGh6xU=";
   };
 
   postPatch = ''

From 496f1abb7a3103e6d7535390468221565858d834 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 06:09:36 +0000
Subject: [PATCH 0964/1497] json-schema-catalog-rs: 0.1.1 -> 0.2.0

---
 pkgs/by-name/js/json-schema-catalog-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/js/json-schema-catalog-rs/package.nix b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
index 00c40f562221..179906351b01 100644
--- a/pkgs/by-name/js/json-schema-catalog-rs/package.nix
+++ b/pkgs/by-name/js/json-schema-catalog-rs/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "json-schema-catalog-rs";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "roberth";
     repo = "json-schema-catalog-rs";
     tag = finalAttrs.version;
-    hash = "sha256-BbEPpolv2aoKFlfZ6A+CmUlr5sySGIqRlv3rLgf1VkA=";
+    hash = "sha256-AEtE57WYmuTaU1hQUw2NyA+hj9odIktZVQ+mDE2+Sdc=";
   };
 
-  cargoHash = "sha256-YI2LN2DBzC1B5wCZOrGAZi/hkKHoAm6xLkdJ+8DDFo8=";
+  cargoHash = "sha256-fW2sODIFRXcDfzPnmYW0sH/dLe8sbRjQLtLWDlAJPxQ=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 45e224b8d7e48ceb3babe29bafe2701466b2e9d2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:14:30 +0800
Subject: [PATCH 0965/1497] zita-resampler: 1.8.0 -> 1.11.2

---
 pkgs/by-name/zi/zita-resampler/package.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/zi/zita-resampler/package.nix b/pkgs/by-name/zi/zita-resampler/package.nix
index 3f812c470350..274080edc871 100644
--- a/pkgs/by-name/zi/zita-resampler/package.nix
+++ b/pkgs/by-name/zi/zita-resampler/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zita-resampler";
-  version = "1.8.0";
+  version = "1.11.2";
 
   src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI=";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-resampler-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qlxU5pYGmvJvPx/tSpYxE8wSN83f1XrlhCq8sazVSSw=";
   };
 
   makeFlags = [
@@ -21,24 +21,17 @@ stdenv.mkDerivation rec {
   postPatch =
     ''
       cd source
-      substituteInPlace Makefile \
-        --replace 'ldconfig' ""
     ''
     + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
       substituteInPlace Makefile \
-        --replace '-DENABLE_SSE2' ""
+        --replace-fail '-DENABLE_SSE2' ""
     '';
 
-  fixupPhase = ''
-    ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1
-  '';
-
   meta = {
     description = "Resample library by Fons Adriaensen";
-    version = version;
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };
-}
+})

From a22c7aad11d572109b3b75bc43593bcb5b925776 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Jun 2025 08:15:52 +0200
Subject: [PATCH 0966/1497] Revert "nixos/postfix: add slow domain"

---
 nixos/modules/services/mail/postfix.nix | 52 ++-----------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 4936edc3dd25..34c236dcd2a6 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -13,7 +13,7 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
   haveCanonical = cfg.canonical != "";
-  haveTransport = cfg.transport != "" || (cfg.enableSlowDomains && cfg.slowDomains != [ ]);
+  haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
   haveLocalRecipients = cfg.localRecipients != null;
 
@@ -319,20 +319,13 @@ let
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
-  transportFile = pkgs.writeText "postfix-transport" (
-    lib.optionalString (cfg.enableSlowDomains && cfg.slowDomains != [ ]) (
-      lib.concatMapStrings (domain: ''
-        ${domain} slow:
-      '') cfg.slowDomains
-    )
-    + cfg.transport
-  );
   localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (
     lib.concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients
   );
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent;
+  transportFile = pkgs.writeText "postfix-transport" cfg.transport;
   headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks;
 
 in
@@ -557,32 +550,6 @@ in
         '';
       };
 
-      enableSlowDomains = lib.mkEnableOption "slow domains feature for rate limiting specific domains";
-
-      slowDomains = lib.mkOption {
-        type = with lib.types; listOf str;
-        default = [ ];
-        example = [
-          "orange.fr"
-          "gmail.com"
-        ];
-        description = "List of domains to be rate-limited using the slow transport.";
-      };
-
-      slowDomainsConfig = {
-        defaultDestinationRateDelay = lib.mkOption {
-          type = lib.types.str;
-          default = "5s";
-          description = "Default rate delay for destinations.";
-        };
-
-        defaultDestinationConcurrencyLimit = lib.mkOption {
-          type = lib.types.int;
-          default = 3;
-          description = "Concurrency limit for slow destinations.";
-        };
-      };
-
       aliasMapType = lib.mkOption {
         type =
           with lib.types;
@@ -1018,10 +985,7 @@ in
             smtpd_tls_key_file = cfg.sslKey;
 
             smtpd_tls_security_level = lib.mkDefault "may";
-          }
-          // lib.optionalAttrs cfg.enableSlowDomains {
-            default_destination_rate_delay = cfg.slowDomainsConfig.defaultDestinationRateDelay;
-            default_destination_concurrency_limit = cfg.slowDomainsConfig.defaultDestinationConcurrencyLimit;
+
           };
 
         services.postfix.masterConfig =
@@ -1113,14 +1077,6 @@ in
                 lib.concatLists (lib.mapAttrsToList mkKeyVal cfg.submissionOptions);
             };
           }
-          // lib.optionalAttrs cfg.enableSlowDomains {
-            slow = {
-              command = "smtp";
-              type = "unix";
-              private = true;
-              maxproc = 2;
-            };
-          }
           // lib.optionalAttrs cfg.enableSmtp {
             smtp_inet = {
               name = "smtp";
@@ -1172,7 +1128,7 @@ in
       (lib.mkIf haveCanonical {
         services.postfix.mapFiles.canonical = canonicalFile;
       })
-      (lib.mkIf (haveTransport || (cfg.enableSlowDomains && cfg.slowDomains != [ ])) {
+      (lib.mkIf haveTransport {
         services.postfix.mapFiles.transport = transportFile;
       })
       (lib.mkIf haveVirtual {

From b04c2b5800b028b5cfb100e7d80a3d775b526815 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 4 Jun 2025 15:24:33 +0900
Subject: [PATCH 0967/1497] viddy: remove RUSTC_BOOTSTRAP

Upstream prefer stable rust-toolchain since v1.0.0-rc.6

ref: https://github.com/sachaos/viddy/commit/f0e835843e50fda81b79fc4558ebee2d8003e481
---
 pkgs/by-name/vi/viddy/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index de37893373a3..2678cdb37212 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -18,9 +18,6 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-Bp3t/fjaFeouIoKlRvQPVDlc46Ggitfx6HUXE+RZN0A=";
 
-  # requires nightly features
-  env.RUSTC_BOOTSTRAP = 1;
-
   env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script
   env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
 

From 6ad33ff4dc7505d6d8916605195453b14591ca6c Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:21:11 +0800
Subject: [PATCH 0968/1497] znc: refactor

---
 pkgs/applications/networking/znc/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 18a4b9f3ac84..a178c2c455b8 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -21,12 +21,12 @@
   withDebug ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "znc";
   version = "1.8.2";
 
   src = fetchurl {
-    url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz";
+    url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz";
     sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz";
   };
 
@@ -62,14 +62,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Advanced IRC bouncer";
     homepage = "https://wiki.znc.in/ZNC";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       schneefux
       lnl7
     ];
-    license = licenses.asl20;
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
   };
-}
+})

From 42c18cf406465fa1b2ecc058e6213f453075d093 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:21:17 +0800
Subject: [PATCH 0969/1497] zncModules: update

---
 pkgs/applications/networking/znc/modules.nix | 113 ++++++++++---------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index cde866ff60fe..4d7403df0050 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -11,22 +11,34 @@ let
       pname,
       src,
       module_name,
-      buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
-      installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so",
+      buildPhase ? ''
+        runHook preBuild
+
+        ${znc}/bin/znc-buildmod ${module_name}.cpp
+
+        runHook postBuild
+      '',
+      installPhase ? ''
+        runHook preInstall
+
+        install -D ${module_name}.so $out/lib/znc/${module_name}.so
+
+        runHook postInstall
+      '',
       ...
     }:
     stdenv.mkDerivation (
       a
       // {
-        inherit buildPhase;
-        inherit installPhase;
+        inherit buildPhase installPhase;
 
         buildInputs = znc.buildInputs;
 
+        passthru.module_name = module_name;
+
         meta = a.meta // {
           platforms = lib.platforms.unix;
         };
-        passthru.module_name = module_name;
       }
     );
 
@@ -35,41 +47,41 @@ in
 
   backlog = zncDerivation {
     pname = "znc-backlog";
-    version = "unstable-2017-06-13";
+    version = "0-unstable-2018-08-24";
     module_name = "backlog";
 
     src = fetchFromGitHub {
       owner = "FruitieX";
       repo = "znc-backlog";
-      rev = "42e8f439808882d2dae60f2a161eabead14e4b0d";
-      sha256 = "1k7ifpqqzzf2j7w795q4mx1nvmics2higzjqr3mid3lp43sqg5s6";
+      rev = "44314a6aca0409ae59b0d841807261be1159fff4";
+      hash = "sha256-yhoMuwXul6zq4VPGn810PlFwiCUIvvV6wkQupE3svOQ=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Request backlog for IRC channels";
       homepage = "https://github.com/fruitiex/znc-backlog/";
-      license = licenses.asl20;
+      license = lib.licenses.asl20;
       maintainers = [ ];
     };
   };
 
-  clientbuffer = zncDerivation rec {
+  clientbuffer = zncDerivation {
     pname = "znc-clientbuffer";
-    version = "unstable-2021-05-30";
+    version = "0-unstable-2021-05-30";
     module_name = "clientbuffer";
 
     src = fetchFromGitHub {
       owner = "CyberShadow";
       repo = "znc-clientbuffer";
       rev = "9a7465b413b53408f5d7af86e84b1d08efb6bec0";
-      sha256 = "0a3f4j6s5j7p53y42zrgpqyl2zm0jxb69lp24j6mni3licigh254";
+      hash = "sha256-pAj4Iot0RFuNJOLSZFaXoH5BPb4vf0H8KPfIoo0kbig=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "ZNC module for client specific buffers";
       homepage = "https://github.com/CyberShadow/znc-clientbuffer";
-      license = licenses.asl20;
-      maintainers = with maintainers; [
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [
         hrdinka
         szlend
         cybershadow
@@ -77,29 +89,29 @@ in
     };
   };
 
-  clientaway = zncDerivation rec {
+  clientaway = zncDerivation {
     pname = "znc-clientaway";
-    version = "unstable-2017-04-28";
+    version = "0-unstable-2017-04-28";
     module_name = "clientaway";
 
     src = fetchFromGitHub {
-      owner = "kylef";
+      owner = "kylef-archive";
       repo = "znc-contrib";
       rev = "f6724a4a3b16b050088adde0cbeed74f189e5044";
-      sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8";
+      hash = "sha256-KBd78ucRFbgV/jILS1OSsZqqKyjT4RmBfiBTKX8bbUY=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "ZNC clientaway module";
-      homepage = "https://github.com/kylef/znc-contrib";
-      license = licenses.gpl2;
+      homepage = "https://github.com/kylef-archive/znc-contrib";
+      license = lib.licenses.gpl2;
       maintainers = [ ];
     };
   };
 
-  fish = zncDerivation rec {
+  fish = zncDerivation {
     pname = "znc-fish";
-    version = "unstable-2017-06-26";
+    version = "0-unstable-2017-06-26";
     module_name = "fish";
 
     src = fetchFromGitHub {
@@ -107,32 +119,32 @@ in
       owner = "oilslump";
       repo = "znc-fish";
       rev = "7d91467dbb195f7b591567911210523c6087662e";
-      sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm";
+      hash = "sha256-VW/je7vDc9arbrj848T0bbeqP9qx7Az5SMOVecLrxc8=";
     };
 
     meta = {
       description = "ZNC FiSH module";
-      homepage = "https://github.com/dctrwatson/znc-fish";
+      homepage = "https://github.com/oilslump/znc-fish";
       maintainers = [ lib.maintainers.offline ];
     };
   };
 
-  ignore = zncDerivation rec {
+  ignore = zncDerivation {
     pname = "znc-ignore";
-    version = "unstable-2017-04-28";
+    version = "0-unstable-2017-04-28";
     module_name = "ignore";
 
     src = fetchFromGitHub {
       owner = "kylef";
       repo = "znc-contrib";
       rev = "f6724a4a3b16b050088adde0cbeed74f189e5044";
-      sha256 = "0ikd3dzjjlr0gs0ikqfk50msm6mij99ln2rjzqavh58iwzr7n5r8";
+      hash = "sha256-KBd78ucRFbgV/jILS1OSsZqqKyjT4RmBfiBTKX8bbUY=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "ZNC ignore module";
       homepage = "https://github.com/kylef/znc-contrib";
-      license = licenses.gpl2;
+      license = lib.licenses.gpl2;
       maintainers = [ ];
     };
   };
@@ -145,48 +157,48 @@ in
     src = fetchFromGitHub {
       owner = "cocodelabs";
       repo = "znc-palaver";
-      rev = version;
+      tag = version;
       hash = "sha256-8W3uF1PrLQiEZm7JaFrpqmJLSFioa4F4qlM1J6Zua8U=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Palaver ZNC module";
       homepage = "https://github.com/cocodelabs/znc-palaver";
-      license = licenses.mit;
-      maintainers = with maintainers; [ szlend ];
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ szlend ];
     };
   };
 
-  playback = zncDerivation rec {
+  playback = zncDerivation {
     pname = "znc-playback";
-    version = "unstable-2015-08-04";
+    version = "0-unstable-2020-05-10";
     module_name = "playback";
 
     src = fetchFromGitHub {
       owner = "jpnurmi";
       repo = "znc-playback";
-      rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
-      sha256 = "0mgfajljy035051b2sx70i8xrb51zw9q2z64kf85zw1lynihzyh4";
+      rev = "8dd128bfe2b24b2cc6a9ea2e2d28bfaa28d2a833";
+      hash = "sha256-/hmwhrWDYGzjfmTeCB4mk+FABAJNZvREnuxzvzl6uo4=";
     };
 
-    meta = with lib; {
+    meta = {
       description = "Advanced playback module for ZNC";
       homepage = "https://github.com/jpnurmi/znc-playback";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ hrdinka ];
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ hrdinka ];
     };
   };
 
-  privmsg = zncDerivation rec {
+  privmsg = zncDerivation {
     pname = "znc-privmsg";
-    version = "unstable-2015-02-22";
+    version = "0-unstable-2017-04-28";
     module_name = "privmsg";
 
     src = fetchFromGitHub {
       owner = "kylef";
       repo = "znc-contrib";
-      rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
-      sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
+      rev = "f6724a4a3b16b050088adde0cbeed74f189e5044";
+      hash = "sha256-KBd78ucRFbgV/jILS1OSsZqqKyjT4RmBfiBTKX8bbUY=";
     };
 
     meta = {
@@ -197,14 +209,14 @@ in
 
   push = zncDerivation rec {
     pname = "znc-push";
-    version = "unstable-2016-10-12";
+    version = "1.1.0";
     module_name = "push";
 
     src = fetchFromGitHub {
       owner = "jreese";
       repo = "znc-push";
-      rev = "cf08b9e0f483f03c28d72dd78df932cbef141f10";
-      sha256 = "0xpwjw8csyrg736g1jc1n8d6804x6kbdkrvldzhk9ldj4iwqz7ay";
+      tag = "v${version}";
+      hash = "sha256-OS2nIU/DlESpJT82cWhb75TizSO7LQr74CMz09ulKyQ=";
     };
 
     meta = {
@@ -217,5 +229,4 @@ in
       ];
     };
   };
-
 }

From 12322392aaded45aafdcc2ab63b3471f951b0323 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:21:22 +0800
Subject: [PATCH 0970/1497] znc: 1.8.2 -> 1.9.1

---
 pkgs/applications/networking/znc/default.nix | 26 +++++++++++---------
 pkgs/applications/networking/znc/modules.nix | 13 ++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index a178c2c455b8..d2762cdccf7a 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch2,
+  cmake,
   openssl,
   pkg-config,
   withPerl ? false,
@@ -23,22 +23,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "znc";
-  version = "1.8.2";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz";
-    sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz";
+    hash = "sha256-6KfPgOGarVELTigur2G1a8MN+I6i4PZPrc3TA8SJTzw=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "CVE-2024-39844.patch";
-      url = "https://github.com/znc/znc/commit/8cbf8d628174ddf23da680f3f117dc54da0eb06e.patch";
-      hash = "sha256-JeKirXReiCiNDUS9XodI0oHASg2mPDvQYtV6P4L0mHM=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace znc.pc.cmake.in \
+      --replace-fail 'bindir=''${exec_prefix}/@CMAKE_INSTALL_BINDIR@' "bindir=@CMAKE_INSTALL_FULL_BINDIR@" \
+      --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_FULL_LIBDIR@" \
+      --replace-fail 'datadir=''${prefix}/@CMAKE_INSTALL_DATADIR@' "datadir=@CMAKE_INSTALL_FULL_DATADIR@" \
+      --replace-fail 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' "includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@" \
+      --replace-fail 'datarootdir=''${prefix}/@CMAKE_INSTALL_DATAROOTDIR@' "datarootdir=@CMAKE_INSTALL_FULL_DATAROOTDIR@"
+  '';
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
   buildInputs =
     [ openssl ]
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 4d7403df0050..70cea47dcae3 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -3,6 +3,10 @@
   stdenv,
   fetchFromGitHub,
   znc,
+  cmake,
+  pkg-config,
+  python3,
+  which,
 }:
 
 let
@@ -32,6 +36,15 @@ let
       // {
         inherit buildPhase installPhase;
 
+        nativeBuildInputs = [
+          python3
+          which
+          cmake
+          pkg-config
+        ];
+
+        dontUseCmakeConfigure = true;
+
         buildInputs = znc.buildInputs;
 
         passthru.module_name = module_name;

From 415f385d1abadaf4e0f8e64e8b6b347c7d64804e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 06:32:53 +0000
Subject: [PATCH 0971/1497] fluxcd-operator-mcp: 0.21.0 -> 0.22.0

---
 pkgs/by-name/fl/fluxcd-operator-mcp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
index 32792f207d93..d7ce4b4fedb9 100644
--- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "fluxcd-operator-mcp";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
     repo = "fluxcd-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SszWTuK3HVsyc669NThQn5VAVwD/7JQtKtqBJD6cTT0=";
+    hash = "sha256-fpqioVo9UtuyiXUOpHQmsrkssDaseUjllBmsQ7r39Ww=";
   };
 
-  vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";
+  vendorHash = "sha256-uR8FpJTzexFCM5M9K0h+80wlFnC0qNvQ/NMFnrVQWAo=";
 
   ldflags = [
     "-s"

From 117ea0db04ec49365e76874237868fc7e8cb24d2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:34:56 +0800
Subject: [PATCH 0972/1497] zxing: 3.1.0 -> 3.5.3

---
 pkgs/by-name/zx/zxing/package.nix | 36 ++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/zx/zxing/package.nix b/pkgs/by-name/zx/zxing/package.nix
index eae4b10a7be4..1c0a556bbe8a 100644
--- a/pkgs/by-name/zx/zxing/package.nix
+++ b/pkgs/by-name/zx/zxing/package.nix
@@ -4,21 +4,30 @@
   fetchurl,
   jre,
 }:
-stdenv.mkDerivation rec {
-  pname = "zxing";
-  version = "3.1.0";
+
+let
+  version = "3.5.3";
+
   # Maven builds are hard to get right
   core_jar = fetchurl {
-    url = "http://repo1.maven.org/maven2/com/google/zxing/core/${version}/core-${version}.jar";
-    sha256 = "199l4xvlcpafqn69r3k9qjpqkw9lvkl02hzpm0ackvdhl7vk42zh";
+    url = "https://repo1.maven.org/maven2/com/google/zxing/core/${version}/core-${version}.jar";
+    hash = "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=";
   };
+
   javase_jar = fetchurl {
-    url = "http://repo1.maven.org/maven2/com/google/zxing/javase/${version}/javase-${version}.jar";
-    sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq";
+    url = "https://repo1.maven.org/maven2/com/google/zxing/javase/${version}/javase-${version}.jar";
+    hash = "sha256-1leVt4nvrIohVssqS2SNIOWL/gNhMWW7Xc5ocOzveY4=";
   };
-  inherit jre;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zxing";
+  inherit version jre;
+
   dontUnpack = true;
+
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out/lib/java" "$out/bin"
     cp "${core_jar}" "${javase_jar}" "$out/lib/java"
     substituteAll "${./java-zxing.sh}" "$out/bin/java-zxing"
@@ -26,8 +35,15 @@ stdenv.mkDerivation rec {
     substituteAll "${./zxing-cmdline-encoder.sh}" "$out/bin/zxing-cmdline-encoder"
     substituteAll "${./zxing.sh}" "$out/bin/zxing"
     chmod a+x "$out/bin"/*
-    cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done
+    pushd "$out/lib/java"
+    for i in *.jar; do
+      mv "$i" "''${i#*-}"
+    done
+    popd
+
+    runHook postInstall
   '';
+
   meta = {
     description = "1D and 2D code reading library";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
@@ -36,4 +52,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     homepage = "https://github.com/zxing/zxing";
   };
-}
+})

From 135163f3d5de559a8094240e8b0c974cd30a83de Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 01:37:51 +0200
Subject: [PATCH 0973/1497] python3Packages.xformers: 0.0.28.post3 -> 0.0.30

Diff: https://github.com/facebookresearch/xformers/compare/refs/tags/v0.0.28.post3...refs/tags/v0.0.30

Changelog: https://github.com/facebookresearch/xformers/blob/0.0.30/CHANGELOG.md
---
 pkgs/development/python-modules/xformers/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 7b8e9a35f4d1..f54be287aaf6 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -30,7 +30,7 @@
 }:
 let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
-  version = "0.0.28.post3";
+  version = "0.0.30";
 in
 buildPythonPackage {
   pname = "xformers";
@@ -43,8 +43,8 @@ buildPythonPackage {
     owner = "facebookresearch";
     repo = "xformers";
     tag = "v${version}";
-    hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw=";
     fetchSubmodules = true;
+    hash = "sha256-ozaw9z8qnGpZ28LQNtwmKeVnrn7KDWNeJKtT6g6Q/W0=";
   };
 
   patches = [ ./0001-fix-allow-building-without-git.patch ];
@@ -117,11 +117,11 @@ buildPythonPackage {
     # flash-attn
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Collection of composable Transformer building blocks";
     homepage = "https://github.com/facebookresearch/xformers";
     changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

From c14567aad67cf2a63cfec39ef0a0da97aa87fb3d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 09:01:58 +0200
Subject: [PATCH 0974/1497] python3Packages.xformers: mark as broken on darwin

---
 pkgs/development/python-modules/xformers/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index f54be287aaf6..db01a4abeb48 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -123,5 +123,9 @@ buildPythonPackage {
     changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ happysalada ];
+    badPlatforms = [
+      # fatal error: 'omp.h' file not found
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From 33d0be171f73fa5874e019b044d004b606bc6678 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 07:03:54 +0000
Subject: [PATCH 0975/1497] stellarsolver: 2.6 -> 2.7

---
 pkgs/by-name/st/stellarsolver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stellarsolver/package.nix b/pkgs/by-name/st/stellarsolver/package.nix
index 0417d3cbd2f0..a473e30b18eb 100644
--- a/pkgs/by-name/st/stellarsolver/package.nix
+++ b/pkgs/by-name/st/stellarsolver/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "stellarsolver";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "rlancaste";
     repo = "stellarsolver";
     rev = finalAttrs.version;
-    sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE=";
+    sha256 = "sha256-tASjV5MZ1ClumZqu/R61b6XE9CGTuVFfpxyC89fwN9o=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9e29c0903dc996d6857b7f1c69321cbbfcae8703 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 07:19:28 +0000
Subject: [PATCH 0976/1497] svg2tikz: 3.3.1 -> 3.3.2

---
 pkgs/development/python-modules/svg2tikz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index baeb6b6ccda1..968ecd84f69a 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "svg2tikz";
-  version = "3.3.1";
+  version = "3.3.2";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "xyz2tex";
     repo = "svg2tikz";
     tag = "v${version}";
-    hash = "sha256-LG8u23pEovF05ApjyxA6AebEjmVtxPxpTp9f2DwkwpM=";
+    hash = "sha256-/yILTmF/N+ZJTKsyFI4vicOYlyuhkBgmFguglu3iXlc=";
   };
 
   build-system = [

From e2b75231c99c2874283b8a482eb7d1dc37ebe31a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 07:22:18 +0000
Subject: [PATCH 0977/1497] cargo-udeps: 0.1.55 -> 0.1.56

---
 pkgs/by-name/ca/cargo-udeps/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index 18a8e46589a5..a2fcaad6e1e5 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.55";
+  version = "0.1.56";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = "cargo-udeps";
     rev = "v${version}";
-    sha256 = "sha256-4/JfD2cH46it8PkU58buTHwFXBZI3sytyJCUWl+vSAE=";
+    sha256 = "sha256-W9COzLyE7A/Yp88HTknSSa9WjufwHMgcmlsqwOYSSCw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4fF5nW8G2XMvC2K2nW7fhZL9DvjW4/cZXSCJurSu9NE=";
+  cargoHash = "sha256-ttIzCro9/oiF0ycRG/UzvgMT+3kXhkVAdkNCIVjIc2g=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1dfe36429208328f31017951d09217430a7bd4ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 07:34:42 +0000
Subject: [PATCH 0978/1497] goflow2: 2.2.2 -> 2.2.3

---
 pkgs/by-name/go/goflow2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goflow2/package.nix b/pkgs/by-name/go/goflow2/package.nix
index 61ae91512caf..cd32fd4c7ce6 100644
--- a/pkgs/by-name/go/goflow2/package.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "2.2.2";
+  version = "2.2.3";
 in
 buildGoModule {
   pname = "goflow2";
@@ -14,7 +14,7 @@ buildGoModule {
     owner = "netsampler";
     repo = "goflow2";
     rev = "v${version}";
-    hash = "sha256-H+YeW1FOx4hE8ad8sEWFQPxl8IOZ+xIaiSk1a5w+0+Y=";
+    hash = "sha256-nLsl3v4pvFa0d4AejjlUY9y92yKCU3jM5ui2Y+qZ3JY=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule {
     "-X=main.version=${version}"
   ];
 
-  vendorHash = "sha256-AR4jKNzHato9qz0fkHurGGfIyQC9BYsGQ/87y9mtJpE=";
+  vendorHash = "sha256-E7gWeh8GVFQdxLSZhpl5wAaShooKkC9EJJsulGaoBtE=";
 
   meta = {
     description = "High performance sFlow/IPFIX/NetFlow Collector";

From c07073812d513a796f85076d6ad1aca960d7233a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 09:13:53 +0200
Subject: [PATCH 0979/1497] box2d: 3.1.0 -> 3.1.1

Diff: https://github.com/erincatto/box2d/compare/refs/tags/v3.1.0...refs/tags/v3.1.1

Changelog: https://github.com/erincatto/box2d/releases/tag/v3.1.1
---
 pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch | 6 ++++--
 pkgs/by-name/bo/box2d/package.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch
index dd76023882df..8d0c0eeb4488 100644
--- a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch
+++ b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch
@@ -1,8 +1,8 @@
 diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
-index 5020345..97af8c6 100644
+index 46d5a23..7572b0b 100644
 --- a/samples/CMakeLists.txt
 +++ b/samples/CMakeLists.txt
-@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples")
+@@ -17,49 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples")
  set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests")
  set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install")
  
@@ -43,6 +43,8 @@ index 5020345..97af8c6 100644
 -target_link_libraries(imgui PUBLIC glfw glad)
 -target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends)
 -target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS)
+-# The sample app also uses stb_truetype and this keeps the symbols separate
+-target_compile_definitions(imgui PRIVATE IMGUI_STB_NAMESPACE=imgui_stb)
 -set_target_properties(imgui PROPERTIES
 -	CXX_STANDARD 20
 -    CXX_STANDARD_REQUIRED YES
diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix
index 27da46b1027e..8b3057b0288b 100644
--- a/pkgs/by-name/bo/box2d/package.nix
+++ b/pkgs/by-name/bo/box2d/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "box2d";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "erincatto";
     repo = "box2d";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs=";
+    hash = "sha256-IqQy9A8fWLG9H8ZPmOXeFZDaaks84miRuzXaFlNwm0g=";
   };
 
   patches = [

From 9832a4c0ff1146ef349beea7a686ce39f3ee8c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 3 Jun 2025 22:56:24 +0200
Subject: [PATCH 0980/1497] bruno: fix build

Explanation at
https://github.com/NixOS/nixpkgs/pull/411803#issuecomment-2937157503.
---
 pkgs/by-name/br/bruno/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 690601abe917..5a13b1dfea00 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -38,8 +38,6 @@ buildNpmPackage rec {
   nativeBuildInputs =
     [
       pkg-config
-      jq
-      moreutils
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       makeWrapper
@@ -73,8 +71,8 @@ buildNpmPackage rec {
       --replace-fail "useTelemetry({ version });" ""
 
     # fix version reported in sidebar and about page
-    jq '.version |= "${version}"' packages/bruno-electron/package.json | sponge packages/bruno-electron/package.json
-    jq '.version |= "${version}"' packages/bruno-app/package.json | sponge packages/bruno-app/package.json
+    ${jq}/bin/jq '.version |= "${version}"' packages/bruno-electron/package.json | ${moreutils}/bin/sponge packages/bruno-electron/package.json
+    ${jq}/bin/jq '.version |= "${version}"' packages/bruno-app/package.json | ${moreutils}/bin/sponge packages/bruno-app/package.json
   '';
 
   postConfigure = ''

From 86c5eed4f8e04a8422290e1374ec1341d253f464 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 09:42:46 +0200
Subject: [PATCH 0981/1497] python3Packages.hf-xet: 1.1.2 -> 1.1.3

Diff: https://github.com/huggingface/xet-core/compare/refs/tags/v1.1.2...refs/tags/v1.1.3

Changelog: https://github.com/huggingface/xet-core/releases/tag/v1.1.3
---
 pkgs/development/python-modules/hf-xet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix
index 38f1b4575f73..2d2f2aa5cb84 100644
--- a/pkgs/development/python-modules/hf-xet/default.nix
+++ b/pkgs/development/python-modules/hf-xet/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "hf-xet";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "xet-core";
     tag = "v${version}";
-    hash = "sha256-272xEw5W2Mo7a/OFpPbVNJMNc3TlmAsOdYFVw4HbXYk=";
+    hash = "sha256-Xj9Nq+Pg9sYfe06LyUVicBqnQRYwI/VCSo6n+YrvEnc=";
   };
 
   sourceRoot = "${src.name}/hf_xet";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-wV8qF3EARKkJWGQVhOPjgi7yKL1idRiuZrJ/HnL1BsQ=";
+    hash = "sha256-zJS1jBbE45F1JU0ROGXYJbZGfvuJSn/4GvML5xfhPbk=";
   };
 
   nativeBuildInputs = [

From dd1140d076d30c80206734474e095d44e379754d Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 0982/1497] miniupnpc: fix missing include

---
 pkgs/by-name/mi/miniupnpc/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix
index d49f0c77a468..8c4644f109e1 100644
--- a/pkgs/by-name/mi/miniupnpc/package.nix
+++ b/pkgs/by-name/mi/miniupnpc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   versionCheckHook,
   nixosTests,
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/miniupnpc";
 
+  patches = [
+    # fix missing include
+    # remove on next release
+    (fetchpatch {
+      url = "https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8.patch";
+      hash = "sha256-PHqjruFOcsGT3rdFS/GD3wEvalCmoRY4BtIKFxCjKDw=";
+      stripLen = 1;
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [

From 38e9df562e979fda27f92fbb3c7a02cb5198929a Mon Sep 17 00:00:00 2001
From: PandapipBot <{{ env.EMAIL }}>
Date: Wed, 4 Jun 2025 07:50:54 +0000
Subject: [PATCH 0983/1497] vscode-extensions.reditorsupport.r: 2.8.5 -> 2.8.6

---
 .../editors/vscode/extensions/reditorsupport.r/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
index 86b8bd729f71..85359d2a95ca 100644
--- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "r";
     publisher = "reditorsupport";
-    version = "2.8.5";
-    hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM=";
+    version = "2.8.6";
+    hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y=";
   };
   nativeBuildInputs = [
     jq

From c3da15521ee74729aa9453a96cd7b4e6c5f6316a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 4 Jun 2025 09:56:01 +0200
Subject: [PATCH 0984/1497] nix-direnv: 3.0.7 -> 3.1.0

Fixes problems with nix version check: https://github.com/nix-community/nix-direnv/issues/581
---
 pkgs/by-name/ni/nix-direnv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix
index 0298c0fd3ec3..9db6efeaffbe 100644
--- a/pkgs/by-name/ni/nix-direnv/package.nix
+++ b/pkgs/by-name/ni/nix-direnv/package.nix
@@ -11,13 +11,13 @@
 # https://github.com/abathur/resholve/issues/107
 resholve.mkDerivation rec {
   pname = "nix-direnv";
-  version = "3.0.7";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-direnv";
     rev = version;
-    hash = "sha256-H59MMmyQ9Tl9CLKKkXIv2NZddrrJNLv8XOOI2e4pG64=";
+    hash = "sha256-HdnQRcysoKNPbVa/D3KDcLgqf5+u9JDPmcl29cGj4AI=";
   };
 
   installPhase = ''

From 301d2c810d0f2695b5abf79ae53ab9c9ebdb11c4 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 22 May 2025 15:46:56 +0200
Subject: [PATCH 0985/1497] python313Packages.apsw: switch test suite

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
---
 .../python-modules/apsw/default.nix           | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index ba376163a7e8..1846517a448f 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -1,10 +1,8 @@
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  pytestCheckHook,
   setuptools,
   sqlite,
 }:
@@ -27,19 +25,13 @@ buildPythonPackage rec {
 
   buildInputs = [ sqlite ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pytestFlagsArray = [ "apsw/tests.py" ];
-
-  disabledTests = [
-    # we don't build the test extension
-    "testLoadExtension"
-    "testShell"
-    "testVFS"
-    "testVFSWithWAL"
-    # no lines in errout.txt
-    "testWriteUnraisable"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "testzzForkChecker" ];
+  # apsw explicitly doesn't use pytest
+  # see https://github.com/rogerbinns/apsw/issues/548#issuecomment-2891633403
+  checkPhase = ''
+    runHook preCheck
+    python -m apsw.tests
+    runHook postCheck
+  '';
 
   pythonImportsCheck = [ "apsw" ];
 

From c49514bd47bf309c6fe5fbd546a3efcff4b487d3 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 0986/1497] zam-plugins: fix some cross builds

---
 pkgs/by-name/za/zam-plugins/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix
index 4dde2a42bf9e..1ec23bfff14d 100644
--- a/pkgs/by-name/za/zam-plugins/package.nix
+++ b/pkgs/by-name/za/zam-plugins/package.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs ./dpf/utils/generate-ttl.sh
+    for f in plugins/*/Makefile; do
+      substituteInPlace "$f" \
+        --replace-quiet 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
+    done
   '';
 
   makeFlags = [
@@ -59,5 +63,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
+    # tries to run dpf/utils/lv2_ttl_generator (built for host)
+    broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   };
 }

From 5747e6fc423f994d330924abcec61230704541e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 08:25:22 +0000
Subject: [PATCH 0987/1497] stackit-cli: 0.32.0 -> 0.33.1

---
 pkgs/by-name/st/stackit-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 165d2e86b723..9cdd191c82f3 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.32.0";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-y0NQXfYgaAwMCCjEdUXpVlILqFXQP4+CxaJNjHZKdr8=";
+    hash = "sha256-qWKnGTSlBnorYrOdQCuA4ymb5lyQUhFQkiOG5SowxD8=";
   };
 
-  vendorHash = "sha256-7jsF91XudEG7mkqYcnhSI2D+uHQ4HGX+bzlm3wGR+MA=";
+  vendorHash = "sha256-OiXUvAksFcD6yU8CTzY8QeDkiYbIr5MTfoqwdyC/ITQ=";
 
   subPackages = [ "." ];
 

From 5d2b0bfe6681b353809ad4884127e7811d70809a Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 31 May 2025 07:52:20 +0200
Subject: [PATCH 0988/1497] linux_xanmod: 6.12.30 -> 6.12.31

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 174be9aacc18..f55a45a6d7c5 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.30";
-      hash = "sha256-OqO41rbb3nBegL+ZjgqR0RGwrka6oLv0QOYXJ8Wdpv8=";
+      version = "6.12.31";
+      hash = "sha256-qYbwHt6j2Sh7V1PDjp1oEIKo+k2T5PcRz5MzZgYwbqg=";
     };
     main = {
       version = "6.14.8";

From adec134fc27c6c2b698125c7ab3c20b864c11e51 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 31 May 2025 07:55:24 +0200
Subject: [PATCH 0989/1497] linux_xanmod_latest: 6.14.8 -> 6.14.9

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index f55a45a6d7c5..5182373a8dd4 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-qYbwHt6j2Sh7V1PDjp1oEIKo+k2T5PcRz5MzZgYwbqg=";
     };
     main = {
-      version = "6.14.8";
-      hash = "sha256-ap3NaM/pk+TWg3RBRxFJPwnfv2n042r47bo66jhj3ck=";
+      version = "6.14.9";
+      hash = "sha256-kwMvXdqr1i3UZ3+N/qsQDjU1TvnymS54tCdOLNxL0nc=";
     };
   };
 

From f3befd0575b7876aef266ca4daeffc9bc9138e19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 08:58:15 +0000
Subject: [PATCH 0990/1497] tana: 1.0.31 -> 1.0.32

---
 pkgs/by-name/ta/tana/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index 49fc649df40e..8a1e3fde0b85 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -62,7 +62,7 @@ let
     stdenv.cc.cc
     stdenv.cc.libc
   ];
-  version = "1.0.31";
+  version = "1.0.32";
 in
 stdenv.mkDerivation {
   pname = "tana";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-    hash = "sha256-+KJ2peQWb378h6nWmoj5J4zAmSi4AHvR6fqrjRC/c8w=";
+    hash = "sha256-oAW9Vx4z0TOweKA6bsmCm7DY72pFWBnPLG0dS05oCw8=";
   };
 
   nativeBuildInputs = [

From f9dbeeb519dcfd93fd1698fd4da7662088bc1ba3 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 4 Jun 2025 11:00:14 +0200
Subject: [PATCH 0991/1497] sfcgal: 2.0.0 -> 2.1.0

---
 pkgs/by-name/sf/sfcgal/cmake-fix.patch | 48 --------------------------
 pkgs/by-name/sf/sfcgal/package.nix     |  9 ++---
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/by-name/sf/sfcgal/cmake-fix.patch

diff --git a/pkgs/by-name/sf/sfcgal/cmake-fix.patch b/pkgs/by-name/sf/sfcgal/cmake-fix.patch
deleted file mode 100644
index 1614fe6323f3..000000000000
--- a/pkgs/by-name/sf/sfcgal/cmake-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07a6c2e5..37c33d92 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-   set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
- endif()
- 
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- #SET(CMAKE_MACOSX_RPATH ON)
- 
-@@ -260,6 +260,10 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
- else()
-   set( SFCGAL_LIB_NAME "SFCGAL" )
- endif()
-+
-+if ( UNIX )
-+  include(GNUInstallDirs)
-+endif()
- #set( SFCGAL_LIB_NAME ${${CMAKE_BUILD_TYPE}
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sfcgal-config.in ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config @ONLY)
- install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config DESTINATION bin )
-diff --git a/sfcgal-config.in b/sfcgal-config.in
-index a0e992c5..49615c13 100755
---- a/sfcgal-config.in
-+++ b/sfcgal-config.in
-@@ -1,6 +1,6 @@
- #!/bin/sh
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- 
- usage()
- {
-diff --git a/sfcgal.pc.in b/sfcgal.pc.in
-index 968cb407..bf517d02 100644
---- a/sfcgal.pc.in
-+++ b/sfcgal.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- includedir=${prefix}/include
- 
- Name: sfcgal
diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix
index dc2163ceb568..f863215740d0 100644
--- a/pkgs/by-name/sf/sfcgal/package.nix
+++ b/pkgs/by-name/sf/sfcgal/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sfcgal";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitLab {
     owner = "sfcgal";
     repo = "SFCGAL";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-cx0QJCtAPR/WkWPpH+mZvq2803eDT7b+qlI5ma+CveE=";
+    hash = "sha256-m8oyfL3rF4qLugoEFa8iiqS5D1Oljg+x1qMp9KfiQ5c=";
   };
 
   buildInputs = [
@@ -29,11 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  patches = [
-    # https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/384
-    ./cmake-fix.patch
-  ];
-
   meta = {
     description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations";
     homepage = "https://sfcgal.gitlab.io/SFCGAL/";

From 1f5f844763c9b2895173d1f23e171fe4692df54c Mon Sep 17 00:00:00 2001
From: h0nIg <h0nIg@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:22:32 +0200
Subject: [PATCH 0992/1497] docu

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 04557b36753b..13134c7a4112 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,12 +21,11 @@
 }:
 
 let
+  # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
   # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
   pythonCustom = python3.override {
     self = pythonCustom;
     packageOverrides = _: super: {
-      # include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
-      # remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
       pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
         version = "24.2.1";
         src = old.src.override {

From 021f5eafd81525ce52182091d710e233c30989d8 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:57:29 +0200
Subject: [PATCH 0993/1497] python3Packages.inwx-domrobot: init at 3.2.0

---
 .../python-modules/inwx-domrobot/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/inwx-domrobot/default.nix

diff --git a/pkgs/development/python-modules/inwx-domrobot/default.nix b/pkgs/development/python-modules/inwx-domrobot/default.nix
new file mode 100644
index 000000000000..965a402ecd15
--- /dev/null
+++ b/pkgs/development/python-modules/inwx-domrobot/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "inwx-domrobot";
+  version = "3.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "inwx";
+    repo = "python-client";
+    tag = "v${version}";
+    hash = "sha256-Nbs3xroJD61NbpaiTdjA3VFxzXIlnqmB1d7SJDj8VN8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  # No tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "INWX" ];
+
+  meta = {
+    description = "INWX Domrobot Python Client";
+    homepage = "https://github.com/inwx/python-client";
+    changelog = "https://github.com/inwx/python-client/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.amadejkastelic ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 79acec4ff1e0..fdc75d023e02 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6895,6 +6895,8 @@ self: super: with self; {
 
   invoke = callPackage ../development/python-modules/invoke { };
 
+  inwx-domrobot = callPackage ../development/python-modules/inwx-domrobot { };
+
   iocapture = callPackage ../development/python-modules/iocapture { };
 
   iocextract = callPackage ../development/python-modules/iocextract { };

From 7bf209e2fc10073bdda8abfd16405b6bdf0fa76b Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Tue, 3 Jun 2025 21:58:41 +0200
Subject: [PATCH 0994/1497] python3Packages.certbot-dns-inwx: add missing
 dependency, fix typo and remove usage of with lib

---
 .../python-modules/certbot-dns-inwx/default.nix      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
index 88e0f0c58cb6..d04b7b04391f 100644
--- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
@@ -5,6 +5,7 @@
   setuptools,
   acme,
   certbot,
+  inwx-domrobot,
 }:
 
 buildPythonPackage rec {
@@ -21,23 +22,24 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     acme
     certbot
+    inwx-domrobot
   ];
 
   # Doesn't have any tests
   doCheck = false;
 
-  pytestImportsCheck = [ "certbot_dns_inwx" ];
+  pythonImportsCheck = [ "certbot_dns_inwx" ];
 
-  meta = with lib; {
+  meta = {
     description = "INWX DNS Authenticator plugin for Certbot";
     homepage = "https://github.com/oGGy990/certbot-dns-inwx";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ onny ];
+    maintainers = with lib.maintainers; [ onny ];
   };
 }

From 2437df377415eefcf586a2a6be4f092172b95652 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 4 Jun 2025 11:40:30 +0200
Subject: [PATCH 0995/1497] certbot-full: add certbot-dns-inwx

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a77f483bac66..9d30e27f2091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7911,6 +7911,7 @@ with pkgs;
     cp: with cp; [
       # FIXME unbreak certbot-dns-cloudflare
       certbot-dns-google
+      certbot-dns-inwx
       certbot-dns-ovh
       certbot-dns-rfc2136
       certbot-dns-route53

From 72fd01a97dc99a394e1502c98209b252da499ef4 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Mon, 26 May 2025 18:02:28 +0100
Subject: [PATCH 0996/1497] python3Packages.giturlparse: init at 0.12.0

---
 .../python-modules/giturlparse/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/giturlparse/default.nix

diff --git a/pkgs/development/python-modules/giturlparse/default.nix b/pkgs/development/python-modules/giturlparse/default.nix
new file mode 100644
index 000000000000..6dfd53352672
--- /dev/null
+++ b/pkgs/development/python-modules/giturlparse/default.nix
@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+  unittestCheckHook,
+}:
+buildPythonPackage rec {
+  pname = "giturlparse";
+  version = "0.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nephila";
+    repo = "giturlparse";
+    tag = version;
+    hash = "sha256-VqlsqMLwOtaciBWXphmFAMwtfkWBBNaL1Sdcc8Ltq7k=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  pythonImportsCheck = [ "giturlparse" ];
+
+  meta = {
+    description = "Parse & rewrite git urls (supports GitHub, Bitbucket, Assembla ...)";
+    homepage = "https://github.com/nephila/giturlparse";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ yajo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 120419879471..cf0bb21a8331 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5712,6 +5712,8 @@ self: super: with self; {
 
   gitpython = callPackage ../development/python-modules/gitpython { };
 
+  giturlparse = callPackage ../development/python-modules/giturlparse { };
+
   glad = callPackage ../development/python-modules/glad { };
 
   glad2 = callPackage ../development/python-modules/glad2 { };

From 33c4a9b1a3ae7ea87a7e46ca29d612c1d0cee65d Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo@moduon.team>
Date: Mon, 26 May 2025 18:02:48 +0100
Subject: [PATCH 0997/1497] python3Packages.oca-port: fix dependencies and
 build from source

It now depends on giturlparse. Build was broken because of that.

I took the chance to update to newer build system, and build from source.
---
 .../python-modules/oca-port/default.nix       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix
index 70720e3e130a..71194b3233c0 100644
--- a/pkgs/development/python-modules/oca-port/default.nix
+++ b/pkgs/development/python-modules/oca-port/default.nix
@@ -1,33 +1,35 @@
 {
   buildPythonPackage,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   gitpython,
+  giturlparse,
   lib,
   nix-update-script,
   requests,
   setuptools-scm,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "oca-port";
   version = "0.18";
-  format = "pyproject";
+  pyproject = true;
 
-  src = fetchPypi {
+  src = fetchFromGitHub {
     inherit version;
-    pname = "oca_port";
-    hash = "sha256-JqSnt23SQSyh/7hKAy04k/ocpAN61qQ+VebQv5Ddbjk=";
+    owner = "OCA";
+    repo = "oca-port";
+    tag = "v${version}";
+    hash = "sha256-r32ePlbg0GjryB5HDx0nQTq71lG/o+4sUFRdKW/K5ys=";
   };
 
-  nativeBuildInputs = [
-    setuptools
+  build-system = [
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
+    giturlparse
     gitpython
     requests
   ];
@@ -36,10 +38,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "oca_port" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool helping to port an addon or missing commits of an addon from one branch to another";
     homepage = "https://github.com/OCA/oca-port";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ yajo ];
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ yajo ];
   };
 }

From daaabecd054bf4c7e43b5c3f182455c199e07d0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 09:54:05 +0000
Subject: [PATCH 0998/1497] python3Packages.google-cloud-pubsub: 2.29.0 ->
 2.29.1

---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 9c46626f6869..ac4b5e0d6c8d 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.29.0";
+  version = "2.29.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-uCD41BDJath7jaecaWuXnhoYKhcNDAYCYm9bnYy/Ie4=";
+    hash = "sha256-X0sFNMWHOU3SBTjBuuq31OvO14lWEFhzlVXrRNeSTOQ=";
   };
 
   build-system = [ setuptools ];

From f1572ce10520f934b30ac0889c80d888c09cf0cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 10:17:07 +0000
Subject: [PATCH 0999/1497] alpaca: 6.0.5 -> 6.1.5

---
 pkgs/by-name/al/alpaca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 78b1263c3610..df884863e4f5 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -20,14 +20,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "6.0.5";
+  version = "6.1.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-faxqSUYqf3vRZYeuXAzv+n1inMVwl5KmnndABF77Sus=";
+    hash = "sha256-4QN88KOCtVFNoqAKpjW/MSvPJFsLoXZixiGN5JNRDvs=";
   };
 
   nativeBuildInputs = [

From abda866f172173b6fd16ccec9b15fb1cbb649cb2 Mon Sep 17 00:00:00 2001
From: Johan Herland <johan.herland@tweag.io>
Date: Mon, 2 Jun 2025 14:24:11 +0000
Subject: [PATCH 1000/1497] fetchurl: Add hook for rewriting/filtering URLs

This allows on-the-fly rewriting of URLs before they are passed from
fetchurl (or fetchurlBoot) to curl.

The intended use is to allow inserting company-internal mirrors, or
working around company firewalls and similar network restrictions,
without having to extensively patch across all of nixpkgs. Instead,
users can pass a function in their nixpkgs that performs the necessary
URL rewrites.

Co-authored-by: Alexander Bantyev <balsoft@balsoft.ru>
---
 doc/release-notes/rl-2511.section.md    |  2 +-
 pkgs/build-support/fetchurl/boot.nix    | 17 ++++++++++++++---
 pkgs/build-support/fetchurl/default.nix |  9 ++++++++-
 pkgs/stdenv/darwin/default.nix          |  1 +
 pkgs/stdenv/freebsd/default.nix         |  1 +
 pkgs/stdenv/linux/default.nix           |  1 +
 pkgs/top-level/all-packages.nix         |  1 +
 pkgs/top-level/config.nix               | 21 +++++++++++++++++++++
 8 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index f739ba9cd1f5..02b08039812b 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -21,7 +21,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- Create the first release note entry in this section!
+- Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
 
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix
index 4aa76094a843..a950b9983329 100644
--- a/pkgs/build-support/fetchurl/boot.nix
+++ b/pkgs/build-support/fetchurl/boot.nix
@@ -2,7 +2,10 @@ let
   mirrors = import ./mirrors.nix;
 in
 
-{ system }:
+{
+  rewriteURL,
+  system,
+}:
 
 {
   url ? builtins.head urls,
@@ -28,7 +31,15 @@ import <nix/fetchurl.nix> {
     # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently
     # supports only one URI, use the first listed mirror.
     let
-      m = builtins.match "mirror://([a-z]+)/(.*)" url;
+      url_ =
+        let
+          u = rewriteURL url;
+        in
+        if builtins.isString u then
+          u
+        else
+          throw "rewriteURL deleted the only URL passed to fetchurlBoot (was ${url})";
+      m = builtins.match "mirror://([a-z]+)/(.*)" url_;
     in
-    if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1);
+    if m == null then url_ else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1);
 }
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index c0e53ba637a7..f948b9ee88aa 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -6,6 +6,7 @@
   stdenvNoCC,
   curl, # Note that `curl' may be `null', in case of the native stdenvNoCC.
   cacert ? null,
+  rewriteURL,
 }:
 
 let
@@ -122,7 +123,7 @@ in
 }@args:
 
 let
-  urls_ =
+  preRewriteUrls =
     if urls != [ ] && url == "" then
       (
         if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}"
@@ -137,6 +138,12 @@ let
     else
       throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}";
 
+  urls_ =
+    let
+      u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls);
+    in
+    if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u;
+
   hash_ =
     if
       with lib.lists;
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 49f0ff040a41..df95cb979fb3 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -181,6 +181,7 @@ let
           inherit lib;
           stdenvNoCC = prevStage.ccWrapperStdenv or thisStdenv;
           curl = bootstrapTools;
+          inherit (config) rewriteURL;
         };
 
         inherit cc;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index c0a6f7e8ea08..f2cb2e5e0b29 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -399,6 +399,7 @@ let
       fetchurlBoot = import ../../build-support/fetchurl {
         inherit lib stdenvNoCC;
         inherit (prevStage) curl;
+        inherit (config) rewriteURL;
       };
       stdenv = import ../generic {
         inherit
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 7682419db9d6..d30cc08eac6a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -190,6 +190,7 @@ let
 
         fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
           inherit system;
+          inherit (config) rewriteURL;
         };
 
         cc =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b6a97087eba..83cb0c442f3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -626,6 +626,7 @@ with pkgs;
       makeOverridable (import ../build-support/fetchurl) {
         inherit lib stdenvNoCC buildPackages;
         inherit cacert;
+        inherit (config) rewriteURL;
         curl = buildPackages.curlMinimal.override (old: rec {
           # break dependency cycles
           fetchurl = stdenv.fetchurlBoot;
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 4f6ae95b23f6..840c4e03e92d 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -211,6 +211,27 @@ let
         Whether to check that the `meta` attribute of derivations are correct during evaluation time.
       '';
     };
+
+    rewriteURL = mkOption {
+      type = types.functionTo (types.nullOr types.str);
+      description = ''
+        A hook to rewrite/filter URLs before they are fetched.
+
+        The function is passed the URL as a string, and is expected to return a new URL, or null if the given URL should not be attempted.
+
+        This function is applied _prior_ to resolving mirror:// URLs.
+
+        The intended use is to allow URL rewriting to insert company-internal mirrors, or work around company firewalls and similar network restrictions.
+      '';
+      default = lib.id;
+      defaultText = literalExpression "(url: url)";
+      example = literalExpression ''
+        {
+          # Use Nix like it's 2024! ;-)
+          rewriteURL = url: "https://web.archive.org/web/2024/''${url}";
+        }
+      '';
+    };
   };
 
 in

From e677a7a7c29706e1a7a01e8224173114c09fe83b Mon Sep 17 00:00:00 2001
From: Kalle Fagerberg <kalle.fagerberg@riskident.com>
Date: Wed, 4 Jun 2025 13:09:09 +0200
Subject: [PATCH 1001/1497] kubectl-klock: 0.8.0 -> 0.8.1

---
 pkgs/by-name/ku/kubectl-klock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix
index ba056902714d..9564a40b22e4 100644
--- a/pkgs/by-name/ku/kubectl-klock/package.nix
+++ b/pkgs/by-name/ku/kubectl-klock/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "kubectl-klock";
-  version = "0.8.0";
+  version = "0.8.1";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -15,7 +15,7 @@ buildGoModule rec {
     owner = "applejag";
     repo = "kubectl-klock";
     rev = "v${version}";
-    hash = "sha256-1t/DJ6cTikAl2edJFfDzXAB8OgdZSjk1C7vOGXyTu0U=";
+    hash = "sha256-WKWaQ7VKzlfgYb5B/GmcUKTjxfFRctt+N+zRJcOGukA=";
   };
 
   ldflags = [

From 7e306d5d69224d454b3ab53e939234f396f35d5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 08:37:24 +0000
Subject: [PATCH 1002/1497] roddhjav-apparmor-rules: 0-unstable-2025-05-20 ->
 0-unstable-2025-05-27

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 9aae938e011a..34e71911f0f1 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-05-20";
+  version = "0-unstable-2025-05-27";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "707a5e8beec085376c6bc772352289ace86633d9";
-    hash = "sha256-tSn+Yymhx8rxbr81aVgoU83FESCfK4Sq01KfO88kzJQ=";
+    rev = "bf22a7786c39d3b56b87095bfd4479769b88ec1a";
+    hash = "sha256-J8h9LcZRxhTaZg7OU2m75upSoeD1i/abSCJQtX1WRsQ=";
   };
 
   dontConfigure = true;

From f7c39aabe8ddb2330f76731db495b41a21985316 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 4 Jun 2025 13:40:38 +0200
Subject: [PATCH 1003/1497] sfcgal: use the tag attribute of fetchFromGitLab

---
 pkgs/by-name/sf/sfcgal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix
index f863215740d0..c5c1cd91a676 100644
--- a/pkgs/by-name/sf/sfcgal/package.nix
+++ b/pkgs/by-name/sf/sfcgal/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "sfcgal";
     repo = "SFCGAL";
-    rev = "refs/tags/v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-m8oyfL3rF4qLugoEFa8iiqS5D1Oljg+x1qMp9KfiQ5c=";
   };
 

From 209e3c7feea4a67a41fe085c9c95e08453adffd8 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 4 Jun 2025 12:43:54 +0100
Subject: [PATCH 1004/1497] python313Packages.breezy: 3.3.10 -> 3.3.12

Updated to include fix for https://bugs.launchpad.net/brz/+bug/2103478
---
 .../python-modules/breezy/Cargo.lock          | 20 +++++++++----------
 .../python-modules/breezy/default.nix         |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock
index 582919223ddf..db5dbd76c7e8 100644
--- a/pkgs/development/python-modules/breezy/Cargo.lock
+++ b/pkgs/development/python-modules/breezy/Cargo.lock
@@ -19,7 +19,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "breezy"
-version = "3.3.10"
+version = "3.3.12"
 dependencies = [
  "pyo3",
 ]
@@ -50,9 +50,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "memchr"
@@ -71,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
@@ -83,9 +83,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -193,7 +193,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rio-py"
-version = "3.3.10"
+version = "3.3.12"
 dependencies = [
  "lazy_static",
  "pyo3",
@@ -202,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index a0b6b806c81d..67a8ff0b944c 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "breezy";
-  version = "3.3.10";
+  version = "3.3.12";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "breezy-team";
     repo = "breezy";
     rev = "brz-${version}";
-    hash = "sha256-AzMDab8SUJ8JJukqxVsqf7HdCTcVMLyFFTInPwAmSqs=";
+    hash = "sha256-V/SnzpslFGjISg+YxViFa+Lpnn0+9enPA3xmvwfXnUM=";
   };
 
   cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };

From 6c95a254e53328e7aeaf67150fef0b8653c703eb Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 4 Jun 2025 13:50:05 +0200
Subject: [PATCH 1005/1497] sfcgal: fix the license mistake, it is lgpl2Plus

---
 pkgs/by-name/sf/sfcgal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix
index c5c1cd91a676..f93082056821 100644
--- a/pkgs/by-name/sf/sfcgal/package.nix
+++ b/pkgs/by-name/sf/sfcgal/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations";
     homepage = "https://sfcgal.gitlab.io/SFCGAL/";
     changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}";
-    license = lib.licenses.lgpl2;
+    license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ fqidz ];
     teams = [ lib.teams.geospatial ];

From 766e53e84408664b5da0f1320339fb8d3800dd28 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 4 Jun 2025 13:51:18 +0200
Subject: [PATCH 1006/1497] sfcgal: switch platforms to unix as it builds on
 darwin

---
 pkgs/by-name/sf/sfcgal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix
index f93082056821..db7a0e806a80 100644
--- a/pkgs/by-name/sf/sfcgal/package.nix
+++ b/pkgs/by-name/sf/sfcgal/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sfcgal.gitlab.io/SFCGAL/";
     changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}";
     license = lib.licenses.lgpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ fqidz ];
     teams = [ lib.teams.geospatial ];
   };

From 88e29e8afdc74dff2b91c7ff47d9e772a5a3bb63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 12:00:10 +0000
Subject: [PATCH 1007/1497] python3Packages.pylamarzocco: 2.0.7 -> 2.0.8

---
 pkgs/development/python-modules/pylamarzocco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 378343d7fb02..26f5ed6cdcaa 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "2.0.7";
+  version = "2.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     tag = "v${version}";
-    hash = "sha256-IFac66zBGvRASXJDa/Y6F3BxZhRD9tG8yAB2l2IsDVk=";
+    hash = "sha256-Fsxs3ugjzU9l3SlxqKs+Bej34kRn2mKrwzCZ94P2UGo=";
   };
 
   build-system = [ setuptools ];

From dfb092c5ea538b0d2f9246419d74e39b8ece9571 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 1 Jun 2025 19:15:39 -0700
Subject: [PATCH 1008/1497] python3Packages.wandb: disable test that fails in
 sandbox on Darwin

---
 pkgs/development/python-modules/wandb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index f96d87583c45..2459a04d7ad9 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -378,6 +378,9 @@ buildPythonPackage rec {
 
       # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
       "test_wandb_image_with_matplotlib_figure"
+
+      # HandleAbandonedError / SystemExit when run in sandbox
+      "test_makedirs_raises_oserror__uses_temp_dir"
     ];
 
   pythonImportsCheck = [ "wandb" ];

From 66f488758519366e5a8de3f13e31ca271e52ca88 Mon Sep 17 00:00:00 2001
From: AlisterH <alister.hood@gmail.com>
Date: Thu, 5 Jun 2025 00:27:03 +1200
Subject: [PATCH 1009/1497] gwc: fix build with gcc14

---
 pkgs/by-name/gw/gwc/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix
index ee0c97523fcd..1fa2a34e019c 100644
--- a/pkgs/by-name/gw/gwc/package.nix
+++ b/pkgs/by-name/gw/gwc/package.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
     fftw
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=implicit-function-declaration"
+    "-Wno-error=int-conversion"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
   enableParallelBuilding = false; # Fails to generate machine.h in time.
 
   meta = with lib; {

From 57afa2783caf7d6713f63c8e29fba6c52a3a5300 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 22:32:55 +1000
Subject: [PATCH 1010/1497] dpkg: 1.22.11 -> 1.22.19 (#370245)

Mark broken on darwin. See https://github.com/NixOS/nixpkgs/pull/370245#discussion_r2126471012
---
 pkgs/by-name/dp/dpkg/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix
index b85ad1a50ba5..b5e9ca516b20 100644
--- a/pkgs/by-name/dp/dpkg/package.nix
+++ b/pkgs/by-name/dp/dpkg/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation rec {
   pname = "dpkg";
-  version = "1.22.11";
+  version = "1.22.19";
 
   src = fetchgit {
     url = "https://git.launchpad.net/ubuntu/+source/dpkg";
     rev = "applied/${version}";
-    hash = "sha256-mKyS0lPTG3ROcw8AhB4IdjNjvZK2YTGV9pbpjz/OLAc=";
+    hash = "sha256-lSuq5VqBj5yKusZaT50sOf82/wd2FeS4g2ILaZT0HPM=";
   };
 
   configureFlags = [
@@ -112,6 +112,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.debian.org/Teams/Dpkg";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with maintainers; [ siriobalmelli ];
   };
 }

From f024e46cb628a3d525adeecfac597a35dfae1f54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 12:33:47 +0000
Subject: [PATCH 1011/1497] pipenv: 2025.0.2 -> 2025.0.3

---
 pkgs/by-name/pi/pipenv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
index d1ce0561ebea..1e9dceda7935 100644
--- a/pkgs/by-name/pi/pipenv/package.nix
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -33,14 +33,14 @@ let
 in
 buildPythonApplication rec {
   pname = "pipenv";
-  version = "2025.0.2";
+  version = "2025.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "pipenv";
     tag = "v${version}";
-    hash = "sha256-FCpHrsKUfrv876RRfskUl01jYhmOjZ5D86PjSJnDcV0=";
+    hash = "sha256-3uf0nCTv6ebq4am4mqJpdkidx6dbO8jI4IMtjZQ+8Qc=";
   };
 
   env.LC_ALL = "en_US.UTF-8";

From f15baddeaa6738d700fda2c5b4e20653564f4b93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 12:40:27 +0000
Subject: [PATCH 1012/1497] xmrig: 6.22.2 -> 6.22.3

---
 pkgs/by-name/xm/xmrig/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix
index bd8895534285..d7b4335293fd 100644
--- a/pkgs/by-name/xm/xmrig/package.nix
+++ b/pkgs/by-name/xm/xmrig/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "6.22.2";
+  version = "6.22.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-/1pSGbKBfin7xqoILacKp2//65NNiBXZxzhO39FOOjY=";
+    hash = "sha256-MS1JDYajtLCvc9kVATKmZrFwXNcAbdGSSUseL2S+tiQ=";
   };
 
   patches = [

From 733b6c8a0bccc042b71af38e8a8769e39e89a5cf Mon Sep 17 00:00:00 2001
From: pilz0 <marie0@riseup.net>
Date: Mon, 2 Jun 2025 15:03:50 +0200
Subject: [PATCH 1013/1497] maintainers: add pilz

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a1c296dd9f4c..5314a22833d1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19511,6 +19511,12 @@
     githubId = 7536431;
     name = "Jonas Fierlings";
   };
+  pilz = {
+    name = "Pilz";
+    email = "nix@pilz.foo";
+    github = "pilz0";
+    githubId = 48645439;
+  };
   pimeys = {
     email = "julius@nauk.io";
     github = "pimeys";

From 5b49345be3c52182fd79d95f628022f7cb893af2 Mon Sep 17 00:00:00 2001
From: pilz0 <marie0@riseup.net>
Date: Mon, 2 Jun 2025 14:03:25 +0200
Subject: [PATCH 1014/1497] buttplug-mcp: init at v0.0.1

---
 pkgs/by-name/bu/buttplug-mcp/package.nix | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/bu/buttplug-mcp/package.nix

diff --git a/pkgs/by-name/bu/buttplug-mcp/package.nix b/pkgs/by-name/bu/buttplug-mcp/package.nix
new file mode 100644
index 000000000000..2eab6952da0b
--- /dev/null
+++ b/pkgs/by-name/bu/buttplug-mcp/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "buttplug-mcp";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "ConAcademy";
+    repo = "buttplug-mcp";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-C4ZPTO+Gh6g19BrqHugSCF74aAZ888XRTk1AzNpEBok=";
+  };
+
+  vendorHash = "sha256-EoLv7HpdAyEM83m/DTgu9jMh0Nn+v8b2buIavQFJbnY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Buttplug.io Model Context Protocol (MCP) Server";
+    homepage = "https://github.com/ConAcademy/buttplug-mcp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pilz ];
+    mainProgram = "buttplug-mcp";
+  };
+})

From 59496508c566298de29fd6c00e44eef2d63c6c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Sat, 19 Apr 2025 11:48:58 +0200
Subject: [PATCH 1015/1497] shell-gpt: add litellm dependency

---
 pkgs/by-name/sh/shell-gpt/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix
index 3c52c2e43011..fa627069330d 100644
--- a/pkgs/by-name/sh/shell-gpt/package.nix
+++ b/pkgs/by-name/sh/shell-gpt/package.nix
@@ -33,11 +33,16 @@ python3.pkgs.buildPythonApplication rec {
     click
     distro
     instructor
+    litellm
     openai
     rich
     typer
   ];
 
+  buildInputs = with python3.pkgs; [
+    litellm
+  ];
+
   # Tests want to read the OpenAI API key from stdin
   doCheck = false;
 

From abd741e3d9b28e4d1b5cb01f7dd17ca286660145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Sat, 19 Apr 2025 11:48:59 +0200
Subject: [PATCH 1016/1497] shell-gpt: 1.4.4 -> 1.4.5

---
 pkgs/by-name/sh/shell-gpt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix
index fa627069330d..f7d3b6524b3f 100644
--- a/pkgs/by-name/sh/shell-gpt/package.nix
+++ b/pkgs/by-name/sh/shell-gpt/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "shell-gpt";
-  version = "1.4.4";
+  version = "1.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TheR1D";
     repo = "shell_gpt";
     tag = version;
-    hash = "sha256-4/5CLzIq+RXVTJk4chrd65GeazRp8VFKdOMt3fT+mbI=";
+    hash = "sha256-e0zKlbt508psiV1ryuE/JV0rWM/XZDhMChqReGHefig=";
   };
 
   pythonRelaxDeps = [

From c12759a8847c651bec2c31fabd4cf013315e3c41 Mon Sep 17 00:00:00 2001
From: pilz0 <marie0@riseup.net>
Date: Wed, 21 May 2025 16:59:34 +0200
Subject: [PATCH 1017/1497] kubectl-ai: init at v0.0.9

---
 pkgs/by-name/ku/kubectl-ai/package.nix | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/ku/kubectl-ai/package.nix

diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
new file mode 100644
index 000000000000..0545b0caa33d
--- /dev/null
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "kubectl-ai";
+  version = "0.0.9";
+
+  src = fetchFromGitHub {
+    owner = "GoogleCloudPlatform";
+    repo = "kubectl-ai";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-zsqHRXUyRguDbY3yPCWJ9KLzF6VR/y7juzI9uaVPSAE=";
+  };
+
+  vendorHash = "sha256-VpTAq9rXDPBOdaZIXm7h4AP1YFOk7HzLiUxYaCOP/w8=";
+
+  # Build the main command
+  subPackages = [ "cmd" ];
+
+  postInstall = ''
+    mv $out/bin/{cmd,kubectl-ai}
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  # Disable the automatic subpackage detection
+  doCheck = false;
+
+  meta = {
+    description = "AI powered Kubernetes Assistant";
+    homepage = "https://github.com/GoogleCloudPlatform/kubectl-ai";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pilz ];
+    mainProgram = "kubectl-ai";
+  };
+})

From 7012a4885252ee27a02d01a9c73d030d08e4d6c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:08:21 +0000
Subject: [PATCH 1018/1497] restinio: 0.7.6 -> 0.7.7

---
 pkgs/by-name/re/restinio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix
index 486fc3c9287c..3b3b61e829ef 100644
--- a/pkgs/by-name/re/restinio/package.nix
+++ b/pkgs/by-name/re/restinio/package.nix
@@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "restinio";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "Stiffstream";
     repo = "restinio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wQIJsybPz5GNcQMECcYhs8nh/h8gWEocS+M+lnP8EOE=";
+    hash = "sha256-bbiBz/WkQc3HiS7+x/qsRdHoravPX8LBKb+a2WeC81s=";
   };
 
   # https://www.github.com/Stiffstream/restinio/issues/230

From 93e3fa7e05482f959e7a6a37f029672f054e713e Mon Sep 17 00:00:00 2001
From: Twingate Build Bot <build-bot@twingate.com>
Date: Wed, 4 Jun 2025 13:09:54 +0000
Subject: [PATCH 1019/1497] twingate: 2025.114.149850 -> 2025.155.154210

---
 pkgs/by-name/tw/twingate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix
index 60756975e8e4..25fec007ae26 100644
--- a/pkgs/by-name/tw/twingate/package.nix
+++ b/pkgs/by-name/tw/twingate/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "twingate";
-  version = "2025.114.149850";
+  version = "2025.155.154174";
 
   src = fetchurl {
     url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb";
-    hash = "sha256-rsV05HuGPrY6sNWP8JRaniwaj8Bn2V2Dk7yXX7gibFs=";
+    hash = "sha256-TPXw9PDNZ/0X3yZ51mEBtCi9/NO7T6M66nauoBOn6HQ=";
   };
 
   buildInputs = [

From 862ed7c1a4de0a4a52f3093dc9673d3a48f0b7a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:10:46 +0000
Subject: [PATCH 1020/1497] partclone: 0.3.36 -> 0.3.37

---
 pkgs/by-name/pa/partclone/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index c01867172d95..014f70123f4b 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "partclone";
-  version = "0.3.36";
+  version = "0.3.37";
 
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
     rev = version;
-    sha256 = "sha256-TZkWDs0KC2Kb7l5QFiHITJqWyq+ryj5mnhNY1wxcUyE=";
+    sha256 = "sha256-VqPCj2DjWux17vgLb13AJd0EAHkqRGdIL0aPxkT3JlY=";
   };
 
   nativeBuildInputs = [

From 5be9890c8f3a93f3f615174006db2e9b49ac313c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:31:11 +0000
Subject: [PATCH 1021/1497] ls-lint: 2.3.0 -> 2.3.1

---
 pkgs/by-name/ls/ls-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ls/ls-lint/package.nix b/pkgs/by-name/ls/ls-lint/package.nix
index 2d6627d132b2..3a9d5445dfb7 100644
--- a/pkgs/by-name/ls/ls-lint/package.nix
+++ b/pkgs/by-name/ls/ls-lint/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ls-lint";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "loeffel-io";
     repo = "ls-lint";
     rev = "v${version}";
-    sha256 = "sha256-QAUmQAa1gNS2LLyFmOsydOVKZoZMWzu9y7SgbIq1ESk=";
+    sha256 = "sha256-kwZvpZaiS58UFE+qncQ370E8bnEuzQACK0FOAYlJwV0=";
   };
 
-  vendorHash = "sha256-ZqQHxkeV+teL6+Be59GcDJTH9GhGTJnz+OHAeIC9I24=";
+  vendorHash = "sha256-XbYfHgpZCGv6w/55dGiFcYTQ36f0n3w8XwnC7wIUFro=";
 
   meta = with lib; {
     description = "Extremely fast file and directory name linter";

From ea9be9a23a730744f908d9888cfe539fce190f0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 13:44:14 +0000
Subject: [PATCH 1022/1497] gh-skyline: 0.1.5 -> 0.1.6

---
 pkgs/by-name/gh/gh-skyline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix
index b4d2ba692582..d226bebfd665 100644
--- a/pkgs/by-name/gh/gh-skyline/package.nix
+++ b/pkgs/by-name/gh/gh-skyline/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gh-skyline";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-skyline";
     tag = "v${version}";
-    hash = "sha256-jcdOLoyOXq270SaObMpCD+ts6Hj8wqSAjUZWEg3F9+w=";
+    hash = "sha256-IMsq+IhuZUJ7JSWZJPvx2bQ9avFsjfc/kOW9Sre5jAo=";
   };
 
-  vendorHash = "sha256-rCFHYofUQlfRMP7bJav2se7oAkE7rS8KJl1n8kCsSag=";
+  vendorHash = "sha256-iAqc8RlvpvP9Go8E/b+PnEgKRdpD3+IIQ1JUKVZ1Ces=";
 
   ldflags = [
     "-s"

From f08e609a495560088e4b1d119e6633b4dc776efe Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 4 Jun 2025 13:43:49 +0000
Subject: [PATCH 1023/1497] countryfetch: 0.1.9 -> 0.2.0

---
 pkgs/by-name/co/countryfetch/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/countryfetch/package.nix b/pkgs/by-name/co/countryfetch/package.nix
index 22c8e43964ea..007d8ca7cb14 100644
--- a/pkgs/by-name/co/countryfetch/package.nix
+++ b/pkgs/by-name/co/countryfetch/package.nix
@@ -10,20 +10,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "countryfetch";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "nik-rev";
     repo = "countryfetch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KdFgY54vXLmq6IZfJzZ1IeZ2eQuNJoCRZUV3rVuPpcY=";
+    hash = "sha256-povKd1Y/2Mi+6yJd9+RsJ4F19/wvXvBOK2Jgbs4UnP0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XJI9k/5hdak8p0/J/x9u6lqJu/DIbX93Wwm3LALkAAw=";
+  cargoHash = "sha256-0ZBhRheJGapPqVieXbIpoboVV4RLXan042u5SSgrYQk=";
 
   env = {
-    RUSTC_BOOTSTRAP = 1;
     OPENSSL_NO_VENDOR = true;
   };
 

From 6be7baab536590d68d1267d14c9f2021b4a533a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:07:56 +0000
Subject: [PATCH 1024/1497] python3Packages.types-mock: 5.2.0.20250306 ->
 5.2.0.20250516

---
 pkgs/development/python-modules/types-mock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix
index 0f9dac90ddd8..441e0a83c540 100644
--- a/pkgs/development/python-modules/types-mock/default.nix
+++ b/pkgs/development/python-modules/types-mock/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-mock";
-  version = "5.2.0.20250306";
+  version = "5.2.0.20250516";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_mock";
     inherit version;
-    hash = "sha256-FYgstc+ZgFh6dgfjGJCAEiOAHXmX9VloaAXOCbZTYIc=";
+    hash = "sha256-qrfT2a04FPL42hLMjkLZvn04IAxfIU48AnjDj6ASmdc=";
   };
 
   build-system = [ setuptools ];

From f6a34109d892c379d03e8ed2474b6b5d5eddd8c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:09:12 +0000
Subject: [PATCH 1025/1497] hugo: 0.147.5 -> 0.147.7

---
 pkgs/by-name/hu/hugo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index a22d5f3f9d4c..7e3baaf717a5 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.147.5";
+  version = "0.147.7";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Or1aRiNbCW1h4+PU9XsYD9lMW243+8VjpWXATGADxMo=";
+    hash = "sha256-4TIdxujzlRc3y2yUzrJg2IhzWE4ZuqySRHqlhlHuzpc=";
   };
 
-  vendorHash = "sha256-lnUz3MqQVQqfbNweGLsehrdQuHS1Xa/L7pWKrmB4tNw=";
+  vendorHash = "sha256-ejdBxm0OL3J97SLXtt++Z/1feUlN/yu6vsw+CQt1PX8=";
 
   checkFlags =
     let

From 11fd59381d0bae52eb64b5bf68d17822af09cbf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:10:40 +0000
Subject: [PATCH 1026/1497] python3Packages.pybrowsers: 1.1.0 -> 1.3.0

---
 pkgs/development/python-modules/pybrowsers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix
index 6398d0ded602..4f1abf26d40e 100644
--- a/pkgs/development/python-modules/pybrowsers/default.nix
+++ b/pkgs/development/python-modules/pybrowsers/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pybrowsers";
-  version = "1.1.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = "browsers";
     tag = version;
-    hash = "sha256-9YO/FTgL/BzabPnpi2RM/C08F7/d6FNshWnGsT6NQlg=";
+    hash = "sha256-GW5yuBc9lwGIUK/ZH4qHFXlA+wyMD6HdShq0A/ydb+k=";
   };
 
   build-system = [ poetry-core ];

From 5d986dcfca3b39858647cbdb3b35a0568f1e1c1f Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 3 Jun 2025 17:31:25 +0200
Subject: [PATCH 1027/1497] steam-unwrapped: 1.0.0.82 -> 1.0.0.83

---
 pkgs/by-name/st/steam-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index dcb374f48437..57ca2d102008 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "steam-unwrapped";
-  version = "1.0.0.82";
+  version = "1.0.0.83";
 
   src = fetchurl {
     # use archive url so the tarball doesn't 404 on a new release
     url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz";
-    hash = "sha256-r6Lx3WJx/StkW6MLjzq0Cv02VONUJBoxy9UQAPfm/Hc=";
+    hash = "sha256-eRaCsMx+/ZRscAL5F8ndR00mGbf57QCJEhaoprSsj4I=";
   };
 
   patches = [

From 913d9a936cb59c797eb6dbb61abb13d4ca112f98 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 15:55:08 +0200
Subject: [PATCH 1028/1497] steam-unwrapped: `--replace` -> `--replace-fail`

---
 pkgs/by-name/st/steam-unwrapped/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index 57ca2d102008..32159fd86b0e 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/etc/udev/rules.d/
     cp ./subprojects/steam-devices/*.rules $out/etc/udev/rules.d/
     substituteInPlace $out/etc/udev/rules.d/60-steam-input.rules \
-      --replace "/bin/sh" "${bash}/bin/bash"
+      --replace-fail "/bin/sh" "${bash}/bin/bash"
 
     # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
     rm $out/share/applications/steam.desktop

From 952de82a2b24ad785e5f15425509c31d41fbf839 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 15:57:48 +0200
Subject: [PATCH 1029/1497] steam-unwrapped: remove `with lib;`

---
 pkgs/by-name/st/steam-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index 32159fd86b0e..c9c5e0cec510 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = ./update.py;
 
-  meta = with lib; {
+  meta = {
     description = "Digital distribution platform";
     longDescription = ''
       Steam is a video game digital distribution service and storefront from Valve.
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
       To install on NixOS, please use the option `programs.steam.enable = true`.
     '';
     homepage = "https://store.steampowered.com/";
-    license = licenses.unfreeRedistributable;
-    maintainers = [ lib.maintainers.jagajaga ];
-    teams = [ lib.teams.steam ];
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ jagajaga ];
+    teams = with lib.teams; [ steam ];
     mainProgram = "steam";
   };
 })

From 6427e30613afe4e487de22e0601bf525fccda3f7 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 15:58:53 +0200
Subject: [PATCH 1030/1497] steam-unwrapped: `DESTDIR` -> `PREFIX`, use
 `placeholder` in `makeFlags`

---
 pkgs/by-name/st/steam-unwrapped/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index c9c5e0cec510..f3a21165a181 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   makeFlags = [
-    "DESTDIR=$(out)"
-    "PREFIX="
+    "PREFIX=${placeholder "out"}"
   ];
 
   postInstall = ''

From 6486c717cf62b2860821ca9136c2cf6a9023cdd2 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 16:00:41 +0200
Subject: [PATCH 1031/1497] steam-unwrapped: replace `sed` usage with
 `substitute`

---
 pkgs/by-name/st/steam-unwrapped/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix
index f3a21165a181..236caad9062a 100644
--- a/pkgs/by-name/st/steam-unwrapped/package.nix
+++ b/pkgs/by-name/st/steam-unwrapped/package.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
     rm $out/share/applications/steam.desktop
-    sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop
+    substitute steam.desktop $out/share/applications/steam.desktop \
+      --replace-fail /usr/bin/steam steam
   '';
 
   passthru.updateScript = ./update.py;

From 63d916e7cef8a1ab99962c3b7f0c110fa631e78d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:17:39 +0000
Subject: [PATCH 1032/1497] oama: 0.20.1 -> 0.20.2

---
 pkgs/by-name/oa/oama/generated-package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oa/oama/generated-package.nix b/pkgs/by-name/oa/oama/generated-package.nix
index e78d118a8e0b..046adf971b9a 100644
--- a/pkgs/by-name/oa/oama/generated-package.nix
+++ b/pkgs/by-name/oa/oama/generated-package.nix
@@ -4,8 +4,10 @@
   mkDerivation,
   aeson,
   base,
+  base64-bytestring,
   bytestring,
   containers,
+  cryptohash-sha256,
   directory,
   fetchgit,
   hsyslog,
@@ -18,6 +20,7 @@
   optparse-applicative,
   pretty-simple,
   process,
+  random,
   streaming-commons,
   string-qq,
   strings,
@@ -31,11 +34,11 @@
 }:
 mkDerivation {
   pname = "oama";
-  version = "0.20.1";
+  version = "0.20.2";
   src = fetchgit {
     url = "https://github.com/pdobsan/oama.git";
-    sha256 = "sha256-59tKAHL7rCZJyfraD7NnwFR5iP6784IcgH82hfsFHiA=";
-    rev = "99659a8567808b28885ed241abe4df03f37e92fc";
+    sha256 = "1zr2a77b3azdqyk6hzchhg573gwwb5h0d7x382srggm25lp3isk9";
+    rev = "bbe5a6d9f87659c8a24b6515694acf1b522a396b";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -43,8 +46,10 @@ mkDerivation {
   libraryHaskellDepends = [
     aeson
     base
+    base64-bytestring
     bytestring
     containers
+    cryptohash-sha256
     directory
     hsyslog
     http-conduit
@@ -55,6 +60,7 @@ mkDerivation {
     optparse-applicative
     pretty-simple
     process
+    random
     streaming-commons
     string-qq
     strings
@@ -69,8 +75,10 @@ mkDerivation {
   executableHaskellDepends = [
     aeson
     base
+    base64-bytestring
     bytestring
     containers
+    cryptohash-sha256
     directory
     hsyslog
     http-conduit
@@ -81,6 +89,7 @@ mkDerivation {
     optparse-applicative
     pretty-simple
     process
+    random
     streaming-commons
     string-qq
     strings

From 42736c1e6cd26d69c3f215aae9d75a86011b01dc Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Wed, 4 Jun 2025 10:21:07 -0400
Subject: [PATCH 1033/1497] packer: 1.12.0 -> 1.13.0 (#413284)

---
 pkgs/by-name/pa/packer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix
index 9bb7f19c98bf..2205a6059f8e 100644
--- a/pkgs/by-name/pa/packer/package.nix
+++ b/pkgs/by-name/pa/packer/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "packer";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    hash = "sha256-19eaQs2f4zM3lXuQrWoS2S/tXWe3HdxXesjtVG67LFE=";
+    hash = "sha256-MWVNDRtvH33fby17rj8Fdc/14NGuxWIRNG6B+onUK+M=";
   };
 
-  vendorHash = "sha256-BsYL0PEpujsXLjhFP05yK8Pr0tc0lrdsQqxzmKso3rw=";
+  vendorHash = "sha256-aXeYGyMn+lnsfcQMJXRt1uZsdi9np26sMna6Ch1swbg=";
 
   subPackages = [ "." ];
 

From 3381a3ec2f99cfe928ff7e080a47979cae0dd175 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:26:39 +0000
Subject: [PATCH 1034/1497] cirrus-cli: 0.144.0 -> 0.144.1

---
 pkgs/by-name/ci/cirrus-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index 7a0411231fe1..e53f35129229 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.144.0";
+  version = "0.144.1";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
     rev = "v${version}";
-    hash = "sha256-pbfLEoc9MF9Zo9P5D8R0WM/ZbzwhdIZhtcWR9tSKzX8=";
+    hash = "sha256-xU1c7dDYCfzLao6TLQFSijwTnEz0afkcOQnlHeTgaVQ=";
   };
 
-  vendorHash = "sha256-PH28ZIubrJWk4qTrL9OSx/ylW1iEP0j0iq4uNg9d9ko=";
+  vendorHash = "sha256-ZFvulF/glMq7Crp1d1lK602G34/anlT5yyyQQcgiuHg=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

From 7e6017fe587960961cc8506d8c991e82d8a3ba3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:27:25 +0000
Subject: [PATCH 1035/1497] civo: 1.2.3 -> 1.3.0

---
 pkgs/by-name/ci/civo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index 2775c9a504bc..5457292c1946 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.2.3";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-NREiQA/zAxClwKZDq5SR43/AAT6HqdfR6/ud9Xhe5rM=";
+    hash = "sha256-XK3FMgtAXOQYKa2il83blgdFhOdzbmP7VnIOijyDsK8=";
   };
 
-  vendorHash = "sha256-xSvq8ZrkdzRhfD2gPKSJkLnwVQuFuWnSYJ89iUDOpUU=";
+  vendorHash = "sha256-fGAJUGYbPJ88Dnfi5XWXr2jd9hE6M8p2ZLq5ORMoyL0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 72a4d41dedf2a4b74ed1082313a4ef290dcd326f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 14:28:31 +0000
Subject: [PATCH 1036/1497] buildah-unwrapped: 1.40.0 -> 1.40.1

---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 38dff810651d..a268b255c2d4 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -18,13 +18,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.40.0";
+  version = "1.40.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    hash = "sha256-4gn8bbzI+NerU8Bdi6FxLB/Kg1JaDBiZkR98zMRvTkw=";
+    hash = "sha256-+LHS+Syyy/jsk5G16qBhvv+/kjEACnxjl2q9YrrdPYE=";
   };
 
   outputs = [

From 1290be592e237394baafa2c882e9cf5df54bc82f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 4 Jun 2025 23:40:36 +0900
Subject: [PATCH 1037/1497] tdf: correct license

Upstream changed its license to GPL-3.0-or-later
starting with version 0.2.0.

- https://github.com/itsjunetime/tdf/commit/b9a12650c6065411e18ed88f396f62c448fdfcbf
- https://github.com/itsjunetime/tdf/blob/v0.2.0/LICENSE
---
 pkgs/by-name/td/tdf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/td/tdf/package.nix b/pkgs/by-name/td/tdf/package.nix
index 26514d2d1305..c76fcaab1ce4 100644
--- a/pkgs/by-name/td/tdf/package.nix
+++ b/pkgs/by-name/td/tdf/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Tui-based PDF viewer";
     homepage = "https://github.com/itsjunetime/tdf";
-    license = lib.licenses.mpl20;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       luftmensch-luftmensch
       DieracDelta

From f15f81efb8918ecd9d9ba6cb5530c7be27ddbf8d Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 4 Jun 2025 22:24:38 +0800
Subject: [PATCH 1038/1497] c-blosc: partially revert "c-blosc2: add
 cmake-config and propagate buildInputs"

partially revert commit https://github.com/NixOS/nixpkgs/commit/bb3d46c9943623f078d3fcd46a336b3c5d9346c0.
c-blosc does not provide a *cmake.config module and should not propagate lz4, zlib, zstd.
---
 pkgs/development/libraries/c-blosc/1.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix
index 6349063e3dd9..169f27b0f937 100644
--- a/pkgs/development/libraries/c-blosc/1.nix
+++ b/pkgs/development/libraries/c-blosc/1.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
     lz4
     zlib
     zstd
@@ -54,19 +54,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = !static;
 
-  passthru.tests = {
-    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    cmake-config = testers.hasCmakeConfigModules {
-      moduleNames = [ "Blosc2" ];
-      package = finalAttrs.finalPackage;
-    };
-  };
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
   meta = with lib; {
     description = "Blocking, shuffling and loss-less compression library";
     homepage = "https://www.blosc.org";
     changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}";
-    pkgConfigModules = [ "blosc2" ];
+    pkgConfigModules = [ "blosc" ];
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ris ];

From f1d85a79074a6d3fb245e3f0015fb3587ad3dd5e Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Wed, 4 Jun 2025 16:44:41 +0200
Subject: [PATCH 1039/1497] heroic-unwrapped: 2.17.0 -> 2.17.1

Diff: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/compare/refs/tags/v2.17.0...refs/tags/v2.17.1

Changelog: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases
---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 90cce11b353d..944936fbe444 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -22,18 +22,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.17.0";
+  version = "2.17.1";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tjme43vw+aIjyXBIsaNE8+bWrLKpIDJZpQaKb/bJYFQ=";
+    hash = "sha256-8vmFgLtFvS9JtbQbUNdSHr9zZaTZnQ2ntSueLcCICaE=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cV0+HZb6g65kGu1zOBueY954ol1bLGW8ddCniwAVWcw=";
+    hash = "sha256-9WCIdQ91IU8pfq6kpbmmn6APBTNwpCi9ovgRuWYUad8=";
   };
 
   nativeBuildInputs = [

From 82bd6b2a78890f4a6d59c0ecddc4ef17bd9df8b4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 17:14:51 +0200
Subject: [PATCH 1040/1497] alloy6: 6.0.0 -> 6.2.0

---
 pkgs/development/tools/alloy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 312d10a60c62..170c1705bd34 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -71,12 +71,12 @@ in
 rec {
   alloy5 = generic {
     version = "5.1.0";
-    sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53";
+    sha256 = "sha256-o7Q+jsmWeUeuotUQG9lrPE6w2B6z3Ju6QcyWSTScaQo=";
   };
 
   alloy6 = generic {
-    version = "6.0.0";
-    sha256 = "sha256-rA7mNxcu0DWkykMyfV4JwFmQqg0HOIcwjjD4jCRxNww=";
+    version = "6.2.0";
+    sha256 = "sha256-a4wctbyTvt/HxhQ1xOGrbmiKJC3HAqOUYo2amAHtt40=";
   };
 
   alloy = alloy5;

From 13fb53529fd1dd445772f493bcf7a889a3a61b95 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 17:20:02 +0200
Subject: [PATCH 1041/1497] bugstalker: 0.3.0 -> 0.3.1

Diff: https://github.com/godzie44/BugStalker/compare/v0.3.0...v0.3.1
---
 pkgs/by-name/bu/bugstalker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix
index 86135b2abd44..1f3667ab6cd3 100644
--- a/pkgs/by-name/bu/bugstalker/package.nix
+++ b/pkgs/by-name/bu/bugstalker/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bugstalker";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "godzie44";
     repo = "BugStalker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8Iqg2coFsPQY3ws5MEC1LhTu+Z1lXeI3ccjgoBS454o=";
+    hash = "sha256-c3NyYDz+Ha5jHTpXLw9xsY+h0NjW9Uvpyn2PStmahKA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a5YI6bOo/rsi9hZO1BcVMjJtdrYq2aHqxtlO3F+P+8s=";
+  cargoHash = "sha256-/FSV/avsg7kbgtinmKBb0+gemLFZdSE+A+tfLvtfNas=";
 
   buildInputs = [ libunwind ];
 

From 05482c6b799344b813a4b55dd6ebb402c61b28b7 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Tue, 3 Jun 2025 17:56:12 -0400
Subject: [PATCH 1042/1497] glibc: allow easier overriding of linux headers
 package

Before this change, one would have to `callPackage` `common.nix` manually,
but now this can be done via `glibc.override`.
---
 pkgs/development/libraries/glibc/common.nix  | 1 +
 pkgs/development/libraries/glibc/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5117d420463b..18e7d84477f7 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -260,6 +260,7 @@ stdenv.mkDerivation (
 
   // (removeAttrs args [
     "withLinuxHeaders"
+    "linuxHeaders"
     "withGd"
     "enableCET"
     "postInstall"
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d165cb8fff62..fc76ebe9ae05 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   withLinuxHeaders ? true,
+  linuxHeaders ? null,
   profilingLibraries ? false,
   withGd ? false,
   enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false,
@@ -19,7 +20,7 @@ let
   ];
 in
 
-(callPackage ./common.nix { inherit stdenv; } {
+(callPackage ./common.nix { inherit stdenv linuxHeaders; } {
   inherit
     withLinuxHeaders
     withGd

From 9a80987f613ae651552e1087d8c13549716bf01a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 15:33:48 +0000
Subject: [PATCH 1043/1497] lunar-client: 3.3.8 -> 3.3.9

---
 pkgs/by-name/lu/lunar-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 92dff5e16573..99527086416f 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.3.8";
+  version = "3.3.9";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
-    hash = "sha512-H4v2fpOvjU8Cxxf0kxHf2CB/NwjarMp8EjjfGb2IbrVM0aXQQyvW+cHRwfsLnkyOxNYLWNC50Px0Ur/0rpj4bg==";
+    hash = "sha512-XeaxhpAuOOwsUSdzR/Tb58A8P1MZQDUBFST+NVX3z54BCfLkc8JNHnIKphwBfdf3bj3CF0a93rPTWNnd850aWA==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 530e8781236453a25861a824bdcbdefea6dbc0dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 2 Jun 2025 21:05:20 +0200
Subject: [PATCH 1044/1497] nixos/gitea: drop useWizard

It was broken and lacks automated testing.

See https://github.com/NixOS/nixpkgs/issues/413172
---
 nixos/modules/services/misc/gitea.nix | 109 ++++++++++++--------------
 1 file changed, 52 insertions(+), 57 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index d4225232ed60..a393abf8aa08 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -79,8 +79,13 @@ in
     )
 
     (mkRemovedOptionModule [ "services" "gitea" "ssh" "enable" ]
-      "services.gitea.ssh.enable has been migrated into freeform setting services.gitea.settings.server.DISABLE_SSH. Keep in mind that the setting is inverted"
+      "It has been migrated into freeform setting services.gitea.settings.server.DISABLE_SSH. Keep in mind that the setting is inverted."
     )
+    (mkRemovedOptionModule [
+      "services"
+      "gitea"
+      "useWizard"
+    ] "Has been removed because it was broken and lacked automated testing.")
   ];
 
   options = {
@@ -93,12 +98,6 @@ in
 
       package = mkPackageOption pkgs "gitea" { };
 
-      useWizard = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator.";
-      };
-
       stateDir = mkOption {
         default = "/var/lib/gitea";
         type = types.str;
@@ -495,9 +494,7 @@ in
                   This can be disabled by using this option.
 
                   *Note:* please keep in mind that this should be added after the initial
-                  deploy unless [](#opt-services.gitea.useWizard)
-                  is `true` as the first registered user will be the administrator if
-                  no install wizard is used.
+                  deploy as the first registered user will be the administrator.
                 '';
               };
             };
@@ -752,62 +749,60 @@ in
         in
         ''
           # copy custom configuration and generate random secrets if needed
-          ${optionalString (!cfg.useWizard) ''
-            function gitea_setup {
-              cp -f '${configFile}' '${runConfig}'
+          function gitea_setup {
+            cp -f '${configFile}' '${runConfig}'
 
-              if [ ! -s '${secretKey}' ]; then
-                  ${exe} generate secret SECRET_KEY > '${secretKey}'
+            if [ ! -s '${secretKey}' ]; then
+                ${exe} generate secret SECRET_KEY > '${secretKey}'
+            fi
+
+            # Migrate LFS_JWT_SECRET filename
+            if [[ -s '${oldLfsJwtSecret}' && ! -s '${lfsJwtSecret}' ]]; then
+                mv '${oldLfsJwtSecret}' '${lfsJwtSecret}'
+            fi
+
+            if [ ! -s '${oauth2JwtSecret}' ]; then
+                ${exe} generate secret JWT_SECRET > '${oauth2JwtSecret}'
+            fi
+
+            ${lib.optionalString cfg.lfs.enable ''
+              if [ ! -s '${lfsJwtSecret}' ]; then
+                  ${exe} generate secret LFS_JWT_SECRET > '${lfsJwtSecret}'
               fi
+            ''}
 
-              # Migrate LFS_JWT_SECRET filename
-              if [[ -s '${oldLfsJwtSecret}' && ! -s '${lfsJwtSecret}' ]]; then
-                  mv '${oldLfsJwtSecret}' '${lfsJwtSecret}'
-              fi
+            if [ ! -s '${internalToken}' ]; then
+                ${exe} generate secret INTERNAL_TOKEN > '${internalToken}'
+            fi
 
-              if [ ! -s '${oauth2JwtSecret}' ]; then
-                  ${exe} generate secret JWT_SECRET > '${oauth2JwtSecret}'
-              fi
+            chmod u+w '${runConfig}'
+            ${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}'
+            ${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}'
+            ${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}'
+            ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'
 
-              ${lib.optionalString cfg.lfs.enable ''
-                if [ ! -s '${lfsJwtSecret}' ]; then
-                    ${exe} generate secret LFS_JWT_SECRET > '${lfsJwtSecret}'
-                fi
-              ''}
+            ${lib.optionalString cfg.lfs.enable ''
+              ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
+            ''}
 
-              if [ ! -s '${internalToken}' ]; then
-                  ${exe} generate secret INTERNAL_TOKEN > '${internalToken}'
-              fi
+            ${lib.optionalString (cfg.camoHmacKeyFile != null) ''
+              ${replaceSecretBin} '#hmackey#' '${cfg.camoHmacKeyFile}' '${runConfig}'
+            ''}
 
-              chmod u+w '${runConfig}'
-              ${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}'
-              ${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}'
-              ${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}'
-              ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'
+            ${lib.optionalString (cfg.mailerPasswordFile != null) ''
+              ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}'
+            ''}
 
-              ${lib.optionalString cfg.lfs.enable ''
-                ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
-              ''}
+            ${lib.optionalString (cfg.metricsTokenFile != null) ''
+              ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}'
+            ''}
 
-              ${lib.optionalString (cfg.camoHmacKeyFile != null) ''
-                ${replaceSecretBin} '#hmackey#' '${cfg.camoHmacKeyFile}' '${runConfig}'
-              ''}
-
-              ${lib.optionalString (cfg.mailerPasswordFile != null) ''
-                ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}'
-              ''}
-
-              ${lib.optionalString (cfg.metricsTokenFile != null) ''
-                ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}'
-              ''}
-
-              ${lib.optionalString (cfg.captcha.secretFile != null) ''
-                ${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}'
-              ''}
-              chmod u-w '${runConfig}'
-            }
-            (umask 027; gitea_setup)
-          ''}
+            ${lib.optionalString (cfg.captcha.secretFile != null) ''
+              ${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}'
+            ''}
+            chmod u-w '${runConfig}'
+          }
+          (umask 027; gitea_setup)
 
           # run migrations/init the database
           ${exe} migrate

From 37a85289a0fa76d0783e849c09f33600d442cb2e Mon Sep 17 00:00:00 2001
From: Sam Connelly <myclevorname@gmail.com>
Date: Wed, 4 Jun 2025 12:02:59 -0400
Subject: [PATCH 1045/1497] maintainers: drop clevor

---
 maintainers/maintainer-list.nix                    | 6 ------
 pkgs/applications/science/math/cemu-ti/default.nix | 2 +-
 pkgs/by-name/co/convbin/package.nix                | 2 +-
 pkgs/by-name/co/convfont/package.nix               | 2 +-
 pkgs/by-name/co/convimg/package.nix                | 2 +-
 pkgs/by-name/fa/fasmg/package.nix                  | 5 +----
 pkgs/by-name/li/libticables2/package.nix           | 5 +----
 pkgs/by-name/li/libticalcs2/package.nix            | 5 +----
 pkgs/by-name/li/libticonv/package.nix              | 5 +----
 pkgs/by-name/li/libtifiles2/package.nix            | 5 +----
 pkgs/by-name/me/metadata/package.nix               | 2 +-
 pkgs/by-name/ti/tilem/package.nix                  | 5 +----
 12 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5314a22833d1..070342a3427d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4752,12 +4752,6 @@
     githubId = 848609;
     name = "Michael Bishop";
   };
-  clevor = {
-    email = "myclevorname@gmail.com";
-    github = "myclevorname";
-    githubId = 140354451;
-    name = "Samuel Connelly";
-  };
   clkamp = {
     email = "c@lkamp.de";
     github = "clkamp";
diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix
index 8de76351a7e8..896cb8d9c84b 100644
--- a/pkgs/applications/science/math/cemu-ti/default.nix
+++ b/pkgs/applications/science/math/cemu-ti/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "CEmu";
     homepage = "https://ce-programming.github.io/CEmu";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ clevor ];
+    maintainers = with maintainers; [ ];
     platforms = [
       "x86_64-linux"
       "x86_64-darwin"
diff --git a/pkgs/by-name/co/convbin/package.nix b/pkgs/by-name/co/convbin/package.nix
index 512c0d6b889d..3812fbf4d810 100644
--- a/pkgs/by-name/co/convbin/package.nix
+++ b/pkgs/by-name/co/convbin/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/mateoconlechuga/convbin";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ clevor ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
     mainProgram = "convbin";
   };
diff --git a/pkgs/by-name/co/convfont/package.nix b/pkgs/by-name/co/convfont/package.nix
index d740f068ea56..dd1423897667 100644
--- a/pkgs/by-name/co/convfont/package.nix
+++ b/pkgs/by-name/co/convfont/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     description = "Converts font for use with FontLibC";
     homepage = "https://github.com/drdnar/convfont";
     license = lib.licenses.unfree;
-    maintainers = with maintainers; [ clevor ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
     mainProgram = "convfont";
   };
diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix
index 202cc987b1f4..1d9a3863dbc9 100644
--- a/pkgs/by-name/co/convimg/package.nix
+++ b/pkgs/by-name/co/convimg/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/mateoconlechuga/convimg";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ clevor ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
     mainProgram = "convimg";
   };
diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index 66a20c9129e9..f12836e2f42f 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -90,10 +90,7 @@ stdenv.mkDerivation rec {
     mainProgram = "fasmg";
     homepage = "https://flatassembler.net";
     license = licenses.bsd3;
-    maintainers = with maintainers; [
-      orivej
-      clevor
-    ];
+    maintainers = with maintainers; [ orivej ];
     platforms = with platforms; intersectLists (linux ++ darwin) x86;
   };
 }
diff --git a/pkgs/by-name/li/libticables2/package.nix b/pkgs/by-name/li/libticables2/package.nix
index 162b8332c7f5..b2ed22b27cd2 100644
--- a/pkgs/by-name/li/libticables2/package.nix
+++ b/pkgs/by-name/li/libticables2/package.nix
@@ -69,10 +69,7 @@ stdenv.mkDerivation rec {
     description = "This library is part of the TiLP framework";
     homepage = "http://lpg.ticalc.org/prj_tilp/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
-      siraben
-      clevor
-    ];
+    maintainers = with maintainers; [ siraben ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/li/libticalcs2/package.nix b/pkgs/by-name/li/libticalcs2/package.nix
index 4d488f260ef1..9cc1111328cc 100644
--- a/pkgs/by-name/li/libticalcs2/package.nix
+++ b/pkgs/by-name/li/libticalcs2/package.nix
@@ -44,10 +44,7 @@ stdenv.mkDerivation rec {
     description = "This library is part of the TiLP framework";
     homepage = "http://lpg.ticalc.org/prj_tilp/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
-      siraben
-      clevor
-    ];
+    maintainers = with maintainers; [ siraben ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/li/libticonv/package.nix b/pkgs/by-name/li/libticonv/package.nix
index 5ef5348b7947..395f5e002023 100644
--- a/pkgs/by-name/li/libticonv/package.nix
+++ b/pkgs/by-name/li/libticonv/package.nix
@@ -33,10 +33,7 @@ stdenv.mkDerivation rec {
     description = "This library is part of the TiLP framework";
     homepage = "http://lpg.ticalc.org/prj_tilp/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
-      siraben
-      clevor
-    ];
+    maintainers = with maintainers; [ siraben ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/li/libtifiles2/package.nix b/pkgs/by-name/li/libtifiles2/package.nix
index 6e2536604407..b5a1dbdb5ee5 100644
--- a/pkgs/by-name/li/libtifiles2/package.nix
+++ b/pkgs/by-name/li/libtifiles2/package.nix
@@ -33,10 +33,7 @@ stdenv.mkDerivation rec {
     description = "This library is part of the TiLP framework";
     homepage = "http://lpg.ticalc.org/prj_tilp/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
-      siraben
-      clevor
-    ];
+    maintainers = with maintainers; [ siraben ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix
index f9232b849ae1..df03dae973ef 100644
--- a/pkgs/by-name/me/metadata/package.nix
+++ b/pkgs/by-name/me/metadata/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage {
 
   meta = {
     description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg";
-    maintainers = with lib.maintainers; [ clevor ];
+    maintainers = with lib.maintainers; [ ];
     license = lib.licenses.mit;
     homepage = "https://github.com/zmwangx/metadata";
     mainProgram = "metadata";
diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix
index a5caea4922cc..9fee7818b287 100644
--- a/pkgs/by-name/ti/tilem/package.nix
+++ b/pkgs/by-name/ti/tilem/package.nix
@@ -33,10 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "http://lpg.ticalc.org/prj_tilem/";
     description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
-      siraben
-      clevor
-    ];
+    maintainers = with maintainers; [ siraben ];
     platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "tilem2";
   };

From a4778902695dc35a66b173b73608b55d7b4044b0 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 4 Jun 2025 09:03:20 -0700
Subject: [PATCH 1046/1497] python3Packages.firebase-admin: disable flaky tests
 for all platforms

Tests that were marked as flaky on darwin fail on other platforms in Hydra. Disabled for all.
---
 .../python-modules/firebase-admin/default.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/firebase-admin/default.nix b/pkgs/development/python-modules/firebase-admin/default.nix
index 4d87e969cec1..d2d91cfe4bfe 100644
--- a/pkgs/development/python-modules/firebase-admin/default.nix
+++ b/pkgs/development/python-modules/firebase-admin/default.nix
@@ -50,18 +50,16 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTests =
-    [
-      # Flaky (AssertionError)
-      # >       assert delta <= timedelta(seconds=15)
-      # E       assert datetime.timedelta(seconds=17, microseconds=28239) <= datetime.timedelta(seconds=15)
-      "test_task_options"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky / timing sensitive
-      "test_expired_cookie_with_tolerance"
-      "test_expired_token_with_tolerance"
-    ];
+  disabledTests = [
+    # Flaky (AssertionError)
+    # >       assert delta <= timedelta(seconds=15)
+    # E       assert datetime.timedelta(seconds=17, microseconds=28239) <= datetime.timedelta(seconds=15)
+    "test_task_options"
+
+    # Flaky / timing sensitive
+    "test_expired_cookie_with_tolerance"
+    "test_expired_token_with_tolerance"
+  ];
 
   meta = {
     description = "Firebase Admin Python SDK";

From d0be8ff24246bb5101b4c1f5cf451f99bf2650de Mon Sep 17 00:00:00 2001
From: Brendan Taylor <bct@diffeq.com>
Date: Wed, 4 Jun 2025 10:05:58 -0600
Subject: [PATCH 1047/1497] nixos/borgmatic: do not use pg_dumpall when a
 format is set (#413251)

---
 nixos/modules/services/backup/borgmatic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix
index 75dbf5fe1c77..632b7e6e72d9 100644
--- a/nixos/modules/services/backup/borgmatic.nix
+++ b/nixos/modules/services/backup/borgmatic.nix
@@ -25,7 +25,7 @@ let
         in
         {
           pg_dump_command =
-            if d.name == "all" then
+            if d.name == "all" && (!(d ? format) || isNull d.format) then
               "${as_user}${postgresql}/bin/pg_dumpall"
             else
               "${as_user}${postgresql}/bin/pg_dump";

From 2ab69f487dd7a9f0edf97e0a90a23495062c6342 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 4 Jun 2025 09:17:00 -0700
Subject: [PATCH 1048/1497] python3Packages.google-cloud-spanner: disable flaky
 test

`test_retry_helper` is retrying too quickly on fast machines.
---
 .../development/python-modules/google-cloud-spanner/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index a580a84ded06..4cd1785cbc7b 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -94,6 +94,8 @@ buildPythonPackage rec {
     "test_generate_client_hash"
     # Flaky, compares to execution time
     "test_snapshot_read_concurrent"
+    # Flaky, can retry too quickly and fail
+    "test_retry_helper"
   ];
 
   disabledTestPaths = [

From 076a9680992a478de62ec53c15ae2773977ce7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 4 Jun 2025 18:23:17 +0200
Subject: [PATCH 1049/1497] dnscontrol: 4.20.0 -> 4.21.0

Diff: https://github.com/StackExchange/dnscontrol/compare/refs/tags/v4.20.0...refs/tags/v4.21.0

Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.21.0
---
 pkgs/by-name/dn/dnscontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index b152cb2a70e3..c20f49edb89d 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.20.0";
+  version = "4.21.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     tag = "v${version}";
-    hash = "sha256-GiwmSAcExafo5fJcdNsMF8BuvHdUaNoCLpl5y1pautw=";
+    hash = "sha256-M1Ertf/0GBICci8CV/LyfuubsVTvQ1dql7hDKuHGM6k=";
   };
 
-  vendorHash = "sha256-8KSqPDEI5gmxzcgFsaCzeXzYN6tO9Fjq7rnQN/vSThw=";
+  vendorHash = "sha256-BTysXvuE+LOHkUhsV+p8+5VOFcMUidz2i7uo2fdzyXg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 32b9dc0f982f60958e3250a15b8a15e81f666e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 09:25:23 -0700
Subject: [PATCH 1050/1497] python3Packages.aiokem: 0.5.12 -> 1.0.1

Diff: https://github.com/kohlerlibs/aiokem/compare/refs/tags/v0.5.12...refs/tags/v1.0.1

Changelog: https://github.com/kohlerlibs/aiokem/blob/v1.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiokem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiokem/default.nix b/pkgs/development/python-modules/aiokem/default.nix
index 1ff1e3d60909..04b1cf6fd5bb 100644
--- a/pkgs/development/python-modules/aiokem/default.nix
+++ b/pkgs/development/python-modules/aiokem/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiokem";
-  version = "0.5.12";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "kohlerlibs";
     repo = "aiokem";
     tag = "v${version}";
-    hash = "sha256-/NbPKN47aSfM7SllP04fHXV2fr+QQRr1x6NfbpeTfzc=";
+    hash = "sha256-1mhsHoHttMMdMkHJ4awDHQhoMHWLHnNkeC6scEd25Z4=";
   };
 
   build-system = [ setuptools ];

From 4088d097677747298b919d373c5b32f232416fe8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 4 Jun 2025 16:28:50 +0000
Subject: [PATCH 1051/1497] orpie: Refactor and hardcode orpie attribute and
 rev -> tag

---
 pkgs/applications/misc/orpie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index 0783d9cf16bf..8c99c0830ca0 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -10,9 +10,9 @@ ocamlPackages.buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "pelzlpj";
-    repo = pname;
-    rev = "release-${version}";
-    sha256 = "1rx2nl6cdv609pfymnbq53pi3ql5fr4kda8x10ycd9xq2gc4f21g";
+    repo = "orpie";
+    tag = "release-${version}";
+    sha256 = "sha256-LwhH2BO4p8Y8CB2pNkl2heIR7yh42erdTcDsxgy1ouc=";
   };
 
   patches = [ ./prefix.patch ];

From ecb9bc83b2987d9a8382df8842662a47d619e738 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 00:21:48 +0200
Subject: [PATCH 1052/1497] miniserve: use finalAttrs pattern

---
 pkgs/by-name/mi/miniserve/package.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 70196d7d6bcc..39903d1a37c0 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -7,27 +7,23 @@
   curl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "miniserve";
   version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
   };
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw=";
 
-  nativeBuildInputs = [
-    installShellFiles
-  ];
+  nativeBuildInputs = [ installShellFiles ];
 
-  nativeCheckInputs = [
-    curl
-  ];
+  nativeCheckInputs = [ curl ];
 
   checkFlags = [
     "--skip=bind_ipv4_ipv6::case_2"
@@ -52,9 +48,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";
-    changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "miniserve";
   };
-}
+})

From 9d88cb90f604908751bf05e059c1f90d6ad0dc8e Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 00:22:21 +0200
Subject: [PATCH 1053/1497] miniserve: use tag in fetchFromGitHub

---
 pkgs/by-name/mi/miniserve/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 39903d1a37c0..756224465e2f 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
   };
 

From f31bcc275d301e67062b07c43b5bb0793204bc81 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 00:26:46 +0200
Subject: [PATCH 1054/1497] miniserve: add versionCheckHook

---
 pkgs/by-name/mi/miniserve/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 756224465e2f..140e01be1e36 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   stdenv,
   curl,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";

From d4f2f43e48137eae7e24500b6b80b6e1a1a8a5a4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 00:32:06 +0200
Subject: [PATCH 1055/1497] miniserve: add updateScript

---
 pkgs/by-name/mi/miniserve/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 140e01be1e36..98f171be57d8 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -6,6 +6,7 @@
   stdenv,
   curl,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";

From 5058f4a040ee547c16e2f24fc63998ef60adbba5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 29 May 2025 22:42:50 +0000
Subject: [PATCH 1056/1497] miniserve: 0.28.0 -> 0.29.0

---
 pkgs/by-name/mi/miniserve/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 98f171be57d8..c89b69b28fb6 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -2,7 +2,10 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  pkg-config,
   installShellFiles,
+  openssl,
+  cacert,
   stdenv,
   curl,
   versionCheckHook,
@@ -11,21 +14,29 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "miniserve";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "miniserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U=";
+    hash = "sha256-HHTNBqMYf7WrqJl5adPmH87xfrzV4TKJckpwTPiiw7w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw=";
+  cargoHash = "sha256-Rjql9cyw7RS66HE50iUrjNvS5JRhR1HBaalOY9eDGH4=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
 
-  nativeCheckInputs = [ curl ];
+  buildInputs = [ openssl ];
+
+  nativeCheckInputs = [
+    curl
+    cacert
+  ];
 
   checkFlags = [
     "--skip=bind_ipv4_ipv6::case_2"

From 529d5138d6b582c7530b864ea4e9efecaf669079 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 30 May 2025 00:43:05 +0200
Subject: [PATCH 1057/1497] miniserve: add defelo as maintainer

---
 pkgs/by-name/mi/miniserve/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index c89b69b28fb6..34f88c26958e 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -69,7 +69,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/svenstaro/miniserve";
     changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [
+      figsoda
+      defelo
+    ];
     mainProgram = "miniserve";
   };
 })

From 3aac00b659b351c05f2f818468c7d8054076c680 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:06 +0300
Subject: [PATCH 1058/1497] linux_6_15: 6.15 -> 6.15.1

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e15de15e0df9..932c680103ed 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -36,7 +36,7 @@
         "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r"
     },
     "6.15": {
-        "version": "6.15",
-        "hash": "sha256:0r4ppfd5kwvj24bjig92hxa18lmjgy9gqvh5qknfffw08wjrd1km"
+        "version": "6.15.1",
+        "hash": "sha256:0r0dkxwhp4qrihfvbk4ppvyciin1iv9qbp76w2ppnbjizs2bpwa4"
     }
 }

From cf7e137ae9feeced3b397a60b83a819d8242f3cc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:09 +0300
Subject: [PATCH 1059/1497] linux_6_14: 6.14.9 -> 6.14.10

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 932c680103ed..c14a1556301c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,8 +32,8 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.9",
-        "hash": "sha256:0qgkr69745al6nf4wicxq284xnsmxybh29r7hjh2b6bi6bhds31r"
+        "version": "6.14.10",
+        "hash": "sha256:0hzylab1gh791qpi5albv5wcjz0m7hrs4k7f6bw24k77xb7rg2yy"
     },
     "6.15": {
         "version": "6.15.1",

From e21df292407fcce5215ab402645847ae143cffac Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:11 +0300
Subject: [PATCH 1060/1497] linux_6_12: 6.12.31 -> 6.12.32

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index c14a1556301c..1231306b9ad1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -24,8 +24,8 @@
         "hash": "sha256:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
     },
     "6.12": {
-        "version": "6.12.31",
-        "hash": "sha256:19sba8zak31gn89pzfa3kb9rv7y9z8kybvyikigamq7nblz5nk5h"
+        "version": "6.12.32",
+        "hash": "sha256:0w3a6k0cbdanknlha3qjyvvmhh3xks9d6xq1043laf3q2xr21c59"
     },
     "6.13": {
         "version": "6.13.12",

From 1a8f6c1a58c5ba2f95b6340ffd2b5a797b678cbb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:14 +0300
Subject: [PATCH 1061/1497] linux_6_6: 6.6.92 -> 6.6.93

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 1231306b9ad1..14fe4bbd4bf3 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
     },
     "6.6": {
-        "version": "6.6.92",
-        "hash": "sha256:1v1pq9yzxrlaxx4y4cj5q3wska0jbv2inc7phqfw70fj88kai0hx"
+        "version": "6.6.93",
+        "hash": "sha256:06bpg5vvh165znzn01mqab2divrsbznxwc73y44z1s9mjqszyy8d"
     },
     "6.12": {
         "version": "6.12.32",

From 055441950dbc8e52d8c7c79179e8511c90481aba Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:18 +0300
Subject: [PATCH 1062/1497] linux_6_1: 6.1.140 -> 6.1.141

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 14fe4bbd4bf3..13a72f15e618 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0b9149pyg4lzzxqwx6sg8nz9ca1md7aijg9nrcagrq9sypl53hxn"
     },
     "6.1": {
-        "version": "6.1.140",
-        "hash": "sha256:0x7b856hxmli8qnkps9x62q8sca101v4sfwjqgivzxvprb5gjyap"
+        "version": "6.1.141",
+        "hash": "sha256:05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w"
     },
     "5.15": {
         "version": "5.15.184",

From 34c78b3e6b9e6ecfdc7f15e0736ec2665ea758d3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:27 +0300
Subject: [PATCH 1063/1497] linux_5_15: 5.15.184 -> 5.15.185

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 13a72f15e618..227103ee3347 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -8,8 +8,8 @@
         "hash": "sha256:05n1561cbzaw9vcxp86bqzvhqz5wv7dajpy7cq34bw7myvx4ag5w"
     },
     "5.15": {
-        "version": "5.15.184",
-        "hash": "sha256:1nf1v89ikwi9philrw6h03hzb085mwz44lfxx71agp67vk39hglw"
+        "version": "5.15.185",
+        "hash": "sha256:1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx"
     },
     "5.10": {
         "version": "5.10.237",

From 535c5c25b76ec2e35cfa0420681182e9de855906 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:30 +0300
Subject: [PATCH 1064/1497] linux_5_10: 5.10.237 -> 5.10.238

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 227103ee3347..3f05632b5453 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -12,8 +12,8 @@
         "hash": "sha256:1p0kjc09qqv361phscny1gqj38di9dpab9gxywljkwqhi5wyn0rx"
     },
     "5.10": {
-        "version": "5.10.237",
-        "hash": "sha256:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"
+        "version": "5.10.238",
+        "hash": "sha256:1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07"
     },
     "5.4": {
         "version": "5.4.293",

From 9a1847622677ebcc755d521d39bba56c8dea46bd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 4 Jun 2025 19:36:36 +0300
Subject: [PATCH 1065/1497] linux_5_4: 5.4.293 -> 5.4.294

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 3f05632b5453..2837223e4330 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -16,8 +16,8 @@
         "hash": "sha256:1dkblixa0as9h11m081dqq8vlz4dcjbzdz7phkz07p621na55j07"
     },
     "5.4": {
-        "version": "5.4.293",
-        "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
+        "version": "5.4.294",
+        "hash": "sha256:16bv0x4c9ssr66vrd6jnv2dw5na1y7hxfn4d67g0zaksh6xd0yf8"
     },
     "6.6": {
         "version": "6.6.93",

From 4410ac3485f7f692baf480793171580e03672124 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 18:37:40 +0200
Subject: [PATCH 1066/1497] python3Packages.granian: only use rust-jemalloc-sys
 on aarch64

---
 pkgs/development/python-modules/granian/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 2698683c3a55..6c9b5ceba619 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   rustPlatform,
   cacert,
@@ -40,9 +41,10 @@ buildPythonPackage rec {
     maturinBuildHook
   ];
 
-  buildInputs = [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isAarch64) [
     # fix "Unsupported system page size" on aarch64-linux with 16k pages
     # https://github.com/NixOS/nixpkgs/issues/410572
+    # only enabled on aarch64 due to https://github.com/NixOS/nixpkgs/pull/410611#issuecomment-2939564567
     (rust-jemalloc-sys.overrideAttrs (
       { configureFlags, ... }:
       {

From 46ef95aff69d0cadda05591df6e98c0e4253c950 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Jun 2025 18:42:17 +0200
Subject: [PATCH 1067/1497] pihole: remove leftover file

---
 sync.sh | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100755 sync.sh

diff --git a/sync.sh b/sync.sh
deleted file mode 100755
index a72a4defd47d..000000000000
--- a/sync.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-local_root=~/.config/nix/
-nixpkgs_root="$(dirname "$0")"
-
-cp "$local_root"/modules/pihole-ftl* "$nixpkgs_root"/nixos/modules/services/networking/
-cp "$local_root"/modules/pihole-web* "$nixpkgs_root"/nixos/modules/services/web-apps/
-
-cp -r "$local_root"/pkgs/pihole* "$nixpkgs_root"/pkgs/by-name/pi/
-cp -r "$local_root"/modules/pihole-web* "$nixpkgs_root"/nixos/modules/services/web-apps/

From 97262ee87192c8bd8e95540a3e97e96dea1ddac8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 4 Jun 2025 18:54:50 +0200
Subject: [PATCH 1068/1497] treewide: replace `stdenv.is` with
 `stdenv.hostPlatform.is`

---
 nixos/tests/mattermost/default.nix                    |  2 +-
 pkgs/by-name/ac/actual-server/package.nix             |  2 +-
 pkgs/by-name/ag/age-plugin-se/package.nix             |  2 +-
 pkgs/by-name/ak/akkoma-admin-fe/package.nix           |  2 +-
 pkgs/by-name/ar/ares-rs/package.nix                   |  2 +-
 pkgs/by-name/ar/arp-scan-rs/package.nix               |  2 +-
 pkgs/by-name/bi/bicep-lsp/package.nix                 |  6 +++---
 pkgs/by-name/ca/camilladsp/package.nix                |  2 +-
 pkgs/by-name/ca/cargo-bazel/package.nix               |  2 +-
 pkgs/by-name/cl/cloud-provider-kind/package.nix       |  2 +-
 pkgs/by-name/fl/fluent-bit/package.nix                |  2 +-
 pkgs/by-name/gc/gcc-arm-embedded-13/package.nix       |  6 +++---
 pkgs/by-name/gc/gcc-arm-embedded-14/package.nix       |  6 +++---
 pkgs/by-name/gz/gz-cmake/package.nix                  |  2 +-
 pkgs/by-name/ht/http-scanner/package.nix              |  2 +-
 pkgs/by-name/ja/jai/package.nix                       |  2 +-
 pkgs/by-name/li/libcdio/package.nix                   |  2 +-
 pkgs/by-name/ma/matrix-brandy/package.nix             |  4 ++--
 pkgs/by-name/mu/musl-obstack/package.nix              |  2 +-
 pkgs/by-name/mu/muvm/package.nix                      |  4 ++--
 pkgs/by-name/ne/neofetch/package.nix                  |  6 ++++--
 pkgs/by-name/os/osu-lazer-bin/package.nix             |  2 +-
 pkgs/by-name/ov/ovftool/package.nix                   |  2 +-
 pkgs/by-name/rp/rp/package.nix                        |  4 ++--
 pkgs/by-name/ry/ryubing/package.nix                   |  2 +-
 pkgs/by-name/sp/spider/package.nix                    |  2 +-
 pkgs/by-name/yn/ynetd/package.nix                     |  2 +-
 pkgs/development/beam-modules/build-mix.nix           |  4 ++--
 pkgs/development/beam-modules/mix-release.nix         |  4 ++--
 pkgs/development/compilers/dotnet/packages.nix        | 11 +++++++----
 .../compilers/elm/packages/node/node-composition.nix  |  2 +-
 .../libraries/qt-6/modules/qtdeclarative/default.nix  |  2 +-
 pkgs/development/lisp-modules/imported.nix            |  4 ++--
 pkgs/development/mobile/androidenv/build-tools.nix    |  2 +-
 pkgs/development/php-packages/tideways/default.nix    |  2 +-
 .../python-modules/cut-cross-entropy/default.nix      |  2 +-
 pkgs/development/python-modules/fmpy/default.nix      |  2 +-
 pkgs/development/python-modules/peft/default.nix      |  2 +-
 .../prometheus-fastapi-instrumentator/default.nix     |  2 +-
 pkgs/development/python-modules/pygal/default.nix     |  2 +-
 .../development/python-modules/smolagents/default.nix |  2 +-
 pkgs/development/python-modules/vllm/default.nix      |  2 +-
 pkgs/servers/nextcloud/packages/apps/recognize.nix    |  2 +-
 pkgs/tools/system/uefitool/new-engine.nix             |  2 +-
 44 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 4cb9845df880..b3588c51c7a7 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -569,7 +569,7 @@ import ../make-test-python.nix (
             shutdown_queue.task_done()
         threading.Thread(target=shutdown_worker, daemon=True).start()
 
-        ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
+        ${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
           # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
           run_mattermost_tests(
             shutdown_queue,
diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix
index 51a33635dbff..55ab234532fa 100644
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -208,7 +208,7 @@ stdenv.mkDerivation {
     mainProgram = "actual-server";
     license = lib.licenses.mit;
     # https://github.com/NixOS/nixpkgs/issues/403846
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = [
       lib.maintainers.oddlama
       lib.maintainers.patrickdag
diff --git a/pkgs/by-name/ag/age-plugin-se/package.nix b/pkgs/by-name/ag/age-plugin-se/package.nix
index 49f485ee2b64..b1b27481805d 100644
--- a/pkgs/by-name/ag/age-plugin-se/package.nix
+++ b/pkgs/by-name/ag/age-plugin-se/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # Can't find libdispatch without this on NixOS. (swift 5.8)
-  LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib";
+  LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib";
 
   postPatch =
     let
diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
index e4b47dd374e9..5560eefa7f8b 100644
--- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix
+++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     git
     libsass
-  ] ++ lib.optional stdenv.isDarwin xcbuild;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix
index 4e7ba2a2b08e..54fb178582b6 100644
--- a/pkgs/by-name/ar/ares-rs/package.nix
+++ b/pkgs/by-name/ar/ares-rs/package.nix
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "ares";
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix
index adaa18ee35e6..99dff3f52957 100644
--- a/pkgs/by-name/ar/arp-scan-rs/package.nix
+++ b/pkgs/by-name/ar/arp-scan-rs/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "arp-scan";
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/bi/bicep-lsp/package.nix b/pkgs/by-name/bi/bicep-lsp/package.nix
index 9fdb1381dc86..3f8172b0fe4a 100644
--- a/pkgs/by-name/bi/bicep-lsp/package.nix
+++ b/pkgs/by-name/bi/bicep-lsp/package.nix
@@ -34,16 +34,16 @@ buildDotnetModule rec {
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
-  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  buildInputs = lib.optionals stdenv.isLinux [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     icu
     libkrb5
     openssl
     stdenv.cc.cc.lib
   ];
 
-  doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin
+  doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin
 
   meta = {
     description = "Domain Specific Language (DSL) for deploying Azure resources declaratively";
diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix
index 33995fcba6f8..753bae7f1c39 100644
--- a/pkgs/by-name/ca/camilladsp/package.nix
+++ b/pkgs/by-name/ca/camilladsp/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     libpulseaudio
     openssl
-  ] ++ lib.optionals stdenv.isLinux [ alsa-lib ];
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
 
diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix
index 9816cd19f6fc..8a93a9e88489 100644
--- a/pkgs/by-name/ca/cargo-bazel/package.nix
+++ b/pkgs/by-name/ca/cargo-bazel/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios=";
   };
 
-  buildInputs = lib.optional stdenv.isDarwin libz;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libz;
 
   useFetchCargoVendor = true;
   cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E=";
diff --git a/pkgs/by-name/cl/cloud-provider-kind/package.nix b/pkgs/by-name/cl/cloud-provider-kind/package.nix
index 6f9842e4153f..446dadb03a55 100644
--- a/pkgs/by-name/cl/cloud-provider-kind/package.nix
+++ b/pkgs/by-name/cl/cloud-provider-kind/package.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  checkFlags = lib.optional stdenv.isDarwin "-skip=^Test_firstSuccessfulProbe$";
+  checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^Test_firstSuccessfulProbe$";
 
   meta = {
     description = "Load Balancer implementation for Kubernetes-in-Docker";
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 796fd3d9ef78..829d03a6f055 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
   versionCheckProgramArg = "--version";
 
   passthru = {
-    tests = lib.optionalAttrs stdenv.isLinux {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit (nixosTests) fluent-bit;
     };
 
diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
index f955b0ed54a1..7cca0d7ed5d5 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     ./info-fix.patch
   ];
 
-  nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     makeBinaryWrapper
     darwin.sigtool
   ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
       find $out -type f | while read f; do
         patchelf "$f" > /dev/null 2>&1 || continue
         patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
         } "$f" || true
       done
     ''
-    + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
       find "$out" -executable -type f | while read executable; do
         ( \
           install_name_tool \
diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
index 960225011253..253705829c2e 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 
-  nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     makeBinaryWrapper
     darwin.sigtool
   ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
       find $out -type f | while read f; do
         patchelf "$f" > /dev/null 2>&1 || continue
         patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
         } "$f" || true
       done
     ''
-    + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
       find "$out" -executable -type f | while read executable; do
         ( \
           install_name_tool \
diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix
index 38a825b0d4ab..c5995dae8250 100644
--- a/pkgs/by-name/gz/gz-cmake/package.nix
+++ b/pkgs/by-name/gz/gz-cmake/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs examples/test_c_child_requires_c_no_deps.bash
     substituteInPlace examples/CMakeLists.txt --replace-fail \
-      "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.isDarwin then "lib" else "lib64"}"
+      "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ht/http-scanner/package.nix b/pkgs/by-name/ht/http-scanner/package.nix
index 80d7378aaff2..48197af89519 100644
--- a/pkgs/by-name/ht/http-scanner/package.nix
+++ b/pkgs/by-name/ht/http-scanner/package.nix
@@ -31,6 +31,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "http-scanner";
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index 17dabf41a899..b675790b0cd6 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -37,7 +37,7 @@ let
     ];
   };
 in
-if stdenv.isLinux then
+if stdenv.hostPlatform.isLinux then
   buildFHSEnv {
     inherit meta pname version;
     targetPkgs = pkgs: [ pkgs.zlib ];
diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix
index 94a8d43df4b4..026248eedfd3 100644
--- a/pkgs/by-name/li/libcdio/package.nix
+++ b/pkgs/by-name/li/libcdio/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM=";
   };
 
-  env = lib.optionalAttrs stdenv.is32bit {
+  env = lib.optionalAttrs stdenv.hostPlatform.is32bit {
     NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
   };
 
diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix
index 2adc72a2e897..7c46b34b6c77 100644
--- a/pkgs/by-name/ma/matrix-brandy/package.nix
+++ b/pkgs/by-name/ma/matrix-brandy/package.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
     hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8=";
   };
 
-  patches = lib.optionals stdenv.isDarwin [ ./no-lrt.patch ];
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-lrt.patch ];
 
-  makeFlags = lib.optionals stdenv.isDarwin [
+  makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     "CC=cc"
     "LD=clang"
   ];
diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix
index dfe19c50b41f..8de4fee17b2b 100644
--- a/pkgs/by-name/mu/musl-obstack/package.nix
+++ b/pkgs/by-name/mu/musl-obstack/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8=";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [
     ./0001-ignore-obstack_free-alias-on-darwin.patch
   ];
 
diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix
index 7b59f1052e20..38c9e4e0feaf 100644
--- a/pkgs/by-name/mu/muvm/package.nix
+++ b/pkgs/by-name/mu/muvm/package.nix
@@ -39,7 +39,7 @@ let
     dhcpcd
     passt
     (placeholder "out")
-  ] ++ lib.optionals stdenv.isAarch64 [ fex ];
+  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ fex ];
   wrapArgs = lib.escapeShellArgs [
     "--prefix"
     "PATH"
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
         --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}"
     ''
     # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way
-    + lib.optionalString stdenv.isAarch64 ''
+    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
       substituteInPlace crates/muvm/src/guest/mount.rs \
         --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu"
     '';
diff --git a/pkgs/by-name/ne/neofetch/package.nix b/pkgs/by-name/ne/neofetch/package.nix
index 62d70f751447..f4ba8f9ec05c 100644
--- a/pkgs/by-name/ne/neofetch/package.nix
+++ b/pkgs/by-name/ne/neofetch/package.nix
@@ -5,7 +5,7 @@
   bash,
   makeWrapper,
   pciutils,
-  x11Support ? !stdenvNoCC.isOpenBSD,
+  x11Support ? !stdenvNoCC.hostPlatform.isOpenBSD,
   ueberzug,
   fetchpatch,
 }:
@@ -56,7 +56,9 @@ stdenvNoCC.mkDerivation {
   postInstall = ''
     wrapProgram $out/bin/neofetch \
       --prefix PATH : ${
-        lib.makeBinPath (lib.optional (!stdenvNoCC.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug)
+        lib.makeBinPath (
+          lib.optional (!stdenvNoCC.hostPlatform.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug
+        )
       }
   '';
 
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index ff542b27c083..e9461773bafe 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -55,7 +55,7 @@ let
 
   passthru.updateScript = ./update.sh;
 in
-if stdenvNoCC.isDarwin then
+if stdenvNoCC.hostPlatform.isDarwin then
   stdenvNoCC.mkDerivation {
     inherit
       pname
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 3176c2f5c4c8..0e6f07d773e6 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -341,7 +341,7 @@ stdenv.mkDerivation (final: {
     ];
     platforms = builtins.attrNames ovftoolSystems;
     mainProgram = "ovftool";
-    knownVulnerabilities = lib.optionals (stdenv.isDarwin) [
+    knownVulnerabilities = lib.optionals (stdenv.hostPlatform.isDarwin) [
       "The bundled version of openssl 1.0.2zj in ovftool for Darwin has open vulnerabilities."
       "https://openssl-library.org/news/vulnerabilities-1.0.2/"
       "CVE-2024-0727"
diff --git a/pkgs/by-name/rp/rp/package.nix b/pkgs/by-name/rp/rp/package.nix
index 7bf1a58aaf73..f9c0e9e61989 100644
--- a/pkgs/by-name/rp/rp/package.nix
+++ b/pkgs/by-name/rp/rp/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     cmake
     ninja
   ];
-  buildInputs = lib.optionals (stdenv.isLinux) [ stdenv.cc.libc.static ];
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ stdenv.cc.libc.static ];
 
   src = fetchFromGitHub {
     owner = "0vercl0k";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp rp-${if stdenv.isDarwin then "osx" else "lin"} $out/bin/rp
+    cp rp-${if stdenv.hostPlatform.isDarwin then "osx" else "lin"} $out/bin/rp
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index a3f1951ef483..d9bcd5c50b1f 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -101,7 +101,7 @@ buildDotnetModule rec {
     "--set SDL_VIDEODRIVER x11"
   ];
 
-  preInstall = lib.optionalString stdenv.isLinux ''
+  preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
     mkdir -p $out/lib/sndio-6
     ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index 146baa27c695..d6e99b8d93e5 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "--skip=pdl_is_fresh"
       "--skip=verify_revision_available"
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Sandbox limitation: attempted to create a NULL object
       "--skip=website::test_link_duplicates"
       "--skip=website::not_crawl_blacklist"
diff --git a/pkgs/by-name/yn/ynetd/package.nix b/pkgs/by-name/yn/ynetd/package.nix
index 80228791058f..5a20bea987a1 100644
--- a/pkgs/by-name/yn/ynetd/package.nix
+++ b/pkgs/by-name/yn/ynetd/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-7gioQ0r0LlUftIWKRwTqeZQl0GtskcRKaEE5z6A0S24=";
   };
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace Makefile --replace-fail "-Wl,-z,relro,-z,now" ""
   '';
 
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index 243028f16365..672054a6640b 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -57,8 +57,8 @@ let
           in
           "[${lib.concatStringsSep "," options}]";
 
-        LANG = if stdenv.isLinux then "C.UTF-8" else "C";
-        LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
+        LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C";
+        LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8";
 
         # add to ERL_LIBS so other modules can find at runtime.
         # http://erlang.org/doc/man/code.html#code-path
diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix
index 59a56b98f012..2ab7f9eaa98a 100644
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@@ -138,8 +138,8 @@ stdenv.mkDerivation (
       in
       "[${lib.concatStringsSep "," options}]";
 
-    LANG = if stdenv.isLinux then "C.UTF-8" else "C";
-    LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
+    LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C";
+    LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8";
 
     postUnpack =
       ''
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index 0ad73f45a886..b75116914e8c 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -162,10 +162,13 @@ let
       runHook postInstall
     '';
 
-    ${if stdenvNoCC.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = ''
-      mkdir -p "$out"/nix-support
-      cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
-    '';
+    ${
+      if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null
+    } =
+      ''
+        mkdir -p "$out"/nix-support
+        cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
+      '';
 
     passthru = {
       inherit (vmr) icu targetRid hasILCompiler;
diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix
index a32e52788e8b..559ecd5fb005 100644
--- a/pkgs/development/compilers/elm/packages/node/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix
@@ -18,7 +18,7 @@ let
       writeShellScript
       ;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index f28a180b5876..2a94c8a6aabf 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -25,7 +25,7 @@ qtModule {
   ];
   strictDeps = true;
 
-  nativeBuildInputs = lib.optionals stdenv.isDarwin [
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.sigtool
   ];
 
diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix
index c1e3f1dbe626..00b6e35b5f2c 100644
--- a/pkgs/development/lisp-modules/imported.nix
+++ b/pkgs/development/lisp-modules/imported.nix
@@ -15922,7 +15922,7 @@ lib.makeScope pkgs.newScope (self: {
       meta = {
         hydraPlatforms = [ ];
         # darwin cannot find libpango.dylib
-        broken = stdenv.isDarwin;
+        broken = stdenv.hostPlatform.isDarwin;
       };
     }
   );
@@ -39541,7 +39541,7 @@ lib.makeScope pkgs.newScope (self: {
       meta = {
         hydraPlatforms = [ ];
         # darwin cannot find libpango.dylib
-        broken = stdenv.isDarwin;
+        broken = stdenv.hostPlatform.isDarwin;
       };
     }
   );
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 9a38383f4ad1..ccbf6b855137 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -23,7 +23,7 @@ deployAndroidPackage {
       pkgs.ncurses5
       pkgs.libcxx
     ]
-    ++ lib.optionals (os == "linux" && stdenv.isx86_64) (
+    ++ lib.optionals (os == "linux" && stdenv.hostPlatform.isx86_64) (
       with pkgsi686Linux;
       [
         glibc
diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix
index 618bd9d960eb..9b3ea0d4d17a 100644
--- a/pkgs/development/php-packages/tideways/default.nix
+++ b/pkgs/development/php-packages/tideways/default.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported platform for tideways-php: ${stdenvNoCC.hostPlatform.system}");
 
-  nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [
+  nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
     autoPatchelfHook
   ];
 
diff --git a/pkgs/development/python-modules/cut-cross-entropy/default.nix b/pkgs/development/python-modules/cut-cross-entropy/default.nix
index 5b20239c56e1..f62b88267c7d 100644
--- a/pkgs/development/python-modules/cut-cross-entropy/default.nix
+++ b/pkgs/development/python-modules/cut-cross-entropy/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage {
       transformers
     ];
     # `deepspeed` is not yet packaged in nixpkgs
-    # ++ lib.optionals (!stdenv.isDarwin) [
+    # ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     #   deepspeed
     # ];
   };
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index 0ea342c526cb..f6913ff42909 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -119,7 +119,7 @@ buildPythonPackage rec {
       cmakeConfigurePhase
       cmake --build native/src/build --config Release
     ''
-    + lib.optionalString (enableRemoting && stdenv.isLinux) ''
+    + lib.optionalString (enableRemoting && stdenv.hostPlatform.isLinux) ''
       # reimplementation of native/build_remoting.py
       cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
       cmakeConfigurePhase
diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix
index 07caadc59cd7..290d5d64e2a5 100644
--- a/pkgs/development/python-modules/peft/default.nix
+++ b/pkgs/development/python-modules/peft/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
   pytestFlagsArray = [ "tests" ];
 
   # These tests fail when MPS devices are detected
-  disabledTests = lib.optional stdenv.isDarwin [
+  disabledTests = lib.optional stdenv.hostPlatform.isDarwin [
     "gpu"
   ];
 
diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
index d60c4c658ad1..5dcc297b38d2 100644
--- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
+++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   ];
 
   # numerous test failures on Darwin
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.hostPlatform.isLinux;
 
   pythonImportsCheck = [ "prometheus_fastapi_instrumentator" ];
 
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index 2585c7dda9f5..48bf2a93bfdf 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   __impureHostDeps = [ "/System/Library/Fonts" ];
 
   postCheck = ''
-    export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"}
+    export LANG=${if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"}
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 8da324604d45..4aa0bfc487c8 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -132,7 +132,7 @@ buildPythonPackage rec {
       "test_visit_webpage"
       "test_wikipedia_search"
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Missing dependencies
       "test_get_mlx"
 
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 7cbfb50fce01..de1ccf5b6539 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -295,7 +295,7 @@ buildPythonPackage rec {
     lib.optionals cpuSupport [
       oneDNN
     ]
-    ++ lib.optionals (cpuSupport && stdenv.isLinux) [
+    ++ lib.optionals (cpuSupport && stdenv.hostPlatform.isLinux) [
       numactl
     ]
     ++ lib.optionals cudaSupport (
diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix
index 1e7fb2570fd4..0845d35f08be 100644
--- a/pkgs/servers/nextcloud/packages/apps/recognize.nix
+++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix
@@ -10,7 +10,7 @@
   ffmpeg-headless,
 
   # Current derivation only supports linux-x86_64 (contributions welcome, without libTensorflow builtin webassembly can be used)
-  useLibTensorflow ? stdenv.isx86_64 && stdenv.isLinux,
+  useLibTensorflow ? stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux,
 
   ncVersion,
 }:
diff --git a/pkgs/tools/system/uefitool/new-engine.nix b/pkgs/tools/system/uefitool/new-engine.nix
index a7d908493728..c177c23078d3 100644
--- a/pkgs/tools/system/uefitool/new-engine.nix
+++ b/pkgs/tools/system/uefitool/new-engine.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     zip
     wrapQtAppsHook
   ];
-  patches = lib.optionals stdenv.isDarwin [ ./bundle-destination.patch ];
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bundle-destination.patch ];
 
   meta = {
     description = "UEFI firmware image viewer and editor";

From 5cd05b7c9bec38ba998fadab2229d3aebcb5b1a5 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 1069/1497] openscad-unstable: 2025-05-17 -> 2025-06-04

---
 pkgs/by-name/op/openscad-unstable/package.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 8b14c7e8cfef..f8a2a0f7be6f 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -30,6 +30,7 @@
   libsForQt5,
   libspnav,
   libzip,
+  manifold,
   mesa,
   mpfr,
   python3,
@@ -45,12 +46,12 @@
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
   pname = "openscad-unstable";
-  version = "2025-05-17";
+  version = "2025-06-04";
   src = fetchFromGitHub {
     owner = "openscad";
     repo = "openscad";
-    rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b";
-    hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg=";
+    rev = "65856c9330f8cc4ffcaccf03d91b4217f2eae28d";
+    hash = "sha256-jozcLFGVSfw8G12oSxHjqUyFtAfENgIByID+omk08mU=";
     fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
   };
 
@@ -87,7 +88,6 @@ clangStdenv.mkDerivation rec {
       eigen
       fontconfig
       freetype
-      ghostscript
       glib
       gmp
       opencsg
@@ -96,6 +96,7 @@ clangStdenv.mkDerivation rec {
       lib3mf
       libspnav
       libzip
+      manifold
       mpfr
       qscintilla
       qtbase
@@ -115,9 +116,7 @@ clangStdenv.mkDerivation rec {
     "-DEXPERIMENTAL=ON" # enable experimental options
     "-DSNAPSHOT=ON" # nightly icons
     "-DUSE_BUILTIN_OPENCSG=OFF"
-    # use builtin manifold: 3.1.0 doesn't pass tests, builtin is 7c8fbe1, between 3.0.1 and 3.1.0
-    # FIXME revisit on version update
-    "-DUSE_BUILTIN_MANIFOLD=ON"
+    "-DUSE_BUILTIN_MANIFOLD=OFF"
     "-DUSE_BUILTIN_CLIPPER2=OFF"
     "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\""
     "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity
@@ -150,14 +149,10 @@ clangStdenv.mkDerivation rec {
   nativeCheckInputs = [
     mesa.llvmpipeHook
     ctestCheckHook
+    ghostscript
   ];
 
   dontUseNinjaCheck = true;
-  checkFlags = [
-    "-E"
-    # some fontconfig issues cause pdf output to have wrong font
-    "pdfexporttest"
-  ];
 
   meta = with lib; {
     description = "3D parametric model compiler (unstable)";

From bd4ae3282774a9414b0aae059410ec09b8a7c62c Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Wed, 4 Jun 2025 19:41:44 +0200
Subject: [PATCH 1070/1497] neohtop: 1.1.2 -> 1.2.0

Changelog: https://github.com/Abdenasser/neohtop/releases/tag/v1.2.0
Diff: https://github.com/Abdenasser/neohtop/compare/v1.1.2...v1.2.0
---
 pkgs/by-name/ne/neohtop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix
index 4ed54a841699..68de52fa7d01 100644
--- a/pkgs/by-name/ne/neohtop/package.nix
+++ b/pkgs/by-name/ne/neohtop/package.nix
@@ -17,23 +17,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "neohtop";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "Abdenasser";
     repo = "neohtop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5hDxMQlDPXf0llu51Hwb/9n0GX0YSvVJUS+RvEiLsnM=";
+    hash = "sha256-a6yHg3LqnVQJPi4+WpsxHjvWC2hZhZZkAFqgOVmfWfg=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-qhAdKLtTQ2iUFc7UNJNeB1Mzbzg/NrGAWrKQTdGiN4Y=";
+    hash = "sha256-t0REXcsy9XIIARiI7lkOc5lO/ZSL50KOUK+SMsXpjdM=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-nYBPvfBzRIJdvfuOZnzs+kuSozlkBB/ImqjDYfvNBrA=";
+  cargoHash = "sha256-nFWF1ER3vk1G/MBw8to+lDJAv6HJNobhdPXV0hVERFE=";
 
   cargoRoot = "src-tauri";
 

From 8a975887b274f3c16aa9d3505dc2f24f06220b6c Mon Sep 17 00:00:00 2001
From: Benedikt Fein <fein@fim.uni-passau.de>
Date: Wed, 4 Jun 2025 19:55:33 +0200
Subject: [PATCH 1071/1497] maintainers: add b-fein

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5314a22833d1..1d93ed698c53 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2645,6 +2645,11 @@
     githubId = 9315;
     name = "Zhong Jianxin";
   };
+  b-fein = {
+    github = "b-fein";
+    githubId = 64250573;
+    name = "Benedikt Fein";
+  };
   b-m-f = {
     email = "maximilian@sodawa.com";
     github = "b-m-f";

From 99b3566b61ef91909bbf2d7c771018bcccff0795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:02:02 +0000
Subject: [PATCH 1072/1497] repomix: 0.3.6 -> 0.3.8

---
 pkgs/by-name/re/repomix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index 5d7b83c81d8b..dc760d7e09cc 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-OTbExzeBHqYVvxXMQVAv+WM4Brvg4BZx2iLGRK6YyIk=";
+    hash = "sha256-yvzZQXBJFroSSb4j+ifzM3Qe/iIFVFDCqyfaJTH/65Q=";
   };
 
-  npmDepsHash = "sha256-Q9j5cGEldwb93+ddsLjDF4FW/U6QkT7xiJLp4eA4Uc0=";
+  npmDepsHash = "sha256-VWW9JkLlk3OoMQ7yneTsUdyepe4bDezoM1t2RxF4zVY=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From c3566866575cea5d5949a531db95893cfe79a81a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:04:08 +0000
Subject: [PATCH 1073/1497] az-pim-cli: 1.6.0 -> 1.6.1

---
 pkgs/by-name/az/az-pim-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index e595583cde3b..28862d6ee308 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zi/DNTroMews4PvPCeLWSq74xWdZ22NO2VtmW91zcfs=";
+    hash = "sha256-gf4VscHaUr3JtsJO5PAq1nyPeJxIwGPaiH/QdXKpvQ0=";
   };
 
-  vendorHash = "sha256-g4NcRNmHXS3mOtE0nbV96vFFoVzGFbAvcj/vkdXshoU=";
+  vendorHash = "sha256-PHrpUlAG/PBe3NKUGBQ1U7dCcqkSlErWX2dp9ZPB3+8=";
 
   nativeBuildInputs = [
     installShellFiles

From c1d477fdb299f32c05900752f56d56f751454e09 Mon Sep 17 00:00:00 2001
From: Tony Wasserka <neobrain@users.noreply.github.com>
Date: Wed, 4 Jun 2025 20:08:40 +0200
Subject: [PATCH 1074/1497] fex: 2505 -> 2506

---
 pkgs/by-name/fe/fex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 1d7c20707fe1..fb4c4ece16f1 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -15,14 +15,14 @@
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2505";
+  version = "2506";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
 
-    hash = "sha256-H/BE+x/lwpED10UrbukWHiKJo0L75/KDV2T5q/J0NiM=";
+    hash = "sha256-wzUAyNCfMlABBd3yzFZkPUiy7spuHrekTqVoyUB9jxI=";
 
     leaveDotGit = true;
     postFetch = ''

From 0a6b7417df35db198888275a2c16a7dd8174220e Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Fri, 30 May 2025 15:47:25 -0500
Subject: [PATCH 1075/1497] efficient-compression-tool: 0.9.1 -> 0.9.5

---
 .../ef/efficient-compression-tool/package.nix |  53 ++++++---
 .../use-nixpkgs-libpng.patch                  | 108 ------------------
 2 files changed, 38 insertions(+), 123 deletions(-)
 delete mode 100644 pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch

diff --git a/pkgs/by-name/ef/efficient-compression-tool/package.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix
index 7b01069437d9..659fceca90f7 100644
--- a/pkgs/by-name/ef/efficient-compression-tool/package.nix
+++ b/pkgs/by-name/ef/efficient-compression-tool/package.nix
@@ -6,27 +6,42 @@
   cmake,
   nasm,
   libpng,
+  nix-update-script,
+  versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "efficient-compression-tool";
-  version = "0.9.1";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "fhanau";
     repo = "Efficient-Compression-Tool";
-    rev = "v${version}";
-    hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mlqRDYwgLiB/mRaXkkPTCLiDGxTXqEgu5Nz5jhr1Hsg=";
     fetchSubmodules = true;
   };
 
+  # devendor libpng
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail 'if(EXISTS "''${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "''${CMAKE_SOURCE_DIR}/../src/libpng/README")' 'if(False)' \
+      --replace-fail 'file(COPY ''${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ''${CMAKE_SOURCE_DIR}/libpng/)' ""
+    substituteInPlace src/optipng/CMakeLists.txt \
+      --replace-fail 'set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)' "" \
+      --replace-fail 'add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)' "" \
+      --replace-fail 'png_static)' 'png)'
+    substituteInPlace src/optipng/image.h src/optipng/trans.h \
+      --replace-fail '#include "../libpng/png.h"' '#include <png.h>'
+    substituteInPlace src/optipng/opngreduc/opngreduc.h \
+      --replace-fail '#include "../../libpng/png.h"' '#include <png.h>'
+  '';
+
   nativeBuildInputs = [
     cmake
     nasm
   ];
 
-  patches = [ ./use-nixpkgs-libpng.patch ];
-
   buildInputs = [
     boost
     libpng
@@ -36,17 +51,25 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ];
 
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' does not name a type
-    "-include cstdint"
-  ];
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "-help";
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Fast and effective C++ file optimizer";
     homepage = "https://github.com/fhanau/Efficient-Compression-Tool";
-    license = licenses.asl20;
-    maintainers = [ maintainers.lunik1 ];
-    platforms = platforms.linux;
+    changelog = "https://github.com/fhanau/Efficient-Compression-Tool/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      jwillikers
+      lunik1
+    ];
+    platforms = lib.platforms.all;
     mainProgram = "ect";
   };
-}
+})
diff --git a/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
deleted file mode 100644
index f165b2b95506..000000000000
--- a/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d18843c..a9df1fb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,11 +8,6 @@ if(NOT CMAKE_BUILD_TYPE)
- 	set(CMAKE_BUILD_TYPE Release)
- endif()
- 
--# Check that submodules are present only if source was downloaded with git
--if(EXISTS "${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/../src/libpng/README")
--    message (FATAL_ERROR "Submodules are not initialized. Run \n\tgit submodule update --init --recursive\n within the repository")
--endif()
--
- add_executable(ect
- 	main.cpp
- 	gztools.cpp
-@@ -56,7 +51,6 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL)
- add_subdirectory(miniz EXCLUDE_FROM_ALL)
- add_subdirectory(zlib EXCLUDE_FROM_ALL)
- add_subdirectory(zopfli EXCLUDE_FROM_ALL)
--file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/)
- add_subdirectory(optipng EXCLUDE_FROM_ALL)
- # Mozjpeg changes the install prefix if it thinks the current is defaulted
- set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
-diff --git a/src/Makefile b/src/Makefile
-index cc24367..7aa9f0a 100755
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,7 +18,7 @@ CXXSRC = support.cpp zopflipng.cpp zopfli/deflate.cpp zopfli/zopfli_gzip.cpp zop
- lodepng/lodepng.cpp lodepng/lodepng_util.cpp optipng/codec.cpp optipng/optipng.cpp jpegtran.cpp gztools.cpp \
- leanify/zip.cpp leanify/leanify.cpp
- 
--.PHONY: libpng mozjpeg deps bin all install
-+.PHONY: mozjpeg deps bin all install
- all: deps bin
- 
- bin: deps
-@@ -33,9 +33,6 @@ libz.a:
- 	cd zlib/; \
- 	$(CC) $(UCFLAGS) -c adler32.c crc32.c deflate.c inffast.c inflate.c inftrees.c trees.c zutil.c gzlib.c gzread.c; \
- 	ar rcs ../libz.a adler32.o crc32.o deflate.o inffast.o inflate.o inftrees.o trees.o zutil.o gzlib.o gzread.o
--libpng:
--	cp pngusr.h libpng/pngusr.h
--	make -C libpng/ -f scripts/makefile.linux-opt CC="$(CC)" CFLAGS="$(UCFLAGS) -DPNG_USER_CONFIG -Wno-macro-redefined" libpng.a
- mozjpeg:
- 	cd mozjpeg/; \
- 	export CC="$(CC)"; \
-diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt
-index 1037a20..3c751e9 100644
---- a/src/optipng/CMakeLists.txt
-+++ b/src/optipng/CMakeLists.txt
-@@ -16,16 +16,14 @@ add_library(optipng
- add_library(optipng::optipng ALIAS optipng)
- 
- #make sure that we are using custom zlib and custom libpng options
--set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)
- set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE)
- if(NOT WIN32)
- 	add_compile_options(-Wno-macro-redefined)
- endif()
- add_compile_definitions(PNG_USER_CONFIG)
- 
--add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)
- target_link_libraries(optipng
--	png_static)
-+	png)
- 
- # libpng generates some header files that we need to be able to include
- target_include_directories(optipng
-diff --git a/src/optipng/image.h b/src/optipng/image.h
-index c439f84..8255fa0 100755
---- a/src/optipng/image.h
-+++ b/src/optipng/image.h
-@@ -13,7 +13,7 @@
- #ifndef OPNGCORE_IMAGE_H
- #define OPNGCORE_IMAGE_H
- 
--#include "../libpng/png.h"
-+#include <png.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff --git a/src/optipng/opngreduc/opngreduc.h b/src/optipng/opngreduc/opngreduc.h
-index a7e6553..06ef956 100755
---- a/src/optipng/opngreduc/opngreduc.h
-+++ b/src/optipng/opngreduc/opngreduc.h
-@@ -13,7 +13,7 @@
- 
- #include <stdbool.h>
- 
--#include "../../libpng/png.h"
-+#include <png.h>
- 
- 
- #ifdef __cplusplus
-diff --git a/src/optipng/trans.h b/src/optipng/trans.h
-index a2f7f3e..c0e8dc4 100755
---- a/src/optipng/trans.h
-+++ b/src/optipng/trans.h
-@@ -13,7 +13,7 @@
- #ifndef OPNGTRANS_TRANS_H
- #define OPNGTRANS_TRANS_H
- 
--#include "../libpng/png.h"
-+#include <png.h>
- 
- #ifdef __cplusplus
- extern "C" {

From 079231dfe70376f7e83ebe25ae9e957960821f11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:28:27 +0000
Subject: [PATCH 1076/1497] vscode-extensions.ms-dotnettools.csharp: 2.76.27 ->
 2.80.16

---
 .../extensions/ms-dotnettools.csharp/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 9581bd107502..24bb51ff0b4f 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -17,19 +17,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-yJ4bAxIg3yfQJPWJcl6jUMwQ/ssHkstJWuEp3wr0dDA=";
+        hash = "sha256-rxXyDIDANtWUT4z6SK+fHwMXu/xSOIGtNpILdlC5lMc=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-EpWHwansBwBD0aYoW2ek7iWFbp+s7ZH6ug3ejoSRG5U=";
+        hash = "sha256-3JLnZr7pGOY0wSmo9PpQclDE/Yb99qJLALgEBAPn4Ms=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-345hK47tyMGMJDKiujwpECDHMbRpLi17x2lH2rMX9Lg=";
+        hash = "sha256-yhP5dXP42ZKsoLZ3CySY+Nw2c0bF4IKDc0Le9ky+Qmc=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-u/vflQd285SuZ41ASd8nJgs+lN6892J3x6lPgWqVY+Y=";
+        hash = "sha256-KtOZ4AzsS30nF0DtJJT/CaLRD6Pa9pz1hYBgvxPbzZw=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.76.27";
+    version = "2.80.16";
     inherit (extInfo) hash arch;
   };
 

From c2cf0107ab6bf19ffae1a4b4072bb1e9f439e07d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:46:06 +0000
Subject: [PATCH 1077/1497] vals: 0.41.1 -> 0.41.2

---
 pkgs/by-name/va/vals/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 67468de32c8d..8718efca779f 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.41.1";
+  version = "0.41.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-zgIU4J7p7tXFTdwznC4solJD22QlizzJyBkKyCprayA=";
+    sha256 = "sha256-cwyEg+5vysVaW+pe77e+CUJpYLJ6BediJZTaz/eZRAA=";
   };
 
-  vendorHash = "sha256-Kn3X/85+aZXEFSpWZf7DC8l1tM4OjZrbQXd+cFYoxjE=";
+  vendorHash = "sha256-VOKvXovE/aagZOBFtF2o6/RhJMZhoZAHlVNqXD5Y7L4=";
 
   proxyVendor = true;
 

From 934210a0afb3424ba96bfefa11e1826beca8687e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 18:58:19 +0000
Subject: [PATCH 1078/1497] smtprelay: 1.11.2 -> 1.12.0

---
 pkgs/by-name/sm/smtprelay/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix
index ecda6b770905..8e26c63cc584 100644
--- a/pkgs/by-name/sm/smtprelay/package.nix
+++ b/pkgs/by-name/sm/smtprelay/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "smtprelay";
-  version = "1.11.2";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "decke";
     repo = "smtprelay";
     tag = "v${version}";
-    hash = "sha256-SwLRodyg6DC9gssmwbdKk426V71bKt3yhj9nqn0X3nU=";
+    hash = "sha256-mlaTZXzbZLdtzDqj8y2e8WjyaNxOPQ1a6YXbPhCxc1c=";
   };
 
-  vendorHash = "sha256-poTToZlC/yNM4tD9PCVUGTMFEtbA7N8xgK/fmJfUMnE=";
+  vendorHash = "sha256-wr53cIkygsM0+R02PjQAtIPrQDu7vploRTsMOrPBt4o=";
 
   subPackages = [
     "."

From e32c48547d3bf184d858bd1391b979705160e629 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 4 Jun 2025 16:59:09 +0200
Subject: [PATCH 1079/1497] jujutsu: 0.29.0 -> 0.30.0

Changelog: https://github.com/jj-vcs/jj/releases/tag/v0.30.0
Diff: https://github.com/jj-vcs/jj/compare/v0.29.0...v0.30.0
---
 pkgs/by-name/ju/jujutsu/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 6a46439566f6..f01f4ae94198 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -4,10 +4,6 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  pkg-config,
-  libgit2,
-  libssh2,
-  openssl,
   git,
   gnupg,
   openssh,
@@ -18,29 +14,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jyhjKppwK+emwLEXtOJKU0f4mPdLzDrQabnHhpyUzmw=";
+    hash = "sha256-l+E3os5At/PV4zKvUDSv4Aez9Bg0M+BZDvwVOHX+h9s=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-1bb7YWXExS62s83rprHa0byUBJUCdw6JDYkQ3VZcje8=";
+  cargoHash = "sha256-5H4yPbJ5364CM8YEt40rTbks3+tuQsrb6OQ0wRUQZRw=";
 
   nativeBuildInputs = [
     installShellFiles
-    pkg-config
   ];
 
-  buildInputs = [
-    libgit2
-    libssh2
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
-
   nativeCheckInputs = [
     git
     gnupg

From 4aae235aaf100bb63c7d3c7619fb7af03a2e3824 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:10:19 +0000
Subject: [PATCH 1080/1497] powerstation: 0.5.0 -> 0.5.1

---
 pkgs/by-name/po/powerstation/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/powerstation/package.nix b/pkgs/by-name/po/powerstation/package.nix
index 9072bf77669c..5da9d2aac8d4 100644
--- a/pkgs/by-name/po/powerstation/package.nix
+++ b/pkgs/by-name/po/powerstation/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "powerstation";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "PowerStation";
     tag = "v${version}";
-    hash = "sha256-m8o2sg0qsn+QyPWiOFDIYgfNb/gT5UO6w6Fjo0sg2u0=";
+    hash = "sha256-SrVtVeG3rcQ0Og3Vm0S1bB8zETpj1oK11KJ288I3J9M=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/C9BJBKhkBpvxMonbctmdRa697u3SgGQHyzTbP/dt78=";
+  cargoHash = "sha256-GTsYmSrr98ni8DrJ4klGb/Cph8ECc6pmJGv4WPv1Ap8=";
 
   nativeBuildInputs = [
     cmake

From 9b15fe08d7cf02714b2cc8eea543fce3545c8ea0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:10:32 +0000
Subject: [PATCH 1081/1497] pgmoneta: 0.17.0 -> 0.17.1

---
 pkgs/by-name/pg/pgmoneta/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index 2b278ca155b8..108ae819fbde 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmoneta";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
     rev = version;
-    hash = "sha256-UMsINV0Atl1bWN4v9XfuwDkxNJCye8R8V8n0EnHf2w0=";
+    hash = "sha256-5yatgiNl9szTnZbn6nKaGKgfnm2bOG4gvXGN5SqtbJI=";
   };
 
   nativeBuildInputs = [

From 6430162b6ac7c70badd9af9cbfecf5dc31b52eb3 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Wed, 4 Jun 2025 21:20:36 +0200
Subject: [PATCH 1082/1497] dust: 1.2.0 -> 1.2.1

Changelog: https://github.com/bootandy/dust/releases/tag/v1.2.1
Diff: https://github.com/bootandy/dust/compare/v1.2.0...v1.2.1
---
 pkgs/by-name/du/dust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix
index bbcfa8fd96be..8a27503204b5 100644
--- a/pkgs/by-name/du/dust/package.nix
+++ b/pkgs/by-name/du/dust/package.nix
@@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
   pname = "du-dust";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MmlCTF7tZBBOCnyhUjTatDjajFMGd+Nk2kYyxjzZc04=";
+    hash = "sha256-3Mk2gPlnm2kTRbn74T1YDH/DnjAyhFZQFK83OQaDNeo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-H2tfDZBhIRRrdak8TWjzzjeJBQmYZVWqXNtxTnBnbDk=";
+  cargoHash = "sha256-IZv4XQmBvxUp5k5bn5B4qTJAVBrRO0OZaUlqCni6NpI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 8f856e670c97f6f2d130d00f9aaf04c31092bb6c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 4 Jun 2025 19:14:08 +0000
Subject: [PATCH 1083/1497] flare: refactor meta and pname

---
 pkgs/by-name/fl/flare/engine.nix | 12 ++++++------
 pkgs/by-name/fl/flare/game.nix   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix
index 41feaac20101..d466f032dd8c 100644
--- a/pkgs/by-name/fl/flare/engine.nix
+++ b/pkgs/by-name/fl/flare/engine.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "flareteam";
-    repo = pname;
-    rev = "v${version}";
+    repo = "flare-engine";
+    tag = "v${version}";
     hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
   };
 
@@ -30,14 +30,14 @@ stdenv.mkDerivation rec {
     SDL2_ttf
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Free/Libre Action Roleplaying Engine";
     homepage = "https://github.com/flareteam/flare-engine";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       aanderse
       McSinyx
     ];
-    license = [ licenses.gpl3 ];
-    platforms = platforms.unix;
+    license = [ lib.licenses.gpl3Plus ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix
index 74dbcaaaae31..e726d3a290e0 100644
--- a/pkgs/by-name/fl/flare/game.nix
+++ b/pkgs/by-name/fl/flare/game.nix
@@ -11,21 +11,21 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "flareteam";
-    repo = pname;
-    rev = "v${version}";
+    repo = "flare-game";
+    tag = "v${version}";
     hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Fantasy action RPG using the FLARE engine";
     homepage = "https://github.com/flareteam/flare-game";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       aanderse
       McSinyx
     ];
-    license = [ licenses.cc-by-sa-30 ];
-    platforms = platforms.unix;
+    license = [ lib.licenses.cc-by-sa-30 ];
+    platforms = lib.platforms.unix;
   };
 }

From 29b198af62a7a982308f066416272f72e0848201 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:21:07 +0000
Subject: [PATCH 1084/1497] servo: 0-unstable-2025-05-25 ->
 0-unstable-2025-06-04

---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 103d7283f1e8..685a983fae63 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -61,13 +61,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-05-25";
+  version = "0-unstable-2025-06-04";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "3a04f4195eb650f092c44d5a05fee178b9e84fbe";
-    hash = "sha256-7dbt7h4qUPWgsKBt0wo9by6yTB4034SzlzdqMXmw2Xg=";
+    rev = "e78c033b5bc36a9576530869b38eba88080342d1";
+    hash = "sha256-BG0zQRLEM9bghjkB+He5fqpfinowRcn1k1oqhODzaPI=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-XTtM7yU1kpzK2cspnYdgp7yrt4Xk7xeQ98rmBgu46Tg=";
+  cargoHash = "sha256-7jbaJSmz7isAiOYVXJ3gXorA2lhDEiVpL+l8gkOnQuM=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 4b22b47fea0687bfd60181bfab664a358e87b591 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:23:44 +0000
Subject: [PATCH 1085/1497] nelm: 1.4.1 -> 1.5.0

---
 pkgs/by-name/ne/nelm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index b6cb82cf5230..58e034f39dd0 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4GvxDlSoTtAiia64Fq5hwrKcD21OgZ/mwk0/nll52/8=";
+    hash = "sha256-GywpByQ6GCx47VKFYPaF1fpd6A03sSTjCxSWjWhUzrc=";
   };
 
   vendorHash = "sha256-jzzIvxEJhGPb0bO5S400PGIWCEaOxQcgsybXziY652E=";

From b2b30651aa999c821fdc13766a35b320d1196516 Mon Sep 17 00:00:00 2001
From: merrkry <merrkry@tsubasa.moe>
Date: Wed, 4 Jun 2025 20:20:21 +0200
Subject: [PATCH 1086/1497] memogram: 0.2.4 -> 0.2.5

---
 pkgs/by-name/me/memogram/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix
index 9205ea5d3f5b..ebe7c03b0196 100644
--- a/pkgs/by-name/me/memogram/package.nix
+++ b/pkgs/by-name/me/memogram/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "memogram";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "telegram-integration";
-    tag = "v${version}";
-    hash = "sha256-nhNVo8Bp/g/IWyj548BQlyxPy1t3DDCyLmInDwQCH4c=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q3C1Ehs2TMeKsnjcNiL4HK08sCeWXjqVHiE55iHs0g8=";
   };
 
-  vendorHash = "sha256-g8mAG5l2juOVaem2xk+pPVzKYNJHbWbkS/D0LwF+XdM=";
+  vendorHash = "sha256-3NdWhckcXUEeKLz2G7xsHlbIBViyvFDCQzNVvaDi48U=";
 
   subPackages = [ "bin/memogram" ];
 
@@ -24,10 +24,10 @@ buildGoModule rec {
   meta = {
     description = "Easy to use integration service for syncing messages and images from a Telegram bot into your Memos";
     homepage = "https://github.com/usememos/telegram-integration";
-    changelog = "https://github.com/usememos/telegram-integration/releases/v${version}";
+    changelog = "https://github.com/usememos/telegram-integration/releases/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ merrkry ];
     mainProgram = "memogram";
     platforms = lib.platforms.linux;
   };
-}
+})

From f7464c553046e3b1f22b4fdd8411a2463d581674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 12:35:48 -0700
Subject: [PATCH 1087/1497] python3Packages.pysmlight: 0.2.5 -> 0.2.6

Diff: https://github.com/smlight-tech/pysmlight/compare/refs/tags/v0.2.5...refs/tags/v0.2.6

Changelog: https://github.com/smlight-tech/pysmlight/releases/tag/v0.2.6
---
 pkgs/development/python-modules/pysmlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 64a6ed10946c..475c21daeac0 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.5";
+  version = "0.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-ylfOro/GqgXDAPdtwbAWOMBO207zp5T26HRnDYrIw34=";
+    hash = "sha256-mK9bWRo5l2t2E/TP7POj04z45zD/XZbNOkFXGvD23k8=";
   };
 
   build-system = [ poetry-core ];

From 591327c05d0d2d93ea609d11e7ad24f6051ea781 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 19:37:21 +0000
Subject: [PATCH 1088/1497] kubectl-ai: 0.0.9 -> 0.0.11

---
 pkgs/by-name/ku/kubectl-ai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index 0545b0caa33d..94296e998872 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.9";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zsqHRXUyRguDbY3yPCWJ9KLzF6VR/y7juzI9uaVPSAE=";
+    hash = "sha256-ui8DpqsgJlNh3q+hq4Y7XG7yO/ZPtlffd5s4lf1zU1k=";
   };
 
-  vendorHash = "sha256-VpTAq9rXDPBOdaZIXm7h4AP1YFOk7HzLiUxYaCOP/w8=";
+  vendorHash = "sha256-gufDSIDmC8jtLgY+mg13pc5njGWxAk0osZpOh7RBsHA=";
 
   # Build the main command
   subPackages = [ "cmd" ];

From 49860b21df19cee7fe6082bb99bbf262ce8459aa Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 27 May 2025 18:50:02 +0800
Subject: [PATCH 1089/1497] readeck: 0.18.2 -> 0.19.2

---
 pkgs/by-name/re/readeck/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix
index d0082683eef4..00c9f2063ce3 100644
--- a/pkgs/by-name/re/readeck/package.nix
+++ b/pkgs/by-name/re/readeck/package.nix
@@ -27,14 +27,14 @@ in
 
 buildGoModule rec {
   pname = "readeck";
-  version = "0.18.2";
+  version = "0.19.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "readeck";
     repo = "readeck";
     tag = version;
-    hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8=";
+    hash = "sha256-gTU1RMd6b1wLIqI8VGa1Fn8+ydhW76E8ft5du71E1zM=";
   };
 
   nativeBuildInputs = [
@@ -80,10 +80,10 @@ buildGoModule rec {
 
   npmDeps = fetchNpmDeps {
     src = "${src}/web";
-    hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k=";
+    hash = "sha256-RkyQ7uY7OIpBY7ep2L2Ilq5abY0f91g2uqigdS64sL0=";
   };
 
-  vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw=";
+  vendorHash = "sha256-gqiK96FnfvRAzT0RUpYnT7HftZ1YV9jxbjstcKtGBho=";
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever.";

From 17f95268f30307f0353cf80f5d99cf78f97c5400 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Thu, 5 Jun 2025 03:47:00 +0800
Subject: [PATCH 1090/1497] nixos/readeck: add back MemoryDenyWriteExecute

SQLite driver is reverted to its CGO version so this can be enabled
---
 nixos/modules/services/web-apps/readeck.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix
index 0e5b68fc5faa..4c2c921b5a7c 100644
--- a/nixos/modules/services/web-apps/readeck.nix
+++ b/nixos/modules/services/web-apps/readeck.nix
@@ -69,6 +69,7 @@ in
         ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}";
         ProtectSystem = "full";
         SystemCallArchitectures = "native";
+        MemoryDenyWriteExecute = true;
         NoNewPrivileges = true;
         PrivateTmp = true;
         PrivateDevices = true;

From a395e1ac6dd1ce7f7ea3636d9d11057a168ead5c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 4 Jun 2025 21:54:25 +0200
Subject: [PATCH 1091/1497] jujutsu: replace `git` with `gitMinimal`

---
 pkgs/by-name/ju/jujutsu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index f01f4ae94198..e91fdd85ce5f 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -4,7 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
-  git,
+  gitMinimal,
   gnupg,
   openssh,
   buildPackages,
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   nativeCheckInputs = [
-    git
+    gitMinimal
     gnupg
     openssh
   ];

From b05348651da80907d55802507b45e0e542b8b992 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Wed, 4 Jun 2025 12:58:37 -0700
Subject: [PATCH 1092/1497] samba: 4.20.4 -> 4.20.8

---
 pkgs/servers/samba/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 10946a0803d4..dc753bbb1b6d 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -79,11 +79,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "samba";
-  version = "4.20.4";
+  version = "4.20.8";
 
   src = fetchurl {
     url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU=";
+    hash = "sha256-db4OjTH0UBPpsmD+fPMEo20tgSg5GRR3JXchXsFzqAc=";
   };
 
   outputs = [

From f71ddc3b5ae50ce45f7f3cf96d58acc7a657b8f4 Mon Sep 17 00:00:00 2001
From: Markus Heinrich <68288772+markus-heinrich@users.noreply.github.com>
Date: Wed, 4 Jun 2025 22:00:50 +0200
Subject: [PATCH 1093/1497] sylpheed: fix with gcc 14

---
 pkgs/by-name/sy/sylpheed/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix
index 26aeb6f93388..9ead50540ca4 100644
--- a/pkgs/by-name/sy/sylpheed/package.nix
+++ b/pkgs/by-name/sy/sylpheed/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431";
       sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU=";
     })
+    (fetchurl {
+      name = "0013-fix-FTBFS-GCC-14.patch";
+      url = "https://salsa.debian.org/sylpheed-team/sylpheed/-/raw/22984c6d2bf76b0667256a9e8b660447497e1220/debian/patches/0013-fix-FTBFS-GCC-14.patch?inline=false";
+      sha256 = "sha256-ZfQKiOK8pMrN87hrP0/2LxYZZdnaciBoa0khG1Djelo=";
+    })
   ];
 
   nativeBuildInputs = [ pkg-config ];

From 3c7f09cbb34061e672dd1882bf96b89fbecbe634 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 4 Jun 2025 21:09:22 +0100
Subject: [PATCH 1094/1497] vifm: 0.14.2 -> 0.14.3

Changes: https://github.com/vifm/vifm/releases/tag/v0.14.3
---
 pkgs/by-name/vi/vifm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index cc76b1097b16..598732299bc1 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -23,11 +23,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = if isFullPackage then "vifm-full" else "vifm";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchurl {
     url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
-    hash = "sha256-zRsF0lQ832gp1gsjvCJcb94T0+98EAj4IbkgmDfx4rA=";
+    hash = "sha256-Fqm+EQjWpaCen5R/clY3XlGbpB6+lHNlmyBzn9vzRA4=";
   };
 
   nativeBuildInputs = [

From 21a487c01a7d900198e800f2dfb2b315ca09c15e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 4 Jun 2025 21:12:41 +0100
Subject: [PATCH 1095/1497] vifm: enable parallel building

---
 pkgs/by-name/vi/vifm/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index 598732299bc1..3631d453f2ec 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
     patchShebangs --build src/helpztags
   '';
 
+  enableParallelBuilding = true;
+
   postFixup =
     let
       path = lib.makeBinPath [

From 82b8a1e117609c3da5773d35921570542ad0ffc4 Mon Sep 17 00:00:00 2001
From: williamvds <william@williamvds.me>
Date: Wed, 4 Jun 2025 20:54:52 +0100
Subject: [PATCH 1096/1497] maintainers: rename williamvds -> averyvigolo

---
 maintainers/maintainer-list.nix                  | 14 +++++++-------
 nixos/modules/services/networking/pihole-ftl.nix |  2 +-
 nixos/modules/services/web-apps/pihole-web.nix   |  2 +-
 pkgs/by-name/aw/aws-assume-role/package.nix      |  2 +-
 pkgs/by-name/pi/pihole-ftl/package.nix           |  2 +-
 pkgs/by-name/pi/pihole-web/package.nix           |  2 +-
 pkgs/by-name/pi/pihole/package.nix               |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5314a22833d1..c341d71b7ae8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2539,6 +2539,13 @@
     githubId = 59499799;
     keys = [ { fingerprint = "A0FF 4F26 6B80 0B86 726D  EA5B 3C23 C7BD 9945 2036"; } ];
   };
+  averyvigolo = {
+    email = "nixpkgs@averyv.me";
+    github = "averyvigolo";
+    githubId = 26379999;
+    name = "Avery Vigolo";
+    keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A  E0D5 7A4D F5A8 CDBD 49C7"; } ];
+  };
   avh4 = {
     email = "gruen0aermel@gmail.com";
     github = "avh4";
@@ -26644,13 +26651,6 @@
     githubId = 5185341;
     name = "Will Cohen";
   };
-  williamvds = {
-    email = "nixpkgs@williamvds.me";
-    github = "williamvds";
-    githubId = 26379999;
-    name = "William Vigolo";
-    keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A  E0D5 7A4D F5A8 CDBD 49C7"; } ];
-  };
   willibutz = {
     email = "willibutz@posteo.de";
     github = "WilliButz";
diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix
index 45cd2e5f927b..9920d269a501 100644
--- a/nixos/modules/services/networking/pihole-ftl.nix
+++ b/nixos/modules/services/networking/pihole-ftl.nix
@@ -478,6 +478,6 @@ in
 
   meta = {
     doc = ./pihole-ftl.md;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
   };
 }
diff --git a/nixos/modules/services/web-apps/pihole-web.nix b/nixos/modules/services/web-apps/pihole-web.nix
index fe62dec6afed..90c78b5299d5 100644
--- a/nixos/modules/services/web-apps/pihole-web.nix
+++ b/nixos/modules/services/web-apps/pihole-web.nix
@@ -99,6 +99,6 @@ in
 
   meta = {
     doc = ./pihole-web.md;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
   };
 }
diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix
index 334b6c1ccbe8..9a5556f8dd6e 100644
--- a/pkgs/by-name/aw/aws-assume-role/package.nix
+++ b/pkgs/by-name/aw/aws-assume-role/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
     homepage = "https://github.com/remind101/assume-role";
     license = licenses.bsd2;
     mainProgram = "assume-role";
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix
index 2d3add1f70bc..281d5231fbf0 100644
--- a/pkgs/by-name/pi/pihole-ftl/package.nix
+++ b/pkgs/by-name/pi/pihole-ftl/package.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Pi-hole FTL engine";
     homepage = "https://github.com/pi-hole/FTL";
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
     mainProgram = "pihole-FTL";
   };
diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix
index 905987afd989..516b6862d2a3 100644
--- a/pkgs/by-name/pi/pihole-web/package.nix
+++ b/pkgs/by-name/pi/pihole-web/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       FTLDNS.
     '';
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index d1c6f575b053..55d051213750 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -234,7 +234,7 @@
   meta = {
     description = "A black hole for Internet advertisements";
     license = lib.licenses.eupl12;
-    maintainers = with lib.maintainers; [ williamvds ];
+    maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
     mainProgram = "pihole";
   };

From 533f4fd63560a920bfae54226b16979520a26abf Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 4 Jun 2025 20:25:38 +0200
Subject: [PATCH 1097/1497] velero: remove with lib;

---
 pkgs/by-name/ve/velero/package.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index c953ee711cb7..f8a3bc3a2cf7 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -6,21 +6,21 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "velero";
   version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KfVMWoBScpHINmT5PlnPY+I5Ec1NRgEXKMtL0M7WyhE=";
   };
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}"
+    "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${finalAttrs.version}"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
@@ -38,7 +38,7 @@ buildGoModule rec {
   doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e
   doInstallCheck = true;
   installCheckPhase = ''
-    $out/bin/velero version --client-only | grep ${version} > /dev/null
+    $out/bin/velero version --client-only | grep ${finalAttrs.version} > /dev/null
   '';
 
   nativeBuildInputs = [ installShellFiles ];
@@ -48,14 +48,14 @@ buildGoModule rec {
     installShellCompletion velero.{bash,zsh}
   '';
 
-  meta = with lib; {
-    description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes";
+  meta = {
+    description = "Utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes";
     homepage = "https://velero.io/";
-    changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [
-      maintainers.mbode
-      maintainers.bryanasdev000
+    changelog = "https://github.com/vmware-tanzu/velero/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      mbode
+      bryanasdev000
     ];
   };
-}
+})

From db4b9c9d7d494158d359e4d6caa32bc2d2f2938c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 20:41:21 +0000
Subject: [PATCH 1098/1497] fleet: 4.68.0 -> 4.68.1

---
 pkgs/by-name/fl/fleet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index a3e25fa41989..2029e819aeb5 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.68.0";
+  version = "4.68.1";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-C+rIRbeCdfQIAfAXSbvCGBFl16e7HhHPvNdJhLY82z8=";
+    hash = "sha256-XhnvhWjaU+McklFTsAhGEcSA+UkrYy8DgJ8ADE66U3o=";
   };
   vendorHash = "sha256-ZdkpgZbXchDp5kiEgCsSsd3/ltltSRjOuTPOhiBEloc=";
 

From ec003ba04416c67215deaff74d77537565f95636 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 22:53:20 +0200
Subject: [PATCH 1099/1497] python3Packages.cvxpy: 1.6.5 -> 1.6.6

Diff: https://github.com/cvxpy/cvxpy/compare/refs/tags/v1.6.5...refs/tags/v1.6.6

Changelog: https://github.com/cvxpy/cvxpy/releases/tag/v1.6.6
---
 pkgs/development/python-modules/cvxpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index f6670d52ffe6..c5b779eb01d0 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "cvxpy";
-  version = "1.6.5";
+  version = "1.6.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cvxpy";
     repo = "cvxpy";
     tag = "v${version}";
-    hash = "sha256-utTd/13RQ3WKWreCKFMqGwPUFbPw3TaKKbS4T1BGGP4=";
+    hash = "sha256-xbynw/9jUI41H7tYcARqqw5X+Cr8jDBMwxM6E9thpp0=";
   };
 
   # we need to patch out numpy version caps from upstream

From 00e7de92e3ba52d8d3808ee08aef85caa21d6265 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Wed, 4 Jun 2025 23:17:13 +0200
Subject: [PATCH 1100/1497] shh: 2025.4.12 -> 2025.6.4

---
 pkgs/by-name/sh/shh/package.nix | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index e2b894df6760..8bc26f187235 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -19,40 +19,24 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "shh";
-  version = "2025.4.12";
+  version = "2025.6.4";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${version}";
-    hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw=";
+    hash = "sha256-rhn7qy/cF1vjCFnEoVzVmKNcI/TBUEMxp5pzzC8c9bw=";
   };
 
-  cargoHash = "sha256-rrOH76LHYSEeuNiMIICpAO7U/sz5V0JRO22mbIICQWw=";
-
-  # needs to be done this way to bypass patch conflicts
-  cargoPatches = [
-    (fetchpatch {
-      # to be removed after next release
-      name = "refactor-man-page-generation-command.patch";
-      url = "https://github.com/desbma/shh/commit/849b9a6646981c83a72a977b6398371e29d3b928.patch";
-      hash = "sha256-LZlUFfPtt2ScTxQbQ9j3Kzvp7T4MCFs92cJiI3YbWns=";
-    })
-    (fetchpatch {
-      # to be removed after next release
-      name = "support-shell-auto-complete.patch";
-      url = "https://github.com/desbma/shh/commit/74914dc8cfd74dbd7e051a090cc4c1f561b8cdde.patch";
-      hash = "sha256-WgKRQAEwSpXdQUnrZC1Bp4RfKg2J9kPkT1k6R2wwgT8=";
-    })
-  ];
+  cargoHash = "sha256-hk4IG/FOwrLrV7kPDQigkpWwQzmvf1LvyrIesMYO3jk=";
 
   patches = [
     ./fix_run_checks.patch
     (fetchpatch {
       # to be removed after next release
-      name = "feat-static-strace-path-support-at-compile-time.patch";
-      url = "https://github.com/desbma/shh/commit/da62ceeb227de853be06610721744667c6fe994b.patch";
-      hash = "sha256-p/W7HRZZ4TpIwrWN8wQB/SH3C8x3ZLXzwGV50oK/znQ=";
+      name = "support-kernels-without-kernel-unprivileged_userns_clone.patch";
+      url = "https://github.com/desbma/shh/commit/f103b06c756dbb43aec615b590680cc99cbb0f00.patch";
+      hash = "sha256-K68tU7EN51jUayoP+WAUuvqqB2eqyDXnAdLsWEd/eAM=";
     })
   ];
 

From 0cbfabfa486effc556366e3daecf4919f7a6c527 Mon Sep 17 00:00:00 2001
From: Joshua Manchester <JManch@protonmail.com>
Date: Mon, 12 Feb 2024 22:28:30 +0000
Subject: [PATCH 1101/1497] broadcast-box: init at 2025-06-04

---
 .../br/broadcast-box/allow-no-env.patch       | 13 ++++
 pkgs/by-name/br/broadcast-box/package.nix     | 69 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/br/broadcast-box/allow-no-env.patch
 create mode 100644 pkgs/by-name/br/broadcast-box/package.nix

diff --git a/pkgs/by-name/br/broadcast-box/allow-no-env.patch b/pkgs/by-name/br/broadcast-box/allow-no-env.patch
new file mode 100644
index 000000000000..cad4bbf5ff21
--- /dev/null
+++ b/pkgs/by-name/br/broadcast-box/allow-no-env.patch
@@ -0,0 +1,13 @@
+diff --git a/main.go b/main.go
+index 1814da0..2befc13 100644
+--- a/main.go
++++ b/main.go
+@@ -175,6 +175,8 @@ func main() {
+ 		if os.Getenv("APP_ENV") == "development" {
+ 			log.Println("Loading `" + envFileDev + "`")
+ 			return godotenv.Load(envFileDev)
++		} else if os.Getenv("APP_ENV") == "nixos" {
++			return nil
+ 		} else {
+ 			if _, err := os.Stat("./web/build"); os.IsNotExist(err) {
+ 				return noBuildDirectoryErr
diff --git a/pkgs/by-name/br/broadcast-box/package.nix b/pkgs/by-name/br/broadcast-box/package.nix
new file mode 100644
index 000000000000..a176bb35c510
--- /dev/null
+++ b/pkgs/by-name/br/broadcast-box/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  nixosTests,
+  fetchFromGitHub,
+  buildNpmPackage,
+  buildGoModule,
+}:
+let
+  name = "broadcast-box";
+  version = "0-unstable-2025-06-04";
+
+  src = fetchFromGitHub {
+    repo = "broadcast-box";
+    owner = "Glimesh";
+    rev = "a091f147f750759084a2c9d25a12e815e2feebf8";
+    hash = "sha256-Evhye+DYtFM/VjxqmhH5kU32khvEFUxTUgH9DXytIbo=";
+  };
+
+  frontend = buildNpmPackage {
+    inherit version;
+    pname = "${name}-web";
+    src = "${src}/web";
+    npmDepsHash = "sha256-e1cCezmF20Q6JEXwPb1asRSXuC/GGaR+ImvrTabLl5c=";
+    preBuild = ''
+      # The VITE_API_PATH environment variable is needed
+      cp "${src}/.env.production" ../
+    '';
+    installPhase = ''
+      mkdir -p $out
+      cp -r build $out
+    '';
+  };
+in
+buildGoModule {
+  inherit version src frontend;
+  pname = name;
+  vendorHash = "sha256-Jpee7UmG9AB9SOoTv2fPP2l5BmkDPPdciGFu9Naq9h8=";
+  proxyVendor = true; # fixes darwin/linux hash mismatch
+
+  patches = [ ./allow-no-env.patch ];
+  postPatch = ''
+    substituteInPlace main.go \
+      --replace-fail './web/build' '${placeholder "out"}/share'
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share
+    cp -r $frontend/build/* $out/share
+
+    install -Dm755 $GOPATH/bin/broadcast-box -t $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) broadcast-box;
+  };
+
+  meta = {
+    description = "WebRTC broadcast server";
+    homepage = "https://github.com/Glimesh/broadcast-box";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ JManch ];
+    platforms = lib.platforms.unix;
+    mainProgram = "broadcast-box";
+  };
+}

From a1665f4bbb30c7327db8a7cba5e8aa9bbf613ee3 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 22:43:51 +0200
Subject: [PATCH 1102/1497] telegram-desktop.tg_owt: 0-unstable-2024-10-28 ->
 0-unstable-2025-06-02

---
 .../tg_owt-pipewire-1.4.patch                 | 20 -------------------
 .../telegram/telegram-desktop/tg_owt.nix      | 12 +++--------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch
deleted file mode 100644
index 1ab4d314f7df..000000000000
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt-pipewire-1.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/modules/video_capture/linux/pipewire_session.cc
-+++ b/src/modules/video_capture/linux/pipewire_session.cc
-@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-       .param = OnNodeParam,
-   };
- 
--  pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-+  pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
- }
- 
- // static
-@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
-       uint32_t id = info->params[i].id;
-       if (id == SPA_PARAM_EnumFormat &&
-           info->params[i].flags & SPA_PARAM_INFO_READ) {
--        pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-+        pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-         break;
-       }
-     }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 2efad14fef67..b0329f76eed8 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -33,22 +33,16 @@
 
 stdenv.mkDerivation {
   pname = "tg_owt";
-  version = "0-unstable-2024-10-28";
+  version = "0-unstable-2025-06-02";
 
   src = fetchFromGitHub {
     owner = "desktop-app";
     repo = "tg_owt";
-    rev = "8198c4d8b91e22d68eb5c7327fd408e3b6abcc79";
-    hash = "sha256-3sLa3Px0VWgRYqnnLlwLnx+WWnneqZyhQPrRMBriXQA=";
+    rev = "62321fd7128ab2650b459d4195781af8185e46b5";
+    hash = "sha256-l6EdHJLd42TU+4pLakdU3a5PLVxrxjta0CSRy5hVBFU=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Fix build with Pipewire 1.4
-    # Submitted upstream: https://webrtc-review.googlesource.com/c/src/+/380500
-    ./tg_owt-pipewire-1.4.patch
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
       --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \

From 75829dfb68c43bf0c9e8c21ab58baca5b56122f2 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jun 2025 00:19:06 +0300
Subject: [PATCH 1103/1497] mesa: 25.1.1 -> 25.1.2

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.1.1...mesa-25.1.2

Changelog: https://docs.mesa3d.org/relnotes/25.1.2.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5d5bfd2fbd88..6d4cd1704617 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.1.1";
+  version = "25.1.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-Vk5sE7D8XHDOtxq0ax2a3FmQFWp7IDP4Y510EpnKWo4=";
+    hash = "sha256-oE1QZyCBFdWCFq5T+Unf0GYpvCssVNOEQtPQgPbatQQ=";
   };
 
   meta = {

From 4dbade0a185db49fe49e5e5455fa0a827179440f Mon Sep 17 00:00:00 2001
From: Joshua Manchester <JManch@protonmail.com>
Date: Sat, 23 Nov 2024 17:22:40 +0000
Subject: [PATCH 1104/1497] nixos/broadcast-box: init

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/video/broadcast-box.nix  | 274 ++++++++++++++++++
 3 files changed, 277 insertions(+)
 create mode 100644 nixos/modules/services/video/broadcast-box.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index ce146d0cdedf..4c44cc4e5b08 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -20,6 +20,8 @@
 - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
   Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable).
 
+- [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable).
+
 - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable).
 
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 955bd480d6c7..f093b10dc188 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1491,6 +1491,7 @@
   ./services/ttys/getty.nix
   ./services/ttys/gpm.nix
   ./services/ttys/kmscon.nix
+  ./services/video/broadcast-box.nix
   ./services/video/epgstation/default.nix
   ./services/video/frigate.nix
   ./services/video/go2rtc/default.nix
diff --git a/nixos/modules/services/video/broadcast-box.nix b/nixos/modules/services/video/broadcast-box.nix
new file mode 100644
index 000000000000..2038ca02ea37
--- /dev/null
+++ b/nixos/modules/services/video/broadcast-box.nix
@@ -0,0 +1,274 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  inherit (lib)
+    mkIf
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    attrNames
+    types
+    match
+    optional
+    optionals
+    toInt
+    last
+    splitString
+    allUnique
+    concatStringsSep
+    all
+    filter
+    mapAttrs
+    any
+    getExe
+    maintainers
+    ;
+  inherit (cfg) settings;
+  cfg = config.services.broadcast-box;
+
+  addressToPort = address: toInt (last (splitString ":" address));
+  httpPort = cfg.web.port;
+  tcpMuxPort = addressToPort settings.TCP_MUX_ADDRESS;
+  httpRedirect = settings.ENABLE_HTTP_REDIRECT or (settings.HTTPS_REDIRECT_PORT != null);
+
+  udpPorts =
+    optional (settings.UDP_MUX_PORT != null) settings.UDP_MUX_PORT
+    ++ optional (settings.UDP_WHEP_PORT != null) settings.UDP_WHEP_PORT
+    ++ optional (settings.UDP_WHIP_PORT != null) settings.UDP_WHIP_PORT;
+  tcpPorts = optional (settings.TCP_MUX_ADDRESS != null) tcpMuxPort;
+  webPorts = [ httpPort ] ++ optional httpRedirect settings.HTTPS_REDIRECT_PORT;
+in
+{
+  options.services.broadcast-box = {
+    enable = mkEnableOption "Broadcast Box";
+    package = mkPackageOption pkgs "broadcast-box" { };
+
+    web = {
+      host = mkOption {
+        type = types.str;
+        default = "";
+        example = "127.0.0.1";
+        description = ''
+          Host address the HTTP server listens on. By default the server
+          listens on all interfaces.
+        '';
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = 8080;
+        description = ''
+          Port the HTTP server listens on.
+        '';
+      };
+
+      openFirewall = mkEnableOption ''
+        opening the HTTP server port and, if enabled, the HTTPS redirect server
+        port in the firewall.
+      '';
+    };
+
+    openFirewall = mkEnableOption ''
+      opening WebRTC traffic ports in the firewall. Randomly selected ports
+      will not be opened.
+    '';
+
+    settings = mkOption {
+      visible = "shallow";
+
+      type = types.submodule {
+        freeformType =
+          with types;
+          attrsOf (
+            nullOr (oneOf [
+              bool
+              int
+              str
+            ])
+          );
+        options = {
+          TCP_MUX_ADDRESS = mkOption {
+            type = with types; nullOr (strMatching ".*:[0-9]+");
+            default = null;
+          };
+
+          DISABLE_STATUS = mkOption {
+            type = types.bool;
+            default = true;
+          };
+
+          UDP_MUX_PORT = mkOption {
+            type = with types; nullOr port;
+            default = null;
+          };
+
+          UDP_WHEP_PORT = mkOption {
+            type = with types; nullOr port;
+            default = null;
+          };
+
+          UDP_WHIP_PORT = mkOption {
+            type = with types; nullOr port;
+            default = null;
+          };
+
+          ENABLE_HTTP_REDIRECT = mkOption {
+            type = types.bool;
+            default = false;
+          };
+
+          HTTPS_REDIRECT_PORT = mkOption {
+            type = with types; nullOr port;
+            default = if settings.ENABLE_HTTP_REDIRECT then 80 else null;
+          };
+        };
+      };
+
+      default = {
+        DISABLE_STATUS = true;
+      };
+
+      example = {
+        DISABLE_STATUS = true;
+        INCLUDE_PUBLIC_IP_IN_NAT_1_TO_1_IP = true;
+        UDP_MUX_PORT = 3000;
+      };
+
+      description = ''
+        Attribute set of environment variables.
+
+        <https://github.com/Glimesh/broadcast-box#environment-variables>
+
+        :::{.warning}
+        The status API exposes stream keys so {env}`DISABLE_STATUS` is enabled
+        by default.
+        :::
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !(settings ? HTTP_ADDRESS);
+        message = ''
+          The Broadcast Box `HTTP_ADDRESS` variable should not be used. Instead
+          use the `host` and `port` options.
+        '';
+      }
+      {
+        assertion = httpRedirect -> settings ? SSL_CERT && settings ? SSL_KEY;
+        message = ''
+          The Broadcast Box `ENABLE_HTTP_REDIRECT` variable requires `SSL_CERT`
+          and `SSL_KEY` to be configured.
+        '';
+      }
+      {
+        assertion = httpRedirect -> httpPort == 443;
+        message = ''
+          Broadcast Box HTTP redirect only works if the HTTP server listen port
+          is 443.
+        '';
+      }
+      {
+        assertion = allUnique (tcpPorts ++ webPorts);
+        message = ''
+          Broadcast Box configuration contains duplicate TCP ports.
+        '';
+      }
+      {
+        assertion = all (name: (match "[A-Z0-9_]+" name) != null) (attrNames settings);
+        message =
+          let
+            offenders = filter (name: (match "[A-Z0-9_]+" name) == null) (attrNames settings);
+          in
+          ''
+            Broadcast Box `settings` attribute names must be in uppercase snake
+            case. Invalid attribute name(s): `${concatStringsSep ", " offenders}`
+          '';
+      }
+    ];
+
+    systemd.services.broadcast-box = {
+      description = "Broadcast Box";
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      startLimitBurst = 3;
+      startLimitIntervalSec = 180;
+
+      environment =
+        (mapAttrs (
+          _: value:
+          if (builtins.typeOf value == "bool") then
+            if !value then null else "true"
+          else if (builtins.typeOf value == "int") then
+            toString value
+          else
+            value
+        ) cfg.settings)
+        // {
+          APP_ENV = "nixos";
+          HTTP_ADDRESS = cfg.web.host + ":" + toString cfg.web.port;
+        };
+
+      serviceConfig =
+        let
+          priviledgedPort = any (p: p > 0 && p < 1024) (udpPorts ++ tcpPorts ++ webPorts);
+        in
+        {
+          ExecStart = "${getExe cfg.package}";
+          Restart = "always";
+          RestartSec = "10s";
+
+          DynamicUser = true;
+          LockPersonality = true;
+          NoNewPrivileges = true;
+          PrivateUsers = !priviledgedPort;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          PrivateTmp = true;
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          ProtectControlGroups = true;
+          ProtectClock = true;
+          ProtectProc = "invisible";
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProcSubset = "pid";
+          RemoveIPC = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_NETLINK"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ];
+          CapabilityBoundingSet = if priviledgedPort then [ "CAP_NET_BIND_SERVICE" ] else "";
+          AmbientCapabilities = mkIf priviledgedPort [ "CAP_NET_BIND_SERVICE" ];
+          DeviceAllow = "";
+          MemoryDenyWriteExecute = true;
+          UMask = "0077";
+        };
+    };
+
+    networking.firewall = {
+      allowedTCPPorts = optionals cfg.openFirewall tcpPorts ++ optionals cfg.web.openFirewall webPorts;
+      allowedUDPPorts = optionals cfg.openFirewall udpPorts;
+    };
+  };
+
+  meta.maintainers = with maintainers; [ JManch ];
+}

From ab778dc6b6a3ab3c0490942053bc5589e7d75cea Mon Sep 17 00:00:00 2001
From: Joshua Manchester <JManch@protonmail.com>
Date: Tue, 13 Feb 2024 03:26:32 +0000
Subject: [PATCH 1105/1497] nixos/tests/broadcast-box: init

---
 nixos/tests/all-tests.nix     |  1 +
 nixos/tests/broadcast-box.nix | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 nixos/tests/broadcast-box.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b03125926e88..a2236c4f779b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -264,6 +264,7 @@ in
   bpf = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./bpf.nix { };
   bpftune = runTest ./bpftune.nix;
   breitbandmessung = runTest ./breitbandmessung.nix;
+  broadcast-box = runTest ./broadcast-box.nix;
   brscan5 = runTest ./brscan5.nix;
   btrbk = runTest ./btrbk.nix;
   btrbk-doas = runTest ./btrbk-doas.nix;
diff --git a/nixos/tests/broadcast-box.nix b/nixos/tests/broadcast-box.nix
new file mode 100644
index 000000000000..005cfc3dcd59
--- /dev/null
+++ b/nixos/tests/broadcast-box.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  name = "broadcast-box";
+  meta = { inherit (pkgs.broadcast-box.meta) maintainers; };
+
+  nodes.machine = {
+    services.broadcast-box = {
+      enable = true;
+      web = {
+        host = "127.0.0.1";
+        port = 8080;
+      };
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("broadcast-box.service")
+    machine.wait_for_open_port(8080)
+    machine.succeed("curl --fail http://localhost:8080/")
+  '';
+}

From b3144dd06198790e7b16ea426216127dc6184f41 Mon Sep 17 00:00:00 2001
From: s0me1newithhand7s <litvinovb0@gmail.com>
Date: Thu, 5 Jun 2025 00:11:42 +0300
Subject: [PATCH 1106/1497] cpc: init at 3.0.0

---
 pkgs/by-name/cp/cpc/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/cp/cpc/package.nix

diff --git a/pkgs/by-name/cp/cpc/package.nix b/pkgs/by-name/cp/cpc/package.nix
new file mode 100644
index 000000000000..2c3ab8378cc3
--- /dev/null
+++ b/pkgs/by-name/cp/cpc/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cpc";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "probablykasper";
+    repo = "cpc";
+    tag = "v${version}";
+    hash = "sha256-DjJIXV5rJxQOiMH8/0yZQBvDh+jbejzADt4WSGyhozI=";
+  };
+
+  cargoHash = "sha256-2k+aFrP/PQmlGr3gIF1queDjuo/+3KtnrOrx1+wrqEg=";
+
+  meta = {
+    mainProgram = "cpc";
+    description = "Text calculator with support for units and conversion";
+    homepage = "https://github.com/probablykasper/cpc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      s0me1newithhand7s
+    ];
+  };
+}

From e6155d1fb49f739ed926976d50c72b00d0632268 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:32 +0200
Subject: [PATCH 1107/1497] python312Packages.mypy-boto3-amplify: 1.38.26 ->
 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 84dc690bfa12..5a6178c9a395 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -66,8 +66,8 @@ rec {
       "sha256-NoNqTKRj7/wlqoBwsEW/wgj1cBAHYRXgLVfZvkP5EV0=";
 
   mypy-boto3-amplify =
-    buildMypyBoto3Package "amplify" "1.38.26"
-      "sha256-m+R9I+UnOmamcErUqyzSgmJJB1Z8aM+GiF4m+vKNb1w=";
+    buildMypyBoto3Package "amplify" "1.38.30"
+      "sha256-Ld+K3tUHZzW6xa3xksYRsH9g4+sM9jpQfTh2T9kEyUA=";
 
   mypy-boto3-amplifybackend =
     buildMypyBoto3Package "amplifybackend" "1.38.0"

From b3f4008a6b975d6e0184376d982438fe06e0b307 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:34 +0200
Subject: [PATCH 1108/1497] python312Packages.mypy-boto3-apigateway: 1.38.0 ->
 1.38.29

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5a6178c9a395..63b42706130b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -78,8 +78,8 @@ rec {
       "sha256-w+elhGa7/tXU8nzaE8FNLbt2f3iBCulaW1kdU2pK0wY=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.38.0"
-      "sha256-KAjxv+ojo7xTGvzeHCdoQAHDXcuEkU5SQPKbmpljl5w=";
+    buildMypyBoto3Package "apigateway" "1.38.29"
+      "sha256-PKdlOC4Li7dIAq2LZql9XRsSCn4Xj1W5kVVNJYZsAdM=";
 
   mypy-boto3-apigatewaymanagementapi =
     buildMypyBoto3Package "apigatewaymanagementapi" "1.38.0"

From 5350e14d55ffcf3e0671e61b92174c61b71d0355 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:51:36 +0200
Subject: [PATCH 1109/1497] python312Packages.mypy-boto3-apigatewayv2: 1.38.0
 -> 1.38.29

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 63b42706130b..8e94120a8179 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -86,8 +86,8 @@ rec {
       "sha256-Bn9zu0z1JgU6vUp5rJzcD4H6OenB+3QIYnA/EnjxEzI=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.38.0"
-      "sha256-ol6Gj+NsSOK3hInNvwLTDfWIpfD6tuSVyH52c6UhSNI=";
+    buildMypyBoto3Package "apigatewayv2" "1.38.29"
+      "sha256-UMLg/PboAE4RCyiYXWzZXXu8f5cmUVO1TaN8Uci8HAA=";
 
   mypy-boto3-appconfig =
     buildMypyBoto3Package "appconfig" "1.38.7"

From 7fa057aa7ca7a025e1184b27ae84e9ce63a48d44 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:05 +0200
Subject: [PATCH 1110/1497] python312Packages.mypy-boto3-emr-serverless:
 1.38.27 -> 1.38.29

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8e94120a8179..26dabc4c6175 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -506,8 +506,8 @@ rec {
       "sha256-Lr2cpSBkWl30iIS3fc4qiOWBTbIu5L0MMW5O9Au+COM=";
 
   mypy-boto3-emr-serverless =
-    buildMypyBoto3Package "emr-serverless" "1.38.27"
-      "sha256-+BU0uQBQmQSxGwXalJ9A95Y8RXaFy9L6Lk8Z3D6QwkM=";
+    buildMypyBoto3Package "emr-serverless" "1.38.29"
+      "sha256-xpnGaEw19k0XRjJjYi3APhwZ9uS7WZflWhgCnQDY0cs=";
 
   mypy-boto3-entityresolution =
     buildMypyBoto3Package "entityresolution" "1.38.28"

From 77692cfde2724a612bf1d21ba7fb1751f959caf3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:18:11 +0200
Subject: [PATCH 1111/1497] python3Packages.torch-bin: 2.7.0 -> 2.7.1

Diff: https://github.com/pytorch/pytorch/compare/v2.7.0...v2.7.1

Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.1
---
 .../torch/bin/binary-hashes.nix               | 92 +++++++++----------
 .../python-modules/torch/bin/default.nix      |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
index a94a39aae52a..3a7d0926ba26 100644
--- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.7.0" = {
+  "2.7.1" = {
     x86_64-linux-39 = {
-      name = "torch-2.7.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-9Eb5eyDLBwdHsQP7ZA35QbiMtoyNOwFTgofQXVan6HQ=";
+      name = "torch-2.7.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-c4rJs6155iohJW49JQzuhY3pVfk/ifqxFNqNGRk0fQY=";
     };
     x86_64-linux-310 = {
-      name = "torch-2.7.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-rBhJVT7mc9+vtExhDGDLYKKJDw4Rf0NZmlJs93fri4w=";
+      name = "torch-2.7.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-1sPLoZjck/k0IqhUX0imaXiQNm5LlwH1Q1H8J+IwS9M=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.7.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-xLvAtL5gMZuhzvyQvpVXsxfws8Jh7s65bKbgND7sVr8=";
+      name = "torch-2.7.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-wwHcKARYr9lUUK95SSTJj+B1It0Uj/OEc5uBDj4xefI=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.7.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-fA8I0cRKAqutOJNz3d/OdZBLlppBC+L05RCUg909wM4=";
+      name = "torch-2.7.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-C2T30KbypzntBSupWfe2fGdwKMlWbOUZl/n5D+Vz3ao=";
     };
     x86_64-linux-313 = {
-      name = "torch-2.7.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-0vafkJ2l3FIRPsZqhR1iB589UsgxhM9kvuvfEsovcFw=";
+      name = "torch-2.7.1-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-lWBCX56hrxeRUH6Mpw1bns9i/tfKImqV/NWNDrLMp48=";
     };
     aarch64-darwin-39 = {
-      name = "torch-2.7.0-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-zNdQkUFxOZeGG3qUfvCnFxQ81+kkCt3RaPOLqP0j/VY=";
+      name = "torch-2.7.1-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp39-none-macosx_11_0_arm64.whl";
+      hash = "sha256-NRvpBdG6aT8xe+YDRB5O2VgO2ajX7hez2uYPov9Jv/c=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.7.0-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-NOAWjtbemRIWEtciJOWbKlioPa5kmZmQ6tpyYMXdWC0=";
+      name = "torch-2.7.1-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-+MO+4mGwyOCQ9jR0kNxu4q6/1mHrDz9q6uBtmS2O1W8=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.7.0-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-Co1DyqNCuZhhAexf61u/HYZXC1yqAenLQmN4MRJY/d4=";
+      name = "torch-2.7.1-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-aKNSx/Q1q7XLR+LAMtzRASdyriustvyLg7DBsRh0qzo=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.7.0-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-MLdoiocjmn3oPyaTM2Udjlgq//zm9ZH/8IwEb3eHKW4=";
+      name = "torch-2.7.1-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp312-none-macosx_11_0_arm64.whl";
+      hash = "sha256-e0+LK4O9CPfTmQJamnsyO9u1PSBWbx4NWEaJu5LYL5o=";
     };
     aarch64-darwin-313 = {
-      name = "torch-2.7.0-cp313-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp313-none-macosx_11_0_arm64.whl";
-      hash = "sha256-J/UAe99F97t69/EdGCjVwkh+AwaQr7PYmmUf1wNqOQ4=";
+      name = "torch-2.7.1-cp313-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp313-none-macosx_11_0_arm64.whl";
+      hash = "sha256-fs2GighkaOG890uR20JcHClRqc/NBZLExzN3t+Qkha4=";
     };
     aarch64-linux-39 = {
-      name = "torch-2.7.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-fQpBBrwP4zkpX1CZAM5GIo9Fua2GRmYv5Qx9nllgw8E=";
+      name = "torch-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-pFUcuXuD31+T/A11ODMlNYKFgeHbLxea/ChwJ6+91ug=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.7.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-I4aFne5hkaJXHOFcZcPhgAjU5vF9UlbUm0Zg5UZNyug=";
+      name = "torch-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-wN8Xzul2U9CaToRIijPSEhf5skIIWDxVzyjwBFqrB2Y=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.7.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-zlEDde15Ij2z7BRP4Uy8/8ijYaxX85Z0OX/y2Ns7LCE=";
+      name = "torch-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-X+YEW49Ca/LQQm5P4AnxZnqVTsKuuC8b0L9gxteoVEU=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.7.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-qEW2872jxA9zaEfe3pXYv+yB+34RRYzSWXO6E1Qs8fY=";
+      name = "torch-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-O/LbWt93tDOETwgIh63gScRwXd+f4aMgI/+E/3Napa0=";
     };
     aarch64-linux-313 = {
-      name = "torch-2.7.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-rd+RB5OVIv+ztg0pAP7oOKd9vgmOJkPgEWT0b4YS+cA=";
+      name = "torch-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-6xdkZ5KsQ3T/yH5CNp9F0h7/F8eQholjuQSD7wtttO8=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index 268bd4ddca21..1f08d73ec9b8 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -35,7 +35,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.7.0";
+  version = "2.7.1";
 in
 buildPythonPackage {
   inherit version;

From 65ac8cfabceeac2658118072942008b8c59ff610 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:20:11 +0200
Subject: [PATCH 1112/1497] python3Packages.torchaudio: 2.7.0 -> 2.7.1

Diff: https://github.com/pytorch/audio/compare/v2.7.0...v2.7.1

Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.1
---
 .../python-modules/torchaudio/bin.nix         |  2 +-
 .../torchaudio/binary-hashes.nix              | 92 +++++++++----------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index b6c3cda5e7a5..d85afea91385 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.7.0";
+  version = "2.7.1";
   format = "wheel";
 
   src =
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index 628c0eb8d700..da82062146cb 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.7.0" = {
+  "2.7.1" = {
     x86_64-linux-39 = {
-      name = "torchaudio-2.7.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-DppKLE9UPO/voB3UD0nExEBvve0KcpWpkVgnZ4NFeQ8=";
+      name = "torchaudio-2.7.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DBRNX/tO7IbHn/ETar2RvT+DfzBCcTeV4QdYrtxC3Og=";
     };
     x86_64-linux-310 = {
-      name = "torchaudio-2.7.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-1itum3kq03r20SibooPhAp5xtP+c08bPfw53dvIyVLI=";
+      name = "torchaudio-2.7.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-K6CBbu5lnjQ4UanF3GDI4euBmjlpspJo+rJ9MUMnPXg=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.7.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-lB9ZwDc5DiiLznmPnOU9wXuJT3B/f0a1C6OqHDFE0oM=";
+      name = "torchaudio-2.7.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-hOxyfx/a/fhd0cAYptO/q+tWZbEOC18nOmdetzD1nOU=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.7.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-G/R44k6Uqkm2gua2q0gZmMtULQb3faqar8ks7daiESc=";
+      name = "torchaudio-2.7.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DB1Af5NNRPh5NbE5mR2IcvgfiPimvpt70lkYv3ROK+Y=";
     };
     x86_64-linux-313 = {
-      name = "torchaudio-2.7.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-TgfEDMFF6GS6I5n9+27t78aC9kYk8rjYv1ZwPDEBAFw=";
+      name = "torchaudio-2.7.1-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-fpfqil1eVhCNHAcUFmE7xhoONTHC5rpqm2RiMtbkEIg=";
     };
     aarch64-darwin-39 = {
-      name = "torchaudio-2.7.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-DUIaoiW5NWTJjTuhbxlg3uLtyLTjdfYlGftR4sSJwSM=";
+      name = "torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-oHEA/iz3r0+mnYywRqK3QEZhJiGhpUivpa8caeAur4E=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.7.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-HEpkbJ6TR4NsCell7rxY3QKOxu80xG0+eJG//Y3GReo=";
+      name = "torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-RzmvV9DrlDR9HGobVmi+eKc4Ov6Cbd4YoEiDufnyY7E=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.7.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-hi2cXP4VaIp4RpYrXTyflZvv/oKx5UQZNcejdQTFxec=";
+      name = "torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-1aYviMYpA1kT9QbfA/cQxI/Iu5Y3GRkz8nxnCI1coTY=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.7.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-ZbT8m38oNn+RiwKuTbQpBFe8T90WDyK31oTpOrjcuVY=";
+      name = "torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-kwbc/EWGzr12R6k/6aRI55HE+Dk02mFrlDO3VZeh+Xg=";
     };
     aarch64-darwin-313 = {
-      name = "torchaudio-2.7.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-FQ+95B2mApbv/tdyt6Fw9WPNRJZ1VauwYD/Fc/Oc4kU=";
+      name = "torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl";
+      hash = "sha256-5fBZmlB/RoNUaHjtlmfhsy18o8ipV+TBXGswI3jvTe4=";
     };
     aarch64-linux-39 = {
-      name = "torchaudio-2.7.0-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-DopLBfFZ/7qBB5ic3vKKqyaWMH88f3i7nS4K9z7smAo=";
+      name = "torchaudio-2.7.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-6LLaEaf3eCsAuCPJnoEusA7os0Va1HT4/UKg2gvE9Go=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.7.0-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-nkBzmS9PjnET5LUF2VCVNhzrLyHde5MQd2FgokJm+PY=";
+      name = "torchaudio-2.7.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-wInb/BTF9HCRt78/a/K7rJO4ZhkpnQTZwQL0rVN1iZA=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.7.0-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Z3vTIDExDuc6R9buvC5050wc9GeTKUXuiAgqOTW1yVA=";
+      name = "torchaudio-2.7.1-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-U7xLoS50aL40p8ou6DfuXIvVdVslwS9mWvkznK434mU=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.7.0-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-MwBO1H8Y8ABEyX7ozZ4/XhwuJu8j1PcrXxrjPmGCWHs=";
+      name = "torchaudio-2.7.1-cp312-cp312-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-1mvXayJv3UE1yXZQ4bfrY/t2WbTtDjp3iJjkHbuiG2E=";
     };
     aarch64-linux-313 = {
-      name = "torchaudio-2.7.0-cp313-cp313-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-nZIe6wNlEqh+/eAHl3snvTJjIM181fQxlYJBc/6C6Ig=";
+      name = "torchaudio-2.7.1-cp313-cp313-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-Jx9xeETlx/ngXIMo3oF7+Q9G2DKBx5HpT1TU7eovWBc=";
     };
   };
 }

From 02e6ed21fb6024c2c571bbb57cd3efe84ea879f8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Jun 2025 23:21:58 +0200
Subject: [PATCH 1113/1497] python3Packages.torchvision: 0.22.0 -> 0.22.1

Diff: https://github.com/pytorch/vision/compare/v0.22.0...v0.22.1

Changelog: https://github.com/pytorch/vision/releases/tag/v0.22.1
---
 .../python-modules/torchvision/bin.nix        |  2 +-
 .../torchvision/binary-hashes.nix             | 92 +++++++++----------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index eccd53ebdb5a..1e2d08b4b36c 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -23,7 +23,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.22.0";
+  version = "0.22.1";
 in
 buildPythonPackage {
   inherit version;
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 8d708b474fd9..6457b1621cd8 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "0.22.0" = {
+  "0.22.1" = {
     x86_64-linux-39 = {
-      name = "torchvision-0.22.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-ySo1P/gtszEmRLWybUELWGtylptTWUjVhMJHVp91YFw=";
+      name = "torchvision-0.22.1-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
+      hash = "sha256-UfJbwdKLA32YoUFckXRBcmJE2KAJcZB+bfsA7MwxNl8=";
     };
     x86_64-linux-310 = {
-      name = "torchvision-0.22.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-Wd9aVQETqAzlIwRwZuqu2xaMaUgtqIw6skZxarRboJI=";
+      name = "torchvision-0.22.1-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-U49NtmcobZObTu4KZtMe0htRGGZoAGsOD/4gM47MfgA=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.22.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-86xSfVi0wgQ+uNnin8Vs0XUfNvKqptx1407FTJUby5w=";
+      name = "torchvision-0.22.1-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-klaKxGsTqMiLYViYALG5xGKb4JHqfOCA/G/GIuEeCRU=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.22.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-BsEB9A4f+UhpvhRIfJH9U1LjdvIC/er7j1PFjO4vvrU=";
+      name = "torchvision-0.22.1-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-9k75u5HXGrNdg4SRKhn3QZ41koaFvGdUTVj0UUgzQ3M=";
     };
     x86_64-linux-313 = {
-      name = "torchvision-0.22.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-7k+m1AUtmuJcEjMomUf7+kuI0jcQJUqxdysQjB/F+00=";
+      name = "torchvision-0.22.1-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-vE/vGTkXtR22tAms0//eyShth3uqwK7l3Pu3JZLQC/w=";
     };
     aarch64-darwin-39 = {
-      name = "torchvision-0.22.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-LvOKOX8bnPYoRvsgZZy5kQH502HejEXXkoTuRcb0DVA=";
+      name = "torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl";
+      hash = "sha256-i+lBtNNcCrqBm+cP27vtjOtgQBzmmWuM+quhMAzmImM=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.22.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-ciVvHX/1ELFsn7TdSIWE0Gk/QMeS8oapYgZ0Q4qBzMo=";
+      name = "torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-O0fYNp7laMBneVwNoLQHjzmp3+pvO8HzrIdTDf2h3VY=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.22.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-GR6igyH8Ji2Koaf+ecQf8oSIZL84L59upFxB3egxN5I=";
+      name = "torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-St32JuK1f8Iv1tMpzxNG1HRJdnLmr4ODt7W2NvupSlM=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.22.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-McMWVBj+IcPYH+NFnlEHfC+UiAG4kz7RgWn1RlJ5ag8=";
+      name = "torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-FT8XkOUFvW2hI+Ie7m6D4uFV3wXA/n1WNHMDBn2FQ8U=";
     };
     aarch64-darwin-313 = {
-      name = "torchvision-0.22.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-7OF5lYV90yhIXJwCfAsg/8UtsjLjDIT/bJWrdyAREsU=";
+      name = "torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl";
+      hash = "sha256-nDrjMZYkxDzIEnAg9GwUqoeEBngfCJm7YoOuR0r+r78=";
     };
     aarch64-linux-39 = {
-      name = "torchvision-0.22.0-cp39-cp39-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-QJX6wrLkmpww9wHgnsG989EbHkiwBqdqkBWi7Ys5VW4=";
+      name = "torchvision-0.22.1-cp39-cp39-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-manylinux_2_28_aarch64.whl";
+      hash = "sha256-FUor3DehYSLCAk8vd+ZfWYYCC0DAE1FcaUtdNX+smaE=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.22.0-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-gQ6krzvGPPOeg0+R9CGP9ZmSccqv/iRWJH35BQAr1sA=";
+      name = "torchvision-0.22.1-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-mQ3k1lekHtcWgM2L4umOvKtVNx8wmT3JvS5nZEH3GA4=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.22.0-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-bFYg4Q/+OI629HRJYhBu188VCNJub9+gwQUi0ySa6iQ=";
+      name = "torchvision-0.22.1-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-i0pTpgZ9Y626DFLyuN0ikNtknWQgIWdO5DwMki8Mamk=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.22.0-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-jxFryC4MB25wund25hHtOSuWZqpENmLmh4CLCJk9Jq8=";
+      name = "torchvision-0.22.1-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-lkQU7vGUWdVaEOiG4vylBndVDiQ1htFnj2Xj9va6xHo=";
     };
     aarch64-linux-313 = {
-      name = "torchvision-0.22.0-cp313-cp313-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Rxxt11u5hMbr5PYDIolKKQvz1LGV52nYB1TzaJzX8jg=";
+      name = "torchvision-0.22.1-cp313-cp313-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-SmFKakCNLtdCCNDqbCii+7aCkOmn3yBsX+8/C2hl0wc=";
     };
   };
 }

From 9941c2bfec383956d1d829045849b3c9fd438e7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:29 +0200
Subject: [PATCH 1114/1497] python312Packages.mypy-boto3-mediaconnect: 1.38.0
 -> 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 26dabc4c6175..d73f5b9576d8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -858,8 +858,8 @@ rec {
       "sha256-umSucGwSnfOwHbi+ywjTKO6Tvqv1buUI7InHy87KH7Y=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.38.0"
-      "sha256-F6Yv7tgHnzgsekH7HJ8s7/Kpq1JiZkHs+qZEez5snUI=";
+    buildMypyBoto3Package "mediaconnect" "1.38.30"
+      "sha256-2h5gCpyHFR81p48scesRhcETZYJm+R1FWPE/STWsnps=";
 
   mypy-boto3-mediaconvert =
     buildMypyBoto3Package "mediaconvert" "1.38.16"

From 25b105da383e9be7c0c06800814e535e13ec77db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:30 +0200
Subject: [PATCH 1115/1497] python312Packages.mypy-boto3-mediaconvert: 1.38.16
 -> 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d73f5b9576d8..341ee076a23a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -862,8 +862,8 @@ rec {
       "sha256-2h5gCpyHFR81p48scesRhcETZYJm+R1FWPE/STWsnps=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.38.16"
-      "sha256-13hTO6ZkJl+6IuEjJFl4Yy0McVURcRxfeefzgPnrULs=";
+    buildMypyBoto3Package "mediaconvert" "1.38.30"
+      "sha256-npwBRNcqJRzYlXCkgPQRmf2gKenfS2nNuc5FPBxMVeM=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.38.14"

From 47389c0bcc36d635f652836fd2c31dc52403c5ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:36 +0200
Subject: [PATCH 1116/1497] python312Packages.mypy-boto3-network-firewall:
 1.38.25 -> 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 341ee076a23a..aad786281972 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -950,8 +950,8 @@ rec {
       "sha256-U0fMJNyZpqwYlMuqTBSZCgAtls7IuyKnjWBAJ+6rTV8=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.38.25"
-      "sha256-R2uEXo+0gtP1b76aKT9VWCKM0Uy3PulOO2T9WH2V8dM=";
+    buildMypyBoto3Package "network-firewall" "1.38.30"
+      "sha256-0LNUmv+qHecNzVPHyv8fG5DzGva89wSj0D4f4+0F7QI=";
 
   mypy-boto3-networkmanager =
     buildMypyBoto3Package "networkmanager" "1.38.0"

From 6aaf4bb2ac8ee3777a76db96622b4e1f09911e3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:52:51 +0200
Subject: [PATCH 1117/1497] python312Packages.mypy-boto3-sagemaker: 1.38.27 ->
 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index aad786281972..4ce707c3e819 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1174,8 +1174,8 @@ rec {
       "sha256-lBWZesgIKYnjSjUOPBhF4GNsNSk09YDSEyX0qweT3iM=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.38.27"
-      "sha256-uzh49125b/AmTSUP5MtNqeahVwFpUZn7KclG2kgiCJE=";
+    buildMypyBoto3Package "sagemaker" "1.38.30"
+      "sha256-HXwk6q4GB4h9j9MxMMgXXf61Q7rTbyBhdsl8zoJOmIc=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.38.0"

From 2bfe9af6c91e544d2602481b26461014ffb7aff5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:04 +0200
Subject: [PATCH 1118/1497] python312Packages.mypy-boto3-transcribe: 1.38.0 ->
 1.38.30

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4ce707c3e819..55130de6c032 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1366,8 +1366,8 @@ rec {
       "sha256-X+cq+zQQnUm/8iusKqzkKzVUSFDvQYToiEwRb4rwSGc=";
 
   mypy-boto3-transcribe =
-    buildMypyBoto3Package "transcribe" "1.38.0"
-      "sha256-yfJCkmK3H/QJ0xApdUGfabwjgrHgu8r0mzKNDOsEDqk=";
+    buildMypyBoto3Package "transcribe" "1.38.30"
+      "sha256-stpcFDzkwOjnOHaeOjOSfZg4AQI3VhH/TFD3VsVZDL8=";
 
   mypy-boto3-transfer =
     buildMypyBoto3Package "transfer" "1.38.0"

From 380e689bcb15919504fad726f633ff3be5e6460a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:12 +0200
Subject: [PATCH 1119/1497] python313Packages.botocore-stubs: 1.38.28 ->
 1.38.30

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 8538f3d24f3c..fc1920df72ba 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.38.28";
+  version = "1.38.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-uVSQULgQUb27kZZjI9aitsXHjKjcwyjhbfxEt2W+Ob4=";
+    hash = "sha256-KR1785oxbACopVtyVUibAsDOoaNDSC53hOjR4jW66ZU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From e248093e1af3b5c02e9e30593d5b143402add0b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:53:15 +0200
Subject: [PATCH 1120/1497] python313Packages.boto3-stubs: 1.38.28 -> 1.38.30

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 1e1fe1867c43..816e6516e1fd 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.28";
+  version = "1.38.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-+ujgCepNgQt35J2IJHGDtdjRU78mjr3otKvfWKcBgC8=";
+    hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds=";
   };
 
   build-system = [ setuptools ];

From e2cb8c6cd519bd6fa95ac876306d8f4c730b9042 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:54:55 +0200
Subject: [PATCH 1121/1497] python313Packages.holidays: 0.73 -> 0.74

Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.73...refs/tags/v0.74

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.74
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 049904b5f5a9..c1ffa46c7724 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.73";
+  version = "0.74";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-ErSu47rJ2ehUl4AuYn/yE0N0yNYGlk95IHH7dixUqDI=";
+    hash = "sha256-lc8yNZ7ZFBjIPiIlT7uCvHX81uMstTGv0Rsbx8RUGh0=";
   };
 
   build-system = [

From cb46c25408a848e2762364fd26745e7412663b3f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Jun 2025 23:55:51 +0200
Subject: [PATCH 1122/1497] python313Packages.publicsuffixlist: 1.0.2.20250529
 -> 1.0.2.20250603

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250603-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index fcf7ba5ddab0..db8b08db1f00 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250529";
+  version = "1.0.2.20250603";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0hK9gd9nW5WVCDbc7BqvBi0Xn5Vysn0wS08UwNpyY3s=";
+    hash = "sha256-yilOA8vKLb7Q1KTAM7+iO5HIkphALi+BL64RdXIpcX4=";
   };
 
   build-system = [ setuptools ];

From c7c6a3a73ea54f8e5f7eb04618f5acea1cb34870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Jun 2025 16:46:48 +0000
Subject: [PATCH 1123/1497] plexRaw: 1.41.7.9799-5bce000f7 ->
 1.41.7.9823-59f304c16

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 0b055e24a467..63bdf06ecfb0 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.7.9799-5bce000f7";
+  version = "1.41.7.9823-59f304c16";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "0pzyzgp6w04zrc8wxdkna939wmb7f64wklqlar0bb6g0270hx40v";
+        sha256 = "1gnrb3kc9l7rvbs1yb1640f4csvwdp0kpabhgbq7ql55yk1rcfg8";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "1p26cgzds3h229npp839fll5wdvz29z580xh34mws2ayq25lk796";
+        sha256 = "1r73w7bgpv5nabi8w5fh8np8ghny308s574izmr1damcczz5d0z2";
       };
 
   outputs = [

From 1d717d180a3df6ca463c171f48ded69dd37b6074 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Jun 2025 00:03:55 +0200
Subject: [PATCH 1124/1497] python313Packages.seedir: 0.5.0 -> 0.5.1

Diff: https://github.com/earnestt1234/seedir/compare/refs/tags/v0.5.0...refs/tags/v0.5.1

Changelog: https://github.com/earnestt1234/seedir/releases/tag/v0.5.1
---
 pkgs/development/python-modules/seedir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix
index 5a2891df8e07..ea29422911f8 100644
--- a/pkgs/development/python-modules/seedir/default.nix
+++ b/pkgs/development/python-modules/seedir/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "seedir";
-  version = "0.5.0";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "earnestt1234";
     repo = "seedir";
     tag = "v${version}";
-    hash = "sha256-ilL2KKN5sJclVcStO/kZoacsPoMgcFW1/8M/PQjxw/U=";
+    hash = "sha256-o2CUK00WdoYyLqbDlh+wa30Q23ZkWZC+RvGDCSiCwH4=";
   };
 
   build-system = [ setuptools ];

From c912c0f3210d6ded130b4c698483fd2fb9242450 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Wed, 4 Jun 2025 20:53:28 +0300
Subject: [PATCH 1125/1497] 
 home-assistant-custom-lovelace-modules.custom-sidebar: init at 10.2.0

---
 .../custom-sidebar/package.nix                | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
new file mode 100644
index 000000000000..f9ff95311ea7
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  pnpm,
+  nodejs,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "custom-sidebar";
+  version = "10.2.0";
+
+  src = fetchFromGitHub {
+    owner = "elchininet";
+    repo = "custom-sidebar";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KJ22IAHMIDTyDvm0mPCYymXNEEEUr2Mx+jZTp6wjkko=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-V0lu91aLMIjcFsDfqXJldQGfJVALErrl49qMnR2hplw=";
+  };
+
+  nativeBuildInputs = [
+    pnpm.configHook
+    nodejs
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    cp dist/* "$out"
+
+    runHook postInstall
+  '';
+
+  passthru.entrypoint = "custom-sidebar-yaml.js";
+
+  meta = with lib; {
+    description = "Custom plugin that allows you to personalise the Home Assistant's sidebar per user or device basis";
+    homepage = "https://elchininet.github.io/custom-sidebar";
+    downloadPage = "https://github.com/elchininet/custom-sidebar";
+    changelog = "https://github.com/elchininet/custom-sidebar/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with maintainers; [ kranzes ];
+  };
+})

From 12d537f545c71aede6b230d318758629304c1627 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Jun 2025 22:54:19 +0200
Subject: [PATCH 1126/1497] python313Packages.tencentcloud-sdk-python: 3.0.1391
 -> 3.0.1392

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1391...refs/tags/3.0.1392

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1392/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index fc1035dadcf4..523daa37354f 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1391";
+  version = "3.0.1392";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-bzxaCN2fXoZT2W8zpTg7DrBTmRfyUi2aVhrg+/Y1YkU=";
+    hash = "sha256-dEf4kcaykngTmxVdMXuoiwG5aBwirHA8zVluh7woHrM=";
   };
 
   build-system = [ setuptools ];

From 7ec4c430e82d3094f2230aaa1ca8fee7b37c8c0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Jun 2025 00:17:38 +0200
Subject: [PATCH 1127/1497] python313Packages.tencentcloud-sdk-python: 3.0.1392
 -> 3.0.1393

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1392...refs/tags/3.0.1393

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1393/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 523daa37354f..8e6704319bac 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1392";
+  version = "3.0.1393";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-dEf4kcaykngTmxVdMXuoiwG5aBwirHA8zVluh7woHrM=";
+    hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA=";
   };
 
   build-system = [ setuptools ];

From 4c3eaa9dae561c84cd124809a3d1ddc80e1b63ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 14:58:42 -0700
Subject: [PATCH 1128/1497] bitwarden-cli: 2025.4.0 -> 2025.5.0

Diff: https://github.com/bitwarden/clients/compare/refs/tags/cli-v2025.4.0...refs/tags/cli-v2025.5.0

Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2025.5.0
---
 pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index ec936f6a3a8b..7d536f2bb6ed 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -13,13 +13,13 @@
 
 buildNpmPackage rec {
   pname = "bitwarden-cli";
-  version = "2025.4.0";
+  version = "2025.5.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     tag = "cli-v${version}";
-    hash = "sha256-sWphSdxh07GS7GPlNVxK7zoXMTGLjT7qTLfH1nsIiQQ=";
+    hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ buildNpmPackage rec {
 
   nodejs = nodejs_20;
 
-  npmDepsHash = "sha256-/BOzDt+wgnWedWfShPkAhaeujBBQTDlZdtiKl3wrOqE=";
+  npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     cctools

From d004e444135eba374cdf723afb623fbd4955a264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 15:15:48 -0700
Subject: [PATCH 1129/1497] bitwarden-cli: mark broken on Darwin

---
 pkgs/by-name/bi/bitwarden-cli/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 7d536f2bb6ed..773a788ed663 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -98,6 +98,8 @@ buildNpmPackage rec {
   };
 
   meta = {
+    # https://github.com/NixOS/nixpkgs/issues/339576
+    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}";
     description = "Secure and free password manager for all of your devices";
     homepage = "https://bitwarden.com";

From 634059c8e6e913133ac4cb87e950620c1b0a841d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 22:43:31 +0000
Subject: [PATCH 1130/1497] melange: 0.26.0 -> 0.26.6

---
 pkgs/by-name/me/melange/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index 2fe5d5c9c7da..e7ef7b1f3f28 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.26.0";
+  version = "0.26.6";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-tdZsroG5rwOr+rMA3PPv/XVK1ubqZAu3v75zEa3wQpY=";
+    hash = "sha256-4bH4eobaqnOYHTN8Nj0WVwNQ9FezxWsXpAjZBx9Bbas=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -26,7 +26,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-C8P750AtJX4c/7MtuETP7q5T7WJZPbV4X/0y7HgRPDI=";
+  vendorHash = "sha256-AOlMb39c+S4kDTXpDorXjG6iO1dct9x5kLbboRJSzv4=";
 
   subPackages = [ "." ];
 

From 6234476b8fe68913052af51ec9708552c79fb24b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Jun 2025 00:45:54 +0200
Subject: [PATCH 1131/1497] python313Packages.nessclient: 1.1.2 -> 1.2.0

Changelog: https://github.com/nickw444/nessclient/releases/tag/1.2.0
---
 pkgs/development/python-modules/nessclient/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix
index fb182877ed64..5e00564cfc45 100644
--- a/pkgs/development/python-modules/nessclient/default.nix
+++ b/pkgs/development/python-modules/nessclient/default.nix
@@ -4,7 +4,7 @@
   click,
   fetchFromGitHub,
   justbackoff,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
   pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "nessclient";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "nickw444";
     repo = "nessclient";
     tag = version;
-    hash = "sha256-STDEIY7D02MlH+R6uLAKl6ghSQjhG1OEQWj71DrZP30=";
+    hash = "sha256-AKZwKEwICuwKyCjIFxx4Zb2r9EriC0+3evBsBE9Btak=";
   };
 
   postPatch = ''
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   dependencies = [
     justbackoff
-    pyserial-asyncio
+    pyserial-asyncio-fast
   ];
 
   optional-dependencies = {

From 30e3aac86abd9bd37b38e094f240c75a4c0114ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 22:52:42 +0000
Subject: [PATCH 1132/1497] ts_query_ls: 3.1.0 -> 3.2.0

---
 pkgs/by-name/ts/ts_query_ls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix
index af79a75f46f4..ef8b5b4dca83 100644
--- a/pkgs/by-name/ts/ts_query_ls/package.nix
+++ b/pkgs/by-name/ts/ts_query_ls/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   pname = "ts_query_ls";
-  version = "3.1.0";
+  version = "3.2.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage {
     owner = "ribru17";
     repo = "ts_query_ls";
     rev = "v${version}";
-    hash = "sha256-gnJqSxK8iT48cvgLsJXgQrk2Wo7XQkK0oRirsmfgdAo=";
+    hash = "sha256-sr9uSjSbX/Af/g8OSrSMQXCpObxTblZw7qe5OTfqXvA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-67/bvQ5jMsYdSe0gSTdbxRsG91Sxd8PMaitByQ6jWyQ=";
+  cargoHash = "sha256-y9AR9qWJXRHcf8vtOvBZxMCUZvC/ty/4jF5mkhdMy9Y=";
 
   meta = {
     description = "LSP implementation for Tree-sitter's query files";

From a0e101bd1bd9f2ca2531861e9a1ebdb200d8be60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 16:02:20 -0700
Subject: [PATCH 1133/1497] python3Packages.pysmlight: fix tests on Darwin

---
 pkgs/development/python-modules/pysmlight/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 475c21daeac0..e2c7c3126fd6 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -41,6 +41,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/smlight-tech/pysmlight/releases/tag/${src.tag}";
     description = "Library implementing API control of the SMLIGHT SLZB-06 LAN Coordinators";

From 106a47787c7bcc81634cfa66ad3979b45bd0ec1c Mon Sep 17 00:00:00 2001
From: iivusly <52052910+iivusly@users.noreply.github.com>
Date: Wed, 4 Jun 2025 16:33:51 -0700
Subject: [PATCH 1134/1497] uxn: fix builds in Darwin

---
 pkgs/by-name/ux/uxn/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 43c87dd85fb3..3e3d9bf4e803 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -35,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs build.sh
     substituteInPlace build.sh \
-      --replace "-L/usr/local/lib " ""
+      --replace "-L/usr/local/lib " "" \
+      --replace "$(brew --prefix)/lib/libSDL2.a " "" \
+      --replace "--static-libs" "--libs" \
+      --replace " | sed -e 's/-lSDL2 //'" ""
   '';
 
   buildPhase = ''
@@ -68,6 +71,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ ];
     mainProgram = "uxnemu";
     inherit (SDL2.meta) platforms;
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From b4ebb630d4288c5d5df281697bc6bada5ff5844c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 18:02:59 -0700
Subject: [PATCH 1135/1497] python3Packages.aioimmich: init at 0.9.0

---
 .../python-modules/aioimmich/default.nix      | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/aioimmich/default.nix

diff --git a/pkgs/development/python-modules/aioimmich/default.nix b/pkgs/development/python-modules/aioimmich/default.nix
new file mode 100644
index 000000000000..fcb666d1357c
--- /dev/null
+++ b/pkgs/development/python-modules/aioimmich/default.nix
@@ -0,0 +1,54 @@
+{
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  mashumaro,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "aioimmich";
+  version = "0.9.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mib1185";
+    repo = "aioimmich";
+    tag = "v${version}";
+    hash = "sha256-s2W/Z/psCLvd7zMsaaYi3ZIcEuuRSpyRSvUUfIPe8a4=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail setuptools==80.9.0 setuptools
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+  ];
+
+  pythonImportsCheck = [ "aioimmich" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/mib1185/aioimmich/releases/tag/${src.tag}";
+    description = "Asynchronous library to fetch albums and assests from immich";
+    homepage = "https://github.com/mib1185/aioimmich";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index faf0040093ef..8378b4dc58eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -333,6 +333,8 @@ self: super: with self; {
 
   aioimaplib = callPackage ../development/python-modules/aioimaplib { };
 
+  aioimmich = callPackage ../development/python-modules/aioimmich { };
+
   aioinflux = callPackage ../development/python-modules/aioinflux { };
 
   aioitertools = callPackage ../development/python-modules/aioitertools { };

From 96c8709d826ef5c16d7741db7eac3dd6c11e9a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Wed, 4 Jun 2025 23:47:39 +0000
Subject: [PATCH 1136/1497] virtualbox: 7.1.8 -> 7.1.10

---
 .../virtualization/virtualbox/default.nix            | 12 +++++-------
 .../virtualization/virtualbox/extpack.nix            |  4 ++--
 .../virtualbox/guest-additions-iso/default.nix       |  2 +-
 .../virtualbox/guest-additions/default.nix           |  4 ++--
 pkgs/top-level/all-packages.nix                      |  1 -
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3c9ba2e744cb..b36afd4bdc7f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -16,7 +16,6 @@
   libXcursor,
   libXfixes,
   libXmu,
-  libIDL,
   SDL2,
   libcap,
   libGL,
@@ -74,9 +73,9 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.1.8";
+  virtualboxVersion = "7.1.10";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
+  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
 
   kvmPatchVersion = "20250207";
   kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
@@ -148,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: {
       libX11
       libXext
       libXcursor
-      libIDL
       libcap
       glib
       lvm2
@@ -249,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional enableKvm (
       let
         patchVboxVersion =
-          # There is no updated patch for 7.1.8 yet, but the older one still applies.
-          if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;
+          # There is no updated patch for 7.1.10 yet, but the older one still applies.
+          if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion;
       in
       fetchpatch {
         name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";
@@ -320,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
       ${optionalString (enableKvm) "--with-kvm"} \
       ${extraConfigureFlags} \
       --disable-kmods
-    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
+    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig@' \
         -i AutoConfig.kmk
     sed -e 's@arch/x86/@@' \
         -i Config.kmk
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index a26f3a0cac3f..3d771d975798 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -4,7 +4,7 @@
   virtualbox,
 }:
 let
-  virtualboxExtPackVersion = "7.1.8";
+  virtualboxExtPackVersion = "7.1.10";
 in
 fetchurl rec {
   name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
     let
-      value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";
+      value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 008a41353afe..d78248dbb752 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";
+  sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6de71ef33067..3d8cbf6fe5f3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,9 @@
   libX11,
 }:
 let
-  virtualboxVersion = "7.1.8";
+  virtualboxVersion = "7.1.10";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
+  virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869";
 
   virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
     inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91e9769d22e0..cf6b76c6092a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14346,7 +14346,6 @@ with pkgs;
 
   virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
     stdenv = stdenv_32bit;
-    inherit (gnome2) libIDL;
 
     # VirtualBox uses wsimport, which was removed after JDK 8.
     jdk = jdk8;

From 8cf7a13f561f7a6a3c462861c4e636087e4ea142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 4 Jun 2025 18:17:48 -0700
Subject: [PATCH 1137/1497] python3Packages.aioamazondevices: init at 3.0.5

---
 .../aioamazondevices/default.nix              | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/aioamazondevices/default.nix

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
new file mode 100644
index 000000000000..563dbb624bae
--- /dev/null
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -0,0 +1,55 @@
+{
+  aiohttp,
+  babel,
+  beautifulsoup4,
+  buildPythonPackage,
+  colorlog,
+  fetchFromGitHub,
+  httpx,
+  lib,
+  orjson,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "aioamazondevices";
+  version = "3.0.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "chemelli74";
+    repo = "aioamazondevices";
+    tag = "v${version}";
+    hash = "sha256-CgIkrq5Eni7Iva/bzlcbj1/mqtKPA4mknHC/fQzL7RU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    babel
+    beautifulsoup4
+    colorlog
+    httpx
+    orjson
+    yarl
+  ];
+
+  pythonImportsCheck = [ "aioamazondevices" ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/chemelli74/aioamazondevices/blob/${src.tag}/CHANGELOG.md";
+    description = "Python library to control Amazon devices";
+    homepage = "https://github.com/chemelli74/aioamazondevices";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index faf0040093ef..8d640c640e6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -189,6 +189,8 @@ self: super: with self; {
 
   aioairzone-cloud = callPackage ../development/python-modules/aioairzone-cloud { };
 
+  aioamazondevices = callPackage ../development/python-modules/aioamazondevices { };
+
   aioambient = callPackage ../development/python-modules/aioambient { };
 
   aioamqp = callPackage ../development/python-modules/aioamqp { };

From 2a773a1b68b49d02efe02c9f0639d8aa4ffc1fd8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 5 Jun 2025 09:44:02 +0800
Subject: [PATCH 1138/1497] zasm: 4.4.7 -> 4.4.17

Diff: https://github.com/megatokio/zasm/compare/4.4.7...4.4.17
---
 pkgs/by-name/za/zasm/package.nix | 39 +++++++++++++-------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/za/zasm/package.nix b/pkgs/by-name/za/zasm/package.nix
index 0eaf0992e6f6..c813b9827edc 100644
--- a/pkgs/by-name/za/zasm/package.nix
+++ b/pkgs/by-name/za/zasm/package.nix
@@ -4,24 +4,17 @@
   fetchFromGitHub,
   zlib,
 }:
-let
-  libs-src = fetchFromGitHub {
-    owner = "megatokio";
-    repo = "Libraries";
-    # 2021-02-02
-    rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b";
-    sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk=";
-  };
-in
-stdenv.mkDerivation rec {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "zasm";
-  version = "4.4.7";
+  version = "4.4.17";
 
   src = fetchFromGitHub {
     owner = "megatokio";
     repo = "zasm";
-    rev = version;
-    sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68=";
+    tag = finalAttrs.version;
+    fetchSubmodules = true;
+    hash = "sha256-nc8hlGfix9eVTP5ZimmLKv22cdfsKRfrG70brpUh6CA=";
     postFetch = ''
       # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux)
       rm -rv $out/Test
@@ -30,10 +23,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  configurePhase = ''
-    ln -sf ${libs-src} Libraries
-  '';
-
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
     "CXX=${stdenv.cc.targetPrefix}c++"
@@ -42,16 +31,20 @@ stdenv.mkDerivation rec {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 -t $out/bin zasm
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Z80 / 8080 / Z180 assembler (for unix-style OS)";
     mainProgram = "zasm";
     homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.turbomack ];
-    platforms = platforms.unix;
-    badPlatforms = platforms.aarch64;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.turbomack ];
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.aarch64;
   };
-}
+})

From 3555936f7712f80b4c556748d993d9de93995d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Ahlstr=C3=B6m?= <kalle.ahlstrom@iki.fi>
Date: Thu, 5 Jun 2025 04:11:20 +0300
Subject: [PATCH 1139/1497] dive: add shell completion

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
---
 pkgs/by-name/di/dive/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix
index 46a3a530c126..d051c1771386 100644
--- a/pkgs/by-name/di/dive/package.nix
+++ b/pkgs/by-name/di/dive/package.nix
@@ -4,6 +4,7 @@
   buildGoModule,
   fetchFromGitHub,
   pkg-config,
+  installShellFiles,
   btrfs-progs,
   gpgme,
   lvm2,
@@ -21,7 +22,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-egsFnnHZMPRTJeFw6uByE9OJH06zqKRTvQi9XhegbDI=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     btrfs-progs
@@ -35,6 +39,13 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd dive \
+      --bash <($out/bin/dive completion bash) \
+      --fish <($out/bin/dive completion fish) \
+      --zsh <($out/bin/dive completion zsh)
+  '';
+
   meta = {
     description = "Tool for exploring each layer in a docker image";
     mainProgram = "dive";

From 67ec01ff282fecf7d2ae8e1086fb88a7159dc6b7 Mon Sep 17 00:00:00 2001
From: Mohammad Al-Ahdal <mo@mohammad.dev>
Date: Wed, 4 Jun 2025 20:30:50 -0600
Subject: [PATCH 1140/1497] code-cursor: 0.50.5 -> 1.0.0

---
 pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 118866891f9b..f0c63faeff39 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -49,26 +49,26 @@
 }:
 let
   pname = "cursor";
-  version = "0.50.5";
+  version = "1.0.0";
 
   inherit (stdenvNoCC) hostPlatform;
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/x64/Cursor-0.50.5-x86_64.AppImage";
-      hash = "sha256-DUWIgQYD3Wj6hF7NBb00OGRynKmXcFldWFUA6W8CZeM=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/x64/Cursor-1.0.0-x86_64.AppImage";
+      hash = "sha256-HJiT3aDB66K2slcGJDC21+WhK/kv4KCKVZgupbfmLG0=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/linux/arm64/Cursor-0.50.5-aarch64.AppImage";
-      hash = "sha256-51zTYg4A+4ZUbGZ6/Qp3d5aL8IafewGOUYbXWGG8ILY=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/linux/arm64/Cursor-1.0.0-aarch64.AppImage";
+      hash = "sha256-/F+OUD+sjnIt2ishusi7F/W1kK/n7hwL7Bz1cO3u+x4=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-C2+z3WXi3Ma3PzlU8BrcuJFGMx8YosNdxuSqR5tJdBE=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-7JTgauy+vdoaPOtbYjhSCR+ZtVwzRYKHVelpnvS5oKw=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/96e5b01ca25f8fbd4c4c10bc69b15f6228c80771/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-Gz+aYDaDMDx46R7HA8u5vZwkXx9q//uu4hNyyRmrq9s=";
+      url = "https://downloads.cursor.com/production/53b99ce608cba35127ae3a050c1738a959750865/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-kbSN4+ozVGVAGLqEuaDnWBNfzmFHYdAvbOsCb/KTpe8=";
     };
   };
 

From 01885ade5348ff2502e384f2a07c26ff7582230f Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Thu, 5 Jun 2025 04:38:43 +0200
Subject: [PATCH 1141/1497] perlPackages.FileFindRule: patch for CVE-2011-10007

---
 .../FileFindRule-CVE-2011-10007.patch         | 25 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch

diff --git a/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch
new file mode 100644
index 000000000000..dd8492c60f21
--- /dev/null
+++ b/pkgs/development/perl-modules/FileFindRule-CVE-2011-10007.patch
@@ -0,0 +1,25 @@
+From ca70a73bb147549e62e74751d924b1dbb59d1707 Mon Sep 17 00:00:00 2001
+From: Stig Palmquist <stig@stig.io>
+Date: Thu, 5 Jun 2025 03:45:50 +0200
+Subject: [PATCH] Fix CVE-2011-10007
+
+---
+ lib/File/Find/Rule.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/File/Find/Rule.pm b/lib/File/Find/Rule.pm
+index feccc76..d4dc475 100644
+--- a/lib/File/Find/Rule.pm
++++ b/lib/File/Find/Rule.pm
+@@ -420,7 +420,7 @@ sub grep {
+ 
+     $self->exec( sub {
+         local *FILE;
+-        open FILE, $_ or return;
++        open FILE, '<', $_ or return;
+         local ($_, $.);
+         while (<FILE>) {
+             for my $p (@pattern) {
+-- 
+2.49.0
+
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b4a23d1986b5..a3497aea8bbd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13327,6 +13327,9 @@ with self;
       url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz";
       hash = "sha256-fm8WzDPrHyn/Jb7lHVE/S4qElHu/oY7bLTzECi1kyv4=";
     };
+    patches = [
+      ../development/perl-modules/FileFindRule-CVE-2011-10007.patch
+    ];
     propagatedBuildInputs = [
       NumberCompare
       TextGlob

From cbe714592881bba16352df4f9d544e7a81a0bd43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 02:45:22 +0000
Subject: [PATCH 1142/1497] knot-dns: 3.4.6 -> 3.4.7

---
 pkgs/by-name/kn/knot-dns/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index 361bdb298424..a415cb289709 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "sha256-0ZxaH/lLTyYCfWNd4Qjb/Ij1ZSvobMs7qaRO6b4OWDk=";
+    sha256 = "sha256-3TRspvOvq83F6boJ3WZ7AQWQu2akL0VBAh+51vBz2sw=";
   };
 
   outputs = [

From e38b81803841ca0c580356c50de44f06a60cd04e Mon Sep 17 00:00:00 2001
From: Maya Doshi <maya-doshi@proton.me>
Date: Wed, 4 Jun 2025 22:53:21 -0400
Subject: [PATCH 1143/1497] ezstream: 0.6.0 -> 1.0.2

---
 pkgs/by-name/ez/ezstream/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ez/ezstream/package.nix b/pkgs/by-name/ez/ezstream/package.nix
index 49fa6efb868d..5ea87bb73e51 100644
--- a/pkgs/by-name/ez/ezstream/package.nix
+++ b/pkgs/by-name/ez/ezstream/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  check,
   libiconv,
   libshout,
   taglib,
@@ -11,13 +12,17 @@
 
 stdenv.mkDerivation rec {
   pname = "ezstream";
-  version = "0.6.0";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz";
-    sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
+    hash = "sha256-Ed6Jf0ValbpYVGvc1AqV072mmGbsX3h5qDsCQSbFTCo=";
   };
 
+  checkInputs = [
+    check
+  ];
+
   buildInputs = [
     libiconv
     libshout

From 00d8ed7ae2c235763b514308104fa803eecc24ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 04:58:06 +0200
Subject: [PATCH 1144/1497] python3Packages.django_5_1: 5.1.9 -> 5.1.10

https://docs.djangoproject.com/en/5.1/releases/5.1.10/
https://www.djangoproject.com/weblog/2025/jun/04/security-releases/

Fixes: CVE-2025-48432
---
 pkgs/development/python-modules/django/5_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix
index e65c39cf0549..e172fb2d652d 100644
--- a/pkgs/development/python-modules/django/5_1.nix
+++ b/pkgs/development/python-modules/django/5_1.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.9";
+  version = "5.1.10";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-uBP6MoVjPUtNu6KxLjaYmKTN42JIUCTJSuSnQWSxyQU=";
+    hash = "sha256-+VsTrlff1eBGaVBqRHNOivVXqBkfjZvY2dzawE1sOOQ=";
   };
 
   patches =

From 0e349bdc7688e01944c995b0bac756f7bc72ffec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 04:57:20 +0200
Subject: [PATCH 1145/1497] python3Packages.django_5_2: 5.2.1 -> 5.2.2

https://docs.djangoproject.com/en/5.2/releases/5.2.2/
https://www.djangoproject.com/weblog/2025/jun/04/security-releases/

Fixes: CVE-2025-48432
---
 pkgs/development/python-modules/django/5_2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index 384a7040ea95..bc7d06c3dfb4 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.1";
+  version = "5.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-JmO2IEWrpA7/FXOwESLvIIuHmi2HQgvg28LVNmBXgLA=";
+    hash = "sha256-x5PTE8oYA1VzErYXfuRzT4xNiMRnfEd6H9lEtB+HBkc=";
   };
 
   patches =

From c2e3ef65d1f53d332202da13c47fd7ae25d73a5a Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 26 May 2025 14:20:32 +0900
Subject: [PATCH 1146/1497] typescript: prefer versionCheckHook rather than
 testers.testVersion

Actually simplify updating from 5.8.2 to 5.8.3 causes errors in the version check
---
 pkgs/by-name/ty/typescript/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index e95c9e79d893..ce6a4d89553a 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -2,8 +2,7 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
-  testers,
-  typescript,
+  versionCheckHook,
 }:
 
 buildNpmPackage rec {
@@ -23,11 +22,12 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-ytdkxIjAd3UsU90o9IFZa5lGEv39zblBmgTTseVRGKQ=";
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = typescript;
-    };
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/tsc";
+  versionCheckProgramArg = "--version";
 
   meta = with lib; {
     description = "Superset of JavaScript that compiles to clean JavaScript output";

From 6262669c6ebcee31e4dfca8289a1ded173affc65 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 26 May 2025 14:27:21 +0900
Subject: [PATCH 1147/1497] typescript: cleanup

- add updateScript

- prefer finalAttrs

- remove `with lib;`

- prefer tag rather than rev for fetchFromGitHub
---
 pkgs/by-name/ty/typescript/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index ce6a4d89553a..8b349c5c6160 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -3,16 +3,17 @@
   buildNpmPackage,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "typescript";
   version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fOA5IblxUd+C9ST3oI8IUmTTRL3exC63MPqW5hoWN0M=";
   };
 
@@ -29,12 +30,20 @@ buildNpmPackage rec {
   versionCheckProgram = "${placeholder "out"}/bin/tsc";
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex=^v([\\d.]+)$"
+      ];
+    };
+  };
+
+  meta = {
     description = "Superset of JavaScript that compiles to clean JavaScript output";
     homepage = "https://www.typescriptlang.org/";
-    changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}";
-    license = licenses.asl20;
+    changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
     maintainers = [ ];
     mainProgram = "tsc";
   };
-}
+})

From 1ef2f0078ca0fd4f61e6851a511cde3f7ad32964 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 26 May 2025 14:57:53 +0900
Subject: [PATCH 1148/1497] typescript: 5.8.2 -> 5.8.3

Diff: https://github.com/microsoft/TypeScript/compare/v5.8.2...v5.8.3
---
 pkgs/by-name/ty/typescript/package.nix        | 31 +++++++++--
 .../ty/typescript/revert-bump-to-v5.9.patch   | 52 +++++++++++++++++++
 2 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch

diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index 8b349c5c6160..0c39c7169da9 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -2,26 +2,51 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  replaceVars,
   versionCheckHook,
   nix-update-script,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "typescript";
-  version = "5.8.2";
+  version = "5.8.3";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "TypeScript";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fOA5IblxUd+C9ST3oI8IUmTTRL3exC63MPqW5hoWN0M=";
+    hash = "sha256-/XxjZO/pJLLAvsP7x4TOC+XDbOOR+HHmdpn+8qP77L8=";
   };
 
   patches = [
     ./disable-dprint-dstBundler.patch
+
+    # Should be removed in next 5.9.X TypeScript update: https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050
+    (replaceVars ./revert-bump-to-v5.9.patch {
+      inherit (finalAttrs) version;
+    })
   ];
 
-  npmDepsHash = "sha256-ytdkxIjAd3UsU90o9IFZa5lGEv39zblBmgTTseVRGKQ=";
+  postPatch = ''
+    # The test run in the build script is redundant with checkPhase
+    substituteInPlace package.json \
+     --replace-fail ' && npm run build:tests' ""
+
+    # Should be removed in next 5.9.X TypeScript update
+    substituteInPlace src/compiler/corePublic.ts \
+      --replace-fail 'versionMajorMinor = "5.9"' 'versionMajorMinor = "5.8"'
+    substituteInPlace tests/baselines/reference/api/typescript.d.ts \
+      --replace-fail 'versionMajorMinor = "5.9"' 'versionMajorMinor = "5.8"'
+
+    # Imported from https://github.com/microsoft/TypeScript/blob/b504a1eed45e35b5f54694a1e0a09f35d0a5663c/.github/workflows/set-version.yaml#L75
+    sed -i -e 's/const version\(: string\)\{0,1\} = .*;/const version = "${finalAttrs.version}" as string;/g' src/compiler/corePublic.ts
+  '';
+
+  npmDepsHash = "sha256-BHJGezzZensC/WFsUumJSk6TYAqbS50Inuvw2nV5vUk=";
+
+  postBuild = ''
+    npx hereby lkg
+  '';
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch b/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch
new file mode 100644
index 000000000000..dc7d11e30e24
--- /dev/null
+++ b/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch
@@ -0,0 +1,52 @@
+From fb5da5ae2622c4f7bb421f4d9ac6881b07ee220c Mon Sep 17 00:00:00 2001
+From: Kenichi Kamiya <kachick1@gmail.com>
+Date: Tue, 27 May 2025 16:09:56 +0900
+Subject: [PATCH] Revert 1fdf78aee644afd2702d69c148754a7fc1aff910
+
+This was an unintended slipped commit into v5.8.n
+Should be removed until actually release 5.9
+
+See https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050 for detail
+
+Intentionally omitted to patch corePublic.ts and the d.ts
+Including CRLF causes patching error in nixpkgs
+---
+ package-lock.json | 4 ++--
+ package.json      | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package-lock.json b/package-lock.json
+index d4d2c055cc..63a0b372d2 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+     "name": "typescript",
+-    "version": "5.9.0",
++    "version": "@version@",
+     "lockfileVersion": 2,
+     "requires": true,
+     "packages": {
+         "": {
+             "name": "typescript",
+-            "version": "5.9.0",
++            "version": "@version@",
+             "license": "Apache-2.0",
+             "bin": {
+                 "tsc": "bin/tsc",
+diff --git a/package.json b/package.json
+index ef2c80f8b9..0972bb4648 100644
+--- a/package.json
++++ b/package.json
+@@ -2,7 +2,7 @@
+     "name": "typescript",
+     "author": "Microsoft Corp.",
+     "homepage": "https://www.typescriptlang.org/",
+-    "version": "5.9.0",
++    "version": "@version@",
+     "license": "Apache-2.0",
+     "description": "TypeScript is a language for application scale JavaScript development",
+     "keywords": [
+-- 
+2.49.0
+

From 050d2ca17a3a063e27e353e4aa51b24526b7c45e Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 27 May 2025 18:04:18 +0900
Subject: [PATCH 1149/1497] typescript: add kachick as maintainer

---
 pkgs/by-name/ty/typescript/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index 0c39c7169da9..35ecd29eb15c 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -68,7 +68,9 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://www.typescriptlang.org/";
     changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
     mainProgram = "tsc";
   };
 })

From 38b1b87e90340d1a10f3b96cc602ddf9ba950c4c Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 28 May 2025 00:38:03 +0900
Subject: [PATCH 1150/1497] typescript: prefer npmjs for src

---
 .../disable-dprint-dstBundler.patch           |   15 -
 pkgs/by-name/ty/typescript/package-lock.json  | 5445 +++++++++++++++++
 pkgs/by-name/ty/typescript/package.nix        |   70 +-
 .../ty/typescript/revert-bump-to-v5.9.patch   |   52 -
 pkgs/by-name/ty/typescript/update.bash        |   16 +
 5 files changed, 5494 insertions(+), 104 deletions(-)
 delete mode 100644 pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
 create mode 100644 pkgs/by-name/ty/typescript/package-lock.json
 delete mode 100644 pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch
 create mode 100644 pkgs/by-name/ty/typescript/update.bash

diff --git a/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch b/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
deleted file mode 100644
index 95ccf411a93e..000000000000
--- a/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable dprint on dstBundler
-
-dprint fails on sandbox, because it requires internet access to install its
-plugins.
-
---- a/scripts/dtsBundler.mjs
-+++ b/scripts/dtsBundler.mjs
-@@ -430,5 +430,5 @@
-     return result.replace(/\r\n/g, "\n");
- }
- 
--fs.writeFileSync(output, dprint(publicContents));
--fs.writeFileSync(internalOutput, dprint(internalContents));
-+fs.writeFileSync(output, publicContents);
-+fs.writeFileSync(internalOutput, internalContents);
diff --git a/pkgs/by-name/ty/typescript/package-lock.json b/pkgs/by-name/ty/typescript/package-lock.json
new file mode 100644
index 000000000000..b2f226b14a98
--- /dev/null
+++ b/pkgs/by-name/ty/typescript/package-lock.json
@@ -0,0 +1,5445 @@
+{
+    "name": "typescript",
+    "version": "5.8.3",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "typescript",
+            "version": "5.8.3",
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "devDependencies": {
+                "@dprint/formatter": "^0.4.1",
+                "@dprint/typescript": "0.93.3",
+                "@esfx/canceltoken": "^1.0.0",
+                "@eslint/js": "^9.17.0",
+                "@octokit/rest": "^21.0.2",
+                "@types/chai": "^4.3.20",
+                "@types/diff": "^5.2.3",
+                "@types/minimist": "^1.2.5",
+                "@types/mocha": "^10.0.10",
+                "@types/ms": "^0.7.34",
+                "@types/node": "latest",
+                "@types/source-map-support": "^0.5.10",
+                "@types/which": "^3.0.4",
+                "@typescript-eslint/rule-tester": "^8.18.1",
+                "@typescript-eslint/type-utils": "^8.18.1",
+                "@typescript-eslint/utils": "^8.18.1",
+                "azure-devops-node-api": "^14.1.0",
+                "c8": "^10.1.3",
+                "chai": "^4.5.0",
+                "chalk": "^4.1.2",
+                "chokidar": "^3.6.0",
+                "diff": "^5.2.0",
+                "dprint": "^0.47.6",
+                "esbuild": "^0.24.0",
+                "eslint": "^9.17.0",
+                "eslint-formatter-autolinkable-stylish": "^1.4.0",
+                "eslint-plugin-regexp": "^2.7.0",
+                "fast-xml-parser": "^4.5.1",
+                "glob": "^10.4.5",
+                "globals": "^15.13.0",
+                "hereby": "^1.10.0",
+                "jsonc-parser": "^3.3.1",
+                "knip": "^5.41.0",
+                "minimist": "^1.2.8",
+                "mocha": "^10.8.2",
+                "mocha-fivemat-progress-reporter": "^0.1.0",
+                "monocart-coverage-reports": "^2.11.4",
+                "ms": "^2.1.3",
+                "playwright": "^1.49.1",
+                "source-map-support": "^0.5.21",
+                "tslib": "^2.8.1",
+                "typescript": "^5.7.2",
+                "typescript-eslint": "^8.18.1",
+                "which": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/@bcoe/v8-coverage": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+            "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@dprint/darwin-arm64": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.47.6.tgz",
+            "integrity": "sha512-DrtKVOH7Ue6QYsqsUfUwBlTkSZNF2j35xqyI6KimUT1ulgUPocLG53JC/Aej9KuSCPmt4M3J40xxPKRgIM4jPA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@dprint/darwin-x64": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.47.6.tgz",
+            "integrity": "sha512-p16a4lMbAo4RngbNTAmtREnIRI/cOcZFy5wHPIzbCDnnHI+4UyHiAypTrpF8U8EYx1tw3hgih2MyAuupa9Gfag==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@dprint/formatter": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@dprint/formatter/-/formatter-0.4.1.tgz",
+            "integrity": "sha512-IB/GXdlMOvi0UhQQ9mcY15Fxcrc2JPadmo6tqefCNV0bptFq7YBpggzpqYXldBXDa04CbKJ+rDwO2eNRPE2+/g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@dprint/linux-arm64-glibc": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.47.6.tgz",
+            "integrity": "sha512-WHphnk0oXpNzwJ9cjbddOL+hEZkXTvHxcA2pM1h1kWCBa5m+4qh0fg8YCktckMfHx1qdQuZYWRoT4l7yQbzWYA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@dprint/linux-arm64-musl": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.47.6.tgz",
+            "integrity": "sha512-/2cSPudajg8J0U69ldNZkJx5QiKZNh+ohNVM9leWZ8v6GXN6sJDHX3T6hzS3ohIb03YOCiLOrJZDy9j3+fSgdQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@dprint/linux-riscv64-glibc": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/linux-riscv64-glibc/-/linux-riscv64-glibc-0.47.6.tgz",
+            "integrity": "sha512-RMHJ3Zuzpls426upHlAveVwlGMi8oBLzhiCauyC/yWQl3CkGTAYdyhEpGnux0+RxacysfIL2bd8ourx4K0Sx3w==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@dprint/linux-x64-glibc": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.47.6.tgz",
+            "integrity": "sha512-4zbVsx/a8lHkRyAjfW0PNlN5IMwOJfFapgXNYJowWNO7X3j3m1jYJWovjmdZls+d6pDeOHoanMWtq95wd7zTeQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@dprint/linux-x64-musl": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.47.6.tgz",
+            "integrity": "sha512-0C13t4OVzomgQjvUyD5IrRyjLDhGuOtqMo00uJlwn3QHucfgOBqkjyQ5fq7T6+grBse0m14/EWblvSbYkZpyDw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@dprint/typescript": {
+            "version": "0.93.3",
+            "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.93.3.tgz",
+            "integrity": "sha512-P/AAHYDyUG+5hih8knuk3s9n2wrCD1LSh0YsLlJMx6+v0Wsjf0PpcVRn+xDvHCtwPUctB5WBkZT2U8mu6Cm7RQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@dprint/win32-arm64": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/win32-arm64/-/win32-arm64-0.47.6.tgz",
+            "integrity": "sha512-UOkeFMBdGIuGNwfkrJdVM9eNiRMdbZRRGVy0Cdo2AXn/FCDVqZ74KJkvYVcoUE27GCytHi4Sp1s4at7659WCOw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@dprint/win32-x64": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.47.6.tgz",
+            "integrity": "sha512-i9xwXR8V8Jk/wU1gsYKx15eb0ypBRbRZFkHsnHfC0ZBimcfEOibGnGcfv+UCUcumXtnV46TnBqaJW7H70J1J+A==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@emnapi/core": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
+            "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.0.2",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@emnapi/runtime": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
+            "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@emnapi/wasi-threads": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz",
+            "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@esbuild/aix-ppc64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+            "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "aix"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+            "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+            "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+            "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+            "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+            "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+            "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+            "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+            "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+            "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+            "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+            "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+            "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+            "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+            "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+            "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/netbsd-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+            "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+            "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+            "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+            "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esfx/cancelable": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@esfx/cancelable/-/cancelable-1.0.0.tgz",
+            "integrity": "sha512-2dry/TuOT9ydpw86f396v09cyi/gLeGPIZSH4Gx+V/qKQaS/OXCRurCY+Cn8zkBfTAgFsjk9NE15d+LPo2kt9A==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@esfx/disposable": "^1.0.0"
+            }
+        },
+        "node_modules/@esfx/canceltoken": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@esfx/canceltoken/-/canceltoken-1.0.0.tgz",
+            "integrity": "sha512-/TgdzC5O89w5v0TgwE2wcdtampWNAFOxzurCtb4RxYVr3m72yk3Bg82vMdznx+H9nnf28zVDR0PtpZO9FxmOkw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@esfx/cancelable": "^1.0.0",
+                "@esfx/disposable": "^1.0.0",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@esfx/disposable": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@esfx/disposable/-/disposable-1.0.0.tgz",
+            "integrity": "sha512-hu7EI+YxlEWEKrb2himbS13HNaq5mlUePASf99KeQqkiNeqiAZbKqG4w59uDcLZs8JrV3qJqS/NYib5ZMhbfTQ==",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+            "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
+        },
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.12.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/@eslint/config-array": {
+            "version": "0.20.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/object-schema": "^2.1.6",
+                "debug": "^4.3.1",
+                "minimatch": "^3.1.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@eslint/config-array/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@eslint/config-helpers": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
+            "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/core": {
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/eslintrc": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+            "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@eslint/eslintrc/node_modules/globals": {
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+            "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@eslint/js": {
+            "version": "9.27.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+            "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            }
+        },
+        "node_modules/@eslint/object-schema": {
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/plugin-kit": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+            "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.14.0",
+                "levn": "^0.4.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@humanfs/core": {
+            "version": "0.19.1",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node": {
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/core": "^0.19.1",
+                "@humanwhocodes/retry": "^0.3.0"
+            },
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/module-importer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/retry": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+            "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@istanbuljs/schema": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@napi-rs/wasm-runtime": {
+            "version": "0.2.10",
+            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz",
+            "integrity": "sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.4.3",
+                "@emnapi/runtime": "^1.4.3",
+                "@tybys/wasm-util": "^0.9.0"
+            }
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@octokit/auth-token": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
+            "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/core": {
+            "version": "6.1.5",
+            "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.5.tgz",
+            "integrity": "sha512-vvmsN0r7rguA+FySiCsbaTTobSftpIDIpPW81trAmsv9TGxg3YCujAxRYp/Uy8xmDgYCzzgulG62H7KYUFmeIg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/auth-token": "^5.0.0",
+                "@octokit/graphql": "^8.2.2",
+                "@octokit/request": "^9.2.3",
+                "@octokit/request-error": "^6.1.8",
+                "@octokit/types": "^14.0.0",
+                "before-after-hook": "^3.0.2",
+                "universal-user-agent": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/endpoint": {
+            "version": "10.1.4",
+            "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz",
+            "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/types": "^14.0.0",
+                "universal-user-agent": "^7.0.2"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/graphql": {
+            "version": "8.2.2",
+            "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.2.tgz",
+            "integrity": "sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/request": "^9.2.3",
+                "@octokit/types": "^14.0.0",
+                "universal-user-agent": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/openapi-types": {
+            "version": "25.1.0",
+            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
+            "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@octokit/plugin-paginate-rest": {
+            "version": "11.6.0",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.6.0.tgz",
+            "integrity": "sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/types": "^13.10.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            },
+            "peerDependencies": {
+                "@octokit/core": ">=6"
+            }
+        },
+        "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+            "version": "24.2.0",
+            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+            "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+            "version": "13.10.0",
+            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+            "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/openapi-types": "^24.2.0"
+            }
+        },
+        "node_modules/@octokit/plugin-request-log": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
+            "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 18"
+            },
+            "peerDependencies": {
+                "@octokit/core": ">=6"
+            }
+        },
+        "node_modules/@octokit/plugin-rest-endpoint-methods": {
+            "version": "13.5.0",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.5.0.tgz",
+            "integrity": "sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/types": "^13.10.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            },
+            "peerDependencies": {
+                "@octokit/core": ">=6"
+            }
+        },
+        "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+            "version": "24.2.0",
+            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+            "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+            "version": "13.10.0",
+            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+            "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/openapi-types": "^24.2.0"
+            }
+        },
+        "node_modules/@octokit/request": {
+            "version": "9.2.3",
+            "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.3.tgz",
+            "integrity": "sha512-Ma+pZU8PXLOEYzsWf0cn/gY+ME57Wq8f49WTXA8FMHp2Ps9djKw//xYJ1je8Hm0pR2lU9FUGeJRWOtxq6olt4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/endpoint": "^10.1.4",
+                "@octokit/request-error": "^6.1.8",
+                "@octokit/types": "^14.0.0",
+                "fast-content-type-parse": "^2.0.0",
+                "universal-user-agent": "^7.0.2"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/request-error": {
+            "version": "6.1.8",
+            "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz",
+            "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/types": "^14.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/rest": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.1.tgz",
+            "integrity": "sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/core": "^6.1.4",
+                "@octokit/plugin-paginate-rest": "^11.4.2",
+                "@octokit/plugin-request-log": "^5.3.1",
+                "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/@octokit/types": {
+            "version": "14.1.0",
+            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
+            "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@octokit/openapi-types": "^25.1.0"
+            }
+        },
+        "node_modules/@oxc-resolver/binding-darwin-arm64": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-9.0.2.tgz",
+            "integrity": "sha512-MVyRgP2gzJJtAowjG/cHN3VQXwNLWnY+FpOEsyvDepJki1SdAX/8XDijM1yN6ESD1kr9uhBKjGelC6h3qtT+rA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-darwin-x64": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-9.0.2.tgz",
+            "integrity": "sha512-7kV0EOFEZ3sk5Hjy4+bfA6XOQpCwbDiDkkHN4BHHyrBHsXxUR05EcEJPPL1WjItefg+9+8hrBmoK0xRoDs41+A==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-freebsd-x64": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-9.0.2.tgz",
+            "integrity": "sha512-6OvkEtRXrt8sJ4aVfxHRikjain9nV1clIsWtJ1J3J8NG1ZhjyJFgT00SCvqxbK+pzeWJq6XzHyTCN78ML+lY2w==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-9.0.2.tgz",
+            "integrity": "sha512-aYpNL6o5IRAUIdoweW21TyLt54Hy/ZS9tvzNzF6ya1ckOQ8DLaGVPjGpmzxdNja9j/bbV6aIzBH7lNcBtiOTkQ==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-9.0.2.tgz",
+            "integrity": "sha512-RGFW4vCfKMFEIzb9VCY0oWyyY9tR1/o+wDdNePhiUXZU4SVniRPQaZ1SJ0sUFI1k25pXZmzQmIP6cBmazi/Dew==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-9.0.2.tgz",
+            "integrity": "sha512-lxx/PibBfzqYvut2Y8N2D0Ritg9H8pKO+7NUSJb9YjR/bfk2KRmP8iaUz3zB0JhPtf/W3REs65oKpWxgflGToA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-9.0.2.tgz",
+            "integrity": "sha512-yD28ptS/OuNhwkpXRPNf+/FvrO7lwURLsEbRVcL1kIE0GxNJNMtKgIE4xQvtKDzkhk6ZRpLho5VSrkkF+3ARTQ==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-s390x-gnu": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-9.0.2.tgz",
+            "integrity": "sha512-WBwEJdspoga2w+aly6JVZeHnxuPVuztw3fPfWrei2P6rNM5hcKxBGWKKT6zO1fPMCB4sdDkFohGKkMHVV1eryQ==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-9.0.2.tgz",
+            "integrity": "sha512-a2z3/cbOOTUq0UTBG8f3EO/usFcdwwXnCejfXv42HmV/G8GjrT4fp5+5mVDoMByH3Ce3iVPxj1LmS6OvItKMYQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-linux-x64-musl": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-9.0.2.tgz",
+            "integrity": "sha512-bHZF+WShYQWpuswB9fyxcgMIWVk4sZQT0wnwpnZgQuvGTZLkYJ1JTCXJMtaX5mIFHf69ngvawnwPIUA4Feil0g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-wasm32-wasi": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-9.0.2.tgz",
+            "integrity": "sha512-I5cSgCCh5nFozGSHz+PjIOfrqW99eUszlxKLgoNNzQ1xQ2ou9ZJGzcZ94BHsM9SpyYHLtgHljmOZxCT9bgxYNA==",
+            "cpu": [
+                "wasm32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@napi-rs/wasm-runtime": "^0.2.9"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-9.0.2.tgz",
+            "integrity": "sha512-5IhoOpPr38YWDWRCA5kP30xlUxbIJyLAEsAK7EMyUgqygBHEYLkElaKGgS0X5jRXUQ6l5yNxuW73caogb2FYaw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-9.0.2.tgz",
+            "integrity": "sha512-Qc40GDkaad9rZksSQr2l/V9UubigIHsW69g94Gswc2sKYB3XfJXfIfyV8WTJ67u6ZMXsZ7BH1msSC6Aen75mCg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@tybys/wasm-util": {
+            "version": "0.9.0",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
+            "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@types/chai": {
+            "version": "4.3.20",
+            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz",
+            "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/diff": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.3.tgz",
+            "integrity": "sha512-K0Oqlrq3kQMaO2RhfrNQX5trmt+XLyom88zS0u84nnIcLvFnRUMRRHmrGny5GSM+kNO9IZLARsdQHDzkhAgmrQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/istanbul-lib-coverage": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/json-schema": {
+            "version": "7.0.15",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/minimist": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+            "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/mocha": {
+            "version": "10.0.10",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz",
+            "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/ms": {
+            "version": "0.7.34",
+            "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+            "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "22.15.21",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+            "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.21.0"
+            }
+        },
+        "node_modules/@types/source-map-support": {
+            "version": "0.5.10",
+            "resolved": "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.10.tgz",
+            "integrity": "sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/@types/which": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.4.tgz",
+            "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
+            "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/type-utils": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "graphemer": "^1.4.0",
+                "ignore": "^7.0.0",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
+            "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/@typescript-eslint/parser": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
+            "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/rule-tester": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-8.32.1.tgz",
+            "integrity": "sha512-XUCGJUbBBn6HNFnihX2bm50F4J1LndwdzTlw7kfSnqukXoRkW/SEwMIhDLSiTcSPXZPVbO8R/Aw35J9zm4kD4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/parser": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1",
+                "ajv": "^6.12.6",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "lodash.merge": "4.6.2",
+                "semver": "^7.6.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
+            "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
+            "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/typescript-estree": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/types": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
+            "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
+            "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/utils": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
+            "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.7.0",
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
+            "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/acorn": {
+            "version": "8.14.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-jsx": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
+        },
+        "node_modules/acorn-loose": {
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.5.0.tgz",
+            "integrity": "sha512-ppga7pybjwX2HSJv5ayHe6QG4wmNS1RQ2wjBMFTVnOj0h8Rxsmtc6fnVzINqHSSRz23sTe9IL3UAt/PU9gc4FA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.14.0"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-walk": {
+            "version": "8.3.4",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+            "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.11.0"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ansi-colors": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+            "dev": true,
+            "license": "Python-2.0"
+        },
+        "node_modules/array-back": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+            "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/assertion-error": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+            "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/azure-devops-node-api": {
+            "version": "14.1.0",
+            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.1.0.tgz",
+            "integrity": "sha512-QhpgjH1LQ+vgDJ7oBwcmsZ3+o4ZpjLVilw0D3oJQpYpRzN+L39lk5jZDLJ464hLUgsDzWn/Ksv7zLLMKLfoBzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tunnel": "0.0.6",
+                "typed-rest-client": "2.1.0"
+            },
+            "engines": {
+                "node": ">= 16.0.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/before-after-hook": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
+            "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browser-stdout": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/c8": {
+            "version": "10.1.3",
+            "resolved": "https://registry.npmjs.org/c8/-/c8-10.1.3.tgz",
+            "integrity": "sha512-LvcyrOAaOnrrlMpW22n690PUvxiq4Uf9WMhQwNJ9vgagkL/ph1+D4uvjvDA5XCbykrc0sx+ay6pVi9YZ1GnhyA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@bcoe/v8-coverage": "^1.0.1",
+                "@istanbuljs/schema": "^0.1.3",
+                "find-up": "^5.0.0",
+                "foreground-child": "^3.1.1",
+                "istanbul-lib-coverage": "^3.2.0",
+                "istanbul-lib-report": "^3.0.1",
+                "istanbul-reports": "^3.1.6",
+                "test-exclude": "^7.0.1",
+                "v8-to-istanbul": "^9.0.0",
+                "yargs": "^17.7.2",
+                "yargs-parser": "^21.1.1"
+            },
+            "bin": {
+                "c8": "bin/c8.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "monocart-coverage-reports": "^2"
+            },
+            "peerDependenciesMeta": {
+                "monocart-coverage-reports": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/call-bind-apply-helpers": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/call-bound": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+            "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.2",
+                "get-intrinsic": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/chai": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz",
+            "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "assertion-error": "^1.1.0",
+                "check-error": "^1.0.3",
+                "deep-eql": "^4.1.3",
+                "get-func-name": "^2.0.2",
+                "loupe": "^2.3.6",
+                "pathval": "^1.1.1",
+                "type-detect": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/check-error": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+            "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "get-func-name": "^2.0.2"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cliui/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/command-line-usage": {
+            "version": "6.1.3",
+            "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz",
+            "integrity": "sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-back": "^4.0.2",
+                "chalk": "^2.4.2",
+                "table-layout": "^1.0.2",
+                "typical": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/command-line-usage/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/command-line-usage/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/commander": {
+            "version": "13.1.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
+            "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/comment-parser": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+            "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/console-grid": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/console-grid/-/console-grid-2.2.3.tgz",
+            "integrity": "sha512-+mecFacaFxGl+1G31IsCx41taUXuW2FxX+4xIE0TIPhgML+Jb9JFcBWGhhWerd1/vhScubdmHqTwOhB0KCUUAg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/cross-spawn/node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/debug": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decamelize": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+            "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/deep-eql": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+            "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "type-detect": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/deep-extend": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/deep-is": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/des.js": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+            "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "node_modules/diff": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+            "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.3.1"
+            }
+        },
+        "node_modules/dprint": {
+            "version": "0.47.6",
+            "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.47.6.tgz",
+            "integrity": "sha512-vCQC+IMHVZbISA5pxEj+yshQbozmQoVFA4lzcLlqJ8rzIAH8U+1DKvesN/2Uv3Bqz6rMW6W4WY7pYJQljmiZ8w==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "dprint": "bin.js"
+            },
+            "optionalDependencies": {
+                "@dprint/darwin-arm64": "0.47.6",
+                "@dprint/darwin-x64": "0.47.6",
+                "@dprint/linux-arm64-glibc": "0.47.6",
+                "@dprint/linux-arm64-musl": "0.47.6",
+                "@dprint/linux-riscv64-glibc": "0.47.6",
+                "@dprint/linux-x64-glibc": "0.47.6",
+                "@dprint/linux-x64-musl": "0.47.6",
+                "@dprint/win32-arm64": "0.47.6",
+                "@dprint/win32-x64": "0.47.6"
+            }
+        },
+        "node_modules/dunder-proto": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.2.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/eight-colors": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/eight-colors/-/eight-colors-1.3.1.tgz",
+            "integrity": "sha512-7nXPYDeKh6DgJDR/mpt2G7N/hCNSGwwoPVmoI3+4TEwOb07VFN1WMPG0DFf6nMEjrkgdj8Og7l7IaEEk3VE6Zg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/es-define-property": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-object-atoms": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+            "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "@esbuild/aix-ppc64": "0.24.2",
+                "@esbuild/android-arm": "0.24.2",
+                "@esbuild/android-arm64": "0.24.2",
+                "@esbuild/android-x64": "0.24.2",
+                "@esbuild/darwin-arm64": "0.24.2",
+                "@esbuild/darwin-x64": "0.24.2",
+                "@esbuild/freebsd-arm64": "0.24.2",
+                "@esbuild/freebsd-x64": "0.24.2",
+                "@esbuild/linux-arm": "0.24.2",
+                "@esbuild/linux-arm64": "0.24.2",
+                "@esbuild/linux-ia32": "0.24.2",
+                "@esbuild/linux-loong64": "0.24.2",
+                "@esbuild/linux-mips64el": "0.24.2",
+                "@esbuild/linux-ppc64": "0.24.2",
+                "@esbuild/linux-riscv64": "0.24.2",
+                "@esbuild/linux-s390x": "0.24.2",
+                "@esbuild/linux-x64": "0.24.2",
+                "@esbuild/netbsd-arm64": "0.24.2",
+                "@esbuild/netbsd-x64": "0.24.2",
+                "@esbuild/openbsd-arm64": "0.24.2",
+                "@esbuild/openbsd-x64": "0.24.2",
+                "@esbuild/sunos-x64": "0.24.2",
+                "@esbuild/win32-arm64": "0.24.2",
+                "@esbuild/win32-ia32": "0.24.2",
+                "@esbuild/win32-x64": "0.24.2"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint": {
+            "version": "9.27.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
+            "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.12.1",
+                "@eslint/config-array": "^0.20.0",
+                "@eslint/config-helpers": "^0.2.1",
+                "@eslint/core": "^0.14.0",
+                "@eslint/eslintrc": "^3.3.1",
+                "@eslint/js": "9.27.0",
+                "@eslint/plugin-kit": "^0.3.1",
+                "@humanfs/node": "^0.16.6",
+                "@humanwhocodes/module-importer": "^1.0.1",
+                "@humanwhocodes/retry": "^0.4.2",
+                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
+                "ajv": "^6.12.4",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.6",
+                "debug": "^4.3.2",
+                "escape-string-regexp": "^4.0.0",
+                "eslint-scope": "^8.3.0",
+                "eslint-visitor-keys": "^4.2.0",
+                "espree": "^10.3.0",
+                "esquery": "^1.5.0",
+                "esutils": "^2.0.2",
+                "fast-deep-equal": "^3.1.3",
+                "file-entry-cache": "^8.0.0",
+                "find-up": "^5.0.0",
+                "glob-parent": "^6.0.2",
+                "ignore": "^5.2.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "lodash.merge": "^4.6.2",
+                "minimatch": "^3.1.2",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.3"
+            },
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            },
+            "peerDependencies": {
+                "jiti": "*"
+            },
+            "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-formatter-autolinkable-stylish": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/eslint-formatter-autolinkable-stylish/-/eslint-formatter-autolinkable-stylish-1.4.0.tgz",
+            "integrity": "sha512-fz60p32XUn4o5XaqApuTGu6gUPsAW0pB4IjFb1ER5hdpS7S2OgO29jocnecUlv8fsVx8B8jRviLjkAjv2IQ72g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.2",
+                "plur": "^4.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^8.3.0 || ^9.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-regexp": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-2.7.0.tgz",
+            "integrity": "sha512-U8oZI77SBtH8U3ulZ05iu0qEzIizyEDXd+BWHvyVxTOjGwcDcvy/kEpgFG4DYca2ByRLiVPFZ2GeH7j1pdvZTA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.11.0",
+                "comment-parser": "^1.4.0",
+                "jsdoc-type-pratt-parser": "^4.0.0",
+                "refa": "^0.12.1",
+                "regexp-ast-analysis": "^0.7.1",
+                "scslre": "^0.3.0"
+            },
+            "engines": {
+                "node": "^18 || >=20"
+            },
+            "peerDependencies": {
+                "eslint": ">=8.44.0"
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+            "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/eslint/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint/node_modules/glob-parent": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/eslint/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/espree": {
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.14.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/espree/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/esquery": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "estraverse": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/fast-content-type-parse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
+            "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.8"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-xml-parser": {
+            "version": "4.5.3",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
+            "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.1.1"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/fastest-levenshtein": {
+            "version": "1.0.16",
+            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+            "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.9.1"
+            }
+        },
+        "node_modules/fastq": {
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+            "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/fd-package-json": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/fd-package-json/-/fd-package-json-1.2.0.tgz",
+            "integrity": "sha512-45LSPmWf+gC5tdCQMNH4s9Sr00bIkiD9aN7dc5hqkrEw1geRYyDQS1v1oMHAW3ysfxfndqGsrDREHHjNNbKUfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "walk-up-path": "^3.0.1"
+            }
+        },
+        "node_modules/file-entry-cache": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+            "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flat-cache": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/flat-cache": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+            "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/foreground-child": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "cross-spawn": "^7.0.6",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/formatly": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/formatly/-/formatly-0.2.3.tgz",
+            "integrity": "sha512-WH01vbXEjh9L3bqn5V620xUAWs32CmK4IzWRRY6ep5zpa/mrisL4d9+pRVuETORVDTQw8OycSO1WC68PL51RaA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fd-package-json": "^1.2.0"
+            },
+            "bin": {
+                "formatly": "bin/index.mjs"
+            },
+            "engines": {
+                "node": ">=18.3.0"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-func-name": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+            "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.2",
+                "es-define-property": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.1.1",
+                "function-bind": "^1.1.2",
+                "get-proto": "^1.0.1",
+                "gopd": "^1.2.0",
+                "has-symbols": "^1.1.0",
+                "hasown": "^2.0.2",
+                "math-intrinsics": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-proto": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dunder-proto": "^1.0.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/glob": {
+            "version": "10.4.5",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^3.1.2",
+                "minimatch": "^9.0.4",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^1.11.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/globals": {
+            "version": "15.15.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+            "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/gopd": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "he": "bin/he"
+            }
+        },
+        "node_modules/hereby": {
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/hereby/-/hereby-1.11.0.tgz",
+            "integrity": "sha512-Tdp03ueQL3w5eZCrQVW4POBDxg9ldjNyFrZYWt6ndMha5agyRUO8b+irOEG3B1RSS9/2LxSjjyG6DSxITouJzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "command-line-usage": "^6.1.3",
+                "fastest-levenshtein": "^1.0.16",
+                "minimist": "^1.2.8",
+                "picocolors": "^1.1.0",
+                "pretty-ms": "^8.0.0"
+            },
+            "bin": {
+                "hereby": "bin/hereby.js"
+            },
+            "engines": {
+                "node": ">= 12.20"
+            }
+        },
+        "node_modules/html-escaper": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ignore": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/irregular-plurals": {
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+            "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-plain-obj": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-unicode-supported": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/istanbul-lib-coverage": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-report": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "istanbul-lib-coverage": "^3.0.0",
+                "make-dir": "^4.0.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-reports": {
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "html-escaper": "^2.0.0",
+                "istanbul-lib-report": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jackspeak": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
+        "node_modules/jiti": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+            "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "jiti": "lib/jiti-cli.mjs"
+            }
+        },
+        "node_modules/js-md4": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz",
+            "integrity": "sha512-/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/js-yaml": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/jsdoc-type-pratt-parser": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
+            "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/jsonc-parser": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+            "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/knip": {
+            "version": "5.58.1",
+            "resolved": "https://registry.npmjs.org/knip/-/knip-5.58.1.tgz",
+            "integrity": "sha512-9FKnuGhGFZ8wDgcjEYQ6btMmtGHa7dkvNU2ZHuMcv2NaxL7xDeFXZKjETbaiJBjWnLytrDXrh7a58lGXcE0Zfw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/webpro"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/knip"
+                },
+                {
+                    "type": "polar",
+                    "url": "https://polar.sh/webpro-nl"
+                }
+            ],
+            "license": "ISC",
+            "dependencies": {
+                "@nodelib/fs.walk": "^1.2.3",
+                "fast-glob": "^3.3.3",
+                "formatly": "^0.2.3",
+                "jiti": "^2.4.2",
+                "js-yaml": "^4.1.0",
+                "minimist": "^1.2.8",
+                "oxc-resolver": "^9.0.2",
+                "picocolors": "^1.1.0",
+                "picomatch": "^4.0.1",
+                "smol-toml": "^1.3.1",
+                "strip-json-comments": "5.0.1",
+                "zod": "^3.22.4",
+                "zod-validation-error": "^3.0.3"
+            },
+            "bin": {
+                "knip": "bin/knip.js",
+                "knip-bun": "bin/knip-bun.js"
+            },
+            "engines": {
+                "node": ">=18.18.0"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18",
+                "typescript": ">=5.0.4"
+            }
+        },
+        "node_modules/knip/node_modules/picomatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/knip/node_modules/strip-json-comments": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+            "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/levn": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/log-symbols": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "is-unicode-supported": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/loupe": {
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+            "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "get-func-name": "^2.0.1"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/lz-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/lz-utils/-/lz-utils-2.1.0.tgz",
+            "integrity": "sha512-CMkfimAypidTtWjNDxY8a1bc1mJdyEh04V2FfEQ5Zh8Nx4v7k850EYa+dOWGn9hKG5xOyHP5MkuduAZCTHRvJw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/make-dir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/math-intrinsics": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "braces": "^3.0.3",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/minimalistic-assert": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/mocha": {
+            "version": "10.8.2",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz",
+            "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-colors": "^4.1.3",
+                "browser-stdout": "^1.3.1",
+                "chokidar": "^3.5.3",
+                "debug": "^4.3.5",
+                "diff": "^5.2.0",
+                "escape-string-regexp": "^4.0.0",
+                "find-up": "^5.0.0",
+                "glob": "^8.1.0",
+                "he": "^1.2.0",
+                "js-yaml": "^4.1.0",
+                "log-symbols": "^4.1.0",
+                "minimatch": "^5.1.6",
+                "ms": "^2.1.3",
+                "serialize-javascript": "^6.0.2",
+                "strip-json-comments": "^3.1.1",
+                "supports-color": "^8.1.1",
+                "workerpool": "^6.5.1",
+                "yargs": "^16.2.0",
+                "yargs-parser": "^20.2.9",
+                "yargs-unparser": "^2.0.0"
+            },
+            "bin": {
+                "_mocha": "bin/_mocha",
+                "mocha": "bin/mocha.js"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/mocha-fivemat-progress-reporter": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/mocha-fivemat-progress-reporter/-/mocha-fivemat-progress-reporter-0.1.0.tgz",
+            "integrity": "sha512-nCf6dmCEHObJ8BBrcjW+UHYvVtHEL+FliYR/Mfc/v7dKenNmBQ0ZSuvlICgsyQy9Tt581ldvh+SReS4qp4LrQw==",
+            "dev": true,
+            "license": "Apache 2.0"
+        },
+        "node_modules/mocha/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mocha/node_modules/cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/mocha/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mocha/node_modules/glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/mocha/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/mocha/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mocha/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mocha/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/mocha/node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/mocha/node_modules/yargs": {
+            "version": "16.2.0",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/mocha/node_modules/yargs-parser": {
+            "version": "20.2.9",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/monocart-coverage-reports": {
+            "version": "2.12.6",
+            "resolved": "https://registry.npmjs.org/monocart-coverage-reports/-/monocart-coverage-reports-2.12.6.tgz",
+            "integrity": "sha512-96CMC4B+Rw5Yi8OH2Aot+aMYIw84fK3PNJs7nP9Yw07I0+k0lY1GGiPOJTt123GMDdSpS32lPUIMu/OyqOfBCA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.14.1",
+                "acorn-loose": "^8.5.0",
+                "acorn-walk": "^8.3.4",
+                "commander": "^13.1.0",
+                "console-grid": "^2.2.3",
+                "eight-colors": "^1.3.1",
+                "foreground-child": "^3.3.1",
+                "istanbul-lib-coverage": "^3.2.2",
+                "istanbul-lib-report": "^3.0.1",
+                "istanbul-reports": "^3.1.7",
+                "lz-utils": "^2.1.0",
+                "monocart-locator": "^1.0.2"
+            },
+            "bin": {
+                "mcr": "lib/cli.js"
+            }
+        },
+        "node_modules/monocart-locator": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/monocart-locator/-/monocart-locator-1.0.2.tgz",
+            "integrity": "sha512-v8W5hJLcWMIxLCcSi/MHh+VeefI+ycFmGz23Froer9QzWjrbg4J3gFJBuI/T1VLNoYxF47bVPPxq8ZlNX4gVCw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-inspect": {
+            "version": "1.13.4",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+            "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/optionator": {
+            "version": "0.9.4",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "deep-is": "^0.1.3",
+                "fast-levenshtein": "^2.0.6",
+                "levn": "^0.4.1",
+                "prelude-ls": "^1.2.1",
+                "type-check": "^0.4.0",
+                "word-wrap": "^1.2.5"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/oxc-resolver": {
+            "version": "9.0.2",
+            "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-9.0.2.tgz",
+            "integrity": "sha512-w838ygc1p7rF+7+h5vR9A+Y9Fc4imy6C3xPthCMkdFUgFvUWkmABeNB8RBDQ6+afk44Q60/UMMQ+gfDUW99fBA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/Boshen"
+            },
+            "optionalDependencies": {
+                "@oxc-resolver/binding-darwin-arm64": "9.0.2",
+                "@oxc-resolver/binding-darwin-x64": "9.0.2",
+                "@oxc-resolver/binding-freebsd-x64": "9.0.2",
+                "@oxc-resolver/binding-linux-arm-gnueabihf": "9.0.2",
+                "@oxc-resolver/binding-linux-arm64-gnu": "9.0.2",
+                "@oxc-resolver/binding-linux-arm64-musl": "9.0.2",
+                "@oxc-resolver/binding-linux-riscv64-gnu": "9.0.2",
+                "@oxc-resolver/binding-linux-s390x-gnu": "9.0.2",
+                "@oxc-resolver/binding-linux-x64-gnu": "9.0.2",
+                "@oxc-resolver/binding-linux-x64-musl": "9.0.2",
+                "@oxc-resolver/binding-wasm32-wasi": "9.0.2",
+                "@oxc-resolver/binding-win32-arm64-msvc": "9.0.2",
+                "@oxc-resolver/binding-win32-x64-msvc": "9.0.2"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "dev": true,
+            "license": "BlueOak-1.0.0"
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-ms": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-3.0.0.tgz",
+            "integrity": "sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-scurry": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^10.2.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/pathval": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+            "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/playwright": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
+            "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "playwright-core": "1.52.0"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
+            }
+        },
+        "node_modules/playwright-core": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
+            "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "playwright-core": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/playwright/node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/plur": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+            "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "irregular-plurals": "^3.2.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/prelude-ls": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/pretty-ms": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz",
+            "integrity": "sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parse-ms": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.14.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+            "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "side-channel": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/reduce-flatten": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
+            "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/refa": {
+            "version": "0.12.1",
+            "resolved": "https://registry.npmjs.org/refa/-/refa-0.12.1.tgz",
+            "integrity": "sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.8.0"
+            },
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/regexp-ast-analysis": {
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/regexp-ast-analysis/-/regexp-ast-analysis-0.7.1.tgz",
+            "integrity": "sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.8.0",
+                "refa": "^0.12.1"
+            },
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/scslre": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/scslre/-/scslre-0.3.0.tgz",
+            "integrity": "sha512-3A6sD0WYP7+QrjbfNA2FN3FsOaGGFoekCVgTyypy53gPxhbkCIjtO6YWgdrfM+n/8sI8JeXZOIxsHjMTNxQ4nQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.8.0",
+                "refa": "^0.12.0",
+                "regexp-ast-analysis": "^0.7.0"
+            },
+            "engines": {
+                "node": "^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+            "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/side-channel": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+            "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3",
+                "side-channel-list": "^1.0.0",
+                "side-channel-map": "^1.0.1",
+                "side-channel-weakmap": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-list": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+            "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-map": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+            "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-weakmap": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+            "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3",
+                "side-channel-map": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/smol-toml": {
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.4.tgz",
+            "integrity": "sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">= 18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/cyyynthia"
+            }
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/string-width-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/strnum": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
+            "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/table-layout": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz",
+            "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-back": "^4.0.1",
+                "deep-extend": "~0.6.0",
+                "typical": "^5.2.0",
+                "wordwrapjs": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/test-exclude": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+            "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@istanbuljs/schema": "^0.1.2",
+                "glob": "^10.4.1",
+                "minimatch": "^9.0.4"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/ts-api-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+            "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/tunnel": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+            }
+        },
+        "node_modules/type-check": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/type-detect": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+            "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/typed-rest-client": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz",
+            "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "des.js": "^1.1.0",
+                "js-md4": "^0.3.2",
+                "qs": "^6.10.3",
+                "tunnel": "0.0.6",
+                "underscore": "^1.12.1"
+            },
+            "engines": {
+                "node": ">= 16.0.0"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.8.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/typescript-eslint": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
+            "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/eslint-plugin": "8.32.1",
+                "@typescript-eslint/parser": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/typical": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+            "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/underscore": {
+            "version": "1.13.7",
+            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+            "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/undici-types": {
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/universal-user-agent": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+            "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/v8-to-istanbul": {
+            "version": "9.3.0",
+            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.12",
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/walk-up-path": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz",
+            "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/which": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+            "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/which.js"
+            },
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/word-wrap": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/wordwrapjs": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz",
+            "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "reduce-flatten": "^2.0.0",
+                "typical": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/workerpool": {
+            "version": "6.5.1",
+            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+            "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "17.7.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-unparser": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "camelcase": "^6.0.0",
+                "decamelize": "^4.0.0",
+                "flat": "^5.0.2",
+                "is-plain-obj": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/yargs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/zod": {
+            "version": "3.25.30",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.30.tgz",
+            "integrity": "sha512-VolhdEtu6TJr/fzGuHA/SZ5ixvXqA6ADOG9VRcQ3rdOKmF5hkmcJbyaQjUH5BgmpA9gej++zYRX7zjSmdReIwA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/colinhacks"
+            }
+        },
+        "node_modules/zod-validation-error": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.4.1.tgz",
+            "integrity": "sha512-1KP64yqDPQ3rupxNv7oXhf7KdhHHgaqbKuspVoiN93TT0xrBjql+Svjkdjq/Qh/7GSMmgQs3AfvBT0heE35thw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "zod": "^3.24.4"
+            }
+        }
+    }
+}
diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript/package.nix
index 35ecd29eb15c..4fd37ef9969d 100644
--- a/pkgs/by-name/ty/typescript/package.nix
+++ b/pkgs/by-name/ty/typescript/package.nix
@@ -1,52 +1,38 @@
 {
   lib,
   buildNpmPackage,
-  fetchFromGitHub,
-  replaceVars,
+  fetchurl,
   versionCheckHook,
-  nix-update-script,
+  writeShellApplication,
+  nodejs,
+  gnutar,
+  nix-update,
+  prefetch-npm-deps,
+  gnused,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "typescript";
   version = "5.8.3";
 
-  src = fetchFromGitHub {
-    owner = "microsoft";
-    repo = "TypeScript";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-/XxjZO/pJLLAvsP7x4TOC+XDbOOR+HHmdpn+8qP77L8=";
+  # Prefer npmjs over the GitHub repository for source code.
+  # The TypeScript project typically publishes stable, versioned code to npmjs,
+  # whereas GitHub tags may sometimes include development versions.
+  # For example:
+  #   - https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050
+  #   - https://github.com/microsoft/TypeScript/pull/60150#issuecomment-2648791588, 5.8.3 includes this 5.9 breaking change
+  src = fetchurl {
+    url = "https://registry.npmjs.org/typescript/-/typescript-${finalAttrs.version}.tgz";
+    hash = "sha256-cuddvrksLm65o0y1nXT6tcLubzKgMkqJQF9hZdWgg3Q=";
   };
 
-  patches = [
-    ./disable-dprint-dstBundler.patch
-
-    # Should be removed in next 5.9.X TypeScript update: https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050
-    (replaceVars ./revert-bump-to-v5.9.patch {
-      inherit (finalAttrs) version;
-    })
-  ];
-
   postPatch = ''
-    # The test run in the build script is redundant with checkPhase
-    substituteInPlace package.json \
-     --replace-fail ' && npm run build:tests' ""
-
-    # Should be removed in next 5.9.X TypeScript update
-    substituteInPlace src/compiler/corePublic.ts \
-      --replace-fail 'versionMajorMinor = "5.9"' 'versionMajorMinor = "5.8"'
-    substituteInPlace tests/baselines/reference/api/typescript.d.ts \
-      --replace-fail 'versionMajorMinor = "5.9"' 'versionMajorMinor = "5.8"'
-
-    # Imported from https://github.com/microsoft/TypeScript/blob/b504a1eed45e35b5f54694a1e0a09f35d0a5663c/.github/workflows/set-version.yaml#L75
-    sed -i -e 's/const version\(: string\)\{0,1\} = .*;/const version = "${finalAttrs.version}" as string;/g' src/compiler/corePublic.ts
+    ln -s '${./package-lock.json}' package-lock.json
   '';
 
-  npmDepsHash = "sha256-BHJGezzZensC/WFsUumJSk6TYAqbS50Inuvw2nV5vUk=";
+  npmDepsHash = "sha256-Y/+QPAVOQWKxrHBNEejC3UZrYKQNm7CleR0whFm2sLw=";
 
-  postBuild = ''
-    npx hereby lkg
-  '';
+  dontNpmBuild = true;
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -56,11 +42,21 @@ buildNpmPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
 
   passthru = {
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex=^v([\\d.]+)$"
+    updateScript = lib.getExe (writeShellApplication {
+      name = "${finalAttrs.pname}-updater";
+      runtimeInputs = [
+        nodejs
+        gnutar
+        nix-update
+        prefetch-npm-deps
+        gnused
       ];
-    };
+      runtimeEnv = {
+        PNAME = finalAttrs.pname;
+        PKG_DIR = builtins.toString ./.;
+      };
+      text = builtins.readFile ./update.bash;
+    });
   };
 
   meta = {
diff --git a/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch b/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch
deleted file mode 100644
index dc7d11e30e24..000000000000
--- a/pkgs/by-name/ty/typescript/revert-bump-to-v5.9.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fb5da5ae2622c4f7bb421f4d9ac6881b07ee220c Mon Sep 17 00:00:00 2001
-From: Kenichi Kamiya <kachick1@gmail.com>
-Date: Tue, 27 May 2025 16:09:56 +0900
-Subject: [PATCH] Revert 1fdf78aee644afd2702d69c148754a7fc1aff910
-
-This was an unintended slipped commit into v5.8.n
-Should be removed until actually release 5.9
-
-See https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050 for detail
-
-Intentionally omitted to patch corePublic.ts and the d.ts
-Including CRLF causes patching error in nixpkgs
----
- package-lock.json | 4 ++--
- package.json      | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package-lock.json b/package-lock.json
-index d4d2c055cc..63a0b372d2 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -1,12 +1,12 @@
- {
-     "name": "typescript",
--    "version": "5.9.0",
-+    "version": "@version@",
-     "lockfileVersion": 2,
-     "requires": true,
-     "packages": {
-         "": {
-             "name": "typescript",
--            "version": "5.9.0",
-+            "version": "@version@",
-             "license": "Apache-2.0",
-             "bin": {
-                 "tsc": "bin/tsc",
-diff --git a/package.json b/package.json
-index ef2c80f8b9..0972bb4648 100644
---- a/package.json
-+++ b/package.json
-@@ -2,7 +2,7 @@
-     "name": "typescript",
-     "author": "Microsoft Corp.",
-     "homepage": "https://www.typescriptlang.org/",
--    "version": "5.9.0",
-+    "version": "@version@",
-     "license": "Apache-2.0",
-     "description": "TypeScript is a language for application scale JavaScript development",
-     "keywords": [
--- 
-2.49.0
-
diff --git a/pkgs/by-name/ty/typescript/update.bash b/pkgs/by-name/ty/typescript/update.bash
new file mode 100644
index 000000000000..35b037ec312f
--- /dev/null
+++ b/pkgs/by-name/ty/typescript/update.bash
@@ -0,0 +1,16 @@
+cd "$PKG_DIR"
+
+# Update lockfile
+version="$(npm view typescript version)"
+npm pack typescript
+tar xvf "typescript-${version}.tgz"
+mv package/package.json ./
+npm install --package-lock-only
+npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
+rm -rf ./package ./package.json ./"typescript-${version}.tgz"
+
+cd -
+
+# Update version and hashes
+nix-update "$PNAME" --version "$version"
+sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$PKG_DIR/package.nix"

From 3fdac78c28427afd3d2a52872439999d4e06d870 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 5 Jun 2025 05:36:17 +0200
Subject: [PATCH 1151/1497] nixosTests: migrate `mc config host add` to `mc
 alias set`

The former command was deprecated in 2020 and removed in one of the last
releases.
---
 nixos/tests/atticd.nix                     | 2 +-
 nixos/tests/nextcloud/with-objectstore.nix | 2 +-
 nixos/tests/outline.nix                    | 2 +-
 nixos/tests/thanos.nix                     | 2 +-
 nixos/tests/web-apps/lasuite-docs.nix      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/atticd.nix b/nixos/tests/atticd.nix
index 4193d75d2a92..dd0790fe65e7 100644
--- a/nixos/tests/atticd.nix
+++ b/nixos/tests/atticd.nix
@@ -78,7 +78,7 @@ in
           s3.wait_for_unit("minio.service")
           s3.wait_for_open_port(9000)
           s3.succeed(
-              "mc config host add minio "
+              "mc alias set minio "
               + "http://localhost:9000 "
               + "${accessKey} ${secretKey} --api s3v4",
               "mc mb minio/attic",
diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix
index 53800b8238bc..c652df46b1c4 100644
--- a/nixos/tests/nextcloud/with-objectstore.nix
+++ b/nixos/tests/nextcloud/with-objectstore.nix
@@ -126,7 +126,7 @@ runTest (
 
         with subtest("Check if file is in S3"):
             nextcloud.succeed(
-                "mc config host add minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
+                "mc alias set minio https://acme.test ${accessKey} ${secretKey} --api s3v4"
             )
             files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n')
 
diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix
index e2691c205056..58c751d66f78 100644
--- a/nixos/tests/outline.nix
+++ b/nixos/tests/outline.nix
@@ -44,7 +44,7 @@ in
 
     # Create a test bucket on the server
     machine.succeed(
-        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
+        "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
     )
     machine.succeed("mc mb minio/outline")
 
diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix
index bfdee16a6f9b..c0c10854e73f 100644
--- a/nixos/tests/thanos.nix
+++ b/nixos/tests/thanos.nix
@@ -234,7 +234,7 @@ import ./make-test-python.nix {
       s3.wait_for_unit("minio.service")
       s3.wait_for_open_port(${toString minioPort})
       s3.succeed(
-          "mc config host add minio "
+          "mc alias set minio "
           + "http://localhost:${toString minioPort} "
           + "${s3.accessKey} ${s3.secretKey} --api s3v4",
           "mc mb minio/thanos-bucket",
diff --git a/nixos/tests/web-apps/lasuite-docs.nix b/nixos/tests/web-apps/lasuite-docs.nix
index 49af73a7f604..42629ebba9d6 100644
--- a/nixos/tests/web-apps/lasuite-docs.nix
+++ b/nixos/tests/web-apps/lasuite-docs.nix
@@ -141,7 +141,7 @@ in
       machine.wait_for_unit("lasuite-docs-collaboration-server.service")
 
     with subtest("Create S3 bucket"):
-      machine.succeed("mc config host add minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
+      machine.succeed("mc alias set minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
       machine.succeed("mc mb lasuite-docs")
 
     with subtest("Wait for web servers to start"):

From b56471cf1cdb0a9e8f4fe095cb5e2b70ce75527d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 03:37:49 +0000
Subject: [PATCH 1152/1497] ocm: 1.0.5 -> 1.0.6

---
 pkgs/by-name/oc/ocm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index f9b2fa28dbad..108d85efd83d 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "ocm";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
     rev = "v${version}";
-    sha256 = "sha256-0JCmKuSVuSOinJiLDT4dOKNON6PnICum6Smnf3syJfM=";
+    sha256 = "sha256-NNhHd4++o2nJjG4okx5dWUng9Z2b032goaLq+1eZ+KI=";
   };
 
-  vendorHash = "sha256-kTgTRRSJe3zvgoy923FRtomJpXqnK1t7MF53QAidyuo=";
+  vendorHash = "sha256-KlpQO2xi6edysM45ks2m7/3kkEfxACvK/hzrLpHnEic=";
 
   # Strip the final binary.
   ldflags = [

From 81a5e50efc69eaf8418a69e7a058c16bb2a86762 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 5 Jun 2025 00:39:28 -0300
Subject: [PATCH 1153/1497] lightning-loop: 0.28.8 -> 0.31.1

---
 pkgs/by-name/li/lightning-loop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index c68648a0ee3d..75cc4d103c14 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "lightning-loop";
-  version = "0.28.8-beta";
+  version = "0.31.1-beta";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
     rev = "v${version}";
-    hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
+    hash = "sha256-OJWf96Dq06U56dIMMocGYgyZdu94VM3A6ViJZR+gbxQ=";
   };
 
-  vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0=";
+  vendorHash = "sha256-TnnYjTbN6zuXUbZbh1sK9bmjR7FleFqNFrqwBTllypY=";
 
   subPackages = [
     "cmd/loop"

From 0a00db6f7bb5edbab3e8d9f4bbae8acf6195b5ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 04:06:14 +0000
Subject: [PATCH 1154/1497] ripunzip: 2.0.2 -> 2.0.3

---
 pkgs/by-name/ri/ripunzip/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix
index 9ffa2846b826..da841ffd31de 100644
--- a/pkgs/by-name/ri/ripunzip/package.nix
+++ b/pkgs/by-name/ri/ripunzip/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripunzip";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "ripunzip";
     rev = "v${version}";
-    hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU=";
+    hash = "sha256-giNaTALPZYOfQ+kPyQufbRTdTwwKLK7iDvg50YNfzDg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs=";
+  cargoHash = "sha256-uz07yZBkmBTEGB64rhBYQ2iL0KbrY4UAM96utv8HCSE=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From f633b66c34008394626e708cf0fc820b4905646a Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 5 Jun 2025 11:31:48 +0800
Subject: [PATCH 1155/1497] vivaldi: 7.4.3684.43 -> 7.4.3684.46

---
 pkgs/by-name/vi/vivaldi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index b03a862c7713..70a9d9c87ce2 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -66,7 +66,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.4.3684.43";
+  version = "7.4.3684.46";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-/Zmxwm65HjIL/JdWJtvcgxk4Bj4VcTXr/px6eCJHy0I=";
-        x86_64-linux = "sha256-tDGoew5jEOqoHIHSvoOsBcuEzq817YT0pFSO3Li48OU=";
+        aarch64-linux = "sha256-vcTuqCZy0OlfO5Iz06QVGJRtT3L55wWdmE9R6Y3P1/k=";
+        x86_64-linux = "sha256-uD2CZ4OEZbLIDgl3VGdHwr0edyJd4Gv/C22Z5wQMYk8=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From eb596f27244b545d976f01fb1c0df3fa88fc4065 Mon Sep 17 00:00:00 2001
From: Felix Kimmel <felix.kimmel@web.de>
Date: Wed, 4 Jun 2025 23:02:23 +0200
Subject: [PATCH 1156/1497] vscode-extensions.james-yu.latex-workshop: 10.9.1
 -> 10.10.0 and moved to own directory

---
 .../editors/vscode/extensions/default.nix     | 17 +--------------
 .../james-yu.latex-workshop/default.nix       | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index f5a44a5193af..c84c7e57aaf9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2566,22 +2566,7 @@ let
 
       jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };
 
-      james-yu.latex-workshop = buildVscodeMarketplaceExtension {
-        mktplcRef = {
-          name = "latex-workshop";
-          publisher = "James-Yu";
-          version = "10.9.1";
-          sha256 = "sha256-R+tJ3k71rlzfxtz4Dib6JiU7Sipq/UTP38ERAhojY7c=";
-        };
-        meta = {
-          changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
-          description = "LaTeX Workshop Extension";
-          downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop";
-          homepage = "https://github.com/James-Yu/LaTeX-Workshop";
-          license = lib.licenses.mit;
-          maintainers = [ ];
-        };
-      };
+      james-yu.latex-workshop = callPackage ./james-yu.latex-workshop { };
 
       jamesyang999.vscode-emacs-minimum = buildVscodeMarketplaceExtension {
         mktplcRef = {
diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
new file mode 100644
index 000000000000..c939b796b7b6
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "latex-workshop";
+    publisher = "James-Yu";
+    version = "10.10.0";
+    hash = "sha256-3Rdoer5n2jf8PLRGgg/nqGRoRwQLCdcOXkmKay5uDWE=";
+  };
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
+    description = "LaTeX Workshop Extension";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop";
+    homepage = "https://github.com/James-Yu/LaTeX-Workshop";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.therobot2105 ];
+  };
+}

From 0944ebab3833d3a978da66a0170e4e0bf70b25f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 04:48:15 +0000
Subject: [PATCH 1157/1497] homebank: 5.9.1 -> 5.9.2

---
 pkgs/by-name/ho/homebank/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix
index 5af7e16e7eb0..7b402cff2828 100644
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@@ -13,10 +13,10 @@
 
 stdenv.mkDerivation rec {
   pname = "homebank";
-  version = "5.9.1";
+  version = "5.9.2";
   src = fetchurl {
     url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
-    hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A=";
+    hash = "sha256-63WHr9yUuNx3s2pNvTSPTLwQ2M+757Mr++Yfocb6G8c=";
   };
 
   nativeBuildInputs = [

From 195e553ea6f785d55d27346d25a721c015b03ca0 Mon Sep 17 00:00:00 2001
From: vinylen <victor@viclab.se>
Date: Thu, 5 Jun 2025 07:18:55 +0200
Subject: [PATCH 1158/1497] vimPlugins.kanso-nvim: init at 2025-06-03

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e7415ee7d925..4c41f43d7063 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6652,6 +6652,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  kanso-nvim = buildVimPlugin {
+    pname = "kanso.nvim";
+    version = "2025-06-03";
+    src = fetchFromGitHub {
+      owner = "webhooked";
+      repo = "kanso.nvim";
+      rev = "d5975aa93bc157cfc60d4863d0704ab1d6e4deca";
+      sha256 = "17faa8mk90ch2s774lrvf17r4461askvv64b0ls95b9ilps9vl4j";
+    };
+    meta.homepage = "https://github.com/webhooked/kanso.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   kdl-vim = buildVimPlugin {
     pname = "kdl.vim";
     version = "2023-02-20";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 55b9fddd28d7..5f3dcded1e6f 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -510,6 +510,7 @@ https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
 https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
+https://github.com/webhooked/kanso.nvim/,HEAD,
 https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
 https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD,

From b5cfb30b7027c9c5188f45ebeee035a2596946d7 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:06:34 +0000
Subject: [PATCH 1159/1497] warp-terminal: 0.2025.05.28.08.11.stable_02 ->
 0.2025.05.28.08.11.stable_03

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 05b3ef823722..aba3c69d0bcb 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-II8VDM6qBkep+v017+hhOfx+wfHoMo5lR22IvvXmiy8=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-oPBB3tCxLMogV3SEr7QHjFgOw8n7bfuwFSRdgWwSb9Y=",
+    "version": "0.2025.05.28.08.11.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-7/U/ZPJLNbBpk0fNAh0OHr68+x5zhYsbJn+vc09/h4w=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-pVXmosjXXnSyOrLEUzZtLWs1KWkyDRXSjHV6rdvuK6U=",
+    "version": "0.2025.05.28.08.11.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-TX1OYadvUdOp9R3eDdw1ONtN/wn7K8m1IH1IwIdSuJQ=",
-    "version": "0.2025.05.28.08.11.stable_02"
+    "hash": "sha256-LKFkJg5NEgtjvjK1gzo4ZQqQQbxmzRgP+CNznlgUfJo=",
+    "version": "0.2025.05.28.08.11.stable_03"
   }
 }

From e5003e13f4df0846e5418ebdb0b5060087763d02 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:00:55 +0000
Subject: [PATCH 1160/1497] uwsm: 0.21.4 -> 0.21.6

---
 pkgs/by-name/uw/uwsm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 89e3d31baa28..9f25bebf3496 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.21.4";
+  version = "0.21.6";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/URa5/NK4AowYx933HwKE01191HMRSvuxtDKFKiMQr8=";
+    hash = "sha256-Pav86kNCIe1cqkkPyAt8yGCR1M7wGHPSGibkeLCE4E4=";
   };
 
   nativeBuildInputs = [

From 90071e65fb2ba240224967e8f3ceb2db8e43c9d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 05:42:13 +0000
Subject: [PATCH 1161/1497] safety-cli: 3.5.1 -> 3.5.2

---
 pkgs/development/python-modules/safety/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 50bd8ce07b5f..020178ff3c14 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.5.1";
+  version = "3.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
     tag = version;
-    hash = "sha256-ZUtx0pOBYPWJDy/xM4A71w+7OzFEkmKxgXtudu2oaUo=";
+    hash = "sha256-kYGoJpFkZo4kZmbmak/+nOS2gzDO/xAwfbcGPOFxyrY=";
   };
 
   patches = [

From 97799403ff162117d3e46ae86e25bd64764da4ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 05:45:17 +0000
Subject: [PATCH 1162/1497] postfix-tlspol: 1.8.10 -> 1.8.11

---
 pkgs/by-name/po/postfix-tlspol/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 051aea4e141b..8afc3bf69676 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "postfix-tlspol";
-  version = "1.8.10";
+  version = "1.8.11";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-UAAjvu/nWF9Q60n+Fojw/a6CsgY6iI5qjKv2nsBuzvo=";
+    hash = "sha256-hQSJ0bp3ghfi5chislf2zuCrvPhhoA0jjChRdGYHcFY=";
   };
 
   vendorHash = null;

From 2f43173e8091ef0d6ea83cf0a85868f0b540c3d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Jun 2025 07:59:22 +0200
Subject: [PATCH 1163/1497] python312Packages.polyswarm-api: 3.12.0 -> 3.13.0

Diff: https://github.com/polyswarm/polyswarm-api/compare/refs/tags/3.12.0...refs/tags/3.13.0

Changelog: https://github.com/polyswarm/polyswarm-api/releases/tag/3.13.0
---
 pkgs/development/python-modules/polyswarm-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix
index 4ffa74130384..ac78677fa4c5 100644
--- a/pkgs/development/python-modules/polyswarm-api/default.nix
+++ b/pkgs/development/python-modules/polyswarm-api/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "polyswarm-api";
-  version = "3.12.0";
+  version = "3.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "polyswarm";
     repo = "polyswarm-api";
     tag = version;
-    hash = "sha256-LM+8U7gEo16e8vuFuheonLB685zeNEm736UVXgmtPDw=";
+    hash = "sha256-Mu/Gfs6Iy24xUQ1yvRAR3TXio30FHMVpTel99YtRtyg=";
   };
 
   pythonRelaxDeps = [ "future" ];

From 4063560ec724051ffb79aeb527476f4c64338223 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 06:06:34 +0000
Subject: [PATCH 1164/1497] proton-pass: 1.31.4 -> 1.31.5

---
 pkgs/by-name/pr/proton-pass/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index c94b612280a4..504a570d11f8 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.31.4";
+  version = "1.31.5";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-gl4qCj9BAN9B09b+F78v0f3tUyxRU4/IpsSvtK0CZOM=";
+    hash = "sha256-PNBqnVpLLIpi/S0MLyhCBE6ggnjHJ8aEmBJuYC3DcwQ=";
   };
 
   dontConfigure = true;

From 6a42e78cc3be97f53ee4307c3c79bfaca4c02ece Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Jun 2025 09:34:37 +0200
Subject: [PATCH 1165/1497] uv: 0.7.10 -> 0.7.11

Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.7.10...refs/tags/0.7.11

Changelog: https://github.com/astral-sh/uv/blob/0.7.11/CHANGELOG.md
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 495c48f73f87..9b474a97c1ec 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.10";
+  version = "0.7.11";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-NdePwYsAIphAJxtD+sCC7vSouWt+i+uPEp+b0zRlLg0=";
+    hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vPs6VwhnMsnoTpktdLlOdYcw1X35xN/alwZ5zEyHmEY=";
+  cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA=";
 
   buildInputs = [
     rust-jemalloc-sys

From ac424fab9ade691101bae0bb9e075ce7c5450e17 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 5 Jun 2025 15:53:06 +0800
Subject: [PATCH 1166/1497] wemeet-wayland-screenshare: 0-unstable-2025-01-06
 -> 0-unstable-2025-05-31

---
 pkgs/by-name/we/wemeet/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
index 0cde796af895..2afddc259ab2 100644
--- a/pkgs/by-name/we/wemeet/package.nix
+++ b/pkgs/by-name/we/wemeet/package.nix
@@ -45,13 +45,13 @@
 let
   wemeet-wayland-screenshare = stdenv.mkDerivation {
     pname = "wemeet-wayland-screenshare";
-    version = "0-unstable-2025-01-06";
+    version = "0-unstable-2025-05-31";
 
     src = fetchFromGitHub {
       owner = "xuwd1";
       repo = "wemeet-wayland-screenshare";
-      rev = "ab226c63380c4233e2f490ba17e6ea8f393999e2";
-      hash = "sha256-nBkbyy0VGOaPNVsEA02bSlTI6eQoVr/QVpEEpCuFdUw=";
+      rev = "7f338966e162612b09d838512b11af5901414d05";
+      hash = "sha256-UtPcgEa+9KrF4CblC8D4oClvVJs+a5DWtwH/fD7puVs=";
       fetchSubmodules = true;
     };
 
@@ -83,8 +83,8 @@ let
     };
   };
 
+  # for mitigating file transfer crashes
   libwemeetwrap = stdenv.mkDerivation {
-    # for mitigating file transfer crashes
     pname = "libwemeetwrap";
     version = "0-unstable-2023-12-14";
 
@@ -96,9 +96,7 @@ let
 
     dontWrapQtApps = true;
 
-    nativeBuildInputs = [
-      pkg-config
-    ];
+    nativeBuildInputs = [ pkg-config ];
 
     buildInputs = [
       openssl

From d5b61902ea2ef0ede7389e986c268f3465f76092 Mon Sep 17 00:00:00 2001
From: Marco Desiderati <m.desiderati@abacogroup.eu>
Date: Thu, 5 Jun 2025 09:57:02 +0200
Subject: [PATCH 1167/1497] snx-rs: 3.1.2 -> 4.4.1

---
 pkgs/by-name/sn/snx-rs/package.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index be931652bd21..6678fb7e5ff7 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -1,7 +1,7 @@
 {
   fetchFromGitHub,
   glib,
-  gtk3,
+  gtk4,
   iproute2,
   kdePackages,
   lib,
@@ -14,17 +14,19 @@
   pkg-config,
   rustPlatform,
   webkitgtk_4_1,
+  graphene,
   nix-update-script,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snx-rs";
-  version = "3.1.2";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${version}";
-    hash = "sha256-bLuIXd2pqqiyEP+lDTJYVDZkRZ0HcDkKFZd/qlpuf98=";
+    hash = "sha256-Juv38ALXf1nMeokBH7Z+39oIscXW7S+OxdD/ZSNs49U=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -36,7 +38,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     glib
-    gtk3
+    gtk4
     kdePackages.kstatusnotifieritem
     libappindicator
     libappindicator-gtk2
@@ -45,19 +47,24 @@ rustPlatform.buildRustPackage rec {
     libsoup_3
     openssl
     webkitgtk_4_1
+    graphene
   ];
 
-  postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-  '';
-
   checkFlags = [
     "--skip=platform::linux::net::tests::test_default_ip"
+    "--skip=platform::linux::tests::test_xfrm_check"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-E5OJVf9CkLn5mFtk4Yacs2OIvAuIw0idSs7QuTNvfgU=";
+  cargoHash = "sha256-NcoTdu/CQRu0RuZjlngP8lTPaomEiPTcfn2hAt+YjwA=";
+
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Open source Linux client for Checkpoint VPN tunnels";

From c025fb0d826178b01c0e464d6784e32c13e047b1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:15:59 +0800
Subject: [PATCH 1168/1497] yaml-language-server: 1.17.0 -> 1.18.0

Diff: https://github.com/redhat-developer/yaml-language-server/compare/refs/tags/1.17.0...refs/tags/1.18.0

Changelog: https://github.com/redhat-developer/yaml-language-server/blob/refs/tags/1.18.0/CHANGELOG.md
---
 pkgs/by-name/ya/yaml-language-server/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index 03d0655b1fd5..831c2589c255 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -1,28 +1,28 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchYarnDeps,
   fixup-yarn-lock,
   makeWrapper,
   nodejs,
   writableTmpDirAsHomeHook,
-  stdenv,
   yarn,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
-    tag = version;
-    hash = "sha256-YGPktMZxYi6eihCDc8JIfN/Ht2uu3wGKoKPJWlDKu+g=";
+    tag = finalAttrs.version;
+    hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c=";
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE=";
   };
 
@@ -72,11 +72,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Language Server for YAML Files";
     homepage = "https://github.com/redhat-developer/yaml-language-server";
     license = lib.licenses.mit;
     mainProgram = "yaml-language-server";
     maintainers = [ ];
   };
-}
+})

From 5dd3d7ed18da180b0c7af732dd6017cde395bc57 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:33:01 +0800
Subject: [PATCH 1169/1497] xxdiff: 5.0b1 -> 5.1-unstable-2025-03-21

---
 .../development/tools/misc/xxdiff/default.nix | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 1da47d6c51c5..0d42c1cf02e8 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -1,43 +1,44 @@
 {
   lib,
-  mkDerivation,
-  fetchFromBitbucket,
+  stdenv,
+  fetchFromGitHub,
   docutils,
   bison,
   flex,
-  qmake,
-  qtbase,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xxdiff";
-  version = "5.0b1";
+  version = "5.1-unstable-2025-03-21";
 
-  src = fetchFromBitbucket {
+  src = fetchFromGitHub {
     owner = "blais";
-    repo = pname;
-    rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
-    sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
+    repo = "xxdiff";
+    rev = "a5593c1c675fb79d0ec2b6e353abba1fb0179aa7";
+    hash = "sha256-nRXvqhO128XsAFy4KrsrSYKpzWnciXGJV6QkuqRa07w=";
   };
 
   nativeBuildInputs = [
     bison
     docutils
     flex
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   dontUseQmakeConfigure = true;
 
   # c++11 and above is needed for building with Qt 5.9+
   env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
 
-  sourceRoot = "${src.name}/src";
+  sourceRoot = "${finalAttrs.src.name}/src";
 
   postPatch = ''
-    substituteInPlace xxdiff.pro --replace ../bin ./bin
+    substituteInPlace xxdiff.pro \
+      --replace-fail "../bin" "./bin"
   '';
 
   preConfigure = ''
@@ -47,21 +48,21 @@ mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm555 -t $out/bin                ./bin/xxdiff
-    install -Dm444 -t $out/share/doc/${pname} ${src}/README
+    install -Dm555 -t $out/bin ./bin/xxdiff
+    install -Dm444 -t $out/share/doc/xxdiff ${finalAttrs.src}/README.rst
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical file and directories comparator and merge tool";
     mainProgram = "xxdiff";
     homepage = "http://furius.ca/xxdiff/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       pSub
       raskin
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

From 52474c6bee06b4eb9b332312b62c47c900bbb38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?=
 <1771332+vlaci@users.noreply.github.com>
Date: Thu, 5 Jun 2025 10:54:05 +0200
Subject: [PATCH 1170/1497] unblob: 25.4.14 -> 25.5.26

---
 pkgs/by-name/un/unblob/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix
index 47a22f5b1761..f6228fdcedf6 100644
--- a/pkgs/by-name/un/unblob/package.nix
+++ b/pkgs/by-name/un/unblob/package.nix
@@ -14,11 +14,13 @@
   lziprecover,
   lzop,
   p7zip,
+  partclone,
   sasquatch,
   sasquatch-v4be,
   simg2img,
   ubi_reader,
   unar,
+  upx,
   zstd,
   versionCheckHook,
 }:
@@ -37,13 +39,14 @@ let
     ubi_reader
     simg2img
     unar
+    upx
     zstd
     lz4
-  ];
+  ] ++ lib.optional stdenvNoCC.isLinux partclone;
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "unblob";
-  version = "25.4.14";
+  version = "25.5.26";
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.9";
 
@@ -51,14 +54,14 @@ python3.pkgs.buildPythonApplication rec {
     owner = "onekey-sec";
     repo = "unblob";
     tag = version;
-    hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90=";
+    hash = "sha256-vTakXZFAcD3cmd+y4CwYg3X4O4NmtOzuqMLWLMX2Duk=";
     forceFetchGit = true;
     fetchLFS = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs=";
+    hash = "sha256-NirDPuAcKuNquMs9mBZoEkQf+QJ+cMd7JXjj1anB9Zw=";
   };
 
   strictDeps = true;

From a8b64551c5f11f7fe4700c94d50758b4c1baf5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= <vojtech.kane@gmail.com>
Date: Thu, 22 May 2025 10:42:20 +0200
Subject: [PATCH 1171/1497] aerc: backport an upstream patch for handling of
 attachments' filenames

The patch is not part of a tagged release yet so we apply it selectively
instead of upgrading whole aerc. While it is originally presented as
a usability problem only for attachments with absolutes filepaths (they
fail to open), there is nothing stopping you from putting a relative
path in there therefore forcing aerc to overwriting any path on the host
system with sender chosen data. It's been marked as CVE-2025-49466

I decided to inline the patches into nixpkgs as they are very short and
the current bot protection of git.sr.ht complicates patch fetching.
---
 .../ae/aerc/basename-temp-file-fixup.patch    | 34 +++++++++++++++
 pkgs/by-name/ae/aerc/basename-temp-file.patch | 41 +++++++++++++++++++
 pkgs/by-name/ae/aerc/package.nix              |  9 +++-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
 create mode 100644 pkgs/by-name/ae/aerc/basename-temp-file.patch

diff --git a/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
new file mode 100644
index 000000000000..07bec5bffbd8
--- /dev/null
+++ b/pkgs/by-name/ae/aerc/basename-temp-file-fixup.patch
@@ -0,0 +1,34 @@
+From 2bbe75fe0bc87ab4c1e16c5a18c6200224391629 Mon Sep 17 00:00:00 2001
+From: Nicole Patricia Mazzuca <nicole@streganil.no>
+Date: Fri, 9 May 2025 09:32:21 +0200
+Subject: [PATCH] open: fix opening text/html messages
+
+This fixes a bug introduced in 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329:
+aerc started using `path.Base(<part>)`, which returns `"."` on an empty
+path, but still checked for `""` two lines later.
+
+On macOS, the result is that aerc attempts to open the directory:
+
+```
+open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory
+```
+
+Signed-off-by: Nicole Patricia Mazzuca <nicole@streganil.no>
+Acked-by: Robin Jarry <robin@jarry.cc>
+---
+ commands/msgview/open.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/commands/msgview/open.go b/commands/msgview/open.go
+index a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3..7c770d4a90b771e3a18dfcb327f5e9306d5b5fa7 100644
+--- a/commands/msgview/open.go
++++ b/commands/msgview/open.go
+@@ -59,7 +59,7 @@ func (o Open) Execute(args []string) error {
+ 		}
+ 		filename := path.Base(part.FileName())
+ 		var tmpFile *os.File
+-		if filename == "" {
++		if filename == "." {
+ 			extension := ""
+ 			if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 {
+ 				extension = exts[0]
diff --git a/pkgs/by-name/ae/aerc/basename-temp-file.patch b/pkgs/by-name/ae/aerc/basename-temp-file.patch
new file mode 100644
index 000000000000..8ca81c21db95
--- /dev/null
+++ b/pkgs/by-name/ae/aerc/basename-temp-file.patch
@@ -0,0 +1,41 @@
+From 93bec0de8ed5ab3d6b1f01026fe2ef20fa154329 Mon Sep 17 00:00:00 2001
+From: Robin Jarry <robin@jarry.cc>
+Date: Wed, 9 Apr 2025 10:49:24 +0200
+Subject: [PATCH] open: only use part basename for temp file
+
+When an attachment part has a name such as "/tmp/55208186_AllDocs.pdf",
+aerc creates a temp folder and tries to store the file by blindly
+concatenating the path as follows:
+
+	/tmp/aerc-3444057757/tmp/55208186_AllDocs.pdf
+
+And when writing to this path, it gets a "No such file or directory"
+error because the intermediate "tmp" subfolder isn't created.
+
+Reported-by: Erik Colson <eco@ecocode.net>
+Signed-off-by: Robin Jarry <robin@jarry.cc>
+---
+ commands/msgview/open.go | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/commands/msgview/open.go b/commands/msgview/open.go
+index 4293b7e4892c137a7f3fbbe79245ffb6733b2671..a6e43cb8da5fd49d2aa562d4c25ee2d597deefc3 100644
+--- a/commands/msgview/open.go
++++ b/commands/msgview/open.go
+@@ -5,6 +5,7 @@ import (
+ 	"io"
+ 	"mime"
+ 	"os"
++	"path"
+ 	"path/filepath"
+ 
+ 	"git.sr.ht/~rjarry/aerc/app"
+@@ -56,7 +57,7 @@ func (o Open) Execute(args []string) error {
+ 			app.PushError(err.Error())
+ 			return
+ 		}
+-		filename := part.FileName()
++		filename := path.Base(part.FileName())
+ 		var tmpFile *os.File
+ 		if filename == "" {
+ 			extension := ""
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index b05f3b97c395..906c9a39f7f6 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -33,7 +33,14 @@ buildGoModule (finalAttrs: {
     python3Packages.wrapPython
   ];
 
-  patches = [ ./runtime-libexec.patch ];
+  patches = [
+    ./runtime-libexec.patch
+
+    # TODO remove these with the next release
+    # they resolve a path injection vulnerability when saving attachments (CVE-2025-49466)
+    ./basename-temp-file.patch
+    ./basename-temp-file-fixup.patch
+  ];
 
   postPatch = ''
     substituteAllInPlace config/aerc.conf

From b5fa3b319dd9bcb17ff1d279863e571189b443df Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Wed, 4 Jun 2025 23:21:22 +0300
Subject: [PATCH 1172/1497] teleport_17: 17.4.8 -> 17.5.1

Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.5.0 https://github.com/gravitational/teleport/releases/tag/v17.5.1
Diff: https://github.com/gravitational/teleport/compare/v17.4.8...v17.5.1
---
 pkgs/by-name/te/teleport/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 4cce72857609..58a6caf352dc 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -21,9 +21,9 @@
 
   withRdpClient ? true,
 
-  version ? "17.4.8",
-  hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=",
-  vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=",
+  version ? "17.5.1",
+  hash ? "sha256-+9Oit7GAUTNv5Z8ZDOuBBRnVvtdA9N0X97UJbLILX50=",
+  vendorHash ? "sha256-yeouUrLMfkKSYnS9va59cYWnGCvQatQQrNa1DuHQMug=",
   extPatches ? [ ],
   cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",
   pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=",

From bc69b7dd5dea599232e8ec1fac4c069802755903 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 09:19:20 +0000
Subject: [PATCH 1173/1497] beeper: 4.0.732 -> 4.0.747

---
 pkgs/by-name/be/beeper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 2988a0cf9728..e0743a65c5f2 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.0.732";
+  version = "4.0.747";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-8HcWEMrMpq+QCnkCf7Yn79fADy98KFqL/m1erXtM8XU=";
+    hash = "sha256-eLNxuBCm3vzG/90mZsQCVInGu8lMPrr+/UBAHj+vGJ4=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From 90e3ef2c3d74c269d90debe12dce9da6c46d78d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 09:34:49 +0000
Subject: [PATCH 1174/1497] fastfetchMinimal: 2.44.0 -> 2.45.0

---
 pkgs/by-name/fa/fastfetch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 11e3670eb7cc..fe8745a4d0ed 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -59,13 +59,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.44.0";
+  version = "2.45.0";
 
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-cLN1G/Rp1Euc6pp0V/Xd4qmo3x0b+rnNU8PDP5j/PTE=";
+    hash = "sha256-HDr4goUvAKeMk2UGmF2ON72ETQQipNwLfsvyB+f74LE=";
   };
 
   outputs = [

From 453d0a30a40139ea549418073939f835e398374f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 5 Jun 2025 09:50:40 +0000
Subject: [PATCH 1175/1497] clorinde: 0.15.2 -> 0.16.0

---
 pkgs/by-name/cl/clorinde/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index f56be8024eef..3eed4fed07e1 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-CrgJtgFX5RBNfFFr2ZZ0d3oKfryyLAHva7g2JyBFiB8=";
+    hash = "sha256-ze/PEML1buh3HlVgz6ifMPWfZnr6eT3VpIXf7jR68jw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-jUtkhOAosrxHGRbAdzdrgLzL5Xp2YhxcrG/dcwUhdLg=";
+  cargoHash = "sha256-dp5m/PLVG8xUM6LCq48NKK0P8di44keB/YZ9ocfL0Bg=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 

From 29550470b09fa80d3cc189f40d832a191419d925 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 5 Jun 2025 11:35:10 +0200
Subject: [PATCH 1176/1497] vscode-extensions.esbenp.prettier-vscode: fix path
 to `prettier`

---
 .../vscode/extensions/esbenp.prettier-vscode/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
index 26b8b62c9485..5272f895e38f 100644
--- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
@@ -23,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
 
   postInstall = ''
     cd "$out/$installPrefix"
-    jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}/lib/node_modules/prettier"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}"' package.json | sponge package.json
   '';
 
   meta = {

From 957e95887b532b955a0f0d96999e4edf516dbe1d Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 5 Jun 2025 11:58:51 +0200
Subject: [PATCH 1177/1497] vscode-extensions.robocorp.robotframework: init at
 1.13.0

---
 .../robocorp.robotframework-lsp/default.nix   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
new file mode 100644
index 000000000000..9770195611d0
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  vscode-utils,
+}:
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "robotframework-lsp";
+    publisher = "robocorp";
+    version = "1.13.0";
+    hash = "";
+  };
+
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog";
+    description = "VSCode extension for providing an integration solution for Typst";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
+    homepage = "https://github.com/myriad-dreamin/tinymist";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.drupol ];
+  };
+}

From f598182c0b5a1fe8a4cd170d27cfc8453955c97e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:01:18 +0000
Subject: [PATCH 1178/1497] livekit: 1.8.4 -> 1.9.0

---
 pkgs/by-name/li/livekit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 35abab93682f..9ee557bd80cb 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "livekit";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${version}";
-    hash = "sha256-j8alEPvSMdYpQLdWwaoSG5ZYgO17O1BMa71omeCb2Ug=";
+    hash = "sha256-xj0K9DaLXrj7U9zlaaAOMu7HFkTvn6P9PBb83j26D70=";
   };
 
-  vendorHash = "sha256-7Zs7b0vaXyho1X33obsHh5f7sIUyhJKfJmHsFf/IuPY=";
+  vendorHash = "sha256-3zrP84YkPRn4NC3l9XRhtNraX8G5WnRxo2CNOmMfVJs=";
 
   subPackages = [ "cmd/server" ];
 

From cda9c64a1b8512dcdaa6b252a98fb3fd6b5adff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:02:55 +0000
Subject: [PATCH 1179/1497] ygot: 0.31.0 -> 0.32.0

---
 pkgs/by-name/yg/ygot/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yg/ygot/package.nix b/pkgs/by-name/yg/ygot/package.nix
index f142dc8819d4..853f88a322a3 100644
--- a/pkgs/by-name/yg/ygot/package.nix
+++ b/pkgs/by-name/yg/ygot/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ygot";
-  version = "0.31.0";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "openconfig";
     repo = "ygot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jhPo3K6Q/LcfMkp2jaFwHGoFJSMdBNFidVU3A42Locw=";
+    hash = "sha256-rn5/eq8S2pu+3KYaB1gqN2uwA/pzFJjgX5pyXDE2eEA=";
   };
 
-  vendorHash = "sha256-MxyjO/uptmBXz+JWgRcP/SWeEWyz9pNA9eM4Rul45cM=";
+  vendorHash = "sha256-AgSKfy8Dbc5fRhJ2oskmkShL/mHb2FKkGZoqPyagLfE=";
 
   excludedPackages = [
     "demo/*"

From fd7c6b0bf0c3486f82a3cc08c0a259050bb0a135 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:04:30 +0000
Subject: [PATCH 1180/1497] mtr-exporter: 0.5.1 -> 0.6.0

---
 pkgs/by-name/mt/mtr-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mt/mtr-exporter/package.nix b/pkgs/by-name/mt/mtr-exporter/package.nix
index 3bc1d67f2f5a..4a7f1fae3d7a 100644
--- a/pkgs/by-name/mt/mtr-exporter/package.nix
+++ b/pkgs/by-name/mt/mtr-exporter/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mtr-exporter";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "mgumz";
     repo = "mtr-exporter";
     rev = version;
-    hash = "sha256-+myQg27TGclU+SfU8oO+DvXYqc/8sWE2zRK6fL2DhwM=";
+    hash = "sha256-GkTkL72ZdxeCMG24rjGx8vWt5GQqrTXNxTDpQ81ite8=";
   };
 
   vendorHash = null;

From ba606757866aea8ca39a0b59f85aca4e5629cc05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:07:21 +0000
Subject: [PATCH 1181/1497] nixos-anywhere: 1.10.0 -> 1.11.0

---
 pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix
index 424813cec2a5..7652fa819ead 100644
--- a/pkgs/by-name/ni/nixos-anywhere/package.nix
+++ b/pkgs/by-name/ni/nixos-anywhere/package.nix
@@ -31,12 +31,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixos-anywhere";
-  version = "1.10.0";
+  version = "1.11.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-anywhere";
     rev = finalAttrs.version;
-    hash = "sha256-xzalz30m0iTVfxPMf0nROg5j/xvg6NhHsX04+ym1E9w=";
+    hash = "sha256-hVTCvMnwywxQ6rGgO7ytBiSpVuLOHNgm3w3vE8UNaQY=";
   };
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''

From f349ba88b6ab74701a0bb0b0aa1e01b5e454db3a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 5 Jun 2025 12:08:39 +0200
Subject: [PATCH 1182/1497] cli-visualizer: drop

---
 pkgs/by-name/cl/cli-visualizer/package.nix | 53 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/cl/cli-visualizer/package.nix

diff --git a/pkgs/by-name/cl/cli-visualizer/package.nix b/pkgs/by-name/cl/cli-visualizer/package.nix
deleted file mode 100644
index 5fa6cd2f5143..000000000000
--- a/pkgs/by-name/cl/cli-visualizer/package.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  fftw,
-  ncurses5,
-  libpulseaudio,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.8";
-  pname = "cli-visualizer";
-
-  src = fetchFromGitHub {
-    owner = "dpayne";
-    repo = "cli-visualizer";
-    rev = "v${version}";
-    sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2";
-  };
-
-  postPatch = ''
-    sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    fftw
-    ncurses5
-    libpulseaudio
-  ];
-
-  buildFlags = [ "ENABLE_PULSE=1" ];
-
-  postInstall = ''
-    # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075
-    wrapProgram $out/bin/vis --set TERM rxvt-256color
-  '';
-
-  meta = {
-    homepage = "https://github.com/dpayne/cli-visualizer";
-    description = "CLI based audio visualizer";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.matthiasbeyer ];
-    platforms = with lib.platforms; linux;
-    mainProgram = "vis";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e6a346b9a192..9dca50e96b91 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -443,6 +443,7 @@ mapAliases {
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
   clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
+  cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
   clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07

From 6881e4cdab8fa4a28f62b8b25b5ea230385271d5 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 5 Jun 2025 12:09:04 +0200
Subject: [PATCH 1183/1497] proxmox-backup-client: 3.3.2 -> 3.4.2

- The one patch previously pulled from the AUR packaging is now
   vendored, due to not being updated (yet) there and needing a refresh.
- A new patch is introduced to revert a commit with very much
  upstream-specific change in the `h2` crate, which is not applicable
  here.

Also closes #412778.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 ...ependencies-not-available-on-crates..patch |   42 +-
 ...docs-add-target-path-fixup-variable.patch} |   10 +-
 ...argo-use-local-patched-h2-dependency.patch |    8 +-
 ...4-docs-drop-all-but-client-man-pages.patch |   83 ++
 ...5-Revert-h2-switch-to-legacy-feature.patch |  198 +++
 .../pr/proxmox-backup-client/Cargo.lock       | 1255 +++++++++++------
 .../pr/proxmox-backup-client/package.nix      |   29 +-
 7 files changed, 1139 insertions(+), 486 deletions(-)
 rename pkgs/by-name/pr/proxmox-backup-client/{0002-docs-Add-target-path-fixup-variable.patch => 0002-docs-add-target-path-fixup-variable.patch} (70%)
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
 create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch

diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
index c1ba7aa5290f..37d230f52c57 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
@@ -1,19 +1,19 @@
-From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001
+From fe701cc514b479ca01d18d7f1ab1da6acbc93273 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
-Date: Tue, 24 Dec 2024 17:40:48 +0100
-Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io
+Date: Thu, 5 Jun 2025 11:26:24 +0200
+Subject: [PATCH 1/5] cargo: re-route dependencies not available on crates.io
  to git repos
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
- Cargo.toml | 147 ++++++++++-------------------------------------------
- 1 file changed, 26 insertions(+), 121 deletions(-)
+ Cargo.toml | 146 ++++++++++-------------------------------------------
+ 1 file changed, 27 insertions(+), 119 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 9354fb17..d2014429 100644
+index d38321e3..99d712da 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -42,8 +42,6 @@ members = [
+@@ -41,8 +41,6 @@ members = [
  
      "proxmox-backup-banner",
      "proxmox-backup-client",
@@ -22,23 +22,7 @@ index 9354fb17..d2014429 100644
  
      "pxar-bin",
  ]
-@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" }
- # regular crates
- anyhow = "1.0"
- async-trait = "0.1.56"
--apt-pkg-native = "0.3.2"
- base64 = "0.13"
- bitflags = "2.4"
- bytes = "1.0"
-@@ -126,7 +123,6 @@ flate2 = "1.0"
- foreign-types = "0.3"
- futures = "0.3"
- h2 = { version = "0.4", features = [ "stream" ] }
--handlebars = "3.0"
- hex = "0.4.3"
- http = "0.2"
- hyper = { version = "0.14", features = [ "full" ] }
-@@ -162,139 +158,48 @@ xdg = "2.2"
+@@ -160,138 +158,48 @@ xdg = "2.2"
  zstd = { version = "0.12", features = [ "bindgen" ] }
  zstd-safe = "6.0"
  
@@ -55,7 +39,6 @@ index 9354fb17..d2014429 100644
 -futures.workspace = true
 -h2.workspace = true
 -hex.workspace = true
--http.workspace = true
 -hyper.workspace = true
 -libc.workspace = true
 -log.workspace = true
@@ -116,13 +99,13 @@ index 9354fb17..d2014429 100644
 -proxmox-time.workspace = true
 -proxmox-uuid.workspace = true
 -proxmox-worker-task.workspace = true
+-pbs-api-types.workspace = true
 -
 -# in their respective repo
 -proxmox-acme.workspace = true
 -pxar.workspace = true
 -
 -# proxmox-backup workspace/internal crates
--pbs-api-types.workspace = true
 -pbs-buildcfg.workspace = true
 -pbs-client.workspace = true
 -pbs-config.workspace = true
@@ -136,7 +119,9 @@ index 9354fb17..d2014429 100644
  # Local path overrides
  # NOTE: You must run `cargo update` after changing this for it to take effect!
  [patch.crates-io]
- 
+-#pbs-api-types = { path = "../proxmox/pbs-api-types" }
++pbs-api-types = { path = "../proxmox/pbs-api-types" }
+ #proxmox-acme = { path = "../proxmox/proxmox-acme" }
  #proxmox-apt = { path = "../proxmox/proxmox-apt" }
 -#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
 -#proxmox-async = { path = "../proxmox/proxmox-async" }
@@ -196,7 +181,6 @@ index 9354fb17..d2014429 100644
 +proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
 +proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
  
- #proxmox-acme = { path = "../proxmox/proxmox-acme" }
 -#pathpatterns = {path = "../pathpatterns" }
 -#pxar = { path = "../pxar" }
 +pathpatterns = {path = "../pathpatterns" }
@@ -205,5 +189,5 @@ index 9354fb17..d2014429 100644
  [features]
  default = []
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
similarity index 70%
rename from pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
rename to pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
index a052c9b7fba0..5f09aa9c95a1 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-add-target-path-fixup-variable.patch
@@ -1,7 +1,7 @@
-From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001
+From b71b5bab3fadc663d322e3ef2faa8f098423fb03 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
 Date: Tue, 24 Dec 2024 17:22:35 +0100
-Subject: [PATCH 2/3] docs: Add target path fixup variable
+Subject: [PATCH 2/5] docs: add target path fixup variable
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  1 file changed, 1 insertion(+)
 
 diff --git a/docs/Makefile b/docs/Makefile
-index 66da6037..a9939131 100644
+index c57cbbc2..fa00729e 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
-@@ -92,6 +92,7 @@ API_VIEWER_FILES :=							\
+@@ -94,6 +94,7 @@ API_VIEWER_FILES :=							\
  SPHINXOPTS    = -E
  SPHINXBUILD   = sphinx-build
  BUILDDIR      = output
@@ -21,5 +21,5 @@ index 66da6037..a9939131 100644
  ifeq ($(BUILD_MODE), release)
  COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
index 4a92350d3ebd..fdac6856b983 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch
@@ -1,7 +1,7 @@
-From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001
+From 88f8ac1e5d158ad0a46177b813fd7557cc5e3fbe Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
 Date: Tue, 24 Dec 2024 17:35:40 +0100
-Subject: [PATCH 3/3] cargo: use local patched h2 dependency
+Subject: [PATCH 3/5] cargo: use local patched h2 dependency
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  1 file changed, 2 insertions(+)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index d2014429..54f951c8 100644
+index 99d712da..091696f1 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
@@ -22,5 +22,5 @@ index d2014429..54f951c8 100644
  default = []
  #valgrind = ["valgrind_request"]
 -- 
-2.47.0
+2.49.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
new file mode 100644
index 000000000000..4db8088010d2
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0004-docs-drop-all-but-client-man-pages.patch
@@ -0,0 +1,83 @@
+From 846d0b9c8f62340cb0703c59d16414b05a15382a Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <thomas@lamprecht.org>
+Date: Tue, 29 Nov 2022 17:20:28 +0100
+Subject: [PATCH 4/5] docs: drop all but client man pages
+
+Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ docs/Makefile | 19 -------------------
+ docs/conf.py  | 24 ------------------------
+ 2 files changed, 43 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index fa00729e..53a420b5 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -1,27 +1,8 @@
+ include ../defines.mk
+ 
+ GENERATED_SYNOPSIS := 						\
+-	config/acl/roles.rst					\
+-	config/datastore/config.rst				\
+-	config/domains/config.rst				\
+-	config/media-pool/config.rst				\
+-	config/notifications-priv/config.rst			\
+-	config/notifications/config.rst				\
+-	config/remote/config.rst				\
+-	config/sync/config.rst					\
+-	config/tape-job/config.rst				\
+-	config/tape/config.rst					\
+-	config/user/config.rst					\
+-	config/verification/config.rst				\
+-	config/prune/config.rst				\
+-	pmt/synopsis.rst					\
+-	pmtx/synopsis.rst					\
+ 	proxmox-backup-client/catalog-shell-synopsis.rst 	\
+ 	proxmox-backup-client/synopsis.rst			\
+-	proxmox-backup-debug/synopsis.rst			\
+-	proxmox-backup-manager/synopsis.rst			\
+-	proxmox-file-restore/synopsis.rst			\
+-	proxmox-tape/synopsis.rst				\
+ 	pxar/synopsis.rst					\
+ 
+ MAN1_PAGES := 				\
+diff --git a/docs/conf.py b/docs/conf.py
+index a7fa1079..345a0170 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -93,31 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
+ man_pages = [
+     # CLI
+     ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
+-    ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1),
+-    ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1),
+-    ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1),
+-    ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1),
+-    ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1),
+-    ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1),
+     ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
+-    ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
+-    ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
+-    ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1),
+-    # configs
+-    ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
+-    ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
+-    ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
+-    ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
+-    ('config/node/man5', 'proxmox-backup.node.cfg', 'Proxmox Backup Server - Node Configuration', [author], 5),
+-    ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
+-    ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
+-    ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5),
+-    ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5),
+-    ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5),
+-    ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5),
+-    ('config/prune/man5', 'prune.cfg', 'Prune Job Configuration', [author], 5),
+-    ('config/notifications/man5', 'notifications.cfg', 'Notification target/matcher configuration', [author], 5),
+-    ('config/notifications-priv/man5', 'notifications-priv.cfg', 'Notification target secrets', [author], 5),
+ ]
+ 
+ 
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch
new file mode 100644
index 000000000000..535191c61d0e
--- /dev/null
+++ b/pkgs/by-name/pr/proxmox-backup-client/0005-Revert-h2-switch-to-legacy-feature.patch
@@ -0,0 +1,198 @@
+From b1a06f6a63a63410f89bd0d2968a6fdb7ce2352d Mon Sep 17 00:00:00 2001
+From: Christoph Heiss <christoph@c8h4.io>
+Date: Thu, 5 Jun 2025 12:01:10 +0200
+Subject: [PATCH 5/5] Revert "h2: switch to legacy feature"
+
+This reverts commit 168ed370263e84a6235968c615b856b9280debe1.
+
+It's a Proxmox-specific workaround (see also the commit description
+itself) and does not apply here.
+
+Signed-off-by: Christoph Heiss <christoph@c8h4.io>
+---
+ Cargo.toml                       |  2 +-
+ examples/h2client.rs             |  6 +++---
+ examples/h2s-client.rs           |  6 +++---
+ pbs-client/src/backup_writer.rs  |  8 ++++----
+ pbs-client/src/http_client.rs    | 12 +++++-------
+ pbs-client/src/pipe_to_stream.rs |  2 +-
+ 6 files changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 091696f1..063f62f8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -122,7 +122,7 @@ env_logger = "0.11"
+ flate2 = "1.0"
+ foreign-types = "0.3"
+ futures = "0.3"
+-h2 = { version = "0.4", features = [ "legacy", "stream" ] }
++h2 = { version = "0.4", features = [ "stream" ] }
+ handlebars = "3.0"
+ hex = "0.4.3"
+ hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] }
+diff --git a/examples/h2client.rs b/examples/h2client.rs
+index e44c43fa..1dcb4498 100644
+--- a/examples/h2client.rs
++++ b/examples/h2client.rs
+@@ -10,7 +10,7 @@ use tokio::net::TcpStream;
+ // Simple H2 client to test H2 download speed using h2server.rs
+ 
+ struct Process {
+-    body: h2::legacy::RecvStream,
++    body: h2::RecvStream,
+     trailers: bool,
+     bytes: usize,
+ }
+@@ -50,7 +50,7 @@ impl Future for Process {
+ }
+ 
+ fn send_request(
+-    mut client: h2::legacy::client::SendRequest<bytes::Bytes>,
++    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     println!("sending request");
+ 
+@@ -78,7 +78,7 @@ async fn run() -> Result<(), Error> {
+     let conn = TcpStream::connect(std::net::SocketAddr::from(([127, 0, 0, 1], 8008))).await?;
+     conn.set_nodelay(true).unwrap();
+ 
+-    let (client, h2) = h2::legacy::client::Builder::new()
++    let (client, h2) = h2::client::Builder::new()
+         .initial_connection_window_size(1024 * 1024 * 1024)
+         .initial_window_size(1024 * 1024 * 1024)
+         .max_frame_size(4 * 1024 * 1024)
+diff --git a/examples/h2s-client.rs b/examples/h2s-client.rs
+index 86b3a931..a12b5a48 100644
+--- a/examples/h2s-client.rs
++++ b/examples/h2s-client.rs
+@@ -10,7 +10,7 @@ use tokio::net::TcpStream;
+ // Simple H2 client to test H2 download speed using h2s-server.rs
+ 
+ struct Process {
+-    body: h2::legacy::RecvStream,
++    body: h2::RecvStream,
+     trailers: bool,
+     bytes: usize,
+ }
+@@ -50,7 +50,7 @@ impl Future for Process {
+ }
+ 
+ fn send_request(
+-    mut client: h2::legacy::client::SendRequest<bytes::Bytes>,
++    mut client: h2::client::SendRequest<bytes::Bytes>,
+ ) -> impl Future<Output = Result<usize, Error>> {
+     println!("sending request");
+ 
+@@ -94,7 +94,7 @@ async fn run() -> Result<(), Error> {
+         .await
+         .map_err(|err| format_err!("connect failed - {}", err))?;
+ 
+-    let (client, h2) = h2::legacy::client::Builder::new()
++    let (client, h2) = h2::client::Builder::new()
+         .initial_connection_window_size(1024 * 1024 * 1024)
+         .initial_window_size(1024 * 1024 * 1024)
+         .max_frame_size(4 * 1024 * 1024)
+diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs
+index 32542506..1253ef56 100644
+--- a/pbs-client/src/backup_writer.rs
++++ b/pbs-client/src/backup_writer.rs
+@@ -56,7 +56,7 @@ pub struct UploadOptions {
+ }
+ 
+ struct ChunkUploadResponse {
+-    future: h2::legacy::client::ResponseFuture,
++    future: h2::client::ResponseFuture,
+     size: usize,
+ }
+ 
+@@ -143,7 +143,7 @@ impl BackupWriter {
+         param: Option<Value>,
+         content_type: &str,
+         data: Vec<u8>,
+-    ) -> Result<h2::legacy::client::ResponseFuture, Error> {
++    ) -> Result<h2::client::ResponseFuture, Error> {
+         let request =
+             H2Client::request_builder("localhost", method, path, param, Some(content_type))
+                 .unwrap();
+@@ -514,7 +514,7 @@ impl BackupWriter {
+     }
+ 
+     fn response_queue() -> (
+-        mpsc::Sender<h2::legacy::client::ResponseFuture>,
++        mpsc::Sender<h2::client::ResponseFuture>,
+         oneshot::Receiver<Result<(), Error>>,
+     ) {
+         let (verify_queue_tx, verify_queue_rx) = mpsc::channel(100);
+@@ -537,7 +537,7 @@ impl BackupWriter {
+         tokio::spawn(
+             ReceiverStream::new(verify_queue_rx)
+                 .map(Ok::<_, Error>)
+-                .try_for_each(move |response: h2::legacy::client::ResponseFuture| {
++                .try_for_each(move |response: h2::client::ResponseFuture| {
+                     response
+                         .map_err(Error::from)
+                         .and_then(H2Client::h2api_response)
+diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs
+index c95def07..8f6f8b41 100644
+--- a/pbs-client/src/http_client.rs
++++ b/pbs-client/src/http_client.rs
+@@ -863,7 +863,7 @@ impl HttpClient {
+ 
+         let max_window_size = (1 << 31) - 2;
+ 
+-        let (h2, connection) = h2::legacy::client::Builder::new()
++        let (h2, connection) = h2::client::Builder::new()
+             .initial_connection_window_size(max_window_size)
+             .initial_window_size(max_window_size)
+             .max_frame_size(4 * 1024 * 1024)
+@@ -1008,11 +1008,11 @@ impl Drop for HttpClient {
+ 
+ #[derive(Clone)]
+ pub struct H2Client {
+-    h2: h2::legacy::client::SendRequest<bytes::Bytes>,
++    h2: h2::client::SendRequest<bytes::Bytes>,
+ }
+ 
+ impl H2Client {
+-    pub fn new(h2: h2::legacy::client::SendRequest<bytes::Bytes>) -> Self {
++    pub fn new(h2: h2::client::SendRequest<bytes::Bytes>) -> Self {
+         Self { h2 }
+     }
+ 
+@@ -1092,7 +1092,7 @@ impl H2Client {
+         &self,
+         request: Request<()>,
+         data: Option<bytes::Bytes>,
+-    ) -> impl Future<Output = Result<h2::legacy::client::ResponseFuture, Error>> {
++    ) -> impl Future<Output = Result<h2::client::ResponseFuture, Error>> {
+         self.h2
+             .clone()
+             .ready()
+@@ -1109,9 +1109,7 @@ impl H2Client {
+             })
+     }
+ 
+-    pub async fn h2api_response(
+-        response: Response<h2::legacy::RecvStream>,
+-    ) -> Result<Value, Error> {
++    pub async fn h2api_response(response: Response<h2::RecvStream>) -> Result<Value, Error> {
+         let status = response.status();
+ 
+         let (_head, mut body) = response.into_parts();
+diff --git a/pbs-client/src/pipe_to_stream.rs b/pbs-client/src/pipe_to_stream.rs
+index 3fc942d3..ae689851 100644
+--- a/pbs-client/src/pipe_to_stream.rs
++++ b/pbs-client/src/pipe_to_stream.rs
+@@ -8,7 +8,7 @@ use std::task::{Context, Poll};
+ use anyhow::{format_err, Error};
+ use bytes::Bytes;
+ use futures::{ready, Future};
+-use h2::legacy::SendStream;
++use h2::SendStream;
+ 
+ pub struct PipeToSendStream {
+     body_tx: SendStream<Bytes>,
+-- 
+2.49.0
+
diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
index f7420ac3d37e..9c10cf28e635 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
+++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -45,10 +45,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
-name = "anyhow"
-version = "1.0.95"
+name = "anstream"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+
+[[package]]
+name = "async-trait"
+version = "0.1.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "atomic-waker"
@@ -64,9 +125,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -91,23 +152,20 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.69.5"
+version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cexpr",
  "clang-sys",
  "itertools",
- "lazy_static",
- "lazycell",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.91",
- "which",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -118,9 +176,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "block-buffer"
@@ -133,21 +191,21 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.5"
+version = "1.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
 dependencies = [
  "jobserver",
  "libc",
@@ -160,7 +218,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -201,6 +259,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
 [[package]]
 name = "const_format"
 version = "0.2.34"
@@ -216,8 +280,8 @@ version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "unicode-xid 0.2.6",
 ]
 
@@ -239,9 +303,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
@@ -265,6 +329,12 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -302,22 +372,22 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "email-encoding"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc"
+checksum = "9298e6504d9b9e780ed3f7dfd43a61be8cd0e09eb07f7706a945b0072b6670b6"
 dependencies = [
  "base64 0.22.1",
  "memchr",
@@ -355,29 +425,51 @@ dependencies = [
 ]
 
 [[package]]
-name = "env_logger"
-version = "0.10.2"
+name = "enum-as-inner"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
- "humantime",
- "is-terminal",
  "log",
  "regex",
- "termcolor",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
 ]
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -406,7 +498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
- "rustix",
+ "rustix 0.38.44",
  "windows-sys 0.48.0",
 ]
 
@@ -424,9 +516,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -516,9 +608,9 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -563,13 +655,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
@@ -580,9 +684,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "h2"
@@ -605,7 +709,7 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.10"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -646,15 +750,15 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 
 [[package]]
-name = "hermit-abi"
-version = "0.4.0"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -666,23 +770,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "home"
-version = "0.5.11"
+name = "hickory-proto"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
 dependencies = [
- "windows-sys 0.59.0",
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "once_cell",
+ "rand",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "hostname"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
+checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
 dependencies = [
  "cfg-if",
  "libc",
- "windows",
+ "windows-link",
 ]
 
 [[package]]
@@ -709,9 +849,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "httpdate"
@@ -719,12 +859,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -751,21 +885,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -774,31 +909,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -806,67 +921,54 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
-]
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -880,9 +982,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -890,54 +992,92 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.13"
+name = "ipconfig"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jiff"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+dependencies = [
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
+]
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom 0.3.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -949,17 +1089,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "lettre"
-version = "0.11.11"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5"
+checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2"
 dependencies = [
  "base64 0.22.1",
  "chumsky",
@@ -972,7 +1106,7 @@ dependencies = [
  "idna",
  "mime",
  "native-tls",
- "nom",
+ "nom 8.0.0",
  "percent-encoding",
  "quoted_printable",
  "socket2",
@@ -982,18 +1116,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.53.0",
 ]
 
 [[package]]
@@ -1002,7 +1136,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "libc",
  "redox_syscall",
 ]
@@ -1018,22 +1152,53 @@ dependencies = [
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
+name = "linked-hash-map"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
 
 [[package]]
 name = "memchr"
@@ -1073,29 +1238,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "wasi",
- "windows-sys 0.52.0",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -1153,6 +1318,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1174,17 +1348,23 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1199,22 +1379,22 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -1228,6 +1408,29 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "pathpatterns"
 version = "0.3.0"
@@ -1238,7 +1441,7 @@ dependencies = [
 
 [[package]]
 name = "pbs-api-types"
-version = "0.1.0"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1259,19 +1462,19 @@ dependencies = [
 
 [[package]]
 name = "pbs-buildcfg"
-version = "3.3.2"
+version = "3.4.2"
 
 [[package]]
 name = "pbs-client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures",
- "h2 0.4.7",
+ "h2 0.4.10",
  "hex",
- "http",
+ "hickory-resolver",
  "hyper",
  "libc",
  "nix 0.26.4",
@@ -1324,6 +1527,7 @@ dependencies = [
  "proxmox-shared-memory",
  "proxmox-sys",
  "proxmox-time",
+ "proxmox-uuid",
  "regex",
  "serde",
  "serde_json",
@@ -1335,6 +1539,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
+ "const_format",
  "crc32fast",
  "endian_trait",
  "futures",
@@ -1356,10 +1561,12 @@ dependencies = [
  "proxmox-schema",
  "proxmox-serde",
  "proxmox-sys",
+ "proxmox-systemd",
  "proxmox-time",
  "proxmox-uuid",
  "proxmox-worker-task",
  "pxar",
+ "regex",
  "serde",
  "serde_json",
  "tokio",
@@ -1423,7 +1630,7 @@ name = "pbs-tape"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "endian_trait",
  "hex",
  "libc",
@@ -1457,7 +1664,7 @@ dependencies = [
  "foreign-types",
  "hex",
  "libc",
- "nom",
+ "nom 7.1.3",
  "openssl",
  "proxmox-async",
  "proxmox-human-byte",
@@ -1476,20 +1683,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
 dependencies = [
  "memchr",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1497,22 +1704,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.15"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0"
 dependencies = [
  "once_cell",
  "pest",
@@ -1521,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1533,9 +1740,42 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -1548,26 +1788,26 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proxmox-api-macro"
-version = "1.2.1"
+version = "1.3.3"
 dependencies = [
  "anyhow",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "proxmox-apt-api-types"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "proxmox-config-digest",
  "proxmox-schema",
@@ -1589,7 +1829,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-auth-api"
-version = "0.4.6"
+version = "0.4.8"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1601,7 +1841,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-backup"
-version = "3.3.2"
+version = "3.4.2"
 
 [[package]]
 name = "proxmox-backup-banner"
@@ -1676,7 +1916,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-config-digest"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "hex",
@@ -1699,7 +1939,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-http"
-version = "0.9.4"
+version = "0.9.5"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1715,6 +1955,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-openssl",
+ "tower-service",
  "ureq",
  "url",
 ]
@@ -1730,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-human-byte"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "proxmox-schema",
@@ -1752,7 +1993,7 @@ version = "1.4.0"
 
 [[package]]
 name = "proxmox-log"
-version = "0.2.7"
+version = "0.2.9"
 dependencies = [
  "anyhow",
  "nix 0.26.4",
@@ -1767,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-notify"
-version = "0.5.1"
+version = "0.5.5"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1795,7 +2036,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-router"
-version = "3.0.0"
+version = "3.1.1"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -1812,12 +2053,12 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_plain",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "proxmox-schema"
-version = "3.2.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "const_format",
@@ -1830,7 +2071,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-section-config"
-version = "2.1.1"
+version = "3.0.0"
 dependencies = [
  "anyhow",
  "hex",
@@ -1875,14 +2116,14 @@ dependencies = [
 name = "proxmox-sortable-macro"
 version = "0.1.3"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "proxmox-sys"
-version = "0.6.5"
+version = "0.6.7"
 dependencies = [
  "anyhow",
  "libc",
@@ -1905,13 +2146,13 @@ dependencies = [
 
 [[package]]
 name = "proxmox-time"
-version = "2.0.3"
+version = "2.0.4"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "js-sys",
  "libc",
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -1931,9 +2172,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
+checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
 dependencies = [
  "cc",
 ]
@@ -1987,11 +2228,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
- "proc-macro2 1.0.92",
+ "proc-macro2 1.0.95",
 ]
 
 [[package]]
@@ -2000,6 +2241,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -2011,12 +2258,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.5.8"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "bitflags 2.6.0",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+dependencies = [
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -2025,7 +2302,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.16",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -2059,6 +2336,12 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -2067,20 +2350,33 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+dependencies = [
+ "bitflags 2.9.1",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.4",
  "windows-sys 0.59.0",
 ]
 
@@ -2108,9 +2404,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustyline"
@@ -2131,16 +2430,16 @@ dependencies = [
  "scopeguard",
  "smallvec",
  "unicode-segmentation",
- "unicode-width",
+ "unicode-width 0.1.14",
  "utf8parse",
  "winapi",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -2172,7 +2471,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2181,9 +2480,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2191,29 +2490,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -2232,9 +2531,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2258,9 +2557,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -2282,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "smawk"
@@ -2294,9 +2593,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2310,9 +2609,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.17"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
+checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
 dependencies = [
  "cc",
  "cfg-if",
@@ -2340,31 +2639,31 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.91"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
  "unicode-ident",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "tar"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
 dependencies = [
  "filetime",
  "libc",
@@ -2373,35 +2672,26 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
- "cfg-if",
  "fastrand",
+ "getrandom 0.3.3",
  "once_cell",
- "rustix",
+ "rustix 1.0.7",
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -2415,11 +2705,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.9"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.9",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -2428,20 +2718,20 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.9"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2456,19 +2746,34 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
 ]
 
 [[package]]
-name = "tokio"
-version = "1.42.0"
+name = "tinyvec"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2483,13 +2788,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2516,9 +2821,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2550,9 +2855,9 @@ version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -2609,9 +2914,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
 name = "ucd-trie"
@@ -2631,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-linebreak"
@@ -2653,6 +2958,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -2690,12 +3001,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -2710,9 +3015,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "vcpkg"
@@ -2752,10 +3057,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2764,58 +3078,55 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
- "quote 1.0.37",
+ "quote 1.0.40",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
-name = "which"
-version = "4.4.2"
+name = "widestring"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
 
 [[package]]
 name = "winapi"
@@ -2849,23 +3160,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.52.0"
+name = "windows-link"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
 [[package]]
 name = "windows-sys"
@@ -2918,13 +3216,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -2937,6 +3251,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -2949,6 +3269,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -2961,12 +3287,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -2979,6 +3317,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -2991,6 +3335,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -3003,6 +3353,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -3016,26 +3372,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "write16"
-version = "1.0.0"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.1",
+]
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "xattr"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
 dependencies = [
  "libc",
- "linux-raw-sys",
- "rustix",
+ "rustix 1.0.7",
 ]
 
 [[package]]
@@ -3046,9 +3420,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -3058,62 +3432,79 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
  "synstructure",
 ]
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zeroize"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3122,13 +3513,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
- "proc-macro2 1.0.92",
- "quote 1.0.37",
- "syn 2.0.91",
+ "proc-macro2 1.0.95",
+ "quote 1.0.40",
+ "syn 2.0.101",
 ]
 
 [[package]]
@@ -3152,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "bindgen",
  "cc",
diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
index 833f668aacf5..e19b41c293c6 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/package.nix
+++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix
@@ -21,20 +21,20 @@
 
 let
   pname = "proxmox-backup-client";
-  version = "3.3.2";
+  version = "3.4.2";
 
   proxmox-backup_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox-backup.git";
-    tag = "v${version}";
+    rev = "37f1949335cad801f7cdaa0173cc114590a37e4e";
     name = "proxmox-backup";
-    hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y=";
+    hash = "sha256-OW6GG/4IcEw8XOSSB5EoN+jyoOaL0ZtavJahnKOuAqI=";
   };
 
   proxmox_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox.git";
-    rev = "df6b705f564ff145faa14770db6493bc5da8cab3";
+    rev = "e47fdf411be61b15382bc3baa3064f1e7cb03fa2";
     name = "proxmox";
-    hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg=";
+    hash = "sha256-jSU00D75sx40VS8rgF+D6h120FMaD1Jfq4e8l+8D5BQ=";
   };
 
   proxmox-fuse_src = fetchgit {
@@ -63,11 +63,9 @@ let
     name = "h2";
     owner = "hyperium";
     repo = "h2";
-    rev = "v0.4.7";
-    hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k=";
+    rev = "v0.4.10";
+    hash = "sha256-PasHCbU466ByHIbDQpMMgzjg2dMRveOButHeVSknSEQ=";
   };
-
-  aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee";
 in
 
 rustPlatform.buildRustPackage {
@@ -85,7 +83,7 @@ rustPlatform.buildRustPackage {
   sourceRoot = proxmox-backup_src.name;
 
   # These patches are essentially un-upstreamable, due to being "workarounds" related to the
-  # project structure.
+  # project structure and upstream/Debian-specific packaging.
   cargoPatches = [
     # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or
     # Debian packages). This patch redirects all these dependencies to a local, relative path, which
@@ -94,17 +92,16 @@ rustPlatform.buildRustPackage {
     # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due
     # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`.
     # This patch simply fixes that up.
-    ./0002-docs-Add-target-path-fixup-variable.patch
+    ./0002-docs-add-target-path-fixup-variable.patch
     # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch).
     # This overrides it in the Cargo.toml as needed.
     ./0003-cargo-use-local-patched-h2-dependency.patch
     # This patch prevents the generation of the man-pages for other components inside the repo,
     # which would require them too be built too. Thus avoid wasting resources and just skip them.
-    (fetchpatch {
-      name = "0002-docs-drop-all-but-client-man-pages.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}";
-      hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24=";
-    })
+    ./0004-docs-drop-all-but-client-man-pages.patch
+    # Upstream uses a patched version of the h2 crate (see [0]), which does not apply here.
+    # [0] https://git.proxmox.com/?p=debcargo-conf.git;a=blob;f=src/h2/debian/patches/add-legacy.patch;h=0913da317
+    ./0005-Revert-h2-switch-to-legacy-feature.patch
   ];
 
   postPatch = ''

From 187fe567f64923ab5508ff58db638f37e7bd9b8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:23:26 +0000
Subject: [PATCH 1184/1497] pm2: 6.0.6 -> 6.0.8

---
 pkgs/by-name/pm/pm2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix
index 731c0c8b0561..a4c66208e2c9 100644
--- a/pkgs/by-name/pm/pm2/package.nix
+++ b/pkgs/by-name/pm/pm2/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "pm2";
-  version = "6.0.6";
+  version = "6.0.8";
 
   src = fetchFromGitHub {
     owner = "Unitech";
     repo = "pm2";
     rev = "v${version}";
-    hash = "sha256-ji6IOlPSEj+qpSusF3OX056KuZDL3JjvaTNT/UQTiqA=";
+    hash = "sha256-roSHLJsDeNAa9z9O/hgy9P4ho5zeLz1+w0a8U0Ix2ao=";
 
     # Requested patch upstream: https://github.com/Unitech/pm2/pull/5985
     postFetch = ''
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-b+SSal4eNruQOMNAFoLLJdzfFhz1T3EieDv4kTwwA1Y=";
+  npmDepsHash = "sha256-6xUGO1vrzU5pi33ZaiRB6L5gY8p7ES93effyGdhsV5o=";
 
   dontNpmBuild = true;
 

From 6b3fffa698d4d42fa83262647dbc34d09a48e86e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:36:07 +0000
Subject: [PATCH 1185/1497] python3Packages.sagemaker-core: 1.0.34 -> 1.0.36

---
 pkgs/development/python-modules/sagemaker-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 1660a2b56389..f2f987261b15 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.34";
+  version = "1.0.36";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-ZkV4SfJS+3otrzYFZH7lt/tBsFTbfss9Yt7OKgl3fSQ=";
+    hash = "sha256-3nsBzpkreyavjZoyA96DWK9lV9YrOB6SyrpLFqX4ZP8=";
   };
 
   build-system = [

From 1ecc3eb32e391ec6f3764f1f18cd771e4836511c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 10:55:39 +0000
Subject: [PATCH 1186/1497] vscode-extensions.coder.coder-remote: 1.9.0 ->
 1.9.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..3bc677bdf632 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1018,8 +1018,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.9.0";
-          hash = "sha256-34Qu6BOQIbTsPeIGCp8Lcsz+FoDrP36PuYpX/4mqpvw=";
+          version = "1.9.1";
+          hash = "sha256-Fsh95lMNliag5TV5MWSAs4Z3npj74mrCmaLSztbpH0I=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";

From 262ceea379765a7f9ea0ef0bfc4500e04b7c6e3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:01:21 +0000
Subject: [PATCH 1187/1497] 
 vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 0.14.0 -> 0.14.3

---
 .../ms-windows-ai-studio.windows-ai-studio/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 5a0f77583f56..91b52c9f4065 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "0.14.0";
-    hash = "sha256-qfEPvDHYjFWT+NMN6jlouRljtTflKOqn2wHL83tnUi0=";
+    version = "0.14.3";
+    hash = "sha256-0wXgHr5M/HEMFgZFQlwJ/WDJLJG+o0cPj4cxiQuTFE8=";
   };
 
   meta = {

From 1ea9874c9e4dafddf6ecc8c194ed6e79b26cc718 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:04:33 +0000
Subject: [PATCH 1188/1497] google-play: 1.7.4 -> 1.7.5

---
 pkgs/by-name/go/google-play/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-play/package.nix b/pkgs/by-name/go/google-play/package.nix
index 1077cb5bfda4..ea2d659147b4 100644
--- a/pkgs/by-name/go/google-play/package.nix
+++ b/pkgs/by-name/go/google-play/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "google-play";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "UlyssesZh";
     repo = "google-play";
     tag = "v${version}";
-    hash = "sha256-Qv79fM59AQ+Y0OfWXKW1Jub07J5net3pP8ANm7CtB6A=";
+    hash = "sha256-CmNBE3SJhDyY77mjC56pl0aiyt4ZW6pEYTtOK3FXGhE=";
   };
 
   subPackages = [
@@ -21,7 +21,7 @@ buildGoModule rec {
     "internal/badging"
   ];
 
-  vendorHash = "sha256-+n08a22VEHjKUyk/XxTXBu9yYggSgIxCFx8PFtA2OCc=";
+  vendorHash = "sha256-q0p9+74qUSY2AAnagtM6d6PPEhM1HHF019QWxTemiIo=";
 
   passthru.updateScript = nix-update-script { };
 

From ed2cbd0d154e008fe4647f5181a7bf548909e85f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:06:54 +0000
Subject: [PATCH 1189/1497] vscode-extensions.davidanson.vscode-markdownlint:
 0.59.0 -> 0.60.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..471d651f2a36 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1279,8 +1279,8 @@ let
         mktplcRef = {
           name = "vscode-markdownlint";
           publisher = "DavidAnson";
-          version = "0.59.0";
-          hash = "sha256-zbK7kRa9k5xIM7BcwMOT1pRO7637eMUCUzgQwnpBCvI=";
+          version = "0.60.0";
+          hash = "sha256-Buwa63HahT96qhhuvARW7p1u9kbkoEyA9usoh60m3KE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";

From 25936d2e9d2d0624a828157423bdf48fec31eb53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:17:23 +0000
Subject: [PATCH 1190/1497] vscode-extensions.unifiedjs.vscode-mdx: 1.8.14 ->
 1.8.15

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..3d2495d5e7cd 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5017,8 +5017,8 @@ let
         mktplcRef = {
           name = "vscode-mdx";
           publisher = "unifiedjs";
-          version = "1.8.14";
-          hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM=";
+          version = "1.8.15";
+          hash = "sha256-n2aWgvhSaU7TU45yeIUU8OmIMOAVYYB500jxrChPeA4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";

From 6c76fd5f512e3225ecff578ded7cbe74347253cc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Jun 2025 14:46:22 +0200
Subject: [PATCH 1191/1497] sane-backends: more accurate systemd support check

As opposed to conditioning it on isLinux.
---
 pkgs/applications/graphics/sane/backends/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 2777e107511a..da5ebb101fc2 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -18,6 +18,7 @@
   net-snmp,
   curl,
   systemd,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   libxml2,
   poppler,
   gawk,
@@ -111,6 +112,8 @@ stdenv.mkDerivation rec {
       libieee1284
       libv4l
       net-snmp
+    ]
+    ++ lib.optionals withSystemd [
       systemd
     ];
 

From ea0eb51409d2bd7dd2876850c158125a05672650 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:37:30 +0000
Subject: [PATCH 1192/1497] vscode-extensions.wakatime.vscode-wakatime: 25.0.3
 -> 25.0.4

---
 .../vscode/extensions/WakaTime.vscode-wakatime/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
index 296b3366339c..9e627cf34681 100644
--- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
@@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-wakatime";
     publisher = "WakaTime";
-    version = "25.0.3";
-    hash = "sha256-rD2Uzzt8xfkfgM+Y0NLe7lthfxinv1Zatpr56OjfABM=";
+    version = "25.0.4";
+    hash = "sha256-J+H/PShsOGwt0AZExLApXLl86XQdZbE5cPS9v4gOXWc=";
   };
 
   meta = {

From f8f584f3a96706303120a1098d7415528056b2bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:38:50 +0000
Subject: [PATCH 1193/1497] vscode-extensions.waderyan.gitblame: 11.1.2 ->
 11.1.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..72bf8c311dc8 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5369,8 +5369,8 @@ let
         mktplcRef = {
           name = "gitblame";
           publisher = "waderyan";
-          version = "11.1.2";
-          sha256 = "sha256-TlvMyFmtJQtpsjbdh3bPiRaMHro0M7gKOgtGc2bQLN4=";
+          version = "11.1.3";
+          sha256 = "sha256-r+fmb382hzxD7frrsNZTJk6uPahO7QBfKTJWA0ObWFI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";

From 9439ec8ec0100645239e014b7ba86657a53435b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:41:42 +0000
Subject: [PATCH 1194/1497] vscode-extensions.danielsanmedium.dscodegpt:
 3.12.38 -> 3.12.39

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..749c683c53de 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1210,8 +1210,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.12.38";
-          hash = "sha256-+9OsFH586I8/P7WzadRHS9tX22/bxOByJB2LDSqp2Nk=";
+          version = "3.12.39";
+          hash = "sha256-CShqaG3P6b9JdAtbqFyGn7RGZX8ov98sYJiBy9RCXnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From 273b2638ea7d91f46b4897525649859699a0f9d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:42:29 +0000
Subject: [PATCH 1195/1497] vscode-extensions.bradlc.vscode-tailwindcss:
 0.14.19 -> 0.14.20

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..605e3165e3a7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -786,8 +786,8 @@ let
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.19";
-          hash = "sha256-HgrUTrYHJNC8tS8qZza98Tr3T0O0NMb7DgddNf3m7XY=";
+          version = "0.14.20";
+          hash = "sha256-Q45o7UAqyPuSMI02BOyXHzD5eqOJLYcYGnwA+eppEj4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";

From 976e324947d107638a4309f17f83c8b3809256dc Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 5 Jun 2025 13:54:23 +0200
Subject: [PATCH 1196/1497] Revert "level-zero: 1.21.9 -> 1.22.3"

---
 pkgs/by-name/le/level-zero/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 214052fae46f..489c12d049e9 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.22.3";
+  version = "1.21.9";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     tag = "v${version}";
-    hash = "sha256-yCrfaAoxvsDngfayw13/HqL4RW/gC+eRls6WgIELWHE=";
+    hash = "sha256-I9jCS4ZDEfOH/2kgIgeNne96Z5YZdzsmUGXza8PmXZI=";
   };
 
   nativeBuildInputs = [

From dbe80b1e2b29d183e556857da12c8a07ba2f959a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 11:55:18 +0000
Subject: [PATCH 1197/1497] vscode-extensions.jdinhlife.gruvbox: 1.26.0 ->
 1.28.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..3282c272fc5d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2619,8 +2619,8 @@ let
         mktplcRef = {
           name = "gruvbox";
           publisher = "jdinhlife";
-          version = "1.26.0";
-          hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI=";
+          version = "1.28.0";
+          hash = "sha256-XwQzbbZU6MfYcT50/0YgQp8UaOeQskEvEQPZXG72lLk=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog";

From 6b6a7806b07a4b5aa93d0ebf77e19a40d9aeed49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 12:00:13 +0000
Subject: [PATCH 1198/1497] 
 vscode-extensions.ms-dotnettools.vscode-dotnet-runtime: 2.3.3 -> 2.3.5

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..cf52526da0d7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3284,8 +3284,8 @@ let
         mktplcRef = {
           name = "vscode-dotnet-runtime";
           publisher = "ms-dotnettools";
-          version = "2.3.3";
-          hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24=";
+          version = "2.3.5";
+          hash = "sha256-Hik1BNhvcCs/IzqSvc2dPu3v6PhCZSqovFH4ODVJMnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";

From 79f10f152cdb33b22ba88eb0a2e0c9bae15d551a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Jun 2025 14:12:26 +0200
Subject: [PATCH 1199/1497] nextcloud-client: 3.16.4 -> 3.16.5

Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.16.5
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index dcf4d86a9f70..1f32c3a48dc8 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.16.4";
+  version = "3.16.5";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-8P73YitjuU9SGDBNimqJsvSfGOE9lNCVUNN3f4KXWSY=";
+    hash = "sha256-Xul3NGHResU/ZGP/C7v2bnhcxqGn3CjwjwnaPVmUhfM=";
   };
 
   patches = [

From e9e3ad892fae8e7b6972a58c7ed85aa5b72d6417 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 12:17:21 +0000
Subject: [PATCH 1200/1497] vscode-extensions.stylelint.vscode-stylelint: 1.5.0
 -> 1.5.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c84c7e57aaf9..7a256dd85937 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4615,8 +4615,8 @@ let
         mktplcRef = {
           name = "vscode-stylelint";
           publisher = "stylelint";
-          version = "1.5.0";
-          hash = "sha256-SHUb7+eL0PWlw/KUidXPvE5+MFsJz1Fi7Csptiw8j4M=";
+          version = "1.5.1";
+          hash = "sha256-Sbp2zy/6PcsMlUPe94spm3JrWxBYHfd7py3f4rb+0G4=";
         };
         meta = {
           description = "Official Stylelint extension for Visual Studio Code";

From 16727d7e067fe72c44014859c6d16f72579ba374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 12:21:01 +0000
Subject: [PATCH 1201/1497] rime-wanxiang: 6.8.7 -> 7.0.5

---
 pkgs/by-name/ri/rime-wanxiang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index a0b08f99b4df..82acdf809bcd 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "6.8.7";
+  version = "7.0.5";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-t3A79jvNxroq+aeHwwc24rvzPDJbKxkOgrb9mgdN340=";
+    hash = "sha256-We1MuK9lLrIBRXQODrk91Xe0aWskwsiOZvxCh/oCdeU=";
   };
 
   nativeBuildInputs = [

From 0441253311e751093eafdb5e151fb8ecb1402161 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 5 Jun 2025 14:27:36 +0200
Subject: [PATCH 1202/1497] vscode-extensions.robocorp.robotframework-lsp: init
 at 1.13.0

---
 pkgs/applications/editors/vscode/extensions/default.nix         | 2 ++
 .../vscode/extensions/robocorp.robotframework-lsp/default.nix   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3bc677bdf632..9976a987cbe4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4101,6 +4101,8 @@ let
         };
       };
 
+      robocorp.robotframework-lsp = callPackage ./robocorp.robotframework-lsp { };
+
       roman.ayu-next = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "ayu-next";
diff --git a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
index 9770195611d0..353b353d22ed 100644
--- a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
@@ -7,7 +7,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "robotframework-lsp";
     publisher = "robocorp";
     version = "1.13.0";
-    hash = "";
+    hash = "sha256-3hyKKAMUy4kXGRWBQCL4adV1W6xtgS1OYhJJYSzswbo=";
   };
 
   meta = {

From 25a38ebfb0b41519e6755f73063d316caec381cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 5 Jun 2025 14:28:53 +0200
Subject: [PATCH 1203/1497] appimageTools: Drop gtk2

Should work since it's not in the linked excludelist anymore: https://github.com/AppImageCommunity/pkg2appimage/blob/master/excludelist
Ref: https://github.com/NixOS/nixpkgs/issues/410814

Tested by running `joplin-desktop`
---
 pkgs/build-support/appimage/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 9d72bfe6ed98..2faf818d24ea 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -149,7 +149,6 @@ rec {
         xorg.libpciaccess
 
         glib
-        gtk2
         bzip2
         zlib
         gdk-pixbuf
@@ -218,7 +217,6 @@ rec {
         speex
         SDL2_ttf
         SDL2_mixer
-        libappindicator-gtk2
         libcaca
         libcanberra
         libgcrypt

From 4a2a4193f9f3ad4e62c89a448a79a83ac876fca4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Jun 2025 17:48:19 +0200
Subject: [PATCH 1204/1497] nixos/nginx: fix type of mapHashBucketSize

While the default is indeed 32/64/128, the option accepts any `size`[1]
including values >128, as observed in a customer project.

[1] https://nginx.org/en/docs/http/ngx_http_map_module.html
---
 nixos/modules/services/web-servers/nginx/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index bf658564515c..cd4f404a58ee 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1002,17 +1002,14 @@ in
       };
 
       mapHashBucketSize = mkOption {
-        type = types.nullOr (
-          types.enum [
-            32
-            64
-            128
-          ]
-        );
+        type = types.nullOr (types.ints.positive);
         default = null;
         description = ''
           Sets the bucket size for the map variables hash tables. Default
           value depends on the processor’s cache line size.
+
+          Refer to [the nginx docs on hashes](https://nginx.org/en/docs/hash.html)
+          for more information.
         '';
       };
 

From 154cedf1f454aeabafc9f443b18f3701722c5607 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 2 Jun 2025 20:35:17 -0700
Subject: [PATCH 1205/1497] llvmPackages_git: 21.0.0-unstable-2025-05-25 ->
 21.0.0-unstable-2025-06-06

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0b04e572e881..1762da6b16a8 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
-      rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
-      rev-version = "21.0.0-unstable-2025-05-25";
-      sha256 = "sha256-n8WFnYNb46kK7MEh7XF/Psdbn+KJQFKs/LQBZxCklY4=";
+      rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
+      rev-version = "21.0.0-unstable-2025-06-06";
+      sha256 = "sha256-OtIRNU+AuUaPhAsd0Kn0odAdPJhkV/139+DR6Ls0XrE=";
     };
   } // llvmVersions;
 

From 2648e3fbf8a07529443ecfc84650d4788652283a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 30 May 2025 14:53:16 +0200
Subject: [PATCH 1206/1497] dhcpcd: fix static

I've stuck with checking isLinux rather than availableOn, because I
think that even if we ended up with libudev-devd on FreeBSD, we still
wouldn't want to use it in this package when it has its own FreeBSD
support.
---
 pkgs/by-name/dh/dhcpcd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/dh/dhcpcd/package.nix b/pkgs/by-name/dh/dhcpcd/package.nix
index b6b814248050..27a290c8284f 100644
--- a/pkgs/by-name/dh/dhcpcd/package.nix
+++ b/pkgs/by-name/dh/dhcpcd/package.nix
@@ -8,6 +8,8 @@
   runtimeShellPackage,
   runtimeShell,
   nixosTests,
+  # Always tries to do dynamic linking for udev.
+  withUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
   enablePrivSep ? false,
 }:
 
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
     [
       runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ++ lib.optionals withUdev [
       udev
     ]
     ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
@@ -58,9 +60,7 @@ stdenv.mkDerivation rec {
   ];
 
   # Check that the udev plugin got built.
-  postInstall = lib.optionalString (
-    udev != null && stdenv.hostPlatform.isLinux
-  ) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
+  postInstall = lib.optionalString withUdev "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
 
   passthru.tests = {
     inherit (nixosTests.networking.scripted)

From 27145333ab14bd6a7955272fb0b386905b130773 Mon Sep 17 00:00:00 2001
From: Jez Cope <j.cope@erambler.co.uk>
Date: Wed, 4 Jun 2025 13:52:03 +0100
Subject: [PATCH 1207/1497] python3Packages.bagit: 1.8.1 -> 1.9b2

---
 pkgs/development/python-modules/bagit/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix
index 6742f35877c4..28e4bb4b41ab 100644
--- a/pkgs/development/python-modules/bagit/default.nix
+++ b/pkgs/development/python-modules/bagit/default.nix
@@ -5,24 +5,28 @@
   gettext,
   mock,
   pytestCheckHook,
+  setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "bagit";
-  version = "1.8.1";
-  format = "setuptools";
+  version = "1.9b2";
+  pyproject = true;
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   src = fetchFromGitHub {
     owner = "LibraryOfCongress";
     repo = "bagit-python";
     rev = "v${version}";
-    hash = "sha256-t01P7MPWgOrktuW2zF0TIzt6u/jkLmrpD2OnqawhJaI=";
+    hash = "sha256-IkRMsCrtX8nS0nrxs5B9csMq1YrI75QLDuT8eTPILkw=";
   };
 
   nativeBuildInputs = [
     gettext
-    setuptools-scm
   ];
 
   nativeCheckInputs = [

From cf5377c60743cbeb7e3098206e1d0f77d4925a32 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Thu, 5 Jun 2025 15:07:58 +0200
Subject: [PATCH 1208/1497] Revert "stalwart-mail: build against system
 jemalloc"

---
 pkgs/by-name/st/stalwart-mail/package.nix | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index 6aa5c143921e..f60bc10cfe64 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -9,7 +9,6 @@
   sqlite,
   foundationdb,
   zstd,
-  rust-jemalloc-sys-unprefixed,
   stdenv,
   nix-update-script,
   nixosTests,
@@ -19,9 +18,6 @@
   stalwartEnterprise ? false,
 }:
 
-let
-  rocksdbJemalloc = rocksdb.override { enableJemalloc = true; };
-in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
   version = "0.12.2";
@@ -33,17 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-P19jeEzFE8Gu6hqHZJiPoJ70r+zOmzOpEwfFqPQczZY=";
   };
 
-  # rocksdb does not properly distinguish between pointers it has allocated itself
-  # and pointers which were passed in and might be registered with a different
-  # allocator, so we enable the unprefixed_malloc_on_supported_platforms to use
-  # jemalloc implicitly in the entire process.
-  postPatch = ''
-    for file in crates/main/Cargo.toml tests/Cargo.toml; do
-      substituteInPlace $file --replace-fail \
-        'jemallocator = "0.5.0"' 'jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }'
-    done
-  '';
-
   useFetchCargoVendor = true;
   cargoHash = "sha256-WVvDapCA9pTgOtPpbsK78u2AC2hUfo3sOejZ6pJSlQk=";
 
@@ -58,8 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     openssl
     sqlite
     zstd
-    rust-jemalloc-sys-unprefixed
-    rocksdbJemalloc
   ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
   # Issue: https://github.com/stalwartlabs/stalwart/issues/1104
@@ -80,8 +63,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env = {
     OPENSSL_NO_VENDOR = true;
     ZSTD_SYS_USE_PKG_CONFIG = true;
-    ROCKSDB_INCLUDE_DIR = "${rocksdbJemalloc}/include";
-    ROCKSDB_LIB_DIR = "${rocksdbJemalloc}/lib";
+    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
+    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
   };
 
   postInstall = ''
@@ -172,7 +155,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   passthru = {
-    rocksdb = rocksdbJemalloc; # make used rocksdb version available (e.g., for backup scripts)
+    inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
     webadmin = callPackage ./webadmin.nix { };
     updateScript = nix-update-script { };
     tests.stalwart-mail = nixosTests.stalwart-mail;

From cb66d794e26eefb2a6a66bb760ef1befdf6b69a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 14:16:47 +0000
Subject: [PATCH 1209/1497] kube-bench: 0.10.6 -> 0.10.7

---
 pkgs/by-name/ku/kube-bench/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index 331295e9d383..d7b6b371184e 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "kube-bench";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "kube-bench";
     tag = "v${version}";
-    hash = "sha256-+4OSqFU9IoVN9lsw6CwVL60OU4e/yCBZfnD8qqNLTtk=";
+    hash = "sha256-5QY7rDFv6UV5qIdgKUGkb1DYZYid3POgEzPwSPKtHDU=";
   };
 
-  vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo=";
+  vendorHash = "sha256-fmhlqPizAIVVzJAIHfY2gtCpJZY5Sx1Uih/7m7YEM98=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 3a810fc6323e94cd77cb280b541142fd47fc6e32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 14:31:01 +0000
Subject: [PATCH 1210/1497] crowdin-cli: 4.7.0 -> 4.7.1

---
 pkgs/by-name/cr/crowdin-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index 50f6e0bdec7e..1133887b2671 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-PAmWjFKaiazw+tW3ITekkmMnNCB/fHYM0X/n8ef6jWE=";
+    hash = "sha256-Go1/oz0FF8BhjADkjqjfcoQX5wRBS/9Z9m//pBvTJz8=";
   };
 
   nativeBuildInputs = [

From 344c7d7994ab82c7a7d4c842afd6ca86fd870c81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 14:34:21 +0000
Subject: [PATCH 1211/1497] eksctl: 0.208.0 -> 0.209.0

---
 pkgs/by-name/ek/eksctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 3515d43f81a0..32643f1bf2eb 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.208.0";
+  version = "0.209.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "eksctl";
     rev = version;
-    hash = "sha256-lRRB6yAELCNzXWiuxaEHTwlTG7/x3AC97ZnaEtJ3AVs=";
+    hash = "sha256-iyxO/KMVxSbf/1WijVg0+56BKdyG7gBsfNouyVNMDIA=";
   };
 
-  vendorHash = "sha256-7aV+BJDudRpqpNk0ve2u7/GHCswMvw07yKrdnnvfO6M=";
+  vendorHash = "sha256-vhYexIdkn8Y5U5YZewj/O8sJCt/VimZU4E4kn0/1lU4=";
 
   doCheck = false;
 

From 0ad7514a44be58877d5d09953790988b0c19a05f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jun 2025 17:36:54 +0300
Subject: [PATCH 1212/1497] kdePackages: Gear 25.04.1 -> 25.04.2

---
 pkgs/kde/generated/sources/gear.json | 1500 +++++++++++++-------------
 1 file changed, 750 insertions(+), 750 deletions(-)

diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 61c58d81b9b7..63cd4ff5e2c4 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1252 +1,1252 @@
 {
   "accessibility-inspector": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/accessibility-inspector-25.04.1.tar.xz",
-    "hash": "sha256-l66J7x3pofI4OH5aoEfnuItcidKDIdzkAG3aN9Vese4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/accessibility-inspector-25.04.2.tar.xz",
+    "hash": "sha256-UI4+SfIwU6d3DgjGMgviG7LSH4h1kJghHhWBMjLQoF4="
   },
   "akonadi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-25.04.1.tar.xz",
-    "hash": "sha256-6bseirGeJDtnTFHZuQcyCAhz2dNdYgHITwuCHmL4rA4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-25.04.2.tar.xz",
+    "hash": "sha256-xGiaboDU+LdE4xRZ52jZdwRMvTuPtC0U7Rz357rK5S0="
   },
   "akonadi-calendar": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-calendar-25.04.1.tar.xz",
-    "hash": "sha256-gyMRzH0HsUmW3Vd5s5x5k/LuMEqojxIxd1xCKPcK5e0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-25.04.2.tar.xz",
+    "hash": "sha256-KPG53xqhpWYLuTJjcAbO5aYhH1FLKsUjbOhgplyQKIQ="
   },
   "akonadi-calendar-tools": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-calendar-tools-25.04.1.tar.xz",
-    "hash": "sha256-vTmAcDRRKZzpLy5xswAQdA+ihGzMaVG/IBeYxr398I4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-calendar-tools-25.04.2.tar.xz",
+    "hash": "sha256-Cv6rmPGvnoerYYDfde8Rnqjy1Fo4cKLMBraM7cQm/34="
   },
   "akonadi-contacts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-contacts-25.04.1.tar.xz",
-    "hash": "sha256-ODhuGwd/itiWt5CDwroMcFWJINhspt3EWpaoiJx3F9s="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-contacts-25.04.2.tar.xz",
+    "hash": "sha256-vo8bRbvP1+95+0st80qeC46HQvrxlaiznAXH7g5jcE0="
   },
   "akonadi-import-wizard": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-import-wizard-25.04.1.tar.xz",
-    "hash": "sha256-FGLChbfnyWtEbnP6KFWkYCiMI4h5K6BGa0Lp3ARR+gg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-import-wizard-25.04.2.tar.xz",
+    "hash": "sha256-EFBCZ5MCRK09QJ+20BkUVhMejLUYF0sFOAGmzJrvegE="
   },
   "akonadi-mime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-mime-25.04.1.tar.xz",
-    "hash": "sha256-k04RZvBw2SYve/LuVbECszJMNJvphkNRIpc+S8pIj9I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-mime-25.04.2.tar.xz",
+    "hash": "sha256-2x5PkQXO5qr67x1cr1q8mSborRqLYDidEyGmSLzRYWg="
   },
   "akonadi-search": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadi-search-25.04.1.tar.xz",
-    "hash": "sha256-a8mAcgTyTnCRSknp5hCHadm2ClTdwRlZNjS4c4tZbkk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadi-search-25.04.2.tar.xz",
+    "hash": "sha256-lfY3Q9BQzLOpYo39ybWicWWNRePVlEyxwTH30lTClIY="
   },
   "akonadiconsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akonadiconsole-25.04.1.tar.xz",
-    "hash": "sha256-DxGPjGo9KPCiqOB/q41Ycj+VX364YMuqsOaIymu5L/I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akonadiconsole-25.04.2.tar.xz",
+    "hash": "sha256-kPHinVCimfphGhFQnIPhks8shv7MpQeXaYzGwIRnImY="
   },
   "akregator": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/akregator-25.04.1.tar.xz",
-    "hash": "sha256-/Dgp+jJpNis88umxe4wNRSo0JO+5ez/dXk6GmCvdBSw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/akregator-25.04.2.tar.xz",
+    "hash": "sha256-f9x4b0DgMDUvNT6g+4/PA5NoK4JPdgWqiV1m14hFWjk="
   },
   "alligator": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/alligator-25.04.1.tar.xz",
-    "hash": "sha256-h6aoG65uOmjlHnXmkM2uYLl73TfuO/XoKx5Dig2PA8s="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/alligator-25.04.2.tar.xz",
+    "hash": "sha256-sIt07uSQ/4CL+5LAPwlAUSJOMUfcpVO/KECaxL9oLwo="
   },
   "analitza": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/analitza-25.04.1.tar.xz",
-    "hash": "sha256-PgyN+AC2llXD1SiXCz+/5vr4JIth0GmsGo13VVOB73A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/analitza-25.04.2.tar.xz",
+    "hash": "sha256-Rxd+CoQA4QhJG3abgl70mQ892XszSO7Bgto+ZeVwTbc="
   },
   "angelfish": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/angelfish-25.04.1.tar.xz",
-    "hash": "sha256-ppnnwg8H/m3FnzX/VD2Rq09/wS5aTN0tF3y+sBu5vck="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/angelfish-25.04.2.tar.xz",
+    "hash": "sha256-0tp6/LtJXCR8vTfNBBSDnDeKOLfhvsuK/o0NxHOXHy8="
   },
   "arianna": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/arianna-25.04.1.tar.xz",
-    "hash": "sha256-STltBCDrulO03LG0546Ti+wJIR9TBmO+GKsMhkpSlRQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/arianna-25.04.2.tar.xz",
+    "hash": "sha256-II0jVmwqLL4CwWBBMhAkw4ZOdLF3zRO2CBLRsjpMVw0="
   },
   "ark": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ark-25.04.1.tar.xz",
-    "hash": "sha256-6dImfLuNonhuhFbBJgesWqN4WJ6BEVnlC1xmffUUOn8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ark-25.04.2.tar.xz",
+    "hash": "sha256-VKN0wvBv9lq+V3hlp/wlId5w8Q9DizmfgbvjwN1L5oo="
   },
   "artikulate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/artikulate-25.04.1.tar.xz",
-    "hash": "sha256-Co+In+deR6dN9BD82yvIYGarxx8co7lKVya1EwzlY80="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/artikulate-25.04.2.tar.xz",
+    "hash": "sha256-hRY4dkTYpZn5i/zw0O5Urz5uDtIXrKBdVwKcxZ2XV3o="
   },
   "audex": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audex-25.04.1.tar.xz",
-    "hash": "sha256-iB4SZ74dHNrgPQw+ehtxwl/junLD5FgttgSK7HRo6cg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audex-25.04.2.tar.xz",
+    "hash": "sha256-N3gIXrpyoKpcb4iwbLHSsAsfIIGLhFHYQkmYqg3VyMo="
   },
   "audiocd-kio": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audiocd-kio-25.04.1.tar.xz",
-    "hash": "sha256-eyLIGQea8M4M2QWFxKYBaRODKLZ3fnEN16Ncf75MrDw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audiocd-kio-25.04.2.tar.xz",
+    "hash": "sha256-PXt8+3Grk+mouYWfnVN26+GSqSMkqFm6YYOYJUCcJcs="
   },
   "audiotube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/audiotube-25.04.1.tar.xz",
-    "hash": "sha256-G9QmhqNyVmmm7UahiulCAIWINHEPDc7mIeoWQ0m4CBY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/audiotube-25.04.2.tar.xz",
+    "hash": "sha256-uD4k1UzvldkPnOG+pUJsjQC5OGcJjm02Z4nrTfrrD+o="
   },
   "baloo-widgets": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/baloo-widgets-25.04.1.tar.xz",
-    "hash": "sha256-170d0vrFcIO4AQNrcLeOeu8xKpdszEvCJ+mKlz/wiZM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/baloo-widgets-25.04.2.tar.xz",
+    "hash": "sha256-mXsqG48E8raw4o7if83BGYSX4/rcBaOvYmd9HqZEavA="
   },
   "blinken": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/blinken-25.04.1.tar.xz",
-    "hash": "sha256-fw4f9JiM6QYTHATQRh7aNjJw+lzpKb1g0epEXw5XDL8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/blinken-25.04.2.tar.xz",
+    "hash": "sha256-DjHKvWNAtv3+XHwtclss64igGtVLUNeQwsPQKNLEJfg="
   },
   "bomber": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/bomber-25.04.1.tar.xz",
-    "hash": "sha256-2zlvlKhg5cM0y0aKvrundLK55H1/xx+5nj11z7GJSLQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/bomber-25.04.2.tar.xz",
+    "hash": "sha256-upkpVI1r1h9VtMHuUmVxZESeeEPCeXR5R1QrNXo3exQ="
   },
   "bovo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/bovo-25.04.1.tar.xz",
-    "hash": "sha256-ldrSBRj9Emw2MiKvODCHHL6JHe/2SAW72IKYR7vZk3M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/bovo-25.04.2.tar.xz",
+    "hash": "sha256-6XT+eHMuWe0qL3AtjJ0S7IwIo/DxbC3vYfVWRkufnR4="
   },
   "calendarsupport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calendarsupport-25.04.1.tar.xz",
-    "hash": "sha256-Wn4Le5yNcnf8GJnuFT9MXzrLZP98cm63QovHgA7JTK0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calendarsupport-25.04.2.tar.xz",
+    "hash": "sha256-/UuiVAfQQ7V2Qk8HipjyokJcum5DwmzOobZuTm6GAag="
   },
   "calindori": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calindori-25.04.1.tar.xz",
-    "hash": "sha256-LRvFihqCRSY29PRrjTF4o9RIe1bNMAkL3dIleOcBmcY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calindori-25.04.2.tar.xz",
+    "hash": "sha256-9ps4/+qdp5Dj4SwaSVLdeaT9o0Te8Tjzx5xRLiGsCoA="
   },
   "calligra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/calligra-25.04.1.tar.xz",
-    "hash": "sha256-+B6DK5tWLTniF3tFVpYIvpTuA7rgYaXnwn6y3Asr0+g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/calligra-25.04.2.tar.xz",
+    "hash": "sha256-DAbB30IA4+UWeCmlKQdVP4PY3lDg6kXCaJj+qcGFC0I="
   },
   "cantor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/cantor-25.04.1.tar.xz",
-    "hash": "sha256-jpa5BEsAqhH71gwvhII4oU3pR1AcZXJawwksT/rXqLY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/cantor-25.04.2.tar.xz",
+    "hash": "sha256-jLdEsY2iLeQxWzAPiLPlgOsq9VmRgYenO3izlIYVvnQ="
   },
   "cervisia": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/cervisia-25.04.1.tar.xz",
-    "hash": "sha256-t2BYLgJSK/VJEKNj4PvN7LO4UVF/+o/fFNs4+wQm2oQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/cervisia-25.04.2.tar.xz",
+    "hash": "sha256-ay56wsQPbU6w5o6EfvYkl/25xRBJKiAtzjZvPwM6H60="
   },
   "colord-kde": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/colord-kde-25.04.1.tar.xz",
-    "hash": "sha256-5L7CRVhdGipFjixBZJA/qYGv5KX8kFzN+jVcSCnxpL0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/colord-kde-25.04.2.tar.xz",
+    "hash": "sha256-P4R/lS/zT+mOm5w0dwOYYLldPsB5pEIauCabbuipFFk="
   },
   "dolphin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dolphin-25.04.1.tar.xz",
-    "hash": "sha256-HaMHZ/YteO3JtVYwXJiqyJ4GMknkMnNdLdR40yLkWt0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-25.04.2.tar.xz",
+    "hash": "sha256-jIPEk3t7R5Nbd47NAafUHaBibngT2mM0UVfVfQhyl/A="
   },
   "dolphin-plugins": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dolphin-plugins-25.04.1.tar.xz",
-    "hash": "sha256-JLY/9GW/4NozfNqupIuPBaj5WdEQ/2E8hWjApDfOUnc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dolphin-plugins-25.04.2.tar.xz",
+    "hash": "sha256-tXkl48KJ2cHBuX0pte/d9gCLpPqgelY+jJXoML4t2kE="
   },
   "dragon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/dragon-25.04.1.tar.xz",
-    "hash": "sha256-CMPGloWE6QwbOZnnNjoweiMYuExRyIaSBoR2vpN9CXY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/dragon-25.04.2.tar.xz",
+    "hash": "sha256-FaFO6ylZib8f/zXlWJeoF/f9pwZPC8McMx6IttQf/YI="
   },
   "elisa": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/elisa-25.04.1.tar.xz",
-    "hash": "sha256-KmrUVQuEttFGqB4+p4lrObak9r3OHr2QENcdaHSZJww="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/elisa-25.04.2.tar.xz",
+    "hash": "sha256-49XjQeUz6Rlp7l8gFaH4H47CsLG2AQLqfBaILTa/51A="
   },
   "eventviews": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/eventviews-25.04.1.tar.xz",
-    "hash": "sha256-E420Tr7/KVmPj6UmbM0yAO0a5oz8QOikNRBUxAAjIXU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/eventviews-25.04.2.tar.xz",
+    "hash": "sha256-sKrN/OGCGDMfiRSg7x/GlqLnHXqYEcrAjQzk84xkcjI="
   },
   "falkon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/falkon-25.04.1.tar.xz",
-    "hash": "sha256-ry/7LPTGLRfd+3N+cd/aeoWBbS+s9cgrryNDb8073vA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/falkon-25.04.2.tar.xz",
+    "hash": "sha256-i/2l6Vq8RjqIJBFIyBWEowvUQ7dngY0SJXOeaBlCyYg="
   },
   "ffmpegthumbs": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ffmpegthumbs-25.04.1.tar.xz",
-    "hash": "sha256-1f5u/wDqL2IEAtUY86fL0z0EcSzDwyC8uDv6wa8nMfg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ffmpegthumbs-25.04.2.tar.xz",
+    "hash": "sha256-xH5AlV/VAq+U8m++sPJx/ekNvj3jqkQsrMtG08qASyI="
   },
   "filelight": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/filelight-25.04.1.tar.xz",
-    "hash": "sha256-Fp2x/jVtHWWFDZA8U3iZrRNC4qc9GADSt/v7ox8ONEs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/filelight-25.04.2.tar.xz",
+    "hash": "sha256-ysX3DQLSUY/VVo+Gw3hnfcpF2oYYCIWjjiy/DPENA6o="
   },
   "francis": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/francis-25.04.1.tar.xz",
-    "hash": "sha256-zPZBwXGfTytwNl+ZYy5BBWsGgr8XzJ5pmBfZk5NiWcU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/francis-25.04.2.tar.xz",
+    "hash": "sha256-iHDHRLJJsf1QlLUkqkTm1vAn7i/gTgy2ie/jv3lnCgs="
   },
   "ghostwriter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ghostwriter-25.04.1.tar.xz",
-    "hash": "sha256-gU1FDMhKnrEVQN5Aik7C0ZGMoA0FyloXLVvQE0AxIBA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ghostwriter-25.04.2.tar.xz",
+    "hash": "sha256-EsHf0vgf9E5KB0cUsH00GjXlzAWKaTOOz6zmSNF8hBo="
   },
   "granatier": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/granatier-25.04.1.tar.xz",
-    "hash": "sha256-7O0/9hp3nMaCNAf0Wx1AhuFnr0CmqDPPq7NjwUNuI4w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/granatier-25.04.2.tar.xz",
+    "hash": "sha256-SrthlEvD6/0336VJEmtB2bOf/tc6NXa+R2osrSAX3Ls="
   },
   "grantlee-editor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/grantlee-editor-25.04.1.tar.xz",
-    "hash": "sha256-8DaigFRKjKia8haQ5CRVreUeZpBK5rnzfeUAPXkgGGg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/grantlee-editor-25.04.2.tar.xz",
+    "hash": "sha256-trxLa5OU+HqsBtVJ7SJK9ozylWFBgv9DTUHaBs1kaus="
   },
   "grantleetheme": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/grantleetheme-25.04.1.tar.xz",
-    "hash": "sha256-+mC3zFy0foV1/LjwkdLq0z11EVnU0hGOZdxxOhrLfVw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/grantleetheme-25.04.2.tar.xz",
+    "hash": "sha256-Q4apQf4Qygvvm1SDrfo9Pu4AVrWO+ooQf877JtzpMso="
   },
   "gwenview": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/gwenview-25.04.1.tar.xz",
-    "hash": "sha256-6g9V2A7s+891kCgzFN2duWpMDprLNKy5YbNjah7nkl8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/gwenview-25.04.2.tar.xz",
+    "hash": "sha256-8uwbu3H+/QQaZWaG5OuKPtaE+RPPqG4GKkDZIiyjFD8="
   },
   "incidenceeditor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/incidenceeditor-25.04.1.tar.xz",
-    "hash": "sha256-dRUJgki+MgeSHGzFDKdCfUt4514t4xRB9Z1Liisodtw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/incidenceeditor-25.04.2.tar.xz",
+    "hash": "sha256-mlO3z2nGDBmuJrd0S2ebErYOymEKJHHEl+t5G2otrM8="
   },
   "isoimagewriter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/isoimagewriter-25.04.1.tar.xz",
-    "hash": "sha256-NbaHJaZY9IaYMlbtn8wn6Kk+Rzauj2aITVCk+RX12GY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/isoimagewriter-25.04.2.tar.xz",
+    "hash": "sha256-afDvhV16v/k+U4OZJBuh0SKSPeIp5DoB0yj8cfbJAb4="
   },
   "itinerary": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/itinerary-25.04.1.tar.xz",
-    "hash": "sha256-DbidOVHAZQhnPikyx7o3FwG/NMlRA2ijBAsfW1+jNHY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/itinerary-25.04.2.tar.xz",
+    "hash": "sha256-ZQ2szuqnFPuQhgthI4hA68b2GRYFzylDoHhaS8wAPxA="
   },
   "juk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/juk-25.04.1.tar.xz",
-    "hash": "sha256-5NFUd6tQdAB/k6qHJpZrZxuCc4PaHRnarK+ZNUkM6t8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/juk-25.04.2.tar.xz",
+    "hash": "sha256-5ATTew6kS5JyA11xNRJP+2znBSkmxK42XBV98kXgQm4="
   },
   "k3b": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/k3b-25.04.1.tar.xz",
-    "hash": "sha256-YVtom8luPYgKWGaKrqdXZv+BxguVg/Nbs2rd++6R0iI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/k3b-25.04.2.tar.xz",
+    "hash": "sha256-r6fVDoXK15mN/HS/SMiPF74kSdB/gATNfbSfoLVG/8I="
   },
   "kaccounts-integration": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaccounts-integration-25.04.1.tar.xz",
-    "hash": "sha256-MU/zRqIk0ro/u9wTAkHwalxcN9lxmcUSocYv6tf7/pM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-integration-25.04.2.tar.xz",
+    "hash": "sha256-D+zWTQsLxpi9TJoTqA2vltOncHLduGFri8ZwtnJJ0Vw="
   },
   "kaccounts-providers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaccounts-providers-25.04.1.tar.xz",
-    "hash": "sha256-v0ALGu8T8jX/oldBtFpqJFLwY6rE3h/ZSo/+xV+6Hk0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaccounts-providers-25.04.2.tar.xz",
+    "hash": "sha256-WGQGt/PZMXCjb8Sf4ejW6KbCPx4AvqRgri+LxqX1dis="
   },
   "kaddressbook": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kaddressbook-25.04.1.tar.xz",
-    "hash": "sha256-OMR3wf9EjoIAAYQ5hNrpRsTZ9OUlLAvFyWt5Ai6ac0k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kaddressbook-25.04.2.tar.xz",
+    "hash": "sha256-deC+A4kRASK1nvClb4vAaYdbBYSBNTS8q9watefT4uM="
   },
   "kajongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kajongg-25.04.1.tar.xz",
-    "hash": "sha256-qkjEIyIjZkheY0R/h/X3pcxurvjBHrjbB3CC/gMlEY0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kajongg-25.04.2.tar.xz",
+    "hash": "sha256-THQiKR+4tUhXgodYVFYPIh8frr+nVZCi6tAJ/L2H+RQ="
   },
   "kalarm": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalarm-25.04.1.tar.xz",
-    "hash": "sha256-I4lNVpr6i1NJlvS2OhoyXEImukhy8Eef4PjJnng2/e0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalarm-25.04.2.tar.xz",
+    "hash": "sha256-bDNbQ6ZhCK0FOmNL/3KFBzk6sJDru4l3RTkAl3wiLMY="
   },
   "kalgebra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalgebra-25.04.1.tar.xz",
-    "hash": "sha256-SmEeiZ4+vMEpI/EYcVBy+O4uUvV+mC/yI0K7e4ZQea8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalgebra-25.04.2.tar.xz",
+    "hash": "sha256-tUxTX9L4w+1oWQQPb4yn+9XAzLgaCiGcrJAH+itF/Ms="
   },
   "kalk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalk-25.04.1.tar.xz",
-    "hash": "sha256-UvGKqtHrjfcTMFee1mAtpHi3Z69+l4C8Q2xn2LtSjDk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalk-25.04.2.tar.xz",
+    "hash": "sha256-UeLNayx9DJcaNKhGAYxFmGjnfFXWn07EkJo5VslTZfY="
   },
   "kalm": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalm-25.04.1.tar.xz",
-    "hash": "sha256-mx40htAOStgXRDsE2DHx1/YW10p/sGmOWdX+uMINPLM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalm-25.04.2.tar.xz",
+    "hash": "sha256-LX+/UVl1ELdnZWANxpz3JnCcigvFm/OaWD9nVFS+VUE="
   },
   "kalzium": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kalzium-25.04.1.tar.xz",
-    "hash": "sha256-MaMaRdwtfFWBBm1eZlTCA44sc7FRJjKBcOOf3zYaG2Q="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kalzium-25.04.2.tar.xz",
+    "hash": "sha256-JnriX9QfwDo4bkMtVqfONPnsukzlxWhprQ9dYK1E23Y="
   },
   "kamera": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kamera-25.04.1.tar.xz",
-    "hash": "sha256-v8NdzlrhRoRs+UDvs8WctDZgYNZqbeJioLTQ679OvhA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kamera-25.04.2.tar.xz",
+    "hash": "sha256-pF/QIflaozTS+ZlN3qr6KQ9xWAJ3GStsXSgpY3qNx+g="
   },
   "kamoso": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kamoso-25.04.1.tar.xz",
-    "hash": "sha256-BOqCVgAq7MeaKx3eRsXOCOZZXJFEGj51PwhjDud0SQQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kamoso-25.04.2.tar.xz",
+    "hash": "sha256-Qllpwi0tZOhBNd0N8cRuFabCqH0EdZymyFPjYVFSQsE="
   },
   "kanagram": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kanagram-25.04.1.tar.xz",
-    "hash": "sha256-UKjO9Z8UY1YmGfttsRWsfvPjRCX4FYeCSR2i86aKP1k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kanagram-25.04.2.tar.xz",
+    "hash": "sha256-YipF7lXS3wDP94x/S5DPkzKFjaN2+XwZ2gMVpuJsYsc="
   },
   "kapman": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kapman-25.04.1.tar.xz",
-    "hash": "sha256-71wVm1BcybrUNHORlgpL36avaR2XfVETjLEi2BzLsME="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kapman-25.04.2.tar.xz",
+    "hash": "sha256-7MlzaMoA2NhXmqRtT0tDRigm4x163S1hysE7yRQK3B8="
   },
   "kapptemplate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kapptemplate-25.04.1.tar.xz",
-    "hash": "sha256-S855smMJeCVYHSGlEIbI8dgUU23W5BT325kEP5Nae74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kapptemplate-25.04.2.tar.xz",
+    "hash": "sha256-0fTyCv4Mh2nfsxUAS0tI9///6gIfmWeI/Doacm2Hm5I="
   },
   "kasts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kasts-25.04.1.tar.xz",
-    "hash": "sha256-o5D/TGnuYZ3uoAiFmb8vF4iEWGjtPfN9p8fNVW1LoYI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kasts-25.04.2.tar.xz",
+    "hash": "sha256-2BuVJPOPxxh0+4CpRahizPs+iAtmzeYQe8alEwQxvmM="
   },
   "kate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kate-25.04.1.tar.xz",
-    "hash": "sha256-gg8EEqhIVHKETqg4gcR+G5AJPOPicp5pEPnTWT/lMKo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kate-25.04.2.tar.xz",
+    "hash": "sha256-aVE5GhlWbSzDbDaa74a1gmEWk5HVpkz/D6cwG7F4eaU="
   },
   "katomic": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/katomic-25.04.1.tar.xz",
-    "hash": "sha256-3/LDgLpjOGNPjophi2flgsq3szdiy3iZ12fOETk3fMo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/katomic-25.04.2.tar.xz",
+    "hash": "sha256-gYCFU8+6s+KZenuDlakYr0GBRMQeyW5jGNsPEGrdye8="
   },
   "kbackup": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbackup-25.04.1.tar.xz",
-    "hash": "sha256-rAMqPULe4ltaR9PqAEioI5m0udDcFvb0gtXuTeBywzA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbackup-25.04.2.tar.xz",
+    "hash": "sha256-2z6CpvlxQrh0puvo8bge7koKhADn/VI+UVBVeVjsi7A="
   },
   "kblackbox": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kblackbox-25.04.1.tar.xz",
-    "hash": "sha256-KWsAA4tV4s6Jee8yfW5stkKcxumT2NAcvUOS2VchY+Y="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kblackbox-25.04.2.tar.xz",
+    "hash": "sha256-TxCasBNHCOx/IR3c6dyB4YcF0VepKiO6juvKBjoNark="
   },
   "kblocks": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kblocks-25.04.1.tar.xz",
-    "hash": "sha256-xhpN6fsMNutdg+JFmWJPSOGBAY/OfT/RxbKSEKf4Dsk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kblocks-25.04.2.tar.xz",
+    "hash": "sha256-qNUk1qrgAM3x68OOR0tMTKb+wgTYBJjvBxFRY+0Tzls="
   },
   "kbounce": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbounce-25.04.1.tar.xz",
-    "hash": "sha256-gAYdfMj2V7MdiI+TACk/1GMGMhXtXZ/joguoX624omA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbounce-25.04.2.tar.xz",
+    "hash": "sha256-H600dvJjZ46hd5TrmecnjvIfeZIs+C/9MvqWRMSZ+2k="
   },
   "kbreakout": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbreakout-25.04.1.tar.xz",
-    "hash": "sha256-4TQrYWsim9UREo35ZEDGzIzqx5rhvLliZwebtzyLBd0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbreakout-25.04.2.tar.xz",
+    "hash": "sha256-sdUymrxhZ797tX/NXgJ1gSw3EBjkR9bu3KEVgre93u8="
   },
   "kbruch": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kbruch-25.04.1.tar.xz",
-    "hash": "sha256-Fd66s9ZHLtCo5I34NiuyGZArniHdKgTkaDucrpYoinE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kbruch-25.04.2.tar.xz",
+    "hash": "sha256-UyWR3V0eTQfSSYAQ9b29LUwTwO6fsvHq268iSFtwk+s="
   },
   "kcachegrind": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcachegrind-25.04.1.tar.xz",
-    "hash": "sha256-C3NJuE9ekKnZywWyZCsqecJ6Yp2suFupTle5Uovh+XU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcachegrind-25.04.2.tar.xz",
+    "hash": "sha256-z0+NlHH/4k/EJTfu0AoL+f7qDp1wUzS/jFwxdti3zGs="
   },
   "kcalc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcalc-25.04.1.tar.xz",
-    "hash": "sha256-uI4xr2fNhqKq2DbOCKUjHEdl4KnyAOEkSyw0yE8kllw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalc-25.04.2.tar.xz",
+    "hash": "sha256-mPAQpmFf4Iza2jsV00hRnp6JJXX8NjamYQKbMXs6/Q0="
   },
   "kcalutils": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcalutils-25.04.1.tar.xz",
-    "hash": "sha256-CfDd1OHTOxMuCIaticwAWC15/XOlS5SjHDcKXHsGNKo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcalutils-25.04.2.tar.xz",
+    "hash": "sha256-4vPiAzc6Z59ZzPMyTncGjGfQIxv/Ul1FH/0s2HRZyMA="
   },
   "kcharselect": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcharselect-25.04.1.tar.xz",
-    "hash": "sha256-G01n4ShvMTiPpJ8oCXvEXXc4jHcpbbNbw0rOKtDZyEo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcharselect-25.04.2.tar.xz",
+    "hash": "sha256-NLp4E6e0PnWOEDUW0RuS5oEl+BOYm8DppuQ38zleP2M="
   },
   "kclock": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kclock-25.04.1.tar.xz",
-    "hash": "sha256-m5cvJIx/eBD+1pOzkR4YJcDipeJyKitZrrQ5DT0/1lY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kclock-25.04.2.tar.xz",
+    "hash": "sha256-bP0oUWLNe05VJGgYSqHB7WJsNx+8kaV/3B5unf41Omo="
   },
   "kcolorchooser": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcolorchooser-25.04.1.tar.xz",
-    "hash": "sha256-vtOywWP4d11AvKVYr9C4wYR+KbqbpSm0Evkhfws3gM8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcolorchooser-25.04.2.tar.xz",
+    "hash": "sha256-dJ86gEmPtWMtXINfSsF+7dFtiR3XS4rwbKEkRce8ag8="
   },
   "kcron": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kcron-25.04.1.tar.xz",
-    "hash": "sha256-K+qIgZOtiYa5tx2+6HJoGlLVDceaB+Ez/mxMUpBmGTk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kcron-25.04.2.tar.xz",
+    "hash": "sha256-51s14UXXWzkbgeuILRyPAtjQ8gVhFGOSSQkQNCrgXys="
   },
   "kde-dev-scripts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-dev-scripts-25.04.1.tar.xz",
-    "hash": "sha256-Qs2fP2vzLZiCLNfA9pkn4va6Rtd9Pa5SBKiWd7fVUAU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-scripts-25.04.2.tar.xz",
+    "hash": "sha256-mmHiU8F8Efibjjav+man4tNJR6ZXHmoWQ1IsrVW2lFc="
   },
   "kde-dev-utils": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-dev-utils-25.04.1.tar.xz",
-    "hash": "sha256-2qTJt/cMQ5wegyphqcjGg1MxSZXwyhrHLmis0gcGDTQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-dev-utils-25.04.2.tar.xz",
+    "hash": "sha256-ZVW9LmXO5+X33A0Uqko9q8+WhnIz2Frft7I4d++L33c="
   },
   "kde-inotify-survey": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kde-inotify-survey-25.04.1.tar.xz",
-    "hash": "sha256-G8PjwGpq4WQGDtQPKzxXjkKkHWoJ80mVOo4MgY6QBBY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kde-inotify-survey-25.04.2.tar.xz",
+    "hash": "sha256-UMet+wHCsTJf0xlKbaRDWV6ciWRXJqGHvrycUebVMDo="
   },
   "kdebugsettings": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdebugsettings-25.04.1.tar.xz",
-    "hash": "sha256-xj9EPWF/tvj0KnuO39TzxlpvY+PLlNS3AYN8fNHXFM4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdebugsettings-25.04.2.tar.xz",
+    "hash": "sha256-caSrXDg/AcFPtv8SoVcCKZu/1Zribgixf5+TsJD8qv4="
   },
   "kdeconnect-kde": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdeconnect-kde-25.04.1.tar.xz",
-    "hash": "sha256-6shY6dt5UuBuh4GCMsePe854iW3S/Cz9e6kj0dkb6KU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeconnect-kde-25.04.2.tar.xz",
+    "hash": "sha256-TGXkc6V+Th/8mZg4rbWxqgGoVTSw5GmXq0Kr2hfM0bU="
   },
   "kdeedu-data": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdeedu-data-25.04.1.tar.xz",
-    "hash": "sha256-mlWZc93EqojK4jo2ZNKte5GBtD04aTwo6yHOeSrLvHk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdeedu-data-25.04.2.tar.xz",
+    "hash": "sha256-xtDUd2uqOvy6H23vd0e/xiN21QFRmI1r9/+xGPw2v/M="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdegraphics-mobipocket-25.04.1.tar.xz",
-    "hash": "sha256-50K2ppCZrqJ4B8DIVuFhsr2YWeh0XLsJrFHLTf2Ne/k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-mobipocket-25.04.2.tar.xz",
+    "hash": "sha256-3dVG6P/1VS5bfnKU88Y7YTDZqY9hVeooD6hh95PPIzc="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdegraphics-thumbnailers-25.04.1.tar.xz",
-    "hash": "sha256-a7x11dEJzvUWhiIE/IV4uoKBoBAYhJIPgywX5EZAMmw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdegraphics-thumbnailers-25.04.2.tar.xz",
+    "hash": "sha256-ZaPK/+mKrbXpQCPGdNFj0aPvs9ofOyIvPYgxQ+L3/nw="
   },
   "kdenetwork-filesharing": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdenetwork-filesharing-25.04.1.tar.xz",
-    "hash": "sha256-Y1Cw1dcYIcU9Sz+wB+x+OGyTNmGkL8ZALR2XWlEyEk4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenetwork-filesharing-25.04.2.tar.xz",
+    "hash": "sha256-87G3KM8rLSbEfDjyqtBUxv6BEqMCoMhApwy9TxHaSTs="
   },
   "kdenlive": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdenlive-25.04.1.tar.xz",
-    "hash": "sha256-ygESH95vUuQVtbhP8vTZ/2ieA3WbVovsAFEnElqx6Uc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdenlive-25.04.2.tar.xz",
+    "hash": "sha256-M4VS++Z132ceBaXrzodE6LHQfbnjb0ToNlXv+c4tQoE="
   },
   "kdepim-addons": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdepim-addons-25.04.1.tar.xz",
-    "hash": "sha256-3lv6DERjD3/Ltq3f+RruPPW9Z1q+NKi2zho55AS333I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-addons-25.04.2.tar.xz",
+    "hash": "sha256-l9w5Po3JQfpBGaIut17tCL9Ot9KBlB+HnjqLojD/sDM="
   },
   "kdepim-runtime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdepim-runtime-25.04.1.tar.xz",
-    "hash": "sha256-lZxTNdAMjrBbF3QtobehQrjG+RiEGU8/m/wJ9X8jMe4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdepim-runtime-25.04.2.tar.xz",
+    "hash": "sha256-ZcJC4tJxQ6OiQUVPkq7NGtnApVxKYw/QXaJu8d8B6yg="
   },
   "kdesdk-kio": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdesdk-kio-25.04.1.tar.xz",
-    "hash": "sha256-Ri/2zYtLW2LDwNbmmp8lUUNsX49m+OAxwaK9ByZErTw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-kio-25.04.2.tar.xz",
+    "hash": "sha256-1tqE6xb1CaTjrpzqStHZlzKvhAIJjmFQ45bFC3vy6/c="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdesdk-thumbnailers-25.04.1.tar.xz",
-    "hash": "sha256-SQX53k1YvamqFAakkUsPvH4WKbHFG+ibiBUsHDSN/LE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdesdk-thumbnailers-25.04.2.tar.xz",
+    "hash": "sha256-I9edoNV4v9n9CCePDd12Q5ZfKsw1DzwTTgXbCq7EHY8="
   },
   "kdev-php": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdev-php-25.04.1.tar.xz",
-    "hash": "sha256-F+/hb7bVBnfCWmIZw1VOhI0aaHjbHnGh5oyxbC97ckI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-php-25.04.2.tar.xz",
+    "hash": "sha256-DGue90nQ+ENWUf0B3CWg3LShOnNIXmbtbVPoJE7ITk0="
   },
   "kdev-python": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdev-python-25.04.1.tar.xz",
-    "hash": "sha256-ORyrzlRy7QqfdCRUQ5SIZk+J2bUnxJ1gIinE8Nqce74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdev-python-25.04.2.tar.xz",
+    "hash": "sha256-AF7henR5A+wILh2PZ2SiSs6EboQcyQrnwkC1uv0iKU0="
   },
   "kdevelop": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdevelop-25.04.1.tar.xz",
-    "hash": "sha256-HAHAxVyOhbcuFEBUHQeEUdQppJN9Q5wNTFH6nx0DbjY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdevelop-25.04.2.tar.xz",
+    "hash": "sha256-lG8xT3NZNrlOEpi7bKris6ilwE8KmKE8Hv/H2dgm8Es="
   },
   "kdf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdf-25.04.1.tar.xz",
-    "hash": "sha256-hTieoYAPR4ED8IEJgqejMYFtp68FVOiUEOe70q0CJq8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdf-25.04.2.tar.xz",
+    "hash": "sha256-PYaGYVidrsS/vV5ghAfGkxwL1SBvgVuojoBZgUrZuIs="
   },
   "kdialog": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdialog-25.04.1.tar.xz",
-    "hash": "sha256-pBmEq/TeVVaAJfbEXE0KlIpjdCdXNpV7Yr6gmORJ9is="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdialog-25.04.2.tar.xz",
+    "hash": "sha256-X6fIVrc3+QTyEyoXZRXigdXaRnBza6KI4a656mUQKc0="
   },
   "kdiamond": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kdiamond-25.04.1.tar.xz",
-    "hash": "sha256-g63WShnBkcUNuZkjtGOneaP8KVr0kRRKhtV2/J7rSQs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kdiamond-25.04.2.tar.xz",
+    "hash": "sha256-h3kWpRe7Ej97VSJ64YGqGq2Dxp5rmbvgIdDH/cyNfY8="
   },
   "keditbookmarks": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/keditbookmarks-25.04.1.tar.xz",
-    "hash": "sha256-3Ry9KGzGXic7mzLMvx1YKJdrVxBqi+kLIkmMWvWYnmg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/keditbookmarks-25.04.2.tar.xz",
+    "hash": "sha256-Y55e/2u5YhlQiMc2Dq+za/mq861wDRYMBl0mP02dgjM="
   },
   "keysmith": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/keysmith-25.04.1.tar.xz",
-    "hash": "sha256-t1Ot5d8Xlc2H70VGGJlxBMZEtTYzKfEXuxJMudYGKIU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/keysmith-25.04.2.tar.xz",
+    "hash": "sha256-q9qVQj0bZtM0pXI6cfJcJ0CIUm3CW9Qqv8vcf/6DAPI="
   },
   "kfind": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kfind-25.04.1.tar.xz",
-    "hash": "sha256-rEMeDfFCzChze5qw0zrDfTLUtaPD/MDg9lD6ZUHJDyI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kfind-25.04.2.tar.xz",
+    "hash": "sha256-8oKy0ySqnWEFRm+y8F/3s0Sj3WoQv4IZ4YLEmPKsmNo="
   },
   "kfourinline": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kfourinline-25.04.1.tar.xz",
-    "hash": "sha256-rgf0HT3DKBLssVNiO3om6+u+sJYBwimGBeh5ChVsPtw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kfourinline-25.04.2.tar.xz",
+    "hash": "sha256-2kLqtEZ/Bm2Xg9+1TWS651xHBGcXvfur0SIykfSVd4Q="
   },
   "kgeography": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgeography-25.04.1.tar.xz",
-    "hash": "sha256-tyPdTAf6CPhluYQRuMxN+9kZhWzG9u9cI2H7hsOdjyA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgeography-25.04.2.tar.xz",
+    "hash": "sha256-qDW+rFahTiBYUpQY0Gj5UxfmJvjYELm40XsktsZ2/vc="
   },
   "kget": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kget-25.04.1.tar.xz",
-    "hash": "sha256-lEO9eNBD3/rCBV7XXNk4KnsIA6vlBUMOtnBdFQuRNHE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kget-25.04.2.tar.xz",
+    "hash": "sha256-xsnRB73/vC0ZhV8pjFY0o0GoLWyj4bQwzmCMfBDVgME="
   },
   "kgoldrunner": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgoldrunner-25.04.1.tar.xz",
-    "hash": "sha256-XZPYWM2FJvQenFB9Ox4lTEX4oxob8xikZt8YwwgCHoI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgoldrunner-25.04.2.tar.xz",
+    "hash": "sha256-GkiUGSDCUEvzUiURBZOkw85qW3rbizZZl0W9ZkpoXcI="
   },
   "kgpg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgpg-25.04.1.tar.xz",
-    "hash": "sha256-xKtlHZ2kEmbZlkGP9zJ4gi5dp001YKXXZiZt+qYfcyA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgpg-25.04.2.tar.xz",
+    "hash": "sha256-qtnDIuPwfeVbyf1aVcZVugr9skyyUAh5t8r8Hx7gO+0="
   },
   "kgraphviewer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kgraphviewer-25.04.1.tar.xz",
-    "hash": "sha256-jzqZlrZ//66m5zWCZIg5s2atmS9uzyEqndi8c1RSlIU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kgraphviewer-25.04.2.tar.xz",
+    "hash": "sha256-SEv4Eyoey+wKn88FJ0uwgIHm0oiIKpg16GyzF3p3Qr8="
   },
   "khangman": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khangman-25.04.1.tar.xz",
-    "hash": "sha256-xbxVbQ677INjWslNiKml35VImfBg5CzywoTMw2HDP/c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khangman-25.04.2.tar.xz",
+    "hash": "sha256-jx6XxMZriopAFQ5m8wD5reL8F+oiKklTDI4ZCl1PTh0="
   },
   "khealthcertificate": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khealthcertificate-25.04.1.tar.xz",
-    "hash": "sha256-mkJcwe9bh/FfN5DHRceS0XebqFu92EDh+ltl0AU+L08="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khealthcertificate-25.04.2.tar.xz",
+    "hash": "sha256-k8SkDy3W6UhyoTOrUJt6KXKmxCOMjYxhb7tj6Ui6nLM="
   },
   "khelpcenter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/khelpcenter-25.04.1.tar.xz",
-    "hash": "sha256-xAn2ApE3RycAxn+pnoFpoT9GY/3BXaobPQLY01gzQs0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/khelpcenter-25.04.2.tar.xz",
+    "hash": "sha256-Wsmsq9Ynh+4x+ImJF2WFM+yhdfNhmDJfCdN0gCrL7uo="
   },
   "kidentitymanagement": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kidentitymanagement-25.04.1.tar.xz",
-    "hash": "sha256-m8PVfaklSiH9//HPMmzhZ4odieN9x+TK1/6nMnpdxT4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kidentitymanagement-25.04.2.tar.xz",
+    "hash": "sha256-ifcA+re8z6gEp/iz80GPBI7zw6qXs24QK+up4SJuBF0="
   },
   "kig": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kig-25.04.1.tar.xz",
-    "hash": "sha256-gJN9pSrGm3pisMKp2gvxji6x2qEhLDmqBCJKMSDTQBA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kig-25.04.2.tar.xz",
+    "hash": "sha256-Hi3njHbTiGPJ2g3vICWPQe1aeV3A8wc+BgCCYE6Advs="
   },
   "kigo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kigo-25.04.1.tar.xz",
-    "hash": "sha256-OQaeK3rXyr/89CHrdYGkQVP16uLyYf+OK/MkucAxWyo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kigo-25.04.2.tar.xz",
+    "hash": "sha256-/It27PayRKxAYBL4XaetwHnz1vdCzoEJPu82i/hFAGs="
   },
   "killbots": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/killbots-25.04.1.tar.xz",
-    "hash": "sha256-wRgt3W+4LhUzBO15nNWHkLcevauGrk9nM7ypcEGpKz8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/killbots-25.04.2.tar.xz",
+    "hash": "sha256-eQwxYwBqzEhIHWzVDSpUc9em8bOnCVymSClpZ3DcIvw="
   },
   "kimagemapeditor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kimagemapeditor-25.04.1.tar.xz",
-    "hash": "sha256-/nilNzUBuKur4FAqPUI0NaKIUCcSfPgPpvt88jxxSSk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kimagemapeditor-25.04.2.tar.xz",
+    "hash": "sha256-U+nvufGAfdn+63hZAwHiYH+DFlbIB9U4UsFOZ5ZNjY0="
   },
   "kimap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kimap-25.04.1.tar.xz",
-    "hash": "sha256-ghlPdteCn4yFrd8LgbNlqdEfabiFLfuT7SzF499FIkE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kimap-25.04.2.tar.xz",
+    "hash": "sha256-fSqjYKnDG6YbpAyUYCFKLva/6jXlZRcp+FWiAokmZ74="
   },
   "kio-admin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-admin-25.04.1.tar.xz",
-    "hash": "sha256-2/RhgXTc6zsLpRpPMborc0oOdFN24yRWQKGeeDe+P8M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-admin-25.04.2.tar.xz",
+    "hash": "sha256-x6foaTlqemh3ChPFsRXHEWnqSuhOHrj3PEAgNhJDykc="
   },
   "kio-extras": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-extras-25.04.1.tar.xz",
-    "hash": "sha256-+Cd/v4qkclkmslLi3gNnZ3ZzyNtYWl73vSZ2DTxTRFg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-extras-25.04.2.tar.xz",
+    "hash": "sha256-02wKiCfwkAfSV+9MoG608hI9t6OCVbo3/gdIq2Odf5k="
   },
   "kio-gdrive": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-gdrive-25.04.1.tar.xz",
-    "hash": "sha256-0AiT68GJkzd3F97VSVgZIorQrg+Q8OH8pLaa91dmfFg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-gdrive-25.04.2.tar.xz",
+    "hash": "sha256-anNSK6H+giTv64rcalspAtVZKHBuVSCtS0o7u08RTPA="
   },
   "kio-zeroconf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kio-zeroconf-25.04.1.tar.xz",
-    "hash": "sha256-UGznwnc8/COXIzWyIUwcmtw5F4ZGmgUNrw42hZFshCg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kio-zeroconf-25.04.2.tar.xz",
+    "hash": "sha256-0HW9qtxFjou5g813sn6CcYiep9uOHN8LP6usipIAulw="
   },
   "kirigami-gallery": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kirigami-gallery-25.04.1.tar.xz",
-    "hash": "sha256-u9rFtTrnPoK3nvl25cTzNvKtHoKq8AfidjWwRI4EtBM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kirigami-gallery-25.04.2.tar.xz",
+    "hash": "sha256-+VjlCzl9fXvaF0hCrcLw+Ot48wiJOrDadMlinc/Jp/c="
   },
   "kiriki": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kiriki-25.04.1.tar.xz",
-    "hash": "sha256-Ip1urLyWQDM6Woa38BFrwzGI56ZxX1YzM7sX6p2sYn4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kiriki-25.04.2.tar.xz",
+    "hash": "sha256-YSemlcWQ/qSXbuszQOTCwSh23kZpZwDRznbAlxqG3R8="
   },
   "kiten": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kiten-25.04.1.tar.xz",
-    "hash": "sha256-z8LUnIjRrl5r1UyVockhL/ekgWks2WRv69oqRwBmkmU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kiten-25.04.2.tar.xz",
+    "hash": "sha256-zMiHCKbwdD55UoddYkTzPA06NXCLEUkCCX7ma7WUaPQ="
   },
   "kitinerary": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kitinerary-25.04.1.tar.xz",
-    "hash": "sha256-6U1HeZhhA1zAazo0Ivk3ZxgtgrbKhVGIm+6YQUcsmaA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kitinerary-25.04.2.tar.xz",
+    "hash": "sha256-duOjQGg29jGzBOlOj+0QsZxSzAzBRljROezPQSjDU28="
   },
   "kjournald": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kjournald-25.04.1.tar.xz",
-    "hash": "sha256-/ld5IMrCupUEq5kjP3iywjNTy3q3oaOs7qNCeafByIY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kjournald-25.04.2.tar.xz",
+    "hash": "sha256-K8MgzXF0t0Vnctf5HPcUk+oPaniG7GLzRwVMDU9NDUI="
   },
   "kjumpingcube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kjumpingcube-25.04.1.tar.xz",
-    "hash": "sha256-Z5NV2mTgXIk1CCrfl6IVAhM8v+ZmsflGnsIEBzlkKB4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kjumpingcube-25.04.2.tar.xz",
+    "hash": "sha256-d1hKNpsytpFHSKz+gLORcYhP4lH0kcOc0metmgfs+5Q="
   },
   "kldap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kldap-25.04.1.tar.xz",
-    "hash": "sha256-4jwK8DaEWP1dRpbzqPP5I4LsT29ONko94U0rvgF+r7A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kldap-25.04.2.tar.xz",
+    "hash": "sha256-sEgzLgwFxJB0cB6rk/K1m161bjosGV+3GJeWdHRqrmI="
   },
   "kleopatra": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kleopatra-25.04.1.tar.xz",
-    "hash": "sha256-YfLEc1UesBy64rMA4nS1YuwZAU7j90xO6E81ZFRGuJs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kleopatra-25.04.2.tar.xz",
+    "hash": "sha256-0VXEFhA/rRc8Nh6hDz6h9hQil8xb41mOmwYkYTNqNHY="
   },
   "klettres": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klettres-25.04.1.tar.xz",
-    "hash": "sha256-5eKxQAh7GabtqK1oiLcUIwzGt8bUQ0+eQzSZJ3RGHDY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klettres-25.04.2.tar.xz",
+    "hash": "sha256-+Zfo6ziXD3P724qlbtesQyBG5JqHAfQ5kIQki4w72tw="
   },
   "klickety": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klickety-25.04.1.tar.xz",
-    "hash": "sha256-TCv/4tJltmAm42drq62o8gWQdgrRVJGH8Ln1o/zm6xY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klickety-25.04.2.tar.xz",
+    "hash": "sha256-TbH2zg94I6EKBtUa5Jkx+mJoM/yfAztMXzTMOIcKCmY="
   },
   "klines": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/klines-25.04.1.tar.xz",
-    "hash": "sha256-o8XFaPjJLYXW3XMrWHhtvMDAv4UmmLWuR4Yl9MdcDWI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/klines-25.04.2.tar.xz",
+    "hash": "sha256-PfN6KQMEWtD6wBHNjRCw9EltjZlObufKuOUqzi/W9IM="
   },
   "kmag": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmag-25.04.1.tar.xz",
-    "hash": "sha256-N7ejjsF4pVHoJF1Vm26EI6g8Rxben0HwAAvukWJFamA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmag-25.04.2.tar.xz",
+    "hash": "sha256-GvbF0bCTusFoWGEzPAk+rzUcR/e6PDS375j+uk+rYfk="
   },
   "kmahjongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmahjongg-25.04.1.tar.xz",
-    "hash": "sha256-VerdIJyQ3zrUCp4Zgsa18UHeogAtqTucx2RrSXKiHck="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmahjongg-25.04.2.tar.xz",
+    "hash": "sha256-Y36SRNOWSvw1eoT5Rf3cNWGllF+cLgiUnVF20HYdy0c="
   },
   "kmail": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmail-25.04.1.tar.xz",
-    "hash": "sha256-++e3D2X/1CpUoluJDsw8iL0FB8OY1Nk4/RMB0G1j13c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-25.04.2.tar.xz",
+    "hash": "sha256-zLbVmYxklZRUh5wbBZx/4s0dwFuI9pj8LGDmHe7hlDM="
   },
   "kmail-account-wizard": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmail-account-wizard-25.04.1.tar.xz",
-    "hash": "sha256-Cj7B9obQxnSCKIEbd60CxZ6Z8ViKefYdcHPIb/TnQec="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmail-account-wizard-25.04.2.tar.xz",
+    "hash": "sha256-Etdi+bDcxnv+nSbgvE2twM9KDPPRQoTOREHEXWPHbM4="
   },
   "kmailtransport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmailtransport-25.04.1.tar.xz",
-    "hash": "sha256-80eu5Krfz+MPO/Fk7kCcmMp4BIU4fpF/R6DTyHxG4cw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmailtransport-25.04.2.tar.xz",
+    "hash": "sha256-Me7uiJLNUmXfFt22/d0jmjK+XI5Ba5GXkrYR0VnUMR4="
   },
   "kmbox": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmbox-25.04.1.tar.xz",
-    "hash": "sha256-c3QABoBnz5HzgxHb/HVKMlwaIsAqt86X+uso8G8D1co="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmbox-25.04.2.tar.xz",
+    "hash": "sha256-40g5b7jx3hcp0EFRFrBfYiDw67RCjEYHuYtW7dMh8ao="
   },
   "kmime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmime-25.04.1.tar.xz",
-    "hash": "sha256-igOa3GygKnCUmKgagcvx0o0nUlrjfOcUfUNJsNN6UB0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmime-25.04.2.tar.xz",
+    "hash": "sha256-YQLBGRo0R1r0Y/eG50B+6fMou3X5OhI15Rqz72JQDTo="
   },
   "kmines": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmines-25.04.1.tar.xz",
-    "hash": "sha256-vLU5CieDYxyaIEbujUbiCO02Q3tBhsX71mEqNQX/FUY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmines-25.04.2.tar.xz",
+    "hash": "sha256-AblEqfj4wDh49qrB1ramvKaVDtVaGQlCYSiqpytDZ38="
   },
   "kmix": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmix-25.04.1.tar.xz",
-    "hash": "sha256-so9EjfVX4bD/3yje2xiOZpeUAzFE7ep4nvBeg70wA5g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmix-25.04.2.tar.xz",
+    "hash": "sha256-hnQWCire1iOcwvZlklpu//vjwm4a+S+dg/FejlvGzQ8="
   },
   "kmousetool": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmousetool-25.04.1.tar.xz",
-    "hash": "sha256-PcPxXEQFKJ9sFZ+1W3YslLVE4KB/+DAAab2C+gOg4bI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmousetool-25.04.2.tar.xz",
+    "hash": "sha256-Q8TNy6F2DN7asJOcdA8Bff+YNQr1FPKvkzd130WFrKQ="
   },
   "kmouth": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmouth-25.04.1.tar.xz",
-    "hash": "sha256-Ih/Is0e/r1P41aDFcOhUdGKEfzM8jO+d9Qyu6Zvs7yk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmouth-25.04.2.tar.xz",
+    "hash": "sha256-3D3k1KJO01LFSILPrgQWNZrY41unFj7z0qpL+4K8jlc="
   },
   "kmplot": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kmplot-25.04.1.tar.xz",
-    "hash": "sha256-MuMhC5z3z6mqM0AQKvfXF5e4Wh2g5cYLH31v7177fMk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kmplot-25.04.2.tar.xz",
+    "hash": "sha256-umnMlPMCSsZ3Pdz4aXNGnj9yZjid2Z9r+AzqPbO653w="
   },
   "knavalbattle": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knavalbattle-25.04.1.tar.xz",
-    "hash": "sha256-Ox98zW4o709kY6imlkoMZRBZkPY29k43mGd1UILBy4c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knavalbattle-25.04.2.tar.xz",
+    "hash": "sha256-c/7wgb2wzWz3l9KAdgVZ0yn9ov13tnDZ3A30vSP39z0="
   },
   "knetwalk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knetwalk-25.04.1.tar.xz",
-    "hash": "sha256-CPX0cUMaCr/AOBT8dXYxFLMYrkPaeNk8VbSmw+Sc1go="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knetwalk-25.04.2.tar.xz",
+    "hash": "sha256-EIA1GxhUXHO3EGGoSWMqDUEsz7iI7nZhPNQ+7Fl1DR0="
   },
   "knights": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/knights-25.04.1.tar.xz",
-    "hash": "sha256-40PgImv23y2+3MCa0SE4knoxAcj4mPewClcUpENlZr4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/knights-25.04.2.tar.xz",
+    "hash": "sha256-tGPxQpnk7rtfF4BdMzXEpAuEKYwl3YPB5Eq3WDHssu8="
   },
   "koko": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/koko-25.04.1.tar.xz",
-    "hash": "sha256-Jmg3hvAnLRomybev9PjRw6qChEqno6mzEnf3n8YBrOo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/koko-25.04.2.tar.xz",
+    "hash": "sha256-xaDhc9FotCjkVRz8TQnNZXxG8bJjOWz/OH+Ao+85LSk="
   },
   "kolf": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kolf-25.04.1.tar.xz",
-    "hash": "sha256-mxj/CbtnJIxGxyvsWZe38dSlzgeAvXq/E7E35rOzyEA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kolf-25.04.2.tar.xz",
+    "hash": "sha256-EJyr9KaIFb2pauyfH8IdiSsWVB14IFs69/cfIn/0suA="
   },
   "kollision": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kollision-25.04.1.tar.xz",
-    "hash": "sha256-9wNG4Sc8veU6kQPbYD3i1kAjV3oDPdwdyCmaa78jsC8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kollision-25.04.2.tar.xz",
+    "hash": "sha256-gv6usFPygqO8CzlJpP0Jag+u2KZFNcKOvl+iKlroOgY="
   },
   "kolourpaint": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kolourpaint-25.04.1.tar.xz",
-    "hash": "sha256-rFaRQh3MgWsoX6eqT6xjeML1YZw60SX1NonUXjlEVbU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kolourpaint-25.04.2.tar.xz",
+    "hash": "sha256-dOSV2MEC/iBrxOFz/lMTSkOXoNe1LOBiia8hgFuqUhA="
   },
   "kompare": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kompare-25.04.1.tar.xz",
-    "hash": "sha256-waZee0dHin6RPQz3UQN7gUBnx0/SNHibYQpzwy8Dhwo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kompare-25.04.2.tar.xz",
+    "hash": "sha256-ujxFmgH7f+kvF6Z0YnjrYQlXxJwQyzEWAbiMFxQ1bDM="
   },
   "kongress": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kongress-25.04.1.tar.xz",
-    "hash": "sha256-AmnGxokJTnWom/NRxugaG4Yqaoenx+9sC52qOsqqM8w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kongress-25.04.2.tar.xz",
+    "hash": "sha256-glDewDOwCLADnAmsyOfXG+TNaO8tg0Byb0K6kqOgagY="
   },
   "konqueror": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konqueror-25.04.1.tar.xz",
-    "hash": "sha256-1awO+AqkDtcyID9gB+gm4YxMXcWNo+A8IVUZGDfLqjc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konqueror-25.04.2.tar.xz",
+    "hash": "sha256-c9mgvHCwKOTydLBPfovwlfpakLNCpMZCSzdp+S1TLl0="
   },
   "konquest": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konquest-25.04.1.tar.xz",
-    "hash": "sha256-N0BQ2pFdU1Z45V1CVeLXkPR2FSZALfLJJ0Vz7lHRz2E="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konquest-25.04.2.tar.xz",
+    "hash": "sha256-fEdwkMbv/wMbt8LckjqDJWu+p3xv0xfZF7Vfe5FjpEo="
   },
   "konsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konsole-25.04.1.tar.xz",
-    "hash": "sha256-lh7foKNFD+BhcqMKe3LPgQlWqItWKEcgL+uHBgaOdF4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konsole-25.04.2.tar.xz",
+    "hash": "sha256-ac1sfoTLyz30EifNMRVJilqt3KZkGAKJjXnltORnu/s="
   },
   "kontact": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontact-25.04.1.tar.xz",
-    "hash": "sha256-5uaecUTM1uyN0eacKGAdCiA5pSPhZ8mYXT20+BzuexM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontact-25.04.2.tar.xz",
+    "hash": "sha256-Rn5zb1VCnvuYACnN15a849cSf5QXvtLGQptRsonVxhU="
   },
   "kontactinterface": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontactinterface-25.04.1.tar.xz",
-    "hash": "sha256-bwvXoEDK8aCjRapszD9LgZ6Ym3l0nm5dSyTnnaqH4rk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontactinterface-25.04.2.tar.xz",
+    "hash": "sha256-h7N72peJleg4DfUWJzirskiGTclxq/RrGKvDo3z27Pc="
   },
   "kontrast": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kontrast-25.04.1.tar.xz",
-    "hash": "sha256-vTWkzq7UqP9nPrfMBdkMcqG1Ig9BrQ+Iy9kZcbZy9W8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kontrast-25.04.2.tar.xz",
+    "hash": "sha256-QQ/6KAI1pOMneo7+lTxOE0cU3XJBkTFlvCSqqhNQwcI="
   },
   "konversation": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/konversation-25.04.1.tar.xz",
-    "hash": "sha256-6l4R+WZA/WrkDwRdqkRJrrFiHvo6xPDNjY3awvkUYcI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/konversation-25.04.2.tar.xz",
+    "hash": "sha256-ua5EG9zP00ytn/2UBb+ipolh0ey8dF7gBQJ323yap2A="
   },
   "kopeninghours": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kopeninghours-25.04.1.tar.xz",
-    "hash": "sha256-IoY3p1oVZujgc+Dp7CG2fTDW8jVu2ohABJ0uk+EnhDM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kopeninghours-25.04.2.tar.xz",
+    "hash": "sha256-gJ8TQ4rKJFqV/7//RCQTkbVaOFlec9aMN0eWcrI1hfo="
   },
   "korganizer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/korganizer-25.04.1.tar.xz",
-    "hash": "sha256-qc20b/6LdqhxLLaF+CKcv3gyJMstvQHhWU1nHY10QD0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/korganizer-25.04.2.tar.xz",
+    "hash": "sha256-V2Bdq81m1PlG0rSkltOsF0c290SAqaYyNAYQkJ2h0jA="
   },
   "kosmindoormap": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kosmindoormap-25.04.1.tar.xz",
-    "hash": "sha256-AuIa+WSSrIWkofUud7ZkAA2L5854ea8KIn6WYGpqc1I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kosmindoormap-25.04.2.tar.xz",
+    "hash": "sha256-aneLU4EmrYij1OM0sFJZ9O6kCrB88w++KXM+rq1Zw/w="
   },
   "kpat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpat-25.04.1.tar.xz",
-    "hash": "sha256-3GpA631pEtuWiHVIoE5xOdidHWJSgpAhaQqFskqE4Ks="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpat-25.04.2.tar.xz",
+    "hash": "sha256-MfRzlSMs1Buhny1v2Qvem+A/XtYeFYzx0YJIor4jo3o="
   },
   "kpimtextedit": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpimtextedit-25.04.1.tar.xz",
-    "hash": "sha256-2+gGBCUiDhtiAuw54x+OyW5gb99m3LssOZeJR97qd74="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpimtextedit-25.04.2.tar.xz",
+    "hash": "sha256-3W3sBz43ljqUFdXsDNHtpPNOZL7IgM8nFuE9JUo0z7Y="
   },
   "kpkpass": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpkpass-25.04.1.tar.xz",
-    "hash": "sha256-oZkAAlZwh25Vhtma9rfMn8GdMaddY+Qeti3vSMGjHoQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpkpass-25.04.2.tar.xz",
+    "hash": "sha256-8xfbO9jHw01wcnNTMVyDFnOhawpw2nXwdcu1qdrS+TE="
   },
   "kpmcore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpmcore-25.04.1.tar.xz",
-    "hash": "sha256-wCM1HE/Uv/po/Y1XgOcTi5XRR9xjDPoB8QiZAE7FFgY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpmcore-25.04.2.tar.xz",
+    "hash": "sha256-MalcvcqCTdxd933SH9qkLzIPcdeG3kZ0RV+0rMpbsv0="
   },
   "kpublictransport": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kpublictransport-25.04.1.tar.xz",
-    "hash": "sha256-BHhrp+hr1UoRvGTDGM1rn/uReH6miSwDMM58zAVwsqg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kpublictransport-25.04.2.tar.xz",
+    "hash": "sha256-iBXmji6aAEqGZQdMqRYZwAA9KEW1IR+dwDyJBNuCYqQ="
   },
   "kqtquickcharts": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kqtquickcharts-25.04.1.tar.xz",
-    "hash": "sha256-RZirgX/19kzlkIw0ehEh+NLjn0ygHMX50cGG64G+uO0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kqtquickcharts-25.04.2.tar.xz",
+    "hash": "sha256-8WkcSO/upEKFo2dUaXRBAn2H4Hi2wMQhJJVxRB8xeao="
   },
   "krdc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krdc-25.04.1.tar.xz",
-    "hash": "sha256-vV4MgMrsrskqvtW5IZ3CORLiKjGvoPAY2fFpMIg0z7w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krdc-25.04.2.tar.xz",
+    "hash": "sha256-LWK6gWzZ77po7gakpV5vKLpAXrYcl2b35EFkznWp458="
   },
   "krecorder": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krecorder-25.04.1.tar.xz",
-    "hash": "sha256-v+/2hfcGEOPKtwZ8NJwmRAQZbY5Lx9GGcv1f8FpkAlc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krecorder-25.04.2.tar.xz",
+    "hash": "sha256-Y70TljWdOPMRe4a89d95or/EXwxdzoFwrFfFTPL2z9Y="
   },
   "kreversi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kreversi-25.04.1.tar.xz",
-    "hash": "sha256-oZD/2FFMXg3pjk8iPE/LuE/e9ZLdmG9BArGxdL1K2TU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kreversi-25.04.2.tar.xz",
+    "hash": "sha256-GXRJ8gwm/UEQOaALBDuAK2ual+XzxJIMqb+BJVACArE="
   },
   "krfb": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/krfb-25.04.1.tar.xz",
-    "hash": "sha256-sHMJqEelDNzxSvolSh01dRPx9UQSg+wYYSXY3rzVF2w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/krfb-25.04.2.tar.xz",
+    "hash": "sha256-ff9TuCOPAV5IPwOO0Zy7c4FUEr6ShLhu1LVTb69dUAY="
   },
   "kruler": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kruler-25.04.1.tar.xz",
-    "hash": "sha256-Ped6di9KcrJCy54y8+QsQVFHIs5iQAeeEtZ1ByEe7o8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kruler-25.04.2.tar.xz",
+    "hash": "sha256-hS/zJUCsdkh01AEocfk9QsoLSCQYvyUIQUD5kqCPLsI="
   },
   "ksanecore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksanecore-25.04.1.tar.xz",
-    "hash": "sha256-EQM4IJAZ3DBxRofVwkM1V0YoTPrEEtz3A6wbbgf0i+U="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksanecore-25.04.2.tar.xz",
+    "hash": "sha256-cDnpxMHywpU1mmjZWB8HwGdFcoSDkax8y7GvIsB5Fdg="
   },
   "kshisen": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kshisen-25.04.1.tar.xz",
-    "hash": "sha256-WajYZHc8mLvUDa97mssaHVvJY7GpAqec8Cf0oU+6uMU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kshisen-25.04.2.tar.xz",
+    "hash": "sha256-6dPJjWBTPK1374O+gadZANcscDx8be5IuML73DTsCr0="
   },
   "ksirk": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksirk-25.04.1.tar.xz",
-    "hash": "sha256-XoE41uXA3BXctmsCQVzIUbgjlX0gXL6ouFeaK/Lc3hk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksirk-25.04.2.tar.xz",
+    "hash": "sha256-bvuln1eI+HnZGpP2zQWEQgoZ2CVF+xjSaClQ3q/djM8="
   },
   "ksmtp": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksmtp-25.04.1.tar.xz",
-    "hash": "sha256-QrptuEs1/2tQ7li6TaFOzNpEtgJCtAldU/RhKdbbxH0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksmtp-25.04.2.tar.xz",
+    "hash": "sha256-6Sr/Y4KUnYKq3HzHuoD1/Eqg/qzbJPpNGmDmdaRTMFY="
   },
   "ksnakeduel": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksnakeduel-25.04.1.tar.xz",
-    "hash": "sha256-IZoIezYXE2IT7jriFj6TcFTTgYJebkpmfYJDro6bGuM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksnakeduel-25.04.2.tar.xz",
+    "hash": "sha256-V9T/NEgNV+MeNotXsXBZ5svBIma6YN9rIqLe4C0k1hw="
   },
   "kspaceduel": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kspaceduel-25.04.1.tar.xz",
-    "hash": "sha256-BTV31qDbrauKqdse2wuwfym3gxUrPg+WPcQLIuW2u/M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kspaceduel-25.04.2.tar.xz",
+    "hash": "sha256-Qdms1IzV+lVOdhdqQXYQPYg5vV8lqlSBzNlDk68agoU="
   },
   "ksquares": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksquares-25.04.1.tar.xz",
-    "hash": "sha256-ZJuj7lBUUB/bJWe9Y6l1JJpLqUy709OnrbFmwILLq6w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksquares-25.04.2.tar.xz",
+    "hash": "sha256-Qe0sStUu4IW9XZbJNpYahW6/MwFEiSsdBOM+LQr54H0="
   },
   "ksudoku": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksudoku-25.04.1.tar.xz",
-    "hash": "sha256-HIEnSfFM4/gb45nfa8L8FEI+4YlKInsaKNbCxb38BRM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksudoku-25.04.2.tar.xz",
+    "hash": "sha256-6T+KDli9pOosFbOY79J/UyW2QbVYu9x8Oj9qgmwBrMk="
   },
   "ksystemlog": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ksystemlog-25.04.1.tar.xz",
-    "hash": "sha256-tQoJcMcGD1MRYW0zyQDpabyaWnnKpt8zKQW3Kr133eQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ksystemlog-25.04.2.tar.xz",
+    "hash": "sha256-950IzNsjQNCfxT2X7JxcF/lLpSYAo4F8Ae+XQfFz1eM="
   },
   "kteatime": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kteatime-25.04.1.tar.xz",
-    "hash": "sha256-gQ2XGoaFF+c1JX2X1+PDLMyAQq1e/e1wqrAH38I0k5g="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kteatime-25.04.2.tar.xz",
+    "hash": "sha256-MQvIDRn0otVXLgDVEXiGIJvLqxiGILEwpbJGzhV69aw="
   },
   "ktimer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktimer-25.04.1.tar.xz",
-    "hash": "sha256-VTBqhktjJ4c3u50Ic6m7A7GIPm7lDyTNohdeXwnUb7k="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktimer-25.04.2.tar.xz",
+    "hash": "sha256-10UTMq1mORRx8ee7ks+LwTUsfpHetHpMNM+C7UDSjGw="
   },
   "ktnef": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktnef-25.04.1.tar.xz",
-    "hash": "sha256-mBlv3bN43Nc4rmhZ1GE6yuhR2e054ESpQe6TneGoo9E="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktnef-25.04.2.tar.xz",
+    "hash": "sha256-Tt0YM1+FQW/sTHk9NZgC+TXeg4p7YP1vTZz+fuasyj4="
   },
   "ktorrent": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktorrent-25.04.1.tar.xz",
-    "hash": "sha256-F82xW4qRfaKGwqIenW70IXq0IHPtGo3uJaugLMmqdIQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktorrent-25.04.2.tar.xz",
+    "hash": "sha256-2hg0eV4aA78aAhgs86lb6WVKXewypVvWPleVzF013ic="
   },
   "ktouch": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktouch-25.04.1.tar.xz",
-    "hash": "sha256-zqo7v/6DkK5TEulQpPT/a3oepJEoTZnGQeY/Mh7A1g8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktouch-25.04.2.tar.xz",
+    "hash": "sha256-gQ2f9KJiPsqhBjjvWd1kReOYiknQ7SZRlEf2o+XA8wA="
   },
   "ktrip": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktrip-25.04.1.tar.xz",
-    "hash": "sha256-nlG4HrKDVNbAGFYT6WXN2C+GHd7bjsXQp1LNMCcLVGo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktrip-25.04.2.tar.xz",
+    "hash": "sha256-rNYXo88f7izEt7gWFWcjUBYrRv7ulJ/O1h+TZhsJF3E="
   },
   "ktuberling": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/ktuberling-25.04.1.tar.xz",
-    "hash": "sha256-Ol0bnJRVxIqstUpbrvVk6OmctNWG7qAeW9Hfwb7fjLw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/ktuberling-25.04.2.tar.xz",
+    "hash": "sha256-+cQYkHBThpNwH44iThRTlKwnDMsHDGe9tkCdqxnxMeA="
   },
   "kturtle": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kturtle-25.04.1.tar.xz",
-    "hash": "sha256-cSovcn2tB2IFi6WHsMCcIma5NKoUlhQjLIQbnCZ+rXw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kturtle-25.04.2.tar.xz",
+    "hash": "sha256-tzbKkIhCF2O1qVpXoWmXReH24uVFRHf7vOXoLyWuQxU="
   },
   "kubrick": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kubrick-25.04.1.tar.xz",
-    "hash": "sha256-edzDXK6VsvLLEV05/ZP2wKM3Ys490x9R7ZWc+EIa2OM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kubrick-25.04.2.tar.xz",
+    "hash": "sha256-CnBXBVU4rL4yWpEMjxZ4RhqL6DJK3l6klHabjIpscb0="
   },
   "kunifiedpush": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kunifiedpush-25.04.1.tar.xz",
-    "hash": "sha256-tMYPQwJziQI8YUsEMVc+1xAxfTWri3LTdmBr/Rmc5oE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kunifiedpush-25.04.2.tar.xz",
+    "hash": "sha256-+Wksn/OhMiaVshjL1sJujAj6/JQKZsuovPW+576CuqQ="
   },
   "kwalletmanager": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwalletmanager-25.04.1.tar.xz",
-    "hash": "sha256-rPSftVm+CqLs6kq0lLZssqPacFnFoOoQe25pM/Ug1I4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwalletmanager-25.04.2.tar.xz",
+    "hash": "sha256-YmokCCb1UYQTlbxhdC70U5CZXfV82a7NRKn9sXuWzyg="
   },
   "kwave": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwave-25.04.1.tar.xz",
-    "hash": "sha256-HpB0+BQAanwYP+v1akBCOn6Og0Y1GUJ5zd4NC0e4kzM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwave-25.04.2.tar.xz",
+    "hash": "sha256-EAi7RqA3DYM91lUdPE25fKOSJNFk9t4x7MReBtA9zY4="
   },
   "kweather": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kweather-25.04.1.tar.xz",
-    "hash": "sha256-fgIWxWJYQa36RzYxhsDkbZBpIsjF1W5fvjv0qKVZZWg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kweather-25.04.2.tar.xz",
+    "hash": "sha256-AdcZ/8zNNgMfPzN+SFq0/ppX20ikMzqGR/HpuzfzQsA="
   },
   "kweathercore": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kweathercore-25.04.1.tar.xz",
-    "hash": "sha256-e/YXM/+nasZgtm9lsODArEYjDQd/A82TlY1ckamK/fY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kweathercore-25.04.2.tar.xz",
+    "hash": "sha256-L1l2grMWHjVu+AUQu/JMUej902S9AQigZ/WS7CFxJys="
   },
   "kwordquiz": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/kwordquiz-25.04.1.tar.xz",
-    "hash": "sha256-LJzOFrqifc+C0m1cz9gy+/efo3aQY6e6PXEagCsjDGs="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/kwordquiz-25.04.2.tar.xz",
+    "hash": "sha256-cCo9fCgaqiBWIbIIi6eiTqICrgOQxc9AV/FmhwEoNrc="
   },
   "libgravatar": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libgravatar-25.04.1.tar.xz",
-    "hash": "sha256-hkzPaUzw9RvmctXgelJz60Au/JLF7UP6QHfbMp9kmpo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libgravatar-25.04.2.tar.xz",
+    "hash": "sha256-QMy80q9/85Y71V1eu8JgixopIP/C5KiqfpflBK4aAPA="
   },
   "libkcddb": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkcddb-25.04.1.tar.xz",
-    "hash": "sha256-r0i60/lGFP7B8eN5Oi+ICO/667++FgPC1vJ0ja/4S+w="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcddb-25.04.2.tar.xz",
+    "hash": "sha256-8UJYpxzjYPupSNjcVOtu0WfRbTH4DIO9J+a9t5ynkNM="
   },
   "libkcompactdisc": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkcompactdisc-25.04.1.tar.xz",
-    "hash": "sha256-BKqgo0sPwUNdefBL27nyZXQEJaBkmieBNb2jszX83lA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkcompactdisc-25.04.2.tar.xz",
+    "hash": "sha256-k9qSw8a3zVZlcnZ0QG8GvqvP66Aut7lEWt9EGuZhjVg="
   },
   "libkdcraw": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdcraw-25.04.1.tar.xz",
-    "hash": "sha256-bMX3QXeKfie2uasrDBfYFF89GXoiRS9gju12Fs1rJtY="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdcraw-25.04.2.tar.xz",
+    "hash": "sha256-3nvETQQ3oNypShAFNguWsA2k/8UB9RPv9GbD6ydV/Yo="
   },
   "libkdegames": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdegames-25.04.1.tar.xz",
-    "hash": "sha256-QhrI4uZIpIrkpoCHNfzSeRbJqs5fDpn8giYGBF0HDL4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdegames-25.04.2.tar.xz",
+    "hash": "sha256-h3XHj3bWS+BbqxDfTQw/o9X1RCoJTIZQHW7HramzDSs="
   },
   "libkdepim": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkdepim-25.04.1.tar.xz",
-    "hash": "sha256-fpUS9be2WpRs+MG2PKPOoYKsn0TAxVffnU+gmD0U+kU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkdepim-25.04.2.tar.xz",
+    "hash": "sha256-t1Y+IcVlPLSbFOUPePTenIumsszhFl1kl7YYaEnsBdk="
   },
   "libkeduvocdocument": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkeduvocdocument-25.04.1.tar.xz",
-    "hash": "sha256-BhNYXD/WdcljLtAToUFUNtIeHDx3Y+tfYdrlTfCr59c="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkeduvocdocument-25.04.2.tar.xz",
+    "hash": "sha256-mJeZkx22cQsjNw98tU//BiwSuwLZhWRDUccW8LRsbjY="
   },
   "libkexiv2": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkexiv2-25.04.1.tar.xz",
-    "hash": "sha256-8GaVJ9H+fvIsPvfIJw7yner7CSPseCoi8c7Rt3U2cZA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkexiv2-25.04.2.tar.xz",
+    "hash": "sha256-nuuw2eyXc/xKPbf6GfbfaSOGCSDqIZLKn52d+WvJl9E="
   },
   "libkgapi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkgapi-25.04.1.tar.xz",
-    "hash": "sha256-suG0q1ZPZ80OLF+g+9OUkoEgvI0XoBmjbwcsUX9B7Lw="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkgapi-25.04.2.tar.xz",
+    "hash": "sha256-MWmPsZzNZq9N1tyhI2zvdm1wHU+AmMXCyp4gbLPwNMA="
   },
   "libkleo": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkleo-25.04.1.tar.xz",
-    "hash": "sha256-BP5y9ANcUOAfN0HDtF8hcANTWKBJdMVJfJHNa+sw2AA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkleo-25.04.2.tar.xz",
+    "hash": "sha256-NP65hx2KDm3tCnuqlfeP2sKME9ewDukpa9FmngxgX2o="
   },
   "libkmahjongg": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkmahjongg-25.04.1.tar.xz",
-    "hash": "sha256-+9SHHUKfLgm1ABfGd388xrzIMZEaQUXd7HQ4wqItws0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkmahjongg-25.04.2.tar.xz",
+    "hash": "sha256-14ZzjabJ2blINzCp4DlvHEaB8n00pkfCaTjiI5Ssy5A="
   },
   "libkomparediff2": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libkomparediff2-25.04.1.tar.xz",
-    "hash": "sha256-j30Mz3VTti/JM98Uh0d7gizttO0Hd6N0bRIlcgJJQnQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libkomparediff2-25.04.2.tar.xz",
+    "hash": "sha256-D0g0UbJfRit9cgHYkglZZVrG17tHmaAD1GOmLiE64Hk="
   },
   "libksane": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libksane-25.04.1.tar.xz",
-    "hash": "sha256-XDuDxzrH/XaAvpkzLaBuRn3mxtSc7sG3rjcrFmY3kCM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libksane-25.04.2.tar.xz",
+    "hash": "sha256-xFj8wvD/Ur52jnfLTLPKIVDbiYbthAPLGf8Iv12tzsM="
   },
   "libksieve": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libksieve-25.04.1.tar.xz",
-    "hash": "sha256-ImnDZKqC3zudVmhbnaicpFAE76Vi0rP8RG7vDTCeUHo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libksieve-25.04.2.tar.xz",
+    "hash": "sha256-VIR0mxk0KmDpJN7h+A9vXvE0jNGZBtE26ts2ZRNQy8A="
   },
   "libktorrent": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/libktorrent-25.04.1.tar.xz",
-    "hash": "sha256-3jS5qe3kyyvLVfDYuzXFcfDneW4Sy0SGtQ/VUW2GPBQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/libktorrent-25.04.2.tar.xz",
+    "hash": "sha256-5sz20FA6C3HVlLdeZ6oK1QXVcxbSDVOAzMWQxPBgTpg="
   },
   "lokalize": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/lokalize-25.04.1.tar.xz",
-    "hash": "sha256-1X1l7yoqIm4OA40tCquxkQts1dj0Ab4QfbNtFkVBfLA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/lokalize-25.04.2.tar.xz",
+    "hash": "sha256-hUCK82+QatoB8wNClA4GXrK9najNXecuK9RXnjNkKJ4="
   },
   "lskat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/lskat-25.04.1.tar.xz",
-    "hash": "sha256-YAO872KNpwGPygDIu4IPp4yI8VcDkCf+ivMJ9axWlwM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/lskat-25.04.2.tar.xz",
+    "hash": "sha256-7+saiNsrZq8/D68sqzcg/I1pSVSCT1/0nArE0r4+0J8="
   },
   "mailcommon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mailcommon-25.04.1.tar.xz",
-    "hash": "sha256-Z040Rf3seDx/0Onn5tMcRWp6GSi2EFdi2yMjy61lbdc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mailcommon-25.04.2.tar.xz",
+    "hash": "sha256-LGIMU3AaVtZwRPXZdOFxCTgn1cP5fvCV5uLWD5Mslb4="
   },
   "mailimporter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mailimporter-25.04.1.tar.xz",
-    "hash": "sha256-0lQSwQ3J3P+F4KViWYNsgROosUqtZoAea0eREO3PKV0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mailimporter-25.04.2.tar.xz",
+    "hash": "sha256-v5udSHXzzVszg2am5eca5QiiHVPzsodHROcH8lTYgjE="
   },
   "marble": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/marble-25.04.1.tar.xz",
-    "hash": "sha256-bSRpgnZE9yj5/JoCM4imaBP4GWh9Ff0sk5LYMj438OI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/marble-25.04.2.tar.xz",
+    "hash": "sha256-U7y5nFGwafmPZx3D2sJzUbM9HaXdPmLLC2B62wHXeOo="
   },
   "markdownpart": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/markdownpart-25.04.1.tar.xz",
-    "hash": "sha256-X0KDGYQcqDuHHwDf/wEA3SPWn4zLyXZpVacRI0pdh4I="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/markdownpart-25.04.2.tar.xz",
+    "hash": "sha256-h6RR2IwL01p+PMfGHHXfx9rZdOfV1BeIAasxmYARn9Q="
   },
   "massif-visualizer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/massif-visualizer-25.04.1.tar.xz",
-    "hash": "sha256-0YW6vp/RVMndF4iUM4HJXWqAzI5jOQZlXyho+U69fag="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/massif-visualizer-25.04.2.tar.xz",
+    "hash": "sha256-ED7UvpG66v9+5J5Y6qqwx3TzZIhlqaEG/BMjsZFmeRc="
   },
   "mbox-importer": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mbox-importer-25.04.1.tar.xz",
-    "hash": "sha256-79Ezy2qbFkopifa/ZCTKJO/ZeahI7TjQxCC9QqmStlk="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mbox-importer-25.04.2.tar.xz",
+    "hash": "sha256-jFuSQIelaMDkOr/2s7ZWH4dAxBLq/GpF+GktJVu2jLw="
   },
   "merkuro": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/merkuro-25.04.1.tar.xz",
-    "hash": "sha256-PQ8Rp1umQU747SPJmlIK+QY0c7mBu2UaENGHv7ZO0nA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/merkuro-25.04.2.tar.xz",
+    "hash": "sha256-VE1nf7vfY3KIDkyxMuR9ndYZykU4cxY6nZVv57AfV/Q="
   },
   "messagelib": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/messagelib-25.04.1.tar.xz",
-    "hash": "sha256-kvDh/irBuMtTFo4YcJwgPUPMza44LQiVs+KEZ1ffB3A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/messagelib-25.04.2.tar.xz",
+    "hash": "sha256-c1Supyslwu2S2x3Lidn19bgrorOCl50NEwPEdxZWGgU="
   },
   "mimetreeparser": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/mimetreeparser-25.04.1.tar.xz",
-    "hash": "sha256-irjMoNSfysUM7+Sn8noDvujTHyR6JOBRfuI7aQWfJ34="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/mimetreeparser-25.04.2.tar.xz",
+    "hash": "sha256-nNsEJ48DxzwHrAuEDURJFGDjq0MRMzI9JqTB7whLbjc="
   },
   "minuet": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/minuet-25.04.1.tar.xz",
-    "hash": "sha256-Z30jSxjoJG+PvZ1l8CoMD8V3amTn1snMAIiwPmM53rc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/minuet-25.04.2.tar.xz",
+    "hash": "sha256-bQGHHfD2Zvv8nIS61scUaVVpDmo3tGc46YBY+KW/tRQ="
   },
   "neochat": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/neochat-25.04.1.tar.xz",
-    "hash": "sha256-5m2CkO4aUfgXoQzwg6GCMonp7OubzQoHR/CwV0JJV+o="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/neochat-25.04.2.tar.xz",
+    "hash": "sha256-4yK9tD57IC7aLENfxiJH+q/y5WjiWCPsVfrYzEU5tMY="
   },
   "okular": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/okular-25.04.1.tar.xz",
-    "hash": "sha256-+vPATwFPIHmKcTd3ZhNQkNGZtqiHfyWfjM7h74/8zHg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/okular-25.04.2.tar.xz",
+    "hash": "sha256-vyEC/ndptQThk01GvymTmKZSn6KpbKMCv3iYwTGyXOo="
   },
   "palapeli": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/palapeli-25.04.1.tar.xz",
-    "hash": "sha256-ZXNo0ljItHmsEEBYE/VBfhOX/S1yqImT5IVr09MD0CM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/palapeli-25.04.2.tar.xz",
+    "hash": "sha256-HWDwUKagpQJQilvkSUq483v1MmswMB9DJxMl2JjMNxQ="
   },
   "parley": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/parley-25.04.1.tar.xz",
-    "hash": "sha256-hxceJqBKNiwBKDuWnu9AjU0RaLuC51goiX7BntFF5OA="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/parley-25.04.2.tar.xz",
+    "hash": "sha256-i+QWqdSEkRElkLdYNsveiUD8MwPoCzGJSF+3qVCDGf8="
   },
   "partitionmanager": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/partitionmanager-25.04.1.tar.xz",
-    "hash": "sha256-fhPkCJViasOUikaFtsiYTIZa8f15TrzGSKpZnYeRwmE="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/partitionmanager-25.04.2.tar.xz",
+    "hash": "sha256-MAn6gW9kCHQ6ZYDK936IvOsT86jDG8UnuDrMLwzd5PU="
   },
   "picmi": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/picmi-25.04.1.tar.xz",
-    "hash": "sha256-TKP65bZ+MwGnDM8nbOelazcnN8LJssGdd7fCP/7qcd8="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/picmi-25.04.2.tar.xz",
+    "hash": "sha256-bni4JESztJ7lkIwrMIQsU9mhu4nR8YJaXZ9Ho/xuNPo="
   },
   "pim-data-exporter": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pim-data-exporter-25.04.1.tar.xz",
-    "hash": "sha256-D6H+OBSe2ZdawtLxhczTURGOSdSmfK/Ivg79HZp0g3A="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-data-exporter-25.04.2.tar.xz",
+    "hash": "sha256-XBeX+YTCQ6Z9qmawUnrtEAnnHdyBVTNjsBuIdaRROMM="
   },
   "pim-sieve-editor": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pim-sieve-editor-25.04.1.tar.xz",
-    "hash": "sha256-V6Hnfva5WIweItkMo/EkgL97HNVyUaQdBtY3q1wpm2Y="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pim-sieve-editor-25.04.2.tar.xz",
+    "hash": "sha256-XEc8Yasx1flHvGAaN5j2RXUOuss8VwxMHAE8LZVIiH4="
   },
   "pimcommon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/pimcommon-25.04.1.tar.xz",
-    "hash": "sha256-U2pcBsFShV/FxJeR/FNSpa/TxFupXBXSjCNYmM+8ypc="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/pimcommon-25.04.2.tar.xz",
+    "hash": "sha256-fXUk3guIiwF2uPQNO1df/uiiVcY2clN8fdOTVDaCoM0="
   },
   "plasmatube": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/plasmatube-25.04.1.tar.xz",
-    "hash": "sha256-LDS5bYQVkUEEg/7WpjLbYotFwEQxPp/99xBbCYY4emI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/plasmatube-25.04.2.tar.xz",
+    "hash": "sha256-VE+A27ADyB/CD4PHZfGYx+4xxrfH740Zck5veiSZk6c="
   },
   "poxml": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/poxml-25.04.1.tar.xz",
-    "hash": "sha256-kTthg6l1wOxn8p1/zE9qQx4r+dS94JaNjDSEeDfK5oM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/poxml-25.04.2.tar.xz",
+    "hash": "sha256-W6hrBuFVs02o96Bwsw7YjNjY8kXFa4XPmS9XSrNZ3bg="
   },
   "qmlkonsole": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/qmlkonsole-25.04.1.tar.xz",
-    "hash": "sha256-cz3XzHuP6kYM109q025PnkesiSA/K49UbmXO6YQT2oI="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/qmlkonsole-25.04.2.tar.xz",
+    "hash": "sha256-HRtXvE36fUpWurLMVBnsltGScJ3IsJZQE8aVAaym+Uo="
   },
   "qrca": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/qrca-25.04.1.tar.xz",
-    "hash": "sha256-OySTPF6I1NveQsX3bcaBoFjIJMSyLwQV8b5aV+WCpH4="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/qrca-25.04.2.tar.xz",
+    "hash": "sha256-JfXR4CXGsGGtV5j7u7KuhZGqQtAFVuOn8hEK0GIYGiU="
   },
   "rocs": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/rocs-25.04.1.tar.xz",
-    "hash": "sha256-1xv9v9t/tJE0PTAxRP0T3uRdqwVs4leZYR52qtNIccM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/rocs-25.04.2.tar.xz",
+    "hash": "sha256-6NWvbNY80VpBGV8Q8doJKEw+hqH91h1OC+vM0Bs0Nf8="
   },
   "signon-kwallet-extension": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/signon-kwallet-extension-25.04.1.tar.xz",
-    "hash": "sha256-94/Il8ISzg8JnTL8vkpdd81DYHB67iX2hhhhrv11b7o="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/signon-kwallet-extension-25.04.2.tar.xz",
+    "hash": "sha256-6AMuGGLZPAs+DKgul+cZvn4mFkfK4LZvRnMO01msgRI="
   },
   "skanlite": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skanlite-25.04.1.tar.xz",
-    "hash": "sha256-rkFuyQRCoHo0j8uZYDAuCCiSY7nbhzLDyMAbDQ+MNqo="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skanlite-25.04.2.tar.xz",
+    "hash": "sha256-0W1GV6sItYhaerh703au0APhrL96n1HC6fDrH8Xd2WQ="
   },
   "skanpage": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skanpage-25.04.1.tar.xz",
-    "hash": "sha256-BsEamDTL7kV6MWTmJ3oNuj0xbbeBBmLENaqdpQAIiTM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skanpage-25.04.2.tar.xz",
+    "hash": "sha256-W7JjzHrbPlIhF/rOWvpPmGU8noM5f50qoe2Rz5o0RzE="
   },
   "skladnik": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/skladnik-25.04.1.tar.xz",
-    "hash": "sha256-KGVjnCXZ21HDvvABjkVzuMJWgZ8GUEMUwmR/w2KFRq0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/skladnik-25.04.2.tar.xz",
+    "hash": "sha256-OVXFIN3mztNULYIeFONXcBd2DH0odEdLSbBc54f8Kz4="
   },
   "step": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/step-25.04.1.tar.xz",
-    "hash": "sha256-v8E2rClrYTgS0MLml5WDssKFarwF7GBc+CrStPtPGR0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/step-25.04.2.tar.xz",
+    "hash": "sha256-OKbl6vndh+WiGhYjWsMQJrBXsJ6uUDFQdp9RcNvJQH4="
   },
   "svgpart": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/svgpart-25.04.1.tar.xz",
-    "hash": "sha256-owkDx1j8GBgzTeTNb31ypP6aKEIybhh9RC7g55rhyvg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/svgpart-25.04.2.tar.xz",
+    "hash": "sha256-r7pScDFInTIVETTjHCvhMge+HyJO15Y/HYFwoqKNKpw="
   },
   "sweeper": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/sweeper-25.04.1.tar.xz",
-    "hash": "sha256-jGPkE8Oeqzv2Z4Rw+GDQ28bffu12WkJhYLPuRDnG1mQ="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/sweeper-25.04.2.tar.xz",
+    "hash": "sha256-dSkF7hMvSpu093rUcm2Nx/rwMf5VCHJMnCiJwA05vVE="
   },
   "telly-skout": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/telly-skout-25.04.1.tar.xz",
-    "hash": "sha256-Ip5rEPTVu2ibP60nau4zJWuWgG098AX2lpUt0bUDmkM="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/telly-skout-25.04.2.tar.xz",
+    "hash": "sha256-y9WL88hXb7K1q86mAZY2OkNmr+1JFm/z+LrBjiKM9+k="
   },
   "tokodon": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/tokodon-25.04.1.tar.xz",
-    "hash": "sha256-N6hLVd6AhZ6ZAq4m/vt0ht0c1mAPW8w8s+yc5shp9+M="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/tokodon-25.04.2.tar.xz",
+    "hash": "sha256-OZ7SFwimek/D9f3/sWMK8b5qgtUmubZNU+lW7seVS6w="
   },
   "umbrello": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/umbrello-25.04.1.tar.xz",
-    "hash": "sha256-XaX2PbyLVrKcxPfL7tkagKIyFWJ2E/TbtRuiO2icAqU="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/umbrello-25.04.2.tar.xz",
+    "hash": "sha256-A5uXFlRzktcoGr4UQM8kIZyMArWSeLrX8tOmIUVsfSQ="
   },
   "yakuake": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/yakuake-25.04.1.tar.xz",
-    "hash": "sha256-8katM/RnsIc5Ox++Qx99o0dJ1nq7TAAv8jszOFXAid0="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/yakuake-25.04.2.tar.xz",
+    "hash": "sha256-ZfzsKcRCyLVFJ/fQbhJQYL85mXQT9WHhRr5LXL0LuWM="
   },
   "zanshin": {
-    "version": "25.04.1",
-    "url": "mirror://kde/stable/release-service/25.04.1/src/zanshin-25.04.1.tar.xz",
-    "hash": "sha256-fxs+Z2tEWAUktL5z6+EENRTZQSyNV0JhNlB97Lnh4Bg="
+    "version": "25.04.2",
+    "url": "mirror://kde/stable/release-service/25.04.2/src/zanshin-25.04.2.tar.xz",
+    "hash": "sha256-Ceflyk/XiHdyLvu1beXwwL1IEcy/UvT7I+e2Jti9sSI="
   }
 }
\ No newline at end of file

From 39918c58e9fe1a55696008579db7ac5ec8c6742f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 14:37:33 +0000
Subject: [PATCH 1213/1497] clj-kondo: 2025.04.07 -> 2025.06.05

---
 pkgs/by-name/cl/clj-kondo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix
index ab5303e5d991..f2d772b9fd66 100644
--- a/pkgs/by-name/cl/clj-kondo/package.nix
+++ b/pkgs/by-name/cl/clj-kondo/package.nix
@@ -7,11 +7,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "clj-kondo";
-  version = "2025.04.07";
+  version = "2025.06.05";
 
   src = fetchurl {
     url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-yJyRqQglJUiHotB70zga5NhFquHsKgmwT9sryZHEFRU=";
+    sha256 = "sha256-jmQFiL8MFIuMrHPSxW27E7yZIGf+k8J5nFVXgNGIKoM=";
   };
 
   graalvmDrv = graalvmPackages.graalvm-ce;

From adf24a58eca2deb4b7f709c984cae8dcbf6c02cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 14:48:35 +0000
Subject: [PATCH 1214/1497] consul-template: 0.40.0 -> 0.41.0

---
 pkgs/by-name/co/consul-template/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul-template/package.nix b/pkgs/by-name/co/consul-template/package.nix
index ca14013c21b2..cee277012203 100644
--- a/pkgs/by-name/co/consul-template/package.nix
+++ b/pkgs/by-name/co/consul-template/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "consul-template";
-  version = "0.40.0";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "consul-template";
     rev = "v${version}";
-    hash = "sha256-iqBcY7FYCO4qqQRAHxA2sxTnyL5c0vLVWKuhqvX0oJE=";
+    hash = "sha256-rPr69/U7+TZ7snzK8dvyd+5/O9/sqKMY/sIPOGkORs4=";
   };
 
-  vendorHash = "sha256-Slp+x+cYYIC/XgICb9qDdqq1gTDxLNwXyClaWZt1fs8=";
+  vendorHash = "sha256-VUqRNK6OwSVydVbmxDe75JnI16JpnGT+wyAItqz781Q=";
 
   # consul-template tests depend on vault and consul services running to
   # execute tests so we skip them here

From 1a752a03134f80d2a0c133e11f620ae56a0adba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Jun 2025 10:09:08 +0000
Subject: [PATCH 1215/1497] python3Packages.cmd2: 2.5.11 -> 2.6.0

---
 pkgs/development/python-modules/cmd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index ea1ee3098074..8bef95fd7f5b 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "2.5.11";
+  version = "2.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MKDThQIfvkpBFmcoReVpW75W62gvkJYGZ3Y5T5VKdCk=";
+    hash = "sha256-jP+rp4EFJkIcqzv6AQG0kH4SmP8rzYEZYVllourl2V8=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From f7a7614349cd10c67f312dd9767ffc87c9018b3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:02:42 +0000
Subject: [PATCH 1216/1497] vscode-extensions.github.copilot: 1.323.0 ->
 1.326.0

---
 .../editors/vscode/extensions/github.copilot/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
index 668b086c4c78..8c4253b97f92 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot";
-    version = "1.323.0";
-    hash = "sha256-rTAq6snn3HAARrYbMJYy7aZ5rDucLfFS/t01VPjgXAo=";
+    version = "1.326.0";
+    hash = "sha256-bZ8Cm3bowUCWq4mMv/7rWIBOdw1U6UoH7RODz20/r9U=";
   };
 
   meta = {

From 5637f51c4f944299955a6992d5d3b200f47a0682 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:07:43 +0000
Subject: [PATCH 1217/1497] 
 vscode-extensions.amazonwebservices.amazon-q-vscode: 1.69.0 -> 1.70.0

---
 .../extensions/amazonwebservices.amazon-q-vscode/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
index 35472c001333..1a55635b6571 100644
--- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
   mktplcRef = {
     name = "amazon-q-vscode";
     publisher = "AmazonWebServices";
-    version = "1.69.0";
-    hash = "sha256-DmkDkBItpcbCW3pQJ2j4SFJFubSL9jhfF66EDN96W5k=";
+    version = "1.70.0";
+    hash = "sha256-nMAhVl93CImy0tQ6naB2tBAcMVC6Elo2AfvQj3jaEc4=";
   };
 
   meta = {

From 68fb3c059a8408f9f1447e8cda78a4a26136b4c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:14:23 +0000
Subject: [PATCH 1218/1497] vscode-extensions.editorconfig.editorconfig: 0.17.2
 -> 0.17.4

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3bc677bdf632..ad67044c49ff 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1643,8 +1643,8 @@ let
         mktplcRef = {
           publisher = "editorconfig";
           name = "editorconfig";
-          version = "0.17.2";
-          hash = "sha256-Xi2+mN6zjIKm0HWxfRAFs2vYkZ10Gv6poR2b2d8XCug=";
+          version = "0.17.4";
+          hash = "sha256-MYPYhSKAxgaZ0UijxU+xiO4HDPLtXGymhN+2YmTev8M=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog";

From 37841184e9146e840aef6ecb79a02e244d7ec17b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:18:18 +0000
Subject: [PATCH 1219/1497] vscode-extensions.seatonjiang.gitmoji-vscode: 1.2.5
 -> 1.3.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3bc677bdf632..9446945832a2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4301,8 +4301,8 @@ let
         mktplcRef = {
           publisher = "seatonjiang";
           name = "gitmoji-vscode";
-          version = "1.2.5";
-          hash = "sha256-lWd7SyYNxoDauMecJq11akTiwEKBeXuR4htDYCbb6n4=";
+          version = "1.3.0";
+          hash = "sha256-vr6UKd+7g6J8XEY57sCqPpLuxNC4KOvf7nddDKaceaU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog";

From eaf1de36c14abb9edabb3053ae64ccfe49e825b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:20:22 +0000
Subject: [PATCH 1220/1497] vscode-extensions.ms-azuretools.vscode-bicep:
 0.35.1 -> 0.36.1

---
 .../vscode/extensions/ms-azuretools.vscode-bicep/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
index 2b8a3b4a72fa..fe4664ade4b1 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-azuretools";
     name = "vscode-bicep";
-    version = "0.35.1";
-    hash = "sha256-Ggp3Z3pxPMEDxgzjPYNr830wx+upkBP4YAbKiOivbYs=";
+    version = "0.36.1";
+    hash = "sha256-yrSIHTGHZ1m6fLGrtVlT4UHyWpKuzGKdywBDsMepd4g=";
   };
 
   buildInputs = [

From 92b4bea3edf206a4775fff8e8fcf19e336a5fc31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:28:20 +0000
Subject: [PATCH 1221/1497] opengrok: 1.13.30 -> 1.14.0

---
 pkgs/by-name/op/opengrok/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index 045976f632e2..601bf20e835d 100644
--- a/pkgs/by-name/op/opengrok/package.nix
+++ b/pkgs/by-name/op/opengrok/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
-  version = "1.13.30";
+  version = "1.14.0";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-upmmgyZXl4DUn4BjU0b7+T7LYw/JC9cRyiy169Ned/U=";
+    hash = "sha256-9tTUD5mG6xdkGcZkwXyo9YnvlehuHDT/FH6tvua0S7c=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c03708e5ffe14985c7a743b755707ba49256a05a Mon Sep 17 00:00:00 2001
From: Dhruv Gramopadhye <dgramopadhye@gmail.com>
Date: Tue, 3 Jun 2025 02:06:25 -0700
Subject: [PATCH 1222/1497] sdcc: disable broken-on-darwin man pages output

This change is necessary to mitigate the man-page output for sdcc failing on systems with case-insensitive file systems.

This is caused by a regression in sdcc's own build scripts. Once the fix in sdcc is released, versions of sdcc with the fix can be built with man pages on darwin.
---
 pkgs/by-name/sd/sdcc/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index d8361e04a744..78a452012c9b 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -39,11 +39,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1QMEN/tDa7HZOo29v7RrqqYGEzGPT7P1hx1ygV0e7YA=";
   };
 
-  outputs = [
-    "out"
-    "doc"
-    "man"
-  ];
+  # TODO: sdcc version 4.5.0 does not currently produce a man output.
+  # Until the fix to sdcc's makefiles is released, this workaround
+  # conditionally withholds the man output on darwin.
+  #
+  # sdcc's tracking issue:
+  # <https://sourceforge.net/p/sdcc/bugs/3848/>
+  outputs =
+    [
+      "out"
+      "doc"
+    ]
+    ++ lib.optionals (!stdenv.isDarwin) [
+      "man"
+    ];
 
   enableParallelBuilding = true;
 

From 027e00a5ae15d76e44fb8607e28edaafab505105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 5 Jun 2025 15:37:37 +0000
Subject: [PATCH 1223/1497] osu-lazer-bin: 2025.424.0 -> 2025.605.3

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index ff542b27c083..c1a2302b59f3 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.424.0";
+  version = "2025.605.3";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-fgG3SnltGxOYHwos8BTngaW4YrRdpOdURxd73sz0t7o=";
+        hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-0K+uAH4f8JOfzG4J37aGaStpEkH5tdUfHEqsogMtN2I=";
+        hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-8nOoSkNbzEFpDj0FivCYI20tZzT02YHcKZblfEfh+Zo=";
+        hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 81f4163922a6aaf566affc2721d732cb0f9d7f59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:38:16 +0000
Subject: [PATCH 1224/1497] vscode-extensions.twpayne.vscode-testscript: 0.0.5
 -> 0.0.6

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3bc677bdf632..c23c647e9a23 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4940,8 +4940,8 @@ let
         mktplcRef = {
           name = "vscode-testscript";
           publisher = "twpayne";
-          version = "0.0.5";
-          hash = "sha256-rAkwcEmonZArN7Vls8k5ey+6V1b5bICTJoOSxgtnv+A=";
+          version = "0.0.6";
+          hash = "sha256-y8Esm6nnLf+4FPxy4aZxrTPOxx+zoWm7mUrxZ1dsPyM=";
         };
         meta = {
           description = "Syntax highlighting support for testscript";

From b4b768e44e9d7aa1024614ec0f3835469a48c4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 5 Jun 2025 15:38:21 +0000
Subject: [PATCH 1225/1497] osu-lazer: 2025.424.0 -> 2025.605.3

---
 pkgs/by-name/os/osu-lazer/deps.json   | 8 ++++----
 pkgs/by-name/os/osu-lazer/package.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 18dd9bca29e3..b78a98c0bd35 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -651,8 +651,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.419.0",
-    "hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ="
+    "version": "2025.604.1",
+    "hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.321.0",
-    "hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc="
+    "version": "2025.605.0",
+    "hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ="
   },
   {
     "pname": "ppy.osuTK.NS20",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index f24e49e6ca3e..49bff7b68c97 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.424.0";
+  version = "2025.605.3";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-+r7YeaNrUkoYoMzGqhqT+bqdO1UohvJRlAcAskF7vn4=";
+    hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From e7cdaad08176042dc7c13a5fee29e76fbc9fbd88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 15:40:39 +0000
Subject: [PATCH 1226/1497] vscode-extensions.github.copilot-chat: 0.27.2 ->
 0.27.3

---
 .../editors/vscode/extensions/github.copilot-chat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
index 0976cf6d1ea3..7f81447eeb4e 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot-chat";
-    version = "0.27.2";
-    hash = "sha256-nwBDQNs5qrA0TxQZVtuXRiOy0iBNOCFpIim0x2k37YA=";
+    version = "0.27.3";
+    hash = "sha256-b7zvbDzwJcHAp9tn2ibtyeErrH2KNbgqT4Ir7aqLMQg=";
   };
 
   meta = {

From edf597637797d5af079dde91ae8c0a917d0dea97 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:29:23 -0400
Subject: [PATCH 1227/1497] python312Packages.oic: init at 1.7.0

---
 .../python-modules/oic/default.nix            | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/oic/default.nix

diff --git a/pkgs/development/python-modules/oic/default.nix b/pkgs/development/python-modules/oic/default.nix
new file mode 100644
index 000000000000..3d222a196417
--- /dev/null
+++ b/pkgs/development/python-modules/oic/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  requests,
+  pycryptodomex,
+  pydantic-settings,
+  pyjwkest,
+  mako,
+  cryptography,
+  defusedxml,
+
+  # tests
+  pytestCheckHook,
+  freezegun,
+  responses,
+  testfixtures,
+}:
+
+buildPythonPackage rec {
+  pname = "oic";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "CZ-NIC";
+    repo = "pyoidc";
+    tag = version;
+    hash = "sha256-7qEK1HWLEGCKu+gDAfbyT1a+sM9fVOfjtkqZ33GWv6U=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    requests
+    pycryptodomex
+    pydantic-settings
+    pyjwkest
+    mako
+    cryptography
+    defusedxml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    freezegun
+    responses
+    testfixtures
+  ];
+
+  pythonImportsCheck = [ "oic" ];
+
+  meta = {
+    description = "OpenID Connect implementation in Python";
+    homepage = "https://github.com/CZ-NIC/pyoidc";
+    changelog = "https://github.com/CZ-NIC/pyoidc/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9e2c49d1ee5..87345aebe3ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10278,6 +10278,8 @@ self: super: with self; {
 
   ohme = callPackage ../development/python-modules/ohme { };
 
+  oic = callPackage ../development/python-modules/oic { };
+
   okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
 
   okta = callPackage ../development/python-modules/okta { };

From f05a1313c81dd01c14af9504a19cd51778b811db Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:36:32 -0400
Subject: [PATCH 1228/1497] python313Python.gfal2-python: 1.12.2 -> 1.13.0,
 unbroken

---
 pkgs/development/python-modules/gfal2-python/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix
index 52cb5ad1b227..03cd735683ca 100644
--- a/pkgs/development/python-modules/gfal2-python/default.nix
+++ b/pkgs/development/python-modules/gfal2-python/default.nix
@@ -13,12 +13,12 @@
 }:
 buildPythonPackage rec {
   pname = "gfal2-python";
-  version = "1.12.2";
+  version = "1.13.0";
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2-python";
     rev = "v${version}";
-    hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824=";
+    hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE=";
   };
   nativeBuildInputs = [
     cmake
@@ -44,8 +44,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/cern-fts/gfal2-python";
     license = licenses.asl20;
     maintainers = with maintainers; [ ShamrockLee ];
-    # It currently fails to build against Python 3.12 or later,
-    # complaining CMake faililng to find Python include path, library path and site package path.
-    broken = pythonAtLeast "3.12";
   };
 }

From acab3b9488254a7cefda9f501731eacd248bdcba Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 May 2025 22:29:53 -0400
Subject: [PATCH 1229/1497] python312Packages.rucio: init at 32.8.6

---
 .../python-modules/rucio/default.nix          | 114 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 116 insertions(+)
 create mode 100644 pkgs/development/python-modules/rucio/default.nix

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
new file mode 100644
index 000000000000..15ffb3309b94
--- /dev/null
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -0,0 +1,114 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  alembic,
+  argcomplete,
+  boto3,
+  dogpile-cache,
+  flask,
+  geoip2,
+  gfal2-python,
+  google-auth,
+  jsonschema,
+  oic,
+  paramiko,
+  prometheus-client,
+  pymemcache,
+  python-dateutil,
+  python-magic,
+  redis,
+  requests,
+  sqlalchemy,
+  statsd,
+  stomp-py,
+  tabulate,
+  urllib3,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "rucio";
+  version = "32.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rucio";
+    repo = "rucio";
+    tag = version;
+    hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA=";
+  };
+
+  pythonRelaxDeps = [
+    "alembic"
+    "argcomplete"
+    "boto3"
+    "dogpile.cache"
+    "flask"
+    "geoip2"
+    "google-auth"
+    "jsonschema"
+    "oic"
+    "paramiko"
+    "prometheus_client"
+    "python-dateutil"
+    "redis"
+    "requests"
+    "sqlalchemy"
+    "stomp.py"
+    "urllib3"
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    alembic
+    argcomplete
+    boto3
+    dogpile-cache
+    flask
+    geoip2
+    gfal2-python # needed for rucio download
+    google-auth
+    jsonschema
+    oic
+    paramiko
+    prometheus-client
+    pymemcache
+    python-dateutil
+    python-magic
+    redis
+    requests
+    sqlalchemy
+    statsd
+    stomp-py
+    tabulate
+    urllib3
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  doCheck = false; # needs a rucio.cfg
+
+  pythonImportsCheck = [ "rucio" ];
+
+  meta = {
+    description = "Tool for Scientific Data Management";
+    homepage = "http://rucio.cern.ch/";
+    changelog = "https://github.com/rucio/rucio/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87345aebe3ff..3ffd9c838c36 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15431,6 +15431,8 @@ self: super: with self; {
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 
+  rucio = callPackage ../development/python-modules/rucio { };
+
   ruff = callPackage ../development/python-modules/ruff { inherit (pkgs) ruff; };
 
   ruff-api = callPackage ../development/python-modules/ruff-api { };

From ff8ec41663b6e65609698e79f7575630a1435ae4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 4 Jun 2025 15:17:24 -0400
Subject: [PATCH 1230/1497] rucio: init at 32.8.6

---
 pkgs/by-name/ru/rucio/package.nix | 5 +++++
 pkgs/top-level/all-packages.nix   | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/by-name/ru/rucio/package.nix

diff --git a/pkgs/by-name/ru/rucio/package.nix b/pkgs/by-name/ru/rucio/package.nix
new file mode 100644
index 000000000000..c50e22324b5c
--- /dev/null
+++ b/pkgs/by-name/ru/rucio/package.nix
@@ -0,0 +1,5 @@
+{ python3Packages }:
+
+with python3Packages;
+
+toPythonApplication rucio
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 330e39efac2c..1915af7a1110 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4378,6 +4378,12 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  rucio = callPackage ../by-name/ru/rucio/package.nix {
+    # Pinned to python 3.12 while python313Packages.future does not evaluate and
+    # until https://github.com/CZ-NIC/pyoidc/issues/649 is resolved
+    python3Packages = python312Packages;
+  };
+
   rubocop = rubyPackages.rubocop;
 
   ruby-lsp = rubyPackages.ruby-lsp;

From 944e443d09bfb9677b6ae4778b61f4d34563a892 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 16:09:07 +0000
Subject: [PATCH 1231/1497] immich-public-proxy: 1.11.1 -> 1.11.2

---
 pkgs/by-name/im/immich-public-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index 2d5bcf6217f3..11567f7450b9 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.11.1";
+  version = "1.11.2";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-tuF2ienJPQgPSugJQMZsqgPEB+b/zW013Hx9OUTvV6E=";
+    hash = "sha256-4FZa2OZ0It2UF2VHpNFQvkNyuFkTBfjxxxMgKlEzo6I=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-fl2oboifADrWIOKfdKtckuG4jiOSGT8oMRRXeXpJ8E0=";
+  npmDepsHash = "sha256-3cL6bijTEg5m2KhHu6TcjaDF9BP+GYSn09pEtdr3oYI=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''

From 0efe0e3771f9a298dac29c7c48b126879cb73867 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:09:56 +0000
Subject: [PATCH 1232/1497] mihomo-party: 1.7.3 -> 1.7.4

---
 pkgs/by-name/mi/mihomo-party/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
index 1ea7711b30a7..ad4336297b5a 100644
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ b/pkgs/by-name/mi/mihomo-party/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation rec {
   pname = "mihomo-party";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src =
     let
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     fetchurl {
       url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb";
       hash = selectSystem {
-        x86_64-linux = "sha256-IzOW36nJS8SBc3o6/E6eGdBi9I7JApmWydk1x0gEWUw=";
-        aarch64-linux = "sha256-AKOATvsAqX1CkoQrMQzVlbf2x+BzIP4bcj49vPRIkEg=";
+        x86_64-linux = "sha256-pQcDW9ztCTIS5dbmPuvig32cXWfzYiHksa3Jv/O5J7E=";
+        aarch64-linux = "sha256-YHLHJ05sdMj/Wz/WAEianbDIUz9X+AER2wm9T/QHRXI=";
       };
     };
 

From 58000825abf135952822b1fe59235b3520f7656f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 16:18:37 +0000
Subject: [PATCH 1233/1497] lazyjournal: 0.7.8 -> 0.7.9

---
 pkgs/by-name/la/lazyjournal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix
index 2586ade74e3f..a729926ae9d6 100644
--- a/pkgs/by-name/la/lazyjournal/package.nix
+++ b/pkgs/by-name/la/lazyjournal/package.nix
@@ -5,7 +5,7 @@
   nix-update-script,
 }:
 let
-  version = "0.7.8";
+  version = "0.7.9";
 in
 buildGoModule {
   pname = "lazyjournal";
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "Lifailon";
     repo = "lazyjournal";
     tag = version;
-    hash = "sha256-d+wiq6q5lxE17nCKZvl75xBsLMKz1AjxhLFH6GYX7Y0=";
+    hash = "sha256-ohMcTu4sK5M11FY2QkJcHnNxx6pmscdH3S2MbWorUVM=";
   };
 
   vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8=";

From a4f7e10e678b3e3d8da091a4c497ae210f2677eb Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 4 Jun 2025 23:45:45 -0400
Subject: [PATCH 1234/1497] ocamlPackages.mdx: fix Darwin build

The unix set perm test fails on Darwin, so disable tests as I do not
believe there is a way to disable specific tests in OCaml.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/ocaml-modules/mdx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix
index 9d3e992557ef..75c0ac1e7a98 100644
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/pkgs/development/ocaml-modules/mdx/default.nix
@@ -1,11 +1,13 @@
 {
   lib,
+  stdenv,
   fetchurl,
   buildDunePackage,
   ocaml,
   findlib,
   alcotest,
   astring,
+  cmdliner,
   cppo,
   fmt,
   logs,
@@ -34,6 +36,7 @@ buildDunePackage rec {
     fmt
     logs
     csexp
+    cmdliner
     ocaml-version
     camlp-streams
     re
@@ -44,7 +47,7 @@ buildDunePackage rec {
     lwt
   ];
 
-  doCheck = true;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   outputs = [
     "bin"

From 11883cbb64e2ee40ef46c63f8bb1a93668788417 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 17:09:38 +0000
Subject: [PATCH 1235/1497] git-repo: 2.54 -> 2.55.1

---
 pkgs/by-name/gi/git-repo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix
index 41b7a06a50c5..d0bc4e416468 100644
--- a/pkgs/by-name/gi/git-repo/package.nix
+++ b/pkgs/by-name/gi/git-repo/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.54";
+  version = "2.55.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    hash = "sha256-rZCpuJ4TpbVbTxq7qHfhokoj7qCj9/YcA9PGgd9ROCg=";
+    hash = "sha256-hXImDtTwb5Ie/My610g9SYKNFXPf4SxNFcJwEqHEd4Q=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

From 8592018f577e139761d63e88849b666e737fada7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 17:09:42 +0000
Subject: [PATCH 1236/1497] terraform-providers.jetstream: 0.2.0 -> 0.2.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5b73a0df83c4..c1d76c7f97d8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -687,13 +687,13 @@
     "vendorHash": null
   },
   "jetstream": {
-    "hash": "sha256-N/cKiMwPHo8581PFg06RjgOGpGB02/CCARTIFu9kH3s=",
+    "hash": "sha256-I9T5PTNiZfCyPnNiqL8yDhJxpLRQpK7ynZmlr682BnY=",
     "homepage": "https://registry.terraform.io/providers/nats-io/jetstream",
     "owner": "nats-io",
     "repo": "terraform-provider-jetstream",
-    "rev": "v0.2.0",
+    "rev": "v0.2.1",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s="
+    "vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="
   },
   "kafka": {
     "hash": "sha256-RZwag424lXwI1GR/kFOcpv+huaYMyG4jcFjkhvA0Nlc=",

From 02abef532cfa8dad01813fe3604297ca913c82ec Mon Sep 17 00:00:00 2001
From: Denis Bueno <dbueno@users.noreply.github.com>
Date: Thu, 5 Jun 2025 11:15:44 -0600
Subject: [PATCH 1237/1497] nusmw:  2.6.0 -> 2.7.0 (#395267)

---
 pkgs/by-name/nu/nusmv/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/nu/nusmv/package.nix b/pkgs/by-name/nu/nusmv/package.nix
index 456970b7ee0a..0e7bcad3cc9e 100644
--- a/pkgs/by-name/nu/nusmv/package.nix
+++ b/pkgs/by-name/nu/nusmv/package.nix
@@ -7,32 +7,32 @@
 
 stdenv.mkDerivation rec {
   pname = "NuSMV";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src =
     with stdenv;
     fetchurl (
       if isx86_64 && isLinux then
         {
-          url = "https://nusmv.fbk.eu/distrib/NuSMV-${version}-linux64.tar.gz";
-          sha256 = "1370x2vwjndv9ham5q399nn84hvhm1gj1k7pq576qmh4pi12xc8i";
+          url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-linux64.tar.xz";
+          sha256 = "019d1pa5aw58n11is1024hs8d520b3pp2iyix78vp04yv7wd42l8";
         }
-      else if isx86_32 && isLinux then
+      else if isx86_64 && isDarwin then
         {
-          url = "https://nusmv.fbk.eu/distrib/NuSMV-${version}-linux32.tar.gz";
-          sha256 = "1qf41czwbqxlrmv0rv2daxgz2hljza5xks85sx3dhwpjy2iav9jb";
+          url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-macos-universal.tar.xz";
+          sha256 = "098wllv4yx284qv9nsi8kd5pgh10cr1hig01a1p2rxgfmrki52wm";
         }
       else
-        throw "only linux x86_64 and x86_32 are currently supported"
+        throw "only linux and mac x86_64 are currently supported"
     );
 
-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
 
   installPhase = ''
     install -m755 -D bin/NuSMV $out/bin/NuSMV
     install -m755 -D bin/ltl2smv $out/bin/ltl2smv
     cp -r include $out/include
-    cp -r share $out/share
+    cp -r lib $out/lib
   '';
 
   meta = with lib; {
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://nusmv.fbk.eu/";
     maintainers = with maintainers; [ mgttlinger ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 9750d13712f7001cecd64eab39a114c12eb42282 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 6 Jun 2025 01:29:34 +0800
Subject: [PATCH 1238/1497] xva-img: 1.4.2 -> 1.5

Diff: https://github.com/eriklax/xva-img/compare/1.4.2...1.5
---
 pkgs/by-name/xv/xva-img/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix
index 64b3c36e9212..13cf40683e32 100644
--- a/pkgs/by-name/xv/xva-img/package.nix
+++ b/pkgs/by-name/xv/xva-img/package.nix
@@ -1,25 +1,29 @@
 {
-  stdenv,
   lib,
+  stdenv,
   cmake,
   fetchFromGitHub,
   openssl,
+  xxHash,
 }:
 
 stdenv.mkDerivation rec {
   pname = "xva-img";
-  version = "1.4.2";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "eriklax";
     repo = "xva-img";
-    rev = version;
-    sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
+    tag = version;
+    hash = "sha256-YyWfN6VcEABmzHkkoA/kRehLum1UxsNJ58XBs1pl+c8=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    xxHash
+  ];
 
   meta = {
     maintainers = with lib.maintainers; [ willibutz ];

From fa4a777e6b17c5a6a558325959f729050300b09d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 6 Jun 2025 01:35:14 +0800
Subject: [PATCH 1239/1497] sing-box: 1.11.11 -> 1.11.13

---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 867dc573e195..79f8481ad63f 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.11.11";
+  version = "1.11.13";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hdYYjKBXnTqScYTUCfMmXozDD8GtIorLXnsU2Fmwg/c=";
+    hash = "sha256-Pq5ElVDNJTeT4h6ZrupnKlCydxfJ2wAxk/9eZblT4d4=";
   };
 
-  vendorHash = "sha256-/0pwsZbMbyAFXCrukbNf2RmQjQJ1E/ZUwzrC+5NEZcc=";
+  vendorHash = "sha256-/awpe9v+J1O0DKMvi6CNAgJ0mFJaWoXPHzRAk98nQ+Y=";
 
   tags = [
     "with_quic"

From 1389bb0d744efd2b8ff7f8d388b7609afc052dff Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Thu, 5 Jun 2025 20:38:19 +0300
Subject: [PATCH 1240/1497] pulumi-bin: 3.173.0 -> 3.174.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 162 +++++++++++++--------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 6f85173e76e3..4e4b536e998d 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,16 +1,16 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.173.0";
+  version = "3.174.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-linux-x64.tar.gz";
-        sha256 = "0pjiwblw89r615lbfkmwhcyszbn6gk519rkia92phnx6absf7zfa";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-linux-x64.tar.gz";
+        sha256 = "08ancj87d25dpfbm0hidvv1if4jnr1b5186wwhs6pq7xkifk7j6z";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-linux-amd64.tar.gz";
-        sha256 = "046cqacl3lsrjdrgcc9mzr58dimgcsb2dbcradfsz2x2pg9r4i04";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-amd64.tar.gz";
+        sha256 = "0zmylykkr6gfyr9zvi29qn753kn7927y2zwy5781jgidqz2srxqx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-linux-amd64.tar.gz";
@@ -21,32 +21,32 @@
         sha256 = "1ly3rxvfwjjbywbiv3q858qv9mbikyf89byr1x3y8w8wc50sxhyh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-linux-amd64.tar.gz";
-        sha256 = "1fapykfy2jzgygydgmvrlv54bnh1r1xhmvhp70fbz1z6nr7sh89x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-linux-amd64.tar.gz";
+        sha256 = "1xrhiknhi5hvhq33hzjybz52yyfxrvapc24yh1va1d29dr3cj9m6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-linux-amd64.tar.gz";
-        sha256 = "1wj2jkxq6a02c1ibj2gfnkyvlj45p151xh2cnp8s7l9pfi7svcvs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-linux-amd64.tar.gz";
+        sha256 = "157pd0gn64nwym37qxs0klaxlf8vd6bm31msmgdyfj81i7d0a0kp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-linux-amd64.tar.gz";
-        sha256 = "1nzphkx9kvnw341ssbwr289nn867xndjzgjrw807nijp94900pv8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-linux-amd64.tar.gz";
+        sha256 = "06gsifpbf92lyrrjg82akp3iw2n6s8sbh19j6q7218w51lqv1llq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-amd64.tar.gz";
         sha256 = "0jlaj3pz5j0hgnqdg2b1xw9cwlr4i5pvir8flhwvw222nsah15yv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-amd64.tar.gz";
-        sha256 = "0arg0vvwman2gx4fy9y320y055piyyyl62yjbxj3scw31wzysp5w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-amd64.tar.gz";
+        sha256 = "1wn62hc40zvzr6lh81ha0668y89kfdy67nmc6vpb4jwbr5s8zdvi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-linux-amd64.tar.gz";
         sha256 = "05xlk5nsz2b2vv88r42a5zgcm4iq4nic920fjrx1wz00q64bacwz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-linux-amd64.tar.gz";
-        sha256 = "1g553pbvrgcrxfh5z6dxy4vd1j3im19a070jp9krmqrjzincpbbk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-linux-amd64.tar.gz";
+        sha256 = "1r28zsxhjyi1c9nrr8g98m7sp6fpr2pfszsifi2hrji4ffm3c842";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-amd64.tar.gz";
@@ -57,8 +57,8 @@
         sha256 = "1ccjfr1v88hc2x845z7h3bxkgxqn6f134d422qdz9bgqdlyrr2dk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-linux-amd64.tar.gz";
-        sha256 = "1h78r8m93cgdl85xygdya89ws7jdkgnbkj6hk9mc5gbkj2i4img2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-linux-amd64.tar.gz";
+        sha256 = "0janqzfw9q787j2dcmkiqfh1fi9h7c3p8l2wwhz8sxd4v4av1zwh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-linux-amd64.tar.gz";
@@ -73,8 +73,8 @@
         sha256 = "176bpdyhmwb2pyi4k1dc25agpm4spfndjhg1yjwfv3qvlgnzsnlq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-linux-amd64.tar.gz";
-        sha256 = "19vi9dph5h2fawy7smh2pyiwgadsdji6i3bsk88zw9x7jiz3vhkx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-linux-amd64.tar.gz";
+        sha256 = "0kj8shqi51q3055kq6r45pcy9wc5ygd97nv31cz0pcki4pgnx90s";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-amd64.tar.gz";
@@ -113,8 +113,8 @@
         sha256 = "1macxvx93713r38gmx0430sg1ca34rwz6b2rfsp865cha7hpjpfk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-amd64.tar.gz";
-        sha256 = "07s4xmsqjja79pzdh3vj3fq6q3yhnds7xp08x9yzc964c9kzndzs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-amd64.tar.gz";
+        sha256 = "0j73752fpljn2gydw1jzp8dknrvx2qcldjjqmd7yigf9spbnagj5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-amd64.tar.gz";
@@ -163,12 +163,12 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-darwin-x64.tar.gz";
-        sha256 = "0lzabzp1v888vq0gw5y6wkndx531kd2gxixdqd6a222pmysbhw59";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-darwin-x64.tar.gz";
+        sha256 = "0lw460xwhxl2mvvn5j3wb1wk3g3a7k8n7s9qmgs2mnyrc6a7l039";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-darwin-amd64.tar.gz";
-        sha256 = "1g0b1c35n1hdbyw8amkh3j3dgigxj418hdb7cv3q0mab14p47rxj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-amd64.tar.gz";
+        sha256 = "14z6lbqfzx1qg2m7cmk5fax6gxnqchm6pqkjrkwkz1z9ai5wsig7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-darwin-amd64.tar.gz";
@@ -179,32 +179,32 @@
         sha256 = "0m5mfhf67kv2f11c30mn6x9jr3l0gwz29sgs8zi11aa2vw5f0j0g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-darwin-amd64.tar.gz";
-        sha256 = "11288q3k3dq20kggcxif4xv06zk7x2x5xwcj5swr6la7cjq2wvpr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-darwin-amd64.tar.gz";
+        sha256 = "1azx9saxgrama9mpjkbkgbg4w29ybp1b7cjsiajv0wnrfjfbmlsk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-darwin-amd64.tar.gz";
-        sha256 = "1z3mqcxv7xkl8bamgjfq2jlfday0prbfj26hgbs1xgdq9p571x3r";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-darwin-amd64.tar.gz";
+        sha256 = "1qs9qfiqplhbhd0hva7vlr2mg0kgfl91x41sfa43dpn1bhhzgd7w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-darwin-amd64.tar.gz";
-        sha256 = "0nhs9nj5fj2pbvvrygq1prglfsk0hr2mspc92743n6mn93k32vb8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-darwin-amd64.tar.gz";
+        sha256 = "0i2gvwv0qhcvnfrm65p5qa82sax2my2dsnhk6n1bxq1f7hxn7rqp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-amd64.tar.gz";
         sha256 = "1nvznxmdpb92s7c3fi8arz8kyzwdnvhhy8j4j9s5sqw5bn13bm3a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-amd64.tar.gz";
-        sha256 = "1y8k69ynnjkqr7vwcnv6vgirnlgixplnzzq87ywb592lh7vp9b94";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-amd64.tar.gz";
+        sha256 = "1dwn0xjr0p6rd2r5x59flscfg911xaahp3bvhbkrz8pgkkg6ygcz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-darwin-amd64.tar.gz";
         sha256 = "1596zgpi09c14xghcby80fijy743pc68vs2xpdy6xbcm4k29srqn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-darwin-amd64.tar.gz";
-        sha256 = "1b4ivxds2s03xl65qiinw1vx4phjn2bplxhyl0aw0h0g1155h8j3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-darwin-amd64.tar.gz";
+        sha256 = "1972648yj3pj7l0na2hflv9hy1s8fhg7166kraim8mnmm8ngzgbk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-amd64.tar.gz";
@@ -215,8 +215,8 @@
         sha256 = "0w71myfi4j5kwqrdjf7s8674m7zbfzpk2lz10iyhdr404jawb7rg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-darwin-amd64.tar.gz";
-        sha256 = "0nxz9qgmf9i5zp7am8ca1w9dv0m5vw1y84q6aisbrsi04qlkc9z3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-darwin-amd64.tar.gz";
+        sha256 = "0cxx27nhi8z3k2bqabdy0kkb6l2vlr78fv4yn2g2nxp1pdkjh77q";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-darwin-amd64.tar.gz";
@@ -231,8 +231,8 @@
         sha256 = "049y0l7hyng3kqkh5hkxzw6k743dy1zik0xgbyv3iarg8gxi6yb8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-darwin-amd64.tar.gz";
-        sha256 = "0y3kdll7dw9k2szfyc76diljxcf8ppaaq4gjl3fxnrha44wvpcq7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-darwin-amd64.tar.gz";
+        sha256 = "1xhy4va19y8ybgzcby4gy2ndwm8z49qd6hx9mzh42ra6wkrfrrvh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-amd64.tar.gz";
@@ -271,8 +271,8 @@
         sha256 = "0c2gqgf9d47ffpljq9h0z3m9gljw2b9fnav68mskh0cak8zgfhlz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-amd64.tar.gz";
-        sha256 = "17m6qcpkhavgprqbskad5ky3zs9230bpiadmz3y552z4yci4pmdk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-amd64.tar.gz";
+        sha256 = "1pfkqfviizl1n0kvnm90r02vrnmda0k4a7bhy52dask4vvb3g387";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-amd64.tar.gz";
@@ -321,12 +321,12 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-linux-arm64.tar.gz";
-        sha256 = "1v9pjapx7qh3qdngsy7hjb7lyq0sv8hcyw2vlm3ar6xmz1fgzxw4";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-linux-arm64.tar.gz";
+        sha256 = "0yarz9f8rvw5m97nsg4z2ar7hf5myz3wcf5prsj6v80w19igdmwz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-linux-arm64.tar.gz";
-        sha256 = "1zzg4igsqnnrv4wby9bl3z63am6wayw8kyaf51qz6napp4skwqby";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-linux-arm64.tar.gz";
+        sha256 = "1z72zkrpa0mz15q22r7vrkgb5yy8nfs6pp74flvr0alf4119gi49";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-linux-arm64.tar.gz";
@@ -337,32 +337,32 @@
         sha256 = "0vfspacdpkal3rmnq33vqrn7iwc3havpyqzwl4xnr5ndrizf8afn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-linux-arm64.tar.gz";
-        sha256 = "1087l6716vy72dcm648g36mlnvx7m3nw778bby8azy5almq4v9nr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-linux-arm64.tar.gz";
+        sha256 = "1g10k6qzbk2ajbm31j4hmc8pzv8qb913jc0w9hvxwm2aqv7xklqi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-linux-arm64.tar.gz";
-        sha256 = "1jgj636a6g7gyz0pq5m2drk99f8dczzzpx48mr7mxglqv0h9c8sr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-linux-arm64.tar.gz";
+        sha256 = "1rhj8fadp3q6i975kbr1r17i7lzwg9wr6v0pc6vmw93w2hsgplan";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-linux-arm64.tar.gz";
-        sha256 = "19z7v1fazcv4wsybhsn0x2allrfpsw3drm8wh7lh5kdzcphw9agi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-linux-arm64.tar.gz";
+        sha256 = "0n9n27g1lvpwqzpaargxqnyi2jj6cvlbcbzd8d56vcx0k8bals84";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-arm64.tar.gz";
         sha256 = "17ali0a6dwrmwka319ld7vwlrkhxic6yim21niphcda9gi9v1cs9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-linux-arm64.tar.gz";
-        sha256 = "0wwv7zs4pmnwdy3hzijhihi96jdjv4wdm4ky1wj8krwpbhw7kjl3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-linux-arm64.tar.gz";
+        sha256 = "0bqqng9mpv7k6npdq01w058ram5zmfvand39s075hh73xc6hp5c5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-linux-arm64.tar.gz";
         sha256 = "094fp0y2a4phd6zk7hz0x6iynpshh3sx6z9wyi2swacddjj646cx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-linux-arm64.tar.gz";
-        sha256 = "06gvjl7vyws1bdndjxnhy078mc4pfd4vdvnp0lsni3dzy6s87ls3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-linux-arm64.tar.gz";
+        sha256 = "15rw8fsmg3ndp1gxcg6c3m09bq1wwn0bi7a6fb8y506s21bi6sfj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-arm64.tar.gz";
@@ -373,8 +373,8 @@
         sha256 = "0mazlc88jcbpikvdcph0qk64riq5lfkcypgbsmckwz0ij9y7x15h";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-linux-arm64.tar.gz";
-        sha256 = "0vh94fsv4jfam7ynaxqay0ilxmx1rxx95dh9sxymr5bhrn1vjr6k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-linux-arm64.tar.gz";
+        sha256 = "1vxvwxp7z45nzlahqkfi8ywy5lvkmmy64mf2byg582mxzvkcpsjc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-linux-arm64.tar.gz";
@@ -389,8 +389,8 @@
         sha256 = "0zqyfn995lxmfiji9di44wgz0jmc9adf63pmhjzsi5kqfw5irrkw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-linux-arm64.tar.gz";
-        sha256 = "0qs5vvdjfmpvnx1ap3jpmd8lvwvhz2lmgbwygpbb7ddzxshpmfi9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-linux-arm64.tar.gz";
+        sha256 = "0bgd6vk0yqiwfibkhabcxh9kqpyq23b4blzai8cql6f06mffzlrd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-arm64.tar.gz";
@@ -429,8 +429,8 @@
         sha256 = "1sy9nkilsmvwd9bv8s65x32vfyc8b1qbwj6jnrdjk1y3a2sm1f81";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-arm64.tar.gz";
-        sha256 = "0xhlgdh05i5la27d4440n87kfv4rv9aragqrijw3wyw0fd0zy50s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-arm64.tar.gz";
+        sha256 = "12j121fv3n2p54cmqjbx7yc7p8hqi7sb7bf4pcz6v1mmzxfsfz1c";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-arm64.tar.gz";
@@ -479,12 +479,12 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.173.0-darwin-arm64.tar.gz";
-        sha256 = "1qjmjf1kq6cnjqqdgka11vsk48iqkzs1wckksacl8w5inx1cflkc";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.174.0-darwin-arm64.tar.gz";
+        sha256 = "0pbc1gk453g12p0x79d4gl8f9bcirqs6my28fxdhn36b565l0q2r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.38.0-darwin-arm64.tar.gz";
-        sha256 = "0z35yjjpwas3yzr0zj4z9jigx6b6mmip7xzv6lbr3a08g6fly6nz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.39.0-darwin-arm64.tar.gz";
+        sha256 = "0mbyiyasc6z4acyh6a29xbxd269pdbinarxi4g4czvvg2vd76fi1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v8.1.0-darwin-arm64.tar.gz";
@@ -495,32 +495,32 @@
         sha256 = "1wm2kjbclb31np0hb2a5y0v9cpk5pv3bysf0g5wk8pfr1gnaigpa";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.3-darwin-arm64.tar.gz";
-        sha256 = "01j87fv5i7n9wwp0r8hxscp4gn8hssi0l9a7q90g89ffb18y878x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.4-darwin-arm64.tar.gz";
+        sha256 = "0hzl05y19gzr7wdd4myqlmdnx9ax7a0pz6h9s787gpmw4gjnv861";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.21.0-darwin-arm64.tar.gz";
-        sha256 = "16b1d99k9p34xjl6vjampa1lwhwjw2y38fkds8d15cvg1z725ypf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.22.0-darwin-arm64.tar.gz";
+        sha256 = "0lj9wv18fjsv6xwszzyizibkaf2g4s19rjmldzb034xbdq8jpqbz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.81.0-darwin-arm64.tar.gz";
-        sha256 = "124alv879949ab2g0a3l0ji5bn047wdz5hb11g8rpaq11378cmlq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.82.1-darwin-arm64.tar.gz";
+        sha256 = "17m7p7n25fymhs7dgsgxakq3cnp15ncqc69alsxhi2n6f5nzhxks";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-arm64.tar.gz";
         sha256 = "099z1by8w9vgna544d8q1v3gnp3jbssj01k75kck2sm13954idli";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.9.0-darwin-arm64.tar.gz";
-        sha256 = "0ivjp7sq86gyy38vmy3cmbl1b3zwzij5dxwh6ffp5jf6bazm76wr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.0-darwin-arm64.tar.gz";
+        sha256 = "1j3anypzdv3qicg5nagn6zckxr877f39kzazdi0slki9cpwnzkhi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.23.0-darwin-arm64.tar.gz";
         sha256 = "1drmnhr9svpyj4pxi1czwc3qn4ha78lcb7sqwfwa428h0m0appms";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.0-darwin-arm64.tar.gz";
-        sha256 = "0fxdprj20k532qvma5gcz0fl9bvf6rwz0n5ax96ar45m5i6wrmww";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.2.1-darwin-arm64.tar.gz";
+        sha256 = "0gv7dsk35hhbfs2xx15x6mmdvbizfivnfa2ycpk38f2ihjbn5sdl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-arm64.tar.gz";
@@ -531,8 +531,8 @@
         sha256 = "1z6j18n9w9gh7zw2d76ra623miqc0dy4gf3p61x3iqhid2znc5pl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.45.0-darwin-arm64.tar.gz";
-        sha256 = "0r57qxq26fka8i1gl71xsjc0pbnaj2yj5nqrac9yzr5qvb84k0c0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.46.0-darwin-arm64.tar.gz";
+        sha256 = "1zj4qmvv7r4f19hdk8lxm7h28vprnwyih3h45si7dbifm311gdl1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.7.0-darwin-arm64.tar.gz";
@@ -547,8 +547,8 @@
         sha256 = "0lcx81s0qa13cnkm1sh640a15z650vsqxi5a59zgzq6b0r151h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.32.1-darwin-arm64.tar.gz";
-        sha256 = "07pwsqr2vql3gq7k6qyl26saaykc6qqhxjh5smbkx5blil9bgc5s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.33.0-darwin-arm64.tar.gz";
+        sha256 = "0a4vidalqzfnkwdnyalmm5p8vwq91qfbqiw6dpcjmhi4airi2ilj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-arm64.tar.gz";
@@ -587,8 +587,8 @@
         sha256 = "07mmlcralx8qq5zvjlhlnp8a9vqkm78316aclhs5ys3l1xmhj6j6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-arm64.tar.gz";
-        sha256 = "0my26549lzvc4j7c3xmp6z82qj126x8sx9cj1rz8a7alawn1v5b0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-arm64.tar.gz";
+        sha256 = "1braby52wys2ddfbb99yhhn6n3izr4sc70b7jl6ryrb6b17qqk0f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-arm64.tar.gz";

From 105740103255df4af680d3621eade113f733c4f9 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Fri, 6 Jun 2025 01:42:15 +0800
Subject: [PATCH 1241/1497] typstyle: 0.13.9 -> 0.13.10

---
 pkgs/by-name/ty/typstyle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index c44d84075025..078f44f4d80a 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.9";
+  version = "0.13.10";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FQ/YBjhFaG9PGb8H3LnOlDcgWrYMy1VvFCHJlLEH32k=";
+    hash = "sha256-q1WnpjN9Ue0yTm6q5hmcVrDj5oxUhyY71GiiVn1QcpM=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-btybQpV5Rl9qgd6+4U4smGpr1RqMlXN82m+N7nni2yA=";
+  cargoHash = "sha256-Ov+RpV/ONjY/zc8PbIo/TXS3TzJUokaccrFfTEjpxok=";
 
   # Disabling tests requiring network access
   checkFlags = [

From 8e690ed6fc02c77488d3cd3d811b5d9ded400b8b Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 24 May 2025 04:33:18 +0200
Subject: [PATCH 1242/1497] redmine: Move optional gems to Gemfile.local

In order to make the diff of the original Gemfile and this one a bit
smaller, use Gemfile.local for optional gems like webrick.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/re/redmine/Gemfile       | 2 --
 pkgs/by-name/re/redmine/Gemfile.local | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/re/redmine/Gemfile.local

diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile
index 8d0d2183e7a2..19138ab112f1 100644
--- a/pkgs/by-name/re/redmine/Gemfile
+++ b/pkgs/by-name/re/redmine/Gemfile
@@ -82,8 +82,6 @@ group :test do
   gem 'bundle-audit', require: false
 end
 
-gem "webrick"
-
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exist?(local_gemfile)
   eval_gemfile local_gemfile
diff --git a/pkgs/by-name/re/redmine/Gemfile.local b/pkgs/by-name/re/redmine/Gemfile.local
new file mode 100644
index 000000000000..192455d12b9b
--- /dev/null
+++ b/pkgs/by-name/re/redmine/Gemfile.local
@@ -0,0 +1 @@
+gem 'webrick'

From 22b88ba79d8feb71704fa1baccae978cf9b8d1ab Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 5 Jun 2025 09:11:29 -0700
Subject: [PATCH 1243/1497] treewide: adjust meta descriptions to avoid
 definite or indefinite articles

This patch was produced in Vim by me, a human being. All errors are the fault of the operator. I did try to be careful.

Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
Co-authored-by: dotlambda <nix@dotlambda.de>
---
 pkgs/by-name/_2/_2ship2harkinian/package.nix                  | 2 +-
 pkgs/by-name/ab/abaddon/package.nix                           | 2 +-
 pkgs/by-name/ad/adios2/package.nix                            | 2 +-
 pkgs/by-name/ai/air-formatter/package.nix                     | 2 +-
 pkgs/by-name/am/amphetype/package.nix                         | 2 +-
 pkgs/by-name/ap/apache-orc/package.nix                        | 2 +-
 pkgs/by-name/ap/appflowy/package.nix                          | 2 +-
 pkgs/by-name/aq/aquamarine/package.nix                        | 2 +-
 pkgs/by-name/ar/ares-cli/package.nix                          | 2 +-
 pkgs/by-name/ar/arkenfox-userjs/package.nix                   | 2 +-
 pkgs/by-name/as/astro-language-server/package.nix             | 2 +-
 pkgs/by-name/au/authentik/ldap.nix                            | 2 +-
 pkgs/by-name/av/avalonia/package.nix                          | 2 +-
 pkgs/by-name/av/avml/package.nix                              | 2 +-
 pkgs/by-name/aw/aws-vault/package.nix                         | 2 +-
 pkgs/by-name/az/azahar/package.nix                            | 2 +-
 pkgs/by-name/az/azure-cli/extensions-manual.nix               | 2 +-
 pkgs/by-name/az/azurite/package.nix                           | 2 +-
 pkgs/by-name/ba/balls/package.nix                             | 2 +-
 pkgs/by-name/ba/basalt-monado/package.nix                     | 2 +-
 pkgs/by-name/ba/bash-language-server/package.nix              | 2 +-
 pkgs/by-name/bi/bitbox-bridge/package.nix                     | 2 +-
 pkgs/by-name/bl/blackvoxel/package.nix                        | 2 +-
 pkgs/by-name/bl/blastem/package.nix                           | 2 +-
 pkgs/by-name/bl/blendfarm/package.nix                         | 2 +-
 pkgs/by-name/bo/bolt-launcher/package.nix                     | 2 +-
 pkgs/by-name/br/brainflow/package.nix                         | 2 +-
 pkgs/by-name/bs/bsky-cli/package.nix                          | 2 +-
 pkgs/by-name/bu/buffybox/package.nix                          | 2 +-
 pkgs/by-name/bu/burpsuite/package.nix                         | 2 +-
 pkgs/by-name/ca/cabinpkg/package.nix                          | 2 +-
 pkgs/by-name/ca/camunda-modeler/package.nix                   | 2 +-
 pkgs/by-name/ca/catamaran/package.nix                         | 2 +-
 pkgs/by-name/ca/catppuccin-whiskers/package.nix               | 2 +-
 pkgs/by-name/cc/cctools/package.nix                           | 2 +-
 pkgs/by-name/cf/cfonts/package.nix                            | 2 +-
 pkgs/by-name/ch/chamber/package.nix                           | 2 +-
 pkgs/by-name/cl/clang-tidy-sarif/package.nix                  | 2 +-
 pkgs/by-name/cl/claude-code/package.nix                       | 2 +-
 pkgs/by-name/cl/clifm/package.nix                             | 2 +-
 pkgs/by-name/cl/clippy-sarif/package.nix                      | 2 +-
 pkgs/by-name/co/code2prompt/package.nix                       | 2 +-
 pkgs/by-name/co/cope/package.nix                              | 2 +-
 pkgs/by-name/co/courier-unicode/package.nix                   | 2 +-
 pkgs/by-name/cp/cppad/package.nix                             | 2 +-
 pkgs/by-name/cp/cpu_features/package.nix                      | 2 +-
 pkgs/by-name/cr/crow/package.nix                              | 2 +-
 pkgs/by-name/ct/ctune/package.nix                             | 2 +-
 pkgs/by-name/cu/culvert/package.nix                           | 2 +-
 pkgs/by-name/cu/cutentr/package.nix                           | 2 +-
 pkgs/by-name/db/dbus-broker/package.nix                       | 2 +-
 pkgs/by-name/df/dfl-ipc/package.nix                           | 2 +-
 pkgs/by-name/di/di-tui/package.nix                            | 2 +-
 pkgs/by-name/di/didder/package.nix                            | 2 +-
 pkgs/by-name/di/dinit/package.nix                             | 2 +-
 pkgs/by-name/di/distrobox-tui/package.nix                     | 2 +-
 pkgs/by-name/di/dita-ot/package.nix                           | 2 +-
 pkgs/by-name/dn/dnss/package.nix                              | 2 +-
 pkgs/by-name/do/dotnet-ef/package.nix                         | 2 +-
 pkgs/by-name/dr/draupnir/package.nix                          | 2 +-
 pkgs/by-name/du/dut/package.nix                               | 2 +-
 pkgs/by-name/ed/edido/package.nix                             | 2 +-
 pkgs/by-name/ed/edukai/package.nix                            | 2 +-
 pkgs/by-name/ed/eduli/package.nix                             | 2 +-
 pkgs/by-name/ed/edusong/package.nix                           | 2 +-
 pkgs/by-name/el/element-desktop/package.nix                   | 2 +-
 pkgs/by-name/el/elm-land/package.nix                          | 2 +-
 pkgs/by-name/em/ember-cli/package.nix                         | 2 +-
 pkgs/by-name/en/encrypted-dns-server/package.nix              | 2 +-
 pkgs/by-name/eq/equicord/package.nix                          | 2 +-
 pkgs/by-name/er/erlang-language-platform/package.nix          | 2 +-
 pkgs/by-name/ev/everest-mons/package.nix                      | 2 +-
 pkgs/by-name/f1/f1viewer/package.nix                          | 2 +-
 pkgs/by-name/fa/fastfetch/package.nix                         | 2 +-
 pkgs/by-name/fa/fastqc/package.nix                            | 2 +-
 pkgs/by-name/fa/faust2/package.nix                            | 2 +-
 pkgs/by-name/fc/fcitx5-fluent/package.nix                     | 2 +-
 pkgs/by-name/ff/ffts/package.nix                              | 2 +-
 pkgs/by-name/fs/fscrypt-experimental/package.nix              | 2 +-
 pkgs/by-name/gd/gdmap/package.nix                             | 2 +-
 pkgs/by-name/gi/git-toolbelt/package.nix                      | 2 +-
 pkgs/by-name/gi/git-wait/package.nix                          | 2 +-
 pkgs/by-name/gi/gitnuro/package.nix                           | 2 +-
 pkgs/by-name/gl/glasskube/package.nix                         | 2 +-
 pkgs/by-name/gn/gnome-clocks/package.nix                      | 2 +-
 pkgs/by-name/go/gocatcli/package.nix                          | 2 +-
 pkgs/by-name/go/gomuks/package.nix                            | 2 +-
 pkgs/by-name/go/gopro-tool/package.nix                        | 2 +-
 pkgs/by-name/gp/gpauth/package.nix                            | 2 +-
 pkgs/by-name/gr/gren/generated-package.nix                    | 2 +-
 pkgs/by-name/gr/grpc-gateway/package.nix                      | 2 +-
 pkgs/by-name/gu/guile-json-rpc/package.nix                    | 2 +-
 pkgs/by-name/gu/guile-lsp-server/package.nix                  | 2 +-
 pkgs/by-name/gu/guile-semver/package.nix                      | 2 +-
 pkgs/by-name/ha/hadolint-sarif/package.nix                    | 2 +-
 pkgs/by-name/ha/harlequin/package.nix                         | 2 +-
 pkgs/by-name/hd/hdfview/package.nix                           | 2 +-
 pkgs/by-name/he/headset-charge-indicator/package.nix          | 2 +-
 pkgs/by-name/he/heimdall-proxy/package.nix                    | 2 +-
 pkgs/by-name/he/heptabase/package.nix                         | 2 +-
 pkgs/by-name/he/hexxy/package.nix                             | 2 +-
 pkgs/by-name/hm/hmcl/package.nix                              | 2 +-
 pkgs/by-name/ho/homer/package.nix                             | 2 +-
 pkgs/by-name/ho/honggfuzz/package.nix                         | 2 +-
 pkgs/by-name/ht/hterm/package.nix                             | 2 +-
 pkgs/by-name/hy/hyprland-qt-support/package.nix               | 2 +-
 pkgs/by-name/hy/hyprprop/package.nix                          | 2 +-
 pkgs/by-name/hy/hyprsysteminfo/package.nix                    | 2 +-
 pkgs/by-name/im/imsprog/package.nix                           | 2 +-
 pkgs/by-name/is/isabelle/package.nix                          | 2 +-
 pkgs/by-name/jj/jjui/package.nix                              | 2 +-
 pkgs/by-name/ka/kanidm-provision/package.nix                  | 2 +-
 pkgs/by-name/kc/kcl-language-server/package.nix               | 2 +-
 pkgs/by-name/kc/kcl/package.nix                               | 2 +-
 pkgs/by-name/kc/kclvm/package.nix                             | 2 +-
 pkgs/by-name/kc/kclvm_cli/package.nix                         | 2 +-
 pkgs/by-name/ki/kitex/package.nix                             | 2 +-
 pkgs/by-name/ki/kitty/package.nix                             | 2 +-
 pkgs/by-name/ko/koreader/package.nix                          | 2 +-
 pkgs/by-name/ku/kube-capacity/package.nix                     | 2 +-
 pkgs/by-name/ku/kubefetch/package.nix                         | 2 +-
 pkgs/by-name/ku/kuro/package.nix                              | 2 +-
 pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix | 2 +-
 pkgs/by-name/la/lasuite-docs-frontend/package.nix             | 2 +-
 pkgs/by-name/la/lasuite-docs/package.nix                      | 2 +-
 pkgs/by-name/la/lauti/package.nix                             | 2 +-
 pkgs/by-name/la/lazysql/package.nix                           | 2 +-
 pkgs/by-name/ld/ld64/package.nix                              | 2 +-
 pkgs/by-name/le/leetgo/package.nix                            | 2 +-
 pkgs/by-name/li/liana/package.nix                             | 2 +-
 pkgs/by-name/li/lib25519/package.nix                          | 2 +-
 pkgs/by-name/li/libetebase/package.nix                        | 2 +-
 pkgs/by-name/li/libgen-cli/package.nix                        | 2 +-
 pkgs/by-name/li/libnop/package.nix                            | 2 +-
 pkgs/by-name/li/libpisp/package.nix                           | 2 +-
 pkgs/by-name/li/librandombytes/package.nix                    | 2 +-
 pkgs/by-name/li/librearp-lv2/package.nix                      | 2 +-
 pkgs/by-name/li/librearp/package.nix                          | 2 +-
 pkgs/by-name/li/libstudxml/package.nix                        | 2 +-
 pkgs/by-name/li/littlenavmap/atools.nix                       | 2 +-
 pkgs/by-name/li/littlenavmap/package.nix                      | 2 +-
 pkgs/by-name/lo/lorien/package.nix                            | 2 +-
 pkgs/by-name/lp/lprobe/package.nix                            | 2 +-
 pkgs/by-name/lu/luanti/package.nix                            | 2 +-
 pkgs/by-name/lu/lumafly/package.nix                           | 2 +-
 pkgs/by-name/ly/lyra-cursors/package.nix                      | 2 +-
 pkgs/by-name/ma/mackup/package.nix                            | 2 +-
 pkgs/by-name/ma/mangl/package.nix                             | 2 +-
 pkgs/by-name/ma/marble-marcher-ce/package.nix                 | 2 +-
 pkgs/by-name/ma/markdown-code-runner/package.nix              | 2 +-
 pkgs/by-name/ma/mars-mips/package.nix                         | 2 +-
 pkgs/by-name/ma/maxcso/package.nix                            | 2 +-
 pkgs/by-name/mc/mcphost/package.nix                           | 2 +-
 pkgs/by-name/me/melos/package.nix                             | 2 +-
 pkgs/by-name/me/mesonlsp/package.nix                          | 2 +-
 pkgs/by-name/mi/min/package.nix                               | 2 +-
 pkgs/by-name/mi/mitm-cache/package.nix                        | 2 +-
 pkgs/by-name/mo/moonpalace/package.nix                        | 2 +-
 pkgs/by-name/mo/mov-cli/mov-cli-test.nix                      | 2 +-
 pkgs/by-name/mp/mpv-subs-popout/package.nix                   | 2 +-
 pkgs/by-name/mq/mqtt-explorer/package.nix                     | 2 +-
 pkgs/by-name/mu/music-assistant/frontend.nix                  | 2 +-
 pkgs/by-name/mu/musl-obstack/package.nix                      | 2 +-
 pkgs/by-name/mv/mvnd/package.nix                              | 2 +-
 pkgs/by-name/nb/nbsdgames/package.nix                         | 2 +-
 pkgs/by-name/ne/next-ls/package.nix                           | 2 +-
 pkgs/by-name/ni/nixos-firewall-tool/package.nix               | 2 +-
 pkgs/by-name/ni/nixos-install-tools/package.nix               | 2 +-
 pkgs/by-name/nt/ntfy-alertmanager/package.nix                 | 2 +-
 pkgs/by-name/nu/nuv/package.nix                               | 2 +-
 pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix              | 2 +-
 pkgs/by-name/ob/objfw/package.nix                             | 2 +-
 pkgs/by-name/oc/ocelot-desktop/package.nix                    | 2 +-
 pkgs/by-name/om/omnom/package.nix                             | 2 +-
 pkgs/by-name/on/oncall/package.nix                            | 2 +-
 pkgs/by-name/op/opa-envoy-plugin/package.nix                  | 2 +-
 pkgs/by-name/op/openbgpd/package.nix                          | 2 +-
 pkgs/by-name/op/opensupaplex/package.nix                      | 2 +-
 pkgs/by-name/op/optional-lite/package.nix                     | 2 +-
 pkgs/by-name/os/osquery/toolchain-bin.nix                     | 2 +-
 pkgs/by-name/ov/overskride/package.nix                        | 2 +-
 pkgs/by-name/ox/oxide-rs/package.nix                          | 2 +-
 pkgs/by-name/pa/patchcil/package.nix                          | 2 +-
 pkgs/by-name/pa/paup-cli/package.nix                          | 2 +-
 pkgs/by-name/pe/peertube-viewer/package.nix                   | 2 +-
 pkgs/by-name/pe/perses/package.nix                            | 2 +-
 pkgs/by-name/ph/photini/package.nix                           | 2 +-
 pkgs/by-name/pi/piano-rs/package.nix                          | 2 +-
 pkgs/by-name/pi/pihole/package.nix                            | 2 +-
 pkgs/by-name/pi/piscope/package.nix                           | 2 +-
 pkgs/by-name/po/podman-desktop/package.nix                    | 2 +-
 pkgs/by-name/po/polarity/package.nix                          | 2 +-
 pkgs/by-name/po/popcorntime/package.nix                       | 2 +-
 pkgs/by-name/pp/pplatex/package.nix                           | 2 +-
 pkgs/by-name/pr/premid/package.nix                            | 2 +-
 pkgs/by-name/pr/pretty-php/package.nix                        | 2 +-
 pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix          | 2 +-
 pkgs/by-name/pr/protege/package.nix                           | 2 +-
 pkgs/by-name/pr/protoc-gen-elixir/package.nix                 | 2 +-
 pkgs/by-name/pr/proxsuite/package.nix                         | 2 +-
 pkgs/by-name/py/pymol/package.nix                             | 2 +-
 pkgs/by-name/py/pysolfc/package.nix                           | 2 +-
 pkgs/by-name/py/pyzy/package.nix                              | 2 +-
 pkgs/by-name/qu/quark-goldleaf/package.nix                    | 2 +-
 pkgs/by-name/ra/rainfrog/package.nix                          | 2 +-
 pkgs/by-name/ra/raygui/package.nix                            | 2 +-
 pkgs/by-name/re/realm/package.nix                             | 2 +-
 pkgs/by-name/re/redact/package.nix                            | 2 +-
 pkgs/by-name/re/restic-browser/package.nix                    | 2 +-
 pkgs/by-name/re/rewritefs/package.nix                         | 2 +-
 pkgs/by-name/rp/rpm-sequoia/package.nix                       | 2 +-
 pkgs/by-name/ru/rundeck-cli/package.nix                       | 2 +-
 pkgs/by-name/ru/rush-parallel/package.nix                     | 2 +-
 pkgs/by-name/ru/rustmission/package.nix                       | 2 +-
 pkgs/by-name/sa/sarif-fmt/package.nix                         | 2 +-
 pkgs/by-name/sa/satdump/package.nix                           | 2 +-
 pkgs/by-name/sb/sbom4python/package.nix                       | 2 +-
 pkgs/by-name/sb/sbt-extras/package.nix                        | 2 +-
 pkgs/by-name/sc/scitokens-cpp/package.nix                     | 2 +-
 pkgs/by-name/se/seq-cli/package.nix                           | 2 +-
 pkgs/by-name/se/serie/package.nix                             | 2 +-
 pkgs/by-name/se/servo/package.nix                             | 2 +-
 pkgs/by-name/sh/shader-slang/package.nix                      | 2 +-
 pkgs/by-name/sh/shellspec/package.nix                         | 2 +-
 pkgs/by-name/sh/shipwright/package.nix                        | 2 +-
 pkgs/by-name/sl/sleqp/package.nix                             | 2 +-
 pkgs/by-name/sm/smartdns/package.nix                          | 2 +-
 pkgs/by-name/sn/snapdragon-profiler/package.nix               | 2 +-
 pkgs/by-name/so/source-meta-json-schema/package.nix           | 2 +-
 pkgs/by-name/sp/sparrow3d/package.nix                         | 2 +-
 pkgs/by-name/sp/spip/package.nix                              | 2 +-
 pkgs/by-name/sp/splash/package.nix                            | 2 +-
 pkgs/by-name/sr/srgn/package.nix                              | 2 +-
 pkgs/by-name/st/stardust-xr-flatland/package.nix              | 2 +-
 pkgs/by-name/st/stardust-xr-kiara/package.nix                 | 2 +-
 pkgs/by-name/st/stm32cubemx/package.nix                       | 2 +-
 pkgs/by-name/st/string-view-lite/package.nix                  | 2 +-
 pkgs/by-name/st/stylelint-lsp/package.nix                     | 2 +-
 pkgs/by-name/su/subtitleedit/package.nix                      | 2 +-
 pkgs/by-name/su/supermariowar/package.nix                     | 2 +-
 pkgs/by-name/su/supersonic/package.nix                        | 2 +-
 pkgs/by-name/su/sus-compiler/package.nix                      | 2 +-
 pkgs/by-name/sv/svix-cli/package.nix                          | 2 +-
 pkgs/by-name/sw/swiftlint/package.nix                         | 2 +-
 pkgs/by-name/sw/swiftshader/package.nix                       | 2 +-
 pkgs/by-name/sy/symfpu/package.nix                            | 2 +-
 pkgs/by-name/sy/synthesia/package.nix                         | 2 +-
 pkgs/by-name/tc/tcld/package.nix                              | 2 +-
 pkgs/by-name/te/techmino/package.nix                          | 2 +-
 pkgs/by-name/te/ted/package.nix                               | 2 +-
 pkgs/by-name/tf/tfmigrate/package.nix                         | 2 +-
 pkgs/by-name/tf/tfswitch/package.nix                          | 2 +-
 pkgs/by-name/tg/tg-archive/package.nix                        | 2 +-
 pkgs/by-name/ti/tic-80/package.nix                            | 2 +-
 pkgs/by-name/to/tome2/package.nix                             | 2 +-
 pkgs/by-name/tr/transgui/package.nix                          | 2 +-
 pkgs/by-name/tr/trrntzip/package.nix                          | 2 +-
 pkgs/by-name/ts/tscli/package.nix                             | 2 +-
 pkgs/by-name/ty/typship/package.nix                           | 2 +-
 pkgs/by-name/tz/tzf-rs/package.nix                            | 2 +-
 pkgs/by-name/u-/u-root/package.nix                            | 2 +-
 pkgs/by-name/un/unflac/package.nix                            | 2 +-
 pkgs/by-name/un/unnamed-sdvx-clone/package.nix                | 2 +-
 pkgs/by-name/us/usbkvm/package.nix                            | 2 +-
 pkgs/by-name/va/vacuum-go/package.nix                         | 2 +-
 pkgs/by-name/va/vangers/package.nix                           | 2 +-
 pkgs/by-name/va/variant-lite/package.nix                      | 2 +-
 pkgs/by-name/ve/veloren/package.nix                           | 2 +-
 pkgs/by-name/vi/vimcats/package.nix                           | 2 +-
 pkgs/by-name/vi/vis/package.nix                               | 2 +-
 pkgs/by-name/vk/vkd3d-proton/package.nix                      | 2 +-
 pkgs/by-name/vo/volatility2-bin/package.nix                   | 2 +-
 pkgs/by-name/vs/vscode-js-debug/package.nix                   | 2 +-
 pkgs/by-name/vs/vst2-sdk/package.nix                          | 2 +-
 pkgs/by-name/vz/vzic/package.nix                              | 2 +-
 pkgs/by-name/wc/wchisp/package.nix                            | 2 +-
 pkgs/by-name/we/wealthfolio/package.nix                       | 2 +-
 pkgs/by-name/we/webcord/package.nix                           | 2 +-
 pkgs/by-name/wg/wg-access-server/package.nix                  | 2 +-
 pkgs/by-name/wh/whoogle-search/package.nix                    | 2 +-
 pkgs/by-name/wi/wivrn/package.nix                             | 2 +-
 pkgs/by-name/wl/wl-crosshair/package.nix                      | 2 +-
 pkgs/by-name/wv/wvdial/package.nix                            | 2 +-
 pkgs/by-name/xa/xar/package.nix                               | 2 +-
 pkgs/by-name/yg/yggdrasil/package.nix                         | 2 +-
 pkgs/by-name/yt/ytmdesktop/package.nix                        | 2 +-
 pkgs/by-name/z8/z88dk/package.nix                             | 2 +-
 pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix                 | 2 +-
 pkgs/by-name/ze/zeronsd/package.nix                           | 2 +-
 pkgs/by-name/zi/zimfw/package.nix                             | 2 +-
 pkgs/by-name/zs/zsh-zhooks/package.nix                        | 2 +-
 pkgs/by-name/zt/ztools/package.nix                            | 2 +-
 292 files changed, 292 insertions(+), 292 deletions(-)

diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index dc3fc2e45384..59bddcc473a5 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -199,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/HarbourMasters/2ship2harkinian";
-    description = "A PC port of Majora's Mask with modern controls, widescreen, high-resolution, and more";
+    description = "PC port of Majora's Mask with modern controls, widescreen, high-resolution, and more";
     mainProgram = "2s2h";
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ qubitnano ];
diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 7df9c694be08..93edf9ca9363 100644
--- a/pkgs/by-name/ab/abaddon/package.nix
+++ b/pkgs/by-name/ab/abaddon/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A discord client reimplementation, written in C++";
+    description = "Discord client reimplementation, written in C++";
     mainProgram = "abaddon";
     homepage = "https://github.com/uowuo/abaddon";
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index 863fcbcc0ae8..84ac993e3ce9 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://adios2.readthedocs.io/en/latest/";
-    description = "The Adaptable Input/Output System version 2";
+    description = "Adaptable Input/Output System version 2";
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ qbisi ];
diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 4e6e75f250aa..82a0f0cb5f57 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "An extremely fast R code formatter";
+    description = "Extremely fast R code formatter";
     homepage = "https://posit-dev.github.io/air";
     changelog = "https://github.com/posit-dev/air/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix
index 26d990224685..053b6153d2b5 100644
--- a/pkgs/by-name/am/amphetype/package.nix
+++ b/pkgs/by-name/am/amphetype/package.nix
@@ -10,7 +10,7 @@
 let
   pname = "amphetype";
   version = "1.0.0";
-  description = "An advanced typing practice program";
+  description = "Advanced typing practice program";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index b64b6683c2b1..8f26bb14b51a 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/apache/orc/releases/tag/v${finalAttrs.version}";
-    description = "The smallest, fastest columnar storage for Hadoop workloads";
+    description = "Smallest, fastest columnar storage for Hadoop workloads";
     homepage = "https://github.com/apache/orc/";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ drupol ];
diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 5eef97b1fa68..a3f807a83a1b 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -101,7 +101,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   meta = with lib; {
-    description = "An open-source alternative to Notion";
+    description = "Open-source alternative to Notion";
     homepage = "https://www.appflowy.io/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.agpl3Only;
diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index 26af9529aa98..c11f2ffb4ae5 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/hyprwm/aquamarine/releases/tag/v${finalAttrs.version}";
-    description = "A very light linux rendering backend library";
+    description = "Very light linux rendering backend library";
     homepage = "https://github.com/hyprwm/aquamarine";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.hyprland ];
diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index 88e67f7e22fc..8c5be1fea7eb 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -25,7 +25,7 @@ buildNpmPackage rec {
 
   meta = {
     homepage = "https://webostv.developer.lge.com/develop/tools/cli-introduction";
-    description = "A collection of commands used for creating, packaging, installing, and launching web apps for LG webOS TV.";
+    description = "Collection of commands used for creating, packaging, installing, and launching web apps for LG webOS TV";
     longDescription = ''
       webOS CLI (Command Line Interface) provides a collection of commands used for creating, packaging, installing,
       and launching web apps in the command line environment. The CLI allows you to develop and test your app without using
diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix
index 3e3f9795ecdd..185f56af5b0b 100644
--- a/pkgs/by-name/ar/arkenfox-userjs/package.nix
+++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A comprehensive user.js template for configuration and hardening";
+    description = "Comprehensive user.js template for configuration and hardening";
     homepage = "https://github.com/arkenfox/user.js";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 0d30d9ccdb64..4f96e607fc1b 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "The Astro language server";
+    description = "Astro language server";
     homepage = "https://github.com/withastro/language-tools";
     changelog = "https://github.com/withastro/language-tools/blob/@astrojs/language-server@${finalAttrs.version}/packages/language-server/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/au/authentik/ldap.nix b/pkgs/by-name/au/authentik/ldap.nix
index e3b1bfab8174..db076910082d 100644
--- a/pkgs/by-name/au/authentik/ldap.nix
+++ b/pkgs/by-name/au/authentik/ldap.nix
@@ -14,7 +14,7 @@ buildGoModule {
   subPackages = [ "cmd/ldap" ];
 
   meta = authentik.meta // {
-    description = "The authentik ldap outpost. Needed for the external ldap API.";
+    description = "Authentik ldap outpost. Needed for the external ldap API";
     homepage = "https://goauthentik.io/docs/providers/ldap/";
     mainProgram = "ldap";
   };
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 3bea156c1c91..59cd85fc612a 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -189,7 +189,7 @@ stdenvNoCC.mkDerivation (
         homepage = "https://avaloniaui.net/";
         license = [ lib.licenses.mit ];
         maintainers = with lib.maintainers; [ corngood ];
-        description = "A cross-platform UI framework for dotnet";
+        description = "Cross-platform UI framework for dotnet";
         sourceProvenance = with lib.sourceTypes; [
           fromSource
           binaryNativeCode # npm dependencies contain binaries
diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix
index 26ee2bfc8468..4e6047b9e5df 100644
--- a/pkgs/by-name/av/avml/package.nix
+++ b/pkgs/by-name/av/avml/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A portable volatile memory acquisition tool for Linux";
+    description = "Portable volatile memory acquisition tool for Linux";
     homepage = "https://github.com/microsoft/avml";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.lesuisse ];
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index b868b140f2d8..4a84309316c6 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -53,7 +53,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "A vault for securely storing and accessing AWS credentials in development environments";
+    description = "Vault for securely storing and accessing AWS credentials in development environments";
     mainProgram = "aws-vault";
     homepage = "https://github.com/99designs/aws-vault";
     license = licenses.mit;
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index a107f48f4799..fbf7a0b5c97b 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "An open-source 3DS emulator project based on Citra";
+    description = "Open-source 3DS emulator project based on Citra";
     homepage = "https://github.com/azahar-emu/azahar";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ arthsmn ];
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 609acd44a90e..2b1be98a3dac 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -36,7 +36,7 @@
 
   azure-iot = mkAzExtension rec {
     pname = "azure-iot";
-    description = "The Azure IoT extension for Azure CLI.";
+    description = "Azure IoT extension for Azure CLI";
     version = "0.25.0";
     url = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v${version}/azure_iot-${version}-py3-none-any.whl";
     hash = "sha256-fbS8B2Z++oRyUT2eEh+yVR/K6uaCVce8B2itQXfBscY=";
diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix
index 24fb96652f95..ec273e15187c 100644
--- a/pkgs/by-name/az/azurite/package.nix
+++ b/pkgs/by-name/az/azurite/package.nix
@@ -30,7 +30,7 @@ buildNpmPackage rec {
   ];
 
   meta = {
-    description = "An open source Azure Storage API compatible server";
+    description = "Open source Azure Storage API compatible server";
     homepage = "https://github.com/Azure/Azurite";
     changelog = "https://github.com/Azure/Azurite/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ba/balls/package.nix b/pkgs/by-name/ba/balls/package.nix
index 04f6d701bb0f..60474f602224 100644
--- a/pkgs/by-name/ba/balls/package.nix
+++ b/pkgs/by-name/ba/balls/package.nix
@@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: {
     '';
 
   meta = finalAttrs.src.meta // {
-    description = "The testing framework with balls";
+    description = "Testing framework with balls";
     homepage = "https://github.com/disruptek/balls";
     mainProgram = "balls";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index cc031c9aa7b5..c7dedf44679d 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A fork of Basalt improved for tracking XR devices with Monado";
+    description = "Fork of Basalt improved for tracking XR devices with Monado";
     homepage = "https://gitlab.freedesktop.org/mateosss/basalt";
     license = lib.licenses.bsd3;
     mainProgram = "basalt_vio";
diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix
index f625b702df30..d1b787529e21 100644
--- a/pkgs/by-name/ba/bash-language-server/package.nix
+++ b/pkgs/by-name/ba/bash-language-server/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   meta = with lib; {
-    description = "A language server for Bash";
+    description = "Language server for Bash";
     homepage = "https://github.com/bash-lsp/bash-language-server";
     license = licenses.mit;
     maintainers = with maintainers; [ doronbehar ];
diff --git a/pkgs/by-name/bi/bitbox-bridge/package.nix b/pkgs/by-name/bi/bitbox-bridge/package.nix
index 2d1cec1e76c1..35bb936fe2be 100644
--- a/pkgs/by-name/bi/bitbox-bridge/package.nix
+++ b/pkgs/by-name/bi/bitbox-bridge/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "A bridge service that connects web wallets like Rabby to BitBox02";
+    description = "Bridge service that connects web wallets like Rabby to BitBox02";
     homepage = "https://github.com/BitBoxSwiss/bitbox-bridge";
     downloadPage = "https://bitbox.swiss/download/";
     changelog = "https://github.com/BitBoxSwiss/bitbox-bridge/blob/v${finalAttrs.version}/CHANGELOG.md";
diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix
index f5d23abf41bd..7b2b938a5c61 100644
--- a/pkgs/by-name/bl/blackvoxel/package.nix
+++ b/pkgs/by-name/bl/blackvoxel/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A Sci-Fi game with industry and automation";
+    description = "Sci-Fi game with industry and automation";
     homepage = "https://www.blackvoxel.com";
     changelog = "https://github.com/Blackvoxel/Blackvoxel/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix
index 2bdd9ed5f477..2881fe114b73 100644
--- a/pkgs/by-name/bl/blastem/package.nix
+++ b/pkgs/by-name/bl/blastem/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "The fast and accurate Genesis emulator";
+    description = "Fast and accurate Genesis emulator";
     homepage = "https://www.retrodev.com/blastem/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "blastem";
diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix
index ca4e9e144231..50b22274ece4 100644
--- a/pkgs/by-name/bl/blendfarm/package.nix
+++ b/pkgs/by-name/bl/blendfarm/package.nix
@@ -131,7 +131,7 @@ buildDotnetModule rec {
     '';
 
   meta = with lib; {
-    description = "A open-source, cross-platform, stand-alone, Network Renderer for Blender";
+    description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender";
     homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm";
     license = with licenses; [ gpl3Plus ];
     maintainers = with maintainers; [ gador ];
diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix
index f2c01aceb329..64ca0f2f81f6 100644
--- a/pkgs/by-name/bo/bolt-launcher/package.nix
+++ b/pkgs/by-name/bo/bolt-launcher/package.nix
@@ -146,7 +146,7 @@ buildFHSEnv {
 
   meta = {
     homepage = "https://github.com/Adamcake/Bolt";
-    description = "An alternative launcher for RuneScape.";
+    description = "Alternative launcher for RuneScape";
     longDescription = ''
       Bolt Launcher supports HDOS/RuneLite by default with an optional feature flag for RS3 (enableRS3).
     '';
diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix
index 3aae78ec39ec..8adad4cc3700 100644
--- a/pkgs/by-name/br/brainflow/package.nix
+++ b/pkgs/by-name/br/brainflow/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A library to obtain, parse and analyze data (EEG, EMG, ECG) from biosensors";
+    description = "Library to obtain, parse and analyze data (EEG, EMG, ECG) from biosensors";
     homepage = "https://brainflow.org/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix
index e4fbfb6b9ab4..df9abc7157d9 100644
--- a/pkgs/by-name/bs/bsky-cli/package.nix
+++ b/pkgs/by-name/bs/bsky-cli/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A cli application for bluesky social";
+    description = "Cli application for bluesky social";
     homepage = "https://github.com/mattn/bsky";
     changelog = "https://github.com/mattn/bsky/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix
index 3e6af13bacf8..9e07c3591857 100644
--- a/pkgs/by-name/bu/buffybox/package.nix
+++ b/pkgs/by-name/bu/buffybox/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
-    description = "A suite of graphical applications for the terminal";
+    description = "Suite of graphical applications for the terminal";
     homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox";
     license = licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ colinsane ];
diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 5f45e0746bad..6ef5e96180b6 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -36,7 +36,7 @@ let
   };
 
   pname = "burpsuite";
-  description = "An integrated platform for performing security testing of web applications";
+  description = "Integrated platform for performing security testing of web applications";
   desktopItem = makeDesktopItem {
     name = "burpsuite";
     exec = pname;
diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
index 8c7b9e7542cb..011049884d71 100644
--- a/pkgs/by-name/ca/cabinpkg/package.nix
+++ b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   meta = {
     broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
     homepage = "https://cabinpkg.com";
-    description = "A package manager and build system for C++";
+    description = "Package manager and build system for C++";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.qwqawawow ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix
index e1a0ffa1bfe5..3805652e44fd 100644
--- a/pkgs/by-name/ca/camunda-modeler/package.nix
+++ b/pkgs/by-name/ca/camunda-modeler/package.nix
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/camunda/camunda-modeler";
-    description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io";
+    description = "Integrated modeling solution for BPMN, DMN and Forms based on bpmn.io";
     teams = [ teams.wdz ];
     license = licenses.mit;
     inherit (electron.meta) platforms;
diff --git a/pkgs/by-name/ca/catamaran/package.nix b/pkgs/by-name/ca/catamaran/package.nix
index b13116b6ee22..a7157cc71d38 100644
--- a/pkgs/by-name/ca/catamaran/package.nix
+++ b/pkgs/by-name/ca/catamaran/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation {
 
   meta = with lib; {
     homepage = "https://fonts.google.com/specimen/Catamaran";
-    description = "A stylish sans-serif Tamil and Latin typeface";
+    description = "Stylish sans-serif Tamil and Latin typeface";
     longDescription = ''
       Catamaran is a Unicode-compliant Latin and Tamil text type family designed for the digital age.
       The Tamil is monolinear and was designed alongside the sans serif Latin and Devanagari family Palanquin.
diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
index f98af0a263a7..808a4ac3f2ad 100644
--- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix
+++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
 
   meta = {
     homepage = "https://github.com/catppuccin/whiskers";
-    description = "A templating tool to simplify the creation of Catppuccin ports";
+    description = "Templating tool to simplify the creation of Catppuccin ports";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Name ];
     mainProgram = "whiskers";
diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix
index 6350540065ed..cc6e8f2ab2d1 100644
--- a/pkgs/by-name/cc/cctools/package.nix
+++ b/pkgs/by-name/cc/cctools/package.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "The classic linker for Darwin";
+    description = "Classic linker for Darwin";
     homepage = "https://opensource.apple.com/releases/";
     license = with lib.licenses; [
       apple-psl20
diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix
index f709db09280f..18eecafe4faa 100644
--- a/pkgs/by-name/cf/cfonts/package.nix
+++ b/pkgs/by-name/cf/cfonts/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/dominikwilkowski/cfonts";
-    description = "A silly little command line tool for sexy ANSI fonts in the console";
+    description = "Silly little command line tool for sexy ANSI fonts in the console";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ leifhelm ];
     mainProgram = "cfonts";
diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix
index a4bf2c1fdd53..9d61fd5a038a 100644
--- a/pkgs/by-name/ch/chamber/package.nix
+++ b/pkgs/by-name/ch/chamber/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   ];
 
   meta = with lib; {
-    description = "A tool for managing secrets by storing them in AWS SSM Parameter Store";
+    description = "Tool for managing secrets by storing them in AWS SSM Parameter Store";
     homepage = "https://github.com/segmentio/chamber";
     license = licenses.mit;
     maintainers = with maintainers; [ kalekseev ];
diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
index c90de82444f5..c2874cdf2b78 100644
--- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix
+++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A CLI tool to convert clang-tidy diagnostics into SARIF";
+    description = "CLI tool to convert clang-tidy diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "clang-tidy-sarif";
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 344b6f5f6f79..91ecb4d7eae3 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -36,7 +36,7 @@ buildNpmPackage rec {
   passthru.updateScript = ./update.sh;
 
   meta = {
-    description = "An agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster";
+    description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster";
     homepage = "https://github.com/anthropics/claude-code";
     downloadPage = "https://www.npmjs.com/package/@anthropic-ai/claude-code";
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix
index 61398c22a792..9376fa31f1e0 100644
--- a/pkgs/by-name/cl/clifm/package.nix
+++ b/pkgs/by-name/cl/clifm/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/leo-arch/clifm";
     changelog = "https://github.com/leo-arch/clifm/releases/tag/v${finalAttrs.version}";
-    description = "A CLI-based, shell-like, and non-curses terminal file manager";
+    description = "CLI-based, shell-like, and non-curses terminal file manager";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nadir-ishiguro ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index eed513ff09b2..72d72b616f0a 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A CLI tool to convert clippy diagnostics into SARIF";
+    description = "CLI tool to convert clippy diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix
index 4170d25e5e63..b2793a687ca8 100644
--- a/pkgs/by-name/co/code2prompt/package.nix
+++ b/pkgs/by-name/co/code2prompt/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   meta = {
-    description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting";
+    description = "CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting";
     homepage = "https://github.com/mufeedvh/code2prompt";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ heisfer ];
diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix
index d1aed0b02c5b..2605bbc626f9 100644
--- a/pkgs/by-name/co/cope/package.nix
+++ b/pkgs/by-name/co/cope/package.nix
@@ -33,7 +33,7 @@ perlPackages.buildPerlPackage {
   '';
 
   meta = {
-    description = "A colourful wrapper for terminal programs";
+    description = "Colourful wrapper for terminal programs";
     homepage = "https://github.com/deftdawg/cope";
     license = with lib.licenses; [
       artistic1
diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix
index d8ae055f7b32..e8c757e1a395 100644
--- a/pkgs/by-name/co/courier-unicode/package.nix
+++ b/pkgs/by-name/co/courier-unicode/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://www.courier-mta.org/unicode/";
-    description = "The Courier Unicode Library is used by most other Courier packages";
+    description = "Courier Unicode Library is used by most other Courier packages";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/cp/cppad/package.nix b/pkgs/by-name/cp/cppad/package.nix
index ed8b57071380..49f97e0a0f4a 100644
--- a/pkgs/by-name/cp/cppad/package.nix
+++ b/pkgs/by-name/cp/cppad/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "A C++ Algorithmic Differentiation Package";
+    description = "C++ Algorithmic Differentiation Package";
     homepage = "https://github.com/coin-or/CppAD";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/cp/cpu_features/package.nix b/pkgs/by-name/cp/cpu_features/package.nix
index 0e143c255153..8c3883f02efe 100644
--- a/pkgs/by-name/cp/cpu_features/package.nix
+++ b/pkgs/by-name/cp/cpu_features/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ];
 
   meta = with lib; {
-    description = "A cross platform C99 library to get cpu features at runtime";
+    description = "Cross platform C99 library to get cpu features at runtime";
     homepage = "https://github.com/google/cpu_features";
     license = licenses.asl20;
     platforms = platforms.all;
diff --git a/pkgs/by-name/cr/crow/package.nix b/pkgs/by-name/cr/crow/package.nix
index 357a98600cd9..4eeb4a79a7a3 100644
--- a/pkgs/by-name/cr/crow/package.nix
+++ b/pkgs/by-name/cr/crow/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   meta = {
-    description = "A Fast and Easy to use microframework for the web";
+    description = "Fast and Easy to use microframework for the web";
     homepage = "https://crowcpp.org/";
     maintainers = with lib.maintainers; [ l33tname ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ct/ctune/package.nix b/pkgs/by-name/ct/ctune/package.nix
index 4c128cbe7c52..1b8a075ec3a7 100644
--- a/pkgs/by-name/ct/ctune/package.nix
+++ b/pkgs/by-name/ct/ctune/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./cmake_disable_git_clone.patch ];
 
   meta = {
-    description = "A nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info";
+    description = "Nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info";
     homepage = "https://github.com/An7ar35/ctune";
     changelog = "https://github.com/An7ar35/ctune/blob/master/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;
diff --git a/pkgs/by-name/cu/culvert/package.nix b/pkgs/by-name/cu/culvert/package.nix
index 96c05663d21c..b0fc54b3afeb 100644
--- a/pkgs/by-name/cu/culvert/package.nix
+++ b/pkgs/by-name/cu/culvert/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/amboar/culvert";
-    description = "A Test and Debug Tool for BMC AHB Interfaces ";
+    description = "Test and Debug Tool for BMC AHB Interfaces ";
     mainProgram = "culvert";
     license = licenses.asl20;
     maintainers = [ maintainers.baloo ];
diff --git a/pkgs/by-name/cu/cutentr/package.nix b/pkgs/by-name/cu/cutentr/package.nix
index bea06e6c05e3..b16f7ec41fac 100644
--- a/pkgs/by-name/cu/cutentr/package.nix
+++ b/pkgs/by-name/cu/cutentr/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "A 3DS streaming client for Linux";
+    description = "3DS streaming client for Linux";
     homepage = "https://gitlab.com/BoltsJ/cuteNTR";
     license = lib.licenses.gpl3Plus;
     mainProgram = "cutentr";
diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix
index 510810f90e28..20a3fd102b02 100644
--- a/pkgs/by-name/db/dbus-broker/package.nix
+++ b/pkgs/by-name/db/dbus-broker/package.nix
@@ -39,7 +39,7 @@ let
       ];
       inherit buildInputs;
       meta = meta // {
-        description = "The C-Util Project is a collection of utility libraries for the C11 language.";
+        description = "C-Util Project is a collection of utility libraries for the C11 language";
         homepage = "https://c-util.github.io/";
         license = [
           lib.licenses.asl20
diff --git a/pkgs/by-name/df/dfl-ipc/package.nix b/pkgs/by-name/df/dfl-ipc/package.nix
index b1e09c6871c5..f11a0c72d508 100644
--- a/pkgs/by-name/df/dfl-ipc/package.nix
+++ b/pkgs/by-name/df/dfl-ipc/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "A very simple set of IPC classes for inter-process communication";
+    description = "Very simple set of IPC classes for inter-process communication";
     homepage = "https://gitlab.com/desktop-frameworks/ipc";
     changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index 439237d27497..60a8cbfc8c0e 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A simple terminal UI player for di.fm";
+    description = "Simple terminal UI player for di.fm";
     homepage = "https://github.com/acaloiaro/di-tui";
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.acaloiaro ];
diff --git a/pkgs/by-name/di/didder/package.nix b/pkgs/by-name/di/didder/package.nix
index 8cee20b76693..011fd3d662ab 100644
--- a/pkgs/by-name/di/didder/package.nix
+++ b/pkgs/by-name/di/didder/package.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   '';
 
   meta = src.meta // {
-    description = "An extensive, fast, and accurate command-line image dithering tool";
+    description = "Extensive, fast, and accurate command-line image dithering tool";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "didder";
diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index 394d370bfb88..93ef3172bc74 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A service manager / supervision system, which can (on Linux) also function as a system manager and init";
+    description = "Service manager / supervision system, which can (on Linux) also function as a system manager and init";
     homepage = "https://davmac.org/projects/dinit";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aanderse ];
diff --git a/pkgs/by-name/di/distrobox-tui/package.nix b/pkgs/by-name/di/distrobox-tui/package.nix
index e61cd34e9fd5..f52ad5c742e4 100644
--- a/pkgs/by-name/di/distrobox-tui/package.nix
+++ b/pkgs/by-name/di/distrobox-tui/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
 
   meta = {
     changelog = "https://github.com/phanirithvij/distrobox-tui/releases/tag/v${version}";
-    description = "A TUI for DistroBox";
+    description = "TUI for DistroBox";
     homepage = "https://github.com/phanirithvij/distrobox-tui";
     license = lib.licenses.gpl3Plus;
     mainProgram = "distrobox-tui";
diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index 3568bd8c50fc..f9734f6bfd03 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://dita-ot.org";
     changelog = "https://www.dita-ot.org/dev/release-notes/#v${finalAttrs.version}";
-    description = "The open-source publishing engine for content authored in the Darwin Information Typing Architecture";
+    description = "Open-source publishing engine for content authored in the Darwin Information Typing Architecture";
     license = lib.licenses.asl20;
     mainProgram = "dita";
     platforms = openjdk17.meta.platforms;
diff --git a/pkgs/by-name/dn/dnss/package.nix b/pkgs/by-name/dn/dnss/package.nix
index 72a8907a301a..d9ae1a34334a 100644
--- a/pkgs/by-name/dn/dnss/package.nix
+++ b/pkgs/by-name/dn/dnss/package.nix
@@ -17,7 +17,7 @@ buildGoModule {
   vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A=";
 
   meta = with lib; {
-    description = "A daemon for using DNS over HTTPS";
+    description = "Daemon for using DNS over HTTPS";
     homepage = "https://blitiri.com.ar/git/r/dnss/";
     license = licenses.asl20;
     mainProgram = "dnss";
diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix
index 9fe2edac1f2c..2d7a01bd194e 100644
--- a/pkgs/by-name/do/dotnet-ef/package.nix
+++ b/pkgs/by-name/do/dotnet-ef/package.nix
@@ -7,7 +7,7 @@ buildDotnetGlobalTool {
   nugetHash = "sha256-Mu+MlsjH/qa4kMb7z/TuG1lSVSKPX9j9S4mJLVRZ2+E=";
 
   meta = {
-    description = "The Entity Framework Core tools help with design-time development tasks.";
+    description = "Tools to help with design-time development tasks";
     longDescription = ''
       The Entity Framework Core tools help with design-time development tasks.
       They're primarily used to manage Migrations and to scaffold a DbContext and entity types by reverse engineering the schema of a database.
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 9fbc2e62e9b9..979e59b6f8bf 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -98,7 +98,7 @@ mkYarnPackage rec {
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {
-    description = "A moderation tool for Matrix";
+    description = "Moderation tool for Matrix";
     homepage = "https://github.com/the-draupnir-project/Draupnir";
     longDescription = ''
       As an all-in-one moderation tool, it can protect your server from
diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix
index a1e08751a0d4..3185cbc763ea 100644
--- a/pkgs/by-name/du/dut/package.nix
+++ b/pkgs/by-name/du/dut/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
-    description = "A disk usage calculator for Linux";
+    description = "Disk usage calculator for Linux";
     homepage = "https://codeberg.org/201984/dut";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ errnoh ];
diff --git a/pkgs/by-name/ed/edido/package.nix b/pkgs/by-name/ed/edido/package.nix
index f060b9602574..7a7732a81ca0 100644
--- a/pkgs/by-name/ed/edido/package.nix
+++ b/pkgs/by-name/ed/edido/package.nix
@@ -10,7 +10,7 @@
 }:
 writeShellApplication {
   name = "edido";
-  meta.description = "A tool to apply display configuration from `boot.kernelParams`.";
+  meta.description = "Tool to apply display configuration from `boot.kernelParams`";
   runtimeInputs = [
     diffutils
     findutils
diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix
index a1d6eb5c728a..2e46cd0a0bdf 100644
--- a/pkgs/by-name/ed/edukai/package.nix
+++ b/pkgs/by-name/ed/edukai/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "The MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)";
+    description = "MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)";
     longDescription = ''
       The MOE Standard Kai Font is a kai (regular srcipt) font
       provided by
diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix
index e30cb785ba3a..05d8325df41a 100644
--- a/pkgs/by-name/ed/eduli/package.nix
+++ b/pkgs/by-name/ed/eduli/package.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "The MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)";
+    description = "MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)";
     longDescription = ''
       The MOE Li Font is a li (clerical srcipt) font
       provided by
diff --git a/pkgs/by-name/ed/edusong/package.nix b/pkgs/by-name/ed/edusong/package.nix
index dec473ccf5f0..1a0df4d68f35 100644
--- a/pkgs/by-name/ed/edusong/package.nix
+++ b/pkgs/by-name/ed/edusong/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    description = "The MOE Song font, a Song-style Chinese character typeface";
+    description = "MOE Song font, a Song-style Chinese character typeface";
     longDescription = ''
       A Song-style Chinese character typeface published by the Ministry of Education of the Republic of China (Taiwan). The Song style is also referred to as 宋體, 宋体, sòngtǐ, 明體, 明体, or míngtǐ, in Chinese; 명조체, 明朝體, or myeongjo in Korean; 明朝体, みんちょうたい, or minchōtai in Japanese.
     '';
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index 0f8aac729c08..84a743771187 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -150,7 +150,7 @@ stdenv.mkDerivation (
     };
 
     meta = with lib; {
-      description = "A feature-rich client for Matrix.org";
+      description = "Feature-rich client for Matrix.org";
       homepage = "https://element.io/";
       changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
       license = licenses.asl20;
diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix
index efd66003ec97..fbdce8928623 100644
--- a/pkgs/by-name/el/elm-land/package.nix
+++ b/pkgs/by-name/el/elm-land/package.nix
@@ -59,7 +59,7 @@ buildNpmPackage rec {
   '';
 
   meta = {
-    description = "A production-ready framework for building Elm applications";
+    description = "Production-ready framework for building Elm applications";
     homepage = "https://github.com/elm-land/elm-land";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix
index c7954fb558b3..7dbe7d0d16fe 100644
--- a/pkgs/by-name/em/ember-cli/package.nix
+++ b/pkgs/by-name/em/ember-cli/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://github.com/ember-cli/ember-cli";
-    description = "The Ember.js command line utility";
+    description = "Ember.js command line utility";
     license = licenses.mit;
     maintainers = with maintainers; [ jfvillablanca ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix
index 57e42e80ce33..a9ecc66bd25c 100644
--- a/pkgs/by-name/en/encrypted-dns-server/package.nix
+++ b/pkgs/by-name/en/encrypted-dns-server/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     changelog = "https://github.com/DNSCrypt/encrypted-dns-server/releases/tag/${version}";
-    description = "An easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server";
+    description = "Easy to install, high-performance, zero maintenance proxy to run an encrypted DNS server";
     homepage = "https://github.com/DNSCrypt/encrypted-dns-server";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ paepcke ];
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index e8f6b97529d7..3bd00c4f1962 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "The other cutest Discord client mod";
+    description = "Other cutest Discord client mod";
     homepage = "https://github.com/Equicord/Equicord";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index da80e66bec07..907de09e3d18 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An IDE-first library for the semantic analysis of Erlang code, including LSP server, linting and refactoring tools.";
+    description = "IDE-first library for the semantic analysis of Erlang code, including LSP server, linting and refactoring tools";
     homepage = "https://github.com/WhatsApp/erlang-language-platform/";
     license = with lib.licenses; [
       mit
diff --git a/pkgs/by-name/ev/everest-mons/package.nix b/pkgs/by-name/ev/everest-mons/package.nix
index 40867013870d..30ce4ac2dacd 100644
--- a/pkgs/by-name/ev/everest-mons/package.nix
+++ b/pkgs/by-name/ev/everest-mons/package.nix
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://mons.coloursofnoise.ca/";
-    description = "A commandline Everest installer and mod manager for Celeste";
+    description = "Commandline Everest installer and mod manager for Celeste";
     license = licenses.mit;
     maintainers = with lib.maintainers; [ ulysseszhan ];
     mainProgram = "mons";
diff --git a/pkgs/by-name/f1/f1viewer/package.nix b/pkgs/by-name/f1/f1viewer/package.nix
index 8ff7b9a58711..baa1949673a5 100644
--- a/pkgs/by-name/f1/f1viewer/package.nix
+++ b/pkgs/by-name/f1/f1viewer/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   vendorHash = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg=";
 
   meta = with lib; {
-    description = "A TUI to view Formula 1 footage using VLC or another media player";
+    description = "TUI to view Formula 1 footage using VLC or another media player";
     homepage = "https://github.com/SoMuchForSubtlety/f1viewer";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ michzappa ];
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 11e3670eb7cc..30d51c287968 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -265,7 +265,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool";
+    description = "Actively maintained, feature-rich and performance oriented, neofetch like system information tool";
     homepage = "https://github.com/fastfetch-cli/fastfetch";
     changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/fa/fastqc/package.nix b/pkgs/by-name/fa/fastqc/package.nix
index 13c76f5b3bfe..5cd4a557e3b4 100644
--- a/pkgs/by-name/fa/fastqc/package.nix
+++ b/pkgs/by-name/fa/fastqc/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A quality control application for high throughput sequence data";
+    description = "Quality control application for high throughput sequence data";
     longDescription = ''
       FastQC aims to provide a simple way to do some quality control checks on raw sequence data coming from high throughput sequencing pipelines. It provides a modular set of analyses which you can use to give a quick impression of whether your data has any problems of which you should be aware before doing any further analysis.
 
diff --git a/pkgs/by-name/fa/faust2/package.nix b/pkgs/by-name/fa/faust2/package.nix
index d8b9aefceee0..6c3f5bac9fa4 100644
--- a/pkgs/by-name/fa/faust2/package.nix
+++ b/pkgs/by-name/fa/faust2/package.nix
@@ -126,7 +126,7 @@ let
       '';
 
       meta = meta // {
-        description = "A functional programming language for realtime audio signal processing";
+        description = "Functional programming language for realtime audio signal processing";
         longDescription = ''
           FAUST (Functional Audio Stream) is a functional programming
           language specifically designed for real-time signal processing
diff --git a/pkgs/by-name/fc/fcitx5-fluent/package.nix b/pkgs/by-name/fc/fcitx5-fluent/package.nix
index ab1c46e10f0b..10d3cd7f11ca 100644
--- a/pkgs/by-name/fc/fcitx5-fluent/package.nix
+++ b/pkgs/by-name/fc/fcitx5-fluent/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A fluent-design theme with blur effect and shadow";
+    description = "Fluent-design theme with blur effect and shadow";
     homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5";
     license = licenses.mpl20;
     platforms = platforms.all;
diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix
index edb468c2e8fd..25b371610fe5 100644
--- a/pkgs/by-name/ff/ffts/package.nix
+++ b/pkgs/by-name/ff/ffts/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   cmakeFlags = [ "-DENABLE_SHARED=ON" ];
 
   meta = {
-    description = "The Fastest Fourier Transform in the South";
+    description = "Fastest Fourier Transform in the South";
     homepage = "https://github.com/linkotec/ffts";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bgamari ];
diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index 71f1f63a0773..af8fd18c4eb3 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "A high-level tool for the management of Linux filesystem encryption";
+    description = "High-level tool for the management of Linux filesystem encryption";
     mainProgram = "fscrypt";
     longDescription = ''
       This tool manages metadata, key generation, key wrapping, PAM integration,
diff --git a/pkgs/by-name/gd/gdmap/package.nix b/pkgs/by-name/gd/gdmap/package.nix
index 0704b6ae8dc9..8ee3c5342a04 100644
--- a/pkgs/by-name/gd/gdmap/package.nix
+++ b/pkgs/by-name/gd/gdmap/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://gitlab.com/sjohannes/gdmap";
-    description = "A tool to visualize disk space (GTK 3 port of Original)";
+    description = "Tool to visualize disk space (GTK 3 port of Original)";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix
index 647bde81c5ee..c288fd484899 100644
--- a/pkgs/by-name/gi/git-toolbelt/package.nix
+++ b/pkgs/by-name/gi/git-toolbelt/package.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/nvie/git-toolbelt/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    description = "A suite of useful Git commands that aid with scripting or every day command line usage";
+    description = "Suite of useful Git commands that aid with scripting or every day command line usage";
     homepage = "https://github.com/nvie/git-toolbelt";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix
index f5417c49b36c..29c562fcab20 100644
--- a/pkgs/by-name/gi/git-wait/package.nix
+++ b/pkgs/by-name/gi/git-wait/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = {
-    description = "A simple git wrapper that waits until index.lock file is removed when present before running the command";
+    description = "Simple git wrapper that waits until index.lock file is removed when present before running the command";
     homepage = "https://github.com/darshanparajuli/git-wait";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pbsds ];
diff --git a/pkgs/by-name/gi/gitnuro/package.nix b/pkgs/by-name/gi/gitnuro/package.nix
index fcdee63e3fdc..b57d50a74af0 100644
--- a/pkgs/by-name/gi/gitnuro/package.nix
+++ b/pkgs/by-name/gi/gitnuro/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A FOSS Git multiplatform client based on Compose and JGit";
+    description = "FOSS Git multiplatform client based on Compose and JGit";
     homepage = "https://gitnuro.com/";
     license = licenses.gpl3Plus;
     platforms = [
diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix
index 215314695487..73d9b3d4275c 100644
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@@ -78,7 +78,7 @@ buildGo123Module rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "The missing Package Manager for Kubernetes featuring a GUI and a CLI";
+    description = "Missing Package Manager for Kubernetes featuring a GUI and a CLI";
     homepage = "https://github.com/glasskube/glasskube";
     changelog = "https://github.com/glasskube/glasskube/releases/tag/v${version}";
     maintainers = with lib.maintainers; [ jakuzure ];
diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix
index f27bdc255fbd..21ee134bd933 100644
--- a/pkgs/by-name/gn/gnome-clocks/package.nix
+++ b/pkgs/by-name/gn/gnome-clocks/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://apps.gnome.org/Clocks/";
-    description = "A simple and elegant clock application for GNOME";
+    description = "Simple and elegant clock application for GNOME";
     longDescription = ''
       A simple and elegant clock application. It includes world clocks, alarms,
       a stopwatch, and timers.
diff --git a/pkgs/by-name/go/gocatcli/package.nix b/pkgs/by-name/go/gocatcli/package.nix
index a95949a11023..e10a2e9b4c96 100644
--- a/pkgs/by-name/go/gocatcli/package.nix
+++ b/pkgs/by-name/go/gocatcli/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
   meta = {
     homepage = "https://github.com/deadc0de6/gocatcli";
     changelog = "https://github.com/deadc0de6/gocatcli/releases/tag/v${version}";
-    description = "The command line catalog tool for your offline data";
+    description = "Command line catalog tool for your offline data";
     longDescription = ''
       gocatcli is a catalog tool for your offline data. It indexes external
       media in a catalog file and allows to quickly find specific files or even
diff --git a/pkgs/by-name/go/gomuks/package.nix b/pkgs/by-name/go/gomuks/package.nix
index 1dfb2545f52b..148b995cbc79 100644
--- a/pkgs/by-name/go/gomuks/package.nix
+++ b/pkgs/by-name/go/gomuks/package.nix
@@ -60,7 +60,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://maunium.net/go/gomuks/";
-    description = "A terminal based Matrix client written in Go";
+    description = "Terminal based Matrix client written in Go";
     mainProgram = "gomuks";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ chvp ];
diff --git a/pkgs/by-name/go/gopro-tool/package.nix b/pkgs/by-name/go/gopro-tool/package.nix
index e282bb0f9e07..a5b848d28b5d 100644
--- a/pkgs/by-name/go/gopro-tool/package.nix
+++ b/pkgs/by-name/go/gopro-tool/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "A tool to control GoPro webcam mode in Linux (requires v4l2loopback kernel module and a firewall rule)";
+    description = "Tool to control GoPro webcam mode in Linux (requires v4l2loopback kernel module and a firewall rule)";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ZMon3y ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index a504f94d7693..13f408806c77 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md";
-    description = "A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method";
+    description = "CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method";
     longDescription = ''
       A CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO
       authentication method. Inspired by gp-saml-gui.
diff --git a/pkgs/by-name/gr/gren/generated-package.nix b/pkgs/by-name/gr/gren/generated-package.nix
index 6906bbb6b636..375c447948bd 100644
--- a/pkgs/by-name/gr/gren/generated-package.nix
+++ b/pkgs/by-name/gr/gren/generated-package.nix
@@ -95,7 +95,7 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   jailbreak = true;
   homepage = "https://gren-lang.org";
-  description = "The `gren` command line interface";
+  description = "`gren` command line interface";
   license = lib.licenses.bsd3;
   mainProgram = "gren";
 }
diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
index 8c3ac3447bf3..253cf66661af 100644
--- a/pkgs/by-name/gr/grpc-gateway/package.nix
+++ b/pkgs/by-name/gr/grpc-gateway/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "A gRPC to JSON proxy generator plugin for Google Protocol Buffers";
+    description = "GRPC to JSON proxy generator plugin for Google Protocol Buffers";
     longDescription = ''
       This is a plugin for the Google Protocol Buffers compiler (protoc). It reads
       protobuf service definitions and generates a reverse-proxy server which
diff --git a/pkgs/by-name/gu/guile-json-rpc/package.nix b/pkgs/by-name/gu/guile-json-rpc/package.nix
index 3879ef48e371..608377ed231e 100644
--- a/pkgs/by-name/gu/guile-json-rpc/package.nix
+++ b/pkgs/by-name/gu/guile-json-rpc/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A JSON-RPC implementation for Scheme";
+    description = "JSON-RPC implementation for Scheme";
     homepage = "https://codeberg.org/rgherdt/scheme-json-rpc";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ knightpp ];
diff --git a/pkgs/by-name/gu/guile-lsp-server/package.nix b/pkgs/by-name/gu/guile-lsp-server/package.nix
index 26a2258ffcc6..31484912af86 100644
--- a/pkgs/by-name/gu/guile-lsp-server/package.nix
+++ b/pkgs/by-name/gu/guile-lsp-server/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://codeberg.org/rgherdt/scheme-lsp-server";
-    description = "An LSP server for Guile";
+    description = "LSP server for Guile";
     mainProgram = "guile-lsp-server";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ knightpp ];
diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix
index aad799d81798..5f6f977695e2 100644
--- a/pkgs/by-name/gu/guile-semver/package.nix
+++ b/pkgs/by-name/gu/guile-semver/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with lib; {
-    description = "A GNU Guile library implementing Semantic Versioning 2.0.0";
+    description = "GNU Guile library implementing Semantic Versioning 2.0.0";
     homepage = "https://ngyro.com/software/guile-semver.html";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ foo-dogsquared ];
diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 3ec435ccb785..19bbdc492b31 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A CLI tool to convert hadolint diagnostics into SARIF";
+    description = "CLI tool to convert hadolint diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 6005946cc340..fccaaac2c7ec 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -90,7 +90,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   meta = {
-    description = "The SQL IDE for Your Terminal";
+    description = "SQL IDE for Your Terminal";
     homepage = "https://harlequin.sh";
     changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/hd/hdfview/package.nix b/pkgs/by-name/hd/hdfview/package.nix
index f3d9049485fe..a74bd1274479 100644
--- a/pkgs/by-name/hd/hdfview/package.nix
+++ b/pkgs/by-name/hd/hdfview/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A visual tool for browsing and editing HDF4 and HDF5 files";
+    description = "Visual tool for browsing and editing HDF4 and HDF5 files";
     license = lib.licenses.free; # BSD-like
     homepage = "https://www.hdfgroup.org/downloads/hdfview";
     downloadPage = "https://github.com/HDFGroup/hdfview";
diff --git a/pkgs/by-name/he/headset-charge-indicator/package.nix b/pkgs/by-name/he/headset-charge-indicator/package.nix
index f5df4146a645..9c63c644d319 100644
--- a/pkgs/by-name/he/headset-charge-indicator/package.nix
+++ b/pkgs/by-name/he/headset-charge-indicator/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/centic9/headset-charge-indicator";
-    description = "A app-indicator for GNOME desktops for controlling some features of various wireless headsets";
+    description = "App-indicator for GNOME desktops for controlling some features of various wireless headsets";
     longDescription = "A simple app-indicator for GNOME desktops to display the battery charge of some wireless headsets which also allows to control some functions like LEDs, sidetone and others.";
     platforms = platforms.linux;
     maintainers = with maintainers; [ zebreus ];
diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index 11f0e6664d7f..04d0b0faa4f9 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -34,7 +34,7 @@ buildGoModule {
   ];
 
   meta = {
-    description = "A cloud native Identity Aware Proxy and Access Control Decision service";
+    description = "Cloud native Identity Aware Proxy and Access Control Decision service";
     homepage = "https://dadrus.github.io/heimdall";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ albertilagan ];
diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index 758119ba8839..c82bde882e7c 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -28,7 +28,7 @@ appimageTools.wrapType2 {
 
   meta = {
     changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}";
-    description = "A visual note-taking tool for learning complex topics";
+    description = "Visual note-taking tool for learning complex topics";
     homepage = "https://heptabase.com/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
diff --git a/pkgs/by-name/he/hexxy/package.nix b/pkgs/by-name/he/hexxy/package.nix
index fadbfc446831..aebefe9285eb 100644
--- a/pkgs/by-name/he/hexxy/package.nix
+++ b/pkgs/by-name/he/hexxy/package.nix
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A modern and beautiful alternative to xxd and hexdump";
+    description = "Modern and beautiful alternative to xxd and hexdump";
     homepage = "https://github.com/sweetbbak/hexxy";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.NotAShelf ];
diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix
index 165d09db6700..4a1b9a9b1c0c 100644
--- a/pkgs/by-name/hm/hmcl/package.nix
+++ b/pkgs/by-name/hm/hmcl/package.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://hmcl.huangyuhui.net";
-    description = "A Minecraft Launcher which is multi-functional, cross-platform and popular";
+    description = "Minecraft Launcher which is multi-functional, cross-platform and popular";
     mainProgram = "hmcl";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.gpl3Only;
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 0579e37fbd94..b25aa33f9143 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "A very simple static homepage for your server.";
+    description = "Very simple static homepage for your server";
     homepage = "https://homer-demo.netlify.app/";
     changelog = "https://github.com/bastienwirtz/homer/releases";
     license = licenses.asl20;
diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix
index 5b4b50b8d0a4..06f40e8b8a5d 100644
--- a/pkgs/by-name/ho/honggfuzz/package.nix
+++ b/pkgs/by-name/ho/honggfuzz/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer";
+    description = "Security oriented, feedback-driven, evolutionary, easy-to-use fuzzer";
     longDescription = ''
       Honggfuzz is a security oriented, feedback-driven, evolutionary,
       easy-to-use fuzzer with interesting analysis options. It is
diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix
index 22acf86af892..7b66584be0fd 100644
--- a/pkgs/by-name/ht/hterm/package.nix
+++ b/pkgs/by-name/ht/hterm/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.der-hammer.info/pages/terminal.html";
     changelog = "https://www.der-hammer.info/terminal/CHANGELOG.txt";
-    description = "A terminal program for serial communication";
+    description = "Terminal program for serial communication";
     # See https://www.der-hammer.info/terminal/LICENSE.txt
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix
index 914946eacd23..e160e7561c2b 100644
--- a/pkgs/by-name/hy/hyprland-qt-support/package.nix
+++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "A Qt6 QML provider for hypr* apps";
+    description = "Qt6 QML provider for hypr* apps";
     homepage = "https://github.com/hyprwm/hyprland-qt-support";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix
index ba9e1be21d2d..8e4daab9e84b 100644
--- a/pkgs/by-name/hy/hyprprop/package.nix
+++ b/pkgs/by-name/hy/hyprprop/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
   meta = {
-    description = "An xprop replacement for Hyprland";
+    description = "Xprop replacement for Hyprland";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.hyprland ];
diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix
index d3a405514f26..e5b54b5e5bcd 100644
--- a/pkgs/by-name/hy/hyprsysteminfo/package.nix
+++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A tiny qt6/qml application to display information about the running system";
+    description = "Tiny qt6/qml application to display information about the running system";
     homepage = "https://github.com/hyprwm/hyprsysteminfo";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.hyprland ];
diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix
index 3dd88cf74766..cc34d8ad7219 100644
--- a/pkgs/by-name/im/imsprog/package.nix
+++ b/pkgs/by-name/im/imsprog/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/bigbigmdm/IMSProg/releases/tag/v${finalAttrs.version}";
-    description = "A free I2C EEPROM programmer tool for CH341A device";
+    description = "Free I2C EEPROM programmer tool for CH341A device";
     homepage = "https://github.com/bigbigmdm/IMSProg";
     license = with lib.licenses; [
       gpl3Plus
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 363bf860b8c9..6055b76c59a7 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -229,7 +229,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   };
 
   meta = with lib; {
-    description = "A generic proof assistant";
+    description = "Generic proof assistant";
 
     longDescription = ''
       Isabelle is a generic proof assistant.  It allows mathematical formulas
diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 71da7705ebd3..0da332f659bb 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A TUI for Jujutsu VCS";
+    description = "TUI for Jujutsu VCS";
     homepage = "https://github.com/idursun/jjui";
     changelog = "https://github.com/idursun/jjui/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix
index f7a603dba55c..a96a6d5add71 100644
--- a/pkgs/by-name/ka/kanidm-provision/package.nix
+++ b/pkgs/by-name/ka/kanidm-provision/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "A small utility to help with kanidm provisioning";
+    description = "Small utility to help with kanidm provisioning";
     homepage = "https://github.com/oddlama/kanidm-provision";
     license = with lib.licenses; [
       asl20
diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix
index 22108ca4195e..36586717f0ff 100644
--- a/pkgs/by-name/kc/kcl-language-server/package.nix
+++ b/pkgs/by-name/kc/kcl-language-server/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     changelog = "https://github.com/kcl-lang/kcl/releases/tag/v${version}";
-    description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
+    description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
     downloadPage = "https://github.com/kcl-lang/kcl/tree/v${version}/kclvm/tools/src/LSP";
     homepage = "https://www.kcl-lang.io/";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index b99a85421cc8..5973fa7de973 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -63,7 +63,7 @@ buildGoModule rec {
   updateScript = nix-update-script { };
 
   meta = {
-    description = "A command line interface for KCL programming language";
+    description = "Command line interface for KCL programming language";
     changelog = "https://github.com/kcl-lang/cli/releases/tag/v${version}";
     homepage = "https://github.com/kcl-lang/cli";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix
index dbe6b3bf8d79..dea0cb9cc654 100644
--- a/pkgs/by-name/kc/kclvm/package.nix
+++ b/pkgs/by-name/kc/kclvm/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   PROTOC_INCLUDE = "${protobuf}/include";
 
   meta = with lib; {
-    description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
+    description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
     homepage = "https://github.com/kcl-lang/kcl";
     license = licenses.asl20;
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix
index b205e1484df0..35eea846e8d0 100644
--- a/pkgs/by-name/kc/kclvm_cli/package.nix
+++ b/pkgs/by-name/kc/kclvm_cli/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   meta = with lib; {
-    description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
+    description = "High-performance implementation of KCL written in Rust that uses LLVM as the compiler backend";
     homepage = "https://github.com/kcl-lang/kcl";
     license = licenses.asl20;
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index 4eeb2099de2a..739623518f3d 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    description = "A high-performance and strong-extensibility Golang RPC framework";
+    description = "High-performance and strong-extensibility Golang RPC framework";
     homepage = "https://github.com/cloudwego/kitex";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aaronjheng ];
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index afffc52f51db..b3c795d14947 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -312,7 +312,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://github.com/kovidgoyal/kitty";
-    description = "The fast, feature-rich, GPU based terminal emulator";
+    description = "Fast, feature-rich, GPU based terminal emulator";
     license = licenses.gpl3Only;
     changelog = [
       "https://sw.kovidgoyal.net/kitty/changelog/"
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index d8fee487a22a..a8d0d7f7d25b 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/koreader/koreader";
     changelog = "https://github.com/koreader/koreader/releases/tag/v${version}";
-    description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
+    description = "Ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices";
     mainProgram = "koreader";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = [
diff --git a/pkgs/by-name/ku/kube-capacity/package.nix b/pkgs/by-name/ku/kube-capacity/package.nix
index b5f969cb7929..bf35827a8565 100644
--- a/pkgs/by-name/ku/kube-capacity/package.nix
+++ b/pkgs/by-name/ku/kube-capacity/package.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A=";
 
   meta = {
-    description = "A simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster";
+    description = "Simple CLI that provides an overview of the resource requests, limits, and utilization in a Kubernetes cluster";
     mainProgram = "kube-capacity";
     homepage = "https://github.com/robscott/kube-capacity";
     changelog = "https://github.com/robscott/kube-capacity/releases/tag/v${version}";
diff --git a/pkgs/by-name/ku/kubefetch/package.nix b/pkgs/by-name/ku/kubefetch/package.nix
index 4a771efc824a..aed03eae6ee1 100644
--- a/pkgs/by-name/ku/kubefetch/package.nix
+++ b/pkgs/by-name/ku/kubefetch/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   vendorHash = "sha256-qsncOsCxepySJI+rJnzbIGxSWlxMzqShtzcEoJD2UPw=";
 
   meta = {
-    description = "A neofetch-like tool to show info about your Kubernetes Cluster.";
+    description = "Neofetch-like tool to show info about your Kubernetes Cluster";
     homepage = "https://github.com/jkulzer/kubefetch";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ wrmilling ];
diff --git a/pkgs/by-name/ku/kuro/package.nix b/pkgs/by-name/ku/kuro/package.nix
index 5fb26933e51e..e03de7344c6e 100644
--- a/pkgs/by-name/ku/kuro/package.nix
+++ b/pkgs/by-name/ku/kuro/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     changelog = "https://github.com/davidsmorais/kuro/releases/tag/${src.rev}";
-    description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app";
+    description = "Unofficial, featureful, open source, community-driven, free Microsoft To-Do app";
     homepage = "https://github.com/davidsmorais/kuro";
     license = licenses.mit;
     mainProgram = "kuro";
diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
index 1173bc7e8247..8b2b13e974b4 100644
--- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
+    description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
     homepage = "https://github.com/suitenumerique/docs";
     changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md";
     mainProgram = "docs-collaboration-server";
diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
index af557cd9e2f7..f88cb44a379b 100644
--- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
+    description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
     homepage = "https://github.com/suitenumerique/docs";
     changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index 9ccb81cfe890..7a0a5c675af2 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -108,7 +108,7 @@ python.pkgs.buildPythonApplication rec {
   };
 
   meta = {
-    description = "A collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
+    description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline";
     homepage = "https://github.com/suitenumerique/docs";
     changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix
index f53397b39b8a..95a8dc739cc9 100644
--- a/pkgs/by-name/la/lauti/package.nix
+++ b/pkgs/by-name/la/lauti/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
   };
 
   meta = {
-    description = "An open source calendar for events, groups and places";
+    description = "Open source calendar for events, groups and places";
     homepage = "https://lauti.org";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ onny ];
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 82dabbcd3fff..922928c162c1 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "A cross-platform TUI database management tool written in Go";
+    description = "Cross-platform TUI database management tool written in Go";
     homepage = "https://github.com/jorgerojas26/lazysql";
     license = licenses.mit;
     maintainers = with maintainers; [ kanielrkirby ];
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index c3cdaabec73c..54355735828e 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   meta = {
-    description = "The classic linker for Darwin";
+    description = "Classic linker for Darwin";
     homepage = "https://opensource.apple.com/releases/";
     license = lib.licenses.apple-psl20;
     mainProgram = "ld";
diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix
index ebd872598035..9d5250d93ba3 100644
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
   '';
 
   meta = {
-    description = "A command-line tool for LeetCode";
+    description = "Command-line tool for LeetCode";
     homepage = "https://github.com/j178/leetgo";
     changelog = "https://github.com/j178/leetgo/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix
index f67131878a62..6f04130cc54d 100644
--- a/pkgs/by-name/li/liana/package.nix
+++ b/pkgs/by-name/li/liana/package.nix
@@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     mainProgram = "liana-gui";
-    description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery";
+    description = "Bitcoin wallet leveraging on-chain timelocks for safety and recovery";
     homepage = "https://wizardsardine.com/liana";
     changelog = "https://github.com/wizardsardine/liana/releases/tag/${src.rev}";
     license = licenses.bsd3;
diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix
index 515ef90967fa..bf21ad06ca95 100644
--- a/pkgs/by-name/li/lib25519/package.nix
+++ b/pkgs/by-name/li/lib25519/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://randombytes.cr.yp.to/";
-    description = "A simple API for applications generating fresh randomness";
+    description = "Simple API for applications generating fresh randomness";
     changelog = "https://randombytes.cr.yp.to/download.html";
     license = with lib.licenses; [
       # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html
diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix
index c10169135e4e..f91727100143 100644
--- a/pkgs/by-name/li/libetebase/package.nix
+++ b/pkgs/by-name/li/libetebase/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   passthru.tests.pkgs-config = testers.testMetaPkgConfig libetebase;
 
   meta = with lib; {
-    description = "A C library for Etebase";
+    description = "C library for Etebase";
     homepage = "https://www.etebase.com/";
     license = licenses.bsd3;
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/li/libgen-cli/package.nix b/pkgs/by-name/li/libgen-cli/package.nix
index 33aa2fc8cfa1..7b7963093a5f 100644
--- a/pkgs/by-name/li/libgen-cli/package.nix
+++ b/pkgs/by-name/li/libgen-cli/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://github.com/ciehanski/libgen-cli";
-    description = "A CLI tool used to access the Library Genesis dataset; written in Go";
+    description = "CLI tool used to access the Library Genesis dataset; written in Go";
     longDescription = ''
       libgen-cli is a command line interface application which allows users to
       quickly query the Library Genesis dataset and download any of its
diff --git a/pkgs/by-name/li/libnop/package.nix b/pkgs/by-name/li/libnop/package.nix
index 09cba2b2404c..f1eeb531bc11 100644
--- a/pkgs/by-name/li/libnop/package.nix
+++ b/pkgs/by-name/li/libnop/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A fast, header-only C++ serialization library";
+    description = "Fast, header-only C++ serialization library";
     homepage = "https://github.com/google/libnop";
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/li/libpisp/package.nix b/pkgs/by-name/li/libpisp/package.nix
index 2a9dd59d2d46..d7aa73b00722 100644
--- a/pkgs/by-name/li/libpisp/package.nix
+++ b/pkgs/by-name/li/libpisp/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://github.com/raspberrypi/libpisp";
-    description = "A helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components.";
+    description = "Helper library to generate run-time configuration for the Raspberry Pi ISP (PiSP), consisting of the Frontend and Backend hardware components";
     license = licenses.bsd2;
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/li/librandombytes/package.nix b/pkgs/by-name/li/librandombytes/package.nix
index e6ecbdef8eea..cb19ead59257 100644
--- a/pkgs/by-name/li/librandombytes/package.nix
+++ b/pkgs/by-name/li/librandombytes/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://randombytes.cr.yp.to/";
-    description = "A simple API for applications generating fresh randomness";
+    description = "Simple API for applications generating fresh randomness";
     changelog = "https://randombytes.cr.yp.to/download.html";
     license = with lib.licenses; [
       # Upstream specifies the public domain licenses with the terms here https://cr.yp.to/spdx.html
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index c5a0cd73daf0..0d30ff5115ab 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "A pattern-based arpeggio generator plugin.";
+    description = "Pattern-based arpeggio generator plugin";
     homepage = "https://librearp.gitlab.io/";
     license = licenses.gpl3Plus;
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index eb6f10ea8a74..491ea9d1f3fb 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "A pattern-based arpeggio generator plugin";
+    description = "Pattern-based arpeggio generator plugin";
     homepage = "https://librearp.gitlab.io/";
     license = licenses.gpl3Plus;
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/li/libstudxml/package.nix b/pkgs/by-name/li/libstudxml/package.nix
index 7cba6de407cd..501f416d7a80 100644
--- a/pkgs/by-name/li/libstudxml/package.nix
+++ b/pkgs/by-name/li/libstudxml/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A streaming XML pull parser and streaming XML serializer implementation for modern, standard C++";
+    description = "Streaming XML pull parser and streaming XML serializer implementation for modern, standard C++";
     homepage = "https://www.codesynthesis.com/projects/libstudxml/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix
index 3072f02f4e55..96f92a39c369 100644
--- a/pkgs/by-name/li/littlenavmap/atools.nix
+++ b/pkgs/by-name/li/littlenavmap/atools.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   meta = {
-    description = "A static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more";
+    description = "Static library extending Qt for exception handling, a log4j like logging framework, Flight Simulator related utilities like BGL reader and more";
     homepage = "https://github.com/albar965/atools";
     changelog = "https://github.com/albar965/atools/blob/${src.rev}/CHANGELOG.txt";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
index 8ebe6e9dce63..a33c7adf273a 100644
--- a/pkgs/by-name/li/littlenavmap/package.nix
+++ b/pkgs/by-name/li/littlenavmap/package.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   passthru.local-packages = { inherit atools marble; };
 
   meta = {
-    description = "A free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
+    description = "Free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
     homepage = "https://github.com/albar965/littlenavmap";
     changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/lo/lorien/package.nix b/pkgs/by-name/lo/lorien/package.nix
index 345be9574959..664b5453cef8 100644
--- a/pkgs/by-name/lo/lorien/package.nix
+++ b/pkgs/by-name/lo/lorien/package.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/mbrlabs/Lorien";
-    description = "An infinite canvas drawing/note-taking app";
+    description = "Infinite canvas drawing/note-taking app";
     longDescription = ''
       An infinite canvas drawing/note-taking app that is focused on performance,
       small savefiles and simplicity
diff --git a/pkgs/by-name/lp/lprobe/package.nix b/pkgs/by-name/lp/lprobe/package.nix
index 2aacf60ec18b..853db3bffdb1 100644
--- a/pkgs/by-name/lp/lprobe/package.nix
+++ b/pkgs/by-name/lp/lprobe/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   ];
 
   meta = {
-    description = "A command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)";
+    description = "Command-line tool to perform Local Health Check Probes inside Container Images (ECS, Docker)";
     homepage = "https://github.com/fivexl/lprobe";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix
index ba6f24bbf5bf..d99cddaf95a9 100644
--- a/pkgs/by-name/lu/luanti/package.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     homepage = "https://www.luanti.org/";
-    description = "An open source voxel game engine (formerly Minetest)";
+    description = "Open source voxel game engine (formerly Minetest)";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix
index 1f36430c1997..19278a3a9add 100644
--- a/pkgs/by-name/lu/lumafly/package.nix
+++ b/pkgs/by-name/lu/lumafly/package.nix
@@ -68,7 +68,7 @@ buildDotnetModule rec {
   ];
 
   meta = {
-    description = "A cross platform mod manager for Hollow Knight written in Avalonia";
+    description = "Cross platform mod manager for Hollow Knight written in Avalonia";
     homepage = "https://themulhima.github.io/Lumafly/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "Lumafly";
diff --git a/pkgs/by-name/ly/lyra-cursors/package.nix b/pkgs/by-name/ly/lyra-cursors/package.nix
index b1ce03d965fb..da7b6530080b 100644
--- a/pkgs/by-name/ly/lyra-cursors/package.nix
+++ b/pkgs/by-name/ly/lyra-cursors/package.nix
@@ -73,7 +73,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "A cursor theme inspired by macOS and based on capitaine-cursors";
+    description = "Cursor theme inspired by macOS and based on capitaine-cursors";
     homepage = "https://github.com/yeyushengfan258/Lyra-Cursors";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 63113960f5ec..93de75693573 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
   disabledTests = [ "test_is_process_running" ];
 
   meta = {
-    description = "A tool to keep your application settings in sync (OS X/Linux)";
+    description = "Tool to keep your application settings in sync (OS X/Linux)";
     changelog = "https://github.com/lra/mackup/releases/tag/${version}";
     license = lib.licenses.agpl3Only;
     homepage = "https://github.com/lra/mackup";
diff --git a/pkgs/by-name/ma/mangl/package.nix b/pkgs/by-name/ma/mangl/package.nix
index 699babd5ae4f..53c00df623d2 100644
--- a/pkgs/by-name/ma/mangl/package.nix
+++ b/pkgs/by-name/ma/mangl/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/zigalenarcic/mangl";
-    description = "A graphical man page viewer based on the mandoc library";
+    description = "Graphical man page viewer based on the mandoc library";
     license = licenses.bsd2;
     maintainers = with maintainers; [ nrabulinski ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/ma/marble-marcher-ce/package.nix b/pkgs/by-name/ma/marble-marcher-ce/package.nix
index bff892e6c6c5..47768199202b 100644
--- a/pkgs/by-name/ma/marble-marcher-ce/package.nix
+++ b/pkgs/by-name/ma/marble-marcher-ce/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "A community-developed version of the original Marble Marcher - a fractal physics game";
+    description = "Community-developed version of the original Marble Marcher - a fractal physics game";
     mainProgram = "marble-marcher-ce";
     homepage = "https://michaelmoroz.itch.io/mmce";
     license = with lib.licenses; [
diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix
index 94615392a96c..5cf2bb999d9a 100644
--- a/pkgs/by-name/ma/markdown-code-runner/package.nix
+++ b/pkgs/by-name/ma/markdown-code-runner/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   dontUseCargoParallelTests = true;
 
   meta = {
-    description = "A configurable Markdown code runner that executes and optionally replaces code blocks using external commands";
+    description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands";
     longDescription = ''
       markdown-code-runner is a command-line tool that scans Markdown files for fenced code blocks,
       executes them using per-language configuration, and optionally replaces the block content
diff --git a/pkgs/by-name/ma/mars-mips/package.nix b/pkgs/by-name/ma/mars-mips/package.nix
index 3de083a98317..2e1474e676b9 100644
--- a/pkgs/by-name/ma/mars-mips/package.nix
+++ b/pkgs/by-name/ma/mars-mips/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "An IDE for programming in MIPS assembly language intended for educational-level use";
+    description = "IDE for programming in MIPS assembly language intended for educational-level use";
     mainProgram = "Mars";
     homepage = "https://courses.missouristate.edu/KenVollmar/MARS/";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix
index d0f670578d86..f0810fd126e3 100644
--- a/pkgs/by-name/ma/maxcso/package.nix
+++ b/pkgs/by-name/ma/maxcso/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/unknownbrackets/maxcso";
-    description = "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio";
+    description = "Fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio";
     maintainers = with maintainers; [ david-sawatzke ];
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.isc;
diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
index 485d91a0da40..90c81ab70dab 100644
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
   vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw=";
 
   meta = {
-    description = "A CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP";
+    description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP";
     homepage = "https://github.com/mark3labs/mcphost";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ drupol ];
diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix
index a821d74fdb66..25a8ae792f28 100644
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -36,7 +36,7 @@ buildDartApplication {
 
   meta = {
     homepage = "https://github.com/invertase/melos";
-    description = "A tool for managing Dart projects with multiple packages. With IntelliJ and Vscode IDE support. Supports automated versioning, changelogs & publishing via Conventional Commits. ";
+    description = "Tool for managing Dart projects with multiple packages. With IntelliJ and Vscode IDE support. Supports automated versioning, changelogs & publishing via Conventional Commits. ";
     mainProgram = "melos";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.eymeric ];
diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index bd8c30791060..2c67abb0968a 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -160,7 +160,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    description = "An unofficial, unendorsed language server for Meson written in C++";
+    description = "Unofficial, unendorsed language server for Meson written in C++";
     homepage = "https://github.com/JCWasmx86/mesonlsp";
     changelog = "https://github.com/JCWasmx86/mesonlsp/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix
index 60d1b11404d1..5897d391e42a 100644
--- a/pkgs/by-name/mi/min/package.nix
+++ b/pkgs/by-name/mi/min/package.nix
@@ -34,7 +34,7 @@ buildNimPackage (finalAttrs: {
   NIX_LDFLAGS = [ "-lpcre" ];
 
   meta = {
-    description = "A functional, concatenative programming language with a minimalist syntax";
+    description = "Functional, concatenative programming language with a minimalist syntax";
     homepage = "https://min-lang.org/";
     changelog = "https://github.com/h3rald/min/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/mi/mitm-cache/package.nix b/pkgs/by-name/mi/mitm-cache/package.nix
index 9c4e89bf3d55..dbef2c58b7e8 100644
--- a/pkgs/by-name/mi/mitm-cache/package.nix
+++ b/pkgs/by-name/mi/mitm-cache/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   passthru.fetch = callPackage ./fetch.nix { };
 
   meta = with lib; {
-    description = "A MITM caching proxy for use in nixpkgs";
+    description = "MITM caching proxy for use in nixpkgs";
     homepage = "https://github.com/chayleaf/mitm-cache#readme";
     license = licenses.mit;
     maintainers = with maintainers; [ chayleaf ];
diff --git a/pkgs/by-name/mo/moonpalace/package.nix b/pkgs/by-name/mo/moonpalace/package.nix
index a317b5bc3b29..a661020ee17b 100644
--- a/pkgs/by-name/mo/moonpalace/package.nix
+++ b/pkgs/by-name/mo/moonpalace/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   };
 
   meta = {
-    description = "An API debugging tool provided by Moonshot AI";
+    description = "API debugging tool provided by Moonshot AI";
     homepage = "https://github.com/MoonshotAI/moonpalace";
     changelog = "https://github.com/MoonshotAI/moonpalace/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix
index 7c34524eabcd..9819ad9ce4ab 100644
--- a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix
+++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools-scm ];
 
   meta = {
-    description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons";
+    description = "Mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons";
     homepage = "https://github.com/mov-cli/mov-cli-test";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ youhaveme9 ];
diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix
index b4831561b7af..f02963827731 100644
--- a/pkgs/by-name/mp/mpv-subs-popout/package.nix
+++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   meta = {
-    description = "A little application that makes it possible to display mpv's subs anywhere you want. With translation features";
+    description = "Little application that makes it possible to display mpv's subs anywhere you want. With translation features";
     homepage = "https://github.com/sdaqo/mpv-subs-popout";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.sdaqo ];
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index 75ff2b1b798a..d9f8293dc1ad 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "An all-round MQTT client that provides a structured topic overview";
+    description = "All-round MQTT client that provides a structured topic overview";
     homepage = "https://github.com/thomasnordquist/MQTT-Explorer";
     changelog = "https://github.com/thomasnordquist/MQTT-Explorer/releases/tag/v${version}";
     license = licenses.cc-by-nd-40;
diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index f2976a021145..23f91c042213 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     changelog = "https://github.com/music-assistant/frontend/releases/tag/${version}";
-    description = "The Music Assistant frontend";
+    description = "Music Assistant frontend";
     homepage = "https://github.com/music-assistant/frontend";
     license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix
index 8de4fee17b2b..31475e66a1f4 100644
--- a/pkgs/by-name/mu/musl-obstack/package.nix
+++ b/pkgs/by-name/mu/musl-obstack/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/void-linux/musl-obstack";
-    description = "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc";
+    description = "Extraction of the obstack functions and macros from GNU libiberty for use with musl-libc";
     platforms = platforms.unix;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.pjjw ];
diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 59a8645d3a81..b08669a624f0 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -100,7 +100,7 @@ maven.buildMavenPackage rec {
     });
 
   meta = {
-    description = "The Apache Maven Daemon";
+    description = "Apache Maven Daemon";
     homepage = "https://maven.apache.org/";
     license = lib.licenses.asl20;
     platforms = builtins.attrNames platformMap;
diff --git a/pkgs/by-name/nb/nbsdgames/package.nix b/pkgs/by-name/nb/nbsdgames/package.nix
index 552694601833..7543a39f9fbc 100644
--- a/pkgs/by-name/nb/nbsdgames/package.nix
+++ b/pkgs/by-name/nb/nbsdgames/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A package of 18 text-based modern games";
+    description = "Package of 18 text-based modern games";
     homepage = "https://github.com/abakh/nbsdgames";
     license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ sarcasticadmin ];
diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix
index 68e9f96d9510..7771bae3a195 100644
--- a/pkgs/by-name/ne/next-ls/package.nix
+++ b/pkgs/by-name/ne/next-ls/package.nix
@@ -37,7 +37,7 @@ beamPackages.mixRelease rec {
   meta = {
     homepage = "https://www.elixir-tools.dev/next-ls/";
     changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}";
-    description = "The language server for Elixir that just works";
+    description = "Language server for Elixir that just works";
     license = lib.licenses.mit;
     mainProgram = "nextls";
     maintainers = [ lib.maintainers.adamcstephens ];
diff --git a/pkgs/by-name/ni/nixos-firewall-tool/package.nix b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
index 13f27d3b7b25..4615287fb260 100644
--- a/pkgs/by-name/ni/nixos-firewall-tool/package.nix
+++ b/pkgs/by-name/ni/nixos-firewall-tool/package.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A tool to temporarily manipulate the NixOS firewall";
+    description = "Tool to temporarily manipulate the NixOS firewall";
     license = licenses.mit;
     maintainers = with maintainers; [
       clerie
diff --git a/pkgs/by-name/ni/nixos-install-tools/package.nix b/pkgs/by-name/ni/nixos-install-tools/package.nix
index 853c4d718e38..03be3c9ea39b 100644
--- a/pkgs/by-name/ni/nixos-install-tools/package.nix
+++ b/pkgs/by-name/ni/nixos-install-tools/package.nix
@@ -28,7 +28,7 @@ in
   extraOutputsToInstall = [ "man" ];
 
   meta = {
-    description = "The essential commands from the NixOS installer as a package";
+    description = "Essential commands from the NixOS installer as a package";
     longDescription = ''
       With this package, you get the commands like nixos-generate-config and
       nixos-install that you would otherwise only find on a NixOS system, such
diff --git a/pkgs/by-name/nt/ntfy-alertmanager/package.nix b/pkgs/by-name/nt/ntfy-alertmanager/package.nix
index ef87df47b46f..88edb49f9157 100644
--- a/pkgs/by-name/nt/ntfy-alertmanager/package.nix
+++ b/pkgs/by-name/nt/ntfy-alertmanager/package.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   vendorHash = "sha256-8a6dvBERegpFYFHQGJppz5tlQioQAudCe3/Q7vro+ZI=";
 
   meta = with lib; {
-    description = "A bridge between ntfy and Alertmanager";
+    description = "Bridge between ntfy and Alertmanager";
     homepage = "https://git.xenrox.net/~xenrox/ntfy-alertmanager";
     license = licenses.agpl3Only;
     mainProgram = "ntfy-alertmanager";
diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix
index 0cd295b98b9c..94c50de321cc 100644
--- a/pkgs/by-name/nu/nuv/package.nix
+++ b/pkgs/by-name/nu/nuv/package.nix
@@ -71,7 +71,7 @@ buildGoModule {
 
   meta = {
     homepage = "https://nuvolaris.io/";
-    description = "A CLI tool for running tasks using the Nuvolaris serverless engine";
+    description = "CLI tool for running tasks using the Nuvolaris serverless engine";
     license = lib.licenses.asl20;
     mainProgram = "nuv";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index 015ca1efd4bc..b4b8f08b630c 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "An app runtime based on Chromium and node.js";
+    description = "App runtime based on Chromium and node.js";
     homepage = "https://nwjs.io/";
     platforms = [
       "i686-linux"
diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix
index 27604339d318..ebda5feb6aa0 100644
--- a/pkgs/by-name/ob/objfw/package.nix
+++ b/pkgs/by-name/ob/objfw/package.nix
@@ -37,7 +37,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A portable framework for the Objective-C language";
+    description = "Portable framework for the Objective-C language";
     homepage = "https://objfw.nil.im";
     license = lib.licenses.lgpl3;
     maintainers = [ lib.maintainers.steeleduncan ];
diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix
index 73a127dc1d1c..8369fd56bb15 100644
--- a/pkgs/by-name/oc/ocelot-desktop/package.nix
+++ b/pkgs/by-name/oc/ocelot-desktop/package.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "An advanced OpenComputers emulator";
+    description = "Advanced OpenComputers emulator";
     homepage = "https://ocelot.fomalhaut.me/desktop";
     changelog = "https://gitlab.com/cc-ru/ocelot/ocelot-desktop/-/releases/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/om/omnom/package.nix b/pkgs/by-name/om/omnom/package.nix
index d885a6601df9..9e4076306615 100644
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@@ -78,7 +78,7 @@ buildGoModule (finalAttrs: {
   '';
 
   meta = {
-    description = "A webpage bookmarking and snapshotting service";
+    description = "Webpage bookmarking and snapshotting service";
     homepage = "https://github.com/asciimoo/omnom";
     license = lib.licenses.agpl3Only;
     teams = [ lib.teams.ngi ];
diff --git a/pkgs/by-name/on/oncall/package.nix b/pkgs/by-name/on/oncall/package.nix
index 4c56b281699c..bfa1578ce7d5 100644
--- a/pkgs/by-name/on/oncall/package.nix
+++ b/pkgs/by-name/on/oncall/package.nix
@@ -100,7 +100,7 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   meta = {
-    description = "A calendar web-app designed for scheduling and managing on-call shifts";
+    description = "Calendar web-app designed for scheduling and managing on-call shifts";
     homepage = "http://oncall.tools";
     changelog = "https://github.com/linkedin/oncall/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.bsd2;
diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 99cb30ccf703..7d2ae1fb3fd4 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -67,7 +67,7 @@ buildGoModule rec {
     mainProgram = "opa";
     homepage = "https://www.openpolicyagent.org/docs/latest/envoy-introduction/";
     changelog = "https://github.com/open-policy-agent/opa-envoy-plugin/blob/v${version}/CHANGELOG.md";
-    description = "A plugin to enforce OPA policies with Envoy";
+    description = "Plugin to enforce OPA policies with Envoy";
     longDescription = ''
       OPA-Envoy extends OPA with a gRPC server that implements the Envoy
       External Authorization API. You can use this version of OPA to enforce
diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix
index a6decdcf8ff6..7c33126a56a4 100644
--- a/pkgs/by-name/op/openbgpd/package.nix
+++ b/pkgs/by-name/op/openbgpd/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
   meta = with lib; {
-    description = "A free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
+    description = "Free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
     license = licenses.isc;
     homepage = "http://www.openbgpd.org/";
     maintainers = with maintainers; [ kloenk ];
diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix
index 66a2079282ce..b1cbe51469f0 100644
--- a/pkgs/by-name/op/opensupaplex/package.nix
+++ b/pkgs/by-name/op/opensupaplex/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    description = "A decompilation of Supaplex in C and SDL";
+    description = "Decompilation of Supaplex in C and SDL";
     homepage = "https://github.com/sergiou87/open-supaplex";
     changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/op/optional-lite/package.nix b/pkgs/by-name/op/optional-lite/package.nix
index aa07b6be1936..062e09519e6d 100644
--- a/pkgs/by-name/op/optional-lite/package.nix
+++ b/pkgs/by-name/op/optional-lite/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library";
+    description = "C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library";
     homepage = "https://github.com/martinmoene/optional-lite";
     changelog = "https://github.com/martinmoene/optional-lite/blob/v${finalAttrs.version}/CHANGES.txt";
     license = lib.licenses.boost;
diff --git a/pkgs/by-name/os/osquery/toolchain-bin.nix b/pkgs/by-name/os/osquery/toolchain-bin.nix
index 5a12e7fb3746..3d05ee9f1e2f 100644
--- a/pkgs/by-name/os/osquery/toolchain-bin.nix
+++ b/pkgs/by-name/os/osquery/toolchain-bin.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A LLVM-based toolchain for Linux designed to build a portable osquery";
+    description = "LLVM-based toolchain for Linux designed to build a portable osquery";
     homepage = "https://github.com/osquery/osquery-toolchain";
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index 7b76d5fd1630..063484dc32d4 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -78,7 +78,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = with lib; {
-    description = "A Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful";
+    description = "Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful";
     homepage = "https://github.com/${owner}/${name}";
     changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Only;
diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index 3176d0ffcdd1..ceeb53b7d3cf 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "The Oxide Rust SDK and CLI";
+    description = "Oxide Rust SDK and CLI";
     homepage = "https://github.com/oxidecomputer/oxide.rs";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix
index d0bdfb97c7b2..4f019dfe4516 100644
--- a/pkgs/by-name/pa/patchcil/package.nix
+++ b/pkgs/by-name/pa/patchcil/package.nix
@@ -59,7 +59,7 @@ buildDotnetModule rec {
   };
 
   meta = {
-    description = "A small utility to modify the library paths from PInvoke in .NET assemblies.";
+    description = "Small utility to modify the library paths from PInvoke in .NET assemblies";
     homepage = "https://github.com/GGG-KILLER/patchcil";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ggg ];
diff --git a/pkgs/by-name/pa/paup-cli/package.nix b/pkgs/by-name/pa/paup-cli/package.nix
index 12796245bced..006a65b7fb95 100644
--- a/pkgs/by-name/pa/paup-cli/package.nix
+++ b/pkgs/by-name/pa/paup-cli/package.nix
@@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "A software package for inferring evolutionary trees";
+    description = "Software package for inferring evolutionary trees";
     homepage = "http://phylosolutions.com/paup-test/";
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix
index 4aa5dca89d33..97aef545c6c9 100644
--- a/pkgs/by-name/pe/peertube-viewer/package.nix
+++ b/pkgs/by-name/pe/peertube-viewer/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ=";
 
   meta = with lib; {
-    description = "A simple CLI browser for the peertube federated video platform";
+    description = "Simple CLI browser for the peertube federated video platform";
     homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ haruki7049 ];
diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix
index 7db0debadcb2..1682b11683df 100644
--- a/pkgs/by-name/pe/perses/package.nix
+++ b/pkgs/by-name/pe/perses/package.nix
@@ -119,7 +119,7 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    description = "The CNCF sandbox for observability visualisation";
+    description = "CNCF sandbox for observability visualisation";
     homepage = "https://perses.dev/";
     changelog = "https://github.com/perses/perses/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/ph/photini/package.nix b/pkgs/by-name/ph/photini/package.nix
index c9d8bd031bc4..841794754f60 100644
--- a/pkgs/by-name/ph/photini/package.nix
+++ b/pkgs/by-name/ph/photini/package.nix
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     homepage = "https://github.com/jim-easterbrook/Photini";
     changelog = "https://photini.readthedocs.io/en/release-${version}/misc/changelog.html";
-    description = "An easy to use digital photograph metadata (Exif, IPTC, XMP) editing application";
+    description = "Easy to use digital photograph metadata (Exif, IPTC, XMP) editing application";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ zebreus ];
     mainProgram = "photini";
diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix
index bedc763202d2..5ab9be6b6cdb 100644
--- a/pkgs/by-name/pi/piano-rs/package.nix
+++ b/pkgs/by-name/pi/piano-rs/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "A multiplayer piano using UDP sockets that can be played using computer keyboard, in the terminal";
+    description = "Multiplayer piano using UDP sockets that can be played using computer keyboard, in the terminal";
     homepage = "https://github.com/ritiek/piano-rs";
     license = licenses.mit;
     mainProgram = "piano-rs";
diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index 55d051213750..d55a7f99273b 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -232,7 +232,7 @@
     };
 
   meta = {
-    description = "A black hole for Internet advertisements";
+    description = "Black hole for Internet advertisements";
     license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ averyvigolo ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/pi/piscope/package.nix b/pkgs/by-name/pi/piscope/package.nix
index 8191f53aa1c9..9873ada380eb 100644
--- a/pkgs/by-name/pi/piscope/package.nix
+++ b/pkgs/by-name/pi/piscope/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "http://abyz.me.uk/rpi/pigpio/piscope.html";
-    description = "A logic analyser (digital waveform viewer) for the Raspberry";
+    description = "Logic analyser (digital waveform viewer) for the Raspberry";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ doronbehar ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index ad256b2253f9..666a5f0f9aae 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "A graphical tool for developing on containers and Kubernetes";
+    description = "Graphical tool for developing on containers and Kubernetes";
     homepage = "https://podman-desktop.io";
     changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 3d65af77c032..ca1409cffdb0 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
-    description = "A Language with Dependent Data and Codata Types";
+    description = "Language with Dependent Data and Codata Types";
     homepage = "https://polarity-lang.github.io/";
     changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md";
     license = with lib.licenses; [
diff --git a/pkgs/by-name/po/popcorntime/package.nix b/pkgs/by-name/po/popcorntime/package.nix
index 93413a04572d..c6db6644f36c 100644
--- a/pkgs/by-name/po/popcorntime/package.nix
+++ b/pkgs/by-name/po/popcorntime/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/popcorn-official/popcorn-desktop";
-    description = "An application that streams movies and TV shows from torrents";
+    description = "Application that streams movies and TV shows from torrents";
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.gpl3;
diff --git a/pkgs/by-name/pp/pplatex/package.nix b/pkgs/by-name/pp/pplatex/package.nix
index f7f0a04f2181..a6380ec920c8 100644
--- a/pkgs/by-name/pp/pplatex/package.nix
+++ b/pkgs/by-name/pp/pplatex/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    description = "A tool to reformat the output of latex and friends into readable messages";
+    description = "Tool to reformat the output of latex and friends into readable messages";
     mainProgram = "pplatex";
     homepage = "https://github.com/stefanhepp/pplatex";
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/pr/premid/package.nix b/pkgs/by-name/pr/premid/package.nix
index 557a3ab20161..6cf748999a4d 100644
--- a/pkgs/by-name/pr/premid/package.nix
+++ b/pkgs/by-name/pr/premid/package.nix
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A simple, configurable utility to show your web activity as playing status on Discord";
+    description = "Simple, configurable utility to show your web activity as playing status on Discord";
     homepage = "https://premid.app";
     downloadPage = "https://premid.app/downloads";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix
index ab9e61be897d..35a132174ecc 100644
--- a/pkgs/by-name/pr/pretty-php/package.nix
+++ b/pkgs/by-name/pr/pretty-php/package.nix
@@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   meta = {
-    description = "The opinionated PHP code formatter";
+    description = "Opinionated PHP code formatter";
     homepage = "https://github.com/lkrms/pretty-php";
     license = lib.licenses.mit;
     mainProgram = "pretty-php";
diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix
index 4c317159f552..73d2a823f0c1 100644
--- a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix
+++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (
 
     meta = {
       homepage = "https://github.com/prometheus/jmx_exporter";
-      description = "A process for exposing JMX Beans via HTTP for Prometheus consumption";
+      description = "Process for exposing JMX Beans via HTTP for Prometheus consumption";
       sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
       license = lib.licenses.asl20;
       maintainers = [ lib.maintainers.srhb ];
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
index 4ef2318e150d..45bd7081b6e9 100644
--- a/pkgs/by-name/pr/protege/package.nix
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -74,7 +74,7 @@ maven.buildMavenPackage rec {
   meta = {
     homepage = "https://protege.stanford.edu/";
     downloadPage = "https://protege.stanford.edu/software.php#desktop-protege";
-    description = "A free and open-source OWL 2 ontology editor";
+    description = "Free and open-source OWL 2 ontology editor";
     longDescription = ''
       Protégé Desktop is a feature rich ontology editing environment with full
       support for the OWL 2 Web Ontology Language, and direct in-memory
diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 96af826fd59f..ba7e9ed2d18d 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -30,7 +30,7 @@ mixRelease rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A protoc plugin to generate Elixir code";
+    description = "Protoc plugin to generate Elixir code";
     mainProgram = "protoc-gen-elixir";
     homepage = "https://github.com/elixir-protobuf/protobuf";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix
index 0acf7886422f..ae499019b099 100644
--- a/pkgs/by-name/pr/proxsuite/package.nix
+++ b/pkgs/by-name/pr/proxsuite/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
   pythonImportsCheck = [ "proxsuite" ];
 
   meta = {
-    description = "The Advanced Proximal Optimization Toolbox";
+    description = "Advanced Proximal Optimization Toolbox";
     homepage = "https://github.com/Simple-Robotics/proxsuite";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ nim65s ];
diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix
index 27cedfb1e044..df3549541efa 100644
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -17,7 +17,7 @@
 }:
 let
   pname = "pymol";
-  description = "A Python-enhanced molecular graphics tool";
+  description = "Python-enhanced molecular graphics tool";
 
   desktopItem = makeDesktopItem {
     name = pname;
diff --git a/pkgs/by-name/py/pysolfc/package.nix b/pkgs/by-name/py/pysolfc/package.nix
index 1c8d0b852663..e558487a8771 100644
--- a/pkgs/by-name/py/pysolfc/package.nix
+++ b/pkgs/by-name/py/pysolfc/package.nix
@@ -98,7 +98,7 @@ python311Packages.buildPythonApplication rec {
   );
 
   meta = with lib; {
-    description = "A collection of more than 1000 solitaire card games";
+    description = "Collection of more than 1000 solitaire card games";
     mainProgram = "pysol.py";
     homepage = "https://pysolfc.sourceforge.io";
     license = licenses.gpl3;
diff --git a/pkgs/by-name/py/pyzy/package.nix b/pkgs/by-name/py/pyzy/package.nix
index 5fdcae56c47b..e9e5d392ccf1 100644
--- a/pkgs/by-name/py/pyzy/package.nix
+++ b/pkgs/by-name/py/pyzy/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   };
 
   meta = with lib; {
-    description = "The Chinese PinYin and Bopomofo conversion library";
+    description = "Chinese PinYin and Bopomofo conversion library";
     homepage = "https://github.com/openSUSE/pyzy";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ azuwis ];
diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix
index 7395bff0c8f8..927e6f097f97 100644
--- a/pkgs/by-name/qu/quark-goldleaf/package.nix
+++ b/pkgs/by-name/qu/quark-goldleaf/package.nix
@@ -98,7 +98,7 @@ maven.buildMavenPackage rec {
 
   meta = {
     changelog = "https://github.com/XorTroll/Goldleaf/releases/tag/${src.rev}";
-    description = "A GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf";
+    description = "GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf";
     homepage = "https://github.com/XorTroll/Goldleaf#quark-and-remote-browsing";
     longDescription = ''
       ${meta.description}
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 3931848bdafa..5f3185c7de83 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
 
   meta = {
     changelog = "https://github.com/achristmascarl/rainfrog/releases/tag/v${version}";
-    description = "A database management TUI for postgres";
+    description = "Database management TUI for postgres";
     homepage = "https://github.com/achristmascarl/rainfrog";
     license = lib.licenses.mit;
     mainProgram = "rainfrog";
diff --git a/pkgs/by-name/ra/raygui/package.nix b/pkgs/by-name/ra/raygui/package.nix
index b60693f84e92..5aa6b78023b0 100644
--- a/pkgs/by-name/ra/raygui/package.nix
+++ b/pkgs/by-name/ra/raygui/package.nix
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A simple and easy-to-use immediate-mode gui library";
+    description = "Simple and easy-to-use immediate-mode gui library";
     homepage = "https://github.com/raysan5/raygui";
     license = lib.licenses.zlib;
     maintainers = with lib.maintainers; [ sigmanificient ];
diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index 6edeccfdd07d..3ef4dc7724e7 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "A simple, high performance relay server written in rust";
+    description = "Simple, high performance relay server written in rust";
     homepage = "https://github.com/zhboner/realm";
     mainProgram = "realm";
     license = licenses.mit;
diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix
index f635684222a7..b04f6be12d16 100644
--- a/pkgs/by-name/re/redact/package.nix
+++ b/pkgs/by-name/re/redact/package.nix
@@ -49,7 +49,7 @@ appimageTools.wrapType2 {
       '';
 
   meta = {
-    description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place.";
+    description = "Only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place";
     homepage = "https://redact.dev/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ reputable2772 ];
diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix
index 7cfba5fae808..415dd5cdc27b 100644
--- a/pkgs/by-name/re/restic-browser/package.nix
+++ b/pkgs/by-name/re/restic-browser/package.nix
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A GUI to browse and restore restic backup repositories";
+    description = "GUI to browse and restore restic backup repositories";
     homepage = "https://github.com/emuell/restic-browser";
     changelog = "https://github.com/emuell/restic-browser/releases/tag/v${version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/re/rewritefs/package.nix b/pkgs/by-name/re/rewritefs/package.nix
index 03638fb5cf57..91dd2d334024 100644
--- a/pkgs/by-name/re/rewritefs/package.nix
+++ b/pkgs/by-name/re/rewritefs/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   preConfigure = "substituteInPlace Makefile --replace /usr/local $out";
 
   meta = with lib; {
-    description = "A FUSE filesystem intended to be used like Apache mod_rewrite";
+    description = "FUSE filesystem intended to be used like Apache mod_rewrite";
     homepage = "https://github.com/sloonz/rewritefs";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ rnhmjoj ];
diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix
index aa28141583e3..2c645221c9aa 100644
--- a/pkgs/by-name/rp/rpm-sequoia/package.nix
+++ b/pkgs/by-name/rp/rpm-sequoia/package.nix
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "An OpenPGP backend for rpm using Sequoia PGP";
+    description = "OpenPGP backend for rpm using Sequoia PGP";
     homepage = "https://sequoia-pgp.org/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ baloo ];
diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix
index 2bfb535e08a9..cbf54aed1752 100644
--- a/pkgs/by-name/ru/rundeck-cli/package.nix
+++ b/pkgs/by-name/ru/rundeck-cli/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "The official CLI tool for Rundeck";
+    description = "Official CLI tool for Rundeck";
     longDescription = ''
       The rd command provides command line access to the Rundeck HTTP API,
       allowing you to access and control your Rundeck server from the
diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix
index 96292cbd65b1..1eeff70b49bf 100644
--- a/pkgs/by-name/ru/rush-parallel/package.nix
+++ b/pkgs/by-name/ru/rush-parallel/package.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
   ];
 
   meta = {
-    description = "A cross-platform command-line tool for executing jobs in parallel";
+    description = "Cross-platform command-line tool for executing jobs in parallel";
     homepage = "https://github.com/shenwei356/rush";
     changelog = "https://github.com/shenwei356/rush/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix
index 932876025231..bfb842f81181 100644
--- a/pkgs/by-name/ru/rustmission/package.nix
+++ b/pkgs/by-name/ru/rustmission/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = {
-    description = "A TUI for the Transmission daemon";
+    description = "TUI for the Transmission daemon";
     homepage = "https://github.com/intuis/rustmission";
     changelog = "https://github.com/intuis/rustmission/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index cba1bff8a1ef..5cc577ddbc40 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A CLI tool to pretty print SARIF diagnostics";
+    description = "CLI tool to pretty print SARIF diagnostics";
     homepage = "https://psastras.github.io/sarif-rs";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
diff --git a/pkgs/by-name/sa/satdump/package.nix b/pkgs/by-name/sa/satdump/package.nix
index 3da37757f09f..3d5b7f41a0f0 100644
--- a/pkgs/by-name/sa/satdump/package.nix
+++ b/pkgs/by-name/sa/satdump/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A generic satellite data processing software";
+    description = "Generic satellite data processing software";
     homepage = "https://www.satdump.org/";
     changelog = "https://github.com/SatDump/SatDump/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix
index ae712563008d..518b9ca5af77 100644
--- a/pkgs/by-name/sb/sbom4python/package.nix
+++ b/pkgs/by-name/sb/sbom4python/package.nix
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     changelog = "https://github.com/anthonyharrison/sbom4python/releases/tag/${src.tag}";
-    description = "A tool to generate a SBOM (Software Bill of Materials) for an installed Python module";
+    description = "Tool to generate a SBOM (Software Bill of Materials) for an installed Python module";
     homepage = "https://github.com/anthonyharrison/sbom4python";
     license = lib.licenses.asl20;
     mainProgram = "sbom4python";
diff --git a/pkgs/by-name/sb/sbt-extras/package.nix b/pkgs/by-name/sb/sbt-extras/package.nix
index a57c84270b5f..aa57a55d2f1b 100644
--- a/pkgs/by-name/sb/sbt-extras/package.nix
+++ b/pkgs/by-name/sb/sbt-extras/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A more featureful runner for sbt, the simple/scala/standard build tool";
+    description = "More featureful runner for sbt, the simple/scala/standard build tool";
     homepage = "https://github.com/paulp/sbt-extras";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix
index 4ba56eb1e849..6f390abeac71 100644
--- a/pkgs/by-name/sc/scitokens-cpp/package.nix
+++ b/pkgs/by-name/sc/scitokens-cpp/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     homepage = "https://github.com/scitokens/scitokens-cpp/";
-    description = "A C++ implementation of the SciTokens library with a C library interface";
+    description = "C++ implementation of the SciTokens library with a C library interface";
     platforms = platforms.unix;
     license = licenses.asl20;
     maintainers = with maintainers; [ evey ];
diff --git a/pkgs/by-name/se/seq-cli/package.nix b/pkgs/by-name/se/seq-cli/package.nix
index 4c97eab76450..0d496ad25ffd 100644
--- a/pkgs/by-name/se/seq-cli/package.nix
+++ b/pkgs/by-name/se/seq-cli/package.nix
@@ -32,7 +32,7 @@ buildDotnetModule (finalAttrs: {
   };
 
   meta = {
-    description = "The Seq command-line client. Administer, log, ingest, search, from any OS";
+    description = "Seq command-line client. Administer, log, ingest, search, from any OS";
     homepage = "https://github.com/datalust/seqcli";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hausken ];
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 28939ed70d01..e77b8841a1cb 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   passthru.tests.version = testers.testVersion { package = serie; };
 
   meta = with lib; {
-    description = "A rich git commit graph in your terminal, like magic";
+    description = "Rich git commit graph in your terminal, like magic";
     homepage = "https://github.com/lusingander/serie";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ matthiasbeyer ];
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 685a983fae63..a2494c57eba1 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -155,7 +155,7 @@ rustPlatform.buildRustPackage {
   };
 
   meta = {
-    description = "The embeddable, independent, memory-safe, modular, parallel web rendering engine";
+    description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine";
     homepage = "https://servo.org";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index ef04aac610a0..8bada528041d 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";
+    description = "Shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";
     homepage = "https://github.com/shader-slang/slang";
     license = with lib.licenses; [
       asl20
diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix
index 8fff36ca0ac6..17f31fc13a52 100644
--- a/pkgs/by-name/sh/shellspec/package.nix
+++ b/pkgs/by-name/sh/shellspec/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   meta = with lib; {
-    description = "A full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells";
+    description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells";
     homepage = "https://shellspec.info/";
     changelog = "https://github.com/shellspec/shellspec/releases/tag/${version}";
     license = licenses.mit;
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 1013b52c53e6..b47543a96131 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/HarbourMasters/Shipwright";
-    description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
+    description = "PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";
     mainProgram = "soh";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/sl/sleqp/package.nix b/pkgs/by-name/sl/sleqp/package.nix
index 4ca9983ba2a7..cf00b01448b4 100644
--- a/pkgs/by-name/sl/sleqp/package.nix
+++ b/pkgs/by-name/sl/sleqp/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    description = "An active set-based NLP solver";
+    description = "Active set-based NLP solver";
     homepage = "https://github.com/chrhansk/sleqp";
     changelog = "https://github.com/chrhansk/sleqp/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix
index 3fa68ae0d87b..dcb20ec7015d 100644
--- a/pkgs/by-name/sm/smartdns/package.nix
+++ b/pkgs/by-name/sm/smartdns/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    description = "A local DNS server to obtain the fastest website IP for the best Internet experience";
+    description = "Local DNS server to obtain the fastest website IP for the best Internet experience";
     longDescription = ''
       SmartDNS is a local DNS server. SmartDNS accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients.
       Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering.
diff --git a/pkgs/by-name/sn/snapdragon-profiler/package.nix b/pkgs/by-name/sn/snapdragon-profiler/package.nix
index 923648776911..13febc9a2cd4 100644
--- a/pkgs/by-name/sn/snapdragon-profiler/package.nix
+++ b/pkgs/by-name/sn/snapdragon-profiler/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://developer.qualcomm.com/software/snapdragon-profiler";
-    description = "An profiler for Android devices running Snapdragon chips";
+    description = "Profiler for Android devices running Snapdragon chips";
     license = licenses.unfree;
     maintainers = [ ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index c9eeb51445a2..aec54fa9a398 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/sourcemeta/jsonschema";
-    description = "The CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines ";
+    description = "CLI for working with JSON Schema. Covers formatting, linting, testing, bundling, and more for both local development and CI/CD pipelines ";
     changelog = "https://github.com/sourcemeta/jsonschema/releases";
     license = with lib.licenses; [
       agpl3Plus
diff --git a/pkgs/by-name/sp/sparrow3d/package.nix b/pkgs/by-name/sp/sparrow3d/package.nix
index 393781481639..b2a519ff07b1 100644
--- a/pkgs/by-name/sp/sparrow3d/package.nix
+++ b/pkgs/by-name/sp/sparrow3d/package.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/theZiz/sparrow3d";
-    description = "A software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora";
+    description = "Software renderer for different open handhelds like the gp2x, wiz, caanoo and pandora";
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ colinsane ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/sp/spip/package.nix b/pkgs/by-name/sp/spip/package.nix
index 71fa19fb9949..384e8d6b3dab 100644
--- a/pkgs/by-name/sp/spip/package.nix
+++ b/pkgs/by-name/sp/spip/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A random forest model for splice prediction in genomics";
+    description = "Random forest model for splice prediction in genomics";
     license = licenses.mit;
     homepage = "https://github.com/raphaelleman/SPiP";
     maintainers = with maintainers; [ apraga ];
diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix
index d014f3808a2f..3492ad797549 100644
--- a/pkgs/by-name/sp/splash/package.nix
+++ b/pkgs/by-name/sp/splash/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   meta = {
-    description = "An interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations";
+    description = "Interactive visualisation and plotting tool using kernel interpolation, mainly used for Smoothed Particle Hydrodynamics simulations";
     inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ doronbehar ];
diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix
index f8c3ada6f924..597e898dad86 100644
--- a/pkgs/by-name/sr/srgn/package.nix
+++ b/pkgs/by-name/sr/srgn/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "A code surgeon for precise text and code transplantation";
+    description = "Code surgeon for precise text and code transplantation";
     license = licenses.mit;
     maintainers = with maintainers; [ magistau ];
     mainProgram = "srgn";
diff --git a/pkgs/by-name/st/stardust-xr-flatland/package.nix b/pkgs/by-name/st/stardust-xr-flatland/package.nix
index 5e3f0b251736..d4fdd4b077d2 100644
--- a/pkgs/by-name/st/stardust-xr-flatland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-flatland/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A flat window for Stardust XR";
+    description = "Flat window for Stardust XR";
     homepage = "https://stardustxr.org";
     license = lib.licenses.mit;
     mainProgram = "flatland";
diff --git a/pkgs/by-name/st/stardust-xr-kiara/package.nix b/pkgs/by-name/st/stardust-xr-kiara/package.nix
index 8a3fe1ff9f3b..615b8147cb5a 100644
--- a/pkgs/by-name/st/stardust-xr-kiara/package.nix
+++ b/pkgs/by-name/st/stardust-xr-kiara/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A 360-degree app shell / DE for Stardust XR using Niri";
+    description = "360-degree app shell / DE for Stardust XR using Niri";
     homepage = "https://stardustxr.org/";
     license = lib.licenses.mit;
     mainProgram = "kiara";
diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index bd0250accc8e..b8c9af298ff2 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -86,7 +86,7 @@ let
     '';
 
     meta = with lib; {
-      description = "A graphical tool for configuring STM32 microcontrollers and microprocessors";
+      description = "Graphical tool for configuring STM32 microcontrollers and microprocessors";
       longDescription = ''
         A graphical tool that allows a very easy configuration of STM32
         microcontrollers and microprocessors, as well as the generation of the
diff --git a/pkgs/by-name/st/string-view-lite/package.nix b/pkgs/by-name/st/string-view-lite/package.nix
index afcb1354ef1d..2d50c921411b 100644
--- a/pkgs/by-name/st/string-view-lite/package.nix
+++ b/pkgs/by-name/st/string-view-lite/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library";
+    description = "C++17-like string_view for C++98, C++11 and later in a single-file header-only library";
     homepage = "https://github.com/martinmoene/string-view-lite";
     changelog = "https://github.com/martinmoene/string-view-lite/blob/v${finalAttrs.version}/CHANGES.txt";
     license = lib.licenses.boost;
diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix
index 7de32eea7929..78c830808d7c 100644
--- a/pkgs/by-name/st/stylelint-lsp/package.nix
+++ b/pkgs/by-name/st/stylelint-lsp/package.nix
@@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A stylelint Language Server";
+    description = "Stylelint Language Server";
     homepage = "https://github.com/bmatcuk/stylelint-lsp";
     license = lib.licenses.mit;
     mainProgram = "stylelint-lsp";
diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix
index 03aab4482d4d..23df1771fed7 100644
--- a/pkgs/by-name/su/subtitleedit/package.nix
+++ b/pkgs/by-name/su/subtitleedit/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "A subtitle editor";
+    description = "Subtitle editor";
     longDescription = ''
       With Subtitle Edit you can easily adjust a subtitle if it is out of sync with
       the video in several different ways. You can also use it for making
diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix
index 960131aeb9bb..d98c9d6f6909 100644
--- a/pkgs/by-name/su/supermariowar/package.nix
+++ b/pkgs/by-name/su/supermariowar/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = unstableGitUpdater { };
 
   meta = {
-    description = "A fan-made multiplayer Super Mario Bros. style deathmatch game";
+    description = "Fan-made multiplayer Super Mario Bros. style deathmatch game";
     homepage = "https://github.com/mmatyas/supermariowar";
     changelog = "https://github.com/mmatyas/supermariowar/blob/${finalAttrs.src.rev}/CHANGELOG";
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index 17d452b3d8a9..7a0b1a480458 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -95,7 +95,7 @@ buildGoModule rec {
 
   meta = with lib; {
     mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland";
-    description = "A lightweight cross-platform desktop client for Subsonic music servers";
+    description = "Lightweight cross-platform desktop client for Subsonic music servers";
     homepage = "https://github.com/dweymouth/supersonic";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.gpl3Plus;
diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix
index 50289df4befc..649eeb0026ea 100644
--- a/pkgs/by-name/su/sus-compiler/package.nix
+++ b/pkgs/by-name/su/sus-compiler/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
 
   meta = {
-    description = "A new Hardware Design Language that keeps you in the driver's seat";
+    description = "New Hardware Design Language that keeps you in the driver's seat";
     homepage = "https://github.com/pc2/sus-compiler";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ pbsds ];
diff --git a/pkgs/by-name/sv/svix-cli/package.nix b/pkgs/by-name/sv/svix-cli/package.nix
index 82915128fcdc..27072fe6708b 100644
--- a/pkgs/by-name/sv/svix-cli/package.nix
+++ b/pkgs/by-name/sv/svix-cli/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
   ];
 
   meta = with lib; {
-    description = "A CLI for interacting with the Svix API";
+    description = "CLI for interacting with the Svix API";
     homepage = "https://github.com/svix/svix-cli/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ techknowlogick ];
diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index e2968a05f31d..9a891c95aa53 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A tool to enforce Swift style and conventions";
+    description = "Tool to enforce Swift style and conventions";
     homepage = "https://realm.github.io/SwiftLint/";
     license = lib.licenses.mit;
     mainProgram = "swiftlint";
diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix
index 004e600725f1..238e214c382f 100644
--- a/pkgs/by-name/sw/swiftshader/package.nix
+++ b/pkgs/by-name/sw/swiftshader/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API";
+    description = "High-performance CPU-based implementation of the Vulkan 1.3 graphics API";
     homepage = "https://opensource.google/projects/swiftshader";
     license = licenses.asl20;
     # Should be possible to support Darwin by changing the install phase with
diff --git a/pkgs/by-name/sy/symfpu/package.nix b/pkgs/by-name/sy/symfpu/package.nix
index f4ba9d4f4558..8ea91cb53669 100644
--- a/pkgs/by-name/sy/symfpu/package.nix
+++ b/pkgs/by-name/sy/symfpu/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A (concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point";
+    description = "(concrete or symbolic) implementation of IEEE-754 / SMT-LIB floating-point";
     homepage = "https://github.com/martin-cs/symfpu";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
diff --git a/pkgs/by-name/sy/synthesia/package.nix b/pkgs/by-name/sy/synthesia/package.nix
index 5667962fb0dd..a4a8b5a573d9 100644
--- a/pkgs/by-name/sy/synthesia/package.nix
+++ b/pkgs/by-name/sy/synthesia/package.nix
@@ -69,7 +69,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A fun way to learn how to play the piano";
+    description = "Fun way to learn how to play the piano";
     homepage = "https://synthesiagame.com/";
     downloadPage = "https://synthesiagame.com/download";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix
index eb2f64dc5c39..f34713ab6343 100644
--- a/pkgs/by-name/tc/tcld/package.nix
+++ b/pkgs/by-name/tc/tcld/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "The temporal cloud cli.";
+    description = "Temporal cloud cli";
     homepage = "https://www.github.com/temporalio/tcld";
     license = lib.licenses.mit;
     teams = [ lib.teams.mercury ];
diff --git a/pkgs/by-name/te/techmino/package.nix b/pkgs/by-name/te/techmino/package.nix
index 9da82feeab1c..af876861ea53 100644
--- a/pkgs/by-name/te/techmino/package.nix
+++ b/pkgs/by-name/te/techmino/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "techmino";
-  description = "A modern Tetris clone with many features";
+  description = "Modern Tetris clone with many features";
 
   desktopItem = makeDesktopItem {
     name = pname;
diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix
index 78edd65d5096..b8da10b305da 100644
--- a/pkgs/by-name/te/ted/package.nix
+++ b/pkgs/by-name/te/ted/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "An easy rich text processor";
+    description = "Easy rich text processor";
     longDescription = ''
       Ted is a text processor running under X Windows on Unix/Linux systems.
       Ted was developed as a standard easy light weight word processor, having
diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix
index a03840702747..0b8ba744f031 100644
--- a/pkgs/by-name/tf/tfmigrate/package.nix
+++ b/pkgs/by-name/tf/tfmigrate/package.nix
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A Terraform / OpenTofu state migration tool for GitOps ";
+    description = "Terraform / OpenTofu state migration tool for GitOps ";
     homepage = "https://github.com/minamijoyo/tfmigrate";
     changelog = "https://github.com/minamijoyo/tfmigrate/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index 2b72188f298b..29272bcd14ac 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "A command line tool to switch between different versions of terraform";
+    description = "Command line tool to switch between different versions of terraform";
     mainProgram = "tfswitch";
     homepage = "https://github.com/warrensbox/terraform-switcher";
     license = licenses.mit;
diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix
index dfe236ce2ce2..d3971c3ca4ef 100644
--- a/pkgs/by-name/tg/tg-archive/package.nix
+++ b/pkgs/by-name/tg/tg-archive/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication {
   ];
 
   meta = {
-    description = "A tool for exporting Telegram group chats into static websites like mailing list archives";
+    description = "Tool for exporting Telegram group chats into static websites like mailing list archives";
     homepage = "https://github.com/knadh/tg-archive";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ euxane ];
diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index 713f1ddaa7e4..c214e5f9fb75 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with lib; {
-    description = "A free and open source fantasy computer for making, playing and sharing tiny games";
+    description = "Free and open source fantasy computer for making, playing and sharing tiny games";
     longDescription = ''
       TIC-80 is a free and open source fantasy computer for making, playing and
       sharing tiny games.
diff --git a/pkgs/by-name/to/tome2/package.nix b/pkgs/by-name/to/tome2/package.nix
index 59f032905827..d43ec5ca4dcd 100644
--- a/pkgs/by-name/to/tome2/package.nix
+++ b/pkgs/by-name/to/tome2/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "tome2";
-  description = "A dungeon crawler similar to Angband, based on the works of Tolkien";
+  description = "Dungeon crawler similar to Angband, based on the works of Tolkien";
 
   desktopItem = makeDesktopItem {
     desktopName = pname;
diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix
index fb78b119b537..d2dfc2078473 100644
--- a/pkgs/by-name/tr/transgui/package.nix
+++ b/pkgs/by-name/tr/transgui/package.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "A cross platform front-end for the Transmission BitTorrent client";
+    description = "Cross platform front-end for the Transmission BitTorrent client";
     homepage = "https://sourceforge.net/p/transgui";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ ramkromberg ];
diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix
index d0f5d813deea..6a2cf689e89d 100644
--- a/pkgs/by-name/tr/trrntzip/package.nix
+++ b/pkgs/by-name/tr/trrntzip/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ zlib ];
 
   meta = with lib; {
-    description = "The goal of the program is to use standard values when creating zips to create identical files over multiple systems";
+    description = "Goal of the program is to use standard values when creating zips to create identical files over multiple systems";
     longDescription = ''
       Torrentzip converts zip archives to a standard format with some
       pre-defined values, sorting the files, and using particular compression
diff --git a/pkgs/by-name/ts/tscli/package.nix b/pkgs/by-name/ts/tscli/package.nix
index 7573a782e6c1..1d9c088db4ec 100644
--- a/pkgs/by-name/ts/tscli/package.nix
+++ b/pkgs/by-name/ts/tscli/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   '';
 
   meta = {
-    description = "A CLI tool to interact with the Tailscale API";
+    description = "CLI tool to interact with the Tailscale API";
     homepage = "https://github.com/jaxxstorm/tscli";
     changelog = "https://github.com/jaxxstorm/tscli/releases/tag/${src.tag}/CHANGELOG.md";
     mainProgram = "tscli";
diff --git a/pkgs/by-name/ty/typship/package.nix b/pkgs/by-name/ty/typship/package.nix
index 5b26a4343122..68b0e8b4a6d2 100644
--- a/pkgs/by-name/ty/typship/package.nix
+++ b/pkgs/by-name/ty/typship/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "A Typst package CLI tool";
+    description = "Typst package CLI tool";
     homepage = "https://github.com/sjfhsjfh/typship";
     license = lib.licenses.mit;
     changelog = "https://github.com/sjfhsjfh/typship/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix
index 65c380b832e5..0bd8349f0a32 100644
--- a/pkgs/by-name/tz/tzf-rs/package.nix
+++ b/pkgs/by-name/tz/tzf-rs/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A fast timezone finder for Rust";
+    description = "Fast timezone finder for Rust";
     homepage = "https://github.com/ringsaturn/tzf-rs";
     changelog = "https://github.com/ringsaturn/tzf-rs/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/u-/u-root/package.nix b/pkgs/by-name/u-/u-root/package.nix
index df55883dd276..c61bf39ef673 100644
--- a/pkgs/by-name/u-/u-root/package.nix
+++ b/pkgs/by-name/u-/u-root/package.nix
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    description = "A fully Go userland with Linux bootloaders";
+    description = "Fully Go userland with Linux bootloaders";
     longDescription = ''
       u-root can create a one-binary root file system (initramfs) containing a busybox-like set of tools written in Go.
 
diff --git a/pkgs/by-name/un/unflac/package.nix b/pkgs/by-name/un/unflac/package.nix
index ad7c1c925408..067dd072f448 100644
--- a/pkgs/by-name/un/unflac/package.nix
+++ b/pkgs/by-name/un/unflac/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "A command line tool for fast frame accurate audio image + cue sheet splitting";
+    description = "Command line tool for fast frame accurate audio image + cue sheet splitting";
     homepage = "https://sr.ht/~ft/unflac/";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
index 1ac3eac42581..363aec592a94 100644
--- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
+++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A game based on K-Shoot MANIA and Sound Voltex";
+    description = "Game based on K-Shoot MANIA and Sound Voltex";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sako ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index f24a2d707a04..aba9c164c377 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/carrotIndustries/usbkvm";
-    description = "An open-source USB KVM (Keyboard, Video and Mouse) adapter";
+    description = "Open-source USB KVM (Keyboard, Video and Mouse) adapter";
     changelog = "https://github.com/carrotIndustries/usbkvm/releases/tag/v${version}";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ lschuermann ];
diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 0d266543990b..008eb83705e3 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
   };
 
   meta = {
-    description = "The world's fastest OpenAPI & Swagger linter";
+    description = "World's fastest OpenAPI & Swagger linter";
     homepage = "https://quobix.com/vacuum";
     changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index 41f8ead4f737..0143ae4261b9 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "The video game that combines elements of the racing and role-playing genres";
+    description = "Video game that combines elements of the racing and role-playing genres";
     homepage = "https://github.com/KranX/Vangers";
     mainProgram = "vangers";
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/va/variant-lite/package.nix b/pkgs/by-name/va/variant-lite/package.nix
index 4e8374440c6e..b667c14a101b 100644
--- a/pkgs/by-name/va/variant-lite/package.nix
+++ b/pkgs/by-name/va/variant-lite/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library";
+    description = "C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library";
     homepage = "https://github.com/martinmoene/variant-lite";
     changelog = "https://github.com/martinmoene/variant-lite/blob/v${finalAttrs.version}/CHANGES.txt";
     license = lib.licenses.boost;
diff --git a/pkgs/by-name/ve/veloren/package.nix b/pkgs/by-name/ve/veloren/package.nix
index 6af10dc7ac16..3f2cd1cecc74 100644
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@@ -101,7 +101,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = with lib; {
-    description = "An open world, open source voxel RPG";
+    description = "Open world, open source voxel RPG";
     homepage = "https://www.veloren.net";
     license = licenses.gpl3;
     mainProgram = "veloren-voxygen";
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index bfec5d72a56f..32eccfc5777a 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   passthru.tests.version = testers.testVersion { package = vimcats; };
 
   meta = with lib; {
-    description = "A CLI to generate vim/nvim help doc from LuaCATS. Forked from lemmy-help";
+    description = "CLI to generate vim/nvim help doc from LuaCATS. Forked from lemmy-help";
     longDescription = ''
       `vimcats` is a LuaCATS parser as well as a CLI which takes that parsed tree and converts it into vim help docs.
       It is a fork of lemmy-help that aims to support more recent LuaCATS features.
diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix
index edf173026d90..f2c64626a78c 100644
--- a/pkgs/by-name/vi/vis/package.nix
+++ b/pkgs/by-name/vi/vis/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "A vim like editor";
+    description = "Vim like editor";
     homepage = "https://github.com/martanne/vis";
     license = licenses.isc;
     maintainers = with maintainers; [ ramkromberg ];
diff --git a/pkgs/by-name/vk/vkd3d-proton/package.nix b/pkgs/by-name/vk/vkd3d-proton/package.nix
index d5e274cea8cd..6c865a3908bf 100644
--- a/pkgs/by-name/vk/vkd3d-proton/package.nix
+++ b/pkgs/by-name/vk/vkd3d-proton/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
-    description = "A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
+    description = "Fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
     license = with lib.licenses; [ lgpl21Plus ];
     maintainers = with lib.maintainers; [ ];
     inherit (wine.meta) platforms;
diff --git a/pkgs/by-name/vo/volatility2-bin/package.nix b/pkgs/by-name/vo/volatility2-bin/package.nix
index 288d198e338e..971b4425b671 100644
--- a/pkgs/by-name/vo/volatility2-bin/package.nix
+++ b/pkgs/by-name/vo/volatility2-bin/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     homepage = "https://volatilityfoundation.org/";
     mainProgram = "volatility2";
-    description = "An advanced memory forensics framework";
+    description = "Advanced memory forensics framework";
     platforms = [
       "x86_64-linux"
       "x86_64-darwin"
diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
index db0d6dba2d7d..fea245a29644 100644
--- a/pkgs/by-name/vs/vscode-js-debug/package.nix
+++ b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -75,7 +75,7 @@ buildNpmPackage rec {
       '';
 
   meta = with lib; {
-    description = "A DAP-compatible JavaScript debugger";
+    description = "DAP-compatible JavaScript debugger";
     longDescription = ''
       This is a [DAP](https://microsoft.github.io/debug-adapter-protocol/)-based
       JavaScript debugger. It debugs Node.js, Chrome, Edge, WebView2, VS Code
diff --git a/pkgs/by-name/vs/vst2-sdk/package.nix b/pkgs/by-name/vs/vst2-sdk/package.nix
index bf16ba8025f7..373ec52d4f4a 100644
--- a/pkgs/by-name/vs/vst2-sdk/package.nix
+++ b/pkgs/by-name/vs/vst2-sdk/package.nix
@@ -16,7 +16,7 @@ fetchzip rec {
   '';
 
   meta = {
-    description = "The VST2 source development kit";
+    description = "VST2 source development kit";
     longDescription = ''
       VST2 is proprietary, and deprecated by Steinberg.
       As such, it should only be used for legacy reasons.
diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix
index 4e645e096bbf..48ac5341b843 100644
--- a/pkgs/by-name/vz/vzic/package.nix
+++ b/pkgs/by-name/vz/vzic/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/libical/vzic";
-    description = "A program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification";
+    description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification";
     changelog = "https://github.com/libical/vzic/blob/${src.rev}/ChangeLog";
     mainProgram = "vzic";
     license = with lib.licenses; [ gpl2Plus ];
diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix
index 767b2c0c7dd2..efa8b6dcc26d 100644
--- a/pkgs/by-name/wc/wchisp/package.nix
+++ b/pkgs/by-name/wc/wchisp/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    description = "A command-line implementation of WCHISPTool, for flashing ch32 MCUs";
+    description = "Command-line implementation of WCHISPTool, for flashing ch32 MCUs";
     homepage = "https://ch32-rs.github.io/wchisp/";
     changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}";
     license = with lib.licenses; [ gpl2Only ];
diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index 56672781d455..a4a2aa14632d 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "A Beautiful Private and Secure Desktop Investment Tracking Application";
+    description = "Beautiful Private and Secure Desktop Investment Tracking Application";
     homepage = "https://wealthfolio.app/";
     license = lib.licenses.agpl3Only;
     mainProgram = "wealthfolio";
diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix
index e61cb8d5deee..244def175a97 100644
--- a/pkgs/by-name/we/webcord/package.nix
+++ b/pkgs/by-name/we/webcord/package.nix
@@ -80,7 +80,7 @@ buildNpmPackage rec {
   passthru.updateScript = ./update.sh;
 
   meta = {
-    description = "A Discord and SpaceBar electron-based client implemented without Discord API";
+    description = "Discord and SpaceBar electron-based client implemented without Discord API";
     homepage = "https://github.com/SpacingBat3/WebCord";
     downloadPage = "https://github.com/SpacingBat3/WebCord/releases";
     changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
diff --git a/pkgs/by-name/wg/wg-access-server/package.nix b/pkgs/by-name/wg/wg-access-server/package.nix
index b77bc0acab69..e93eb4db7c74 100644
--- a/pkgs/by-name/wg/wg-access-server/package.nix
+++ b/pkgs/by-name/wg/wg-access-server/package.nix
@@ -66,7 +66,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "An all-in-one WireGuard VPN solution with a web ui for connecting devices";
+    description = "All-in-one WireGuard VPN solution with a web ui for connecting devices";
     homepage = "https://github.com/freifunkMUC/wg-access-server";
     license = licenses.mit;
     maintainers = with maintainers; [ xanderio ];
diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix
index d6eaf4bdb742..68706f230c80 100644
--- a/pkgs/by-name/wh/whoogle-search/package.nix
+++ b/pkgs/by-name/wh/whoogle-search/package.nix
@@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     homepage = "https://github.com/benbusby/whoogle-search";
-    description = "A self-hosted, ad-free, privacy-respecting metasearch engine";
+    description = "Self-hosted, ad-free, privacy-respecting metasearch engine";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ malte-v ];
     mainProgram = "whoogle-search";
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 6be3a80dbc25..050076e10d28 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -188,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "An OpenXR streaming application to a standalone headset";
+    description = "OpenXR streaming application to a standalone headset";
     homepage = "https://github.com/WiVRn/WiVRn/";
     changelog = "https://github.com/WiVRn/WiVRn/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix
index adf8d08bf3ca..e1a00e98e408 100644
--- a/pkgs/by-name/wl/wl-crosshair/package.nix
+++ b/pkgs/by-name/wl/wl-crosshair/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = {
-    description = "A crosshair overlay for wlroots compositor";
+    description = "Crosshair overlay for wlroots compositor";
     homepage = "https://github.com/lelgenio/wl-crosshair";
     license = lib.licenses.unfree; # didn't found a license
     mainProgram = "wl-crosshair";
diff --git a/pkgs/by-name/wv/wvdial/package.nix b/pkgs/by-name/wv/wvdial/package.nix
index c71addca1a9b..6ca28d07665d 100644
--- a/pkgs/by-name/wv/wvdial/package.nix
+++ b/pkgs/by-name/wv/wvdial/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    description = "A dialer that automatically recognises the modem";
+    description = "Dialer that automatically recognises the modem";
     homepage = "https://gitea.osmocom.org/retronetworking/wvdial";
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ flokli ];
diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix
index 68267014c683..61b25b6c15f2 100644
--- a/pkgs/by-name/xa/xar/package.nix
+++ b/pkgs/by-name/xa/xar/package.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/apple-oss-distributions/xar";
-    description = "An easily extensible archive format";
+    description = "Easily extensible archive format";
     license = lib.licenses.bsd3;
     maintainers = lib.attrValues { inherit (lib.maintainers) tie; };
     teams = [ lib.teams.darwin ];
diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index c7e2b7c5ee8b..fb197529abfe 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
   passthru.tests.basic = nixosTests.yggdrasil;
 
   meta = with lib; {
-    description = "An experiment in scalable routing as an encrypted IPv6 overlay network";
+    description = "Experiment in scalable routing as an encrypted IPv6 overlay network";
     homepage = "https://yggdrasil-network.github.io/";
     license = licenses.lgpl3;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix
index 89afe420b2c1..154981166927 100644
--- a/pkgs/by-name/yt/ytmdesktop/package.nix
+++ b/pkgs/by-name/yt/ytmdesktop/package.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     changelog = "https://github.com/ytmdesktop/ytmdesktop/tag/v${finalAttrs.version}";
-    description = "A Desktop App for YouTube Music";
+    description = "Desktop App for YouTube Music";
     downloadPage = "https://github.com/ytmdesktop/ytmdesktop/releases";
     homepage = "https://ytmdesktop.app/";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/z8/z88dk/package.nix b/pkgs/by-name/z8/z88dk/package.nix
index 2896135dbb15..80dab21136ee 100644
--- a/pkgs/by-name/z8/z88dk/package.nix
+++ b/pkgs/by-name/z8/z88dk/package.nix
@@ -25,7 +25,7 @@ let
       hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs=";
     };
     meta = {
-      description = "A date object with as little code as possible (and rw accessors)";
+      description = "Date object with as little code as possible (and rw accessors)";
       license = with lib.licenses; [
         artistic1
         gpl1Plus
diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
index 8e3e5a1afd4a..9d2f78e2c6c3 100644
--- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
+++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = {
-    description = "A Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh";
+    description = "Zenoh plug-in that allows to integrate and/or route MQTT pub/sub with Eclipse Zenoh";
     homepage = "https://github.com/eclipse-zenoh/zenoh-plugin-mqtt";
     license = with lib.licenses; [
       epl20
diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix
index 0c1cc9f88052..660de91c614d 100644
--- a/pkgs/by-name/ze/zeronsd/package.nix
+++ b/pkgs/by-name/ze/zeronsd/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "A DNS server for ZeroTier users";
+    description = "DNS server for ZeroTier users";
     homepage = "https://github.com/zerotier/zeronsd";
     license = licenses.bsd3;
     maintainers = [ maintainers.dstengele ];
diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix
index 09f57daac283..5848dac14772 100644
--- a/pkgs/by-name/zi/zimfw/package.nix
+++ b/pkgs/by-name/zi/zimfw/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "The Zsh configuration framework with blazing speed and modular extensions";
+    description = "Zsh configuration framework with blazing speed and modular extensions";
     homepage = "https://zimfw.sh";
     license = licenses.mit;
     maintainers = [ maintainers.joedevivo ];
diff --git a/pkgs/by-name/zs/zsh-zhooks/package.nix b/pkgs/by-name/zs/zsh-zhooks/package.nix
index 047cd75ef61e..33ac4f1d4106 100644
--- a/pkgs/by-name/zs/zsh-zhooks/package.nix
+++ b/pkgs/by-name/zs/zsh-zhooks/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = {
-    description = "A tool for displaying the code for all Zsh hook functions";
+    description = "Tool for displaying the code for all Zsh hook functions";
     homepage = "https://github.com/agkozak/zhooks";
     license = lib.licenses.mit;
     longDescription = ''
diff --git a/pkgs/by-name/zt/ztools/package.nix b/pkgs/by-name/zt/ztools/package.nix
index 52477e2c9874..1baf1fe466c8 100644
--- a/pkgs/by-name/zt/ztools/package.nix
+++ b/pkgs/by-name/zt/ztools/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "An essential set of Z-machine tools for interpreter authors, experienced Inform programmers, and Z-code hackers.";
+    description = "Essential set of Z-machine tools for interpreter authors, experienced Inform programmers, and Z-code hackers";
     homepage = "http://inform-fiction.org/zmachine/ztools.html";
     license = lib.licenses.cc-by-sa-40;
     platforms = lib.platforms.unix;

From b58ef718f995e33f61211a866a43134cc00d17e1 Mon Sep 17 00:00:00 2001
From: Nishimara <me@nishimara.com>
Date: Thu, 5 Jun 2025 21:05:42 +0300
Subject: [PATCH 1244/1497] zapret: add information about commit and version

---
 pkgs/by-name/za/zapret/package.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index 534effaa4ef2..9f44fc65c395 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -21,8 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
+
+    leaveDotGit = true;
+    postFetch = ''
+      cd "$out"
+      git rev-parse --short HEAD > $out/COMMIT
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
+
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OeOnzqYyRAQNRtjtPHwzDL/csuTAUgIRJKsPVr3iBac=";
+    hash = "sha256-cwwj0xGEiR3sg2WheurtQo6Hy5JAARcZJNHEHMfAoOE=";
   };
 
   buildInputs = [
@@ -31,12 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
     libnetfilter_queue
     libnfnetlink
   ];
+
   nativeBuildInputs = [
     iptables
     nftables
     gawk
   ];
 
+  preBuild = ''
+    makeFlagsArray+=("CFLAGS=-DZAPRET_GH_VER=${finalAttrs.src.tag} -DZAPRET_GH_HASH=`cat $src/COMMIT`")
+  '';
+
   makeFlags = [ "TGT=${placeholder "out"}/bin" ];
 
   installPhase = ''
@@ -88,12 +101,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "DPI bypass multi platform";
     homepage = "https://github.com/bol-van/zapret";
-    changelog = "https://github.com/bol-van/zapret/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/bol-van/zapret/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nishimara ];
     mainProgram = "zapret";
-
-    # probably gonna work on darwin, but untested
-    broken = stdenv.hostPlatform.isDarwin;
+    platforms = lib.platforms.linux;
   };
 })

From 8d532014d8f45d5a32da6ddd0ff835b954348bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 5 Jun 2025 11:06:29 -0700
Subject: [PATCH 1245/1497] python3Packages.pyiskra: 0.1.19 -> 0.1.21

Diff: https://github.com/Iskramis/pyiskra/compare/refs/tags/v0.1.19...refs/tags/v0.1.21

Changelog: https://github.com/Iskramis/pyiskra/releases/tag/v0.1.21
---
 pkgs/development/python-modules/pyiskra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix
index 55430ffafc65..22da96bb17b0 100644
--- a/pkgs/development/python-modules/pyiskra/default.nix
+++ b/pkgs/development/python-modules/pyiskra/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyiskra";
-  version = "0.1.19";
+  version = "0.1.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Iskramis";
     repo = "pyiskra";
     tag = "v${version}";
-    hash = "sha256-M44dXA4hBlyRvIwgIolxaGE8QmystPoEGX3ongvLB04=";
+    hash = "sha256-ZFva7pyilMjvgRfsDhnsLGKRjl9Jf4vdFfK4RFb3sSE=";
   };
 
   build-system = [ setuptools ];

From b0af966fa8fb7305791dc187d930540fba6fce82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 18:37:18 +0000
Subject: [PATCH 1246/1497] flexget: 3.16.1 -> 3.16.3

---
 pkgs/by-name/fl/flexget/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 3dc3eda4c780..9a20815265e6 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.16.1";
+  version = "3.16.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${version}";
-    hash = "sha256-IqkzMbWc8GiSo00sMrTugE+G552769WFz+GJbYIPOvs=";
+    hash = "sha256-07dCSwRLIf/cmNsFuNHs9XXFGuJvwUNWgLuxRsMOXo4=";
   };
 
   pythonRelaxDeps = true;

From 1c0e562a59052e2e6dd953472cd9c12505ae1fa8 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Wed, 4 Jun 2025 07:44:54 -0600
Subject: [PATCH 1247/1497] glamoroustoolkit: add .desktop entry

---
 pkgs/by-name/gl/glamoroustoolkit/package.nix | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
index 94debf50ed1f..cb611aa4f22a 100644
--- a/pkgs/by-name/gl/glamoroustoolkit/package.nix
+++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix
@@ -1,9 +1,11 @@
 {
   lib,
   stdenv,
+  fetchurl,
   fetchzip,
   wrapGAppsHook3,
   cairo,
+  copyDesktopItems,
   dbus,
   fontconfig,
   freetype,
@@ -19,12 +21,18 @@
   libglvnd,
   libuuid,
   libxcb,
+  makeDesktopItem,
   harfbuzz,
   libsoup_3,
   webkitgtk_4_1,
   zenity,
 }:
-
+let
+  gkIcon = fetchurl {
+    url = "https://gist.githubusercontent.com/qbit/cb52e6cd193c410e0b0aee8a216f6574/raw/2b042bde1dc4cbd30457f14c9d18c889444bf3d0/glamoroustoolkit.svg";
+    sha256 = "sha256-Trfo8P01anLq9yTFzwqIfsyidLGyuZDg48YQPrGBkgs=";
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "glamoroustoolkit";
   version = "1.1.24";
@@ -37,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     wrapGAppsHook3
+    copyDesktopItems
   ];
 
   sourceRoot = ".";
@@ -46,10 +55,21 @@ stdenv.mkDerivation (finalAttrs: {
   dontPatchELF = true;
   dontStrip = true;
 
+  desktopItems = with finalAttrs; [
+    (makeDesktopItem {
+      name = pname;
+      desktopName = "GlamorousToolkit";
+      exec = "GlamorousToolkit";
+      icon = "GlamorousToolkit";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 
-    install -d $out/bin $out/lib
+    install -d $out/bin $out/lib $out/share/icons/hicolor/scalable/apps
+
+    cp ${gkIcon} $out/share/icons/hicolor/scalable/apps/GlamorousToolkit.svg
     cp -r $src/bin $src/lib $out/
     cp ${./GlamorousToolkit-GetImage} $out/bin/GlamorousToolkit-GetImage
 

From 3807e606273ad341e48e0f341a69b54c46e4afad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 19:25:20 +0000
Subject: [PATCH 1248/1497] newt-go: 1.1.3 -> 1.2.0

---
 pkgs/by-name/ne/newt-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/newt-go/package.nix b/pkgs/by-name/ne/newt-go/package.nix
index 6f86105d62f5..1703a9373257 100644
--- a/pkgs/by-name/ne/newt-go/package.nix
+++ b/pkgs/by-name/ne/newt-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "newt";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = version;
-    hash = "sha256-wfm2UI4QUiYiAJIYBiSCOD/w72WRJIv2cyLIkfqGsek=";
+    hash = "sha256-dZsHPEhvrElFdmJ6mgqyLqcblyUfpt8dtLsNFm1emrw=";
   };
 
-  vendorHash = "sha256-8VlT9cy2uNhQPiUpr1jJuQSgUR6TtlbQ+etran2Htxs=";
+  vendorHash = "sha256-Yc5IXnShciek/bKkVezkAcaq47zGiZP8vUHFb9p09LI=";
 
   postPatch = ''
     substituteInPlace main.go \

From de8110976b2c91470b83250110914f4efb6bbf1c Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 5 Jun 2025 21:32:32 +0200
Subject: [PATCH 1249/1497] claude-code: 1.0.6 -> 1.0.11 (#413858)

---
 pkgs/by-name/cl/claude-code/package-lock.json | 86 ++++++++++++++++++-
 pkgs/by-name/cl/claude-code/package.nix       |  6 +-
 2 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 4435b1946964..bb7e691f0784 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.6"
+        "@anthropic-ai/claude-code": "^1.0.11"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.6.tgz",
-      "integrity": "sha512-QqPZZ4IXbUaSLqXEx4z68Stjc7NlGh/b4woyYyMks+cMUJ5ZYDEkAe09cRZQ6tjubZNgBaGTOqfTaT8NgnkioQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.11.tgz",
+      "integrity": "sha512-ezYfkSxCiQjReJoBJkayTpzhWRWKmfEy6Ria2TdufBmDR7Kj/iP4IY10M5JOTgB8pw7XfjYpijgnomiFZmVRbg==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
@@ -22,7 +22,9 @@
       },
       "optionalDependencies": {
         "@img/sharp-darwin-arm64": "^0.33.5",
+        "@img/sharp-darwin-x64": "^0.33.5",
         "@img/sharp-linux-arm": "^0.33.5",
+        "@img/sharp-linux-arm64": "^0.33.5",
         "@img/sharp-linux-x64": "^0.33.5",
         "@img/sharp-win32-x64": "^0.33.5"
       }
@@ -49,6 +51,28 @@
         "@img/sharp-libvips-darwin-arm64": "1.0.4"
       }
     },
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
+      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.0.4"
+      }
+    },
     "node_modules/@img/sharp-libvips-darwin-arm64": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
@@ -65,6 +89,22 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
+      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-libvips-linux-arm": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
@@ -81,6 +121,22 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
+      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@img/sharp-libvips-linux-x64": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
@@ -119,6 +175,28 @@
         "@img/sharp-libvips-linux-arm": "1.0.5"
       }
     },
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
+      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.0.4"
+      }
+    },
     "node_modules/@img/sharp-linux-x64": {
       "version": "0.33.5",
       "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 91ecb4d7eae3..f72ea6dc5994 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.6";
+  version = "1.0.11";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-yMvx543OOClV/BSkM4/bzrbytL+98HAfp14Qk1m2le0=";
+    hash = "sha256-IXNBNjt4Sh5pR+Cz2uEZcCop9reAmQ7hObohtN0f3Ww=";
   };
 
-  npmDepsHash = "sha256-5QP6WQ2tXGADOID9QHq/m7sDQeQsoMGQWxORvQhVROg=";
+  npmDepsHash = "sha256-p5FQBBlMNcRBYKIkeeETyup5zKr2Rcxu/Jw+kFwQrHA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From ec2b95cf8654a8c1f531f22626a7ffd7a59555e1 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 5 Jun 2025 21:40:49 +0200
Subject: [PATCH 1250/1497] mbedtls_2: 2.28.9 -> 2.28.10

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/development/libraries/mbedtls/2.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix
index 8c20144c0f63..31105350e6cb 100644
--- a/pkgs/development/libraries/mbedtls/2.nix
+++ b/pkgs/development/libraries/mbedtls/2.nix
@@ -1,15 +1,6 @@
 { callPackage, fetchpatch }:
 
 callPackage ./generic.nix {
-  version = "2.28.9";
-  hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE=";
-  patches = [
-    # https://github.com/Mbed-TLS/mbedtls/pull/9529
-    # switch args to calloc in test macro to fix build with gcc-14
-    (fetchpatch {
-      name = "gcc-14-fixes.patch";
-      url = "https://github.com/Mbed-TLS/mbedtls/commit/990a88cd53d40ff42481a2c200b05f656507f326.patch";
-      hash = "sha256-Ki8xjm4tbzLZGNUr4hRbf+dlp05ejvl44ddroWJZY4w=";
-    })
-  ];
+  version = "2.28.10";
+  hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s=";
 }

From 57460ca0ca1fd32ffe43cf394aad6401069c733a Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Thu, 5 Jun 2025 14:27:54 -0500
Subject: [PATCH 1251/1497] magic-wormhole: install shell completions

---
 .../python-modules/magic-wormhole/default.nix            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 71be18913927..d4cc8603e4cf 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  installShellFiles,
 
   # build-system
   setuptools,
@@ -88,6 +89,10 @@ buildPythonPackage rec {
     dilation = [ noiseprotocol ];
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   nativeCheckInputs =
     [
       magic-wormhole-mailbox-server
@@ -101,6 +106,10 @@ buildPythonPackage rec {
 
   postInstall = ''
     install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
+    installShellCompletion --cmd ${meta.mainProgram} \
+      --bash wormhole_complete.bash \
+      --fish wormhole_complete.fish \
+      --zsh wormhole_complete.zsh
   '';
 
   meta = {

From 56872245ce35267019d79de7db73b994379c83e8 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Thu, 5 Jun 2025 14:56:12 -0500
Subject: [PATCH 1252/1497] sonusmix: set meta.mainProgram

---
 pkgs/by-name/so/sonusmix/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix
index 21c19a0cc9d0..f419ac40ec8e 100644
--- a/pkgs/by-name/so/sonusmix/package.nix
+++ b/pkgs/by-name/so/sonusmix/package.nix
@@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
+    mainProgram = "sonusmix";
   };
 }

From be1545fc17a672a14bb6bc66bd4ecfc7fa2833ff Mon Sep 17 00:00:00 2001
From: Gurjaka <esartia.gurika@gmail.com>
Date: Fri, 23 May 2025 19:19:52 +0400
Subject: [PATCH 1253/1497] nixos/dwl: init module

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/programs/wayland/dwl.nix        | 104 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/dwl.nix                           |  43 ++++++++
 5 files changed, 151 insertions(+)
 create mode 100644 nixos/modules/programs/wayland/dwl.nix
 create mode 100644 nixos/tests/dwl.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 4bd4cc7ec152..fe8a05a32946 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -19,6 +19,8 @@
 
 - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable).
 
+[dwl](https://codeberg.org/dwl/dwl), a compact, hackable compositor for Wayland based on wlroots. Available as [programs.dwl](#opt-programs.dwl.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f53efee6a4a9..45004f0e307c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -330,6 +330,7 @@
   ./programs/vivid.nix
   ./programs/wavemon.nix
   ./programs/wayland/cardboard.nix
+  ./programs/wayland/dwl.nix
   ./programs/wayland/gtklock.nix
   ./programs/wayland/hyprland.nix
   ./programs/wayland/hyprlock.nix
diff --git a/nixos/modules/programs/wayland/dwl.nix b/nixos/modules/programs/wayland/dwl.nix
new file mode 100644
index 000000000000..5e3ac932b212
--- /dev/null
+++ b/nixos/modules/programs/wayland/dwl.nix
@@ -0,0 +1,104 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.dwl;
+in
+{
+  options.programs.dwl = {
+    enable = lib.mkEnableOption ''
+      Dwl is a compact, hackable compositor for Wayland based on wlroots.
+      You can manually launch Dwl by executing "exec dwl" on a TTY.
+    '';
+
+    package = lib.mkPackageOption pkgs "dwl" {
+      example = ''
+        # Lets apply bar patch from:
+        # https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/bar
+        (pkgs.dwl.override {
+          configH = ./dwl-config.h;
+        }).overrideAttrs (oldAttrs: {
+          buildInputs =
+            oldAttrs.buildInputs or []
+            ++ [
+              pkgs.libdrm
+              pkgs.fcft
+            ];
+          patches = oldAttrs.patches or [] ++ [
+            ./bar-0.7.patch
+          ];
+        });
+      '';
+    };
+
+    extraSessionCommands = lib.mkOption {
+      default = "";
+      type = lib.types.lines;
+      description = ''
+        Shell commands executed just before dwl is started.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    # Create systemd target for dwl session
+    systemd.user.targets.dwl-session = {
+      description = "dwl compositor session";
+      documentation = [ "man:systemd.special(7)" ];
+      bindsTo = [ "graphical-session.target" ];
+      wants = [ "graphical-session-pre.target" ];
+      after = [ "graphical-session-pre.target" ];
+    };
+
+    # Create wrapper script for dwl
+    environment.etc."xdg/dwl-session" = {
+      text = ''
+        #!${pkgs.runtimeShell}
+        # Import environment variables
+        ${cfg.extraSessionCommands}
+        # Setup systemd user environment
+        systemctl --user import-environment DISPLAY WAYLAND_DISPLAY
+        systemctl --user start dwl-session.target
+        # Start dwl
+        exec ${lib.getExe cfg.package}
+      '';
+      mode = "0755"; # Make it executable
+    };
+
+    # Create desktop entry for display managers
+    services.displayManager.sessionPackages =
+      let
+        dwlDesktopFile = pkgs.writeTextFile {
+          name = "dwl-desktop-entry";
+          destination = "/share/wayland-sessions/dwl.desktop";
+          text = ''
+            [Desktop Entry]
+            Name=dwl
+            Comment=Dynamic window manager for Wayland
+            Exec=/etc/xdg/dwl-session
+            Type=Application
+          '';
+        };
+
+        dwlSession = pkgs.symlinkJoin {
+          name = "dwl-session";
+          paths = [ dwlDesktopFile ];
+          passthru.providedSessions = [ "dwl" ];
+        };
+      in
+      [ dwlSession ];
+
+    # Configure XDG portal for dwl (minimal configuration)
+    xdg.portal.config.dwl.default = lib.mkDefault [
+      "wlr"
+      "gtk"
+    ];
+  };
+
+  meta.maintainers = with lib.maintainers; [ gurjaka ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a91b390baa91..43957c03a791 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -412,6 +412,7 @@ in
   druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drbd-driver = runTest ./drbd-driver.nix;
   dublin-traceroute = runTest ./dublin-traceroute.nix;
+  dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix;
   earlyoom = handleTestOn [ "x86_64-linux" ] ./earlyoom.nix { };
   early-mount-options = handleTest ./early-mount-options.nix { };
   ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { };
diff --git a/nixos/tests/dwl.nix b/nixos/tests/dwl.nix
new file mode 100644
index 000000000000..6398ebeba5cf
--- /dev/null
+++ b/nixos/tests/dwl.nix
@@ -0,0 +1,43 @@
+{ lib, ... }:
+{
+  name = "dwl_test_vm";
+
+  meta = {
+    maintainers = with lib.maintainers; [ gurjaka ];
+  };
+
+  nodes.machine =
+    {
+      pkgs,
+      lib,
+      ...
+    }:
+    {
+      imports = [
+        ./common/user-account.nix
+        ./common/wayland-cage.nix
+      ];
+
+      environment.systemPackages = [ pkgs.foot ];
+
+      services.displayManager.defaultSession = lib.mkForce "dwl";
+
+      programs.dwl.enable = true;
+    };
+
+  testScript = ''
+    with subtest("ensure dwl starts"):
+      machine.wait_for_file("/run/user/1000/wayland-0")
+
+    with subtest("ensure foot is installed"):
+      machine.succeed("which foot")
+
+    with subtest("ensure we can open a new terminal"):
+      # sleep 3 is required to make sure dwl has started
+      # TODO: find better way to identify dwl session
+      machine.sleep(3)
+      machine.send_key("alt-shift-ret")
+      machine.sleep(3)
+      machine.screenshot("terminal")
+  '';
+}

From 425b529507064ce489321abb04e83ac182bb1f59 Mon Sep 17 00:00:00 2001
From: Gurjaka <esartia.gurika@gmail.com>
Date: Thu, 5 Jun 2025 23:22:53 +0400
Subject: [PATCH 1254/1497] dwl: add nixosTests.dwl to passthru.tests

---
 pkgs/by-name/dw/dwl/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index e30827a71774..ac4845a42ee3 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -10,6 +10,7 @@
   pkg-config,
   stdenv,
   testers,
+  nixosTests,
   wayland,
   wayland-protocols,
   wayland-scanner,
@@ -103,10 +104,13 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   passthru = {
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      # `dwl -v` emits its version string to stderr and returns 1
-      command = "dwl -v 2>&1; return 0";
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        # `dwl -v` emits its version string to stderr and returns 1
+        command = "dwl -v 2>&1; return 0";
+      };
+      basic = nixosTests.dwl;
     };
   };
 

From b6ca294c8d6efe9c90aa23fdf249b01fc5ea36ef Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 5 Jun 2025 22:18:11 +0200
Subject: [PATCH 1255/1497] dolphin-emu: 2503a -> 2506

---
 pkgs/by-name/do/dolphin-emu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 79e343544514..4b0b68131eda 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -53,13 +53,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolphin-emu";
-  version = "2503a";
+  version = "2506";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
     tag = finalAttrs.version;
-    hash = "sha256-1IqrQi2aBUFpa3n/WI7nF1wqBPyyfpv02YIFfX/911w=";
+    hash = "sha256-JEp1rc5nNJY4GfNCR2Vi4ctQ14p+LZWuFPFirv6foUM=";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''

From f7464fcd5c5d6bf60e8df2fbb67664135c3eff80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 20:32:10 +0000
Subject: [PATCH 1256/1497] firezone-gateway: 1.4.9 -> 1.4.10

---
 pkgs/by-name/fi/firezone-gateway/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 96b5dd217dd7..e48004aa9a4a 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-gateway";
-  version = "1.4.9";
+  version = "1.4.10";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${version}";
-    hash = "sha256-JfsOiNTwwpO998mKA1ZGZTdZfzOgP6AKBkg8cuaqKr0=";
+    hash = "sha256-3iU7AHu3GupqiZEDkuOEb+rFPA2KB1fjVNX1BY4abXc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Ok+pyGG5VHJbsKenKBr0mM1XRoOiAso0ebeQ5hDuwjM=";
+  cargoHash = "sha256-p2zLhLFL6NbHvVojQU5+1amf+Kh0jRAbIESPt2vqWwg=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
   RUSTFLAGS = "--cfg system_certs";

From af11d544917ae75c20c48be62753b8f3d270bbb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 20:33:43 +0000
Subject: [PATCH 1257/1497] dita-ot: 4.3.1 -> 4.3.2

---
 pkgs/by-name/di/dita-ot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index 3568bd8c50fc..d5cd3794c4ce 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.3.1";
+  version = "4.3.2";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-MwE6HnOrVtoT23wF0Tyje8T52au8kD6waY9tsrLQVck=";
+    hash = "sha256-LmXkFuejnWQh0i1L0/GcD/NBNBCMKE5+7M7bUC0DLIg=";
   };
 
   installPhase = ''

From 1dde4953f17bbd98b957e81ab329532b67649a1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 20:48:06 +0000
Subject: [PATCH 1258/1497] cargo-mutants: 25.0.1 -> 25.1.0

---
 pkgs/by-name/ca/cargo-mutants/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index f97aa1bdf8a7..e63d46c3b8d3 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-mutants";
-  version = "25.0.1";
+  version = "25.1.0";
 
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "cargo-mutants";
     rev = "v${version}";
-    hash = "sha256-aTGuCkPk1GYUlRXCdNIy94d5zHxUPpNNFN4aapf8s0U=";
+    hash = "sha256-boT8jptZSGTITBQzFBHIcZnQMlRKctCFoGllcZZ0Onw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Vrh8N29EWIwVgAR6aEQcnkbrs/+llCx+GfiV0WlZOqw=";
+  cargoHash = "sha256-iKK5sZKUSWB5+FfbGXaZndzGT023fU+0f6/g9YRJszA=";
 
   # too many tests require internet access
   doCheck = false;

From cad7504016004276b744291effd6725c8214c4e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 20:56:02 +0000
Subject: [PATCH 1259/1497] argo-rollouts: 1.8.2 -> 1.8.3

---
 pkgs/by-name/ar/argo-rollouts/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix
index f4e1f3419e04..9a91e8bce35e 100644
--- a/pkgs/by-name/ar/argo-rollouts/package.nix
+++ b/pkgs/by-name/ar/argo-rollouts/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "argo-rollouts";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-rollouts";
     rev = "v${version}";
-    sha256 = "sha256-C2Ha3Sdq5IOHEc9S4jb4g6do6a4Gkm4E0BVFq5TnJDM=";
+    sha256 = "sha256-OCFbnBSFSXcbXHT48sS8REAt6CtNFPCNTIfKRBj19DM=";
   };
 
-  vendorHash = "sha256-1YtRc2xLP8QAIK+vO690zHb9tXCkR7na/zwwlIdAxgQ=";
+  vendorHash = "sha256-2zarm9ZvPJ5uwEYvYI60uaN5MONKE8gd+i6TPHdD3PU=";
 
   # Disable tests since some test fail because of missing test data
   doCheck = false;

From 15ca53c6a30cd89ad56b69c113b5417ebe606e82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 21:05:01 +0000
Subject: [PATCH 1260/1497] cadvisor: 0.52.1 -> 0.53.0

---
 pkgs/by-name/ca/cadvisor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cadvisor/package.nix b/pkgs/by-name/ca/cadvisor/package.nix
index 450bb669c9d2..ba27a158b009 100644
--- a/pkgs/by-name/ca/cadvisor/package.nix
+++ b/pkgs/by-name/ca/cadvisor/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "cadvisor";
-  version = "0.52.1";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    hash = "sha256-EXhKX4Za+fdJcSrrbH1te533jyEVLmhgd3I9LcOCz2Q=";
+    hash = "sha256-caGzjv7XhIst3JZA0ri97XqQOO3mI+hwS8WJmLk9f7g=";
   };
 
   modRoot = "./cmd";
 
-  vendorHash = "sha256-DkJLWFhYElN7BYb5Jn6PDYzgndJKbEI5U08WbRqSMdw=";
+  vendorHash = "sha256-xUhHo/kDnjAQLuaeFG1EouC2FWBnFhj1RawlQX7ggVs=";
 
   ldflags = [
     "-s"

From 5bfefc51d99f79cd3ea2364dc718ea4a623d20ac Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 5 Jun 2025 13:38:40 -0700
Subject: [PATCH 1261/1497] python3Packages.langchain-tests: 0.3.19 -> 0.3.20

changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-tests%3D%3D0.3.20

diff: https://github.com/langchain-ai/langchain/compare/langchain-tests%3D%3D0.3.19...langchain-tests%3D%3D0.3.20
---
 .../python-modules/langchain-tests/default.nix       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 7c6bb1762386..2b3862edd3ee 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -10,6 +10,10 @@
   httpx,
   langchain-core,
   syrupy,
+  pytest-benchmark,
+  pytest-codspeed,
+  pytest-recording,
+  vcrpy,
 
   # buildInputs
   pytest,
@@ -26,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "0.3.19";
+  version = "0.3.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-tests==${version}";
-    hash = "sha256-DSTngWRFseJ6kSAY7Lxxkh77QFr0jhHxG3mH89QmdxA=";
+    hash = "sha256-RMuxWA/n8d71FReFKO3Y/5P0MYk4aZ5WU2/TRxf9UuE=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";
@@ -51,8 +55,12 @@ buildPythonPackage rec {
     httpx
     langchain-core
     pytest-asyncio
+    pytest-benchmark
+    pytest-codspeed
+    pytest-recording
     pytest-socket
     syrupy
+    vcrpy
   ];
 
   buildInputs = [ pytest ];

From 495cadca873cbf4915ac927c55d3bb0c82aadf14 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 3 Jun 2025 09:35:57 -0700
Subject: [PATCH 1262/1497] python3Packages.langchain-anthropic: 0.3.13 ->
 0.3.15

changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-anthropic%3D%3D0.3.15

diff: https://github.com/langchain-ai/langchain/compare/langchain-anthropic%3D%3D0.3.13...langchain-anthropic%3D%3D0.3.15
---
 .../python-modules/langchain-anthropic/default.nix        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index 7a7f95ad5e5a..25bfd22922b7 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-anthropic";
-  version = "0.3.13";
+  version = "0.3.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-anthropic==${version}";
-    hash = "sha256-CloIxDPnBnKDUeS4psRvpz8ifK/xR/U62wG+ORHginM=";
+    hash = "sha256-GOD6pMuUDCfrQ6MP+/HXZIg5wHUDRysosEjXjewY/9M=";
   };
 
   sourceRoot = "${src.name}/libs/partners/anthropic";
@@ -52,7 +52,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [ "tests/unit_tests" ];
+  disabledTestPaths = [
+    "tests/integration_tests"
+  ];
 
   pythonImportsCheck = [ "langchain_anthropic" ];
 

From da9ddfabb2e77ebab48f76f41bf3940953541c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 21:33:15 +0000
Subject: [PATCH 1263/1497] ferron: 1.3.0 -> 1.3.1

---
 pkgs/by-name/fe/ferron/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix
index f2d56a9a7f35..51a1eece0960 100644
--- a/pkgs/by-name/fe/ferron/package.nix
+++ b/pkgs/by-name/fe/ferron/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ferron";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "ferronweb";
     repo = "ferron";
     tag = finalAttrs.version;
-    hash = "sha256-Ckz4+B4CxS2S+YbImdqkNGBONTMetxXxZb/J84dB4c0=";
+    hash = "sha256-DD9mv2tMGLtnBU1YAb/CDTt+OcDVRzEfW3kUmePT+y4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZK78ftnVb6k19Pv84HMeM5rGit/KxHJRG8JP8mrjCnY=";
+  cargoHash = "sha256-ezH8Oraog7XmD4zcrT5eiqS4zQ54m0SXNWlBRx0mJgo=";
 
   nativeBuildInputs = [
     pkg-config

From 1e422c37983d81e275d9b005b2791dafc61f9530 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 5 Jun 2025 23:37:43 +0200
Subject: [PATCH 1264/1497] palemoon-bin: 33.7.1 -> 33.7.2

https://www.palemoon.org/releasenotes.shtml#v33.7.2
---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 5defd3f14dd5..476f8c8d9dbd 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.7.1";
+  version = "33.7.2";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU=";
+          hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE=";
+          hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q=";
         };
       };
 

From 89c4e998997da715646ca1dd00150b414764a153 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 22:34:39 +0200
Subject: [PATCH 1265/1497] telegram-desktop: 5.14.3 -> 5.15.2

---
 .../telegram/telegram-desktop/unwrapped.nix       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 4af7adf07264..2e0ae23cc855 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -10,6 +10,10 @@
   python3,
   tdlib,
   tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
+  libavif,
+  libheif,
+  libjxl,
+  kimageformats,
   qtbase,
   qtimageformats,
   qtsvg,
@@ -47,14 +51,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.14.3";
+  version = "5.15.2";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";
+    hash = "sha256-T+gzNY3jPfCWjV9yFEGlz8kNGeAioyDUD2qazM/j05I=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -98,6 +102,13 @@ stdenv.mkDerivation (finalAttrs: {
       boost
       ada
       (tdlib.override { tde2eOnly = true; })
+      # even though the last 3 dependencies are already in `kimageformats`,
+      # because of a logic error in the cmake files, in td 5.15.{1,2} it
+      # doesn't link when you don't add them explicitly
+      kimageformats
+      libavif
+      libheif
+      libjxl
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       protobuf

From b7cfcd389e371315444475c8794a4bcb7dbb4d2f Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 4 Jun 2025 23:35:33 +0200
Subject: [PATCH 1266/1497] telegram-desktop: set meta.mainProgram correctly
 for >=5.15

---
 .../instant-messengers/telegram/telegram-desktop/unwrapped.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 2e0ae23cc855..e0d56e3c037e 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -158,6 +158,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://desktop.telegram.org/";
     changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ nickcao ];
-    mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram";
+    mainProgram = "Telegram";
   };
 })

From f13bb8490908521a2c53fe21d69ec72e770fc6ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 22:06:01 +0000
Subject: [PATCH 1267/1497] vscode-extensions.rooveterinaryinc.roo-cline:
 3.18.3 -> 3.19.3

---
 .../vscode/extensions/rooveterinaryinc.roo-cline/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
index 0ad4f9cab313..9cf7d817b7b6 100644
--- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "RooVeterinaryInc";
     name = "roo-cline";
-    version = "3.18.3";
-    hash = "sha256-kg4kXO7UwDQPXb6CAysaez2v8FPRMbX+f41vE68V0QA=";
+    version = "3.19.3";
+    hash = "sha256-7GZD7oCrkGcG7B/pgXK92hL0QyyodmqyxOcRhTt5LMs=";
   };
 
   passthru.updateScript = vscode-extension-update-script { };

From 5c1955ff1404eddf3c0379a0573aabe83ac5bca3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 May 2025 01:40:09 -0400
Subject: [PATCH 1268/1497] libcCross: Remove!

We have a long-standing goal of nothing with "cross" in its name. This
gets us much closer!
---
 pkgs/by-name/qm/qmk/package.nix               |   2 +-
 pkgs/by-name/sh/shadow/package.nix            |   4 +-
 pkgs/development/compilers/gcc/all.nix        |  13 +-
 pkgs/development/compilers/gcc/default.nix    |   2 +-
 pkgs/development/compilers/go/1.23.nix        |   4 +-
 pkgs/development/compilers/go/1.24.nix        |   4 +-
 .../compilers/llvm/common/default.nix         |   4 +-
 pkgs/os-specific/windows/default.nix          |   6 +-
 pkgs/top-level/aliases.nix                    |   2 -
 pkgs/top-level/all-packages.nix               | 175 +++++++++---------
 pkgs/top-level/darwin-packages.nix            |   6 +-
 pkgs/top-level/release-cross.nix              |   4 +-
 12 files changed, 115 insertions(+), 111 deletions(-)

diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix
index 91c5cdc262d6..39c130310768 100644
--- a/pkgs/by-name/qm/qmk/package.nix
+++ b/pkgs/by-name/qm/qmk/package.nix
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
       pkgsCross.avr.buildPackages.binutils
       pkgsCross.avr.buildPackages.binutils.bintools
       pkgsCross.avr.buildPackages.gcc
-      pkgsCross.avr.libcCross
+      pkgsCross.avr.libc
     ];
 
   # no tests implemented
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 9c27f92eb921..cc5a36f5afbd 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -14,7 +14,7 @@
   libxslt,
   libxcrypt,
   pkg-config,
-  glibcCross ? null,
+  glibc ? null,
   pam ? null,
   withLibbsd ? lib.meta.availableOn stdenv.hostPlatform libbsd,
   libbsd,
@@ -24,7 +24,7 @@
 let
   glibc =
     if stdenv.hostPlatform != stdenv.buildPlatform then
-      glibcCross
+      glibc
     else
       assert stdenv.hostPlatform.libc == "glibc";
       stdenv.cc.libc;
diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index a4eda45eb028..1aba286411bd 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -2,10 +2,9 @@
   lib,
   stdenv,
   pkgs,
+  targetPackages,
   callPackage,
   isl_0_20,
-  libcCross,
-  threadsCross,
   noSysDirs,
   lowPrio,
   wrapCC,
@@ -27,9 +26,15 @@ let
             reproducibleBuild = true;
             profiledCompiler = false;
             libcCross =
-              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then args.libcCross else null;
+              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then
+                targetPackages.libc or pkgs.libc
+              else
+                null;
             threadsCross =
-              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then threadsCross else { };
+              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then
+                targetPackages.threads or pkgs.threads
+              else
+                { };
             isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20;
             # do not allow version skew when cross-building gcc
             #
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 38f17692cefa..fe1a77f0ef01 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -38,7 +38,7 @@
   enablePlugin ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), # Whether to support user-supplied plug-ins
   name ? "gcc",
   libcCross ? null,
-  threadsCross ? null, # for MinGW
+  threadsCross ? { }, # for MinGW
   withoutTargetLibc ? false,
   flex,
   gnused ? null,
diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index cf16461958e3..4b9e49e3ae87 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -8,7 +8,7 @@
   mailcap,
   buildPackages,
   pkgsBuildTarget,
-  threadsCross,
+  targetPackages,
   testers,
   skopeo,
   buildGo123Module,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildTarget = lib.optional isCross targetCC;
 
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
 
   postPatch = ''
     patchShebangs .
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 51cdecec738c..ac8828d873a4 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -8,7 +8,7 @@
   mailcap,
   buildPackages,
   pkgsBuildTarget,
-  threadsCross,
+  targetPackages,
   testers,
   skopeo,
   buildGo124Module,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildTarget = lib.optional isCross targetCC;
 
-  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
+  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;
 
   postPatch = ''
     patchShebangs .
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index d94d28c9b387..cf4118e0935d 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -2,9 +2,9 @@
   lowPrio,
   newScope,
   pkgs,
+  targetPackages,
   lib,
   stdenv,
-  preLibcCrossHeaders,
   libxcrypt,
   substitute,
   replaceVars,
@@ -255,7 +255,7 @@ let
 
       bintoolsNoLibc = wrapBintoolsWith {
         bintools = tools.bintools-unwrapped;
-        libc = preLibcCrossHeaders;
+        libc = targetPackages.preLibcHeaders;
       };
 
       bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 59806318a23e..3e291917ed11 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   buildPackages,
+  pkgs,
   newScope,
   overrideCC,
   stdenvNoLibc,
-  libcCross,
 }:
 
 lib.makeScope newScope (
@@ -31,9 +31,9 @@ lib.makeScope newScope (
       else
         buildPackages.gccWithoutTargetLibc.override (old: {
           bintools = old.bintools.override {
-            libc = libcCross;
+            libc = pkgs.libc;
           };
-          libc = libcCross;
+          libc = pkgs.libc;
         })
     );
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9dca50e96b91..7b06b80d22d1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -320,7 +320,6 @@ mapAliases {
   autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17
   avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
-  avrlibcCross = avrlibc; # Added 2024-09-06
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   awesome-4-0 = awesome; # Added 2022-05-05
   aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
@@ -1955,7 +1954,6 @@ mapAliases {
   ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17
   ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
   uclibc = uclibc-ng; # Added 2022-06-16
-  uclibcCross = uclibc-ng; # Added 2022-06-16
   unicap = "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17
   uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bc22b9cca40..eff036235122 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5175,7 +5175,7 @@ with pkgs;
   gccWithoutTargetLibc =
     assert stdenv.targetPlatform != stdenv.hostPlatform;
     let
-      libcCross1 = binutilsNoLibc.libc;
+      libc1 = binutilsNoLibc.libc;
     in
     wrapCCWith {
       cc = gccFun {
@@ -5190,7 +5190,7 @@ with pkgs;
 
         withoutTargetLibc = true;
         langCC = false;
-        libcCross = libcCross1;
+        libcCross = libc1;
         targetPackages.stdenv.cc.bintools = binutilsNoLibc;
         enableShared =
           stdenv.targetPlatform.hasSharedLibraries
@@ -5201,7 +5201,7 @@ with pkgs;
           && !(stdenv.targetPlatform.useLLVM or false);
       };
       bintools = binutilsNoLibc;
-      libc = libcCross1;
+      libc = libc1;
       extraPackages = [ ];
     };
 
@@ -6142,7 +6142,7 @@ with pkgs;
       libcxx ? null,
       extraPackages ? lib.optional (
         cc.isGNU or false && stdenv.targetPlatform.isMinGW
-      ) threadsCross.package,
+      ) targetPackages.threads.package,
       nixSupport ? { },
       ...
     }@extraArgs:
@@ -6182,7 +6182,7 @@ with pkgs;
   wrapBintoolsWith =
     {
       bintools,
-      libc ? if stdenv.targetPlatform != stdenv.hostPlatform then libcCross else stdenv.cc.libc,
+      libc ? if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else stdenv.cc.libc,
       ...
     }@extraArgs:
     callPackage ../build-support/bintools-wrapper (
@@ -7001,7 +7001,7 @@ with pkgs;
   });
   binutilsNoLibc = wrapBintoolsWith {
     bintools = binutils-unwrapped;
-    libc = preLibcCrossHeaders;
+    libc = targetPackages.preLibcHeaders;
   };
 
   libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix { };
@@ -7055,7 +7055,7 @@ with pkgs;
       null;
   bintoolsNoLibc = wrapBintoolsWith {
     bintools = bintools-unwrapped;
-    libc = preLibcCrossHeaders;
+    libc = targetPackages.preLibcHeaders;
   };
   bintools = wrapBintoolsWith {
     bintools = bintools-unwrapped;
@@ -8155,9 +8155,21 @@ with pkgs;
     withMinecraftPatch = true;
   };
 
-  glibc = callPackage ../development/libraries/glibc {
-    stdenv = gccStdenv; # doesn't compile without gcc
-  };
+  glibc = callPackage ../development/libraries/glibc (
+    if stdenv.hostPlatform != stdenv.buildPlatform then
+      {
+        stdenv = gccCrossLibcStdenv; # doesn't compile without gcc
+        libgcc = callPackage ../development/libraries/gcc/libgcc {
+          gcc = gccCrossLibcStdenv.cc;
+          glibc = glibc.override { libgcc = null; };
+          stdenvNoLibs = gccCrossLibcStdenv;
+        };
+      }
+    else
+      {
+        stdenv = gccStdenv; # doesn't compile without gcc
+      }
+  );
 
   mtrace = callPackage ../development/libraries/glibc/mtrace.nix { };
 
@@ -8168,96 +8180,85 @@ with pkgs;
     withGd = true;
   };
 
-  # Being redundant to avoid cycles on boot. TODO: find a better way
-  glibcCross = callPackage ../development/libraries/glibc {
-    stdenv = gccCrossLibcStdenv; # doesn't compile without gcc
-    libgcc = callPackage ../development/libraries/gcc/libgcc {
-      gcc = gccCrossLibcStdenv.cc;
-      glibc = glibcCross.override { libgcc = null; };
-      stdenvNoLibs = gccCrossLibcStdenv;
-    };
-  };
-
-  muslCross = musl.override {
-    stdenv = stdenvNoLibc;
-  };
+  musl = callPackage ../by-name/mu/musl/package.nix (
+    lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+      stdenv = stdenvNoLibc;
+    }
+  );
 
   # These are used when building compiler-rt / libgcc, prior to building libc.
-  preLibcCrossHeaders =
+  preLibcHeaders =
     let
-      inherit (stdenv.targetPlatform) libc;
+      inherit (stdenv.hostPlatform) libc;
     in
-    if stdenv.targetPlatform.isMinGW then
-      targetPackages.windows.mingw_w64_headers or windows.mingw_w64_headers
+    if stdenv.hostPlatform.isMinGW then
+      windows.mingw_w64_headers or fallback
     else if libc == "nblibc" then
-      targetPackages.netbsd.headers or netbsd.headers
+      netbsd.headers
     else
       null;
 
   # We can choose:
-  libcCrossChooser =
-    name:
-    # libc is hackily often used from the previous stage. This `or`
-    # hack fixes the hack, *sigh*.
-    if name == null then
-      null
-    else if name == "glibc" then
-      targetPackages.glibcCross or glibcCross
-    else if name == "bionic" then
-      targetPackages.bionic or bionic
-    else if name == "uclibc" then
-      targetPackages.uclibc or uclibc
-    else if name == "avrlibc" then
-      targetPackages.avrlibc or avrlibc
-    else if name == "newlib" && stdenv.targetPlatform.isMsp430 then
-      targetPackages.msp430Newlib or msp430Newlib
-    else if name == "newlib" && stdenv.targetPlatform.isVc4 then
-      targetPackages.vc4-newlib or vc4-newlib
-    else if name == "newlib" && stdenv.targetPlatform.isOr1k then
-      targetPackages.or1k-newlib or or1k-newlib
-    else if name == "newlib" then
-      targetPackages.newlib or newlib
-    else if name == "newlib-nano" then
-      targetPackages.newlib-nano or newlib-nano
-    else if name == "musl" then
-      targetPackages.muslCross or muslCross
-    else if name == "msvcrt" then
-      targetPackages.windows.mingw_w64 or windows.mingw_w64
-    else if name == "ucrt" then
-      targetPackages.windows.mingw_w64 or windows.mingw_w64
-    else if name == "libSystem" then
-      if stdenv.targetPlatform.useiOSPrebuilt then
-        targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
+  libc =
+    if stdenv.hostPlatform == stdenv.buildPlatform then
+      # TODO get rid of this branch after the native boostrap is reworked
+      stdenv.cc.libc
+    else
+      let
+        inherit (stdenv.hostPlatform) libc;
+        # libc is hackily often used from the previous stage. This `or`
+        # hack fixes the hack, *sigh*.
+      in
+      if libc == null then
+        null
+      else if libc == "glibc" then
+        glibc
+      else if libc == "bionic" then
+        bionic
+      else if libc == "uclibc" then
+        uclibc
+      else if libc == "avrlibc" then
+        avrlibc
+      else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then
+        msp430Newlib
+      else if libc == "newlib" && stdenv.hostPlatform.isVc4 then
+        vc4-newlib
+      else if libc == "newlib" && stdenv.hostPlatform.isOr1k then
+        or1k-newlib
+      else if libc == "newlib" then
+        newlib
+      else if libc == "newlib-nano" then
+        newlib-nano
+      else if libc == "musl" then
+        musl
+      else if libc == "msvcrt" then
+        windows.mingw_w64
+      else if libc == "ucrt" then
+        windows.mingw_w64
+      else if libc == "libSystem" then
+        if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem
+      else if libc == "fblibc" then
+        freebsd.libc
+      else if libc == "oblibc" then
+        openbsd.libc
+      else if libc == "nblibc" then
+        netbsd.libc
+      else if libc == "wasilibc" then
+        wasilibc
+      else if libc == "relibc" then
+        relibc
+      else if name == "llvm" then
+        llvmPackages_20.libc
       else
-        targetPackages.darwin.libSystem or darwin.libSystem
-    else if name == "fblibc" then
-      targetPackages.freebsd.libc or freebsd.libc
-    else if name == "oblibc" then
-      targetPackages.openbsd.libc or openbsd.libc
-    else if name == "nblibc" then
-      targetPackages.netbsd.libc or netbsd.libc
-    else if name == "wasilibc" then
-      targetPackages.wasilibc or wasilibc
-    else if name == "relibc" then
-      targetPackages.relibc or relibc
-    else if name == "llvm" then
-      targetPackages.llvmPackages_20.libc or llvmPackages_20.libc
-    else
-      throw "Unknown libc ${name}";
+        throw "Unknown libc ${libc}";
 
-  libcCross =
-    if stdenv.targetPlatform == stdenv.buildPlatform then
-      null
-    else
-      libcCrossChooser stdenv.targetPlatform.libc;
-
-  threadsCross =
-    lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false))
+  threads =
+    lib.optionalAttrs (stdenv.hostPlatform.isMinGW && !(stdenv.hostPlatform.useLLVM or false))
       {
         # other possible values: win32 or posix
         model = "mcf";
         # For win32 or posix set this to null
-        package = targetPackages.windows.mcfgthreads or windows.mcfgthreads;
+        package = windows.mcfgthreads;
       };
 
   wasilibc = callPackage ../development/libraries/wasilibc {
@@ -8775,7 +8776,7 @@ with pkgs;
         "fblibc"
       ]
     then
-      libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc)
+      libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libc else stdenv.cc.libc)
     else if stdenv.hostPlatform.isDarwin then
       darwin.libiconv
     else
@@ -9582,7 +9583,7 @@ with pkgs;
 
   simavr = callPackage ../development/tools/simavr {
     avrgcc = pkgsCross.avr.buildPackages.gcc;
-    avrlibc = pkgsCross.avr.libcCross;
+    avrlibc = pkgsCross.avr.libc;
   };
 
   simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 9d656d33c338..a24d981de2e4 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -6,7 +6,6 @@
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   stdenv,
-  preLibcCrossHeaders,
   config,
 }:
 
@@ -57,7 +56,8 @@ makeScopeWithSplicing' {
       };
 
       binutils = pkgs.wrapBintoolsWith {
-        libc = if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc;
+        libc =
+          if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else pkgs.stdenv.cc.libc;
         bintools = self.binutils-unwrapped;
       };
 
@@ -88,7 +88,7 @@ makeScopeWithSplicing' {
       };
 
       binutilsNoLibc = pkgs.wrapBintoolsWith {
-        libc = preLibcCrossHeaders;
+        libc = targetPackages.preLibcHeaders;
         bintools = self.binutils-unwrapped;
       };
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 340c8b92f133..22cc2ce290e8 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -71,13 +71,13 @@ let
   embedded = {
     buildPackages.binutils = nativePlatforms;
     buildPackages.gcc = nativePlatforms;
-    libcCross = nativePlatforms;
+    libc = nativePlatforms;
   };
 
   common = {
     buildPackages.binutils = nativePlatforms;
     gmp = nativePlatforms;
-    libcCross = nativePlatforms;
+    libc = nativePlatforms;
     nix = nativePlatforms;
     nixVersions.git = nativePlatforms;
     mesa = nativePlatforms;

From b3b88065eebf8cdd228c11fe03e7ad9b3e4c044a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 22:16:23 +0000
Subject: [PATCH 1269/1497] ha-mqtt-discoverable-cli: 0.18.0 -> 0.19.2.1

---
 pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
index 031005fc54c3..937d996eae83 100644
--- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.18.0";
+  version = "0.19.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${version}";
-    hash = "sha256-bPgVPj/ZfHznY0cY1ac0TlhCCdw3ZssL/E8yo0gACgQ=";
+    hash = "sha256-SPCbBqdhC+pgV3mQ+e3jkg2hWYegl1wE38Ac06R5uAA=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "CLI for creating Home Assistant compatible MQTT entities that will be automatically discovered";
     homepage = "https://github.com/unixorn/ha-mqtt-discoverable-cli";
-    changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v${version}";
+    changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "hmd";

From f9162386e9a2154259b92d6ece2c4a7a49d5ae72 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 00:23:10 +0200
Subject: [PATCH 1270/1497] ruff: 0.11.12 -> 0.11.13

Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.11.12...refs/tags/0.11.13

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.13
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 625968ee98b0..4cad9bee4f43 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.12";
+  version = "0.11.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU";
+    hash = "sha256-qa4TCvjk0zrXRdiTTqjJbUnCXQKpwiRwtA28y8ZuGpw=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs";
+  cargoHash = "sha256-JkhvTONWKd3/2jI/yQU2jRfEQ2eAp3drup9SsYWOXNA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 52e34f99d12c0f41ed1b585c9d1325525ca4b2d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 22:26:58 +0000
Subject: [PATCH 1271/1497] fsautocomplete: 0.78.1 -> 0.78.3

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 12 ++++++------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index f3083695459f..bc3a9e23a5c2 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -221,18 +221,18 @@
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.71.1",
-    "hash": "sha256-54LnHaowj5xpUdkI3UgIzNVdxNmVqNCNMiJo8k1LMGI="
+    "version": "0.71.2",
+    "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.71.1",
-    "hash": "sha256-UtAh4f6ee+c0cMkomP0ayo1mOUqWdFwMtBxK/DWioFE="
+    "version": "0.71.2",
+    "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.71.1",
-    "hash": "sha256-zSVY/uRc4HoEEB9YDSJtDlDDHdZD+zBca3RrXJaRoBM="
+    "version": "0.71.2",
+    "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks="
   },
   {
     "pname": "LinkDotNet.StringBuilder",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index a10fa0a66ed0..1729a1388f1c 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.78.1";
+  version = "0.78.3";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l+xC7OXOEE3gSfbsqcTF26/29dsr/cin8moRoaDSKBM=";
+    hash = "sha256-ZY0sRRGTazaesHyqUe5C/l8xmo+teTS34KVXd0DnO84=";
   };
 
   nugetDeps = ./deps.json;

From 7cbf03f2e18788cac33221049df8328290c0cc98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 22:33:49 +0000
Subject: [PATCH 1272/1497] python3Packages.certbot-dns-inwx: 3.0.1 -> 3.0.2

---
 pkgs/development/python-modules/certbot-dns-inwx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
index d04b7b04391f..b7627f60f3ce 100644
--- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix
+++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "certbot-dns-inwx";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oGGy990";
     repo = "certbot-dns-inwx";
     tag = "v${version}";
-    hash = "sha256-9dDSJcXlPq065CloaszwutUXsGn+Y9fIeTiGmiXGonY=";
+    hash = "sha256-x4wDg36J9MvXXHBxUMCoHO3p6c3FKBBB879CpxG/1NA=";
   };
 
   build-system = [ setuptools ];

From a4a78c561f7dfacc7cee5815439d19ef8eb6672c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Jun 2025 08:44:24 +1000
Subject: [PATCH 1273/1497] go_1_23: 1.23.9 -> 1.23.10

Changelog: https://go.dev/doc/devel/release#go1.23.10
---
 pkgs/development/compilers/go/1.23.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index cf16461958e3..8921fcd0b328 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.23.9";
+  version = "1.23.10";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-CPZBlUdWPtnnA30SuciQlnfHL3X2LvhYh+2dv0m40t0=";
+    hash = "sha256-gAp64b/xeaIntlOi9kRRfIAEQ7i0q/MnOvXhy3ET3lk=";
   };
 
   strictDeps = true;

From 38a446c696e00eb47018cfc449787113d35e0ed6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 6 Jun 2025 06:46:39 +0800
Subject: [PATCH 1274/1497] xmind: 25.01.01061-202501070800 ->
 25.04.03523-202505300040

---
 pkgs/by-name/xm/xmind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix
index 52d03207c56a..b8b566917a60 100644
--- a/pkgs/by-name/xm/xmind/package.nix
+++ b/pkgs/by-name/xm/xmind/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmind";
-  version = "25.01.01061-202501070800";
+  version = "25.04.03523-202505300040";
 
   src = fetchurl {
     url = "https://dl3.xmind.app/Xmind-for-Linux-amd64bit-${finalAttrs.version}.deb";
-    hash = "sha256-Mp2aC/yHoB29t9QY4Tnbgn//J8Gordt5S1JrJn0BvXg=";
+    hash = "sha256-0Z6ygpIhu32pyXH2q0QE1oBu+SD7U8T0rFBk2icnoeM=";
   };
 
   nativeBuildInputs = [

From ff5ff0f1cb3cd183b6baf3849b21e44a0a65c907 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 22:55:03 +0000
Subject: [PATCH 1275/1497] terraform-providers.docker: 3.6.0 -> 3.6.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5b73a0df83c4..187b1fb9e857 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -399,13 +399,13 @@
     "vendorHash": "sha256-0axKIqF1t4AW1PPi+fHfsFQLRrjhpsloQIZ9clR+8Gc="
   },
   "docker": {
-    "hash": "sha256-sPeX1bupACBSmt8ppyxQKyD+FXIPdCBWn8cnOAvNHwQ=",
+    "hash": "sha256-A2XFSVWpEZs6vmJb5i9dDqkIIlwoGLgbFxXUnFKgtMo=",
     "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker",
     "owner": "kreuzwerker",
     "repo": "terraform-provider-docker",
-    "rev": "v3.6.0",
+    "rev": "v3.6.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bQM6bAtTqAzrIqvCnpfxYefiTmTKaJq8okAgOVls5jk="
+    "vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI="
   },
   "doppler": {
     "hash": "sha256-TPWHqRpvyk1dtSbQySMOecq0AhN2VlSB+2naPIbvMHI=",

From 7cb01ddd655fe6f94aff05e03866d8993fce01e0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 17:46:50 +0200
Subject: [PATCH 1276/1497] solarus-launcher: init at 2.0.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../so/solarus-launcher/github-fetches.patch  |  34 ++++++
 pkgs/by-name/so/solarus-launcher/package.nix  | 109 ++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 pkgs/by-name/so/solarus-launcher/github-fetches.patch
 create mode 100644 pkgs/by-name/so/solarus-launcher/package.nix

diff --git a/pkgs/by-name/so/solarus-launcher/github-fetches.patch b/pkgs/by-name/so/solarus-launcher/github-fetches.patch
new file mode 100644
index 000000000000..181acbd56123
--- /dev/null
+++ b/pkgs/by-name/so/solarus-launcher/github-fetches.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80b9aab..e56ca84 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,8 +88,7 @@ include(FetchContent)
+ 
+ # Qlementine Icons: an SVG icon library made for Qt.
+ FetchContent_Declare(qlementine-icons
+-  GIT_REPOSITORY "https://github.com/oclero/qlementine-icons.git"
+-  GIT_TAG v1.8.0
++  SOURCE_DIR "@qlementine-icons-src@"
+ )
+ FetchContent_MakeAvailable(qlementine-icons)
+ set_target_properties(qlementine-icons
+@@ -99,8 +98,7 @@ set_target_properties(qlementine-icons
+ 
+ # Qlementine: the QStyle library to have a modern look n' feel.
+ FetchContent_Declare(qlementine
+-  GIT_REPOSITORY "https://github.com/oclero/qlementine.git"
+-  GIT_TAG v1.2.0
++  SOURCE_DIR "@qlementine-src@"
+ )
+ FetchContent_MakeAvailable(qlementine)
+ set_target_properties(qlementine
+@@ -109,8 +107,7 @@ set_target_properties(qlementine
+ )
+ 
+ FetchContent_Declare(QtAppInstanceManager
+- GIT_REPOSITORY "https://github.com/oclero/qtappinstancemanager.git"
+- GIT_TAG v1.3.0
++  SOURCE_DIR "@qtappinstancemanager-src@"
+ )
+ FetchContent_MakeAvailable(QtAppInstanceManager)
+ set_target_properties(QtAppInstanceManager
diff --git a/pkgs/by-name/so/solarus-launcher/package.nix b/pkgs/by-name/so/solarus-launcher/package.nix
new file mode 100644
index 000000000000..ce8cd109a307
--- /dev/null
+++ b/pkgs/by-name/so/solarus-launcher/package.nix
@@ -0,0 +1,109 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchFromGitHub,
+  replaceVars,
+  cmake,
+  ninja,
+  luajit,
+  SDL2,
+  SDL2_image,
+  SDL2_ttf,
+  physfs,
+  openal,
+  libmodplug,
+  libvorbis,
+  solarus,
+  glm,
+  qt6Packages,
+  kdePackages,
+}:
+
+let
+  qlementine-icons-src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qlementine-icons";
+    tag = "v1.8.0";
+    hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0=";
+  };
+
+  qlementine-src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qlementine";
+    tag = "v1.2.1";
+    hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA=";
+  };
+
+  qtappinstancemanager-src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qtappinstancemanager";
+    tag = "v1.3.0";
+    hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
+  };
+
+  inherit (qt6Packages)
+    qtbase
+    qttools
+    wrapQtAppsHook
+    ;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "solarus-launcher";
+  version = "2.0.0";
+
+  src = fetchFromGitLab {
+    owner = "solarus-games";
+    repo = "solarus-launcher";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zBJnHzYJyhfzP1m6TgMkDLRA3EXC1oG8PC0Jq/fC2+Q=";
+  };
+
+  patches = [
+    (replaceVars ./github-fetches.patch {
+      inherit qlementine-src qlementine-icons-src qtappinstancemanager-src;
+    })
+  ];
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    cmake
+    ninja
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    luajit
+    SDL2
+    SDL2_image
+    SDL2_ttf
+    physfs
+    openal
+    libmodplug
+    libvorbis
+    solarus
+    qtbase
+    kdePackages.qtsvg
+    glm
+  ];
+
+  meta = {
+    description = "Launcher for the Zelda-like ARPG game engine, Solarus";
+    longDescription = ''
+      Solarus is a game engine for Zelda-like ARPG games written in lua.
+      Many full-fledged games have been writen for the engine.
+      Games can be created easily using the editor.
+    '';
+    homepage = "https://www.solarus-games.org";
+    mainProgram = "solarus-launcher";
+    license = with lib.licenses; [
+      # code
+      gpl3Plus
+      # assets
+      cc-by-sa-40
+    ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+    platforms = lib.platforms.linux;
+  };
+})

From 13982535dc8fb06089d79269737596a9a68bf616 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:03:01 +0200
Subject: [PATCH 1277/1497] solarus: remove `with lib;` from meta

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index a2b7bb295a39..fd2065ff4b1a 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -62,16 +62,16 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "lib"}/share")
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Zelda-like ARPG game engine";
     longDescription = ''
       Solarus is a game engine for Zelda-like ARPG games written in lua.
       Many full-fledged games have been writen for the engine.
     '';
     homepage = "https://www.solarus-games.org";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 }

From 20be8a92b1fd54d0dd5e6b1b1ce9d79fb20a8c4c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:04:05 +0200
Subject: [PATCH 1278/1497] solarus: use finalAttrs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index fd2065ff4b1a..bab859cd955c 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -16,14 +16,14 @@
   libvorbis,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "solarus";
   version = "2.0.0";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
-    repo = pname;
-    rev = "v${version}";
+    repo = "solarus";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
   };
 
@@ -73,5 +73,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-
-}
+})

From 5d9e81ede10ff9446f5f10251cf63857f6f48c3d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:13:03 +0200
Subject: [PATCH 1279/1497] solarus: enable strictDeps

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index bab859cd955c..973d8609a3e5 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  strictDeps = true;
   nativeBuildInputs = [
     cmake
     ninja

From 01118fbfd4ee1f171c17f3d428d199cfc2553791 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:04:35 +0200
Subject: [PATCH 1280/1497] solarus: s/rev/tag/ s/sha256/hash/

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index 973d8609a3e5..a8af00081fc1 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = "solarus";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Kfg4pFZrEhsIU4RQlOox3hMpk2PXbOzrkwDElPGnDjA=";
   };
 
   patches = [

From 2641ee4e50be412a32bbce51a485b80f664d862a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:05:42 +0200
Subject: [PATCH 1281/1497] solarus: add meta.mainProgram

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index a8af00081fc1..1004cfeb0179 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -70,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
       Many full-fledged games have been writen for the engine.
     '';
     homepage = "https://www.solarus-games.org";
+    mainProgram = "solarus-run";
     license = lib.licenses.gpl3;
     maintainers = [ ];
     platforms = lib.platforms.linux;

From b5d0791022e5e59d2fb930988b7b243e957486d5 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:10:36 +0200
Subject: [PATCH 1282/1497] solarus: update license

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index 1004cfeb0179..ba04f1f8d257 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -71,7 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.solarus-games.org";
     mainProgram = "solarus-run";
-    license = lib.licenses.gpl3;
+    license = with lib.licenses; [
+      # code
+      gpl3Plus
+      # assets
+      cc-by-sa-30
+      cc-by-sa-40
+    ];
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };

From 909afa88231e88847926509a5e2a0bc671ed8fa5 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:22:06 +0200
Subject: [PATCH 1283/1497] solarus: add tests

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index ba04f1f8d257..267c16638f71 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -14,6 +14,10 @@
   openal,
   libmodplug,
   libvorbis,
+
+  # tests
+  solarus-quest-editor,
+  solarus-launcher,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -63,6 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "${placeholder "lib"}/share")
   ];
 
+  passthru.tests = {
+    inherit solarus-quest-editor solarus-launcher;
+  };
+
   meta = {
     description = "Zelda-like ARPG game engine";
     longDescription = ''

From 78fdc691d293ade6377766068cecb3f31dd2c07a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:10:51 +0200
Subject: [PATCH 1284/1497] solarus: adopt

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/solarus/package.nix b/pkgs/by-name/so/solarus/package.nix
index 267c16638f71..34db918dc2d4 100644
--- a/pkgs/by-name/so/solarus/package.nix
+++ b/pkgs/by-name/so/solarus/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
       cc-by-sa-30
       cc-by-sa-40
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
     platforms = lib.platforms.linux;
   };
 })

From 941def2d07ca7dd96022dfa66ddfe25778b2a4c9 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:14:55 +0200
Subject: [PATCH 1285/1497] solarus-quest-editor: remove `with lib;` from meta

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus-quest-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 315aedd47954..2a7a9a614df4 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     glm
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Editor for the Zelda-like ARPG game engine, Solarus";
     mainProgram = "solarus-editor";
     longDescription = ''
@@ -78,9 +78,9 @@ stdenv.mkDerivation rec {
       Games can be created easily using the editor.
     '';
     homepage = "https://www.solarus-games.org";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
 }

From 22917c1670184a483798e38880b40bcfc59e4c7c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:16:05 +0200
Subject: [PATCH 1286/1497] solarus-quest-editor: use finalAttrs

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus-quest-editor/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 2a7a9a614df4..5606c953450c 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -33,14 +33,14 @@ let
     wrapQtAppsHook
     ;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-quest-editor";
   version = "2.0.0";
 
   src = fetchFromGitLab {
     owner = "solarus-games";
-    repo = pname;
-    rev = "v${version}";
+    repo = "solarus-quest-editor";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw=";
   };
 
@@ -82,5 +82,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-
-}
+})

From a21e645626b90615d6869f110e2e135d02b97c14 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:16:31 +0200
Subject: [PATCH 1287/1497] solarus-quest-editor: enable strictDeps

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus-quest-editor/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 5606c953450c..3e7d8203a53e 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -17,6 +17,7 @@
   solarus,
   glm,
   qt6Packages,
+  kdePackages,
 }:
 
 let
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./qlementine-src.patch { inherit qlementine-src; })
   ];
 
+  strictDeps = true;
   nativeBuildInputs = [
     cmake
     ninja
@@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     solarus
     qtbase
+    kdePackages.qtsvg
     glm
   ];
 

From 16ec2ed250c63d4ba73356596df076e7b82fa03d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:17:00 +0200
Subject: [PATCH 1288/1497] solarus-quest-editor: s/rev/tag/

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus-quest-editor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 3e7d8203a53e..459f0a910270 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "solarus-games";
     repo = "solarus-quest-editor";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GTslxValldReWGb3x67zRPrvQUuCO/HQSXOEQlJfAmw=";
   };
 

From 50318d1775982f9b3aed35f447310e36b25c1f5f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 27 May 2025 18:17:35 +0200
Subject: [PATCH 1289/1497] solarus-quest-editor: adopt

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/so/solarus-quest-editor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 459f0a910270..124e26d348f2 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.solarus-games.org";
     license = lib.licenses.gpl3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ marcin-serwin ];
     platforms = lib.platforms.linux;
   };
 })

From 609a05a9947a886e772132ef0bc3cccac72fbdf4 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 30 May 2025 20:06:12 +0200
Subject: [PATCH 1290/1497] cubeb: 0-unstable-2025-04-02 ->
 0-unstable-2025-05-29

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ...cmake-add-pkg-config-file-generation.patch | 208 ------------------
 ...t-hardcode-include-as-the-includedir.patch |  31 ---
 pkgs/by-name/cu/cubeb/package.nix             |  23 +-
 pkgs/by-name/du/duckstation/package.nix       |   3 +-
 .../du/duckstation/remove-cubeb-vendor.patch  |  14 +-
 pkgs/by-name/du/duckstation/sources.nix       |  12 -
 pkgs/by-name/pc/pcsx2/package.nix             |  13 +-
 .../pc/pcsx2/remove-cubeb-vendor.patch        |  14 +-
 8 files changed, 25 insertions(+), 293 deletions(-)
 delete mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch
 delete mode 100644 pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch

diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch b/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch
deleted file mode 100644
index 018ec29358f4..000000000000
--- a/pkgs/by-name/cu/cubeb/0001-cmake-add-pkg-config-file-generation.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From e0cbc1049b9a3a3322cd48d32af148f87d5007c2 Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <marcin@serwin.dev>
-Date: Mon, 19 May 2025 22:36:53 +0200
-Subject: [PATCH] cmake: add pkg-config file generation
-
-Signed-off-by: Marcin Serwin <marcin@serwin.dev>
----
- CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- libcubeb.pc.in | 12 ++++++++++++
- 2 files changed, 62 insertions(+)
- create mode 100644 libcubeb.pc.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07618fa..6470837 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,17 @@ if(NOT CMAKE_BUILD_TYPE)
-       "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
- endif()
- 
-+set(private_requires)
-+set(private_libs)
-+set(private_libs_flags)
-+if(UNIX AND NOT APPLE)
-+  if(BSD OR ANDROID)
-+    list(APPEND private_libs c++)
-+  else()
-+    list(APPEND private_libs stdc++)
-+  endif()
-+endif()
-+
- set(CMAKE_C_STANDARD 99)
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-@@ -141,6 +152,7 @@ if(NOT BUNDLE_SPEEX)
-     pkg_check_modules(speexdsp IMPORTED_TARGET speexdsp)
-     if(speexdsp_FOUND)
-       add_library(speex ALIAS PkgConfig::speexdsp)
-+      list(APPEND private_requires speexdsp)
-     endif()
-   endif()
- endif()
-@@ -155,6 +167,7 @@ if(NOT TARGET speex)
-     EXPORT=
-     RANDOM_PREFIX=speex
-   )
-+  list(APPEND private_libs speex)
- endif()
- 
- # $<BUILD_INTERFACE:> required because of https://gitlab.kitware.com/cmake/cmake/-/issues/15415
-@@ -166,6 +179,7 @@ include(CheckIncludeFiles)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads)
- target_link_libraries(cubeb PRIVATE Threads::Threads)
-+list(APPEND private_libs ${CMAKE_THREAD_LIBS_INIT})
- 
- if(LAZY_LOAD_LIBS)
-   check_include_files(pulse/pulseaudio.h USE_PULSE)
-@@ -176,6 +190,7 @@ if(LAZY_LOAD_LIBS)
- 
-   if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
-     target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
-+    list(APPEND private_libs ${CMAKE_DL_LIBS})
- 
-     if(ANDROID)
-       target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
-@@ -191,6 +206,7 @@ else()
-     set(USE_PULSE ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
-+    list(APPEND private_requires libpulse)
-   endif()
- 
-   pkg_check_modules(alsa IMPORTED_TARGET alsa)
-@@ -198,6 +214,7 @@ else()
-     set(USE_ALSA ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
-+    list(APPEND private_requires alsa)
-   endif()
- 
-   pkg_check_modules(jack IMPORTED_TARGET jack)
-@@ -205,18 +222,21 @@ else()
-     set(USE_JACK ON)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
-     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
-+    list(APPEND private_requires jack)
-   endif()
- 
-   check_include_files(sndio.h USE_SNDIO)
-   if(USE_SNDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE sndio)
-+    list(APPEND private_libs sndio)
-   endif()
- 
-   check_include_files(aaudio/AAudio.h USE_AAUDIO)
-   if(USE_AAUDIO)
-     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
-     target_link_libraries(cubeb PRIVATE aaudio)
-+    list(APPEND private_libs aaudio)
-   endif()
- endif()
- 
-@@ -263,6 +283,7 @@ if(USE_AUDIOUNIT)
-     src/cubeb_osx_run_loop.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_AUDIOUNIT)
-   target_link_libraries(cubeb PRIVATE "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
-+  list(APPEND private_libs_flags "-framework AudioUnit" "-framework CoreAudio" "-framework CoreServices")
- endif()
- 
- check_include_files(audioclient.h USE_WASAPI)
-@@ -271,6 +292,7 @@ if(USE_WASAPI)
-     src/cubeb_wasapi.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_WASAPI)
-   target_link_libraries(cubeb PRIVATE avrt ole32 ksuser)
-+  list(APPEND private_libs avrt ole32 ksuser)
- endif()
- 
- check_include_files("windows.h;mmsystem.h" USE_WINMM)
-@@ -279,6 +301,7 @@ if(USE_WINMM)
-     src/cubeb_winmm.c)
-   target_compile_definitions(cubeb PRIVATE USE_WINMM)
-   target_link_libraries(cubeb PRIVATE winmm)
-+  list(APPEND private_libs winmm)
- endif()
- 
- check_include_files(SLES/OpenSLES.h USE_OPENSL)
-@@ -288,6 +311,7 @@ if(USE_OPENSL)
-     src/cubeb-jni.cpp)
-   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
-   target_link_libraries(cubeb PRIVATE OpenSLES)
-+  list(APPEND private_libs OpenSLES)
- endif()
- 
- check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
-@@ -303,6 +327,7 @@ if(HAVE_SYS_SOUNDCARD_H)
-       pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay)
-       if(libbsd-overlay_FOUND)
-         target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay)
-+        list(APPEND private_requires libbsd-overlay)
-         set(HAVE_STRLCPY true)
-       endif()
-     endif()
-@@ -320,6 +345,7 @@ if(USE_AUDIOTRACK)
-     src/cubeb_audiotrack.c)
-   target_compile_definitions(cubeb PRIVATE USE_AUDIOTRACK)
-   target_link_libraries(cubeb PRIVATE log)
-+  list(APPEND private_libs log)
- endif()
- 
- check_include_files(sys/audioio.h USE_SUN)
-@@ -335,6 +361,7 @@ if(USE_KAI)
-     src/cubeb_kai.c)
-   target_compile_definitions(cubeb PRIVATE USE_KAI)
-   target_link_libraries(cubeb PRIVATE kai)
-+  list(APPEND private_libs kai)
- endif()
- 
- if(USE_PULSE AND USE_PULSE_RUST)
-@@ -452,3 +479,26 @@ add_custom_target(clang-format-check
-   | xargs -0 ${CLANG_FORMAT_BINARY} -Werror -n
-   COMMENT "Check formatting with clang-format"
-   VERBATIM)
-+
-+
-+list(TRANSFORM private_libs PREPEND "-l")
-+string(JOIN " " CUBEB_PC_PRIVATE_LIBS ${private_libs} ${private_libs_flags})
-+
-+string(JOIN " " CUBEB_PC_PRIVATE_REQUIRES ${private_requires})
-+
-+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-+  set(CUBEB_PC_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
-+else()
-+  set(CUBEB_PC_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
-+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-+  set(CUBEB_PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-+else()
-+  set(CUBEB_PC_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
-+endif()
-+
-+configure_file(libcubeb.pc.in libcubeb.pc @ONLY)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcubeb.pc"
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+)
-+
-diff --git a/libcubeb.pc.in b/libcubeb.pc.in
-new file mode 100644
-index 0000000..2310ae6
---- /dev/null
-+++ b/libcubeb.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=@CUBEB_PC_LIBDIR@
-+includedir=@CUBEB_PC_INCLUDEDIR@
-+
-+Name: libcubeb
-+Description: Cross platform audio library
-+Version: @PROJECT_VERSION@
-+Requires.private: @CUBEB_PC_PRIVATE_REQUIRES@
-+Libs: -L${libdir} -lcubeb
-+Libs.private: @CUBEB_PC_PRIVATE_LIBS@
-+Cflags: -I${includedir}
--- 
-2.49.0
-
diff --git a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch b/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch
deleted file mode 100644
index 9309495a4a93..000000000000
--- a/pkgs/by-name/cu/cubeb/0001-cmake-don-t-hardcode-include-as-the-includedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4f8dff52e99bdd70d07d7cb47d357bb91dc5f1a9 Mon Sep 17 00:00:00 2001
-From: Marcin Serwin <marcin@serwin.dev>
-Date: Sat, 24 May 2025 16:20:51 +0200
-Subject: [PATCH] cmake: don't hardcode "include" as the includedir
-
-When the default CMAKE_INSTALL_INCLUDEDIR is changed
-headers are installed to a different location, however, the
-INTERFACE_INCLUDE_DIRECTORIES in exported cmake configuration still
-point to <prefix>/include.
-
-Signed-off-by: Marcin Serwin <marcin@serwin.dev>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07618fa..bdf2212 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,7 +91,7 @@ add_library(cubeb
-   src/cubeb_utils.cpp
- )
- target_include_directories(cubeb
--  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
-+  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
- set_target_properties(cubeb PROPERTIES
-   VERSION ${cubeb_VERSION}
--- 
-2.49.0
-
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 764e763ee220..f399ddd06a8b 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -14,8 +14,6 @@
 
   # passthru.tests
   testers,
-  pcsx2,
-  duckstation,
 
   alsaSupport ? !stdenv.hostPlatform.isDarwin,
   pulseSupport ? !stdenv.hostPlatform.isDarwin,
@@ -26,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2025-04-02";
+  version = "0-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "975a727e5e308a04cfb9ecdf7ddaf1150ea3f733";
-    hash = "sha256-3IP++tdiJUwXR6t5mf/MkPd524K/LYESNMkQ8vy10jo=";
+    rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d";
+    hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o=";
   };
 
   outputs = [
@@ -56,14 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional pulseSupport libpulseaudio
     ++ lib.optional sndioSupport sndio;
 
-  patches = [
-    # https://github.com/mozilla/cubeb/pull/813
-    ./0001-cmake-add-pkg-config-file-generation.patch
-
-    # https://github.com/mozilla/cubeb/pull/814
-    ./0001-cmake-don-t-hardcode-include-as-the-includedir.patch
-  ];
-
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "BUILD_TESTS" false) # tests require an audio server
@@ -76,12 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
-
-    tests = {
-      # These packages depend on a patched version of cubeb
-      inherit pcsx2 duckstation;
-      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-    };
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
   meta = {
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index e4c39a397c6a..a94fc06e1161 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -6,6 +6,7 @@
   callPackage,
   cmake,
   cpuinfo,
+  cubeb,
   curl,
   extra-cmake-modules,
   libXrandr,
@@ -56,7 +57,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     cpuinfo
-    sources.cubeb
+    cubeb
     curl
     libXrandr
     libbacktrace
diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
index b28d522cbd50..e740b0619338 100644
--- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
+++ b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch
@@ -15,15 +15,19 @@ index af35687..8347825 100644
  disable_compiler_warnings_for_target(kissfft)
  
 diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp
-index 85579c4..526d168 100644
+index 85579c4..339190a 100644
 --- a/src/util/cubeb_audio_stream.cpp
 +++ b/src/util/cubeb_audio_stream.cpp
-@@ -261,7 +261,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+@@ -261,9 +261,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
    std::vector<std::pair<std::string, std::string>> names;
    names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
  
 -  const char** cubeb_names = cubeb_get_backend_names();
-+  const char*const * cubeb_names = cubeb_get_backend_names();
-   for (u32 i = 0; cubeb_names[i] != nullptr; i++)
-     names.emplace_back(cubeb_names[i], cubeb_names[i]);
+-  for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+-    names.emplace_back(cubeb_names[i], cubeb_names[i]);
++  cubeb_backend_names backends = cubeb_get_backend_names();
++  for (u32 i = 0; i < backends.count; i++)
++    names.emplace_back(backends.names[i], backends.names[i]);
    return names;
+ }
+
diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix
index 42a24ede16c5..228bcbc2aaba 100644
--- a/pkgs/by-name/du/duckstation/sources.nix
+++ b/pkgs/by-name/du/duckstation/sources.nix
@@ -9,7 +9,6 @@
   stdenv,
   cmake,
   ninja,
-  cubeb,
 }:
 
 {
@@ -164,15 +163,4 @@
       platforms = lib.platforms.linux;
     };
   });
-
-  cubeb = cubeb.overrideAttrs (old: {
-    pname = "cubeb-patched-for-duckstation";
-    patches = (old.patches or [ ]) ++ [
-      (fetchpatch {
-        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
-        stripLen = 2;
-        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
-      })
-    ];
-  });
 }
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index e8375dc46f57..93a9b4974322 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -25,7 +25,6 @@
   wayland,
   zip,
   zstd,
-  fetchpatch,
 }:
 
 let
@@ -37,16 +36,6 @@ let
     qtwayland
     wrapQtAppsHook
     ;
-
-  cubeb' = cubeb.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [
-      (fetchpatch {
-        url = "https://github.com/PCSX2/pcsx2/commit/430e31abe4a9e09567cb542f1416b011bb9b6ef9.patch";
-        stripLen = 2;
-        hash = "sha256-bbH0c1X3lMeX6hfNKObhcq5xraFpicFV3mODQGYudvQ=";
-      })
-    ];
-  });
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   inherit (sources.pcsx2) pname version src;
@@ -93,7 +82,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
     wayland
     zstd
-    cubeb'
+    cubeb
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch
index 2c98f22746dd..c8196e5b0ac5 100644
--- a/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch
+++ b/pkgs/by-name/pc/pcsx2/remove-cubeb-vendor.patch
@@ -15,15 +15,19 @@ index ff66f9c..e177c90 100644
  # Find the Qt components that we need.
  find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
 diff --git a/pcsx2/Host/CubebAudioStream.cpp b/pcsx2/Host/CubebAudioStream.cpp
-index 4cd9993..604635d 100644
+index 4cd9993..74c2f5a 100644
 --- a/pcsx2/Host/CubebAudioStream.cpp
 +++ b/pcsx2/Host/CubebAudioStream.cpp
-@@ -288,7 +288,7 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
+@@ -288,9 +288,9 @@ std::vector<std::pair<std::string, std::string>> AudioStream::GetCubebDriverName
  	std::vector<std::pair<std::string, std::string>> names;
  	names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default"));
  
 -	const char** cubeb_names = cubeb_get_backend_names();
-+	const char* const* cubeb_names = cubeb_get_backend_names();
- 	for (u32 i = 0; cubeb_names[i] != nullptr; i++)
- 		names.emplace_back(cubeb_names[i], cubeb_names[i]);
+-	for (u32 i = 0; cubeb_names[i] != nullptr; i++)
+-		names.emplace_back(cubeb_names[i], cubeb_names[i]);
++	cubeb_backend_names backends = cubeb_get_backend_names();
++	for (u32 i = 0; i < backends.count; i++)
++		names.emplace_back(backends.names[i], backends.names[i]);
  
+ 	return names;
+ }

From f81f12278b467f4b19c9e2bb91589ad2939e6a06 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 25 May 2025 17:11:25 -0400
Subject: [PATCH 1291/1497] render50: init at 9.2.7

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/re/render50/package.nix | 53 ++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/re/render50/package.nix

diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix
new file mode 100644
index 000000000000..132d1a76af3e
--- /dev/null
+++ b/pkgs/by-name/re/render50/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  fetchpatch2,
+  versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "render50";
+  version = "9.2.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cs50";
+    repo = "render50";
+    tag = "v${version}";
+    hash = "sha256-ZCSd1Y7PPVkMQWkEgcaqh3Ypy8OrWxI9iM2HMVT/VeA=";
+  };
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    backports-shutil-which
+    braceexpand
+    beautifulsoup4
+    natsort
+    pygments
+    pypdf
+    requests
+    six
+    termcolor
+    weasyprint
+  ];
+
+  nativeCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  # no pytest checks
+
+  meta = {
+    description = "Generate syntax-highlighted PDFs of source code";
+    homepage = "https://cs50.readthedocs.io/render50/";
+    downloadPage = "https://github.com/cs50/render50";
+    changelog = "https://github.com/cs50/render50/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    mainProgram = "render50";
+  };
+}

From 06847dd80f73c0ac751c800a7e208b43abede799 Mon Sep 17 00:00:00 2001
From: iivusly <52052910+iivusly@users.noreply.github.com>
Date: Thu, 5 Jun 2025 18:06:50 -0700
Subject: [PATCH 1292/1497] whatsapp-for-mac: 2.24.23.82 -> 2.25.16.81

---
 pkgs/by-name/wh/whatsapp-for-mac/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whatsapp-for-mac/package.nix b/pkgs/by-name/wh/whatsapp-for-mac/package.nix
index 674b2322e0e2..e38f52ffd13e 100644
--- a/pkgs/by-name/wh/whatsapp-for-mac/package.nix
+++ b/pkgs/by-name/wh/whatsapp-for-mac/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "whatsapp-for-mac";
-  version = "2.24.23.82";
+  version = "2.25.16.81";
 
   src = fetchzip {
     extension = "zip";
     name = "WhatsApp.app";
     url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch";
-    hash = "sha256-FnXW3l4JUdJkDQ7eASlDeUzRdZ2N5l3WvEKcuBuE0nY=";
+    hash = "sha256-CZcMYWyBpusM+NUlMC2du01cq3uqXvMiIdOienLn/nM=";
   };
 
   dontConfigure = true;

From 92366a97375f68697dd1c5e15a064f4b1fa2ca52 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 22 May 2025 11:25:20 -0400
Subject: [PATCH 1293/1497] fish-lsp: add llakala as maintainer

---
 pkgs/by-name/fi/fish-lsp/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index 227edead777b..7c80ec11e209 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -82,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ndonfris/fish-lsp";
     license = lib.licenses.mit;
     mainProgram = "fish-lsp";
-    maintainers = with lib.maintainers; [ petertriho ];
+    maintainers = with lib.maintainers; [
+      llakala
+      petertriho
+    ];
     platforms = lib.platforms.unix;
   };
 })

From 8028dbc66b18bb5b5655fd34a01c56663d30fd8f Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Thu, 22 May 2025 11:29:25 -0400
Subject: [PATCH 1294/1497] fish-lsp: 1.0.8-4 -> 1.0.9-1

---
 pkgs/by-name/fi/fish-lsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix
index 7c80ec11e209..52f6af662810 100644
--- a/pkgs/by-name/fi/fish-lsp/package.nix
+++ b/pkgs/by-name/fi/fish-lsp/package.nix
@@ -15,18 +15,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fish-lsp";
-  version = "1.0.8-4";
+  version = "1.0.9-1";
 
   src = fetchFromGitHub {
     owner = "ndonfris";
     repo = "fish-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA=";
+    hash = "sha256-NyEhvW5NMqvESdbauxur7xWAzQiQdTVklGMYhckNAnw=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk=";
+    hash = "sha256-xB4kWpPQbA1OkXNr5sozPIP96dLJhwoDUpesE6DORzg=";
   };
 
   nativeBuildInputs = [

From f51e34cc06c5c9be3f5e1e232d6994c3ab3a8a43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 01:36:22 +0000
Subject: [PATCH 1295/1497] kodiPackages.controller-topology-project: 1.0.2 ->
 1.0.3

---
 .../video/kodi/addons/controller-topology-project/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index a76afe010f3b..3c06a8d40ff8 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -8,13 +8,13 @@
 let
   drv = stdenv.mkDerivation rec {
     pname = "controller-topology-project";
-    version = "1.0.2";
+    version = "1.0.3";
 
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
       rev = "v${version}";
-      sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg=";
+      sha256 = "sha256-KHM4DAF6xLLlxF19R4UKfVMbLsmniuxy/C4STcL0IHQ=";
     };
 
     postPatch = ''

From 937f4b2928bb29f4b9bf065a2b2d7a3906035a62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 01:47:42 +0000
Subject: [PATCH 1296/1497] mkbrr: 1.12.0 -> 1.12.1

---
 pkgs/by-name/mk/mkbrr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix
index 99010243e484..020a2a0c9f2b 100644
--- a/pkgs/by-name/mk/mkbrr/package.nix
+++ b/pkgs/by-name/mk/mkbrr/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mkbrr";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "mkbrr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v5MkbsXbS37axZTrp7YTNCU5/uqVW1vnJu+F5hxk3bI=";
+    hash = "sha256-gUIX271eaG15329pLnZ8QnZD7BrdCk+cWs43uUzKxOE=";
   };
 
   vendorHash = "sha256-G8WM5x99UZfAZUkE5W37Ogx/OKk8JypPzGBrIuBOFNo=";

From a2ae90d0c7efdd7c8c08e1609f90ed76cfe1468d Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 19:51:41 -0500
Subject: [PATCH 1297/1497] python3Packages.fxrays: init at 1.3.6

---
 .../python-modules/fxrays/default.nix         | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/fxrays/default.nix

diff --git a/pkgs/development/python-modules/fxrays/default.nix b/pkgs/development/python-modules/fxrays/default.nix
new file mode 100644
index 000000000000..b7859e624117
--- /dev/null
+++ b/pkgs/development/python-modules/fxrays/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "fxrays";
+  version = "1.3.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "FXrays";
+    tag = "${version}_as_released";
+    hash = "sha256-IwEY54zDXqMci7WRvhueDJidTsbMwv6eqQSGZzFOtnQ";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  pythonImportsCheck = [ "FXrays" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m FXrays.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Computes extremal rays of polyhedral cones with filtering";
+    changelog = "https://github.com/3-manifolds/FXrays/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/FXrays";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 322c7740bd41..0864b3030c3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5432,6 +5432,8 @@ self: super: with self; {
 
   fx2 = callPackage ../development/python-modules/fx2 { };
 
+  fxrays = callPackage ../development/python-modules/fxrays { };
+
   fyta-cli = callPackage ../development/python-modules/fyta-cli { };
 
   g2pkk = callPackage ../development/python-modules/g2pkk { };

From c7c30f47c201e10f509e0778d1237d8a5071ed83 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 19:59:34 -0500
Subject: [PATCH 1298/1497] python3Packages.low-index: init at 1.2.1

---
 .../python-modules/low-index/default.nix      | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/low-index/default.nix

diff --git a/pkgs/development/python-modules/low-index/default.nix b/pkgs/development/python-modules/low-index/default.nix
new file mode 100644
index 000000000000..7d21f3602b02
--- /dev/null
+++ b/pkgs/development/python-modules/low-index/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "low-index";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "low_index";
+    tag = "v${version}_as_released";
+    hash = "sha256-T8hzC9ulikQ1pUdbXgjuKAX5oMJEycPvXWv74rCkQGY=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "low_index" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m low_index.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Enumerates low index subgroups of a finitely presented group";
+    changelog = "https://github.com/3-manifolds/low_index/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/low_index";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0864b3030c3a..e2a09f9b2ef9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8463,6 +8463,8 @@ self: super: with self; {
 
   lottie = callPackage ../development/python-modules/lottie { };
 
+  low-index = callPackage ../development/python-modules/low-index { };
+
   lox = callPackage ../development/python-modules/lox { };
 
   lpc-checksum = callPackage ../development/python-modules/lpc-checksum { };

From f98c76b988a185a8a0683a31d5ea86376a225f11 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 19:54:20 -0500
Subject: [PATCH 1299/1497] python3Packages.plink: init at 2.4.6

---
 .../python-modules/plink/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/plink/default.nix

diff --git a/pkgs/development/python-modules/plink/default.nix b/pkgs/development/python-modules/plink/default.nix
new file mode 100644
index 000000000000..062d438058a4
--- /dev/null
+++ b/pkgs/development/python-modules/plink/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  sphinx,
+  tkinter,
+}:
+
+buildPythonPackage rec {
+  pname = "plink";
+  version = "2.4.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "plink";
+    tag = "${version}_as_released";
+    hash = "sha256-+WUyQvQY9Fx47GikzJ4gcCpSIjvk5756FP0bDdF6Ack=";
+  };
+
+  build-system = [
+    setuptools
+    sphinx
+  ];
+
+  dependencies = [ tkinter ];
+
+  pythonImportsCheck = [ "plink" ];
+
+  meta = {
+    description = "Full featured Tk-based knot and link editor";
+    mainProgram = "plink";
+    homepage = "https://3-manifolds.github.io/PLink";
+    changelog = "https://github.com/3-manifolds/PLink/releases/tag/${src.tag}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2a09f9b2ef9..ec0e0cba8bd0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11441,6 +11441,8 @@ self: super: with self; {
 
   plfit = toPythonModule (pkgs.plfit.override { inherit (self) python; });
 
+  plink = callPackage ../development/python-modules/plink { };
+
   plone-testing = callPackage ../development/python-modules/plone-testing { };
 
   ploomber-core = callPackage ../development/python-modules/ploomber-core { };

From 6f28c8729eae9aecaf91f9809b1a0ca2aa7caeb2 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 19:58:22 -0500
Subject: [PATCH 1300/1497] python3Packages.cypari: init at 2.5.5

---
 .../python-modules/cypari/default.nix         | 80 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/development/python-modules/cypari/default.nix

diff --git a/pkgs/development/python-modules/cypari/default.nix b/pkgs/development/python-modules/cypari/default.nix
new file mode 100644
index 000000000000..da8e988829ad
--- /dev/null
+++ b/pkgs/development/python-modules/cypari/default.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchurl,
+  setuptools,
+  cython,
+  bash,
+  perl,
+  gnum4,
+  texliveBasic,
+}:
+
+let
+  pariVersion = "2.15.4";
+  gmpVersion = "6.3.0";
+
+  pariSrc = fetchurl {
+    url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor pariVersion}/pari-${pariVersion}.tar.gz";
+    hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8=";
+  };
+
+  gmpSrc = fetchurl {
+    url = "https://ftp.gnu.org/gnu/gmp/gmp-${gmpVersion}.tar.bz2";
+    hash = "sha256-rCghGnz7YJuuLiyNYFjWbI/pZDT3QM9v4uR7AA0cIMs=";
+  };
+in
+buildPythonPackage rec {
+  pname = "cypari";
+  version = "2.5.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "CyPari";
+    tag = "${version}_as_released";
+    hash = "sha256-RJ9O1KsDHmMkTCIFUrcSUkA5ijTsxmoI939QCsCib0Y=";
+  };
+
+  postPatch = ''
+    substituteInPlace ./setup.py \
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
+    # final character is stripped from PARI error messages for some reason
+    substituteInPlace ./cypari/handle_error.pyx \
+      --replace-fail "not a function in function call" "not a function in function cal"
+    ln -s ${pariSrc} ${pariSrc.name}
+    ln -s ${gmpSrc} ${gmpSrc.name}
+  '';
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  NIX_LDFLAGS = "-lc";
+
+  nativeBuildInputs = [
+    gnum4
+    perl
+    texliveBasic
+  ];
+
+  pythonImportsCheck = [ "cypari" ];
+
+  checkPhase = ''
+    runHook preCheck
+    rm -r cypari
+    ${python.interpreter} -m cypari.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Sage's PARI extension, modified to stand alone";
+    homepage = "https://github.com/3-manifolds/CyPari";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+    changelog = "https://github.com/3-manifolds/CyPari/releases/tag/${src.tag}";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec0e0cba8bd0..c3c6b1c512f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3128,6 +3128,8 @@ self: super: with self; {
 
   cynthion = callPackage ../development/python-modules/cynthion { };
 
+  cypari = callPackage ../development/python-modules/cypari { };
+
   cypari2 = callPackage ../development/python-modules/cypari2 { };
 
   cypherpunkpay = callPackage ../development/python-modules/cypherpunkpay { };

From 5d647bfcce74059a1615b4bc6a59223be33fde95 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 20:02:56 -0500
Subject: [PATCH 1301/1497] python3Packages.knot-floer-homology: init at 1.2.2

---
 .../knot-floer-homology/default.nix           | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/knot-floer-homology/default.nix

diff --git a/pkgs/development/python-modules/knot-floer-homology/default.nix b/pkgs/development/python-modules/knot-floer-homology/default.nix
new file mode 100644
index 000000000000..b483f3146bf3
--- /dev/null
+++ b/pkgs/development/python-modules/knot-floer-homology/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+}:
+
+buildPythonPackage rec {
+  pname = "knot-floer-homology";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "knot_floer_homology";
+    tag = "${version}_as_released";
+    hash = "sha256-Gw9k9AaUVTBzE+ERUH8VgS//aVT03DdKozpL8xLG4No=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  pythonImportsCheck = [ "knot_floer_homology" ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m knot_floer_homology.test
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Python wrapper for Zoltán Szabó's HFK Calculator";
+    changelog = "https://github.com/3-manifolds/knot_floer_homology/releases/tag/${src.tag}";
+    homepage = "https://github.com/3-manifolds/knot_floer_homology";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c3c6b1c512f7..e5905b4b534c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7582,6 +7582,8 @@ self: super: with self; {
 
   knocki = callPackage ../development/python-modules/knocki { };
 
+  knot-floer-homology = callPackage ../development/python-modules/knot-floer-homology { };
+
   knx-frontend = callPackage ../development/python-modules/knx-frontend { };
 
   kombu = callPackage ../development/python-modules/kombu { };

From 042e8accc2dc9c8e05570b6c4553545b301e67c8 Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 20:04:44 -0500
Subject: [PATCH 1302/1497] python3Packages.snappy-manifolds: init at 1.2.1

---
 .../snappy-manifolds/default.nix              | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/snappy-manifolds/default.nix

diff --git a/pkgs/development/python-modules/snappy-manifolds/default.nix b/pkgs/development/python-modules/snappy-manifolds/default.nix
new file mode 100644
index 000000000000..b5fb336f3b63
--- /dev/null
+++ b/pkgs/development/python-modules/snappy-manifolds/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "snappy-manifolds";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "snappy_manifolds";
+    tag = "${version}_as_released";
+    hash = "sha256-vxG3z6zWzG4S11fBxYGn4/c2f2sWOCIrzT+R27TR144=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "snappy_manifolds" ];
+
+  meta = {
+    description = "Database of snappy manifolds";
+    changelog = "https://github.com/3-manifolds/snappy_manifolds/releases/tag/${src.tag}";
+    homepage = "https://snappy.computop.org";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5905b4b534c..39a380866478 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16309,6 +16309,8 @@ self: super: with self; {
 
   snapcast = callPackage ../development/python-modules/snapcast { };
 
+  snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { };
+
   snapshottest = callPackage ../development/python-modules/snapshottest { };
 
   snaptime = callPackage ../development/python-modules/snaptime { };

From fc29fe854a2a50ec71e597b6ba5e10d140fa373c Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 20:05:42 -0500
Subject: [PATCH 1303/1497] python3Packages.snappy-15-knots: init at 1.2.1

---
 .../snappy-15-knots/default.nix               | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/snappy-15-knots/default.nix

diff --git a/pkgs/development/python-modules/snappy-15-knots/default.nix b/pkgs/development/python-modules/snappy-15-knots/default.nix
new file mode 100644
index 000000000000..ec26a0bc8534
--- /dev/null
+++ b/pkgs/development/python-modules/snappy-15-knots/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  snappy-manifolds,
+}:
+
+buildPythonPackage rec {
+  pname = "snappy-15-knots";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "snappy_15_knots";
+    tag = "${version}_as_released";
+    hash = "sha256-fhJhHZFf4XuW/0V6LOuV4qoFWke3oFP0KArDpXLWh9g=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ snappy-manifolds ];
+
+  pythonImportsCheck = [ "snappy_15_knots" ];
+
+  meta = with lib; {
+    description = "Database of snappy manifolds";
+    homepage = "https://snappy.computop.org";
+    changelog = "https://github.com/3-manifolds/snappy_15_knots/releases/tag/${src.tag}";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39a380866478..82377018f2ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16309,6 +16309,8 @@ self: super: with self; {
 
   snapcast = callPackage ../development/python-modules/snapcast { };
 
+  snappy-15-knots = callPackage ../development/python-modules/snappy-15-knots { };
+
   snappy-manifolds = callPackage ../development/python-modules/snappy-manifolds { };
 
   snapshottest = callPackage ../development/python-modules/snapshottest { };

From c9519e8299e3618c707be1e4a849df64a6e46aad Mon Sep 17 00:00:00 2001
From: noiioiu <noiioiu@cocaine.ninja>
Date: Thu, 22 May 2025 20:27:09 -0500
Subject: [PATCH 1304/1497] python3Packages.spherogram: init at 2.3

---
 .../python-modules/spherogram/default.nix     | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/spherogram/default.nix

diff --git a/pkgs/development/python-modules/spherogram/default.nix b/pkgs/development/python-modules/spherogram/default.nix
new file mode 100644
index 000000000000..0e4a3da679d5
--- /dev/null
+++ b/pkgs/development/python-modules/spherogram/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+  networkx,
+  decorator,
+  knot-floer-homology,
+  snappy-manifolds,
+  snappy-15-knots,
+}:
+
+buildPythonPackage rec {
+  pname = "spherogram";
+  version = "2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "3-manifolds";
+    repo = "spherogram";
+    tag = "${version}_as_released";
+    hash = "sha256-uqc+3xS4xulXR0tZlNuyC5Zz5OztR6c4PZWpsvU+4Pw=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  dependencies = [
+    networkx
+    decorator
+    snappy-manifolds
+    knot-floer-homology
+  ];
+
+  optional-dependencies.snappy-15-knots = [ snappy-15-knots ];
+
+  pythonImportsCheck = [ "spherogram" ];
+
+  meta = {
+    description = "Spherical diagrams for 3-manifold topology";
+    homepage = "https://snappy.computop.org/spherogram.html";
+    changelog = "https://github.com/3-manifolds/Spherogram/releases/tag/${src.tag}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ noiioiu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 82377018f2ca..69272a955c58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16479,6 +16479,8 @@ self: super: with self; {
 
   spglib = callPackage ../development/python-modules/spglib { };
 
+  spherogram = callPackage ../development/python-modules/spherogram { };
+
   sphfile = callPackage ../development/python-modules/sphfile { };
 
   sphinx = callPackage ../development/python-modules/sphinx { };

From e340fef5de52b7302abccc1e3be99d144c64ff8b Mon Sep 17 00:00:00 2001
From: Jie Zhu <alienchuj@gmail.com>
Date: Wed, 21 May 2025 10:13:31 +0800
Subject: [PATCH 1305/1497] lan-mouse: install desktop and icon file

---
 pkgs/by-name/la/lan-mouse/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix
index a32cc9cc4956..529c4f98dbf0 100644
--- a/pkgs/by-name/la/lan-mouse/package.nix
+++ b/pkgs/by-name/la/lan-mouse/package.nix
@@ -50,6 +50,11 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM=";
 
+  postInstall = ''
+    install -Dm444 de.feschber.LanMouse.desktop -t $out/share/applications
+    install -Dm444 lan-mouse-gtk/resources/de.feschber.LanMouse.svg -t $out/share/icons/hicolor/scalable/apps
+  '';
+
   meta = {
     description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network";
     homepage = "https://github.com/feschber/lan-mouse";

From 81f47d27ae2b720dcb0164cd96e6fd34dd98da3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 03:04:52 +0000
Subject: [PATCH 1306/1497] attic-client: 0-unstable-2025-02-02 ->
 0-unstable-2025-05-29

---
 pkgs/by-name/at/attic-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix
index 3b8a97074e52..f97093594ff0 100644
--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage {
   pname = "attic";
-  version = "0-unstable-2025-02-02";
+  version = "0-unstable-2025-05-29";
 
   src = fetchFromGitHub {
     owner = "zhaofengli";
     repo = "attic";
-    rev = "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e";
-    hash = "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=";
+    rev = "ce9373715fe3fac7a174a65a7e6d6baeba8cb4f9";
+    hash = "sha256-CvaKOUq8G10sghKpZhEB2UYjJoWhEkrDFggDgi7piUI=";
   };
 
   nativeBuildInputs = [

From 6b35c295a0e778d6b618263f9e8b089e6a59710f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 03:06:36 +0000
Subject: [PATCH 1307/1497] gose: 0.10.6 -> 0.11.1

---
 pkgs/by-name/go/gose/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix
index 2a5cec699716..450c3ba88c1d 100644
--- a/pkgs/by-name/go/gose/package.nix
+++ b/pkgs/by-name/go/gose/package.nix
@@ -7,13 +7,13 @@
   lib,
 }:
 let
-  version = "0.10.6";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     repo = "gose";
     owner = "stv0g";
     tag = "v${version}";
-    hash = "sha256-H+15d0wCfL+jd+xjKSOrimLIAG1Mh8vO+5MaHaVocJg=";
+    hash = "sha256-Wz3gcx9/wrSfiHkOGnjAoUFfN0tiA1C+31GlnHqL3M0=";
   };
 
   frontend = buildNpmPackage {

From 476e2417e8b6d0cc7ac83abd0cf0829fc2c1b323 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 03:19:15 +0000
Subject: [PATCH 1308/1497] dbeaver-bin: 25.0.5 -> 25.1.0

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index ee7ec2c69559..d41db8966365 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -17,7 +17,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.0.5";
+  version = "25.1.0";
 
   src =
     let
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-8JkvI6OZGP1Ot2TEP2n4hj3s9As7holT+thVf0BvOMQ=";
-        aarch64-linux = "sha256-cZQFEbogSxuIaS/z/tFQcvs08J0Omi21zLqb0eFQNw0=";
-        x86_64-darwin = "sha256-LueOQZIKB/r6gtlj0+xwoJXMRTFvbSY+RTwAB74KiYo=";
-        aarch64-darwin = "sha256-L6bOyvhlsT4sXL1QDhlJtb8DFfDVw21ixyRenOVdCxU=";
+        x86_64-linux = "sha256-Bpc4p6WNFdc6nwVeZI4THETzODfNUj2SouEgOhDFTkk=";
+        aarch64-linux = "sha256-mqeG/Vzn/5qsBoD7U6i/6GxXBUvP+55pC1U1wBKF1T0=";
+        x86_64-darwin = "sha256-3RoJGvOafuKRo9dn+m8J274O06F8YUWx1YAcRMQb/Qs=";
+        aarch64-darwin = "sha256-11VbGnZz2fDtG5LRQZWnQdXCT7qrIia22aO+5nA/LQE=";
       };
     in
     fetchurl {

From c706234790eff09667d224371b09821aec6f2e19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 03:44:59 +0000
Subject: [PATCH 1309/1497] python3Packages.py-machineid: 0.7.0 -> 0.8.0

---
 pkgs/development/python-modules/py-machineid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix
index 9c634e6a1ab6..332ff82cd9bf 100644
--- a/pkgs/development/python-modules/py-machineid/default.nix
+++ b/pkgs/development/python-modules/py-machineid/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "py-machineid";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WnSoEOOLV7BDsUXHVsHmrBYVKct9g/4gCZ/LmGrMV3s=";
+    hash = "sha256-VRXV+XeQc9DKouiq8VoP3QrUJH/QuG2cRHQxyW0+NGc=";
   };
 
   build-system = [ setuptools ];

From 0fd0e1cf1ad298a37c20388d7f275e8e078d6a4d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Jun 2025 12:44:22 -0500
Subject: [PATCH 1310/1497] vimPlugins: update on 2025-06-05

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 654 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |  16 +-
 2 files changed, 337 insertions(+), 333 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 4c41f43d7063..f4b84f57180d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -386,12 +386,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-05-27";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5";
-      sha256 = "1fh8xynmdj0ag6ppid6gi288gjwp59w2p2ishfl3zyjwlkv7kxkh";
+      rev = "307a3320d3ec6c8ddafd62c4c661e71bc20cb93f";
+      sha256 = "17025v5zzp848jglz2iws1fgdji8dwvxknfas6fvkg3m7m79n38i";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -647,12 +647,12 @@ final: prev: {
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2025-04-20";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "2e00d1d4248f08dddfceacb8d2996e51e13e00f6";
-      sha256 = "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw";
+      rev = "5c0df1679bf7c814c924dc6646cc5291daca8363";
+      sha256 = "1dhsg3bli32d0p36c9f1i95p7h9hn5czr1zwlcd3v926qzj9wp1j";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -895,12 +895,12 @@ final: prev: {
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "2025-04-30";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      rev = "c797dd5a592e2bd154f2503e231b8a4083659534";
-      sha256 = "1dmdnk3hggdssbaqz9bdf7h29chc64vw20bnxv5n6qrnrfrsfqx0";
+      rev = "cd9a7d82f00df90b7f76e73ef1569551b6993a5f";
+      sha256 = "1jg94s5i6q756nq0f7jcw5gvgqwipmnnf8k82sfrsvc0k3j8p126";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
     meta.hydraPlatforms = [ ];
@@ -908,12 +908,12 @@ final: prev: {
 
   astrolsp = buildVimPlugin {
     pname = "astrolsp";
-    version = "2025-05-13";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrolsp";
-      rev = "f2604d0de0bfd3c442a2f2a47d9e7be850467883";
-      sha256 = "0pgz1ndrksqicdpq5dyqq3a1clwi5d3vd3xfdd6v7ckzndg5gxqb";
+      rev = "a215b1caedfc93092374fe5f1d63f958b9efa568";
+      sha256 = "0bynmjjdcgkyfgw3dy54j9pzczv9gpcda63jlqlbakdhh6w7zibs";
     };
     meta.homepage = "https://github.com/AstroNvim/astrolsp/";
     meta.hydraPlatforms = [ ];
@@ -1325,12 +1325,12 @@ final: prev: {
 
   bamboo-nvim = buildVimPlugin {
     pname = "bamboo.nvim";
-    version = "2025-03-08";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "ribru17";
       repo = "bamboo.nvim";
-      rev = "97124a0b81f886abc0d666ebec512b92425d67b6";
-      sha256 = "16yfdnl92x3z47a0l3zn3gxdcyirrr1pvr5vf1afpmryn9ng7b4k";
+      rev = "ab8393d1a314d96314605369b4b1e6bc7737f2b5";
+      sha256 = "12fia7ix4c515kjkm8hqrk4x7cbzm81kz3sk33r3qmdh7mm4rwiv";
     };
     meta.homepage = "https://github.com/ribru17/bamboo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1364,12 +1364,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "2025-05-26";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "f9ce7474c54803cb0fa308b0b91549d394a07940";
-      sha256 = "1d575pa225ws5rhabr17if5pl8vfy1ks1a9w3rx7f47vdk8ars4m";
+      rev = "5d0fcd834d48048822e36221ab067bedb3ef5c93";
+      sha256 = "035j1x44sjk0vhcbp18nm1lq32z8ra8qp8wlij3382mai8jrrb06";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.hydraPlatforms = [ ];
@@ -1390,12 +1390,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "2025-05-24";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "b4cb646df33e9140271211671256dd148e127595";
-      sha256 = "0ihlzaglyf1s1wmzqbz1q677vcjxxxbvbp9y398sdn6mkj6kvv4n";
+      rev = "2dbb72f4ae6f78cb3adc60c2c3b69524f97c9cd6";
+      sha256 = "16p0syfvf70b0zzdndm3d2jwbqssgcpl1bzvbzjzbsqy3xi8n1w2";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.hydraPlatforms = [ ];
@@ -1533,12 +1533,12 @@ final: prev: {
 
   blink-cmp-git = buildVimPlugin {
     pname = "blink-cmp-git";
-    version = "2025-05-25";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "Kaiser-Yang";
       repo = "blink-cmp-git";
-      rev = "e78e9ff3de63f82685e3c5f2eed1ec203222f63b";
-      sha256 = "1s7pb7if902gn0lrvyvwrbp7vpixmpri6g2h1lz0dbp5wcwy2cwn";
+      rev = "28f302c3917e374b91acb3d2ff2da5cd392679f5";
+      sha256 = "0mf84n2zqf8wg2hpjadd33bi2ps0abdgbww8bnsyc6w6lii3jwk9";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
     meta.hydraPlatforms = [ ];
@@ -1624,12 +1624,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-05-13";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "a910b62c896eee2d0e74eb48b3ff5eedd211db69";
-      sha256 = "0xinh3rxjrglkzgw9d80x1scl20h2gxzkl3f3cjzpz04rrr6slsm";
+      rev = "3b146c70869c3f42c623341ad8befe9a073087a6";
+      sha256 = "0058rns7sgkzsfkgdqlx51bi04fn6hxv4ddl8g32mpq27dji13pn";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1858,12 +1858,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2025-05-26";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "56a9dfd1e05868cf3189369aad87242941396563";
-      sha256 = "082rlnsxm1ip5mhpgc37nyp96s2hmvkcd4cbbvsvzdghiq4kl51b";
+      rev = "a0c769bc7cd04bbbf258b3d5f01e2bdce744108d";
+      sha256 = "08qv1had0gi2hzd854j7xyq3s3z9bvf1x40bav05ll52xkksn5vx";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -1871,12 +1871,12 @@ final: prev: {
 
   catppuccin-vim = buildVimPlugin {
     pname = "catppuccin-vim";
-    version = "2024-08-14";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "vim";
-      rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c";
-      sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4";
+      rev = "a72bc6487f4fb47c36539e29f5496ac7ba8e136c";
+      sha256 = "02mqlpw64am42wcikqcckh20i2vr50md4nyv5hiim4wmmdqich7q";
     };
     meta.homepage = "https://github.com/catppuccin/vim/";
     meta.hydraPlatforms = [ ];
@@ -1923,12 +1923,12 @@ final: prev: {
 
   chadtree = buildVimPlugin {
     pname = "chadtree";
-    version = "2025-05-21";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "c09921c0157b718ced8ec469d7397a5f29ee7d94";
-      sha256 = "1r1rwfq2dn91zrpn47b18y8n58lfbxp44srsa9d7df5ff769yrcz";
+      rev = "bc34bbf898c5832fae1390c963365be5f71bb152";
+      sha256 = "1iggi65sid081z06b15wpszac1lx0chn2wxlsivqp2c3rmfc0pyb";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
     meta.hydraPlatforms = [ ];
@@ -2872,12 +2872,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-05-25";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "4bf93f031261b7a7cdff38aaac7a12b564e2f00c";
-      sha256 = "1j0v2zw3d3q5aia8qkagclzcdir0cmf844bgxrcr0wy4lcbgm6lz";
+      rev = "9f7f280194f70229ec667721373a74d238618220";
+      sha256 = "0bmpc1dsd796dmg4ig9i1ijl2a4p9jd1dfmwppmfdlpp9awqp7n3";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2924,12 +2924,12 @@ final: prev: {
 
   codecompanion-history-nvim = buildVimPlugin {
     pname = "codecompanion-history.nvim";
-    version = "2025-05-23";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "ravitemer";
       repo = "codecompanion-history.nvim";
-      rev = "36f1a611a2bed70b57a50c877ffc50bdb74c9d23";
-      sha256 = "1kb208i6n8k2qcbagmcnbmmxl62k2vwgm16y4xpkl78vayza9gf8";
+      rev = "66943e78bcacaa27f4ac4a398df4016eb5413ecd";
+      sha256 = "053sk528m4cq8xmawqk2vgrdwp5f9m1zv4vnx3n9r4zglp75ibar";
     };
     meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2937,12 +2937,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-05-28";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "43185768e353065f910dcf5915386404f0e950da";
-      sha256 = "0yii24w0py4gjqldb59gdawphl66fhdljivyh43fw9bcbypqmksj";
+      rev = "cdf772165782e55a451c0793bf4c2a89926b89bd";
+      sha256 = "1q2c35b5razr2aav9k8gn3z3z2j7vx4haf12gm4w9dj35gx3d3kq";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3210,12 +3210,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-05-22";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "6feb2f28f9a9385e401857b21eeac3c1b66dd628";
-      sha256 = "1vfjv81b27qja3byfzskv1y57jsqwy6y0mac1ry7xpdbnva3vxwc";
+      rev = "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6";
+      sha256 = "0hvpvk0gs76b9sfzrzhmrq9d7rab3ldim0vf18qf424xl72fbw8b";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3302,12 +3302,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-05-28";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "5f726c8e6bbcd7461ee0b870d4e6c8a973b55b64";
-      sha256 = "08caf8v2a9vs8m85krq14d2ps2ljqi0n2f1h6nplzp02qr9x1w6j";
+      rev = "c1bb86abbed1a52a11ab3944ef00c8410520543d";
+      sha256 = "11w41p4wah0w6f1lyhrr214h761rcic7nfnriszk2b25q4ifj4db";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3393,12 +3393,12 @@ final: prev: {
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "2025-05-29";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "a3da881bb97e36891c9c9892e5f789e159db0d26";
-      sha256 = "05xsplqd6fm5vs9gg1w2w5ym51b382bl7mf1zblsmlg0y9s3p9qi";
+      rev = "09ce78ef988eacad5393ed73908613554b1ea30c";
+      sha256 = "1zbpvd90h2jmim9kbp1g9zvacb7qvfkdpi1m6rnqvmii2g5sqvw1";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
     meta.hydraPlatforms = [ ];
@@ -3445,12 +3445,12 @@ final: prev: {
 
   crates-nvim = buildVimPlugin {
     pname = "crates.nvim";
-    version = "2025-05-28";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "fc59684a10706cce85e356d03b07fda535bec533";
-      sha256 = "00myb5ny8zlcz8rnqnmbizh86wik96m1lz4v9n5lcql7xmz02amr";
+      rev = "5d8b1bef686db0fabe5f1bb593744b617e8f1405";
+      sha256 = "1zy81gdfis2wmhhsi1qjnmxpfpsviscwdyypnnccqhp7z3lwcf5h";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3471,12 +3471,12 @@ final: prev: {
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "2025-05-07";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "9cdc993347cfb51d102bf5da1ebf6bf4fc4683e4";
-      sha256 = "0ls3m94qk4vjwki7bjrf4di9fiwvh9hhkahav28c3nz14j559gs4";
+      rev = "79ea71655a705be38a113809d7e9e15aaa0695b2";
+      sha256 = "1a4igb5ldhw3wnhbf06fn97qgxfgmnqz86ss6ycc9y4g7jaj0bi7";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3653,12 +3653,12 @@ final: prev: {
 
   dashboard-nvim = buildVimPlugin {
     pname = "dashboard-nvim";
-    version = "2025-05-21";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "dashboard-nvim";
-      rev = "0f99b3cd66b9fde13926724c67c6e1abeb48e07d";
-      sha256 = "0s0i568nj4mkq0q29gjj9cm050p7n8b2jykbkyl7qajc1piwa93x";
+      rev = "c42fcfbd96dfcaa486c0a0ab52494316f1c31350";
+      sha256 = "1lydgxs3j1jbyrn1ybpm43l7wfbix9mlvymb2frg93dlg0gw4zd3";
     };
     meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
     meta.hydraPlatforms = [ ];
@@ -3770,12 +3770,12 @@ final: prev: {
 
   ddc-vim = buildVimPlugin {
     pname = "ddc.vim";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc.vim";
-      rev = "70db25791969d39ec9f8a3795b37fce707975502";
-      sha256 = "1ncb1m1l77vskf4cfra098722wdq89lgn36cvy54yv2byiqjfcrp";
+      rev = "57fc46eef055a9ef8c9b75a01291567a13bf22fe";
+      sha256 = "19wr7n18ds2x36khjca5a1wlmphm3vfa76lhlcpskfwxwckpnvmz";
     };
     meta.homepage = "https://github.com/Shougo/ddc.vim/";
     meta.hydraPlatforms = [ ];
@@ -4396,12 +4396,12 @@ final: prev: {
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2025-05-24";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "f7ecb0c3600ca1dc467c361e9af40f97289d7aad";
-      sha256 = "107hiyjbxpkz6caa3hj9j9n4r1bd3g6nsl7k6piwg6ldkxjd2miz";
+      rev = "ce1db78abd1fae838abc23740b8fc9525679d6dc";
+      sha256 = "17jlzw6qa685w2kqilvlh3i0rmjsp4cscrb7bw71k7cp5s6xxpsn";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4422,12 +4422,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-05-28";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "a641cc44781ef59fae48c2bc85aa272933e647e0";
-      sha256 = "0hpms7lrrffkpg2nrcy5vfyp7abnfc4arvh1d2icvwwk0bgcp0qv";
+      rev = "9fe1ca3e5c9128609b45bf23771935729fc50af0";
+      sha256 = "0z1f5hcmjf4fbkmsh0h9nw0mxlyqx69b2gh49hndmx5nk2zagsql";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4645,12 +4645,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2025-04-16";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18";
-      sha256 = "1s1m9z8061yvdr124hvwdpfhkyx1l46gcp860rz1bxlbk5h02g1z";
+      rev = "c4bb2ae687ae21938775f436cf213492702a0cf3";
+      sha256 = "0id5lhd7iqhh4qh427d83k3iczvdgs5nfi20i0409ww41wrpj6db";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.hydraPlatforms = [ ];
@@ -4749,12 +4749,12 @@ final: prev: {
 
   fastfold = buildVimPlugin {
     pname = "fastfold";
-    version = "2024-12-15";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "fff6d05064dec4d7e1398aa507db35fcd57edfb4";
-      sha256 = "11s9js2cavqihmk4shskmk9hvdk4hq9gypy5b14r169ly64rhg00";
+      rev = "c1ddfa1a0e00316d1161ce11438ec980348b8cb9";
+      sha256 = "1m8npkahkr1zm7kx6ig8skxg03h7ds927g7gykbbi2iddi1k2n7l";
     };
     meta.homepage = "https://github.com/konfekt/fastfold/";
     meta.hydraPlatforms = [ ];
@@ -5323,12 +5323,12 @@ final: prev: {
 
   git-messenger-vim = buildVimPlugin {
     pname = "git-messenger.vim";
-    version = "2024-09-05";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "git-messenger.vim";
-      rev = "edc603d4cda7894a743e383e16c638e206d03148";
-      sha256 = "0b9wkjxlc2d91wrjhqkpph9mcix3ndpqy3bdr1xajxnjz9lsy22a";
+      rev = "fd124457378a295a5d1036af4954b35d6b807385";
+      sha256 = "0bwfwvkwgffw0c3c3awmsh5qfz8s5zmvajv2ry0a1sajik9jpzzl";
     };
     meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
     meta.hydraPlatforms = [ ];
@@ -5375,12 +5375,12 @@ final: prev: {
 
   gitignore-nvim = buildVimPlugin {
     pname = "gitignore.nvim";
-    version = "2025-03-23";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "wintermute-cell";
       repo = "gitignore.nvim";
-      rev = "47cefc0b6ea412e1e149552b10ebfe9f7f0b8952";
-      sha256 = "0z631qr6vdk4m2vq615qfq0l9c6gkwrpwd4icglhpcnss9vxa52i";
+      rev = "0344f643768c4d64af4add8c1bdddf6f7d4c9010";
+      sha256 = "1xm430incyprhmxxg1spn35kdmsg7svdl8z9z7gzpfddafhvw2zm";
     };
     meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5466,12 +5466,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-05-23";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "e1b763cab2cfd3c60207873dbc925c9be49913c0";
-      sha256 = "092d0qbsdqs8wj77k41an6an0javr6p6lds4klc6wwh0k1jhdhci";
+      rev = "a3455f48cff718a86275115523dcc735535a13aa";
+      sha256 = "1fw9bpn2x48rk6262p4zk520170lh6m7qgs81d5m4hd0nbasz1gg";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6248,12 +6248,12 @@ final: prev: {
 
   inc-rename-nvim = buildVimPlugin {
     pname = "inc-rename.nvim";
-    version = "2025-05-06";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "smjonas";
       repo = "inc-rename.nvim";
-      rev = "2eaff20526ff6101337b84f4b0d238c11f47d7f4";
-      sha256 = "09h885nl9kiyygfxly762r52bdz9isaz2aamjfj143vihfs70pnf";
+      rev = "a3e31af13844534c66041ce92f29af7745883875";
+      sha256 = "0a9zm9yqi8pvs89mks0aixv1kmgia76ighxd9yqxfm62p9j6npxl";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6261,12 +6261,12 @@ final: prev: {
 
   incline-nvim = buildVimPlugin {
     pname = "incline.nvim";
-    version = "2025-03-24";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "incline.nvim";
-      rev = "27040695b3bbfcd3257669037bd008d1a892831d";
-      sha256 = "1frm25a0fa13x6ihimi94p21pipxs93s3bbapjjhzmg4z08npj75";
+      rev = "0fd2d5a27504dba7fdc507a53275f22c081fe640";
+      sha256 = "19x35z2sj3hl3icrxzbs67xhxgq9d237vhgzqrz8ppdc74p8wgaz";
     };
     meta.homepage = "https://github.com/b0o/incline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6641,12 +6641,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-05-29";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "c61bf936b9bb4b0888de74735fc147bd0b525c64";
-      sha256 = "12lcjvg5bammrhwrkw2j5a2l8jcj8vxh0bys8brkylg6s3m2b0hq";
+      rev = "9815b97b8e7e9913495ce2a88afbd47bf31edf25";
+      sha256 = "1px6m7s1dk3k2fn282w8mvv622j458iz88jyhvjp10bcpspck5ib";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6758,12 +6758,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-05-25";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "aa462decb4aa2f0cb9783fba4ad8f401b042c3be";
-      sha256 = "1xarhds6jxmlgv3ngbwizdl404ylj2r394ffdknb5cjkz31ybii6";
+      rev = "1568d31c9d115d6cf36da9fc6bf047e00830f730";
+      sha256 = "1kp535fdvw9bzw78p4skqh9xrsnz7647w0j077b9gns7lkcwgyrj";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -6889,12 +6889,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-05-27";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "d3d2dcd8c85db8c0cff76608704374c316ac991c";
-      sha256 = "00gs7imirlswaxswfdxf143h9rk6r4j0imbknx5srwcjp168d93s";
+      rev = "a04cc6f296271fc99468b97ff1dcf12efebf3b5d";
+      sha256 = "0kvhlgxval4wp8lv3vjp6ad9f0h031qha3n5nczdi7g19l6x26jf";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6928,12 +6928,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-05-28";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "212429314c5bfa41f4154bfa8805f7227ba6a880";
-      sha256 = "0kb61kxy4pmfc7ca2h5qzdsfvnjwl2b173jw0gvmi9j7lc7cipnl";
+      rev = "9958013bd9c41e6f32af0202b9ea41055fe4667e";
+      sha256 = "1l4hpjwfa2d2vkfrymjsv1zn0clx6vxnr0xzlfdi2jg41ms1niwq";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7643,12 +7643,12 @@ final: prev: {
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-05-27";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "1edad11ca4a1fddf171c07a1a3d81e24cef08410";
-      sha256 = "04mz29dlrazqici70fkqbp0b1n7ig3zbj31466iv123jjx4cxv0q";
+      rev = "c3b270ac84391b9792dba122d47139c741217311";
+      sha256 = "1lskdf92s9vjd6jdmnh1dmpjyb93xww4axwlnz7md7155cajqlyd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -7657,12 +7657,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-05-28";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "67da97f8c2fd12d05427bb485ce07ee6418e0a51";
-      sha256 = "09wpha0g0z4qjnlbr5znmdrfv6iiflyk75ksb97v1d074aq779qa";
+      rev = "bef29b653ba71d442816bf56286c2a686210be04";
+      sha256 = "08nsyzzflaplvy626ai8qpcdl7hjh2q4zgiamh1w2xz9pvy2rm01";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7709,12 +7709,12 @@ final: prev: {
 
   mason-tool-installer-nvim = buildVimPlugin {
     pname = "mason-tool-installer.nvim";
-    version = "2025-05-13";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "WhoIsSethDaniel";
       repo = "mason-tool-installer.nvim";
-      rev = "75d60a8f928decd8b38897f80849768b7c540a5b";
-      sha256 = "1l0qgr99gsjrgab997n6l76252420hl0yy51dgkw092lpqkx1xki";
+      rev = "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903";
+      sha256 = "1nirz0i0x7aa8lnl2q6r2a36x7w33qinaf3gfprbaacdb3xspzhl";
     };
     meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7800,12 +7800,12 @@ final: prev: {
 
   melange-nvim = buildVimPlugin {
     pname = "melange-nvim";
-    version = "2025-01-16";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "savq";
       repo = "melange-nvim";
-      rev = "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae";
-      sha256 = "0lac9qisdkvnab8r4wb2qfnp8h006swwrl5cdx4xzw5wdrlhkkvb";
+      rev = "a51c6faa4fb09331382f87be99f71a8aa48dd422";
+      sha256 = "1342j1mlzw51prp9w9ink03mmsjbq0jdp7xk86qazaia3k8ynnd9";
     };
     meta.homepage = "https://github.com/savq/melange-nvim/";
     meta.hydraPlatforms = [ ];
@@ -7865,12 +7865,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "2025-05-29";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.ai";
-      rev = "4b5348fac5912f1957f4c012c2e0ab0c4b865386";
-      sha256 = "12hvn1dd4qcjj4ah56na9l6n55kz2x0k5krwswij2amws2a7g1wc";
+      rev = "5225f16eacf4dce2cb7204ca345123ef54e209d6";
+      sha256 = "0vqf5xywkqw84r96malik5jxib7ifr9vpk1f6ifj74d23ldqzs1c";
     };
     meta.homepage = "https://github.com/echasnovski/mini.ai/";
     meta.hydraPlatforms = [ ];
@@ -8125,12 +8125,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-04-12";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.hues";
-      rev = "f1fa8ad34788eada276f0b8a41d96a15622933de";
-      sha256 = "0yap91dqnr4jpwz1krmzay5p89pxb8v6m5457b6sm6f98956zgqq";
+      rev = "62f16a7b4704d051f69c39dbbe867dfdb4f0d3ed";
+      sha256 = "0hmflllpxmp39d1x1lx0j6w3mm2yin3mf0mjgfics2s6jdami3pj";
     };
     meta.homepage = "https://github.com/echasnovski/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -8190,12 +8190,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "2025-05-20";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.keymap";
-      rev = "2aa0a66d6cbf15c9cea331d976ac4d4b9f01621e";
-      sha256 = "18samb1yjvmw2yjl0l4csl484aqah71qr19zspx46z5dk3jib908";
+      rev = "da545fb70161aedb5331572ddcbffbdb8e31d8ce";
+      sha256 = "0s1x9c2rbz947g3wnbcf50hrs8d6wvqia2y4mi1nk0zafp3v1ijb";
     };
     meta.homepage = "https://github.com/echasnovski/mini.keymap/";
     meta.hydraPlatforms = [ ];
@@ -8255,12 +8255,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-05-29";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "25c8959b3fcf0461271a21dd204e6f3cd1cd7806";
-      sha256 = "1qqf539ikm6smiags4srlqg5b7g6l1pmd3ssm37d13xqfhfhq2gd";
+      rev = "c3d398d8bfbd18ae24cb22a17cde1aaad3764cd3";
+      sha256 = "1gc67yassyasxl9z6da75rhxgnbclcvlpgbx0z3v48l91ampmv7g";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8320,12 +8320,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "2025-04-18";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.snippets";
-      rev = "d005684e620e76eb2a5fbbbd211a1eba7212b4aa";
-      sha256 = "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x";
+      rev = "6f0de3c3f97a8c015f99619f72edf9b2880b6886";
+      sha256 = "0pbkwp5p0y3djf3xfvmnf6ys1w5287gyhas09s94ha2ghhsyzy2w";
     };
     meta.homepage = "https://github.com/echasnovski/mini.snippets/";
     meta.hydraPlatforms = [ ];
@@ -8372,12 +8372,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-05-27";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.surround";
-      rev = "f4307f935ad87cfe3e570dbaae485b35cce4e5ec";
-      sha256 = "0gmzcnvwlrbvg8swi54lhx5zjrcx60xmzvan8fis2llbf8dz04ig";
+      rev = "0d278217ca98ffa5b768701fb57f52a88b1e1f93";
+      sha256 = "0r93kgzd5xhykcwxzfjcmdmcd2dmj80hxqfd4r6ikbaxq6b6vnk0";
     };
     meta.homepage = "https://github.com/echasnovski/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -8892,12 +8892,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-05-23";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde";
-      sha256 = "0mh0wv4x2pi6khwbp3fvi40n6hd3sz5ak81w9vf2xn3hh2z0mmqc";
+      rev = "f3e8633f06007e015f855d3c1ec0cee23af14d8e";
+      sha256 = "04ddr8cl67xk7i459y49m3mfxc3ca8kbdzmiwwz3ksrfhxyzr0g1";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8918,12 +8918,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-05-30";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "5ebd6c29c88931fe7c603f087b4c32ac8157d901";
-      sha256 = "1byjy0bvb2q281zzk88a2lq1rkqzw9q4fr2if6lbcq5h89vdly6k";
+      rev = "27ad122b711ad1ab7fe1cd8d352ded0c454ec05e";
+      sha256 = "1n3fi1njgqg27g1aakizi2bqclk0f3hxqzym9ya1jh7dxaxagp3x";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8996,12 +8996,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-05-29";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "51eeadb9d3c1768ad1e247d1bde604c252b5768f";
-      sha256 = "09jv9nx8z0p7h65lap8m2k0h5yqnylcp7ynpk1aphip3kkkjgbq9";
+      rev = "89a2df9a882868ddfa2a757e3224f57971e38329";
+      sha256 = "0smcr2y4nrgdsp7nk2v06dhpchl2gsrn9ckzhzwq1smdh0nlgdkf";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9179,12 +9179,12 @@ final: prev: {
 
   neotest-dart = buildVimPlugin {
     pname = "neotest-dart";
-    version = "2025-02-26";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "sidlatau";
       repo = "neotest-dart";
-      rev = "ec1cecdfd44c82632f5fbdcad3dc77622fe4ee67";
-      sha256 = "1nxswiijd2fpz5ilvi5jf924p0krkhbjmgmn6kp9gjl0f6dp1al4";
+      rev = "5ee074c9593639b60ebc452102d951438c815aac";
+      sha256 = "1hkggr8mls7ilbr5vw9iqfgbf7nspspbisdzkp7mfvx5358jf1cw";
     };
     meta.homepage = "https://github.com/sidlatau/neotest-dart/";
     meta.hydraPlatforms = [ ];
@@ -9205,12 +9205,12 @@ final: prev: {
 
   neotest-dotnet = buildVimPlugin {
     pname = "neotest-dotnet";
-    version = "2025-05-13";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "neotest-dotnet";
-      rev = "b27e6ed8197b232909658322a823b901295b54ec";
-      sha256 = "13k2c2lqxcvylglnhzj4q8nra8134nisdkv55381i2rzrjnvsl4c";
+      rev = "962af8bcb73622b0f44f1e25a0441f5783fe5665";
+      sha256 = "001z2j0nr6qa9m5jr1l341pyw1h9105ywk7ns6bnl6y73sqa0rx0";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
     meta.hydraPlatforms = [ ];
@@ -9258,12 +9258,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-05-27";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "4b1b145c94b29e36e35704238350f583fae03646";
-      sha256 = "0xsfs6w2a3ljwv1glpscigml4slddz5059k8md4yih5lsywvf4xq";
+      rev = "863a9d8cef20b7392aac77eaa7d116faa8344aab";
+      sha256 = "04knx74iqwqm1w165jp0jnjf3nas8mdfsqp9yw5vz7krn6cgywql";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9298,12 +9298,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-05-26";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "04ced6ff82940047ca92b0b654271289982e0bd7";
-      sha256 = "14hl022zx3fxhk1d8887cgsfrql8pyl3cgdmp06hxp5bm064z228";
+      rev = "f2a3373ccc5e41ce53dd2f3fa76e8b0a82cf3613";
+      sha256 = "06jgrcrbjrpi4wfkschcrwyzapy4bcssfy03vnxw2lj6c5czjrwz";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9610,12 +9610,12 @@ final: prev: {
 
   nerdy-nvim = buildVimPlugin {
     pname = "nerdy.nvim";
-    version = "2025-03-09";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "2KAbhishek";
       repo = "nerdy.nvim";
-      rev = "14bdcd13265dfc80e6ca6cee0598c5880729e24f";
-      sha256 = "1xci5viwiyzxj644vxbh8n6y3irkjvqxfmxjiad25adr8qv4qx7x";
+      rev = "dcf0afa6cd5a325d6779cb75d8d703dc2188adbb";
+      sha256 = "0d82dk112dpnk1i4x2gg32nq8fpjc8irv5kj9xnh1m6s4aycg25v";
     };
     meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9779,12 +9779,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-05-29";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "878983844698427d19c4e479fb14a462f39624f7";
-      sha256 = "1iwdifqypfck8mmnby7ww6y9vi9cvdf2dj7d03n1amqqq0mpn0h9";
+      rev = "757e1580182f62162a22da6131645a7c51397a25";
+      sha256 = "10q2kck6mjnvsk0c3rcnakfqij3757wj67rmml0zgg0k43bar423";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9818,12 +9818,12 @@ final: prev: {
 
   no-neck-pain-nvim = buildVimPlugin {
     pname = "no-neck-pain.nvim";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
-      rev = "137c9c4992fc51f43047bed4ba8aaf021edcd858";
-      sha256 = "080kfnnwfy1jlqqjanhvwghh890ixjgvq915xpipvs1llnjfb1rg";
+      rev = "ecdfe60f23134089fac92659e688b65fdd8b5cc0";
+      sha256 = "0a5xmflib60k81gj6v11m1wymnzknyjxl5ydxpawyx61y36k3xhc";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9961,12 +9961,12 @@ final: prev: {
 
   nvchad = buildVimPlugin {
     pname = "nvchad";
-    version = "2025-05-07";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "d4e5b8a10f01c06e18d2a8bb66761a3596562a67";
-      sha256 = "1nhqp61msi1p472d885w4lrj6al3363iydyvdi02h3n0fb95ghx7";
+      rev = "478299d3455e22e375df468bba7cf9e2cadcc189";
+      sha256 = "179qbxbs01ra289lag7pq7bajs44xmsjhpdlfj4795w2zh5bdjca";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
     meta.hydraPlatforms = [ ];
@@ -9974,12 +9974,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2025-05-24";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "7c51760f8772a6695875ac29f8b3c398da7753f0";
-      sha256 = "05slbvdsq0iladmd88wb4a59vh5mbsjb9mhcyfwhx0xicnsfyb8s";
+      rev = "b7c656064ec54f77bc6c75e4c51108ba451e6d7a";
+      sha256 = "12zqah2zgsi3ic3blhkcyhg8ahpzywk20hjq0gxl7ijpqfqq73d6";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.hydraPlatforms = [ ];
@@ -10208,12 +10208,12 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-05-22";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "b0f983507e3702f073bfe1516846e58b56d4e42f";
-      sha256 = "17fcxlfkzh75q8sasjf21jbh18s78v9g80p5qrlgi0caqznj0hv7";
+      rev = "ea82027c3447dc1a022be9a9884de276c05cd33a";
+      sha256 = "0m91bqbprp6n00m7kk5wqrhl237a5q082m98xak6r7gvxg1c7ac7";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10312,12 +10312,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-05-27";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "186c9580895f8552a6e0eff8087e643a824dac2d";
-      sha256 = "0lp19h19ylmrgl8nsrp9ijk3z148lrf9k11cjj7r4hc03b95frk2";
+      rev = "7b305ecbbdeb5c6fb7463e68e42c44c19add60b9";
+      sha256 = "0788q2p5534l9qsxpd9ik6dwd99pfprr1j8cszvffl6mh1rjf9ss";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10481,12 +10481,12 @@ final: prev: {
 
   nvim-highlite = buildVimPlugin {
     pname = "nvim-highlite";
-    version = "2025-05-23";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "9ffcfde58d230ccd591811611c0dd204aa247728";
-      sha256 = "0ix8b2xgjcamcx3v9k9m6qzffwv990na80f0hwp3m3l34idhwh8c";
+      rev = "9097dfdab09c0610c5057a0161f68d9e9a187657";
+      sha256 = "0hf826dk6wvfmzs7d6xrnilkvqlrdnfrrr5h5b4jyvqy8k0zsckv";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
     meta.hydraPlatforms = [ ];
@@ -10676,12 +10676,12 @@ final: prev: {
 
   nvim-lilypond-suite = buildVimPlugin {
     pname = "nvim-lilypond-suite";
-    version = "2025-05-04";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "martineausimon";
       repo = "nvim-lilypond-suite";
-      rev = "9fca94011b3ea22826660a6ceae3ccc1f54d89ce";
-      sha256 = "1rab4akawxfl84qadif9v8q94bvpjl6qaczjsb1s3hvpxa33wnmh";
+      rev = "8227b50451d60aa370e67cc5f8bad8b14783551c";
+      sha256 = "068b7kygi0wb39hz1gqjl1spqf6lrlas61yw0khxb83j7kwcy655";
     };
     meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
     meta.hydraPlatforms = [ ];
@@ -10689,12 +10689,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-05-22";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "b47cbb249351873e3a571751c3fb66ed6369852f";
-      sha256 = "0cs6vs58p98fv6nmqsyik2kws6xnqbny79gl39mmyssm3z9mpps8";
+      rev = "cc26ae6a620298bb3f33b0e0681f99a10ae57781";
+      sha256 = "0jspqgw8zwz79jrlcqr15waaxzw68n5c10bvhm3hqw02dr0bbipq";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -10741,12 +10741,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-05-27";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "b8e7957bde4cbb3cb25a13a62548f7c273b026e9";
-      sha256 = "1lalfwgp5hw7dq5ixh5k0wa8r5a81xkbx0k7nwl0j17krwxvlm4w";
+      rev = "036885e8e5456d3907626b634693234f628afef6";
+      sha256 = "1zkjmr33srzdcjriwdlvq1dmpia7n0xgy3k5l3cdhrfn66k3mwl2";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -10806,12 +10806,12 @@ final: prev: {
 
   nvim-metals = buildVimPlugin {
     pname = "nvim-metals";
-    version = "2025-05-19";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "d1639b7fccd845875e33444c7860ad292ab8670d";
-      sha256 = "1f6cgzs3vwqdva06jdcmyy5rldjlxg8x5fbdyq61hbl3xw5qjvsq";
+      rev = "5ab889232ccb6e749094294e7979fda4a71fdecb";
+      sha256 = "10asl4vi6di8vzhhjsczf8c5l16lcj0ygj2fbylav44ydy4dlwxd";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
     meta.hydraPlatforms = [ ];
@@ -11040,12 +11040,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-05-22";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "f51c39e9d47fdd64ded74caec9d27d115dc0ea5f";
-      sha256 = "0simmkf59gb41w9chhq6apzr6k34jr9s68578mng5n3y7419gny3";
+      rev = "1738c92fe35f95a0f9814cd5984534c50f1b5103";
+      sha256 = "101lhrnqqywzx9c0n0ad60a7pwgpwrnw1jsy0wqkav1d3l3pqllr";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -11235,12 +11235,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2025-05-26";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "ebcaccda1c575fa19a8087445276e6671e2b9b37";
-      sha256 = "1x1yw3xjpn2g0qxsniyjq4pxkccycbz499mwp9m6h8xdyhbafsvg";
+      rev = "1c733e8c1957dc67f47580fe9c458a13b5612d5b";
+      sha256 = "1a92zsb1r48s6cjphvx406lbxyc1v9w3gk9kkp3ri0k1l134aaw8";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -11261,12 +11261,12 @@ final: prev: {
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "ed1cf48d5af252248c55f50b9427e8ce883a2c6b";
-      sha256 = "1y2z2z8h8nmrpcg2igrbmbzs96y9dmcgfajbljqci5fbihqh7vbz";
+      rev = "464a443b5a6657f39772b20baa95d02ffe97b268";
+      sha256 = "1q8ll6lkgqc2vhr9jz687a9rgzxrd0swy8cnsy2mb6c6626sxxhq";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.hydraPlatforms = [ ];
@@ -11534,12 +11534,12 @@ final: prev: {
 
   nvzone-menu = buildVimPlugin {
     pname = "nvzone-menu";
-    version = "2025-04-13";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "nvzone";
       repo = "menu";
-      rev = "8adb036ec34c679050913864cbc98cc64eb91f6c";
-      sha256 = "0yxs5fmj6swbbwnkwvji5hp553692mnaww87y1ag6xj14g5i96sl";
+      rev = "7a0a4a2896b715c066cfbe320bdc048091874cc6";
+      sha256 = "11jafag2wsap9vmzd19ndfrbyyd685gn9jh580lbpniprbld0rz0";
     };
     meta.homepage = "https://github.com/nvzone/menu/";
     meta.hydraPlatforms = [ ];
@@ -11625,12 +11625,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-05-27";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "53a424b7432d97f3ef0b5cf7a08972d7c9974f5a";
-      sha256 = "1dnmnhqvs7131h5g4037yh1m6zz9l5azg40qp6fmyg68pcr065sy";
+      rev = "ef7ece509e43cf757f027aa41436c0a40f4ed8bb";
+      sha256 = "0smi2g8c7cfaj72jrdsx4na42x8yw9hmyrxrc0jp4swml8cymzfg";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11703,12 +11703,12 @@ final: prev: {
 
   one-small-step-for-vimkind = buildVimPlugin {
     pname = "one-small-step-for-vimkind";
-    version = "2025-05-29";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "jbyuki";
       repo = "one-small-step-for-vimkind";
-      rev = "76642dc962bcfafe5dcc693d95a61c29845f6127";
-      sha256 = "02i9xxg36bwl9pzjvh8xwm04xq7b1m0npjnlq1qgr6f8b3ks2aia";
+      rev = "81415bd613479d6d6d55e99ac9057264fe6aadac";
+      sha256 = "1cr0slzggfbdhqapl2sw80hkqsayh08wigga1xkdcqvzikwjjal3";
     };
     meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
     meta.hydraPlatforms = [ ];
@@ -11755,12 +11755,12 @@ final: prev: {
 
   onedarkpro-nvim = buildVimPlugin {
     pname = "onedarkpro.nvim";
-    version = "2025-05-25";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "18c1722ade40d7b268cbd942939239b5f3e7acaf";
-      sha256 = "1z4j78kgd57xy30pf00nznbzibjf5qspr83yh4vn7sw6rg5dilcx";
+      rev = "5ffd45b3602bc1ed75f0b2be6c5c1f6ba5c6b796";
+      sha256 = "02zn53vda99mjb3ygy6jpjhlb0v4anbjndrn0g9awzi3dyv7gcsa";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11872,12 +11872,12 @@ final: prev: {
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2025-05-14";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "fa436071c67233e6cd466268212feaf4ff4ed406";
-      sha256 = "0i8bkgyh8zaszm15h8lznd9ik1fh0l0mdcwyam4mnn4q0nhjqznb";
+      rev = "1348aad77adac26fe3dff44aa220c5a7e96aa8ae";
+      sha256 = "0qdc2dy16jk9a081g1kfiiibxfmzwxvnl5d5m239mcfivzkwn8yq";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -11912,12 +11912,12 @@ final: prev: {
 
   oxocarbon-nvim = buildVimPlugin {
     pname = "oxocarbon.nvim";
-    version = "2024-08-28";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "nyoom-engineering";
       repo = "oxocarbon.nvim";
-      rev = "004777819ba294423b638a35a75c9f0c7be758ed";
-      sha256 = "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy";
+      rev = "acdfdd5d319c36170b5ad2a120283bec2f450081";
+      sha256 = "1byvqvrnf56y050r6dl4sykn22z11i8qxxai8j552a06l7jxyiw4";
     };
     meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12003,12 +12003,12 @@ final: prev: {
 
   papercolor-theme-slim = buildVimPlugin {
     pname = "papercolor-theme-slim";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "pappasam";
       repo = "papercolor-theme-slim";
-      rev = "d62413a30a8b17076a701d4083838bc237e05e35";
-      sha256 = "0bf34z03dqlb426na1f6bh0z0ni5vpmbwrfdzziqm9ybn9gzc4hm";
+      rev = "41338b61dd1ff8a12a711c7de355f1e48353c1d8";
+      sha256 = "1npa7kfgxraw11mlsb9r55s6cy9hx0dsqw0mdmds30kl0m1wdvxg";
     };
     meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/";
     meta.hydraPlatforms = [ ];
@@ -12029,12 +12029,12 @@ final: prev: {
 
   parrot-nvim = buildVimPlugin {
     pname = "parrot.nvim";
-    version = "2025-05-29";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "frankroeder";
       repo = "parrot.nvim";
-      rev = "a884f12ca143ee223abccc645ea4edb871b82cf8";
-      sha256 = "03ik4gyr8z6pm47r2xqvvgn1nlpm59bw50q7lis7sbzr6qkgm71k";
+      rev = "378d7706a392c06eabe0ddbbdc6ed5fa57ca4db0";
+      sha256 = "1q9fg57vp7gvxlvzbml5j9vvzsivby384h0y5bxg32nvggj4amhy";
     };
     meta.homepage = "https://github.com/frankroeder/parrot.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12420,12 +12420,12 @@ final: prev: {
 
   pum-vim = buildVimPlugin {
     pname = "pum.vim";
-    version = "2025-05-03";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "4728300b8c6e0887256362648a0e2a3acf2ea22e";
-      sha256 = "1l467rwv42bw6lb7jzfqw83gnwgx5aabm43w1944ddmck7mz6ic3";
+      rev = "697bbb620803482c13b8faf36742dfcea4eedb09";
+      sha256 = "02wnq3jhkcvcckvj119hkmbmr5v5phyrncz1fk6nppd1w5xyggnf";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
     meta.hydraPlatforms = [ ];
@@ -12499,12 +12499,12 @@ final: prev: {
 
   qmk-nvim = buildVimPlugin {
     pname = "qmk.nvim";
-    version = "2024-09-14";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "codethread";
       repo = "qmk.nvim";
-      rev = "ad51cb15e607da0983fcf9882d38a2aafac32149";
-      sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq";
+      rev = "348ab2cd4f319f7c9881ca8b1bc0241e9b4d6619";
+      sha256 = "11vnmhaslgphy07bngfcxi1jiyprdm1lm6n2vi5y9qi7ky8y8hrz";
     };
     meta.homepage = "https://github.com/codethread/qmk.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12707,12 +12707,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "2025-05-21";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "64dbe67bf7c28c864488262d267c799f80cae9ba";
-      sha256 = "07p55lf8d0y6lb11jg44w2p5p6x91xarns51ric5j58w2ynkwdcw";
+      rev = "9cd0186ffe76fe6abc64c0aafb775c8f776ab5ee";
+      sha256 = "0zfgndnidqxkypywdghscygrzbmxh2pm0hzz1k56hz5lvd33ww61";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12759,12 +12759,12 @@ final: prev: {
 
   remote-sshfs-nvim = buildVimPlugin {
     pname = "remote-sshfs.nvim";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "nosduco";
       repo = "remote-sshfs.nvim";
-      rev = "1307b3645af5ce60b9e42f06d27eb5a1fab18fc7";
-      sha256 = "0qqf71j3c4686wwq8v0jh8gskbakinkx878p5yifkjld4j77qg3c";
+      rev = "6e893c32ff7c5b8d0d501b748c525fa53963fb35";
+      sha256 = "0q4bhq153k3smq4nhiqf9zyni4yyx96swc6radj7j53vwhadafbr";
     };
     meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12785,12 +12785,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-05-29";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "048d68028d09ad2e134e7059032b8192a85180b9";
-      sha256 = "1bz8y9pdw3fivnb99jm0ciz4wsbpfsiz1xvl81cprjcvcddhhkpw";
+      rev = "6f5a4c36d9383b2a916facaa63dcd573afa11ee8";
+      sha256 = "15q8169wxslr6kmzqagvsj20j745cym72a2yjmdavh61mgs56rxh";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12824,12 +12824,12 @@ final: prev: {
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2025-03-24";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "fd08e476c4e2f826905c384a3a301a821758764b";
-      sha256 = "0l6hzzz1n3mlhab97hdy1zy5z3i22v9fk3an5a3wrgjn8sgsm25i";
+      rev = "84c81e5fd8a94dc85a60b97089536174e558e288";
+      sha256 = "1jhv172izp772fn07lf4a80kcd7sj2j5cq763h0xaafb4h03kjax";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
@@ -12916,12 +12916,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-05-26";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "65769488fca061e5663c575c73da277ec1e5abc2";
-      sha256 = "0sy0f8ygxnrmb7c2w8m9y2fqwcn9bbfxa3nmm3vk3i4in8mjfzn2";
+      rev = "21c8ff60d6e36b3938c88d81cc98096e2156d77f";
+      sha256 = "00lm72l8zqav2cjv8m0vgrn5s359rbqi6a2p23hr6zbhwx8wbzj4";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13268,12 +13268,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-05-23";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "5ef94ca23b28148187846fc46f10184aad4d17b0";
-      sha256 = "04y30g6xfwzfw9qj7z5kh1yifz4cc2q7krnyzc08siwwvnsfdlkz";
+      rev = "e80bf81015a342b78e3e9ef0395a09ca91f666de";
+      sha256 = "12nd3cra6dw5nyqgcp9cvsrdxrf4m575ngi3f03180cpnsw6vhmx";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13541,12 +13541,12 @@ final: prev: {
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2025-04-12";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "6af1cdcae4b46a90dbcd59ce0ca3543f34c7732c";
-      sha256 = "026pnf7pvz1qz3f4cqwm086nv2f9apgc8qiyvysygfq8vsr6azpj";
+      rev = "451c70158aaccf806d29be69a0d4482734a4f9ee";
+      sha256 = "17c6vkiqyx8dcb93nvplvw5y16xmy04cmdrapj4vpm357n8a2qq7";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -13685,12 +13685,12 @@ final: prev: {
 
   statuscol-nvim = buildVimPlugin {
     pname = "statuscol.nvim";
-    version = "2025-04-20";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "luukvbaal";
       repo = "statuscol.nvim";
-      rev = "a2580e009a3b4c51b5978768d907dafae2c919ac";
-      sha256 = "0k3wj5mzv38wrmq17pd9xpdcc8p3l1bwx078931ylrga5j1ld3vx";
+      rev = "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc";
+      sha256 = "02aajcwrbhjxkd4hykjcwj8anv3vq09ma04sj1n49ysmkr210lcw";
     };
     meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14012,12 +14012,12 @@ final: prev: {
 
   tagbar = buildVimPlugin {
     pname = "tagbar";
-    version = "2024-12-27";
+    version = "2025-06-03";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "8de7694c0aeda253073098bbc9fb890b2902ddb8";
-      sha256 = "1s3x0p0j7fx4xzalfq4fjnmf5vdhh398pfd08j8j5qc1f0p09fmq";
+      rev = "b72250e9d77b7a5cf9be067875dc5270652b005e";
+      sha256 = "19p2j36bzjma3rgxxms1ckw4ir6sngiz3df8gkmjnxszdwaw5fva";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
     meta.hydraPlatforms = [ ];
@@ -14704,12 +14704,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "2025-05-26";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "2c76bae44d0e2c4e8fbb3f6b0ba944e898c38579";
-      sha256 = "1v19sh05i8jw4a13n205jqni4mz6xsl79q1lxr92nzwzka1dry6l";
+      rev = "658b34995a253d0ee4764103a0e17440b6cfb45a";
+      sha256 = "1b0gsw1nld6r886npp0s64si7x3dpvmjr7vmr4a3jwi1jday15cg";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.hydraPlatforms = [ ];
@@ -14730,12 +14730,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-05-12";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "b6ed8038dfd256eb963a2c79cb30f0f4683551a0";
-      sha256 = "0na7v97iqsc9416v6qhdnazzmzkx283hxvgihl16lj91cs4z7yh9";
+      rev = "cac10593c4baaacd0f2a1f4d8ba9508667bf3f79";
+      sha256 = "1s60j36rv08mg33dk8a8hip9r9f4mplv81d6rbhfy38l3kz518yp";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14887,12 +14887,12 @@ final: prev: {
 
   transparent-nvim = buildVimPlugin {
     pname = "transparent.nvim";
-    version = "2024-08-25";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "xiyaowong";
       repo = "transparent.nvim";
-      rev = "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21";
-      sha256 = "14d9jy9lzybr49i287n9ijcphrppb3l0kgixdpd5r7daqn0qncza";
+      rev = "d41ae9b56ac2706cb3db4b16afe5cd6903013937";
+      sha256 = "1sdn8zc9jwn0fvz9qsl79fx9hr3lqb4bw9v30znm267lf20b035s";
     };
     meta.homepage = "https://github.com/xiyaowong/transparent.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14913,12 +14913,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-05-27";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "86ae3cf9896b43f3cfa35b962428f32fed8b5ee8";
-      sha256 = "1d6v2pb1lxzbf084zggz99j8w3yd2wiskbhylks6slzn965vkhjb";
+      rev = "fe814c2181dc3004d97073a613c20554cc1a7d7b";
+      sha256 = "05dkiilkqzl488k1ifwk5xj48zfy14pzny062llm2jyc7pxcrwlk";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15174,12 +15174,12 @@ final: prev: {
 
   ultisnips = buildVimPlugin {
     pname = "ultisnips";
-    version = "2025-03-09";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "dbc458e110bb49299da76ec53f8b09b4f6dce28a";
-      sha256 = "1yqnbqq0zxfq8zlaibq0k4n525a5cjp68gab2jhcf76jyczi53wb";
+      rev = "b22a86f9dcc5257624bff3c72d8b902eac468aad";
+      sha256 = "195pkgzjv24qw1y92phjmvird00filrzl5i28mm139sdshzqnx14";
     };
     meta.homepage = "https://github.com/SirVer/ultisnips/";
     meta.hydraPlatforms = [ ];
@@ -15239,12 +15239,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-05-28";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "7f153635463cb45f8ebe62fbec17e8d18aadb813";
-      sha256 = "0dhdmjib6vwry8axaim0dd61dv8jbysdsma7bk44cnp6wpv9pm9k";
+      rev = "3766e89f85cb838a89d14e36f5ca836ce022e8b1";
+      sha256 = "1sxcypq5fgmjif30vqgdgql6mbvbdm9ckidri6mp6p8rhqy9ssm4";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -15369,12 +15369,12 @@ final: prev: {
 
   vifm-vim = buildVimPlugin {
     pname = "vifm.vim";
-    version = "2025-04-26";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "vifm";
       repo = "vifm.vim";
-      rev = "c9fe6475abcf58ec03b4950c063adb7578cb308c";
-      sha256 = "115qdv45ifscd8clsi03pk9m29dzxzxnm0wzczg2qy4lkc8525ws";
+      rev = "169373867147a45db6b5ce5855addbcc1a4d6893";
+      sha256 = "09wfp8zm7s3mcsi2j0wps1lwhrlivq5jzjhnl5fiimz441d4k3hn";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
     meta.hydraPlatforms = [ ];
@@ -15798,12 +15798,12 @@ final: prev: {
 
   vim-airline-themes = buildVimPlugin {
     pname = "vim-airline-themes";
-    version = "2025-01-02";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "cda3b5ea087f7e301a3d4e61727108f66ba6dd20";
-      sha256 = "1w792m7j8sk1qh3z336nz2d81pa1pnp7iqmlpigdzwm66yig67q4";
+      rev = "0e976956eb674db8a6f72fae4dda6d1277433660";
+      sha256 = "04md0ig673l4lidcskaikkc246j04vrz63ns002wp5dpsvchcczk";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
     meta.hydraPlatforms = [ ];
@@ -15824,12 +15824,12 @@ final: prev: {
 
   vim-android = buildVimPlugin {
     pname = "vim-android";
-    version = "2024-09-05";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "hsanson";
       repo = "vim-android";
-      rev = "62192c9079b942aa3c9f6d34a1bc312bf54d0301";
-      sha256 = "0d1miihh7f7kghp88a8q38b19hfhlnwg821rd6yc2w7yvkzfh7bx";
+      rev = "1445cd5359f0c8597ac34428a8d273427d4ab0fe";
+      sha256 = "0vqahgvfsmrmad2fjar1p5jmvlpxrflszlx624klqm3q0xx7l7in";
     };
     meta.homepage = "https://github.com/hsanson/vim-android/";
     meta.hydraPlatforms = [ ];
@@ -16604,12 +16604,12 @@ final: prev: {
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2025-04-14";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "460432301a5cb280ea265ddfa15c9f3dcd1d26b7";
-      sha256 = "0adpm2sv0lwcfgn90lka3wj8slzbx0bl3lp201syrc8w6w7jgljr";
+      rev = "2900a1617b3df1a48683d872eadbe1101146a49a";
+      sha256 = "070x8c82a29ik68qy71j6dbznakc5vzr2b3kyicaiindbqavcbgv";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.hydraPlatforms = [ ];
@@ -17423,12 +17423,12 @@ final: prev: {
 
   vim-go = buildVimPlugin {
     pname = "vim-go";
-    version = "2025-05-26";
+    version = "2025-05-31";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "68d769bfcdf0ba57af793c6b177a4a9b9b02bdf1";
-      sha256 = "0mpgq856j4mzga809s90lhlbhgywdi1hsz0zssjbd9wzjdypf9r2";
+      rev = "787342da47bc5fe6fa88e9d65842c6a0a6304700";
+      sha256 = "0r0f7kfp47lna4xc5jsk159080qac2j6shs7pymrdlaxfn0gyn0d";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
     meta.hydraPlatforms = [ ];
@@ -17488,12 +17488,12 @@ final: prev: {
 
   vim-gruvbox8 = buildVimPlugin {
     pname = "vim-gruvbox8";
-    version = "2025-05-29";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-gruvbox8";
-      rev = "24c410a45189564fbd96f6ada022df2ad8e6d0d0";
-      sha256 = "1v1zjb7bf78ri0d8b7py25p75dv3i1d3cyb11vxlw2gwh0n5waz8";
+      rev = "9ac7db13bfe3cffb836f844e567efad71174238a";
+      sha256 = "15mdy3r94i33m1y941943qa96xrmkxirq61ck4d2b9ms0xfc7iqn";
     };
     meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
     meta.hydraPlatforms = [ ];
@@ -18543,12 +18543,12 @@ final: prev: {
 
   vim-matchup = buildVimPlugin {
     pname = "vim-matchup";
-    version = "2025-05-16";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "56c714495ec7f40cf2c7e92fb124067c7951e650";
-      sha256 = "011kb5fi3mahpv9n5iwgbmc6h9drsry57wr31x95g0yqr3s97viy";
+      rev = "c478d4a72bbf397eff42743198f1939f6a264736";
+      sha256 = "0v6dqj30h6pqhx07lk65r8mi30yjphya9wn2wz5hfky1rl1wrwrq";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
     meta.hydraPlatforms = [ ];
@@ -19999,12 +19999,12 @@ final: prev: {
 
   vim-solarized8 = buildVimPlugin {
     pname = "vim-solarized8";
-    version = "2025-05-29";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-solarized8";
-      rev = "7693d4aaa77edcfbdd7f6cb0109fdd2a5eb663c9";
-      sha256 = "1gl4qlirrgzlrckmvrx173dn1nxba5bzhp8jmx46ym9fx6v0y9dx";
+      rev = "2f31fc2239c965d7dd9754ba8160582c99211e12";
+      sha256 = "0s02xs7asba82ibzj03s68869jc767r5aihcji00gr5f7gkmsha3";
     };
     meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
     meta.hydraPlatforms = [ ];
@@ -20051,12 +20051,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-05-15";
+    version = "2025-06-05";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "2c65832b77195fa78424138553ebc13dba5f2574";
-      sha256 = "065r3yq2zl86nn19191hn5ivy63ddndxy51qbkafi3hmifzisav7";
+      rev = "5e5dbebfae3b239bf5b5fdae1ba748940468830e";
+      sha256 = "0hicyp3q6hhpsk6v944v3if6v47a8xsg2czz4qka8rlggc039v9w";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20194,12 +20194,12 @@ final: prev: {
 
   vim-svelte = buildVimPlugin {
     pname = "vim-svelte";
-    version = "2022-10-27";
+    version = "2025-05-30";
     src = fetchFromGitHub {
       owner = "evanleck";
       repo = "vim-svelte";
-      rev = "0e93ec53c3667753237282926fec626785622c1c";
-      sha256 = "1vv10bx2q463bjg7gvjy5lfxn0177s2r8i8xlwy2kg4620n0g5xi";
+      rev = "f6df955ad86583e9751487eb7550fae9e53d2d6b";
+      sha256 = "1ksihgv8hbmhckxwrbrbq8nq1m6rihygczfxm1cljhmwx38qmp6i";
     };
     meta.homepage = "https://github.com/evanleck/vim-svelte/";
     meta.hydraPlatforms = [ ];
@@ -20325,12 +20325,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2025-04-02";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "b0c3e13249699a522c8b472ff79eff40d2935476";
-      sha256 = "0qcqg8cklj1lkl7mx0nk49jgdk2vy6l5mlk7ajs7s35bkbk8kmv1";
+      rev = "202d4cd6ace8399014d5c0e81385cb65da398642";
+      sha256 = "0rscbqx2yf4xav8fq3r2dz70k87vsn7lkzkg1yf9q8dkfarvwyyi";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -20481,12 +20481,12 @@ final: prev: {
 
   vim-tmux-navigator = buildVimPlugin {
     pname = "vim-tmux-navigator";
-    version = "2025-05-28";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "a74836d404c295e799a6ba59794e37fe257509ec";
-      sha256 = "14hdk3qba4zdbzvamgsj7zfkv2l3rpq8sllib619bsxz815x50d1";
+      rev = "97e58f2b3b4f8fd30ce149302f10202f363cc361";
+      sha256 = "0xg9gdybrpm02m3jff393bdhdaynisanidc6zr6hv8lc66vcl6j3";
     };
     meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
     meta.hydraPlatforms = [ ];
@@ -20936,12 +20936,12 @@ final: prev: {
 
   vim-zettel = buildVimPlugin {
     pname = "vim-zettel";
-    version = "2025-05-29";
+    version = "2025-06-04";
     src = fetchFromGitHub {
       owner = "michal-h21";
       repo = "vim-zettel";
-      rev = "55db0f204f4cc9e3008f55979e6829222c56e19d";
-      sha256 = "10nd7n7g7fpdv3pv6sbk3zwfdhq3zxiiq4gp2xpq53xaji2xm7ks";
+      rev = "ba9268e4b99510b5aef3d839fbf4326540b99bf4";
+      sha256 = "1ddiz8v03fbmw8qrhvp3bxwp08lvwrbacw15dhcqdihjkwx4jx5m";
     };
     meta.homepage = "https://github.com/michal-h21/vim-zettel/";
     meta.hydraPlatforms = [ ];
@@ -21145,12 +21145,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-05-17";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "08760834ce04903deb6f8760e61c11cf6f6b2f89";
-      sha256 = "1shgfcq7lzcq8y069b7sn9x1syjc7afadfnjiq4kq5sn0i0xvlxs";
+      rev = "f20b11458e97250d690ce0dc8670759b838cace9";
+      sha256 = "1ihq3l1wx7pbm6qw1gky8r51f2z08c723gvc19j1mklcg4gxgw7z";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -21249,12 +21249,12 @@ final: prev: {
 
   visual-whitespace-nvim = buildVimPlugin {
     pname = "visual-whitespace.nvim";
-    version = "2025-05-21";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "mcauley-penney";
       repo = "visual-whitespace.nvim";
-      rev = "97445894de3f7d56193876e56356e13f73940149";
-      sha256 = "0mc0gm8mc6cvilm3l2hfkfa3dbd2aw4hdirzb041fyy1mi4gq4l1";
+      rev = "11b654e7e053e52e375297f472c8824a74b1b965";
+      sha256 = "0ivs92hr1gbz6hap9vm31gxypdjrqffv4si4hh9nxvaw2hcnmasv";
     };
     meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21392,12 +21392,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2025-03-07";
+    version = "2025-06-02";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "bb404d4c67ecb4af768d9fe15f235709722ff78d";
-      sha256 = "0llykkcbg7cdi62g002a8fnbldx0z34fkxwsnrs7a8znbrxf1ya6";
+      rev = "52e1abfaa87a61f624ec59ee51ed1fe9ea43986d";
+      sha256 = "1ld5ffhi708jaw61x200maym9gqh5h9b1b7rxhnr69x862n1qzr0";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.hydraPlatforms = [ ];
@@ -21666,12 +21666,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-05-28";
+    version = "2025-06-01";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "59c22d1a8bcb3d00a7115ef7f2d59b90cf989ab3";
-      sha256 = "09a6sbs9ipkwncmgwalnvm29myp639m4z8rybdsd5i8s5019fshv";
+      rev = "e2ddbaa88ec61d0b96e3d53ba851b0e7a0b36f14";
+      sha256 = "1d3lk4q5ivysvjmy8pq2l39cd2sabwkh9y0iizcydaa2vdax8cyy";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 4164a6c0f229..0731d9a2518f 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -621,14 +621,18 @@ in
   };
 
   codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
+    checkInputs = with self; [
+      # Optional completion
+      blink-cmp
+      nvim-cmp
+      # Optional pickers
+      fzf-lua
+      mini-nvim
+      snacks-nvim
+      telescope-nvim
+    ];
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
-      # Optional provider dependencies
-      "codecompanion.providers.actions.mini_pick"
-      "codecompanion.providers.actions.snacks"
-      "codecompanion.providers.actions.telescope"
-      "codecompanion.providers.actions.fzf_lua"
-      "codecompanion.providers.diff.mini_diff"
       # Requires setup call
       "codecompanion.actions.static"
       "codecompanion.actions.init"

From 7e42236d87e5f90ebf1f15863b8ab9998729077d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 04:33:56 +0000
Subject: [PATCH 1311/1497] goeland: 0.18.3 -> 0.20.1

---
 pkgs/by-name/go/goeland/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index b9bf7fc535c6..a10a406755ff 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "goeland";
-  version = "0.18.3";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${version}";
-    sha256 = "sha256-4xhw6L6CuwW2MepwGvpVLVafMcU/g0bn/2M/8ZSRF/U=";
+    sha256 = "sha256-5MKkjUOAXz6R7PdChuJA4ybc07gHdO9BF68CpI7OExA=";
   };
 
-  vendorHash = "sha256-TZIHYFE4kJu5EOQ9oT8S0Tp/r38d5RhoLdmIrus8Ibc=";
+  vendorHash = "sha256-Jnui1toAV4VvPs6T7UqgAUarFjuik/OnLUrF5VqI+EU=";
 
   ldflags = [
     "-s"

From 33ef317f230f36ff0caeef166b1b6953a5f2070f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Jun 2025 23:32:54 -0500
Subject: [PATCH 1312/1497] vimPlugins: nvimSkipModules -> checkInputs

Migrate some of the skips to actually check the modules with check
inputs.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/overrides.nix         | 179 +++++++++---------
 1 file changed, 94 insertions(+), 85 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 0731d9a2518f..636a43b767d7 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -172,9 +172,9 @@ in
 
   aerial-nvim = super.aerial-nvim.overrideAttrs {
     # optional dependencies
-    nvimSkipModules = [
-      "lualine.components.aerial"
-      "telescope._extensions.aerial"
+    checkInputs = with self; [
+      lualine-nvim
+      telescope-nvim
     ];
   };
 
@@ -212,11 +212,8 @@ in
   };
 
   asyncrun-vim = super.asyncrun-vim.overrideAttrs {
-    nvimSkipModules = [
-      # vim plugin with optional toggleterm integration
-      "asyncrun.toggleterm"
-      "asyncrun.toggleterm2"
-    ];
+    # Optional toggleterm integration
+    checkInputs = [ self.toggleterm-nvim ];
   };
 
   autosave-nvim = super.autosave-nvim.overrideAttrs {
@@ -224,12 +221,8 @@ in
   };
 
   auto-session = super.auto-session.overrideAttrs {
-    # optional telescope dependency
-    nvimSkipModules = [
-      "auto-session.session-lens.actions"
-      "auto-session.session-lens.init"
-      "telescope._extensions.session-lens"
-    ];
+    # Optional integration
+    checkInputs = [ self.telescope-nvim ];
   };
 
   aw-watcher-vim = super.aw-watcher-vim.overrideAttrs {
@@ -241,6 +234,11 @@ in
   };
 
   bamboo-nvim = super.bamboo-nvim.overrideAttrs {
+    # Optional integration
+    checkInputs = with self; [
+      barbecue-nvim
+      lualine-nvim
+    ];
     nvimSkipModules = [
       # Requires config table
       "bamboo.colors"
@@ -249,14 +247,17 @@ in
       "bamboo-light"
       "bamboo-vulgaris"
       "bamboo-multiplex"
-      # Optional modules
-      "lualine.themes.bamboo"
       "barbecue.theme.bamboo"
     ];
   };
 
   barbar-nvim = super.barbar-nvim.overrideAttrs {
-    # nvim-web-devicons dependency
+    # Optional integrations
+    checkInputs = with self; [
+      bufferline-nvim
+      nvim-web-devicons
+    ];
+    # E5108: Error executing lua ...implugin-barbar.nvim-2025-04-28/lua/bufferline/utils.lua:10: module 'barbar.utils.hl' not found:
     nvimSkipModules = [ "bufferline.utils" ];
   };
 
@@ -1310,9 +1311,12 @@ in
   };
 
   go-nvim = super.go-nvim.overrideAttrs {
+    checkInputs = with self; [
+      luasnip
+      null-ls-nvim
+      nvim-treesitter
+    ];
     nvimSkipModules = [
-      # Null-ls
-      "go.null_ls"
       # _GO_NVIM_CFG
       "go.inlay"
       "go.project"
@@ -1320,16 +1324,9 @@ in
       "go.tags"
       "go.gotests"
       "go.format"
-      # nvim-treesitter
-      "go.gotest"
-      "go.ginkgo"
       "go.ts.go"
-      "go.ts.utils"
       "go.ts.nodes"
-      "go.fixplurals"
-      # Luasnip
       "go.snips"
-      "snips.all"
       "snips.go"
     ];
   };
@@ -1394,11 +1391,9 @@ in
   };
 
   haskell-tools-nvim = neovimUtils.buildNeovimPlugin {
+    # Optional integrations
+    checkInputs = [ self.telescope-nvim ];
     luaAttr = luaPackages.haskell-tools-nvim;
-    nvimSkipModules = [
-      # Optional telescope integration
-      "haskell-tools.hoogle.helpers"
-    ];
   };
 
   helpview-nvim = super.helpview-nvim.overrideAttrs {
@@ -1411,10 +1406,10 @@ in
 
   himalaya-vim = super.himalaya-vim.overrideAttrs {
     buildInputs = [ himalaya ];
-    # vim plugin with optional telescope lua module
-    nvimSkipModules = [
-      "himalaya.folder.pickers.fzflua"
-      "himalaya.folder.pickers.telescope"
+    # Optional integrations
+    checkInputs = with self; [
+      fzf-lua
+      telescope-nvim
     ];
   };
 
@@ -1831,8 +1826,8 @@ in
   };
 
   material-vim = super.material-vim.overrideAttrs {
-    # vim plugin with optional lualine module
-    nvimSkipModules = "material.lualine";
+    # Optional integration
+    checkInputs = [ self.lualine-nvim ];
   };
 
   meson = buildVimPlugin {
@@ -1907,11 +1902,11 @@ in
   };
 
   molten-nvim = super.molten-nvim.overrideAttrs {
-    nvimSkipModules = [
-      # Optional image providers
-      "load_image_nvim"
-      "load_wezterm_nvim"
-      "load_snacks_nvim"
+    # Optional image providers
+    checkInputs = with self; [
+      image-nvim
+      snacks-nvim
+      wezterm-nvim
     ];
   };
 
@@ -1961,9 +1956,11 @@ in
   };
 
   neogit = super.neogit.overrideAttrs {
+    # Optional diffview integration
+    checkInputs = [ self.diffview-nvim ];
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
-      # Optional diffview integration
+      # E5108: Error executing lua ...vim-2024-06-13/lua/diffview/api/views/diff/diff_view.lua:13: attempt to index global 'DiffviewGlobal' (a nil value)
       "neogit.integrations.diffview"
       "neogit.popups.diff.actions"
       "neogit.popups.diff.init"
@@ -2227,11 +2224,12 @@ in
   };
 
   netman-nvim = super.netman-nvim.overrideAttrs {
-    nvimSkipModules = [
-      # Optional neo-tree integration
-      "netman.ui.neo-tree.init"
-      "netman.ui.neo-tree.commands"
-      "netman.ui.neo-tree.components"
+    # Optional neo-tree integration
+    checkInputs = with self; [
+      neo-tree-nvim
+      # FIXME: propagate `neo-tree` dependencies
+      nui-nvim
+      plenary-nvim
     ];
   };
 
@@ -2317,9 +2315,12 @@ in
   };
 
   nvim-autopairs = super.nvim-autopairs.overrideAttrs {
+    # Optional completion dependency
+    checkInputs = with self; [
+      nvim-cmp
+    ];
     nvimSkipModules = [
-      # Optional completion dependencies
-      "nvim-autopairs.completion.cmp"
+      # compe not packaged anymore
       "nvim-autopairs.completion.compe"
     ];
   };
@@ -2496,10 +2497,10 @@ in
   };
 
   nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
-    nvimSkipModules = [
-      # Optional dependencies
-      "neoclip.fzf"
-      "neoclip.telescope"
+    # Optional dependencies
+    checkInputs = with self; [
+      fzf-lua
+      telescope-nvim
     ];
   };
 
@@ -2510,7 +2511,9 @@ in
 
   nvim-notify = super.nvim-notify.overrideAttrs {
     # Optional fzf integration
-    nvimSkipModules = "notify.integrations.fzf";
+    checkInputs = [
+      self.fzf-lua
+    ];
   };
 
   nvim-nu = super.nvim-nu.overrideAttrs {
@@ -2536,13 +2539,17 @@ in
   };
 
   nvim-snippets = super.nvim-snippets.overrideAttrs {
-    # Optional cmp integration
-    nvimSkipModules = "snippets.utils.cmp";
+    checkInputs = [
+      # Optional cmp integration
+      self.nvim-cmp
+    ];
   };
 
   nvim-surround = super.nvim-surround.overrideAttrs {
-    # Optional treesitter integration
-    nvimSkipModules = "nvim-surround.queries";
+    checkInputs = [
+      # Optional treesitter integration
+      self.nvim-treesitter
+    ];
   };
 
   nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
@@ -2554,6 +2561,8 @@ in
   };
 
   nvim-test = super.nvim-test.overrideAttrs {
+    # Optional toggleterm integration
+    checkInputs = [ self.toggleterm-nvim ];
     dependencies = with self; [
       nvim-treesitter
       nvim-treesitter-parsers.c_sharp
@@ -2567,8 +2576,6 @@ in
       nvim-treesitter-parsers.zig
     ];
     nvimSkipModules = [
-      # Optional toggleterm integration
-      "nvim-test.terms.toggleterm"
       # Broken runners
       "nvim-test.runners.zig"
       "nvim-test.runners.hspec"
@@ -2771,9 +2778,11 @@ in
   };
 
   overseer-nvim = super.overseer-nvim.overrideAttrs {
-    checkInputs = [
+    checkInputs = with self; [
       # Optional integration
-      self.neotest
+      neotest
+      toggleterm-nvim
+      nvim-dap
     ];
     checkPhase = ''
       runHook preCheck
@@ -2786,11 +2795,6 @@ in
 
       runHook postCheck
     '';
-    nvimSkipModules = [
-      # Optional integrations
-      "overseer.strategy.toggleterm"
-      "overseer.dap"
-    ];
   };
 
   package-info-nvim = super.package-info-nvim.overrideAttrs {
@@ -3040,6 +3044,8 @@ in
   };
 
   snacks-nvim = super.snacks-nvim.overrideAttrs {
+    # Optional trouble integration
+    checkInputs = [ self.trouble-nvim ];
     nvimSkipModules = [
       # Requires setup call first
       # attempt to index global 'Snacks' (a nil value)
@@ -3064,8 +3070,6 @@ in
       "snacks.win"
       "snacks.words"
       "snacks.zen"
-      # Optional trouble integration
-      "trouble.sources.profiler"
       # TODO: Plugin requires libsqlite available, create a test for it
       "snacks.picker.util.db"
     ];
@@ -3431,6 +3435,7 @@ in
   };
 
   tokyonight-nvim = super.tokyonight-nvim.overrideAttrs {
+    checkInputs = [ self.fzf-lua ];
     nvimSkipModules = [
       # Meta file
       "tokyonight.docs"
@@ -3482,11 +3487,13 @@ in
     };
 
   typescript-nvim = super.typescript-nvim.overrideAttrs {
+    checkInputs = [
+      # Optional null-ls integration
+      self.none-ls-nvim
+    ];
     dependencies = with self; [
       nvim-lspconfig
     ];
-    # Optional null-ls integration
-    nvimSkipModules = [ "typescript.extensions.null-ls.code-actions.init" ];
   };
 
   typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
@@ -3811,7 +3818,7 @@ in
 
   vim-illuminate = super.vim-illuminate.overrideAttrs {
     # Optional treesitter integration
-    nvimSkipModules = "illuminate.providers.treesitter";
+    checkInputs = [ self.nvim-treesitter ];
   };
 
   vim-isort = super.vim-isort.overrideAttrs {
@@ -3943,14 +3950,17 @@ in
   };
 
   whichpy-nvim = super.whichpy-nvim.overrideAttrs {
-    checkInputs = with self; [
-      telescope-nvim
+    checkInputs = [
+      # Optional telescope integration
+      self.telescope-nvim
     ];
   };
 
   wiki-vim = super.wiki-vim.overrideAttrs {
-    # Optional telescope integration
-    nvimSkipModules = [ "wiki.telescope" ];
+    checkInputs = [
+      # Optional telescope integration
+      self.telescope-nvim
+    ];
   };
 
   windows-nvim = super.windows-nvim.overrideAttrs {
@@ -3993,10 +4003,9 @@ in
   };
 
   yanky-nvim = super.yanky-nvim.overrideAttrs {
-    nvimSkipModules = [
+    checkInputs = with self; [
       # Optional telescope integration
-      "yanky.telescope.mapping"
-      "yanky.telescope.yank_history"
+      telescope-nvim
     ];
   };
 
@@ -4078,12 +4087,12 @@ in
   };
 
   zk-nvim = super.zk-nvim.overrideAttrs {
-    # Optional integrations
-    nvimSkipModules = [
-      "zk.pickers.fzf_lua"
-      "zk.pickers.minipick"
-      "zk.pickers.snacks_picker"
-      "zk.pickers.telescope"
+    checkInputs = with self; [
+      # Optional pickers
+      fzf-lua
+      mini-nvim
+      snacks-nvim
+      telescope-nvim
     ];
   };
 

From 1308f9d9b806771f3534418757100d1c28a5860b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 5 Jun 2025 23:38:35 -0500
Subject: [PATCH 1313/1497] vimPlugins.avante-nvim: 0.0.23-unstable-2025-06-02
 -> 0.0.24-unstable-2025-06-05

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 19b4fd806bb7..3207844a8a6b 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-06-02";
+  version = "0.0.24-unstable-2025-06-05";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "647a459a2b87e5c9b2987cb44150b71beffdfb10";
-    hash = "sha256-GgLOcVp2IuMBr4aBRWJTvrAuWWiMEIHmec/S97piBaM=";
+    rev = "12bdb66ea4749f9f59861e7165a4de6cfbf4eb22";
+    hash = "sha256-dUtvMkb85HR7xzMoCHeeJIwwyQPdwHNdQHUMyA7+EsU=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 8712db665d8606223dfe85f6ad9f06160a3f760a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 05:17:25 +0000
Subject: [PATCH 1314/1497] yaziPlugins.restore: 25.5.28-unstable-2025-05-30 ->
 25.5.31-unstable-2025-06-05

---
 pkgs/by-name/ya/yazi/plugins/restore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
index f5ed65cfde5b..d24769c725c2 100644
--- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "restore.yazi";
-  version = "25.5.28-unstable-2025-05-30";
+  version = "25.5.31-unstable-2025-06-05";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "86dff4319ace07da83c235ccab7a14bc0853a03a";
-    hash = "sha256-7hMFTeNghXIf3Db2AtguIzLkWbXYtJNwGkFdymDr35s=";
+    rev = "b7c33766e0bc4bbbb99e8e934be90e3beb881d29";
+    hash = "sha256-qtthY7eySqXoA3TARubZF0SsYkkLEgkjdtPUxR5ro0I=";
   };
 
   meta = {

From c7c93dfc754b511be5f465bbc7fbe040d29d6201 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 05:28:36 +0000
Subject: [PATCH 1315/1497] markdown-oxide: 0.25.1 -> 0.25.2

---
 pkgs/by-name/ma/markdown-oxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index 9bcb6a7cd31f..509ce2b8967b 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "markdown-oxide";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "Feel-ix-343";
     repo = "markdown-oxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hgXqJwmIpXJNIl67Jjbg5MR4PlwB5XbqnFo+rNLoqbE=";
+    hash = "sha256-LXFZAMxg2Mlatwx7d4ozofr7H9nrqDxai9U/oB4vkqA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-o4wn6L5PVZM0SN8kA34NOp6ogTSoCv2xiN4vfj+ptc8=";
+  cargoHash = "sha256-VEYwLTWnFMO6qH9qsO4/oiNeIHgoEZAF+YjeVgFOESQ=";
 
   meta = {
     description = "Markdown LSP server inspired by Obsidian";

From 9de5026589c5861c643f042a2b643431440be051 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 05:32:43 +0000
Subject: [PATCH 1316/1497] starlark: 0-unstable-2025-04-17 ->
 0-unstable-2025-06-03

---
 pkgs/by-name/st/starlark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 9a74f63c3b78..9a4ecc6db7c3 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-04-17";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "f57e51f710eb2662fb0866b2bfb87c218cecdc52";
-    hash = "sha256-JuWdw0+SDcnfkEp4aUIUtI86dhEbZMBWNUibLEwQBek=";
+    rev = "27fdb1d4744d057ceaa6c18d8eca9bf5692e3852";
+    hash = "sha256-iS9v4XRJTclFxc/siuhTGliUAjM4pqju9lD+muFXp4Y=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";

From 1c9df5c6dea3c3d11be9484ed0eddb56c551e6c9 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 17:05:20 +0200
Subject: [PATCH 1317/1497] nixos/murmur: Use lib.mkEnableOption where possible

While on it, replace occurrences of "Murmur" with "Mumble server" of
touched options.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 29 +++-----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index aa205d1f60b4..2142d656bfa5 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -60,19 +60,9 @@ in
 
   options = {
     services.murmur = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If enabled, start the Murmur Mumble server.";
-      };
+      enable = lib.mkEnableOption "Mumble server";
 
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Open ports in the firewall for the Murmur Mumble server.
-        '';
-      };
+      openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server";
 
       user = mkOption {
         type = types.str;
@@ -203,14 +193,7 @@ in
         '';
       };
 
-      bonjour = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enable Bonjour auto-discovery, which allows clients over
-          your LAN to automatically discover Murmur servers.
-        '';
-      };
+      bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers";
 
       sendVersion = mkOption {
         type = types.bool;
@@ -255,11 +238,7 @@ in
         '';
       };
 
-      clientCertRequired = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Require clients to authenticate via certificates.";
-      };
+      clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
 
       sslCert = mkOption {
         type = types.str;

From b6c81af12d89f7c1a40fcb588ee16958b73458fe Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 17:19:56 +0200
Subject: [PATCH 1318/1497] nixos/murmur: Get rid global lib expansion

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 178 +++++++++----------
 1 file changed, 88 insertions(+), 90 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 2142d656bfa5..e6fd390aaf5c 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -5,8 +5,6 @@
   ...
 }:
 
-with lib;
-
 let
   cfg = config.services.murmur;
   forking = cfg.logFile != null;
@@ -18,44 +16,44 @@ let
     autobanTimeframe=${toString cfg.autobanTimeframe}
     autobanTime=${toString cfg.autobanTime}
 
-    logfile=${optionalString (cfg.logFile != null) cfg.logFile}
-    ${optionalString forking "pidfile=/run/murmur/murmurd.pid"}
+    logfile=${lib.optionalString (cfg.logFile != null) cfg.logFile}
+    ${lib.optionalString forking "pidfile=/run/murmur/murmurd.pid"}
 
     welcometext="${cfg.welcometext}"
     port=${toString cfg.port}
 
-    ${optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
-    ${optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
+    ${lib.optionalString (cfg.hostName != "") "host=${cfg.hostName}"}
+    ${lib.optionalString (cfg.password != "") "serverpassword=${cfg.password}"}
 
     bandwidth=${toString cfg.bandwidth}
     users=${toString cfg.users}
 
     textmessagelength=${toString cfg.textMsgLength}
     imagemessagelength=${toString cfg.imgMsgLength}
-    allowhtml=${boolToString cfg.allowHtml}
+    allowhtml=${lib.boolToString cfg.allowHtml}
     logdays=${toString cfg.logDays}
-    bonjour=${boolToString cfg.bonjour}
-    sendversion=${boolToString cfg.sendVersion}
+    bonjour=${lib.boolToString cfg.bonjour}
+    sendversion=${lib.boolToString cfg.sendVersion}
 
-    ${optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
-    ${optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
-    ${optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
-    ${optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
+    ${lib.optionalString (cfg.registerName != "") "registerName=${cfg.registerName}"}
+    ${lib.optionalString (cfg.registerPassword != "") "registerPassword=${cfg.registerPassword}"}
+    ${lib.optionalString (cfg.registerUrl != "") "registerUrl=${cfg.registerUrl}"}
+    ${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
 
-    certrequired=${boolToString cfg.clientCertRequired}
-    ${optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
-    ${optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
-    ${optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
+    certrequired=${lib.boolToString cfg.clientCertRequired}
+    ${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
+    ${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
+    ${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
 
-    ${optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
+    ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
 
     ${cfg.extraConfig}
   '';
 in
 {
   imports = [
-    (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
-    (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
+    (lib.mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
+    (lib.mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
   ];
 
   options = {
@@ -64,8 +62,8 @@ in
 
       openFirewall = lib.mkEnableOption "opening ports in the firewall for the Mumble server";
 
-      user = mkOption {
-        type = types.str;
+      user = lib.mkOption {
+        type = lib.types.str;
         default = "murmur";
         description = ''
           The name of an existing user to use to run the service.
@@ -73,8 +71,8 @@ in
         '';
       };
 
-      group = mkOption {
-        type = types.str;
+      group = lib.mkOption {
+        type = lib.types.str;
         default = "murmur";
         description = ''
           The name of an existing group to use to run the service.
@@ -82,16 +80,16 @@ in
         '';
       };
 
-      stateDir = mkOption {
-        type = types.path;
+      stateDir = lib.mkOption {
+        type = lib.types.path;
         default = "/var/lib/murmur";
         description = ''
           Directory to store data for the server.
         '';
       };
 
-      autobanAttempts = mkOption {
-        type = types.int;
+      autobanAttempts = lib.mkOption {
+        type = lib.types.int;
         default = 10;
         description = ''
           Number of attempts a client is allowed to make in
@@ -100,8 +98,8 @@ in
         '';
       };
 
-      autobanTimeframe = mkOption {
-        type = types.int;
+      autobanTimeframe = lib.mkOption {
+        type = lib.types.int;
         default = 120;
         description = ''
           Timeframe in which a client can connect without being banned
@@ -109,47 +107,47 @@ in
         '';
       };
 
-      autobanTime = mkOption {
-        type = types.int;
+      autobanTime = lib.mkOption {
+        type = lib.types.int;
         default = 300;
         description = "The amount of time an IP ban lasts (in seconds).";
       };
 
-      logFile = mkOption {
-        type = types.nullOr types.path;
+      logFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
         example = "/var/log/murmur/murmurd.log";
         description = "Path to the log file for Murmur daemon. Empty means log to journald.";
       };
 
-      welcometext = mkOption {
-        type = types.str;
+      welcometext = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Welcome message for connected clients.";
       };
 
-      port = mkOption {
-        type = types.port;
+      port = lib.mkOption {
+        type = lib.types.port;
         default = 64738;
         description = "Ports to bind to (UDP and TCP).";
       };
 
-      hostName = mkOption {
-        type = types.str;
+      hostName = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Host to bind to. Defaults binding on all addresses.";
       };
 
-      package = mkPackageOption pkgs "murmur" { };
+      package = lib.mkPackageOption pkgs "murmur" { };
 
-      password = mkOption {
-        type = types.str;
+      password = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Required password to join server, if specified.";
       };
 
-      bandwidth = mkOption {
-        type = types.int;
+      bandwidth = lib.mkOption {
+        type = lib.types.int;
         default = 72000;
         description = ''
           Maximum bandwidth (in bits per second) that clients may send
@@ -157,26 +155,26 @@ in
         '';
       };
 
-      users = mkOption {
-        type = types.int;
+      users = lib.mkOption {
+        type = lib.types.int;
         default = 100;
         description = "Maximum number of concurrent clients allowed.";
       };
 
-      textMsgLength = mkOption {
-        type = types.int;
+      textMsgLength = lib.mkOption {
+        type = lib.types.int;
         default = 5000;
         description = "Max length of text messages. Set 0 for no limit.";
       };
 
-      imgMsgLength = mkOption {
-        type = types.int;
+      imgMsgLength = lib.mkOption {
+        type = lib.types.int;
         default = 131072;
         description = "Max length of image messages. Set 0 for no limit.";
       };
 
-      allowHtml = mkOption {
-        type = types.bool;
+      allowHtml = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Allow HTML in client messages, comments, and channel
@@ -184,8 +182,8 @@ in
         '';
       };
 
-      logDays = mkOption {
-        type = types.int;
+      logDays = lib.mkOption {
+        type = lib.types.int;
         default = 31;
         description = ''
           How long to store RPC logs for in the database. Set 0 to
@@ -195,14 +193,14 @@ in
 
       bonjour = lib.mkEnableOption "Bonjour auto-discovery, which allows clients over your LAN to automatically discover Mumble servers";
 
-      sendVersion = mkOption {
-        type = types.bool;
+      sendVersion = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = "Send Murmur version in UDP response.";
       };
 
-      registerName = mkOption {
-        type = types.str;
+      registerName = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Public server registration name, and also the name of the
@@ -211,8 +209,8 @@ in
         '';
       };
 
-      registerPassword = mkOption {
-        type = types.str;
+      registerPassword = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           Public server registry password, used authenticate your
@@ -221,14 +219,14 @@ in
         '';
       };
 
-      registerUrl = mkOption {
-        type = types.str;
+      registerUrl = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "URL website for your server.";
       };
 
-      registerHostname = mkOption {
-        type = types.str;
+      registerHostname = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = ''
           DNS hostname where your server can be reached. This is only
@@ -240,34 +238,34 @@ in
 
       clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
 
-      sslCert = mkOption {
-        type = types.str;
+      sslCert = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL certificate.";
       };
 
-      sslKey = mkOption {
-        type = types.str;
+      sslKey = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL key.";
       };
 
-      sslCa = mkOption {
-        type = types.str;
+      sslCa = lib.mkOption {
+        type = lib.types.str;
         default = "";
         description = "Path to your SSL CA certificate.";
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Extra configuration to put into murmur.ini.";
       };
 
-      environmentFile = mkOption {
-        type = types.nullOr types.path;
+      environmentFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         default = null;
-        example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
+        example = lib.literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
         description = ''
           Environment file as defined in {manpage}`systemd.exec(5)`.
 
@@ -290,8 +288,8 @@ in
         '';
       };
 
-      dbus = mkOption {
-        type = types.enum [
+      dbus = lib.mkOption {
+        type = lib.types.enum [
           null
           "session"
           "system"
@@ -302,19 +300,19 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    users.users.murmur = mkIf (cfg.user == "murmur") {
+  config = lib.mkIf cfg.enable {
+    users.users.murmur = lib.mkIf (cfg.user == "murmur") {
       description = "Murmur Service user";
       home = cfg.stateDir;
       createHome = true;
       uid = config.ids.uids.murmur;
       group = cfg.group;
     };
-    users.groups.murmur = mkIf (cfg.group == "murmur") {
+    users.groups.murmur = lib.mkIf (cfg.group == "murmur") {
       gid = config.ids.gids.murmur;
     };
 
-    networking.firewall = mkIf cfg.openFirewall {
+    networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ cfg.port ];
       allowedUDPPorts = [ cfg.port ];
     };
@@ -332,8 +330,8 @@ in
       serviceConfig = {
         # murmurd doesn't fork when logging to the console.
         Type = if forking then "forking" else "simple";
-        PIDFile = mkIf forking "/run/murmur/murmurd.pid";
-        EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
+        PIDFile = lib.mkIf forking "/run/murmur/murmurd.pid";
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
         ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini";
         Restart = "always";
         RuntimeDirectory = "murmur";
@@ -369,7 +367,7 @@ in
 
     # currently not included in upstream package, addition requested at
     # https://github.com/mumble-voip/mumble/issues/6078
-    services.dbus.packages = mkIf (cfg.dbus == "system") [
+    services.dbus.packages = lib.mkIf (cfg.dbus == "system") [
       (pkgs.writeTextFile {
         name = "murmur-dbus-policy";
         text = ''
@@ -411,19 +409,19 @@ in
           r /run/murmur/murmurd.ini,
           r ${configFile},
       ''
-      + optionalString (cfg.logFile != null) ''
+      + lib.optionalString (cfg.logFile != null) ''
         rw ${cfg.logFile},
       ''
-      + optionalString (cfg.sslCert != "") ''
+      + lib.optionalString (cfg.sslCert != "") ''
         r ${cfg.sslCert},
       ''
-      + optionalString (cfg.sslKey != "") ''
+      + lib.optionalString (cfg.sslKey != "") ''
         r ${cfg.sslKey},
       ''
-      + optionalString (cfg.sslCa != "") ''
+      + lib.optionalString (cfg.sslCa != "") ''
         r ${cfg.sslCa},
       ''
-      + optionalString (cfg.dbus != null) ''
+      + lib.optionalString (cfg.dbus != null) ''
         dbus bus=${cfg.dbus}
       ''
       + ''

From 31d18149addc47d59160ea042c91deff697e6789 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 18:14:15 +0200
Subject: [PATCH 1319/1497] nixos/murmur: Drop warnings regarding
 renamed/removed options

These warnings were added around 5 years ago. That's long enough. So
drop them.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 nixos/modules/services/networking/murmur.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index e6fd390aaf5c..ff46a52ca17a 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -51,11 +51,6 @@ let
   '';
 in
 {
-  imports = [
-    (lib.mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
-    (lib.mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
-  ];
-
   options = {
     services.murmur = {
       enable = lib.mkEnableOption "Mumble server";

From 4ef835ac71875323062467700517111c93e7bdd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 06:01:38 +0000
Subject: [PATCH 1320/1497] nwg-panel: 0.10.4 -> 0.10.6

---
 pkgs/by-name/nw/nwg-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index 371fdf825d0a..dec6073e3687 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,13 +23,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.10.4";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     tag = "v${version}";
-    hash = "sha256-yONNXCKKUH2P0Bhq2lRh3zNWZGvZG4LUi/ONUozTYmI=";
+    hash = "sha256-+LnnYP7AA/Gohusk9/lvvxdHpnOfMhBu58UB/LhkMX4=";
   };
 
   # No tests

From 0d501560ef6361ce4b8a4e683f43b8891df37c2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 06:06:45 +0000
Subject: [PATCH 1321/1497] copilot-language-server: 1.322.0 -> 1.330.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index bb328afce10d..20230ef65b76 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -45,11 +45,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.322.0";
+  version = "1.330.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip";
-    hash = "sha256-3AJTC4TI+sqTi1/B1XQZght7CClplWwIxjGmrt1E2ME=";
+    hash = "sha256-/Em00UVEg46gEI52fG7aQo2rqKwqrF3V1tAVx2hpyMc=";
     stripRoot = false;
   };
 

From eb42260d00d37eba1a34e44fcb0c4e5ed8d57694 Mon Sep 17 00:00:00 2001
From: PandapipBot <{{ env.EMAIL }}>
Date: Fri, 6 Jun 2025 06:19:40 +0000
Subject: [PATCH 1322/1497] vscode-extensions.reditorsupport.r: 2.8.5 -> 2.8.6

---
 .../editors/vscode/extensions/reditorsupport.r/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
index 86b8bd729f71..85359d2a95ca 100644
--- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
@@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "r";
     publisher = "reditorsupport";
-    version = "2.8.5";
-    hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM=";
+    version = "2.8.6";
+    hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y=";
   };
   nativeBuildInputs = [
     jq

From d0cbdfcb02ce4338f81526f15ebd9d241ba0e9a0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 6 Jun 2025 08:21:14 +0200
Subject: [PATCH 1323/1497] go: remove unused patch

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../go/go_no_vendor_checks-1.22.patch         | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch

diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
deleted file mode 100644
index bd545d50948f..000000000000
--- a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
-and replacements listed in the main module go.mod file, and it is a hard failure if
-vendor/modules.txt is missing.
-
-Relax module consistency checks and switch back to pre go1.14 behaviour if
-vendor/modules.txt is missing regardless of go version requirement in go.mod.
-
-This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
-See https://github.com/golang/go/issues/37948 for discussion.
-
-diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
-index b2cb44100e..05bf3829d5 100644
---- a/src/cmd/go/internal/modload/vendor.go
-+++ b/src/cmd/go/internal/modload/vendor.go
-@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m
- 			panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
- 		}
- 		index := indexes[0]
--		if gover.Compare(index.goVersion, "1.14") < 0 {
-+		if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
- 			// Go versions before 1.14 did not include enough information in
- 			// vendor/modules.txt to check for consistency.
- 			// If we know that we're on an earlier version, relax the consistency check.

From 926b5c4e3e11ba419775a72cf64c992597373533 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 06:35:22 +0000
Subject: [PATCH 1324/1497] terraform-providers.aiven: 4.40.0 -> 4.41.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5b73a0df83c4..5eb5857580e4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -36,13 +36,13 @@
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "aiven": {
-    "hash": "sha256-XZXyeWSgJ5h+dkxYNqb49BrdlmpbfMIxY7UgP2yAtoI=",
+    "hash": "sha256-XIBaAzQWuKbLIkjSqBS3hVOtXlZzt9AonSgE+qTmU8Q=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.40.0",
+    "rev": "v4.41.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-T2yIUO8DAuUC5s/bBxgsn99fCjJO1y6TzmPTuhT08FY="
+    "vendorHash": "sha256-lzih59OW98HRfl8ENCdGDeocNZjnWvHjNWmd0djPoEM="
   },
   "akamai": {
     "hash": "sha256-JALEVzmBVmHtCG4B1jNeNdSWb+SGZWDSZgUQ5voMQPg=",

From b8721d76e05bef1219118f74c8b762108c8ddd5e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 4 Jun 2025 09:20:01 -0400
Subject: [PATCH 1325/1497] teams/ngi: add ethancedwards8

Add myself as a team member as I will be a Summer of Nix participant and
would like to be more involved/informed.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 3ac3b6fe6e19..35aa999a58be 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -913,6 +913,7 @@ with lib.maintainers;
   ngi = {
     members = [
       eljamm
+      ethancedwards8
       fricklerhandwerk
       wegank
     ];

From b91ce21bdbca745adb5e3fd1d77a551376a03098 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 06:36:04 +0000
Subject: [PATCH 1326/1497] v2ray-domain-list-community: 20250602083629 ->
 20250605152911

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 2b1544c24ac4..f1e1788d87b7 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20250602083629";
+    version = "20250605152911";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-LdB4BUHDpPoA0c8yoZX9gZhaY97t4DfkR37y32yHlvk=";
+      hash = "sha256-WmBRTr1DHsYgw1XBYCgJAqIvgoW+oqMHe7Ifh7pSG1I=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From fb160c4b28b00010a3d9fd08db6bd46285d6a22f Mon Sep 17 00:00:00 2001
From: "Shahar \"Dawn\" Or" <mightyiampresence@gmail.com>
Date: Fri, 6 Jun 2025 13:36:26 +0700
Subject: [PATCH 1327/1497] maintainers: add quotes around Dawn for mightyiam

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5c7b0d434e2f..7837ef5e0448 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16161,7 +16161,7 @@
     email = "mightyiampresence@gmail.com";
     github = "mightyiam";
     githubId = 635591;
-    name = "Shahar Dawn Or";
+    name = "Shahar \"Dawn\" Or";
   };
   mihaimaruseac = {
     email = "mihaimaruseac@gmail.com";

From 9613b03c3204b47d755e7a7775fe761ef3937620 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 07:17:22 +0000
Subject: [PATCH 1328/1497] terraform-providers.grafana: 3.25.1 -> 3.25.2

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5b73a0df83c4..c3554badef55 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -543,13 +543,13 @@
     "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
   },
   "grafana": {
-    "hash": "sha256-Nz+6l/sJog7Snzady4qQCooBwv6IZ+12RkFZ55Hka9w=",
+    "hash": "sha256-nKapC8Pcg/HF/xXP8fOzMQV0NSJarAym6TIb+7l0g+c=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v3.25.1",
+    "rev": "v3.25.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-G5CiuQ0GPsJ7D+wlWQUAktT3DSgb2X7NL66c6U+9APU="
+    "vendorHash": "sha256-QTcWJlwE6s4nEPSg6svzIhsJo9p9rk1gQiSr4qSTfns="
   },
   "gridscale": {
     "hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=",

From afdf5811b43eeca35059a8f312107471f384e8c9 Mon Sep 17 00:00:00 2001
From: April John <aprl@acab.dev>
Date: Thu, 17 Apr 2025 15:33:11 +0200
Subject: [PATCH 1329/1497] zsh-history: drop Dropped upstream and has no
 maintainer. No upstream commits since 6 years.

aliases: add change date

Co-authored-by: Acid Bong <acidbong@tilde.club>
---
 nixos/tests/all-tests.nix               |  1 -
 nixos/tests/zsh-history.nix             | 38 ----------------------
 pkgs/by-name/zs/zsh-history/package.nix | 43 -------------------------
 pkgs/by-name/zs/zsh/package.nix         |  2 +-
 pkgs/top-level/aliases.nix              |  1 +
 5 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 nixos/tests/zsh-history.nix
 delete mode 100644 pkgs/by-name/zs/zsh-history/package.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8e83095a7ded..e30e30aacb88 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1494,7 +1494,6 @@ in
   zookeeper = runTest ./zookeeper.nix;
   zram-generator = runTest ./zram-generator.nix;
   zrepl = runTest ./zrepl.nix;
-  zsh-history = runTest ./zsh-history.nix;
   zwave-js = runTest ./zwave-js.nix;
   zwave-js-ui = runTest ./zwave-js-ui.nix;
 }
diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix
deleted file mode 100644
index fe3dd44a25e2..000000000000
--- a/nixos/tests/zsh-history.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, ... }:
-{
-  name = "zsh-history";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ ];
-  };
-
-  nodes.default =
-    { ... }:
-    {
-      programs = {
-        zsh.enable = true;
-      };
-      environment.systemPackages = [ pkgs.zsh-history ];
-      programs.zsh.interactiveShellInit = ''
-        source ${pkgs.zsh-history.out}/share/zsh/init.zsh
-      '';
-      users.users.root.shell = "${pkgs.zsh}/bin/zsh";
-    };
-
-  testScript = ''
-    start_all()
-    default.wait_for_unit("multi-user.target")
-    default.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
-
-    # Login
-    default.wait_until_tty_matches("1", "login: ")
-    default.send_chars("root\n")
-    default.wait_until_tty_matches("1", r"\nroot@default\b")
-
-    # Generate some history
-    default.send_chars("echo foobar\n")
-    default.wait_until_tty_matches("1", "foobar")
-
-    # Ensure that command was recorded in history
-    default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")
-  '';
-}
diff --git a/pkgs/by-name/zs/zsh-history/package.nix b/pkgs/by-name/zs/zsh-history/package.nix
deleted file mode 100644
index e9b7f80eb0d6..000000000000
--- a/pkgs/by-name/zs/zsh-history/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-  installShellFiles,
-  nixosTests,
-}:
-
-buildGoModule {
-  pname = "zsh-history";
-  version = "2019-12-10";
-
-  src = fetchFromGitHub {
-    owner = "b4b4r07";
-    repo = "history";
-    rev = "8da016bd91b0c2eb53c9980f00eee6abdbb097e2";
-    sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3";
-  };
-
-  vendorHash = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8=";
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  doCheck = false;
-
-  postInstall = ''
-    install -d $out/share
-    cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
-    installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
-  '';
-
-  passthru.tests = {
-    zsh-history-shell-integration = nixosTests.zsh-history;
-  };
-
-  meta = with lib; {
-    description = "CLI to provide enhanced history for your ZSH shell";
-    homepage = "https://github.com/b4b4r07/history";
-    license = licenses.mit;
-    maintainers = [ ];
-    mainProgram = "history";
-  };
-}
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index e84ddddd9fcf..bfdeff8325b1 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
   passthru = {
     shellPath = "/bin/zsh";
     tests = {
-      inherit (nixosTests) zsh-history oh-my-zsh;
+      inherit (nixosTests) oh-my-zsh;
     };
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5cd67e0b58e4..2a9224580939 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1918,6 +1918,7 @@ mapAliases {
   zinc = zincsearch; # Added 2023-05-28
   zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
   zkg = throw "'zkg' has been replaced by 'zeek'";
+  zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
   zq = zed.overrideAttrs (old: {
     meta = old.meta // {
       mainProgram = "zq";

From ef8893744a53f1681d904abc5785b03e058687f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 07:33:08 +0000
Subject: [PATCH 1330/1497] python3Packages.pytest-ansible: 25.4.1 -> 25.5.0

---
 pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index 8e35b08b12ea..9a341c0eb418 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "25.4.1";
+  version = "25.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "pytest-ansible";
     tag = "v${version}";
-    hash = "sha256-AJU7jGO/fN5R0ZVb/WhiXZKEZF4Z2ibhIBs+267lSSk=";
+    hash = "sha256-k6JFaB5VbUCwknN8SkNotdPRvSvW1tFmTx5p3hGfesg=";
   };
 
   postPatch = ''

From 24979e200c5de8451da3efc0d4013006dd535937 Mon Sep 17 00:00:00 2001
From: con-f-use <con-f-use@gmx.net>
Date: Wed, 5 Feb 2025 00:00:11 +0100
Subject: [PATCH 1331/1497] python3Packages.devpi-ldap: init at
 2.1.1-unstable-2023-11-28

---
 .../python-modules/devpi-ldap/default.nix     | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/devpi-ldap/default.nix

diff --git a/pkgs/development/python-modules/devpi-ldap/default.nix b/pkgs/development/python-modules/devpi-ldap/default.nix
new file mode 100644
index 000000000000..894819670e38
--- /dev/null
+++ b/pkgs/development/python-modules/devpi-ldap/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  devpi-server,
+  fetchFromGitHub,
+  ldap3,
+  mock,
+  pytest-cov-stub,
+  pytest-flake8,
+  pytestCheckHook,
+  pythonOlder,
+  pyyaml,
+  setuptools,
+  webtest,
+}:
+
+buildPythonPackage rec {
+  pname = "devpi-ldap";
+  version = "2.1.1-unstable-2023-11-28";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "devpi";
+    repo = "devpi-ldap";
+    rev = "281a21d4e8d11bfec7dca2cf23fa39660a6d5796";
+    hash = "sha256-vwX0bOb2byN3M6iBk0tZJy8H39fjwBYvA0Nxi7OTzFQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    devpi-server
+    pyyaml
+    ldap3
+  ];
+
+  nativeCheckInputs = [
+    devpi-server
+    mock
+    pytest-cov-stub
+    pytest-flake8
+    pytestCheckHook
+    webtest
+  ];
+
+  pythonImportsCheck = [ "devpi_ldap" ];
+
+  meta = {
+    homepage = "https://github.com/devpi/devpi-ldap";
+    description = "LDAP authentication for devpi-server";
+    changelog = "https://github.com/devpi/devpi-ldap/blob/main/CHANGELOG.rst";
+    license = lib.licenses.mit; # according to its setup.py
+    maintainers = with lib.maintainers; [ confus ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 394044814e2a..0438dedca534 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3238,6 +3238,8 @@ self: super: with self; {
 
   devpi-common = callPackage ../development/python-modules/devpi-common { };
 
+  devpi-ldap = callPackage ../development/python-modules/devpi-ldap { };
+
   devtools = callPackage ../development/python-modules/devtools { };
 
   dfdiskcache = callPackage ../development/python-modules/dfdiskcache { };

From 1e73dcda917aefd439045d696bca49df6f425216 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 07:38:11 +0000
Subject: [PATCH 1332/1497] pywal16: 3.8.6 -> 3.8.9

---
 pkgs/by-name/py/pywal16/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index e93f4c3ef4d1..7acf51d007d2 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.8.6";
+  version = "3.8.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     tag = version;
-    hash = "sha256-aq9I9KJnzwFjfLZ2fzW80abJQ/oSX7FcmCXYi1JMY7Q=";
+    hash = "sha256-43nKFTkIqaG9UzAjvNbZAog3NLMRKdtnZHxiiiBuD/4=";
   };
 
   build-system = [ python3.pkgs.setuptools ];

From de9ffff5eadf21ab75215ecfc6f46414e5d094a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 07:45:58 +0000
Subject: [PATCH 1333/1497] vscode-extensions.gitlab.gitlab-workflow: 6.17.0 ->
 6.21.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9976a987cbe4..140637dca7e0 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2129,8 +2129,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.17.0";
-          hash = "sha256-4/wGrHFB7yn7WTJq9igOU6XTOQZ1PGZ6kdMBP/IlZqw=";
+          version = "6.21.0";
+          hash = "sha256-vaOAk4ovQjUcnBtxqMlRstYLvR6uzmqGk3Sx6zV6wvY=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

From 9aaef07c4dbac7f9c9718bf2fde345e3de6ff694 Mon Sep 17 00:00:00 2001
From: bb2020 <bb2020@users.noreply.github.com>
Date: Thu, 27 Feb 2025 01:45:20 +0300
Subject: [PATCH 1334/1497] discrete-scroll: minor fixes

---
 pkgs/by-name/di/discrete-scroll/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/discrete-scroll/package.nix b/pkgs/by-name/di/discrete-scroll/package.nix
index f3b0f1c98109..937a5d5b19d1 100644
--- a/pkgs/by-name/di/discrete-scroll/package.nix
+++ b/pkgs/by-name/di/discrete-scroll/package.nix
@@ -23,15 +23,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-    install -Dm755 a.out $out/bin/discretescroll
+    install -Dm555 a.out $out/bin/discretescroll
     runHook postInstall
   '';
 
   meta = {
-    description = "Fix for OS X's scroll wheel problem";
+    description = "Fix for macOS's unnecessary scroll wheel acceleration";
     homepage = "https://github.com/emreyolcu/discrete-scroll";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ bb2020 ];
     platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ bb2020 ];
   };
 })

From 18fa2ffd38f733b67f6d7e1f609f4492b76acdd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:12:58 +0000
Subject: [PATCH 1335/1497] mirrord: 3.142.2 -> 3.143.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index d32e1f6df35d..dc66bc77a164 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.142.2",
+  "version": "3.143.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_x86_64",
-      "hash": "sha256-lTY28QpoC7/CosXRHFwTdwL4Jd5OKGMaaSPaVrUnHco="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_x86_64",
+      "hash": "sha256-0wu90iNAP7OQYENHIPsTSPk8Ko2jK0uBdZWe2d1URS8="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_linux_aarch64",
-      "hash": "sha256-svFAYPSLM9ykk8hTwU6ITmB5uBewGG8rHy97R95D02w="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_linux_aarch64",
+      "hash": "sha256-MWQ5k9Tk6q7f5QQ3Og9O5dyEDd+wNi3FFYqbFpa7uxM="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal",
-      "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal",
+      "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.2/mirrord_mac_universal",
-      "hash": "sha256-hHCDq+rcJhuF1lnJTXfM4jcBenDHz5YTSX1tYptZREg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.143.0/mirrord_mac_universal",
+      "hash": "sha256-GdwZWtNTuiUf+DcuZkVUm0YVH0EKfT6V6clcv1E7BxY="
     }
   }
 }

From d311c0eaeb6e8ec527a9a58821693e500c0b4dc6 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 3 Jun 2025 13:07:14 +0200
Subject: [PATCH 1336/1497] doc: call out 'src' should ideally point to sources

And to mark packages otherwise.
---
 doc/stdenv/stdenv.chapter.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 29b57e9f6d31..43795dfc94f6 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -599,6 +599,8 @@ Additional file types can be supported by setting the `unpackCmd` variable (see
 
 The list of source files or directories to be unpacked or copied. One of these must be set. Note that if you use `srcs`, you should also set `sourceRoot` or `setSourceRoot`.
 
+These should ideally actually be sources and licensed under a FLOSS license.  If you have to use a binary upstream release or package non-free software, make sure you correctly mark your derivation as such in the [`sourceProvenance`](#var-meta-sourceProvenance) and [`license`](#sec-meta-license) fields of the [`meta`](#chap-meta) section.
+
 ##### `sourceRoot` {#var-stdenv-sourceRoot}
 
 After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it.

From 59ff5c82d609bae7abd406eb7cf9d9f4ea349e63 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 10:25:07 +0200
Subject: [PATCH 1337/1497] python3Packages.mcp: 1.9.1 -> 1.9.3

Diff: https://github.com/modelcontextprotocol/python-sdk/compare/refs/tags/v1.9.1...refs/tags/v1.9.3

Changelog: https://github.com/modelcontextprotocol/python-sdk/releases/tag/v1.9.3
---
 pkgs/development/python-modules/mcp/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 2603fcc4cfd5..71c8c93869ac 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -27,22 +27,24 @@
   websockets,
 
   # tests
+  inline-snapshot,
   pytest-asyncio,
   pytest-examples,
+  pytest-xdist,
   pytestCheckHook,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.9.1";
+  version = "1.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-8u02/tHR2F1CpjcHXHC8sZC+/JrWz1satqYa/zdSGDw=";
+    hash = "sha256-3r7NG2AnxxKgAAd3n+tjjPTz4WJRmc7isfh3p21hUa0=";
   };
 
   postPatch = ''
@@ -85,8 +87,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "mcp" ];
 
   nativeCheckInputs = [
+    inline-snapshot
     pytest-asyncio
     pytest-examples
+    pytest-xdist
     pytestCheckHook
     requests
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
@@ -108,6 +112,9 @@ buildPythonPackage rec {
 
     # AttributeError: 'coroutine' object has no attribute 'client_metadata'
     "TestOAuthClientProvider"
+
+    # inline_snapshot._exceptions.UsageError: snapshot value should not change. Use Is(...) for dynamic snapshot parts
+    "test_build_metadata"
   ];
 
   __darwinAllowLocalNetworking = true;

From cf85d813d29ba16143fdf5a1eeb746e85c305a90 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Fri, 6 Jun 2025 10:33:13 +0200
Subject: [PATCH 1338/1497] shh: 2025.6.4 -> 2025.6.5

---
 pkgs/by-name/sh/shh/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index 8bc26f187235..694e717743f3 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -3,7 +3,6 @@
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
-  fetchpatch,
   installShellFiles,
   python3,
   strace,
@@ -19,25 +18,19 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "shh";
-  version = "2025.6.4";
+  version = "2025.6.5";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${version}";
-    hash = "sha256-rhn7qy/cF1vjCFnEoVzVmKNcI/TBUEMxp5pzzC8c9bw=";
+    hash = "sha256-cKN5SK7pVw4Ey6QmCZRYIlDPJ69eg9ihQ1M2vZDmGZ0=";
   };
 
-  cargoHash = "sha256-hk4IG/FOwrLrV7kPDQigkpWwQzmvf1LvyrIesMYO3jk=";
+  cargoHash = "sha256-09mQDautFnL0RYfIfn6KC2T7Ah57gV7JD1JkqmApmYI=";
 
   patches = [
     ./fix_run_checks.patch
-    (fetchpatch {
-      # to be removed after next release
-      name = "support-kernels-without-kernel-unprivileged_userns_clone.patch";
-      url = "https://github.com/desbma/shh/commit/f103b06c756dbb43aec615b590680cc99cbb0f00.patch";
-      hash = "sha256-K68tU7EN51jUayoP+WAUuvqqB2eqyDXnAdLsWEd/eAM=";
-    })
   ];
 
   env = {

From 97568674a30e7e3f10c5e7cc25b3d85cb7970316 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:42:09 +0000
Subject: [PATCH 1339/1497] firefox-devedition-bin-unwrapped: 140.0b4 ->
 140.0b5

---
 .../firefox-bin/developer-edition_sources.nix | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index f67bffe378d7..02dcc819e4f8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "140.0b4";
+  version = "140.0b5";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "ed1554afe2f6f16e43600abc464a5093f9668cbe2c2f9ff2c2a5c7751924dfcc";
+      sha256 = "1f0375f886207ee6dde86ddbb12445774197020d37d749560618865b479b98d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "2c42439d6d8aebb5e9cd5a7a662d181fa421a6baca7288492bf22f1f919001f8";
+      sha256 = "7e7cf35862873d17ab3bbc1feb285d79b263b8a3cd78e310dabef83ba622979e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "413ccf730b5429950731693c968f1839c9c84772c62e2d06c9e93e1724015230";
+      sha256 = "95700689dccb1e1035f8642c4fd3ccba7cd7985b967992cabd75ab82d3bf83d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "f99f746fb9d1996cc2aec0881c78d01d871d5c0feae57ac07f2a81cf4b295247";
+      sha256 = "214f50dcc2566cef3db820eef8b211187d1f46ab973b55bce948f975166ec527";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "becb101ca6fbcf2452ff5d025524b465815ebebb3507f3f2f24c42ef1e2cd2cb";
+      sha256 = "9847906a18ee8f83708c20954443cecd00644b83f0b9fbbd3fc435e728fc3881";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "1c8ce7b3c1a3d0fe79f2039d0386cc8bfb36583331db2e76d4fef0e36fe3dd01";
+      sha256 = "73dd33ed39918c78a298808fbd6666e122ef5bb8e027437e5b84c9fd0ed49c8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "0e24d3516d2a464e9bbf4b575c8f3ab54c724102c89d19890c3a629e3d53d4aa";
+      sha256 = "dc15d821f6ef14ad47e1faaf47fa33e1f47e6d2fe2c6991c1b05c42b93caa646";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d7184793c5aaf2d53a15de10f97a3f74a04f47a17a4864a3ab0fdd082d14c8ef";
+      sha256 = "15754b928c5de3ad978134ec7a41cab691e80541a7b77d40f587a4ef49056ca3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5b29c8c9dea8541a00c94b35af1b05681b3f7e5533f50724bbcdfad23fe4b374";
+      sha256 = "d6608a03f465ba43d6a19745d371e896f751c9965b39d48864fb51acd657ade9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "90e8da40dc2fad16a3fcee7fd04e7d8b9507dd0bbeb343f1feb5cead4351a53f";
+      sha256 = "e92b43c268562f6601367d8fcd5cbff941c0bde8c2f5e83f01a5e8606d25e1b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "a2aca9afe6c3bc00d0f3c885a29d4ad6537a5a9f9e34bec196592c8c18d7fd09";
+      sha256 = "d93a05def66a977d4a30fbd84c9238128ce1f4790584b7a8d649b953b97b63ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "5d4bc97a8726f34b93d1c066e7417904be8017e209a912eb08116d97a21d4350";
+      sha256 = "ce716548b10a8dc0e61b065e9b388f00f83596f7cd02aad650260f6690bb3e26";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "2a33c442ae382b834a78ee4358f0771bb6edd5c6382ec9f298861a2eca11b79e";
+      sha256 = "649ca4101a10ef6dd1daa520b1cf6a131c1379298241db3cee23d5df6ef60677";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e0d45404dee8ee5bdf301fbafd876d6a20597d0bf52a7765aaa5069115825f3d";
+      sha256 = "6fb8e27c6068aa3b91e4405b1c5272ef9258cc5d9ebc8b521129694faa7afdab";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "892e04a3707da1bcf31d1b7ebf3ca896e4eb28e833fde42c0c86d1d6bc4f7ad3";
+      sha256 = "665afa6ff95c2893d025827e19a2a00283f4317a5dbe70fd699b72f6c1b88032";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "51251020df6ef2436f91994c7bd6760bc27ce79f24f4044dc27ea35a827508df";
+      sha256 = "747e19b6455197097bff2376537e07a7b221683b57cd8f94d87531607f9c4c60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d0a7f95babaf32f19267f36a1553159a340187deb131a8c68c6807e15afeca32";
+      sha256 = "3c07cb7562cccaee370526f6f3377eba01bd497d15b32e38813aaf20e872a6f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "df0c0ab4772c2004be8fb9f1db5ca8d00ed2ef4217c60138db991c2b5dbbe439";
+      sha256 = "3190ba13d9e483e6b245058e73fcfa2b14b45ecfca089e0d58b719903bcbc49f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "af4a92e19e01ab664e26b7c59fe34a230f4dd3bfcc4bca59d1d71a46936d7800";
+      sha256 = "b989fb3ef4c972bd17eb590e66e4f829bdcd1ec3d1a1f1cfe0c16607448c8e4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ece534644114af64ee062608aeb0d04c7fedacde76c80ace8931692a89213015";
+      sha256 = "b903e43d0e2d1ec0b434c979e90a00c4df1a39f59c5698b0dbdfc1f1eccae780";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "494aa1d40b6faa19bf16be5f75a8eaec0b6903e22a3b85bf6db969815c67e744";
+      sha256 = "1b6586b6d6e646f690d8ef05fe05a019e3320fbd16b4945ddcbb18bbf841ee80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "8cb6a84fb9fcc27115de62396eff3a24de1b4eb87fdbba649536d4a877bb9e90";
+      sha256 = "b80c1cf17aa66d6d1cf35f3166ca9d409ac169e7f33f7159daebfe7cc714f825";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "4e7af27ab23d6b5da4cef54989c510612f55ec058f53106b1f51152b25db4d9b";
+      sha256 = "e57259f92dc44630d5f0ed60e24cc3358cc7053754171134f1c8d5413aa297e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "fd5a6ab7fc1748b1444f655ceafe5fb83441baa6ad70b10aed44a2e973dc7f33";
+      sha256 = "b413dd6127f3661945a98691d972b72dde13dff6460e0a8a7cdf4b0b8ac05bf6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "16a4e466fc24c65736ebbf83ac2cba1fdc0f74ca28a10faf0c5748776bf0c1f8";
+      sha256 = "e832a156c248c826e2d4b3026fcec5dfa2c395a22de474d26a08d912e150b029";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "9750c945c67f351ac9a8d5be40cefee79f4dd6974cfdcd5f1f7162da8d2466f0";
+      sha256 = "72b105af7610696a56f0ac576d92f09c2890891bc6057988f9af7e803893dc7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "f174e7a9ad5d95dabede5e2339b1750c6f85e2bb0d1f8dc654d242ba00b39c00";
+      sha256 = "8b49655f00932ba12a7c4d182f00c69109130c0d55dfe9c58400c1d81c79aa70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "b9257a36159ad9e65fde2e5580efafa722600d6a27ac2996fbba49fb2fbe0c08";
+      sha256 = "00ecb996a022264e13bd1d7877dbcbbefc16ebd272cb55d0e2bf6f59f17c1629";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "d1c583e56238a293e1fbe9eebfb6cbdc33eafec1c5286ff5765debd2f68b0ce4";
+      sha256 = "371a145b068313d3bc2f2a2229e6db80a109b5d82c2030f9e952a1638dc79a31";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "def0cd7abfc22a6f60927bd232ac93d504ddb26e3e4983d9708e31b7341db75a";
+      sha256 = "df1c9b82cdfafee8495e7c2f668fcad116866f9cff8047a3cee9490242386edd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "44e74ebd3258cc16be4e2d9f6718b08e7e6c60f0239f990006727c42662d925f";
+      sha256 = "9209168394b752bd142ede109f93cb2291c58d61457a1d8e9835525a43befbd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "bde7c76e9728ba604b297d6924034983f7846077daba3fa959710bbd18f3e525";
+      sha256 = "f56c153920106cfe48bd822e6e1c8d1c9d9075bc868a06e3ad92a38a603f0b1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "e71fe4950ab0395cadce49dc7774940ff126476004155270de788660963af6d9";
+      sha256 = "3dd2e61b36e421c21bab47aa32e72156197f650f1d930a39106b1519b30bc9a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "73d3bcd3efa9828c4c46dab307ea2fb7478700a8a4746aa81d35e31d969756ef";
+      sha256 = "83ca5faffd5679f63d9abf7ce95e68ef66e764e49ac0babdd35ec20217086a47";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "e81e8ad39b55548bc88666bb7adc03ce18fc5ba57d31c0d94c90202897e29cc5";
+      sha256 = "43e0cce06fb685e2a7c2dd0c19cb8d340d821976ca582400222626bc75cec5f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "c064a6fdb1b474f9cce223691e216a9a232041326b1ef1dc47175c406e7619b9";
+      sha256 = "804fbcdaecab060280ca1c86f92c41b9e5e4b8384eafebba56ce2524f8a2ae7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "09fd356ab21d082b7b2ca96ac05bbc8691e0b833a96cd20e01058228506fba7d";
+      sha256 = "b4e9e07084cc1683befabd6353b7df48bb093c08d52eebf1c8ae571f106553bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "2c2128f710ef3ff6d462c9420d1e0080a280fbe74279b99fd48f90b607b43dce";
+      sha256 = "37b708878f8835eb98214d236ba6749776dc98db251f4b5443b9405882920e51";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "8bd114ad5da25dbd4672519939d39e1b865abcdb64d672f51a66b7ffbdadb68d";
+      sha256 = "a91659c8dcef37a9b94c71e8e0741ace6e705e9f36dfc65b1a604dcc50357ade";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "8af55045fcf0f4f28f1ce09e5a540c6a28ac2f7040a0f41599298fdbc898a750";
+      sha256 = "6d50592dc20b4e3b874eef21e50c5b5b5bff5fcce5d71c959c8c044e690648ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "a05701804e12296468c1c5b0f41352117c3564e81987d9f085a1a5aa21ff8345";
+      sha256 = "15ef43dba8a61a8fb0717b132b57d510f57f40ceeab758cfca5b4b7bb152cc55";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "569bfc9273743adf40a346f9d921ea9828e1356d384969287dca95d4f008d7a9";
+      sha256 = "bb9c0e28b3526e2873728ed0b912cf3ac5aabbe48e7cd3181b75bbcd2706fa06";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "07b8ba1226e79cc94cd081d7a845b9d2f19960cd622cb1b09f7e03bd2ae07bf6";
+      sha256 = "078f4ff60fedb0ca2f4955997cc9f80c77923195aa45ff9c4a9d428a5982ff4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "212bdc93f22821083001f8e605fcc3bb898a2af5aa03adcfe5361f72461142c1";
+      sha256 = "7bde8d2f20e21705000f9ccde96ac4444a002d822e7d8b35b6b5550931a42b9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "7d4ea28a2c6adaf9e71f4694d35f7aece693b6f4e3634ce21df45e7c0c0145dd";
+      sha256 = "2143fe5abf7cbc3bcefdfb17cb6ab9e751bd33bf8b1e9a00fad356d3490b34d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9165f21b67d2714d2704f23c93026c1ceecca3db09faaec9782640fef16cbc0b";
+      sha256 = "fbba0f840bc931ab4515fc8e5d9f38ac54ee090f127f381160c9f8a26f1d12cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "ce04cecbfcac04037bce64d5cd06995416cbfd4232dae04515fd0edf8a1fb6eb";
+      sha256 = "bd3259df39763727d25de9bba943bc4037535c90ba3ebfa42e7b1835b683e772";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "241daa6215d95180879c077a94733058d804e9b08aa285f50a07362e95955fce";
+      sha256 = "a0bd18ac32ff40fca8b255878013eee13a357d2aab8693376ca9e17d535bc8c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "563114161ebad123b8c98d53fd45dc4f42a36c43699b476039fc136503f4a3d3";
+      sha256 = "de80edc3b03c238f448a7710fc74c061ed4a281692771667788cf2ad1afa175e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "aceeaea1d110c7404eb6514dc2c0bb498cfc0f7dc01fe49b3b28362672adacb9";
+      sha256 = "b85126641862e01bb17da1f8e316630157d7dfe18f4670579221b049f8edd891";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "9f723893095f114ad85e1efeb8241018e77fe2c67c130d7c1e3528347d83e7df";
+      sha256 = "456adcf9c274637e211c8d0f19e64f288ab83a4a24b353fc55b399ed92ba8ebd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3e4c5d1b66bf80cf6c60c30394852c4413157bfe00c04648dabec7d461d83685";
+      sha256 = "90235c0a0fa89fb72e64760fa613ffed6bc4c829019a4fd4744e15be523891e9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "39c96201f2965d1c4e04bb7e10b380d2fba4466545c6f7ed6065466edeb796cc";
+      sha256 = "be4c4ed1517876d1b8fc6bc61827f2517e41a5f6456f9a66687948e458699da8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "785ed68e6de6fe0c683b424aa985649e0057bcceb3fff29389df590662019b6b";
+      sha256 = "19e9316dd5b08edb3e44a067446c2d87fc222a562c1fca8f2b8985652b0b69b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "ed6314351021e49aa00ea3121545d17b884d0a016b210e80ae4a0426ff5089f2";
+      sha256 = "9bcd6689af6b3931acebdf57eae4d36b9fbe13e1efe7e1c458af146a6fca0b71";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "03af2b330ca148cd24a5155fbc31f331b4cc849dc65fc92aa566652a692118ea";
+      sha256 = "461dec754f0c5acb4100fd980aa50244dba4f17129dba26bef5d25bc95bc7079";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "5af858ea0c84882e6f432ce0cb49b890dd9dbfc77f7f0a1df3e9dceb2a055857";
+      sha256 = "d7b6b9442a088633245e7dfa9d75748d3c8a8549eeaac41b147d2d61e2ea2c52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "e05d5fbf17993d217ee9c87935181540b1fb3fae861e9c9432c677a144d6d5a4";
+      sha256 = "97ba610de2be5754682a903f56bfb486301ea9fdd6fd59320715a05cac426bd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "ff343e1471223c89b91b7dd5ec432517907cc3e2f7abfb4652a3fcb6c327ff39";
+      sha256 = "0a96d7be3e3522ae802eca359080f99adaeb5cb534c0e96588a87b3c1f6899d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "7b200ec16524ca006ecbe4a9110a1c18d7d795e71be1f46d402f494de194c3f2";
+      sha256 = "2fd758c3e16e9c2289683bfe219f7b950269f21a359fec496c3fffbff915bb13";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ec4214a35bfa6fadef80a22a68f74bfa493d98f2a1c9ac56d795ddab892e1154";
+      sha256 = "b0375b051d45de1722893042c2a6adf36cfb0a463078da62603a06421610b2f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "12224a1d1326bb76fccecdc44ef10b943a348c5db0b0986fe1f973a515496c23";
+      sha256 = "fdc935009644294a4349474c28d087c29ca1a07934dc7b5ba11e34c367f858e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "8caa52f7d7eba810af4ee5fe666a0f8b42f06178a048b9c3df552d60de229512";
+      sha256 = "38675d2e5500a21d93f8184f0e1839a490405dd56701bae901a1f4fecd0e41fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "2ec5bd3d8077427e6f897f24a65dd0795106b41c53f869e198c473d80f9a1187";
+      sha256 = "9fe67041bba54945fbdf969c0c585bee99560132a2fe85db632400c08cf341d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "43e005ebbc0e36c28beeb7459e4332f258a5ed4c7782ac1edfe9e667f0f27320";
+      sha256 = "bc8d5e0d70b4c0ba24ba956b460f5d70fd6a9c2d09bb6effa9f142655ccb6547";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "22e97b6b60c15ebd0aecd0d4c4add317cc33f60a05cbfcb7e2cbbf415b740fca";
+      sha256 = "b97f0e0d3f2018d82778039a27a11b67021936c9bf526ff85b4795e6040fe563";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "1e16445ab882842732731a9c03d68a6c1f2141ee2a78a00d2cec4d8310361657";
+      sha256 = "05d9dd4c60971f42262e16cb42417acdbe36c595fada3bdac9b4ad1b9797d736";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "da05f794f09e9c91b7b0abb0d446ff0d93d4e21ec9519464a29d39d8025e9144";
+      sha256 = "ddf3b254e789cc5133ed56b3ddf83f8cec6b9f1b8d840d3885c92c3395b18198";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "2d1b1f7ef8610cc251c1555218babc2d93e8189088dc00fd5c64d76e5d1b1524";
+      sha256 = "34aece8d99b5b0996b5fc46ce3bc622e052dce3bff8313c4248de22e2391823c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "89ea5fa03cc3ad404bdcf4a8586daa44a9de04552be5618f5fca1cd033572832";
+      sha256 = "f7f36e08f8602abcaa855cde1f825e6ea68aeef51fb9ccf48cab40868ddb7ad0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "4722a3918593e032bd846f1ffd00e432014e84afc4f65b84d40b6345972456d5";
+      sha256 = "9a6d448c1b564dbe8f839ea47ff03d5f9b029895e095d916ac9d6b4e47957887";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "5dc3a51b9d3b63be9c55ee7fa3e6bc489fec279c1cdda3fb7a905d2b892bc236";
+      sha256 = "cfcec2e6a45f8808d5ac1ab24760b28a21c77851b607e358b225a144fbf87e97";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "47c5182687c634fe5d71bd4e4de4fa564fb1c5e11cdc1e1909c61ef4887ae64e";
+      sha256 = "b586d6f8327547fd985ab8ece9effe5ae508f839a9c4e85012c39174fab21eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ac74c82c721cd6690cbc5d684b684f9b8856ee369f6336a582a7afaa70796ddf";
+      sha256 = "4aec4f5a831ad1720d3705059ac2a7ada0842b730d9df5ba00b628f068209a6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "c0b3597bdb10e90649b0d4d7f7021fae07540f59b8ff001c37e3384ca191a290";
+      sha256 = "03fefcfec26e178b1af63f35c8889536a96af3f40f95ec967b7f47e3af28f061";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "bbf4412b492a5aa9c69a24e98549cf58715174dc7a5332ad68e7057096c57712";
+      sha256 = "8b0ad9ee6e3572bb46cd2ee3f0d2ce5c0a31801b713c28307b9239c124f9baee";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "a9760586112083eb36a80ad983ba2b2871d9388567de54786a074639ad1e60d2";
+      sha256 = "81c813ef203182d8d1d3b66ba9f096dfa6be1620d013852f4582c728ebc1e08e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "66207f430c6ca2ec178d749c1a73950b13d4532f455303689cb6f333dd42d534";
+      sha256 = "171b85bf91ed8e51568ca1510455d6f12044a414604e0950c20ae9b7ab9e7425";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "39a81cdcab313029ef8517a8c5ba99ee00bad85eb0d8bcb4e474e978bec531b8";
+      sha256 = "dfe78faa9752928e3fa198379392963363c22669d6a830ab5d03fa596a436584";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "dc12f5de8d130e29ed6afdd973999f02d64a7e24a0319b4315dacd284411cbb5";
+      sha256 = "333cb935eafd06ede21d8f29fc9b94c2ef617f97b7ef29612af5842e57a0a20f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "882a0fe884852ae0674e504385801f5d37bc385f750cba7a657cce3b5208b915";
+      sha256 = "7fc61ce0118c16c866ae74e15aa68b8cba8a799afead5841efe85c799adbeb21";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "ea153b3fc99a99391cefd60bd1ad85c7f20d8ab75c8ede046400ba11cc84270a";
+      sha256 = "fbf4c3f430558a1925f8aeb263ef9f31313b7dac9a5f965cca5c58643d183e61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "8bf2a2bd7162e0d77975ca84e90a11e5e3a3768dc6f2aa514ae337c6297234e3";
+      sha256 = "ae4933c0bc448b40f44de22ea8ca6d3c65fc767df3e41a1224c44365a9c86f58";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "e84d6fc022ba4073b8fe718b97bd24f2a4607aa2373bfed8d5e3342392378d79";
+      sha256 = "4a91e009d7ee4fb7586874212f5c8244c228836ca22f5eb7a2dbe2b915587492";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "288cab80c8fc5f4d86c11e3a2eb7b709c7c83b1a9bb0af6277270e5de2c1a3a4";
+      sha256 = "2448c45428dc05793a0fe4fe90209809879b4476d4199f942ca4e4bbdbf2b025";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "01ac1ac79660e7881254e734b5fdd27bca4d5e4ca59edb9596f7e06351d70ac6";
+      sha256 = "0f11bea317827b4fd23cbc6e3bb70aa10f7f879886c16a9106fee8521ca1f440";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "fb3785faf424ced77ad426ca57af0f3e012a95369b1d21c2e45a0ee20b141513";
+      sha256 = "449844010b9fe25100d21a796203cd05353b3151ea012a7f6dcabd2992057c2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "fdd59c366029567c7304766df55c1b26cf343ea894ce860c09c9b6fc7de2d329";
+      sha256 = "f03a9888f5b98b3bf371bc0617a604892abda50220348bb76fa41d2600ad091e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "a134efee05e83eab94598023c344f8a5d1689577e3a502394207404c31f9e617";
+      sha256 = "68b101310ca823bb8ca02a86644704afdd6ce52378d96537cca4cbeee6670a5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "d9435ca50da4cccea83236810861f171b82c226e309cfcdc4bc482cc7700824f";
+      sha256 = "199406d08eb4b0c0002123eb13bb43d894f19de3686406542b75b63ea9debdca";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "c39704e465a36dca6aab92f286212be3bf19d3bb13ffd9beb116c082a93d5b5b";
+      sha256 = "4fe2b70b0038bd505b1d98d711bfb7495decaae51dbc9a7728e23ad05d72fc60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "8f7399c91dace4831a8ee9e8577cc1c5a4f6adf03dca99727b4a02dd75e3fd44";
+      sha256 = "bebe0aa276b1aa9c029898487ad71e4ab7e19419c973afd0bb308a86c70d1af1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "0272f94a2af35c3b1c119f840f773048172216512d413fc96bac3000d700af47";
+      sha256 = "26f91bf692ab8e1ded4f1cdd7701786098c4019ee5cbf55abc5c7ed1dabb1e70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "651df98e8048a27031bd7a3e2fc831f730a096b353c8ee4bc122dbb2efa9f9b8";
+      sha256 = "4f143b73ee41bcaa442db99e65a86f47d2f517e854fdaea51ac32f23acc51feb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "3cf549f861a4116de29a557bb156c20ac00fe4c74b3d7d34ee034c58d93e02c0";
+      sha256 = "4804e037f5f1c77d94f539a7ecf55ed1fd76e24a240276a32274d1bab8b78f0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "e95c80ae3cde23c2e5c46d275a3cf7fc7eafff7501e36f8eed75c35715099a82";
+      sha256 = "0eecf30a34a7253efb99fd12f354dda39aba1a967ef9fdc2491399a7fa2d6f83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "5a449bbdcc17018e4ab397da53fb494088822785ad12a8cecedbf29b3f4ab469";
+      sha256 = "1676a467fc60e18d7625a2d8ff56447ee2d324ece1798f2a72e01fdd04b07590";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "83bc6404434776cdfffe5dbb881ae129c770105199db75d93cb548e6d8e1b786";
+      sha256 = "d1be9330ced56239b4b060fa0840dc66e0eb6672e56b7c53ee6d3a9a7ab66497";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "03e14237adb3018e6f87a8c5f5f8958027de62bc61ae13d32f243416be24f8a3";
+      sha256 = "fba3e9e66bae2d51de4d619c878434794a31928a6f17198b88cf9b3611b5dd8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "4b894630987ede195b9cefd5d1820dee6947b90059e852ab3af121edb26c23a6";
+      sha256 = "389182910fc820cd7742b6adb9693c6d819e7ef18d8d59c3947d742f863858c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "21ec74dba16ce06e4801454ff7f12a08776eb51f811395910f5db5ef86c476ca";
+      sha256 = "54a8be4548e339b09d8f0a580e21dcfaf6b805879cc4b11d322ad1c7e61814c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c6b51c4b57e7930133f9b787a771f6ffbc07557c039f94c5e897b338a9429379";
+      sha256 = "910a3c47ad88ce41190640d00d13b9bce983fe82b1b424c2e0ea8ffdc46cb8c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-x86_64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-x86_64/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "58cb18063b47f3fb738769a9384adb48f5ac31350209328f013a683f4bf55736";
+      sha256 = "084aef73cc86d91d0de87756d24c10bd9408d669766be163ef2ca654255d3ad2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "ba1ea1cb0fc6050123edbaf5c49211c8ee2c897fb01cebd85092d3802ad90007";
+      sha256 = "31b38971dbb4179219abebba2e4af9ebc7408cc22efa7d509a6d2e95e4483d31";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "a9b39fedc4a4fbd62a8a2ff8c56bee38c2785c5172a6017da1b01efca8e79981";
+      sha256 = "088d709c208f5b6c61ac3b2c9f92b1033f2f4e12ec8c59d6818e489f83c6ce7a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "b70844ad6f608cc3f9d212929e4e278ab86eb7a0ee6933ac73a4673a54979533";
+      sha256 = "2f6ea2031c3297c08acf4129727c439839a8187169caaa3cfb4f7e0af435c0d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "a3964ca7ef4331a9dfc59a2782ba02695e63698200920435b34cfb5d2a91b74c";
+      sha256 = "f655136b09c77116ea3a34ff249233e704630f82fbeeca4e69e536e6cf54e5f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "7953ed51d14b92a69ef579e9d36f0abdcf9e8e29e3e87f9c098605e520dbbb92";
+      sha256 = "bc037b74217b18486f22f749150c43fdd5832f9468fcd78f874d686af07f9d12";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "e306ba790d170ce433de39816ee322200d9332d9e4b4a3200233c77aed23fd46";
+      sha256 = "7518cb0f99987c58c6974073e207b3d61acf0da2205113c5b2850e017d96ef6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "c95ff9d17f160b66e5d98b50cc9e3e23cb602e96535a20dc6d106648b634af5f";
+      sha256 = "3e282507c63ba8c1cae72de29776aa0acafee8d3ce761e08cd6be80679de5806";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "7612be680b6232be9bf25f44e9878d705da84d9c06f689ce39b704cd5b467a3d";
+      sha256 = "802ad40c1faf63046840e79268ab2c1f57e07976c61c0b88569c0ae6b1fa1126";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "0ff1f5370c1c3ca852880b85bb5b0274a86a2129769b63dcec7dfe2c0dc24d01";
+      sha256 = "0d7e8b4014c21fcd432026a0ba8ec404fb29e19788ce781703e3c66af888c989";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5cfb59c58c42c84b8b27eb764ba734513e3943182de27a924bfd9886fffcd7bc";
+      sha256 = "73e555c48f77650ac03e23f914bf555bb680aa43cdf31611149b5605106fbd6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "82b6944f76105800a44cd0a6cc734a41901c84afdf504d32ffcee1ea6930302e";
+      sha256 = "b21e377b6fd7caab4b3296936bff662e3798ebee398d81569937e14b3a7911c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "b431b242cf9ca2c894cc1ea30efd512c2aa390da9a4ac03ebceb019b8dfe07ff";
+      sha256 = "5c6e85f38e21832b4bde1a818b013559ca0afc13877b84f31e2fd0fd15d23110";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "ab394498f4a9557cdca2b060e458c65d93cb95441464b36dd6131e3690d9edf0";
+      sha256 = "636fa17ab60cc9229d6def795fdd225104455d5c39764af63534f8c9cbeb038f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "04d17aafda6d62a9c3a225fd6136d1ed6f97d2a09f2580cf947f434f8ff1b63c";
+      sha256 = "c1a802e80a78e50504c0134071f83ecffdfe8ec96960ab6b13c586b29bc7b6d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "5286ed9fcd63351bea906c7b24b33398492bc2b8fe6e6ec0b07946f88630243f";
+      sha256 = "2f91cc15d3c298c70c41ec327c462bff3a25bd84a292a731ef0ede406253aa22";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "cb83d8e01aba72c385dd9b9cc4a2a5fd791533481d9bddf32eb8b0245701adbe";
+      sha256 = "dbaa4dd4487b3851c82ae57157076197df67eb51d635dce9ba4bdc107c121ea6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "48b9bbfd7985809559b801353e104ec5ab56654a0141e23e04220ed851705ed9";
+      sha256 = "e70bad35611124a24952eb7e5eefb2e40df4d7c91998fa62f8da1d73c468f6f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "b6b189a3c7b2fe43dce76e1021f96e45417d462847a743a1e77b683266aafcc5";
+      sha256 = "ad4a122375d2bbf9d5f53d8001a13e7655b42f7cd1e8f85c4ccdeb5a1fcb29bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "11fa034d78efe86b64d6d06902d4e4e2bc65ca3ad26f9d4921ea58cb09984876";
+      sha256 = "cf60d3e0baa038a8e8541ff60df61f992d2e8924f8b623a853f1c18b6b621c70";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "31f822245236d5176e4b03ff56b1c65a40ba7bb466410aea2b118776f710aec8";
+      sha256 = "c182514ffe63d2f89f048034df5cbab78503a0c0604abe01beb3877be052fa83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "38fc5dc95972a11cd02b1c081ee321716a42e98ec6ef7e3f435d4b1221bf2ce1";
+      sha256 = "2e35526cfbf9ec90ca05e03086eb8ed38126c7df4e2019549b071b1fc1c702c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "0fef7f42cae9c59916fa6057d364d708c802a1f94941f90caaacb3035296e544";
+      sha256 = "faffc77533d11a3c95ae03604cea6d89724fd3888b80a75d3d294ba0e1a3738a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "13669006bc1b4910b522c29ff090f2678be9fa240f4f267616af593c10ef462f";
+      sha256 = "6b4c4042ebba0447e2abdba1492f74a3d64294c08f6ead9486389df079719511";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "9e7e27590c325c569d52230fc011cae9e9ac01bb812e2e18e5f0267fe55a2918";
+      sha256 = "7533ece466a96dbde70e989b65f6cb54d932198b1c0b14a436513a23dbf70d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "e6c051adaecd6f60d1fc4709d9303cf466024be18742966edbaf43a36789999c";
+      sha256 = "3f9f4246aa07b6e4eebb829147b6b36677f640d4165f0309e573577abdec0090";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "b8517c7afbc67ead810e626fa1ea48f1684e19d6dcd662798725b8b892bde6b3";
+      sha256 = "d38573e34c9e65d91bb2183e6a4b2dae26746a3906eaf61326810da7c16b6b60";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "c4c0b29a4a060a0c8af8629adf6ca0ff2976f78cc64aec6fb008b87858e273e8";
+      sha256 = "31a88ca04d74fa7e9276090eb75c5605cae5e560b4383b2308486dd31b6aac2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "49b3abcab9b709150d6e972049f2b6de488c46a12419ea9f1f6197f66e91e8b0";
+      sha256 = "dba3c5ee85d385c9ba25bc30f6c1dad03d942f5ef8263dfdcfc92daff280fc94";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "75a4e80ebf1b76c63552b333d09d2955dcb96695c3a2a1ce4e1c1923f088fb1e";
+      sha256 = "9be9acf89163402f93ace157412617d6a4b4cc15c657d7053eb1237029738e80";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "8ea8d99a94ebc7b8f42d8e10bd95842bbfdd536482efcc122b81be83cdcf3735";
+      sha256 = "519305e7e193995715b89a21dc2a625071fbdf3ac65aef24ce5a8617864b3acc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "e6bef39a4ecd26f015a73c01e16a3c7002ea10940b656c44d143718f0142fe10";
+      sha256 = "238f5f7b0d5fc5bdc407e64ad1daeebb411360f1f2bca8190593dd477ef36ffd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "d10e07baef739462e5416f0b274e5ad28ee3d80b46baa1a6fa3cb58ff60ee058";
+      sha256 = "198c8ad774c8cfae507024576afd485a16d4d7d1e83ccae711151ab90b19b625";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "e49ff3f9972a37af4c5e9b63004ba1830c52f6857731c698d3c865e54be1afc5";
+      sha256 = "659adb1e73e8797637a2c2e0d035d1e17423d2a50aa1ef9545b20ce80471df52";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "f994e1c351ea6baf9a180f78815c64279c9012de3a5081f0556979834e626d3c";
+      sha256 = "4681342dfdd4dad61553a441eddfcb6fd4e682ccaa8b8d62bf13c052845b34be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "5d3b63899668bb1c644e0c4c99bf12ebdc0537ae9c3b7254b109f79d45861f8d";
+      sha256 = "5bc884aed861946b0672b21bc109ef022246bdd2db03efb18e368f16a676494b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "b1200734203936c991271a16d46be20e4142ad5ac3f86b37c1dac8aa93d57957";
+      sha256 = "168b6a3e1a9ca5bf492042ac69d837bb33ae596e94e3dcae08a74121f2074084";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1b56d9d55166127ebfc90662ce1165ca70f47aa44efe41fa43f5bd78e82a7d61";
+      sha256 = "338d580883071a761bec3e3da24d35ffc052eb17629f6f2443febb88c2c03199";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "2a822268acefc09e5ba26dee73982de407c4d9aac8c8abe9621c487245654571";
+      sha256 = "7ef232669d13c123ff4cc1f90860006118535e29d309e62bda58680327f94441";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "81e91beebc926105e03b1866b83d4558c89220e2281a5d1ad5ecfbf384529ee3";
+      sha256 = "bd5e5f72002d0bbaa383ce42ec93b604d783403439f8833579e2efbb07a4c7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "fc0ea462b9700642e36ca02589e84be42bdd1943bc014fd1fc3f2601d076e6a3";
+      sha256 = "7e625da091883d57f8aa7ed3ec060feba9328c55b735de718777b76222fd0e82";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "32917a5d626a841856998e2596691b20e86d2e18dc4417f553966b8e4738681d";
+      sha256 = "95e9aff8285cb9aafe2214d6dce93d263c281a0764d1c2b156d75c11de182e0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "d34160eb61dfd9095fbf5c576e787da856815b4510e8d80d1f3e9a948032f7b3";
+      sha256 = "1d19868991246f680f80ce6345791872590556393a27c7ddf95cf88044a9966d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "51828123c95c9d6cc2e36ca3c2c411e7919d7f5555f36674b6f804ab262e4d4d";
+      sha256 = "f8b88f626cc9877fb18b3c14738f53866e60e9a2eac65f76efcd33c52f5342bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "3c4c02943f7a6c60a0a7c87158e03747d4a9e44f1e49cab054b7d35811cfb4f1";
+      sha256 = "5044709e5e8a7833ebeb776ef2452b6b649e8772d3755c05e27cec934b9e4146";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "2885f4677dd03b444a4eec840cebfb9e8bca4b1f091c155e9370b30c9bcbaa41";
+      sha256 = "a0be36a177558e786fa83d570dd474e820f871c1a8b2a271b860b1e3d9a11202";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "4a0aacef612ee558547ea65b43d461ae4f1e4484d8f1b1f08d1e0e1123c39a11";
+      sha256 = "d047f4eab64cd13b150687d0ee8ac0f2a6742f31bd0466d3f07005c2c36c6045";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "756af49598e57e4e604b9d7ae3420fc1d1f92520e9387e769ec32dbf7b88e799";
+      sha256 = "0041adc487a2a6ad619ddedf225edbc1bcb0ccffa547d57c962312a0fefd45dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "4c21904867ebbcf124d66a611454c9170f4974c4056edbe7b85fccc530a89821";
+      sha256 = "df8f85019145dc181a1ba2ce3e4d38fc076d4a269bf55c9f8c84cba3564c599e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "20b890969b74c69d5b08b5249a2c90abd35e209bc0f604c501c666a8698525bf";
+      sha256 = "12f0c14b9fae63ba2bb43f2f5cd42ee7eaa93666d1c592549d4bd34b5a1dc5a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "0a9a6a5847f6e941d5e4dd1dc005811950b136d9f603aaf4cf7137ef254fa72e";
+      sha256 = "a0dd980be044409d5ff9ce9063130338399dd8be0221f3ac05d2296c36f666a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "31dba20ca0561d706ed27a981578c2009ec7b16e34747b203f032e94ee7c58e4";
+      sha256 = "3da4194adb4d2fe2003357f8fdda6ac9bcbfc0157a5b9d1a47784184a97ec901";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "1fea25b831a12066f42dc06a6b266de967eabd096c313d07f13cc70723a2cac4";
+      sha256 = "d088fd24e8b02ee67e6c9214c63543d82141062c6ed135c0b4c60bfe79135c45";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "3a1d9c4bc047759380d0b32c379d21ca79dbfc583548fd8f7c8f04a09bec6a01";
+      sha256 = "9c3c6266e37138bb3f9af48b6a4f9dcebccfc356fa2785a800180dca3f1b0513";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "9983545d86d35e4e7550edc155a58ff2109daec31f8221c3f4f6bf39a2e5e6f8";
+      sha256 = "1b3fa3bb800bf323210af14329529f4211ffb637281c69c7cde0e3c017dbeccb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "888ca132a30e062cfca97fd1583ac5c67bc74b6ec24d988ea37ba55af2a79843";
+      sha256 = "75938c7f4bd5af50df2ebb88275b7cc597342b9423b4e5a84b99fc3a5205e4e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "311fba327c8c69382296a0aa25ac374c50b179e297a255b69b3699d5a4c45a71";
+      sha256 = "f96fb28c8c1136e082140732b290c928c9bd7dce3b06b0bab066b38471dc3cc9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "6ca08c6ce3c707130fee2a835b151dc49b2d7f36f4bb520cfa9390bc7c415731";
+      sha256 = "6bd3d219077118ef67c1ebbb803c857dc04c674607ae264b0946247b870f81ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "df91e05dbcb7e0d0ee071a98716df1406a13f31e1e35aab9861aa4fabde2b19a";
+      sha256 = "37540ac5c5e624d11125ed9673292ccafa35be4e6e662c8c9786beac2fb321ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "d2e4f16f289dc27c5e86260ca43fbded3d9e72d53b287994868e0e8aa61b90c9";
+      sha256 = "c7bcc816b14aa145d48fd5076effc4f00d79432ae12b5714fae8d0550918686d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "5fe6fec4ab706cb36f18a0106052189e0d4003ff30b2fae3f2f686cba43dc03e";
+      sha256 = "3c6b7495391e8e59d1cf2085ee4d7850989b4112cb9e68206bc75f0e20acf4de";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "cf3ff655c1dccd8760eced7c80afd3a56c55b7ebfc9b0fc9dcf0f44511265bfd";
+      sha256 = "add8c79b308fe6b4a12db0342cd1c4036e6e1a6007bfdade4c90c6e5a612493d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "4d0da6a59535c9c1411b6f6aa55a7302eed58cd2f53f0ff53e04a192cb8b6103";
+      sha256 = "0ef1d0d8ba0550f1cd1ed9ff80b18a19f4a9abe4e2861709883c4e0011fabd0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "34c88897c19103f20389bde6c25e0a63a2501d95b51b2e3d4c361afae7c7fa97";
+      sha256 = "124145c79a65804bca92a11586b3f420e093d7d84f068b61e9a0c8ea9a17df62";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "086fe715d88df9c1a7c0248427f15ad667ef21d63778294b2034e5e6e8b6e705";
+      sha256 = "e3ee714e18c5a8ecdedd3f53fe8825054ddc2f12943bce3952aad9840093665e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "f0b76fa4dca799e4a6dc301e121d9d665921b57d2b5a6e2f4930ed238db1da97";
+      sha256 = "09aa50674311c91c6894ad159289922c1344a0f80b29e2273d9126a57e47dd87";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "3db95dcaa7e87cff94f840755ed3c2c044d087e7efc9e4e0e66656def33d0658";
+      sha256 = "3f61fce6f15fd873eb33a8deac9b11c0f0e835c81e48ecdd615f2358678227e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "772ddc3bda37a90f96ebf2c0031f6b382e1551b46b24636fb1fdf327438e6bc3";
+      sha256 = "28a5ad4cd3691b9fd8b56203810e0071667370773cc725dc85a6918082b3a98e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "52cfa752621f9671ca20ff58f17daf8231b6b25fdd93a0ab7089ee9ba30545c4";
+      sha256 = "eb6aaf0fd490205fb55a50422363c49cb2e9334e8d9b17589f90bcdae2eda99e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "0f0da43087dde742473ae10ce9aaaf698a82ecd7f6934a22115eeedd25d9f096";
+      sha256 = "225b9dd0b61653a729946b7e2a694998486e10397cae85b1aca6bff7d81a70d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "59c4b11f86d1699f696d820a7b7f188744a4b05ed8969b16e4e275994e885592";
+      sha256 = "4cbbdae996545ecfb2b0503fae50986cef6fceccbe72d68eee301f1a0a83c5a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "e00b35803b0327542c1b8205bae4cd92a0f4d0996d04f6d0e102271def7faba7";
+      sha256 = "71e3e3aa45afd446fc060600c475f1efed29856f99c5f8eddc009a4197758776";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8a608042c8e0bc3b680c43a17f2c2056e33e7ec08786925e84e78770d2dd56f0";
+      sha256 = "928e1b89d48c504ceef9622ccee53b1e73bf007160de8c2a47fe27679700a217";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "e53f0c8f5f95aa91285ecec905eb0f4319241c6d0213fc18005be9a6b217e856";
+      sha256 = "a6641527d0bb48f1ebd0e943a1b6520cb20fdc017a99781996ee7cb3224d432f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "4c9776ae68caff9fb70b72f4bdeb11479cae6de27e2a55d8cb861b741b753155";
+      sha256 = "73ff19ebdc38f46a463bd850df6529e73260be52892e54cbc809f3ce22a910e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "065aea6a7a7557aa03eca1448b98a1f6d28d63623dc20d6c5a2f810ffb034009";
+      sha256 = "a770b4d0efcb405f06c493064a252b1171d0f4a9676e2305ac6a7ebbd94bd415";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "c32c420d584098f614af1009dd6bc9ea2b90447c2681684f36ce16824113ba28";
+      sha256 = "9dc409c431468cdd06b17fc4341eb9e32952cfa09a49b666c50ca926ed18c168";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2bfbab38ec47b41af7b52a712aa1e8ee8530834f186147ea3ec4d96da3f75538";
+      sha256 = "70c0285e2c6d0a9e4b9f0ebe7f1704fbebd0c116f145dc2efccb31564c44ec90";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "dee5070ffc55dc9ea07db4f2fcef6f0114e919b744f077d083a07db56df140cd";
+      sha256 = "a31c13e572411b3a21ad460335bee076012ee0fcb736156b0d0adacd2e16d685";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "508d7612dfcd6b021b8491b4a81a5554e333bc09c499076807c55fb8d855c840";
+      sha256 = "4e2452c54842dfabe8ef514766c6678023260ed0ca621cf95f1a38a855358eb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "fd658e1c2470ab0428e55d045ff28b5b84b1b598064104184bdc2d4a5d3c9435";
+      sha256 = "964377cb40cdf509a0117b7b18eeebfef92807502ba93b8d0744cabc19590d1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "40e764c31003d7d14040eaa0c414c1ceee0a189cecaad1340e3979c6e8357c15";
+      sha256 = "046f379314acc324d62aa2e4fc3fe06b1cbf4506609029c9e9694ab44ab31efc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "775c2ba89716d160f918d14f2b0308ec36d82f62891444fa8900f404928f9c0a";
+      sha256 = "c0b3443e765be546c04d609150cd0d0aebcfa83f8142da85ad6af921e2a286af";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "307088fdb23dc49e94125b291c489c94c24852a7a9183bef7c24e0c6021dfe51";
+      sha256 = "ef7d2d23ad027e4d263d61e1d581fb6b6e3e8f75567d46f6cc2d769034dfa822";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "4e44491b0516f11d1bad2a5bdf3a36d6a910b686d2b41461c41eaba11c96d337";
+      sha256 = "b2c87ac86184c0860c35e11ed46205c695cbcd9efc68dc6253754161cb1bb4ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "9298a06871c2f64c7ef8f1431a414c9618c6bb1fb7ddfd8bd7c44b05db7100e7";
+      sha256 = "a7588f9989c1ade6420dc81d3192a74283b63fa62d2968e98604cb10e6e2a079";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "31c4d00e0fa5f40b595601ebca3d6915a1063f0c54c4a5d4e6a38f200e682452";
+      sha256 = "b0930917909caa42a400471105887dee86af422c3faea00d41f79826e11f4b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "4bec7611e461fddbbdb227fddfbd9a75b385159e21b2cae079f90d4f08ca7e91";
+      sha256 = "4fd3e9643e6835053dfa9e41857aa4858513f5e0e51155ccde6fc74f13f85755";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "cb0ec16d9499c30569efd03432a54afd2d5fba3814b4bcb8910ba2f15e72f0b8";
+      sha256 = "2604b9a5e6204d90799a2deb7a5fe0428265b857c073304c8633de4f410db45d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "b5499e418ce022f9c586a02304632099a40c24d1c85ce4e0c860cb62e549cb07";
+      sha256 = "cfa4729ce0645fb581b00b10cf46784d6c5bc44f1fa313e3ec2476f85c7b993a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "8ae42a4880e83ac18d95b4fe6b7291bbd6edd0a6712849ad0a7e773c93b63576";
+      sha256 = "7293bd556ab5ba7af783b732047ae4735445a2cedf3cdf633cb71c6181c6cd45";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "e9d5dcf1e96a856e72911d6d236d05defc9f8a0a9c6681846bd3fa7dec7ed0e6";
+      sha256 = "245e23da711630d327092b23bedc30bb43abbab850a02e7d794ee871212200c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "73f95036c7f4582ab186f759580217094ae41a25bbd73b04114665ba62743414";
+      sha256 = "562caf3ad16817c9fab7031d6eb95cbab162e937577a1b7b3adcd25556e5e83e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "de64c2f0db63b483c120fd86628e7a1de36f291944d5496a94d76cd62605bf1b";
+      sha256 = "09b77a463e1d587e90f0761ceedaff1dbfa9618b3615da9c1c217a968b1a099a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "8d6d26d45c5daaeea7f7997d066bee1d8bf543fe16364c19d12430ce53b8d47c";
+      sha256 = "2a7edc4e6f8437564817e07bf6a70360c0cb13cba796f1e5f5d75e9a9a2ada03";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "a0334ec1f4e48340e43e9a7440a59df4977f6794b354ee1b9eee76a89c48171d";
+      sha256 = "b756378920ca14c37469d61c63f34a9466f59f40a82b472ea28d61899bb895f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "42d65c749b7fedda87b79b2f29c30e603b6971e42f909ae43aa3d59d2210a162";
+      sha256 = "0ae49d1e6bda868036ec0c414d5bbc5ff74be0732bb6e4805a2e2e828f72b24c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "6b9aca59b26d720fe0aafb8d5ae8be6c1c16985ace64c4e795b6b85f4cc6fb24";
+      sha256 = "aa70f392172d975aa5041b023b9b80a21f5f718d4ca4bdf109d3bfde49088ade";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "3a30933f5c7e041bf47dea561c20456c47324b1abfbf21f57c1d07c7df7617ca";
+      sha256 = "91fddeb7716b46bb8777edb7267e60aaabec997aa42d7e2df71e6487e569c7da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6b22217611fcd94531655d79f0f75ce39ab8e7165dea079d82e5f396102db1d2";
+      sha256 = "e638a03300432737035c8ec16c9436ad3774ca47b2046a86148293b293fda3e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "528d077a9927444f97f9038dfc189b1ce8c5c1df9fca970c6fc7cfa821398cac";
+      sha256 = "9bd9044f192512c9ea151e78363695e4b6b3b983818c86192f73ffe9513d9b01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "265dd3d23420ec4769c5922bbe385cec8c44ea282673fcfe772292523befa44e";
+      sha256 = "5705c42926c38b630f6c9fc5fb04cf09ecafb589dadba19e2e6cd91600141085";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "71acb38bd43c8f8bde7dad6b9a23d34559f7a7d0c369f7e85b3cd32d13b44a71";
+      sha256 = "ddcd5d6ae6274b4f341fa1a1a92b738ddbb2851701482e52b014f282c7d1774e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-i686/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-i686/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "879603c78d95d245b4efe4cfb1362c57042a1fd56aeda5be0b3af15a28f788c6";
+      sha256 = "aead8a1998fe6f5364c1c1a57477361b3c23b63e6c73ded903b2e0ad341b363e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ach/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ach/firefox-140.0b5.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "a7e501acd0069fb355d5bc55e0d60e578122e8f08d90b064ace8d13bf4127ea1";
+      sha256 = "1e011638061ce47193502f1244c48b2ba954e7e665c7ddcd8d7fe338cc9e61ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/af/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/af/firefox-140.0b5.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "3edc1c94431ab99d9e9f9e6380fbf29523bfc560bdc398d40e0bb84436167db2";
+      sha256 = "b7eff363385cad3a3cf1e6e4afb704b203f5a7becbff73729411355199105ff8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/an/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/an/firefox-140.0b5.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "bf641e4e3fcb50a2720828c68dd823ce804cb8ba1a19197b153c7b243aa73c10";
+      sha256 = "2bc588b60e77e62063ec8c6b7fa7b05bb68100953b58e82335644135f1406ebc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ar/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ar/firefox-140.0b5.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "ec1c54d5165736d52fc882c22f04df0b9a82a3d5cb005d39a970f94dc352a6fe";
+      sha256 = "6f4edbedf96574f929eac18e8c727f0de149ee37ee73fc6c48df52dc2ef4f49b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ast/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ast/firefox-140.0b5.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "074fe462785332a3c2e2f3d8a5d0ce22d13a640b9e8d0acc98d3ee1647c44240";
+      sha256 = "3495d176546a734f7f187559418fe2d7f3c76c9e83da587c1fb4edcda4dbfb8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/az/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/az/firefox-140.0b5.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "b3ebe88576c6d0c609a7a42783f5e90f9e3961ecc21e6bf0eee1244490111791";
+      sha256 = "550d5cf64ee2c75daa38a6cda871bec1f61ca0e563e0d5b1962880f80e70c160";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/be/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/be/firefox-140.0b5.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "645a471bc45c54f63be87d6a1a3ea5ae5f424bf32b7f9b472437464240c21ec5";
+      sha256 = "330e775dca339e3a6945d23eeb03aa752eeb9e8491a35eaba36601610f5ea122";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bg/firefox-140.0b5.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "c8f85a2504587fd939057432ed8e7735a1ba0371894624a54c6d6fa8b2fc8788";
+      sha256 = "8faa665c4a0b31b933a7408f116eafceb88a62ac35ad5e4e168763d9a191c5b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bn/firefox-140.0b5.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "53832bb8bb533abdff06a5465aa932a0abe4241b7bc9cdbaaf6ca4f21b320240";
+      sha256 = "8c72162a644877585db295686598bc7e5dc8d620ac5bb266b7781ad44dc7a248";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/br/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/br/firefox-140.0b5.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "f419664ce76ee1caf1ad5d6e4c3c469c3647a5b649a729db98535dd25d614aee";
+      sha256 = "a18b9133a16206f1d67bc9d5e627cfc9fb721619c5ac01da1546da98147e735a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/bs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/bs/firefox-140.0b5.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "ed84c36ab94648dcbe89993fde2ebb9a5f888d9cb83da3912a60ef7c68f676fe";
+      sha256 = "58777ac3d69a8855e2b0a951cedd3f4f953de54b70420083b78dbd19275448a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca-valencia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca-valencia/firefox-140.0b5.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "f51810d7120309d7907ce365a3ca7889ccd2cca40078fdf339c723bf00cc9cc6";
+      sha256 = "449002fe40db46803bcf5bd6a52eee835480a72c9c59df4496ed68e4b56832a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ca/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ca/firefox-140.0b5.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "a6b2ec151b6e56d010635b3edb5fd23659ee5eac7b14caf4e7a9107a05049cf1";
+      sha256 = "59474c67b320c3e9e8ab08d47b2b0277265ec09e1b5f12c7532bd223c3f8f3dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cak/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cak/firefox-140.0b5.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "f281b21314debf2f7911a55f1a03a7d18d15800e598dd0d227d51fbc0686bb1c";
+      sha256 = "60dabdd0cdf32ea8dfa74a8e867e93846dcbdba1fed03063caf70781df141b83";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cs/firefox-140.0b5.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "df68b5f0652248f01854a273564a97009e5323107be4f0643af0d1e274d01ca7";
+      sha256 = "45ae87dfcfebf1fb2912b5644d162162d8a98455e9229c06d5f23a5644a91db1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/cy/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/cy/firefox-140.0b5.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "4b8eb5be13009cc0f26f6145d6a424e6063f21cfcc70c58fc0ad0e3b29113846";
+      sha256 = "40108a63e30314a5aa599b09ac6f0ca87b5f7dbd08de0fa09038bfcf291e951b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/da/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/da/firefox-140.0b5.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "a43ef915b3c408f6072266f3b97ac02b3f27bd10b8ba1e2ec27e43a3a3d480e8";
+      sha256 = "19627a6e38683435e26c184139d9fef0c85d354fe34b406ac16be4de09e7d783";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/de/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/de/firefox-140.0b5.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "c9dca2e0fae1bb033049ced050256a63a90158a60c8b42609dbd11081bfe8ec3";
+      sha256 = "f64faf6d852a31a0e833215789c49f2d58ac4f2f293a68ad1ff6e81ebdbf0bef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/dsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/dsb/firefox-140.0b5.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "07cea557c54f2033f36f5f084d06575b6f55e8cf2f8af9ec333ec2487b96fcf5";
+      sha256 = "184d700e189dcbc21d40d3f5db54c2837356321b027608b330e1cd76268a8650";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/el/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/el/firefox-140.0b5.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "1dcd0eba988414a72a17218a05bf2fe6f5ab1af26dd1ae07bac72d9af2f4f502";
+      sha256 = "9a8ca4f1f802229d9cc0f560488186245a82405aa938cdba20d7ef760314a262";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-CA/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-CA/firefox-140.0b5.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "aade344b8c7db7a3fafaa67245d7d38d7470c7b9d0c94978b7bd3c36a2127571";
+      sha256 = "4886557b6a6ab5db4c71cc6440b60cdbd43bfc432f122de2194ca059766919f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-GB/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-GB/firefox-140.0b5.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "e45fda7738885e6aeb3141e8b1eda1e8c962dcc6cb9c5254d0e20921f066e4ed";
+      sha256 = "45050e91de2864cffc6dd4300d44f389922d8dd572ec257ec72171ce8c09143a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/en-US/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/en-US/firefox-140.0b5.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "314382f39fa55784648cc1dd0daca9e1f0a650f8d598591c8a54172d016f9945";
+      sha256 = "a0ee52348165433189bc72678a3e62899b7f63dfc0b26a5533df43af98f11f9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eo/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eo/firefox-140.0b5.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "d6539e43fe59d660b33ed528d093379123e00ac0d90c2eab8da087cdd594eb53";
+      sha256 = "2f283c0c08a403861b015d003bb2cbbb989f960a4cf5071dbfd076b2b8311c75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-AR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-AR/firefox-140.0b5.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "0cc4e43a4b4158a381856a1bfa861e062a273ef408e2c8083331ec4bb902b97e";
+      sha256 = "6161b9e86c35efcd3528f37c0075b18c718fbc143075f2580ee5e297479b9cd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-CL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-CL/firefox-140.0b5.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "4aa6e06b29aa104b47a7bb7216035ede7b686850b7cdfe12ad9dea0df40daa01";
+      sha256 = "997bdb4cf544482f75456a95435f3e21aab8ab62b84bd095d673f7f289eac774";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-ES/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-ES/firefox-140.0b5.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "0e2d72cdf607a7db275a1b19b42a0fec0192fb5ca0fd6d46a0a433d009f64c0f";
+      sha256 = "90f601277721de0bc1f7f443e1078c662ee999856f5810e58efc999bc9ead114";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/es-MX/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/es-MX/firefox-140.0b5.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "a79ee5bdd66012e6d6fff63303ff62279befe9d363f97a93e0e65b2b1689ac61";
+      sha256 = "653916d1c61dcf53fdb1346e78b7c6c7054ace4ad09304316c3b81fdf71957da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/et/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/et/firefox-140.0b5.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "8f571465035cf972bfc0f2527ef62fd6f7bab7642208f52fa48c49b53c2597b0";
+      sha256 = "7dd4dab421af15474b0417753c5df7b422014ad85c62954518b78589d28ff143";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/eu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/eu/firefox-140.0b5.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "c345cbe1a1756e0f77a4ad911852f48a225e963ee7594925c89d4b3c8cc8ecf1";
+      sha256 = "60d186881b7694813433badc2e8ff787ff6f5ebb4a868197831b8e38abca7870";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fa/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fa/firefox-140.0b5.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "40da9c11b36069fa939b531d9de251e511ef3745e94c23031de3741cd447daab";
+      sha256 = "ff5b4003af3d4be4041517216e94a8ccdf7370cec16000df01cb30a238a07a75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ff/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ff/firefox-140.0b5.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "7716c5668458c2f39fb90816dd1f7eec3f54b9774567d4743e9e1f1364870388";
+      sha256 = "ca08ec6ac6a77cad1e0e24dc29f29a7857eebcd8abcb6614b40045a2ecae699f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fi/firefox-140.0b5.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "41ae7a385cd6ffc6fa05d4088b9ee9b956e5485810d165a5f1001c2ffaeca01a";
+      sha256 = "762d4cb09ecb00e5a51f6f9eef51805f9613716717a52ef107725c5466e81bfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fr/firefox-140.0b5.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "1ea2ee87f0d0c94f8868b119d2d424bb3b830565875e48ccfc1e91e4973f9eb5";
+      sha256 = "6db714ca2523ba57e70e625be0281bf65065b4b3a928671f3bc8286c3a60d1b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fur/firefox-140.0b5.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "d43424b5efe10b2b0e65c0feb5239bd647af086605d918f91d3b2dee7c13adc1";
+      sha256 = "886b97c7d720d5bcf0cb083da7c8c9272c354116ae9a6174a135f024ece89a7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/fy-NL/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/fy-NL/firefox-140.0b5.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "6d024e0bf0dc906e6cbf93391ad26824947a90c084243ec77c305366755ae76b";
+      sha256 = "35af23cfc3b24562fd897163a3e128bf75eb155c591c8aa39faaa25e83acde3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ga-IE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ga-IE/firefox-140.0b5.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "87d7b52ab1ac75fb33de8e13a3df94ddd9231645179070900f16107934b2b6ea";
+      sha256 = "f3b13118476e1c27cec0cc5a6953a0ff9a937c3840d4356af0dbc346943e0cd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gd/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gd/firefox-140.0b5.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "956d2b67600153073c8d20bab2cd4b2b0ce954a33923a86ba6b48c186e0741b0";
+      sha256 = "eb9cb4cc1d142a50b19f43325f455620cf8c88924d8688f2a4706e81cd0f67f1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gl/firefox-140.0b5.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "27e6131bcfe6325ec8d058063dff15f75f7c66f79d15013628684a914a9e49ec";
+      sha256 = "033e8e3693b8cf68066435d85490db69e615688f0b29a3c55c5cea97f867abeb";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gn/firefox-140.0b5.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "ef710f084aae6cf3b2fda3a9e0d017a0bf959960337d4ddee5097d3dd406debe";
+      sha256 = "4c224925a326b8f8d9a1fd95bf5033a5be1e2bae657be6decc329f39d57275ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/gu-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/gu-IN/firefox-140.0b5.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "28ccc4ca0e116dc69ee73dd76da61d32fbf8b67042896f6776ee156cf05e6e86";
+      sha256 = "85f1222a1cd7175d03cf8a8d2985ec8e26cb3eb6ce9b995ef001cb7d2669caa1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/he/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/he/firefox-140.0b5.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "ab26a9a8bcd33bcce2a3347c034b49bac859747b6d2bd51f3ed9ac5206e6fef3";
+      sha256 = "3c16de5fff4b745cf82331d1ca61e26d3470828f7a0780923825193fbd7a77c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hi-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hi-IN/firefox-140.0b5.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "cd45abdfd476d38451a97677654ef53f5d987d1acc1225cfff18fe4d8d600b8e";
+      sha256 = "5bd8778a884af045280bebb3dad18c3713596f2f4bc28866a174aa905a8033c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hr/firefox-140.0b5.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "4951c793afba243271ba640eec8b7351e16b04e9fc49975f3f97844447e21e27";
+      sha256 = "090c4785527ff5060af5ec61ed257a79fe09f48355fdace3748557b66644545e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hsb/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hsb/firefox-140.0b5.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "26881be6be8d8502b8a3cfe2889172bb7b06dcc86cb822805a09fa2e8d839217";
+      sha256 = "a4e024dc461e043c80752b615f81040d963313c6a7d846535520e51f644d2f50";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hu/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hu/firefox-140.0b5.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "af29ec58b423ddcf5ece496b28a11f014619a0e091066bda01495db3c63e88a3";
+      sha256 = "4e782f584f846064a7cbf5765c3be5b204ff2979447c98a84efafe0f6ec96da2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/hy-AM/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/hy-AM/firefox-140.0b5.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "1d202708d4a46499ea91fcb225514966b5c4f099549e014874a93969eae96048";
+      sha256 = "d72106a177b9cdd4202e28d9ae687185acae2e2057a47628249b7b814dd79512";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ia/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ia/firefox-140.0b5.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "8569d38bc4ce56749462b7db17b82b8059a6efca1744b8295439735f4825951d";
+      sha256 = "037217e499e38a3db7589c73092d49dcab2de8e98f2bb09e9c243397573c4fe3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/id/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/id/firefox-140.0b5.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "2718544968fb71d1e7645d8c353e9b909ae7caf0768ae9efae6202681d378026";
+      sha256 = "e49cc487d68df6e4f3c5e829e67ba9b66f6becab4956d7d37818b00d93adf096";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/is/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/is/firefox-140.0b5.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "3048c7a981a59ed35530e882704ca28e57545f63036fa0500309872cb90041f8";
+      sha256 = "935810f00a7742c48a80559b8e387c77781664a202be6f014375ca9b50f0c14e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/it/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/it/firefox-140.0b5.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "47a2136e5d24befe2d7250fc917d838294d3d3d0ce67bbdfc12ed52cb13c5820";
+      sha256 = "3f28d9eebaa24d21583110e062177b2e709a8b20558de73df1d8852ef1fb4095";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ja/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ja/firefox-140.0b5.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "c691c79991add05818169ec0762c71e83704aa26d518fa960d6760e1c4935630";
+      sha256 = "bbb9ff9c320061e98e54a93930c63944cb6cc4f921e89c00a5d5295d4770f59a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ka/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ka/firefox-140.0b5.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "5d5e32cd2dbca632b2af119af427b15c1e0ff201b945b6cacb961ae2092f2b88";
+      sha256 = "8bbe2d76336c916920a74bbff6a80ad53bec9f282849a6ffed4f2c54deef0c2b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kab/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kab/firefox-140.0b5.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "04564d398f617497e6503cd81095c3d9994f1decea0e99a86347dbdea3ec8373";
+      sha256 = "d2a9cd1f96f1dce323ec228e361ef056b648402011c34c9fcc506d76a7cb775c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kk/firefox-140.0b5.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "4c0ee1b602a71b6c2edb5b4d2cc7dee2c92f5cf2100c3211a1cd4747dfbc3cf9";
+      sha256 = "2ff4750434a085bcc6967355ad60895faa9b0f66aebb1df9e77a2b4ad5ec05d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/km/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/km/firefox-140.0b5.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "3f4f5c974a2f82a8eb24eacc80dd43dd6888687d7b33b709a75dfa028ca0ab61";
+      sha256 = "3821c7e71d387596c042b231a046c4e1737beb59fc4869f2731aef7bbba0f61a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/kn/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/kn/firefox-140.0b5.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "b2831008cf28a63f2ef589f6eb9af55b796deffecdb7d5b6ba283820fb303eed";
+      sha256 = "38f9731050ce577db8e657bf817d7e049d75fec65a5a46d3b4092146264fcf56";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ko/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ko/firefox-140.0b5.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "e2a06611817017184cb75cbb999cd51ca4854e14585b5be643afa6fbd976391f";
+      sha256 = "81bbc9a2dfd74aab21573a0d914992be67cafd07b3c9340575a4e2e15d8800d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lij/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lij/firefox-140.0b5.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "dd60b5542bc5ad651fe6c9113f1379e34773a57e85306bb98bdda2738cf4fac1";
+      sha256 = "c310e302c58b8c051879cfe416930b686662cb13d57e416f8d4fcc03a8c10cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lt/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lt/firefox-140.0b5.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "d9dbf35f5982441c0f46af3ab76523d1012d117fb6dd23e45437c23ba30ea196";
+      sha256 = "380ceac202194db26a7c04d718542be4d7ed53d12b90431a80c729fb6a314d0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/lv/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/lv/firefox-140.0b5.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "c24ddb01ca378672832eb5cf8e95bb78f6d5cab3266fa67070441e808db98439";
+      sha256 = "966c9fd50281bb33eeb194bc4725e1c7f090fa73de4b525d417f05427cdf809a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mk/firefox-140.0b5.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "d97f6661efd9f853c0a0e33b8a3c346866594bea9490bbfc4d0506aad919b62c";
+      sha256 = "627744979950de4aa672aefddba71aefeb600175b53146601ab8d2afa41e014c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/mr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/mr/firefox-140.0b5.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "35a07a397fb9daef535f2f8753261ed318f4a775f8e15e266af0942761acf2fc";
+      sha256 = "8c747e56063119607db5c2aab161bd52c4e7a13967c54144fccee5862231766b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ms/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ms/firefox-140.0b5.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "72d8acaf044201716007c6c189222020002d9a4016f4a3d253a91d64ca798783";
+      sha256 = "e33f0ceb939e05283d62de4f07098d40da5895c6ac9cc3394e357d5d66e17e08";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/my/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/my/firefox-140.0b5.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "07a733a01b0825331ef5c8d107f194345e0afd157ae123f4e2e234029ce03903";
+      sha256 = "9f4fa6be9d82941e39c7c8290b9d1c81db93b5e14e8762164b7fb51dc79f9a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nb-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nb-NO/firefox-140.0b5.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "23fd5336cf74966635ee1bb595d10766751251e018039fe97062f92dd28701f1";
+      sha256 = "b933144efd2c94924acbdc023b6e970ec86dcb3af66992f5b8adbd7c6196c07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ne-NP/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ne-NP/firefox-140.0b5.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "225de7dede580be0c8ddfbe8a497af052c424b464ba606e11effb2a0258aaafa";
+      sha256 = "a1538cb554c8e0cdd7aa3cae99b42c8f873b53d8a66f68a1c771792fdcc9ad66";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nl/firefox-140.0b5.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "caeed5870902eabacc4b44398dbc9d8f1e7a94af15de1988d7d269004806559d";
+      sha256 = "c8a4a788a71971d188c684168569fb65180681e34dd0c40068cdf74e577ce031";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/nn-NO/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/nn-NO/firefox-140.0b5.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "878938c66ba82f4b8598e3aa74b6dc9a8285e16d6287bbe760425dff2e6aee33";
+      sha256 = "5fbaab1173ee8b8dfd283641a6dcb2f5d70138045bd0c794a75b5ba09fbe98d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/oc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/oc/firefox-140.0b5.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "1213e2a2226aedad71b543e1914151cf085c3186c447e6001c9ebf9b5644da35";
+      sha256 = "fcfda166f46d99afb40654d1a7028b395f91f50ec22ea873fb2a20b2358866c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pa-IN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pa-IN/firefox-140.0b5.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "7141be31170e77c199c7e88a85b640a0aa9fbf3a87a6502bffdd7b95975e3fa3";
+      sha256 = "4a7f826caf0bac406b5c0025f64e04e0f40cd74c12251f2541dba3e2125b1018";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pl/firefox-140.0b5.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "f6128d1579be2067e2547f8eb1828a56e6dd6f29258b87e363d5105b7cebc4ce";
+      sha256 = "7be0dc3d878ff5b3b0089dbdd6124fb736f1ae6e43aefdc30e17fa7095fc7eec";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-BR/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-BR/firefox-140.0b5.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "9ef2b8cd01242d32f2cb0adf5a7bc310be21f4ba1cae3529cb64da75531d9792";
+      sha256 = "21f9f3142584c0798e88331cf8d961ad66f2d0ff3796d978ba1b7bc7bbb810dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/pt-PT/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/pt-PT/firefox-140.0b5.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "24b50d061bd46d7cccc128b562491e878e67e929f45fc986071d7e8c75585fd6";
+      sha256 = "7b54964662af7c975d64a56178d3a0bcb63fa4f4d7f3022e85384ab2ac194016";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/rm/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/rm/firefox-140.0b5.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "5f138469c44a462d84ecdf70f4d76b9bf09509c0888588cd74240d93a0a65ddf";
+      sha256 = "4f084efd1dbe4424aecf726b9bf78e3e832c79930d366017acc32c3f6bad1969";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ro/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ro/firefox-140.0b5.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "34770ca741c4dc609deb69f606cf227b8abe1c5559c30b4743b03d1fd6bd4e88";
+      sha256 = "a544b6aec82ea94e87d76907ffa295f22f8cafe76b47cdad117437a5ce626733";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ru/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ru/firefox-140.0b5.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "bf0dc41307da0ae66fa013d17e619776ce796301e7c1c3e16adcdf5290d43ce9";
+      sha256 = "ac918191cd19b1cefdbaa34a83aa9e343323f75cedea255ab1caf0119116f826";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sat/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sat/firefox-140.0b5.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "f26a609c8e2dddec77a8d3cddc09fbf03abb9a6f8ff282a155fd0e35778e52f0";
+      sha256 = "ec11b2475fca2aeae9550b2647492227def51ed21ea349586227bbbae2e5362e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sc/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sc/firefox-140.0b5.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "b2535743683e89e58aa9aaed48621553afadd994f6ee1edd020e829abe7a1efe";
+      sha256 = "a6e14ccd27f4b6f57c3464069a194dda3da1b079dd451667fe45f2709b29ab49";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sco/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sco/firefox-140.0b5.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "2731fbe959da7f15a27e3a675fe80b0d54bcae316672035c415376660f8c60f5";
+      sha256 = "78c90f950c950766a633f358920e06da279069f33c37322a1638ac0bf6c2dd59";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/si/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/si/firefox-140.0b5.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "c75fe5891b84c8fcffa4d43093d6c71092741bb60ce3bbb0875067ccb08801d5";
+      sha256 = "5b2155b0e7f61b4bb008dac5a91cfbc373ecf72c8bced76773bcc78bb75e6f1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sk/firefox-140.0b5.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "c4862d30d0cf9450be66cc38213d90c300196bf98b361bfb39fc9d1c4748b2b3";
+      sha256 = "8e5217e5796f746ac6fd99c9b87982e20c70910a15f2e05531d0093ece37da6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/skr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/skr/firefox-140.0b5.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "1702eda3a78cffb1df602d1443fa885a575382b5f5b27fbde44fe26b4b3ca7c5";
+      sha256 = "1fae131ac8dcf6aff16717e0f681cec5621a1952d0d13928ec4ec1f4a923af02";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sl/firefox-140.0b5.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "57dac174f3a82d01f4ddabc28ab47d063f6cff823bf96394aa15b84acc026f03";
+      sha256 = "44e9aeeb682f91ce60571732aaad6e94a2231c2660029ca741707d49f4d2d41d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/son/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/son/firefox-140.0b5.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "02aa9292bc7bb008ce7b3a4c71b7418578c58b45a86397375263ae004c6bdc3c";
+      sha256 = "0e4fe06cbb4e9678d59ab2568d4e1fb7d6dfb388c7dfc55c918405d975c45a68";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sq/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sq/firefox-140.0b5.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "bda64253568603f6bc9edea913748bcee053ff0ff95ea0e7b1fe52960e234f24";
+      sha256 = "21d94ec8f62ff82e72c5b249506f9d2cf735f96ef9ba92575630353d14edc0da";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sr/firefox-140.0b5.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "92fbca93a60dc3f35da2427b2a89185efe0090306df4cace4c025683e13ab7ad";
+      sha256 = "7bcb3e71959b65fb29974cce8169f2ad151475d7f9788c9e22c0b32f7e012c5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/sv-SE/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/sv-SE/firefox-140.0b5.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "ee6be5ad07e13e990c448e19b43a244a15bdd7ea59375ff4ad894ec75dd639bd";
+      sha256 = "9a8b15f4813305901df5482b7873dd9f6e6cb6377aafbcc3186a769f7ed8383b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/szl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/szl/firefox-140.0b5.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "fc481f234c13d42a06dcb6d32a7d092e12113ba15535844a781bf49ed7149781";
+      sha256 = "16c007db8ae7cf01f08fbab1f8f8fc974a65aa5d85dba39eed0c2170e0ad1411";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ta/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ta/firefox-140.0b5.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "082bb72187b9ecd8911051c27a0357ad83fc859a351bc6f48fec4d61961e9b68";
+      sha256 = "924fe10a4ec038dfac1f10a445f88bb16d13d2d9e572e34a454654b622a11ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/te/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/te/firefox-140.0b5.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "13303d06a49825000e7368e8416e38fcbc41f8c9f795b2af6bf836b4f7c65915";
+      sha256 = "fe73e00623af2142be1986748602ffd4b4a809285d6b36131be723dff691067f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tg/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tg/firefox-140.0b5.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "351c468bb51665019393083c834ffb5903b1fbebdbda2560fa233db179bee441";
+      sha256 = "557792ef8ed1e0ecd81fdaaf21c176f5b8a1b2c90d7ed0bc322792020e2d6898";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/th/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/th/firefox-140.0b5.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "f1b2dd8e921d8eebc6bd10b22aca1ce4a48818dba830cae131cf8fe7704e7c6c";
+      sha256 = "0fbe64c99655b66c8b6c17bbc63c6e3a4ed3e44bbd635077a641fa0e05eb4c3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tl/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tl/firefox-140.0b5.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "8e5dacac1a85e5d6aaccd9939aec63143d1688a657e5dc5f0f4ebfe1094acbe5";
+      sha256 = "ebbf21cbea61c110f81ad452989691b81ed2bf830ad7946e51f3f39c2b43df0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/tr/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/tr/firefox-140.0b5.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "14ea2292bc55272d784a0f7d8dc8827502f352665c8652d4251f83cd3e2a6fbc";
+      sha256 = "3649d99ec7c366e1fbde17ad18282ebe05486cf178a3e59f57caa58dde6ef0bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/trs/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/trs/firefox-140.0b5.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3e834c1967efc38e6377fb6e91a40e258b4d3e99561e7d06e7239da0b6db0e6d";
+      sha256 = "ca03e8b17cd5fb3b52d0de8b80c83299d0d90497c758442d60914cf1dd7661fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uk/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uk/firefox-140.0b5.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "0cc79f9b74dc4b8bc52a004e6a299dc7c3067edf51af894a9ef93ff865375daf";
+      sha256 = "5c18f39c0ba60ba060213f8b72266663d97258dffa0453a071c7810954adc320";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/ur/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/ur/firefox-140.0b5.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "ff89b979a9bb6e97b71386c492d0e3ae05097cd21ca4388f6db28ba441bee705";
+      sha256 = "011b35f3ddae4f2dee8424731d41157008409cf3c19184429ef6a83a198975f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/uz/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/uz/firefox-140.0b5.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "69943a4fdb5137baa73fd3c884cc7d2c4c8d3d3c42103fdb4590aec34206df15";
+      sha256 = "ef25f008c7ab6bb046a46d57e93c0015a7189e7fd72684c218a0992f806005a0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/vi/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/vi/firefox-140.0b5.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "0c6b0bb20622e3e181148deecd505c22ce7d3eb70cb3bf89fc234ccdd84384bb";
+      sha256 = "81978010063f3d9bf9cef6719592f5fbb41c64826bb68f658547826e92c9d1d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/xh/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/xh/firefox-140.0b5.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "fb13b9888715720ceca991f449e47ed05154f29f080bfe4c99ee494ac92cf86d";
+      sha256 = "7409e9898935f78bb6762f76a68662ac64086868b89f5e52940e2e3a963e9637";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-CN/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-CN/firefox-140.0b5.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "fa37aa2739232658cb0d947f15ba2839c8b28debb0d3bafae1805a8fc065580a";
+      sha256 = "91172a1bd8722fc67e12f968a51f5d383f9a0bd3d40b4ad56c63e1316d5156fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/linux-aarch64/zh-TW/firefox-140.0b4.tar.xz";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/linux-aarch64/zh-TW/firefox-140.0b5.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "7d300dfc2bf2effa515b05c7e8f51c9c3388024a311c6da9fed1d463bd1946f7";
+      sha256 = "804adf3d4db86537174d2c680daff8df249909d8254e1e5583ac1c0d7a3a5d61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ach/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ach/Firefox%20140.0b5.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "fcc7f8310a689c595c387709685af98b4acc71d02ebf83b4b88a5747d15e7bec";
+      sha256 = "9cb867c92c058f81bb6b7777740f0904cf8610cfe48640b4ba788bec42712cf9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/af/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/af/Firefox%20140.0b5.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "92b2731ca8e8590d7f5c69e48ee196f4a0a34dceaac8eafc3773c15f7fee1d77";
+      sha256 = "5713bf29a1dae788af6a2308548c0a617841a338262b901d2d7e8e6c906a2a1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/an/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/an/Firefox%20140.0b5.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "ca7e1a463cd090e64e798b6f6563e9751b1aa2d4b1227c500bb111c53b3fdee9";
+      sha256 = "24eb57bbd9af5800d8141f61db2b7abcd67afc40b35cebe9d6a606bac1170d01";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ar/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ar/Firefox%20140.0b5.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "f6944b6bd4b086efa5b60a0605709adc737ba1a4ecfa4e689e124331465eff76";
+      sha256 = "c256d4b3f0658d3d2534a2f99df78a9c8de4c6d9159052aff6d138220c2909a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ast/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ast/Firefox%20140.0b5.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "e834ba503dc7fdbdbdf69a516126cb16cdb089eddd1b2773e00c5cc0ff4d7658";
+      sha256 = "9d7008c2ba0142f14ba330a4561e5ba66a9729dffd094a56c0688eb0545d42f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/az/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/az/Firefox%20140.0b5.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "dd4a9c7d87b2e1af7f87b083910682967cafac68aa1c4c87f6b6dcc69bd0836c";
+      sha256 = "b999fc3eab4d3306607f916d7d19b8b380ffd62128b9eb70f8f184a0fe01932d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/be/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/be/Firefox%20140.0b5.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "e6c157e53ef0eabe645ede759f83bcb1e55d3d7da09fb29044edd7e1fd139de0";
+      sha256 = "9b295b314b77c345e91972574b3563cf85b020876abf0825b404b7840057d046";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bg/Firefox%20140.0b5.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "28d50138cca863ee4716f7be693950e468f5442b770dce389081caadb4e86fad";
+      sha256 = "3157128ca5cd17a0e1e38baa2bdf90322595751cdf51fc70201d9ce51a30c91c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bn/Firefox%20140.0b5.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "d16a2cfd1bf7602c22153b7de4b7f74485aaf78b09526985390f4d35783134cc";
+      sha256 = "a2493281741e7338b3e58294aa72a9b39afa0976c6f5db01a0077d95ec781f8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/br/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/br/Firefox%20140.0b5.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "2e9649b9ea8d6da502ce86fcb6a9ed70a4472b58ec7f7a85ea7116c455b8744f";
+      sha256 = "9bbbb53e059cfb4fa06f60ea7c60cc2af7e4fc61579812f8fa9aec3474096f88";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/bs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/bs/Firefox%20140.0b5.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "c566fa2adbbfacdb9779a99a7f925e5a6aa8be78afee2fcc9d082806a7a2998f";
+      sha256 = "539dcf035d240f794074b5fa7968d12c819d044f3bb8299aacf12dc0013ef34b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca-valencia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca-valencia/Firefox%20140.0b5.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "c082e76a703f1d228f45199c0d37f17334720affdf83b9860b538b4fe0381f11";
+      sha256 = "97d6d7866c8d1fb14a57f926e322a9d4f3addb37fde7977a26dc882d1ac44a5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ca/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ca/Firefox%20140.0b5.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "ffe9b9bfa9742d259b1da9675005c21a1018d865fc33eb3006a9757b7af9d9cf";
+      sha256 = "d21d03e2e4c44e5d0ac8d3b685232c1bf21ba52cdbbccad13016834bb735b306";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cak/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cak/Firefox%20140.0b5.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "d6b872285b7db3d977d06e37926250a0d142869c95d60673da38caaadafe6626";
+      sha256 = "a6bbbb0815a0e0a1a9e2ac65ff4847f8be81973a5f333e0130e412cf1f20dd75";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cs/Firefox%20140.0b5.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "e37322b24fe1d3248871314095726a8ee53616b102ddb12be11857fb9fb0c72a";
+      sha256 = "3363713cfe06c13a43a9682cb4ba4b5af198474122d0cb1e35c4979c29a6865c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/cy/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/cy/Firefox%20140.0b5.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "7859f61b331dd65d9f1e3b10919a9d442cdf8f1edf5419944a5a9ef92428e133";
+      sha256 = "18354d7d9de625afcb1c210903a18d06d35ab393f5bba56b2601cca90e1a19c3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/da/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/da/Firefox%20140.0b5.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "7b50efe8bbafe360ceab31db923c61d196402f499bc86d2f402c11b879580581";
+      sha256 = "09f68ef5a82abba5a0d5c26bd42efb9811a4c8e8b05e3a2e68881f86114dd681";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/de/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/de/Firefox%20140.0b5.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "29f7864de3051dc8c63458a4291a03f5cab7c4f1cfcd038cd4cc097300d3fa32";
+      sha256 = "55207c58022b9de2580800ae7f7dcf8885d4e500196bec60ae7c3895650b8be2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/dsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/dsb/Firefox%20140.0b5.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "5487cbd69515dde8e0205aaa6a8439e13e330ca55869a45f4d3b781d2d4b04f4";
+      sha256 = "f4e7f6644f58ed9dd5bd368be6c493542baf429d04694a41be716008b1e1cbdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/el/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/el/Firefox%20140.0b5.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "f7c76d6d24897905a6578d58f19645b197d9d646bea1c9bcb499bbbeddd8e965";
+      sha256 = "56868683851c6f9acc8aaaa68db7d27aa37d8bd3897f765105ed4b834852c605";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-CA/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-CA/Firefox%20140.0b5.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "abf69c3363150980bd1c1a84cd3bdf2d39e4715805f11256a1db38e99e431bcd";
+      sha256 = "1cd3a2bee71bfd98480dbb185a83fad901654f5d2cbbc8b82451916123d5a477";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-GB/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-GB/Firefox%20140.0b5.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "cb9c91e78b00589aa06286af20540e0fb7fd99e045a602aa49353db5de84ae07";
+      sha256 = "0b52e0534c313ccb0b8ab92235a31d6a02e3d93ea0ed16d2226d6225f6c2e29c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/en-US/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/en-US/Firefox%20140.0b5.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "41074b15a8244ec003bde022c29f8bdfd9cc07b7761af8840380c5cd8deb07ab";
+      sha256 = "0e18a2d29400dec3e9285e69d40a6fcd68df1fa59b15aa1e838d97ee95b633e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eo/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eo/Firefox%20140.0b5.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "2b92b43fd83c02243e91d4be7a0a4f32b1ce5ab3f43d2eb98a177ea3fa8c0bde";
+      sha256 = "bffc32a0b380178016dccf7b737c7ac9a4b7eb92cd16105a0b3b18dffae63ad3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-AR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-AR/Firefox%20140.0b5.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "5b4f1f32ed3ad38bc47b04faf68944b9c2eb04f85ac3b6f3653b526fb59dfdfb";
+      sha256 = "99dd4c2524cea56eb5a01d11f180a3e491878ceb4b4b85e2bdd5c351e3eed52c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-CL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-CL/Firefox%20140.0b5.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "603f2ea427bfdfe79bc7087ea3774a4a1deeb8e446f53ea5483e3180e452d59a";
+      sha256 = "4eaf81cc55445d10bf5d6afe7060c7f673ceed66d26350104f7aef497621447d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-ES/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-ES/Firefox%20140.0b5.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "6364d2a4b7ea39d89f654abaae3a291577e74c8b0b764fbaabcbe0992f583159";
+      sha256 = "d2ba722e1a28cac2c99a8573364b264545777cac53839859218bd5d64400d568";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/es-MX/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/es-MX/Firefox%20140.0b5.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "b1690c817759405a79cbc6a50d616fbccde39cc0d99779ee4753603917c1e37e";
+      sha256 = "0674f00814c54795d93a362cb15f7d3037da3fae78098a1bcf569d10625f166d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/et/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/et/Firefox%20140.0b5.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "30b75291e563af62919b75273f442884c9a262fb2a4de542d53027de223f720c";
+      sha256 = "05e738277b188119d318de64b473a08a144253eb7f373d2a8c9519c546c327fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/eu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/eu/Firefox%20140.0b5.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "2b338cf87087b7a4cd172b72a62a52507076088c0dcae1a9f63fe6c4722a6d11";
+      sha256 = "d1a098bccfac6bad61085d4d6e3ef07decef5665edc590a216b85d46d36f6380";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fa/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fa/Firefox%20140.0b5.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "5b1a5509577f307b24065b7f4e88c103306b9937c4d98e49cb9aba97abf2d3a8";
+      sha256 = "8443c7db3237c5a30ab9aeeb2084358a71a030a6d4dda51b4b3b274d8050bf09";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ff/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ff/Firefox%20140.0b5.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "cd5b37a95f414be5af6217ab5dcf983a7ffdcfa78e013b9216ed57f3f9d2a224";
+      sha256 = "3f6f2af196e3ea13d21b20739ad8d4afea28753e4a6f6911efd2889c3861ffb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fi/Firefox%20140.0b5.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "866b567cb5471d434dddbcb58260291b99a322f67b6e203086762083f1967e7d";
+      sha256 = "404209bea1e3d2915445212b5f2ca2e448dec7adedfb4a9901eee0b175b0adb5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fr/Firefox%20140.0b5.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "f5393dcdbdb367bfaf0e1e47ce2a445add9fa265abb87a0c324daceec3a1d0fb";
+      sha256 = "2530f98106899fcb75ef098929d07cb467c8c89c497205874d2285e88f23945f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fur/Firefox%20140.0b5.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "e4ef81af4c352ac12a5a3fb3dd5a34dad3c9acf3ac639e20141694da8fbe8ec6";
+      sha256 = "c895f27121dc816cc26f849de1fa1a89221ef5df7d617f39b69d552afd08987a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/fy-NL/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/fy-NL/Firefox%20140.0b5.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "54be4106d429b1df2ef2d5e3861712f69ec348b47f9bb2565c191762beab8945";
+      sha256 = "e03b79439c2f497a0e8d87eea16ff659417d435454095e050f68f738e091644d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ga-IE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ga-IE/Firefox%20140.0b5.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ee229ef6fa1fe743d5364914c990172e39a9500c2968afc646bacf14a3eb8742";
+      sha256 = "1717510309b0dfed21485023db01b4f8531807f63ce6c14fc6c6342100fd6981";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gd/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gd/Firefox%20140.0b5.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1164bff45a4c75283d70a1dfebf12dd0729275a1135be9710830f7a8eb28521b";
+      sha256 = "f555688aff2a86f6859be7f5ad862107b270e733b54bc6ab8de012628c232550";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gl/Firefox%20140.0b5.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "1317610e3c18cdbd81c9712cf7e6c3ae589952911347c027d3d3a271ff9b9f97";
+      sha256 = "98eb52e363b2bdaf4be579df53d5fcda9f61ba6fe0ea021be00e3ae4eef24924";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gn/Firefox%20140.0b5.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "5ed49bb2afa8c6e8197a20576e97957f0688c144605a5f1c35ebed14f7a1fc41";
+      sha256 = "ad81d8310d57e9f871eecc27943ed1130642c9621b7ddc1b1800bef8db084175";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/gu-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/gu-IN/Firefox%20140.0b5.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "3e4ac33879e91fa422d741f477e7c66f947041999732c5d7b7740f2abdc5bb86";
+      sha256 = "ef2567ffef364b7a90d69549ebaee0bdc1791db0f236492b41ee2a9ccbd8d70f";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/he/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/he/Firefox%20140.0b5.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "94f832c1a5a952823ed1571ea3deaf3a9d115b837114a60e13732de0b8211f5d";
+      sha256 = "8720ef790fc80a8508996adb56cc4d0ca6ea86c098d3dd6a0e3dfe8309f0b3b3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hi-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hi-IN/Firefox%20140.0b5.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "8e2cfbf7c7e015886592a9983390c56fd251ace396bba5f34b3a2593255b1161";
+      sha256 = "2918bbc9d199cb74938f54f5009def557fdfdcadec03ba7048ede47edb04f4a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hr/Firefox%20140.0b5.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e48b5b93adf00da2e4a3ce0b4ec9afa2db03e962287d346de188df2c0d6133b8";
+      sha256 = "883da09b8860a1340691fcfb04f5b8665c4f497489cd4b0670e93288317472fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hsb/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hsb/Firefox%20140.0b5.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "7ab6ff54701b53b258bdb5bd1ab9679cf9acca9c987830d17246dae5d9f141fb";
+      sha256 = "9691f64a2cca90f19c0de44ffa92d897ab79cc9435dbe3fbb7ad8fa831b1b7b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hu/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hu/Firefox%20140.0b5.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "eec1b7f5d3274267d5c25b7aa3b774bf1b44d15801568c60cfe082064d7372b6";
+      sha256 = "3283f61dddd81f508dc58fe594f37bae973be39bbb6eb783dd19a644e8dc88ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/hy-AM/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/hy-AM/Firefox%20140.0b5.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "6347058b34660f414784b5f2782bcef72dbd6349461c4a2f0988cce9b9af6793";
+      sha256 = "e871812379227c2c06db83ab082cbc8b4f75b67a4676176f127628272bfc5f35";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ia/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ia/Firefox%20140.0b5.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "6772fdc20c9a174d0e411c57ae3a383fcc840225e6c3c65b052ca54ac2369621";
+      sha256 = "a829991bdb4c990daae07037d6047daecc7e3277a1122f1f983a8812990b9648";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/id/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/id/Firefox%20140.0b5.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "a4a4e7a132bddc604ea0b9b323339a730b58fdaa2a1c0c7f06f610149c9a4c58";
+      sha256 = "67d899f44ad9306ab978c00eb885df149ebbf6dd326a34075611980a2e25c81c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/is/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/is/Firefox%20140.0b5.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "e6e3f759fa1aa68736b851ae6438ca4eeb7513e7a0e993cb2774c52ed1f2e294";
+      sha256 = "b8498494c0b4de37276de5c75a43c846bc25c2fe8f69f59d4d36d55ae7b5eff4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/it/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/it/Firefox%20140.0b5.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "a0f8f2af64f04e6ba51a082860eb699902e5f5bc27dd995b9b97501d5bc7e0c0";
+      sha256 = "78db18219d6be4ea2edf84b8e2ede39140385c069a088291703c256da38ed7c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ja-JP-mac/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ja-JP-mac/Firefox%20140.0b5.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "3c248f77a15e06c4222760c2dc89d6a8b3f5d2e39772fbd503f35d6fd05aecaf";
+      sha256 = "1ffc9a14b28e03415157d31078f798ee9c65a89040c5e97fa1997fc2ee5352be";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ka/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ka/Firefox%20140.0b5.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "81a45186f076deb52152488cf38b4852b2e0b69e0e6838dc63345587d8d61e88";
+      sha256 = "f0da37860137d3ac987d0b736c0c9c50f4e937df1e4e0bc3d0966982332f76c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kab/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kab/Firefox%20140.0b5.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "84163f185798fc4975e974b3abc617cb04de4e0fcd0494536a9a51efbf8dba23";
+      sha256 = "a81e1d4dd438a1765e201c2dfe2da494f0c5212ee122041bb9f93348b9b6dedc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kk/Firefox%20140.0b5.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "66dc5ac5244e54c22f4ad71bc4653dd416f087008657f16d60d13ef031f96bcb";
+      sha256 = "ab6d96b83912e227644c01854b938df703fa6743fb7f9baae997ab80ca065ac5";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/km/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/km/Firefox%20140.0b5.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "93436870b3cde5355505738fe2ff850d28632223eb4a872c4767961a422c8e3d";
+      sha256 = "42b8255377a61f1fb6967ded391204bea51c86554fefab9138b7848fcadd1ed6";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/kn/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/kn/Firefox%20140.0b5.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "955cec843ecc4360288a573888b15a257f75f39459157dd844208b012cbf8699";
+      sha256 = "77775d78528c08d22ce54fcd00dc977b7debc6f0b315a220bef7876d1da78eb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ko/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ko/Firefox%20140.0b5.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c42535a9c379574d411cce6d4fd5830ccd77ac7b6c849aeba68436bdf82c1186";
+      sha256 = "70d12fe85b89d9834f9c7d0fd28959cbd839e5dc7ad0f2c07c794263fb0803bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lij/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lij/Firefox%20140.0b5.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "470bd5f04da762cf04914613dd6eec4c13c08fa47ad066ab7f078ae4867a2de1";
+      sha256 = "a61c7c1e3a4437817a97a82f8892cea11ed3cc2bde412b5a64b0966261d17b0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lt/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lt/Firefox%20140.0b5.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "47ddaf3acc3f3f19479f59d5fa10493376a53d00543fbbaa9822388ad99740e3";
+      sha256 = "41b77702aa68ca11f0a52a4baf60de49f9668f5cb0706802337591acd3406fdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/lv/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/lv/Firefox%20140.0b5.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "2bdb8c87690c79515d28433f8a740bef9c6b65cdade4d34d6614bcb37c50b743";
+      sha256 = "bebeabd65c432b401191bacda6f939aab6c00e837a3233b369196db16a5f72cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mk/Firefox%20140.0b5.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "eaa7cf469fe18e1af5f2ee1556f91061986bf78a86ba90b6c7b7ccbb65c6b419";
+      sha256 = "291213929ba1950abbdcbab35eb59e53aace3a60b3fbe634815c3ce24af22562";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/mr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/mr/Firefox%20140.0b5.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "2732019664cc9a05c401f690ee8b719dceac32d6ed9266d7ba325d9fe52fb85a";
+      sha256 = "e03bdf951d82b0962500171f0b232b1d3578f9a84e1eba78b41be19ff232e19b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ms/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ms/Firefox%20140.0b5.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "7e91bb6d012fd9536dd78297686a4812dfd9c4f74b6ba2c4c97311d479b76509";
+      sha256 = "011d7de785d36d20bb77bb5757399a062abfc1339de5dfb5611a029b3870601d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/my/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/my/Firefox%20140.0b5.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "83d5c8477be5836b515e0b535c29f7e47a1633ed3464deb57eb882d167d6732a";
+      sha256 = "438f8a5a989d17655ad7b71d38aa624659e90cdb6178e7094f1e27057362d104";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nb-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nb-NO/Firefox%20140.0b5.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "4760c1beef65c7eac0af3722d9f57ab285d7e61c9313683a8c658fbdcc8db359";
+      sha256 = "0a964cbb07466468fa9d948c4dd2049f2cd3a5af268c38d27329f0b86ca1b9a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ne-NP/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ne-NP/Firefox%20140.0b5.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "85b109d9732666dccd91e987409f50832cddaf2e26d56adc9a8abb50fb086b33";
+      sha256 = "b4f2ecc4062c00c8af8e158f1c0eabc2f3a249b8ce411907cca3f32ed7259e9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nl/Firefox%20140.0b5.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "26626d2859d869ad67b8a99f9d0143a307a2998f941b0d8ffbc1b2c10c5d3aec";
+      sha256 = "1ba0773d4d0871dc1cef8c43195f0b0a409cd65d60cd52bdfb2be343310ef8dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/nn-NO/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/nn-NO/Firefox%20140.0b5.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "51b8a1f43bc4fbf15a5723094f7f7b328da5a015751ec0691c98d4d2ce9f16ee";
+      sha256 = "ec1b194966c8b9131dec53e4886449ebaef57cc5a74b4c07f3f1300be45d89e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/oc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/oc/Firefox%20140.0b5.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "a5a71e4caf90caa0d06bc4e25e1871165c9ebe8e710fabb2d52090cb823e5ead";
+      sha256 = "64db50d7cf8110fb07a52a051f679de87431e20a9e8b9cc7d70216392da864e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pa-IN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pa-IN/Firefox%20140.0b5.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "99c12506e095e94890dd10e684d0ca942809a3a37e2650efa72ae87e65e7b45c";
+      sha256 = "3aef49944cbcf028418aa2d00728f6234fb097943a92613de7cbd44f1fd00763";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pl/Firefox%20140.0b5.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "212018c48731d2ca8668642d2c050300a41c08d2a7abf5cdaa2b185dd9c3dcec";
+      sha256 = "11dcb8d1920b878241e0288d0bf5ab948d4e6715f614538aa37428809c45fe61";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-BR/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-BR/Firefox%20140.0b5.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "a25b7e77f2d00bbf1d09cf3b70e8117de7a7ca8f561fe4baf15efa699a5c3d52";
+      sha256 = "b3be4818299c53c21bdc5f969ef1ef25f63184d3d2f6b64818ed0953b133e48d";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/pt-PT/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/pt-PT/Firefox%20140.0b5.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "e10958a717fa15b696221f011ca5bfe9b6e18d6956ef82fa0ed6bc760cb18ec8";
+      sha256 = "00e15c805509c1581807f30824b724886822f0ae3374c7915df02df7cf1b3103";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/rm/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/rm/Firefox%20140.0b5.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "8d7639036da625e60f72e51fce640bd2a447059f8fbf6a6b7209cf1d3a74e63f";
+      sha256 = "fcec910fe50b4048026300de226efb24102ba3b5f49414e3aeb654a53dd92021";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ro/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ro/Firefox%20140.0b5.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "498405a39a28c87cb46f2012b09124e51a3f99e25fe9498c1241594ecbfbf302";
+      sha256 = "190cec36a92228f5a378f27c06a13318436da437b5ea9aa7e952bae31a874495";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ru/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ru/Firefox%20140.0b5.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "29e979cd4639b9bbe6e9e44b79b5173a8f488286382533bb8cb815e4182af549";
+      sha256 = "44324c4801ee925644ea48529b303abda5bf1af1b0bafaa05b219bee85dd968e";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sat/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sat/Firefox%20140.0b5.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "7e8f046e1b7446b15cba2e35a03b978b7308436176babd5ae284e318ee5367ef";
+      sha256 = "bd75841f7cc401cbde05c186ed05acb0cc0054def01a93746ef5635544d563d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sc/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sc/Firefox%20140.0b5.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "7ed54fe5b147236c4be842c04a8341bbcfce15d21b457b516c4ae7f5f36aa34c";
+      sha256 = "7a33465f018f499feb6d923c78a706d6a7b91a185142cde2888cd7f3c7bc0f91";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sco/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sco/Firefox%20140.0b5.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "5d4ee58fda8829d630ed0e6f4db3a45d0d45c26043d7899110939ecb00646a05";
+      sha256 = "6b375e9a10242a14962d3a32eacce685024604d1d01b94d34552836ede00dee1";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/si/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/si/Firefox%20140.0b5.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "596172e11688ca78f9fe5da998723cd63f9772262457db36a2f5fddc0ee614f4";
+      sha256 = "00d743162f57c98c4d1dfb0d9dad8b054d396b837e904bf08769052efc5bd001";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sk/Firefox%20140.0b5.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "9830062f46a64e15681d39a5432a63cbc3175947df962e90f58d8c97d410e9fa";
+      sha256 = "e42ed7d1e3c27e0a0b9eda60cb62f8f80ca6efff1eb5bc760dc54ef332bc7dde";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/skr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/skr/Firefox%20140.0b5.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "99f5c37cf3fb9a2918e760ebbc77e5423903479cc77a869c600320a365e877f1";
+      sha256 = "8b8f25f4fca29cc8cdee2dc1b115dd61fbbba2b4e34182a44034237ce837883c";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sl/Firefox%20140.0b5.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "1b3a3b8456a571948a6b0c15860b9931d66cc04740f653db136331b8ab0d8cdc";
+      sha256 = "33bc92c84f8898cfb651e3dbaa6e44d0d36cf25bcd18590709b6ebce20fe16ea";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/son/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/son/Firefox%20140.0b5.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "82ecd81aefd3a2e3ad39fa20bb733f4547fc32673e030456e31a28e6329365b4";
+      sha256 = "5ec0e3c5e1245ced15371f8004bb49c9347bcbeafec752bd9ec057a6e4fa80fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sq/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sq/Firefox%20140.0b5.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "125a5c6aa708de9b9c709860c2ea74dab9ba51f40f87faff801f7cb217151a29";
+      sha256 = "84c9d9c34363870bdfc7f6a6a5416cf5c533d785618c9d098782378c156474ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sr/Firefox%20140.0b5.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "35b4afe46484cb8ca9093d38fc155948474c80538c3b1721ce67eff9518c3993";
+      sha256 = "346f1cc1d9c66b339ea555d97965a32ba18e45e4991e08f098cd4ec848a60a87";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/sv-SE/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/sv-SE/Firefox%20140.0b5.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d84dfbef368b9b990726e5ee5fc8ad3437696d11747f74f5301d5a52fe2ebb5f";
+      sha256 = "54284aed0d3dfd716c0a709a5407b5a4de149da36e28d22dccd744f5a1386f3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/szl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/szl/Firefox%20140.0b5.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "74a2a1162ce5703807114d2c3a727db10d74367f22a97866b084e23293ea116d";
+      sha256 = "2f8c6f6a7b4ff6a4ae10cc8e613077ed44ed20686f4d774fd7b98902e9259c33";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ta/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ta/Firefox%20140.0b5.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "fbe97f24739b24899b666a04b6e5513a1b03358bdf9d3622947da78013d39b80";
+      sha256 = "f9e32144bbb38db0e22affc83e57413dfbe95ae0227421a9957a28a4d5bd2ca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/te/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/te/Firefox%20140.0b5.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "66516cc17b46140a59e08dec29b65a2c7abc3812279edb25f0f88b94740fae16";
+      sha256 = "8617d545a09b95120344c5e60a6e4819189a273a9f5607a781d5922cf83ad023";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tg/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tg/Firefox%20140.0b5.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "27143f96bc4a02a09b2b86d46b4322d1dd76cfea719c65e81f19666baf239210";
+      sha256 = "254bf6df96997dc2fe6bbb655bd6f46657d9a213a24829e446658ea9946ba463";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/th/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/th/Firefox%20140.0b5.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8179a2e47faaba8943871443550f2d562a1e409c2af660f4adc93d3bf85ee810";
+      sha256 = "4cf71048da6a518b6cbeab880ec83d8c25f1ca46768c6f6804ec186964ea11e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tl/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tl/Firefox%20140.0b5.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "11a536ccb269258bfdf6810d86135cb8d5802071eb659886a2aff7e63ba2f5f1";
+      sha256 = "04b080f4db8874455ce062da8344a0197224d132ac9e548d1de491a76f27adb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/tr/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/tr/Firefox%20140.0b5.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "46f88c04e1e7f2eb41344aae1f7d2ef6f0d49385c8c6a9aacf370a4f32632e6b";
+      sha256 = "3d168f13fb87266ff10a1f982cc98f40dbbacf9bead6193c5909941307964182";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/trs/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/trs/Firefox%20140.0b5.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "07fd992c396199a92b09c93f7478411b788fb132bd2df4446a38ec6e0cf1960f";
+      sha256 = "16eccfd086ee2cffa37bf3851eb9422264276d6fb75eb3b095701f041820456b";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uk/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uk/Firefox%20140.0b5.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "e19dda81f715feaf6011d7f59033df2565db0ec623b7ceccd75538cb3dd7098f";
+      sha256 = "c8dc6ff629b92cec90cd81664135988b89cda7e92885b206ffb36be6af97a5cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/ur/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/ur/Firefox%20140.0b5.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "3fbf0c116482cb641b30db94ecba745df05a419f85eeb0c09180582baf5bb072";
+      sha256 = "d55d1df00cb1a89e256088d871f046e2c79b25d4f6c221e55072d8a52551aea2";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/uz/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/uz/Firefox%20140.0b5.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "0e906f32a4ad896f80bdafc28a4cf86579de2ddb5c19dc7dc5a430f58ba68d2b";
+      sha256 = "f97a5bc25b935296e6f41a04e4ed33776f86a95767ccebbe184ac0491cd31f27";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/vi/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/vi/Firefox%20140.0b5.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "491126108cebab75a43eeb1fcf8e6a4659960055798488c469b2167956f4d6d4";
+      sha256 = "dfd48c9cdfe3aa8291a83c2cb174f098076168d76340e1c787cb1a2f6254c330";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/xh/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/xh/Firefox%20140.0b5.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "67f143f0d7d62772815a7554e74baff5f5fcbe51a58f1f095ec248ee3971cf97";
+      sha256 = "b4dde818b1b2587b9057e96771a205ce691609934ddc4fe3f293a1f4f92598f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-CN/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-CN/Firefox%20140.0b5.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "cd905f3ceff4c7894aa299562fbf495051760af5b600ff35f0d1ef88fdbe2187";
+      sha256 = "c7a7cc8c0f059f44053b712aede9f86e9ebff927dc001dc89e78e844030bdf79";
     }
     {
-      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b4/mac/zh-TW/Firefox%20140.0b4.dmg";
+      url = "https://archive.mozilla.org/pub/devedition/releases/140.0b5/mac/zh-TW/Firefox%20140.0b5.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "8b50ad669970fa040a3c12156c24903c3b6a885ad7cc886ef7a25507ac27f202";
+      sha256 = "728aac576c19521a5cb35e1cf7eb8e82a5055a9dbd4cc31eaa1b0110db10846c";
     }
   ];
 }

From 90f36a1e98384ee3161b86db1bd1cafe49e8d1a1 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <dhs@frame.work>
Date: Fri, 6 Jun 2025 16:50:18 +0800
Subject: [PATCH 1340/1497] framework-tool: 0.4.2 -> 0.4.3

https://github.com/FrameworkComputer/framework-system/releases/tag/v0.4.3

Signed-off-by: Daniel Schaefer <dhs@frame.work>
---
 pkgs/by-name/fr/framework-tool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix
index b05fc3fffe45..f88442c72309 100644
--- a/pkgs/by-name/fr/framework-tool/package.nix
+++ b/pkgs/by-name/fr/framework-tool/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "framework-tool";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "framework-system";
     tag = "v${version}";
-    hash = "sha256-eH6EUpdITFX3FDV0LbeOnqvDmbriDT5R02jhM2DVqtA=";
+    hash = "sha256-gO7ieyVQzK3BkNsy451WNtrx51jlzd6vhwJX8RDoj/o=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qS65k/cqP9t71TxuqP1/0xIPkhe56WEEbzDzV6JfKrs=";
+  cargoHash = "sha256-fgDZgWQGQEN2dLJjghngqeOLDX+0joSiI6OigGC57Hc=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];

From 1619e5a32a1be662cfedd07337d6c231346ddc55 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <dhs@frame.work>
Date: Fri, 6 Jun 2025 16:51:06 +0800
Subject: [PATCH 1341/1497] framework-tool: add johnazoidberg as maintainer

I'm the upstream maintainer as well.

Signed-off-by: Daniel Schaefer <dhs@frame.work>
---
 pkgs/by-name/fr/framework-tool/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix
index f88442c72309..c90e1025f4cc 100644
--- a/pkgs/by-name/fr/framework-tool/package.nix
+++ b/pkgs/by-name/fr/framework-tool/package.nix
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
       nickcao
       leona
       kloenk
+      johnazoidberg
     ];
     mainProgram = "framework_tool";
   };

From a1ea6c92fd6583300054949b76744028436d3a98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 08:58:48 +0000
Subject: [PATCH 1342/1497] python3Packages.ipyvuetify: 1.11.1 -> 1.11.2

---
 pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix
index bab4a43bdfd6..1006dee4835a 100644
--- a/pkgs/development/python-modules/ipyvuetify/default.nix
+++ b/pkgs/development/python-modules/ipyvuetify/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "ipyvuetify";
-  version = "1.11.1";
+  version = "1.11.2";
   pyproject = true;
 
   # GitHub version tries to run npm (Node JS)
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-voAD6ZrUL2Vjx3jMYECEhPtdffsXlSuU2wWu3S8NoYs=";
+    hash = "sha256-P2fb45wct87QS5RshNKMAxCU7Lkx1DAC/nRRhYtREQo=";
   };
 
   # drop pynpm which tries to install node_modules

From 6e25d9885ff38b782cd5c5b6418ddff202ffb6be Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Fri, 6 Jun 2025 11:07:10 +0200
Subject: [PATCH 1343/1497] nixos/filesystems: chore replace 'with' statements

---
 nixos/modules/tasks/filesystems.nix | 38 +++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index ef2a5a685003..e46434559d3c 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -5,11 +5,31 @@
   utils,
   ...
 }@moduleArgs:
-
-with lib;
-with utils;
-
 let
+  inherit (lib)
+    any
+    attrValues
+    concatMapStrings
+    concatMapStringsSep
+    concatStringsSep
+    elem
+    filter
+    flip
+    head
+    literalExpression
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    mkOption
+    optional
+    optionalAttrs
+    optionalString
+    toposort
+    types
+    ;
+  inherit (utils) fsBefore;
+
   # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
   escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
 
@@ -61,7 +81,7 @@ let
           description = "Location of the mounted file system.";
         };
 
-        stratis.poolUuid = lib.mkOption {
+        stratis.poolUuid = mkOption {
           type = types.uniq (types.nullOr types.str);
           description = ''
             UUID of the stratis pool that the fs is located in
@@ -166,9 +186,7 @@ let
 
       };
 
-      config.device = lib.mkIf (config.label != null) (
-        lib.mkDefault "/dev/disk/by-label/${escape config.label}"
-      );
+      config.device = mkIf (config.label != null) (mkDefault "/dev/disk/by-label/${escape config.label}");
 
       config.options =
         let
@@ -320,7 +338,7 @@ in
 
     boot.supportedFilesystems = mkOption {
       default = { };
-      example = lib.literalExpression ''
+      example = literalExpression ''
         {
           btrfs = true;
           zfs = lib.mkForce false;
@@ -471,7 +489,7 @@ in
         # Filesystems.
         ${makeFstabEntries fileSystems { }}
 
-        ${lib.optionalString (config.swapDevices != [ ]) "# Swap devices."}
+        ${optionalString (config.swapDevices != [ ]) "# Swap devices."}
         ${flip concatMapStrings config.swapDevices (sw: "${sw.realDevice} none swap ${swapOptions sw}\n")}
       '';
 

From fe80df2ba677a0715a95f80dd5cdcfb41d87adfe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 11:24:42 +0200
Subject: [PATCH 1344/1497] python3Packages.mcp: skip flaky test on darwin

---
 .../python-modules/mcp/default.nix            | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 71c8c93869ac..ed05bed977be 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -100,22 +101,27 @@ buildPythonPackage rec {
     "ignore::pydantic.warnings.PydanticDeprecatedSince211"
   ];
 
-  disabledTests = [
-    # attempts to run the package manager uv
-    "test_command_execution"
+  disabledTests =
+    [
+      # attempts to run the package manager uv
+      "test_command_execution"
 
-    # performance-dependent test
-    "test_messages_are_executed_concurrently"
+      # performance-dependent test
+      "test_messages_are_executed_concurrently"
 
-    # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
-    "test_client_session_version_negotiation_failure"
+      # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+      "test_client_session_version_negotiation_failure"
 
-    # AttributeError: 'coroutine' object has no attribute 'client_metadata'
-    "TestOAuthClientProvider"
+      # AttributeError: 'coroutine' object has no attribute 'client_metadata'
+      "TestOAuthClientProvider"
 
-    # inline_snapshot._exceptions.UsageError: snapshot value should not change. Use Is(...) for dynamic snapshot parts
-    "test_build_metadata"
-  ];
+      # inline_snapshot._exceptions.UsageError: snapshot value should not change. Use Is(...) for dynamic snapshot parts
+      "test_build_metadata"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Flaky: ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+      "test_notification_validation_error"
+    ];
 
   __darwinAllowLocalNetworking = true;
 

From 55d29209dca10cf15159725838c648e235bd0ceb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 09:36:23 +0000
Subject: [PATCH 1345/1497] python3Packages.osprofiler: 4.2.0 -> 4.3.0

---
 pkgs/development/python-modules/osprofiler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix
index b0c6e012133d..fc9a160cdb2a 100644
--- a/pkgs/development/python-modules/osprofiler/default.nix
+++ b/pkgs/development/python-modules/osprofiler/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "osprofiler";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E=";
+    hash = "sha256-d6jaKyO7X5BIBUvVzMRdCshFdMqKiO8SC4+sbohk4kw=";
   };
 
   build-system = [ setuptools ];

From e95626ec05157709c75c74f3d3a2c96999617966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Fri, 23 May 2025 23:00:41 +0200
Subject: [PATCH 1346/1497] mastodon: allow specifying missingHashes when
 overriding src

---
 pkgs/servers/mastodon/default.nix | 3 +++
 pkgs/servers/mastodon/source.nix  | 1 +
 pkgs/servers/mastodon/update.sh   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 54e0c8624d94..095358d55656 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -19,6 +19,7 @@
   srcOverride ? callPackage ./source.nix { inherit patches; },
   gemset ? ./. + "/gemset.nix",
   yarnHash ? srcOverride.yarnHash,
+  yarnMissingHashes ? srcOverride.yarnMissingHashes,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,9 +37,11 @@ stdenv.mkDerivation rec {
     pname = "${pname}-modules";
     inherit src version;
 
+    missingHashes = yarnMissingHashes;
     yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
       inherit src;
       hash = yarnHash;
+      missingHashes = yarnMissingHashes;
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index b1c8389786c1..4dcc524f01b3 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -19,4 +19,5 @@ in
 // {
   inherit version;
   yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
+  yarnMissingHashes = null;
 }
diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index 330e53676b7a..ca1c52d77872 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -102,6 +102,7 @@ in
 // {
   inherit version;
   yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+  yarnMissingHashes = null;
 }
 EOF
 SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')"

From 27c294bd543bc9a0891d4b872c73f37b2ff297b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 09:45:08 +0000
Subject: [PATCH 1347/1497] geteduroam: 0.11 -> 0.12

---
 pkgs/by-name/ge/geteduroam/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix
index 38a34a0ef224..fd4c0218b897 100644
--- a/pkgs/by-name/ge/geteduroam/package.nix
+++ b/pkgs/by-name/ge/geteduroam/package.nix
@@ -17,16 +17,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "geteduroam";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchFromGitHub {
     owner = "geteduroam";
     repo = "linux-app";
     tag = finalAttrs.version;
-    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
+    hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8=";
   };
 
-  vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
+  vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk=";
 
   subPackages = [
     "cmd/geteduroam-gui"

From 72e9f573288d0c474403e3f20a6bbc081e215ae0 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 20 Feb 2025 10:41:29 +0100
Subject: [PATCH 1348/1497] mobilizon: use lib.getExe

---
 pkgs/servers/mobilizon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index cfe9d710ab17..db729c9d6ee8 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -157,8 +157,8 @@ mixRelease rec {
     updateScript = writeShellScriptBin "update.sh" ''
       set -eou pipefail
 
-      ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
-      ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix
+      ${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
+      ${lib.getExe nixfmt-rfc-style} pkgs/servers/mobilizon/mix.nix
     '';
     elixirPackage = beamPackages.elixir;
   };

From 458b3d1709bbb02a1583f8a4e9a8e7982453ba1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 10:12:21 +0000
Subject: [PATCH 1349/1497] python3Packages.replicate: 1.0.4 -> 1.0.7

---
 pkgs/development/python-modules/replicate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/replicate/default.nix b/pkgs/development/python-modules/replicate/default.nix
index 492de6662f8b..6956900433b5 100644
--- a/pkgs/development/python-modules/replicate/default.nix
+++ b/pkgs/development/python-modules/replicate/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "replicate";
-  version = "1.0.4";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "replicate";
     repo = "replicate-python";
     tag = version;
-    hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48=";
+    hash = "sha256-zl7b6zg5igyFvx5Qw0cjIiY25xivpTucc2NcP1IkFUI=";
   };
 
   build-system = [ setuptools ];
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for Replicate";
     homepage = "https://replicate.com/";
-    changelog = "https://github.com/replicate/replicate-python/releases/tag/${version}";
+    changelog = "https://github.com/replicate/replicate-python/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jokatzke ];
   };

From 78aa5d766be4a1024f40fb105c769256c0bd84bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 10:13:45 +0000
Subject: [PATCH 1350/1497] kew: 3.3.2 -> 3.3.3

---
 pkgs/by-name/ke/kew/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 2ed6a8fb79a5..1e6cf769bbb3 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DcQs9saw4DeEiPUo/pGaP5MMNfIuzOZPQW1FgQKQ20w=";
+    hash = "sha256-1PUvUFlRhGrZLjLwQrNb0kE695m5poSqrAIOBAnm3xk=";
   };
 
   postPatch = ''

From 101965187eb19218d061b1ab04da4d76ea8fa66f Mon Sep 17 00:00:00 2001
From: MidAutumnMoon <me@418.im>
Date: Tue, 27 May 2025 23:46:20 +0800
Subject: [PATCH 1351/1497] nixos/dnscrypt-proxy2: add `package` option

nixos/dnscrypt-proxy2: remove `with lib;`

Co-authored-by: Sizhe Zhao <prc.zhao@outlook.com>
---
 .../manual/release-notes/rl-2511.section.md   |  2 ++
 .../services/networking/dnscrypt-proxy2.nix   | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 21994daff24e..431e30bc8737 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -28,5 +28,7 @@
 
 - `services.clamsmtp` is unmaintained and was removed from Nixpkgs.
 
+- `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use.
+
 - `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
   This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.
diff --git a/nixos/modules/services/networking/dnscrypt-proxy2.nix b/nixos/modules/services/networking/dnscrypt-proxy2.nix
index 273d0b3a6bbb..d305d8cb524b 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy2.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy2.nix
@@ -4,22 +4,25 @@
   pkgs,
   ...
 }:
-with lib;
 
 let
+
   cfg = config.services.dnscrypt-proxy2;
+
 in
 
 {
   options.services.dnscrypt-proxy2 = {
-    enable = mkEnableOption "dnscrypt-proxy2";
+    enable = lib.mkEnableOption "dnscrypt-proxy2";
 
-    settings = mkOption {
+    package = lib.mkPackageOption pkgs "dnscrypt-proxy" { };
+
+    settings = lib.mkOption {
       description = ''
         Attrset that is converted and passed as TOML config file.
         For available params, see: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/${pkgs.dnscrypt-proxy.version}/dnscrypt-proxy/example-dnscrypt-proxy.toml>
       '';
-      example = literalExpression ''
+      example = lib.literalExpression ''
         {
           sources.public-resolvers = {
             urls = [ "https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md" ];
@@ -29,27 +32,27 @@ in
           };
         }
       '';
-      type = types.attrs;
+      type = lib.types.attrs;
       default = { };
     };
 
-    upstreamDefaults = mkOption {
+    upstreamDefaults = lib.mkOption {
       description = ''
         Whether to base the config declared in {option}`services.dnscrypt-proxy2.settings` on the upstream example config (<https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml>)
 
         Disable this if you want to declare your dnscrypt config from scratch.
       '';
-      type = types.bool;
+      type = lib.types.bool;
       default = true;
     };
 
-    configFile = mkOption {
+    configFile = lib.mkOption {
       description = ''
         Path to TOML config file. See: <https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml>
         If this option is set, it will override any configuration done in options.services.dnscrypt-proxy2.settings.
       '';
       example = "/etc/dnscrypt-proxy/dnscrypt-proxy.toml";
-      type = types.path;
+      type = lib.types.path;
       default =
         pkgs.runCommand "dnscrypt-proxy.toml"
           {
@@ -70,11 +73,11 @@ in
             }
             ${pkgs.buildPackages.remarshal}/bin/json2toml < config.json > $out
           '';
-      defaultText = literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`";
+      defaultText = lib.literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`";
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     networking.nameservers = lib.mkDefault [ "127.0.0.1" ];
 
@@ -94,7 +97,7 @@ in
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
         CacheDirectory = "dnscrypt-proxy";
         DynamicUser = true;
-        ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}";
+        ExecStart = "${lib.getExe cfg.package} -config ${cfg.configFile}";
         LockPersonality = true;
         LogsDirectory = "dnscrypt-proxy";
         MemoryDenyWriteExecute = true;

From e2443f78016538195dc7f7a0a6e57fbf1fa2e599 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 10:25:47 +0000
Subject: [PATCH 1352/1497] python3Packages.markitdown: 0.1.1 -> 0.1.2

---
 pkgs/development/python-modules/markitdown/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 244f9ce8e1ed..8db31e31dc05 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "markitdown";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "markitdown";
     tag = "v${version}";
-    hash = "sha256-siXam2a+ryyLBbciQgjd9k6zC8r46LbzjPMoc1dG0wk=";
+    hash = "sha256-7T5cuFBivazKlUk3OKXKKU3YazRAfGRt9O+gCYX3ciQ=";
   };
 
   sourceRoot = "${src.name}/packages/markitdown";

From 2e501491d67897b6b03cbe4189cba747208ea9cb Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Fri, 6 Jun 2025 12:14:22 +0200
Subject: [PATCH 1353/1497] mobilizon: 5.1.2 -> 5.1.4

Changelog: https://framagit.org/kaihuri/mobilizon/-/releases/5.1.4
---
 pkgs/servers/mobilizon/0001-fix-version.patch | 13 -------------
 .../mobilizon/0002-fix-media-proxy.patch      | 19 -------------------
 pkgs/servers/mobilizon/common.nix             |  6 +++---
 pkgs/servers/mobilizon/default.nix            | 13 -------------
 pkgs/servers/mobilizon/frontend.nix           |  2 +-
 5 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/servers/mobilizon/0001-fix-version.patch
 delete mode 100644 pkgs/servers/mobilizon/0002-fix-media-proxy.patch

diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch
deleted file mode 100644
index 8bf6b2dcda86..000000000000
--- a/pkgs/servers/mobilizon/0001-fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mix.exs b/mix.exs
-index 8338abf8..883e6987 100644
---- a/mix.exs
-+++ b/mix.exs
-@@ -1,7 +1,7 @@
- defmodule Mobilizon.Mixfile do
-   use Mix.Project
- 
--  @version "5.1.0"
-+  @version "5.1.2"
- 
-   def project do
-     [
diff --git a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
deleted file mode 100644
index 9641dd3d60ac..000000000000
--- a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex
-index 8a78ef27..788ccc30 100644
---- a/lib/web/proxy/reverse_proxy.ex
-+++ b/lib/web/proxy/reverse_proxy.ex
-@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do
-   @spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) ::
-           Plug.Conn.t()
-   defp response(conn, client, url, status, headers, opts) do
-+    headers = build_resp_headers(headers, opts)
-+    # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding
-+    headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end)
-+
-     result =
-       conn
--      |> put_resp_headers(build_resp_headers(headers, opts))
-+      |> put_resp_headers(headers)
-       |> send_chunked(status)
-       |> chunk_reply(client, opts)
- 
\ No newline at end of file
diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 1bf19e3245d4..813dcb1da927 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.1.2";
+  version = "5.1.4";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
-    owner = "framasoft";
+    owner = "kaihuri";
     repo = pname;
     tag = version;
-    sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM=";
+    sha256 = "sha256-rtYb9wptP1wAaQrK60apjjSCqtfolXag6QgRYf6pwzQ=";
   };
 }
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index db729c9d6ee8..61dd5c7f8dfa 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -20,19 +20,6 @@ in
 mixRelease rec {
   inherit (common) pname version src;
 
-  patches = [
-    # Version 5.1.2 failed to bump their internal package version,
-    # which causes issues with static file serving in the NixOS module.
-    ./0001-fix-version.patch
-    # Mobilizon uses chunked Transfer-Encoding for the media proxy but also
-    # sets the Content-Length header. This is a HTTP/1.1 protocol violation
-    # and results in nginx >=1.24 rejecting the response with this error:
-    # 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same
-    # time while reading response header from upstream'
-    # Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604
-    ./0002-fix-media-proxy.patch
-  ];
-
   nativeBuildInputs = [
     git
     cmake
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index c08bf51ece9e..23b83bc16d7f 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-oOV4clyUzKTdAMCKghWS10X9Nug9j8mil/vXcFhZ6Z0=";
+  npmDepsHash = "sha256-vf8qEXMZ+TGqKjDN7LjUyOm98EQqweW6NKdJuNoMuVc=";
 
   nativeBuildInputs = [ imagemagick ];
 

From b766cc0cf83aa90a78853fd9bceedc3a9e2cd614 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 10:25:38 +0200
Subject: [PATCH 1354/1497] python3Packages.fastmcp: 2.4.0 -> 2.7.0

Diff: https://github.com/jlowin/fastmcp/compare/refs/tags/v2.4.0...refs/tags/v2.7.0

Changelog: https://github.com/jlowin/fastmcp/releases/tag/v2.7.0
---
 .../python-modules/fastmcp/default.nix        | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index d378c0fc9142..239176b8e6f4 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -7,6 +8,7 @@
   hatchling,
 
   # dependencies
+  authlib,
   exceptiongroup,
   httpx,
   mcp,
@@ -14,24 +16,24 @@
   python-dotenv,
   rich,
   typer,
-  websockets,
 
   # tests
   dirty-equals,
   fastapi,
+  pytest-httpx,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.4.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-F4lgMm/84svLZo6SZ7AubsC73s4tffqjJcd9gvA7hGA=";
+    hash = "sha256-UQV/hIu96ukpJxUhOux0mos0o6j4kvsFp2NJHa47tbw=";
   };
 
   postPatch = ''
@@ -45,6 +47,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    authlib
     exceptiongroup
     httpx
     mcp
@@ -52,7 +55,6 @@ buildPythonPackage rec {
     python-dotenv
     rich
     typer
-    websockets
   ];
 
   pythonImportsCheck = [ "fastmcp" ];
@@ -60,9 +62,28 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     dirty-equals
     fastapi
+    pytest-httpx
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # AssertionError: assert 'INFO' == 'DEBUG'
+    "test_temporary_settings"
+  ];
+
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: Server failed to start after 10 attempts
+    "tests/auth/providers/test_bearer.py"
+    "tests/auth/test_oauth_client.py"
+    "tests/client/test_openapi.py"
+    "tests/client/test_sse.py"
+    "tests/client/test_streamable_http.py"
+    "tests/server/http/test_http_dependencies.py"
+    "tests/server/http/test_http_dependencies.py"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The fast, Pythonic way to build MCP servers and clients";
     changelog = "https://github.com/jlowin/fastmcp/releases/tag/v${version}";

From 3f4e9687719bb2eeede3738d9de74b0778e10d78 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 10:59:10 +0200
Subject: [PATCH 1355/1497] python3Packages.fastapi-mcp: fix tests on darwin

---
 pkgs/development/python-modules/fastapi-mcp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix
index 60ec0fa3f8ec..2d6e76197162 100644
--- a/pkgs/development/python-modules/fastapi-mcp/default.nix
+++ b/pkgs/development/python-modules/fastapi-mcp/default.nix
@@ -64,6 +64,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth";
     homepage = "https://github.com/tadata-org/fastapi_mcp";

From 65c2df876015becf9190f9c49cef8057fec9904e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 5 Jun 2025 08:56:24 +0200
Subject: [PATCH 1356/1497] python3Packages.craft-grammar: move pydantic to
 dependencies

---
 pkgs/development/python-modules/craft-grammar/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix
index 8fdaa2bea823..a531db631783 100644
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@@ -25,12 +25,14 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  dependencies = [ overrides ];
+  dependencies = [
+    overrides
+    pydantic
+  ];
 
   pythonImportsCheck = [ "craft_grammar" ];
 
   nativeCheckInputs = [
-    pydantic
     pytestCheckHook
     pyyaml
   ];

From 622328c81dbf37f04f09a759b3aca45712ae8829 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 10:33:22 +0000
Subject: [PATCH 1357/1497] wgsl-analyzer: 2025-04-04 -> 2025-06-02

---
 pkgs/by-name/wg/wgsl-analyzer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix
index 60d047ee4d31..efa158187e13 100644
--- a/pkgs/by-name/wg/wgsl-analyzer/package.nix
+++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgsl-analyzer";
-  version = "2025-04-04";
+  version = "2025-06-02";
 
   src = fetchFromGitHub {
     owner = "wgsl-analyzer";
     repo = "wgsl-analyzer";
     tag = finalAttrs.version;
-    hash = "sha256-t+Gpm+p2EaobuzUppkhCsaj3q/v+YjMSlau4GVoLgJo=";
+    hash = "sha256-bLwehCmWzqDmmg4iGM21BOUquSYJSY2LIqlKuB1bAlA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-QjR0O/GFOsYi0+r3rYBdR9rw/4Qa5pNjWSbn6CsshqU=";
+  cargoHash = "sha256-Z+slANnmrY5bhM8+Ki+l29OAbpqnx38n53CFCuOR6cM=";
 
   checkFlags = [
     # Imports failures

From 1ec5ab7f1a97d7d7681b3317067c05da4a5a14d0 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 5 Jun 2025 08:56:24 +0200
Subject: [PATCH 1358/1497] snapcraft: pin Python 3.12

Using paths as context managers was removed in Python 3.13.
---
 pkgs/by-name/sn/snapcraft/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index de6d5b213dd4..633803f16bee 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -5,14 +5,14 @@
   lib,
   makeWrapper,
   nix-update-script,
-  python3Packages,
+  python312Packages,
   squashfsTools,
   cacert,
   stdenv,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+python312Packages.buildPythonApplication rec {
   pname = "snapcraft";
   version = "8.8.1";
 
@@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  dependencies = with python3Packages; [
+  dependencies = with python312Packages; [
     attrs
     catkin-pkg
     click
@@ -102,7 +102,7 @@ python3Packages.buildPythonApplication rec {
     validators
   ];
 
-  build-system = with python3Packages; [ setuptools-scm ];
+  build-system = with python312Packages; [ setuptools-scm ];
 
   pythonRelaxDeps = [
     "click"
@@ -125,7 +125,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   nativeCheckInputs =
-    with python3Packages;
+    with python312Packages;
     [
       pytest-check
       pytest-cov-stub

From 4e238e4aa894a139332b3d496a54f35a71180d5c Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Fri, 6 Jun 2025 12:48:37 +0200
Subject: [PATCH 1359/1497] elmPackages.elm: Fix runtime TLS connection to
 package.elm-lang.org

Resolves #414208 by downgrading version of TLS library
used to compile executables.

See upstream issue for more context https://github.com/elm/compiler/pull/2325
---
 .../compilers/elm/packages/ghc9_6/default.nix |  4 +
 .../elm/packages/ghc9_6/tls-1.9.0.nix         | 79 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix

diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
index c9ad34e70a81..e3e030c7610d 100644
--- a/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
+++ b/pkgs/development/compilers/elm/packages/ghc9_6/default.nix
@@ -38,6 +38,10 @@ pkgs.haskell.packages.ghc96.override {
 
         inherit fetchElmDeps;
         elmVersion = elmPkgs.elm.version;
+
+        # Fix TLS issues
+        # see https://github.com/elm/compiler/pull/2325
+        tls = self.callPackage ./tls-1.9.0.nix { };
       };
     in
     elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix b/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix
new file mode 100644
index 000000000000..e7d5acd58026
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/ghc9_6/tls-1.9.0.nix
@@ -0,0 +1,79 @@
+{
+  mkDerivation,
+  asn1-encoding,
+  asn1-types,
+  async,
+  base,
+  bytestring,
+  cereal,
+  crypton,
+  crypton-x509,
+  crypton-x509-store,
+  crypton-x509-validation,
+  data-default-class,
+  gauge,
+  hourglass,
+  lib,
+  memory,
+  mtl,
+  network,
+  QuickCheck,
+  tasty,
+  tasty-quickcheck,
+  transformers,
+  unix-time,
+}:
+mkDerivation {
+  pname = "tls";
+  version = "1.9.0";
+  sha256 = "5605b9cbe0903b100e9de72800641453f74bf5dade6176dbe10b34ac9353433e";
+  libraryHaskellDepends = [
+    asn1-encoding
+    asn1-types
+    async
+    base
+    bytestring
+    cereal
+    crypton
+    crypton-x509
+    crypton-x509-store
+    crypton-x509-validation
+    data-default-class
+    memory
+    mtl
+    network
+    transformers
+    unix-time
+  ];
+  testHaskellDepends = [
+    asn1-types
+    async
+    base
+    bytestring
+    crypton
+    crypton-x509
+    crypton-x509-validation
+    data-default-class
+    hourglass
+    QuickCheck
+    tasty
+    tasty-quickcheck
+  ];
+  benchmarkHaskellDepends = [
+    asn1-types
+    async
+    base
+    bytestring
+    crypton
+    crypton-x509
+    crypton-x509-validation
+    data-default-class
+    gauge
+    hourglass
+    QuickCheck
+    tasty-quickcheck
+  ];
+  homepage = "https://github.com/haskell-tls/hs-tls";
+  description = "TLS/SSL protocol native implementation (Server and Client)";
+  license = lib.licenses.bsd3;
+}

From fffc35b2bbba8b0a0bf215bf19daa5cabe7da698 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Jun 2025 11:35:52 +0000
Subject: [PATCH 1360/1497] apacheHttpdPackages.php: 8.4.7 -> 8.4.8

---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 865b7b37180a..11a74cee28dc 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.7";
-      hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg=";
+      version = "8.4.8";
+      hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo=";
     }
   );
 in

From d0a93ecbda813d2e80afa5b15d63dc3c74c14514 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Fri, 6 Jun 2025 13:57:15 +0200
Subject: [PATCH 1361/1497] =?UTF-8?q?radicle-{explorer,httpd}:=200.18.2=20?=
 =?UTF-8?q?=E2=86=92=200.19.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ra/radicle-explorer/package.nix | 4 ++--
 pkgs/by-name/ra/radicle-httpd/package.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index a6eb1001ea5e..6c467f96b1e1 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -63,7 +63,7 @@ lib.fix (
   self:
   lib.makeOverridable (
     {
-      npmDepsHash ? "sha256-pPbN/goBsRHGAnDzof50PlQtS0RMux4dq1b8Gn5jEP4=",
+      npmDepsHash ? "sha256-7/DH0p66FTfC0N42FhWTqehg5m/yq929ANhL4jAt7Ss=",
       patches ? [ ],
     }@args:
     buildNpmPackage {
@@ -77,7 +77,7 @@ lib.fix (
       # separate hash.
       src = fetchgit {
         inherit (radicle-httpd.src) url rev;
-        hash = "sha256-jxiGL9gEbl4n+GmFeRc8cVljfD8hrFRfSrA9GnOeE40=";
+        hash = "sha256-HRSrLdiDETTWNF+Rzvlg1XQerXcCE2xaY+6Xbq5pItI=";
       };
 
       postPatch = ''
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 23be36f33645..365992ca2b1f 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -12,20 +12,20 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.18.2";
+  version = "0.19.1";
   env.RADICLE_VERSION = version;
 
   # You must update the radicle-explorer source hash when changing this.
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-s4QZi3/EEKzlvfhlU9KMuSeH8Al4kFnhADk10WLUilA=";
+    hash = "sha256-RDF36bEJg54DG/YgORGo+BwrHMfmd12FRCrP6fVvHPg=";
     sparseCheckout = [ "radicle-httpd" ];
   };
 
   sourceRoot = "${src.name}/radicle-httpd";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ILsrDrpBMY8X3ZpfyUdf342agP6E8d32LEQTYtV869o=";
+  cargoHash = "sha256-wSz0kM2XU717A0+mU+3eOHJWlRGdG9KjvfUkUq5bv14=";
 
   nativeBuildInputs = [
     asciidoctor

From 585e6f6de1759841a87f0f909a452896b9aaf1ce Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Fri, 6 Jun 2025 13:08:19 +0100
Subject: [PATCH 1362/1497] labelife-label-printer: 1.2.1 -> 2.0.0

---
 .../la/labelife-label-printer/package.nix     | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/la/labelife-label-printer/package.nix b/pkgs/by-name/la/labelife-label-printer/package.nix
index 2efe47654dc9..13ab4a9603a2 100644
--- a/pkgs/by-name/la/labelife-label-printer/package.nix
+++ b/pkgs/by-name/la/labelife-label-printer/package.nix
@@ -1,33 +1,49 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchzip,
   cups,
   autoPatchelfHook,
+  detox,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labelife-label-printer";
-  version = "1.2.1";
+  version = "2.0.0";
 
   arch =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      "x86_64"
-    else if stdenv.hostPlatform.system == "i686-linux" then
-      "i386"
-    else
-      throw "Unsupported system: ${stdenv.hostPlatform.system}";
+    {
+      aarch64-linux = "aarch64";
+      armv7l-linux = "armhf";
+      i686-linux = "i386";
+      x86_64-linux = "x86_64";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  src = fetchurl {
-    url = "https://oss.saas.aimocloud.com/saas/Lablife/bag/LabelPrinter-${finalAttrs.version}.tar.gz";
-    hash = "sha256-twnIFMBMyEM3xGlsuk3763C3emz3mgpEnlfvnL0XRWw=";
+  src = fetchzip {
+    url = "https://oss.qu-in.ltd/Labelife/Label_Printer_Driver_Linux.zip";
+    hash = "sha256-0ESZ0EqPh9Wz6ogQ6vTsAogujbn4zINtMh62sEpNRs4=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    detox
+  ];
   buildInputs = [ cups ];
 
+  unpackPhase = ''
+    runHook preUnpack
+
+    tar -xzf ${finalAttrs.src}/LabelPrinter-${finalAttrs.version}.001.tar.gz --strip-components=1
+
+    runHook postUnpack
+  '';
+
   installPhase = ''
     runHook preInstall
+    # Remove spaces from PPD filenames
+    detox ppds
+
     # Install the CUPS filter with executable permissions
     install -Dm755 ./${finalAttrs.arch}/rastertolabeltspl $out/lib/cups/filter/rastertolabeltspl
 
@@ -46,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     longDescription = ''
       Supported printer models include:
       - D520 & D520BT
-      - PM-201
       - PM-241 & PM-241-BT
-      - PM-246 & PM-246S
 
       Brands using Labelife drivers include:
       - Phomemo
@@ -58,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     maintainers = with lib.maintainers; [ daniel-fahey ];
     platforms = [
+      "aarch64-linux"
+      "armv7l-linux"
       "i686-linux"
       "x86_64-linux"
     ];

From 2d4fc12f1e8995400fc073edd37bbc45942b76e0 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 6 Jun 2025 14:12:22 +0200
Subject: [PATCH 1363/1497] telegram-desktop: add a note to remove
 lib{avif,heif,jxl} next release

---
 .../telegram/telegram-desktop/unwrapped.nix                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index e0d56e3c037e..4159be1e1092 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -105,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: {
       # even though the last 3 dependencies are already in `kimageformats`,
       # because of a logic error in the cmake files, in td 5.15.{1,2} it
       # doesn't link when you don't add them explicitly
+      #
+      # this has been fixed
+      # (https://github.com/desktop-app/cmake_helpers/pull/413), remove next
+      # release
       kimageformats
       libavif
       libheif

From ef984d1859b1ba6d35d5813dba26d59aee22c3c9 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Fri, 6 Jun 2025 15:35:10 +0300
Subject: [PATCH 1364/1497] teleport_16: 16.5.10 -> 16.5.11

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.11
Diff: https://github.com/gravitational/teleport/compare/v16.5.10...v16.5.11
---
 pkgs/by-name/te/teleport_16/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 8011f843ac44..e33ad9171a3a 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -2,9 +2,9 @@
   teleport,
 }:
 teleport.override {
-  version = "16.5.10";
-  hash = "sha256-i+2IK+X0Opyv2tQPpj2XhY64aQGdbylS/C7LsTykuXI=";
-  vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I=";
+  version = "16.5.11";
+  hash = "sha256-uLis1oRTr5J2bKaJtnVAIQ0ixYT8BYLo4jQPcdFp82s=";
+  vendorHash = "sha256-OcVHckqxpTVz6Gaemt3+9WxBQc5D5QBxb3IMGOMq4LI=";
   pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 }

From 69407aaed768e51544be9a0d39212078330777dd Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Fri, 6 Jun 2025 14:44:15 +0200
Subject: [PATCH 1365/1497] maintainers: add yethal

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5c7b0d434e2f..28ac60eeba56 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27246,6 +27246,11 @@
     githubId = 4113027;
     name = "Jesper Geertsen Jonsson";
   };
+  yethal = {
+    github = "yethal";
+    githubId = 26117918;
+    name = "Yethal";
+  };
   yinfeng = {
     email = "lin.yinfeng@outlook.com";
     github = "linyinfeng";

From cc43028aa6ec5585efb67d41c2f1c076fdfde306 Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Fri, 6 Jun 2025 14:45:05 +0200
Subject: [PATCH 1366/1497] nushellPlugins.hcl: init at 0.104.1

---
 pkgs/shells/nushell/plugins/default.nix |  1 +
 pkgs/shells/nushell/plugins/hcl.nix     | 36 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/shells/nushell/plugins/hcl.nix

diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index 1305cd7183f4..d689e49b43e1 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -22,6 +22,7 @@ lib.makeScope newScope (
     };
     skim = callPackage ./skim.nix { };
     semver = callPackage ./semver.nix { };
+    hcl = callPackage ./hcl.nix { };
   }
   // lib.optionalAttrs config.allowAliases {
     regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix
new file mode 100644
index 000000000000..b0bbe819fb7e
--- /dev/null
+++ b/pkgs/shells/nushell/plugins/hcl.nix
@@ -0,0 +1,36 @@
+{
+  stdenv,
+  lib,
+  rustPlatform,
+  pkg-config,
+  nix-update-script,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nushell_plugin_hcl";
+  version = "0.104.1";
+
+  src = fetchFromGitHub {
+    repo = "nu_plugin_hcl";
+    owner = "Yethal";
+    tag = version;
+    hash = "sha256-AGTrSLVzbnzMQ2oUuD8Lq4phRt404lSRPiU8Oh9KBG0=";
+  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-5bxE+wN3uAbJSIh0wFS/KA5iTyFiSvFWmj14S/Fmkec=";
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
+  cargoBuildFlags = [ "--package nu_plugin_hcl" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Nushell plugin for parsing Hashicorp Configuration Language files";
+    mainProgram = "nu_plugin_hcl";
+    homepage = "https://github.com/Yethal/nu_plugin_hcl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yethal ];
+    platforms = with platforms; all;
+  };
+}

From b0afabcc289d6da392d76fbd19cf1673c9244337 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 12:24:47 +0000
Subject: [PATCH 1367/1497] zipline: 4.1.0 -> 4.1.1

---
 pkgs/by-name/zi/zipline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index 2bc70110809f..f31096bfe0a7 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -29,18 +29,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5qa2K17RmWHO5mrkz/Imoxv4ODEaJow3BMUBNzl7Dg8=";
+    hash = "sha256-5/qVczCypQ2HybpBzEJe9THsrT5Iu3md+IXffLJnVmQ=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-xFe1Fdsp8Tpz0r+xvPSYuPR8gXTts6iWTq0a9u+Xh3U=";
+    hash = "sha256-zpNl6Ua4xRvBa62IHf+frnk4tWQHHF/HyEYGuUF2a78=";
   };
 
   buildInputs = [ vips ];

From c7a62d368dd19fecb9321e2e1e5e884bf91d1443 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:13:40 +0200
Subject: [PATCH 1368/1497] exploitdb: 2025-05-30 -> 2025-06-06

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-05-30...2025-06-06
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 67585f1d7c39..069a9f644a54 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2025-05-30";
+  version = "2025-06-06";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-X90stp4BiHOHoh030eqGeUGiWytF5ryY08/VYEsbnIw=";
+    hash = "sha256-DOzhxZZ66p49tECn0z1lGSNHq3GEpEbayhwsiJ6IGG4=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 56353fdbc53627ec6b6c74da8b236147992fa0b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:14:33 +0200
Subject: [PATCH 1369/1497] python313Packages.tencentcloud-sdk-python: 3.0.1393
 -> 3.0.1394

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1393...refs/tags/3.0.1394

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1394/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 8e6704319bac..fc2ae250a34d 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1393";
+  version = "3.0.1394";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-cw+H8CvyCWbhYvNkGFesSqqhHwlUg3oHCKn9Vtll3JA=";
+    hash = "sha256-yX+57zIrz7o8wBPOcB7Kuifq9Z426pKa1/0/e3UHgDQ=";
   };
 
   build-system = [ setuptools ];

From 24b3e369f8b405c326fa82fbff5506c97e5f84b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:14:55 +0200
Subject: [PATCH 1370/1497] python313Packages.publicsuffixlist: 1.0.2.20250603
 -> 1.0.2.20250606

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250606-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index db8b08db1f00..cec383469045 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250603";
+  version = "1.0.2.20250606";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yilOA8vKLb7Q1KTAM7+iO5HIkphALi+BL64RdXIpcX4=";
+    hash = "sha256-N4Lp8bRrD18DvSyg0Ye9wV/T1w2prNjHEdVDSq0wJoM=";
   };
 
   build-system = [ setuptools ];

From cf0749d1a04a7759405d44a03f3d34411bb71bd8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:16:02 +0200
Subject: [PATCH 1371/1497] checkov: 3.2.436 -> 3.2.437

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.436...refs/tags/3.2.437

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.437
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 0a4e982acc8f..0cd5b7deac27 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.436";
+  version = "3.2.437";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-QI7gJjk7TtafSqGJ8vX+bTgajeRjBUHQnNJxhDiVUDI=";
+    hash = "sha256-AXqrqAtwGKdzgPwWEpqScFcsP62tvMpNxVn+K75aHUo=";
   };
 
   pythonRelaxDeps = [

From 144b4784fa5762781ea74e5cc9d802e20c152f11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:17:28 +0200
Subject: [PATCH 1372/1497] python312Packages.mypy-boto3-cloudformation: 1.38.0
 -> 1.38.31

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 55130de6c032..12ef954aae92 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -226,8 +226,8 @@ rec {
       "sha256-E/vP9Z9Cd6QZDJ2es245eXiUjTSsV1XNN9qNnIbXJ7E=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.38.0"
-      "sha256-VjOZFmwH6R4GlfseWBA6JIsr7g214sPwcVV3bdYxGAU=";
+    buildMypyBoto3Package "cloudformation" "1.38.31"
+      "sha256-9BhSMfqrl7+1CyXcEyMzPGMKCS/6jBU1byERb8kqf0I=";
 
   mypy-boto3-cloudfront =
     buildMypyBoto3Package "cloudfront" "1.38.12"

From fd187d1c2fdc6c6a52d3f05fc8804ceb7098b92b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:17:58 +0200
Subject: [PATCH 1373/1497] python312Packages.mypy-boto3-kms: 1.38.0 -> 1.38.31

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 12ef954aae92..57c38c20a783 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -762,8 +762,8 @@ rec {
       "sha256-PKOF/jd1Wjz8lCwbCd4cfHeStkvcDhQu7a7bpHaizgU=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.38.0"
-      "sha256-s1D6mzq5T7G8jm2nxUr7Kq6QeT3oDBOF4yafahD+fq4=";
+    buildMypyBoto3Package "kms" "1.38.31"
+      "sha256-hCN7Docv7FRJrUW1JveU8v68OFl97PQ+xQRICQ8D9rY=";
 
   mypy-boto3-lakeformation =
     buildMypyBoto3Package "lakeformation" "1.38.0"

From 406c3a34217aae131d7ea780dc54a73fcbdd2016 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:18:34 +0200
Subject: [PATCH 1374/1497] python312Packages.mypy-boto3-wafv2: 1.38.0 ->
 1.38.31

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 57c38c20a783..04adbb7e0bfc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1398,8 +1398,8 @@ rec {
       "sha256-ndTROc1T2APmQHL7EsSeU3XxWPYzp1e32tzqe4UDs/8=";
 
   mypy-boto3-wafv2 =
-    buildMypyBoto3Package "wafv2" "1.38.0"
-      "sha256-j50nk+lk4EaSjKHQ94ZWz0euxQSubBx3pTRSRObxBtc=";
+    buildMypyBoto3Package "wafv2" "1.38.31"
+      "sha256-mWZAUafk2fNj9Se9q06vAKSswzLFqeqnt7e5mncqhdM=";
 
   mypy-boto3-wellarchitected =
     buildMypyBoto3Package "wellarchitected" "1.38.0"

From 48da8657f71e2492e27b1799c7b7650bbabc4b0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 15:18:40 +0200
Subject: [PATCH 1375/1497] python313Packages.boto3-stubs: 1.38.30 -> 1.38.31

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 816e6516e1fd..c1f028ec4635 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.38.30";
+  version = "1.38.31";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-dSwG+AEjONb1mSiArcRn41ljisLIusmiFE3dA/Scyds=";
+    hash = "sha256-ApPlSjB6qaMXhT3k0YZPFtv/r8By6SIxcmw2cRO9ho4=";
   };
 
   build-system = [ setuptools ];

From d75957a3bbc310475425c9042174225c837f9473 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 5 Jun 2025 15:02:58 +0530
Subject: [PATCH 1376/1497] treewide: remove rec when using finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../au/auto-multiple-choice/package.nix       |  6 ++---
 pkgs/by-name/be/besu/package.nix              | 12 +++++-----
 pkgs/by-name/eu/eukleides/package.nix         |  4 ++--
 pkgs/by-name/ge/geoserver/package.nix         |  4 ++--
 pkgs/by-name/gl/glog/package.nix              |  4 ++--
 pkgs/by-name/ha/has/package.nix               |  4 ++--
 pkgs/by-name/is/isabelle/package.nix          | 23 ++++++++++---------
 pkgs/by-name/li/libde265/package.nix          |  4 ++--
 pkgs/by-name/li/littlenavmap/package.nix      | 14 +++++------
 pkgs/by-name/mf/mftrace/package.nix           |  4 ++--
 .../msbuild-structured-log-viewer/package.nix | 16 ++++++-------
 pkgs/by-name/no/noti/package.nix              |  2 +-
 pkgs/by-name/np/nph/package.nix               |  4 ++--
 pkgs/by-name/q2/q2pro/package.nix             | 10 ++++----
 pkgs/by-name/qr/qrencode/package.nix          |  4 ++--
 .../sw/swaynotificationcenter/package.nix     |  6 ++---
 .../compilers/llvm/common/tblgen.nix          |  4 ++--
 .../interpreters/spidermonkey/common.nix      |  2 +-
 .../libraries/libpulsar/default.nix           |  6 ++---
 .../development/libraries/poppler/default.nix |  7 +++---
 pkgs/development/tools/ilspycmd/default.nix   |  4 ++--
 21 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/pkgs/by-name/au/auto-multiple-choice/package.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
index 85820918503f..bb3c234b8d0c 100644
--- a/pkgs/by-name/au/auto-multiple-choice/package.nix
+++ b/pkgs/by-name/au/auto-multiple-choice/package.nix
@@ -23,12 +23,12 @@
   pkg-config,
   poppler,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "auto-multiple-choice";
   version = "1.7.0";
   src = fetchurl {
-    url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz";
-    # before 1.7.0, the URL pattern used "precomp" instead of "dist".    ^^^^
+    url = "https://download.auto-multiple-choice.net/auto-multiple-choice_${finalAttrs.version}_dist.tar.gz";
+    # before 1.7.0, the URL pattern used "precomp" instead of "dist".
     sha256 = "sha256-37kWqgdvZopvNSU6LA/FmY2wfSJz3rRSlaQF2HSbdmA=";
   };
 
diff --git a/pkgs/by-name/be/besu/package.nix b/pkgs/by-name/be/besu/package.nix
index 208377db95a8..e0e2675f2937 100644
--- a/pkgs/by-name/be/besu/package.nix
+++ b/pkgs/by-name/be/besu/package.nix
@@ -9,12 +9,12 @@
   testers,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "besu";
   version = "24.1.2";
 
   src = fetchurl {
-    url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
+    url = "https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${finalAttrs.version}/besu-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg=";
   };
 
@@ -26,20 +26,20 @@ stdenv.mkDerivation (finalAttrs: rec {
     cp -r bin $out/
     mkdir -p $out/lib
     cp -r lib $out/
-    wrapProgram $out/bin/${pname} \
+    wrapProgram $out/bin/besu \
       --set JAVA_HOME "${jre}" \
       --suffix ${
         if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"
-      } : ${lib.makeLibraryPath buildInputs}
+      } : ${lib.makeLibraryPath finalAttrs.buildInputs}
   '';
 
   passthru.tests = {
     version = testers.testVersion {
       package = finalAttrs.finalPackage;
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
     jemalloc =
-      runCommand "${pname}-test-jemalloc"
+      runCommand "besu-test-jemalloc"
         {
           nativeBuildInputs = [ finalAttrs.finalPackage ];
           meta.platforms = with lib.platforms; linux;
diff --git a/pkgs/by-name/eu/eukleides/package.nix b/pkgs/by-name/eu/eukleides/package.nix
index fed332af0999..039c43921bfb 100644
--- a/pkgs/by-name/eu/eukleides/package.nix
+++ b/pkgs/by-name/eu/eukleides/package.nix
@@ -11,12 +11,12 @@
   texlive,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eukleides";
   version = "1.5.4";
 
   src = fetchurl {
-    url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2";
+    url = "http://www.eukleides.org/files/eukleides-${finalAttrs.version}.tar.bz2";
     sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q";
   };
 
diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 0cee73f25f50..0822e0f42b29 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -8,12 +8,12 @@
   jre,
   unzip,
 }:
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "geoserver";
   version = "2.27.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
+    url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
     hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
   };
 
diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix
index 58246c2f059f..af0e1c877259 100644
--- a/pkgs/by-name/gl/glog/package.nix
+++ b/pkgs/by-name/gl/glog/package.nix
@@ -9,14 +9,14 @@
   pkgsBuildHost,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "glog";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "glog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
   };
 
diff --git a/pkgs/by-name/ha/has/package.nix b/pkgs/by-name/ha/has/package.nix
index 8f629a440a72..47c9dd21f648 100644
--- a/pkgs/by-name/ha/has/package.nix
+++ b/pkgs/by-name/ha/has/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "has";
   version = "1.5.0";
 
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm0555 ${pname} -t $out/bin
+    install -Dm0555 has -t $out/bin
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 6055b76c59a7..82dae0ed306a 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -52,27 +52,28 @@ let
       cp libsha1.so $out/lib/
     '';
   };
+
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "isabelle";
   version = "2025";
 
-  dirname = "Isabelle${version}";
+  dirname = "Isabelle${finalAttrs.version}";
 
   src =
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_macos.tar.gz";
         hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g=";
       }
     else if stdenv.hostPlatform.isx86 then
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux.tar.gz";
         hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY=";
       }
     else
       fetchurl {
-        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz";
+        url = "https://isabelle.in.tum.de/website-${finalAttrs.dirname}/dist/${finalAttrs.dirname}_linux_arm.tar.gz";
         hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE=";
       };
 
@@ -88,14 +89,14 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ procps ];
 
-  sourceRoot = "${dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}";
+  sourceRoot = "${finalAttrs.dirname}${lib.optionalString stdenv.hostPlatform.isDarwin ".app"}";
 
   doCheck = stdenv.hostPlatform.system != "aarch64-linux";
   checkPhase = "bin/isabelle build -v HOL-SMT_Examples";
 
   postUnpack = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv $sourceRoot ${dirname}
-    sourceRoot=${dirname}
+    mv $sourceRoot ${finalAttrs.dirname}
+    sourceRoot=${finalAttrs.dirname}
   '';
 
   postPatch =
@@ -208,11 +209,11 @@ stdenv.mkDerivation (finalAttrs: rec {
 
     # icon
     mkdir -p "$out/share/icons/hicolor/isabelle/apps"
-    cp "$out/Isabelle${version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/"
+    cp "$out/Isabelle${finalAttrs.version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/"
 
     # desktop item
     mkdir -p "$out/share"
-    cp -r "${desktopItem}/share/applications" "$out/share/applications"
+    cp -r "${finalAttrs.desktopItem}/share/applications" "$out/share/applications"
   '';
 
   desktopItem = makeDesktopItem {
@@ -220,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     exec = "isabelle jedit";
     icon = "isabelle";
     desktopName = "Isabelle";
-    comment = meta.description;
+    comment = finalAttrs.meta.description;
     categories = [
       "Education"
       "Science"
diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix
index 13842a96aca6..286f8c37df2e 100644
--- a/pkgs/by-name/li/libde265/package.nix
+++ b/pkgs/by-name/li/libde265/package.nix
@@ -14,14 +14,14 @@
   gst_all_1,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.0.15";
   pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libde265";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY=";
   };
 
diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
index a33c7adf273a..f01cdeee5494 100644
--- a/pkgs/by-name/li/littlenavmap/package.nix
+++ b/pkgs/by-name/li/littlenavmap/package.nix
@@ -51,14 +51,12 @@ let
       ];
   });
 
-  pname = "littlenavmap";
-
   desktopItem = makeDesktopItem {
     name = "Little Navmap";
     desktopName = "Little Navmap";
-    icon = pname;
+    icon = "littlenavmap";
     terminal = false;
-    exec = pname;
+    exec = "littlenavmap";
     categories = [
       "Qt"
       "Utility"
@@ -67,14 +65,14 @@ let
     ];
   };
 in
-stdenv.mkDerivation (finalAttrs: rec {
-  inherit pname;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "littlenavmap";
   version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "albar965";
     repo = "littlenavmap";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM=";
   };
 
@@ -122,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   meta = {
     description = "Free flight planner, navigation tool, moving map, airport search and airport information system for Flight Simulator X, Microsoft Flight Simulator 2020, Prepar3D and X-Plane";
     homepage = "https://github.com/albar965/littlenavmap";
-    changelog = "https://github.com/albar965/littlenavmap/blob/${src.rev}/CHANGELOG.txt";
+    changelog = "https://github.com/albar965/littlenavmap/blob/${finalAttrs.src.tag}/CHANGELOG.txt";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ ck3d ];
     mainProgram = "littlenavmap";
diff --git a/pkgs/by-name/mf/mftrace/package.nix b/pkgs/by-name/mf/mftrace/package.nix
index a384846e7ec1..8f387f970bb3 100644
--- a/pkgs/by-name/mf/mftrace/package.nix
+++ b/pkgs/by-name/mf/mftrace/package.nix
@@ -20,7 +20,7 @@
   - fontforge = null (limited functionality)
 */
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mftrace";
   version = "1.2.20";
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   src = fetchFromGitHub {
     owner = "hanwen";
     repo = "mftrace";
-    rev = "release/${version}";
+    rev = "release/${finalAttrs.version}";
     sha256 = "02ik25aczkbi10jrjlnxby3fmixxrwm2k5r4fkfif3bjfym7nqbc";
   };
 
diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
index 6f2613b10ca3..20dde2ec5641 100644
--- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
+++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix
@@ -12,14 +12,14 @@
   makeDesktopItem,
   nix-update-script,
 }:
-buildDotnetModule (finalAttrs: rec {
+buildDotnetModule (finalAttrs: {
   pname = "msbuild-structured-log-viewer";
   version = "2.2.490";
 
   src = fetchFromGitHub {
     owner = "KirillOsenkov";
     repo = "MSBuildStructuredLog";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-VJun6bs47NKj90e/6ZGp66x+MG1R/qxqrn2L1bVkdHY=";
   };
 
@@ -48,10 +48,10 @@ buildDotnetModule (finalAttrs: rec {
 
   postFixup =
     ''
-      wrapDotnetProgram $out/lib/${finalAttrs.pname}/StructuredLogViewer.Avalonia $out/bin/${meta.mainProgram}
+      wrapDotnetProgram $out/lib/msbuild-structured-log-viewer/StructuredLogViewer.Avalonia $out/bin/${finalAttrs.meta.mainProgram}
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/${finalAttrs.pname}.png
+      install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/msbuild-structured-log-viewer.png
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \
@@ -60,15 +60,15 @@ buildDotnetModule (finalAttrs: rec {
       install -Dm444 src/StructuredLogViewer.Avalonia/Info.plist $out/Applications/StructuredLogViewer.app/Contents/Info.plist
       install -Dm444 src/StructuredLogViewer.Avalonia/StructuredLogViewer.icns $out/Applications/StructuredLogViewer.app/Contents/Resources/StructuredLogViewer.icns
       mkdir -p $out/Applications/StructuredLogViewer.app/Contents/MacOS
-      ln -s $out/bin/${meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
+      ln -s $out/bin/${finalAttrs.meta.mainProgram} $out/Applications/StructuredLogViewer.app/Contents/MacOS/StructuredLogViewer.Avalonia
     '';
 
   desktopItems = makeDesktopItem {
-    name = finalAttrs.pname;
+    name = "msbuild-structured-log-viewer";
     desktopName = "MSBuild Structured Log Viewer";
     comment = finalAttrs.meta.description;
-    icon = finalAttrs.pname;
-    exec = meta.mainProgram;
+    icon = "msbuild-structured-log-viewer";
+    exec = finalAttrs.meta.mainProgram;
     categories = [ "Development" ];
   };
 
diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix
index 27b8675652c0..4cfd4316b9ea 100644
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@@ -5,7 +5,7 @@
   installShellFiles,
 }:
 
-buildGoModule (finalAttrs: rec {
+buildGoModule (finalAttrs: {
   pname = "noti";
   version = "3.8.0";
 
diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix
index 60aa0d965f06..9b93f5cd87bb 100644
--- a/pkgs/by-name/np/nph/package.nix
+++ b/pkgs/by-name/np/nph/package.nix
@@ -10,13 +10,13 @@ let
     nim2 = nim-2_0;
   };
 in
-buildNimPackage' (finalAttrs: rec {
+buildNimPackage' (finalAttrs: {
   pname = "nph";
   version = "0.6.1";
 
   postPatch = ''
     substituteInPlace src/nph.nim \
-      --replace-fail 'git describe --long --dirty --always --tags' "echo ${version}"
+      --replace-fail 'git describe --long --dirty --always --tags' "echo ${finalAttrs.version}"
   '';
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index d56ffd92ae7a..d46ea13d2d49 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -30,7 +30,7 @@
   waylandSupport ? stdenv.hostPlatform.isLinux,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "q2pro";
   version = "0-unstable-2025-05-03";
 
@@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: rec {
     (lib.mesonEnable "windows-crash-dumps" false)
   ];
 
-  internalVersion = "r${revCount}~${builtins.substring 0 8 src.rev}";
+  internalVersion = "r${finalAttrs.revCount}~${builtins.substring 0 8 finalAttrs.src.rev}";
   postPatch = ''
-    echo '${internalVersion}' > VERSION
+    echo '${finalAttrs.internalVersion}' > VERSION
   '';
 
   postInstall =
@@ -105,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: rec {
       makeWrapper $out/bin/q2pro-unwrapped $out/bin/q2pro \
         --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath finalAttrs.buildInputs}"
 
-      install -D ${src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm
+      install -D ${finalAttrs.src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   preVersionCheck = ''
-    export version='${internalVersion}'
+    export version='${finalAttrs.internalVersion}'
   '';
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/qr/qrencode/package.nix b/pkgs/by-name/qr/qrencode/package.nix
index 246499eba9ce..b9a588488a51 100644
--- a/pkgs/by-name/qr/qrencode/package.nix
+++ b/pkgs/by-name/qr/qrencode/package.nix
@@ -8,7 +8,7 @@
   libiconv,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qrencode";
   version = "4.1.1";
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   src = fetchurl {
-    url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
+    url = "https://fukuchi.org/works/qrencode/qrencode-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-2kSO1PUqumvLDNSMrA3VG4aSvMxM0SdDFAL8pvgXHo4=";
   };
 
diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
index 565ff0e2e499..675e233f9230 100644
--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@@ -32,14 +32,14 @@
   pantheon,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SwayNotificationCenter";
   version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ErikReider";
     repo = "SwayNotificationCenter";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-kRawYbBLVx0ie4t7tChkA8QJShS83fUcGrJSKkxBy8Q=";
   };
 
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   meta = with lib; {
     description = "Simple notification daemon with a GUI built for Sway";
     homepage = "https://github.com/ErikReider/SwayNotificationCenter";
-    changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}";
+    changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl3;
     platforms = platforms.linux;
     mainProgram = "swaync";
diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix
index 49cbcb0af2ca..2c2d541d36a9 100644
--- a/pkgs/development/compilers/llvm/common/tblgen.nix
+++ b/pkgs/development/compilers/llvm/common/tblgen.nix
@@ -55,11 +55,11 @@ let
     else
       src;
 
-  self = stdenv.mkDerivation (finalAttrs: rec {
+  self = stdenv.mkDerivation (finalAttrs: {
     inherit pname version patches;
 
     src = src';
-    sourceRoot = "${src.name}/llvm";
+    sourceRoot = "${finalAttrs.src.name}/llvm";
 
     postPatch = ''
       (
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index b500d4dea89c..6a3fd947024a 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -30,7 +30,7 @@
   libiconv,
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spidermonkey";
   inherit version;
 
diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix
index e3952caea88b..8d8f88f7e907 100644
--- a/pkgs/development/libraries/libpulsar/default.nix
+++ b/pkgs/development/libraries/libpulsar/default.nix
@@ -46,14 +46,14 @@ let
     ++ lib.optional (!asioSupport) boost;
 
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libpulsar";
   version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "pulsar-client-cpp";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-RHWi0KCq7U7Dr3Ic7kduc8P64VpAThTQ3lDxLLEqzIU=";
   };
 
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   meta = with lib; {
     homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/";
     description = "Apache Pulsar C++ library";
-    changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${version}";
+    changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${finalAttrs.version}";
     platforms = platforms.all;
     license = licenses.asl20;
     maintainers = with maintainers; [
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 4f8c2a880aab..e2dfaa031fe6 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchurl,
   fetchFromGitLab,
-  fetchpatch,
   cairo,
   cmake,
   boost,
@@ -60,7 +59,7 @@ let
     hash = "sha256-bImTdlhMAA79kwbKPrHN3a9vVrtsgBh3rFjH3B7tEbQ=";
   };
 in
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "poppler-${suffix}";
   version = "25.05.0"; # beware: updates often break cups-filters build, check scribus too!
 
@@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   src = fetchurl {
-    url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
+    url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
     hash = "sha256-mxYnxbdoFqxeQFKgP1tgW6QLRc8GsCyt0EeWILSZqzg=";
   };
 
@@ -182,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: rec {
 
   meta = {
     homepage = "https://poppler.freedesktop.org/";
-    changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS";
+    changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${finalAttrs.version}/NEWS";
     description = "PDF rendering library";
     longDescription = ''
       Poppler is a PDF rendering library based on the xpdf-3.0 code base. In
diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix
index 61918c6b7a95..4ca7e57522da 100644
--- a/pkgs/development/tools/ilspycmd/default.nix
+++ b/pkgs/development/tools/ilspycmd/default.nix
@@ -8,14 +8,14 @@
   autoSignDarwinBinariesHook,
   glibcLocales,
 }:
-buildDotnetModule (finalAttrs: rec {
+buildDotnetModule (finalAttrs: {
   pname = "ilspycmd";
   version = "9.0-preview3";
 
   src = fetchFromGitHub {
     owner = "icsharpcode";
     repo = "ILSpy";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M=";
   };
 

From afa1d3cadb2ab4cb0b9617dfbdb8f2d8f5fe1329 Mon Sep 17 00:00:00 2001
From: Rishabh <40533251+Rishabh5321@users.noreply.github.com>
Date: Tue, 3 Jun 2025 10:23:04 +0530
Subject: [PATCH 1377/1497] better-control: 6.11.9 -> 6.12.1

---
 pkgs/by-name/be/better-control/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/be/better-control/package.nix b/pkgs/by-name/be/better-control/package.nix
index f56c7ec724e2..0fdd29c4c0c4 100644
--- a/pkgs/by-name/be/better-control/package.nix
+++ b/pkgs/by-name/be/better-control/package.nix
@@ -9,7 +9,7 @@
   brightnessctl,
   power-profiles-daemon,
   gammastep,
-  libpulseaudio,
+  pulseaudio,
   desktop-file-utils,
   wrapGAppsHook3,
   gobject-introspection,
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "better-control";
-  version = "6.11.9";
+  version = "6.12.1";
   pyproject = false;
 
   src = fetchFromGitHub {
-    owner = "quantumvoid0";
+    owner = "better-ecosystem";
     repo = "better-control";
     tag = "v${version}";
-    hash = "sha256-74ZcHiQLIYzPnk25NAJzxsdVMYs2fiPDOJHUTLY4LuE=";
+    hash = "sha256-Dt+se8eOmF8Nzm+/bnYBSIyX0XHSXV9iCPF82qXhzug=";
   };
 
   build-system = with python3Packages; [
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
 
   # Check src/utils/dependencies.py
   runtimeDeps = [
-    libpulseaudio
+    pulseaudio
     networkmanager
     bluez
     brightnessctl
@@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Simple control panel for linux based on GTK";
-    homepage = "https://github.com/quantumvoid0/better-control";
+    homepage = "https://github.com/better-ecosystem/better-control";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Rishabh5321 ];
     platforms = lib.platforms.linux;

From 4b153aad5d363b9d88ca4b47b4628f8032d05863 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 25 Apr 2024 12:54:37 +0000
Subject: [PATCH 1378/1497] nixos/draupnir: init

Co-authored-by: emilylange <git@emilylange.de>
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
---
 nixos/doc/manual/redirects.json               |   9 +
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/matrix/draupnir.md     |  62 +++++
 nixos/modules/services/matrix/draupnir.nix    | 257 ++++++++++++++++++
 5 files changed, 331 insertions(+)
 create mode 100644 nixos/modules/services/matrix/draupnir.md
 create mode 100644 nixos/modules/services/matrix/draupnir.nix

diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index bde64c2c14e8..625dd1516cd5 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -749,6 +749,15 @@
   "module-services-davis-basic-usage": [
     "index.html#module-services-davis-basic-usage"
   ],
+  "module-services-draupnir": [
+    "index.html#module-services-draupnir"
+  ],
+  "module-services-draupnir-setup": [
+    "index.html#module-services-draupnir-setup"
+  ],
+  "module-services-draupnir-setup-ems": [
+    "index.html#module-services-draupnir-setup-ems"
+  ],
   "module-services-castopod": [
     "index.html#module-services-castopod"
   ],
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 4c44cc4e5b08..c7857a9f28a8 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -22,6 +22,8 @@
 
 - [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable).
 
+- [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable).
+
 - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable).
 
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f093b10dc188..be543280a59d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -757,6 +757,7 @@
   ./services/matrix/conduit.nix
   ./services/matrix/continuwuity.nix
   ./services/matrix/dendrite.nix
+  ./services/matrix/draupnir.nix
   ./services/matrix/hebbot.nix
   ./services/matrix/hookshot.nix
   ./services/matrix/lk-jwt-service.nix
diff --git a/nixos/modules/services/matrix/draupnir.md b/nixos/modules/services/matrix/draupnir.md
new file mode 100644
index 000000000000..1d6bce2c4e63
--- /dev/null
+++ b/nixos/modules/services/matrix/draupnir.md
@@ -0,0 +1,62 @@
+# Draupnir (Matrix Moderation Bot) {#module-services-draupnir}
+
+This chapter will show you how to set up your own, self-hosted
+[Draupnir](https://github.com/the-draupnir-project/Draupnir) instance.
+
+As an all-in-one moderation tool, it can protect your server from
+malicious invites, spam messages, and whatever else you don't want.
+In addition to server-level protection, Draupnir is great for communities
+wanting to protect their rooms without having to use their personal
+accounts for moderation.
+
+The bot by default includes support for bans, redactions, anti-spam,
+server ACLs, room directory changes, room alias transfers, account
+deactivation, room shutdown, and more. (This depends on homeserver configuration and implementation.)
+
+See the [README](https://github.com/the-draupnir-project/draupnir#readme)
+page and the [Moderator's guide](https://the-draupnir-project.github.io/draupnir-documentation/moderator/setting-up-and-configuring)
+for additional instructions on how to setup and use Draupnir.
+
+For [additional settings](#opt-services.draupnir.settings)
+see [the default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml).
+
+## Draupnir Setup {#module-services-draupnir-setup}
+
+First create a new unencrypted, private room which will be used as the management room for Draupnir.
+This is the room in which moderators will interact with Draupnir and where it will log possible errors and debugging information.
+You'll need to set this room ID or alias in [services.draupnir.settings.managementRoom](#opt-services.draupnir.settings.managementRoom).
+
+Next, create a new user for Draupnir on your homeserver, if one does not already exist.
+
+The Draupnir Matrix user expects to be free of any rate limiting.
+See [Synapse #6286](https://github.com/matrix-org/synapse/issues/6286)
+for an example on how to achieve this.
+
+If you want Draupnir to be able to deactivate users, move room aliases, shut down rooms, etc.
+you'll need to make the Draupnir user a Matrix server admin.
+
+Now invite the Draupnir user to the management room.
+Draupnir will automatically try to join this room on startup.
+
+```nix
+{
+  services.draupnir = {
+    enable = true;
+
+    settings = {
+      homeserverUrl = "https://matrix.org";
+      managementRoom = "!yyy:example.org";
+    };
+
+    secrets = {
+      accessToken = "/path/to/secret/containing/access-token";
+    };
+  };
+}
+```
+
+### Element Matrix Services (EMS) {#module-services-draupnir-setup-ems}
+
+If you are using a managed ["Element Matrix Services (EMS)"](https://ems.element.io/)
+server, you will need to consent to the terms and conditions. Upon startup, an error
+log entry with a URL to the consent page will be generated.
diff --git a/nixos/modules/services/matrix/draupnir.nix b/nixos/modules/services/matrix/draupnir.nix
new file mode 100644
index 000000000000..e4dfa5d2917b
--- /dev/null
+++ b/nixos/modules/services/matrix/draupnir.nix
@@ -0,0 +1,257 @@
+{
+  config,
+  options,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.draupnir;
+  opt = options.services.draupnir;
+
+  format = pkgs.formats.yaml { };
+  configFile = format.generate "draupnir.yaml" cfg.settings;
+
+  inherit (lib)
+    literalExpression
+    mkEnableOption
+    mkOption
+    mkPackageOption
+    mkRemovedOptionModule
+    mkRenamedOptionModule
+    types
+    ;
+in
+{
+  imports = [
+    # Removed options for those migrating from the Mjolnir module
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "dataPath" ]
+      [ "services" "draupnir" "settings" "dataPath" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "homeserverUrl" ]
+      [ "services" "draupnir" "settings" "homeserverUrl" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "managementRoom" ]
+      [ "services" "draupnir" "settings" "managementRoom" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "draupnir" "accessTokenFile" ]
+      [ "services" "draupnir" "secrets" "accessToken" ]
+    )
+    (mkRemovedOptionModule [ "services" "draupnir" "pantalaimon" ] ''
+      `services.draupnir.pantalaimon.*` has been removed because it depends on the deprecated and vulnerable
+      libolm library for end-to-end encryption and upstream support for Pantalaimon in Draupnir is limited.
+      See <https://the-draupnir-project.github.io/draupnir-documentation/bot/encryption> for details.
+      If you nontheless require E2EE via Pantalaimon, you can configure `services.pantalaimon-headless.instances`
+      yourself and use that with `services.draupnir.settings.pantalaimon` and `services.draupnir.secrets.pantalaimon.password`.
+    '')
+  ];
+
+  options.services.draupnir = {
+    enable = mkEnableOption "Draupnir, a moderations bot for Matrix";
+
+    package = mkPackageOption pkgs "draupnir" { };
+
+    settings = mkOption {
+      example = literalExpression ''
+        {
+          homeserverUrl = "https://matrix.org";
+          managementRoom = "#moderators:example.org";
+
+          autojoinOnlyIfManager = true;
+          automaticallyRedactForReasons = [ "spam" "advertising" ];
+        }
+      '';
+      description = ''
+        Free-form settings written to Draupnir's configuration file.
+        See [Draupnir's default configuration](https://github.com/the-draupnir-project/Draupnir/blob/main/config/default.yaml) for available settings.
+      '';
+      default = { };
+      type = types.submodule {
+        freeformType = format.type;
+        options = {
+          homeserverUrl = mkOption {
+            type = types.str;
+            example = "https://matrix.org";
+            description = ''
+              Base URL of the Matrix homeserver that provides the Client-Server API.
+
+              ::: {.note}
+              When using Pantalaimon, set this to the Pantalaimon URL and
+              {option}`${opt.settings}.rawHomeserverUrl` to the public URL.
+              :::
+            '';
+          };
+
+          rawHomeserverUrl = mkOption {
+            type = types.str;
+            example = "https://matrix.org";
+            default = cfg.settings.homeserverUrl;
+            defaultText = literalExpression "config.${opt.settings}.homeserverUrl";
+            description = ''
+              Public base URL of the Matrix homeserver that provides the Client-Server API when using the Draupnir's
+              [Report forwarding feature](https://the-draupnir-project.github.io/draupnir-documentation/bot/homeserver-administration#report-forwarding).
+
+              ::: {.warning}
+              When using Pantalaimon, do not set this to the Pantalaimon URL!
+              :::
+            '';
+          };
+
+          managementRoom = mkOption {
+            type = types.str;
+            example = "#moderators:example.org";
+            description = ''
+              The room ID or alias where moderators can use the bot's functionality.
+
+              The bot has no access controls, so anyone in this room can use the bot - secure this room!
+              Do not enable end-to-end encryption for this room, unless set up with Pantalaimon.
+
+              ::: {.warning}
+              When using a room alias, make sure the alias used is on the local homeserver!
+              This prevents an issue where the control room becomes undefined when the alias can't be resolved.
+              :::
+            '';
+          };
+
+          dataPath = mkOption {
+            type = types.path;
+            readOnly = true;
+            default = "/var/lib/draupnir";
+            description = ''
+              The path Draupnir will store its state/data in.
+
+              ::: {.warning}
+              This option is read-only.
+              :::
+
+              ::: {.note}
+              If you want to customize where this data is stored, use a bind mount.
+              :::
+            '';
+          };
+        };
+      };
+    };
+
+    secrets = {
+      accessToken = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the access token for Draupnir's Matrix account
+          to be used in place of {option}`${opt.settings}.accessToken`.
+        '';
+      };
+
+      pantalaimon.password = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the password for Draupnir's Matrix account when used in
+          conjunction with Pantalaimon to be used in place of
+          {option}`${opt.settings}.pantalaimon.password`.
+
+          ::: {.warning}
+          Take note that upstream has limited Pantalaimon and E2EE support:
+          <https://the-draupnir-project.github.io/draupnir-documentation/bot/encryption> and
+          <https://the-draupnir-project.github.io/draupnir-documentation/shared/dogfood#e2ee-support>.
+          :::
+        '';
+      };
+
+      web.synapseHTTPAntispam.authorization = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          File containing the secret token when using the Synapse HTTP Antispam module
+          to be used in place of
+          {option}`${opt.settings}.web.synapseHTTPAntispam.authorization`.
+
+          See <https://the-draupnir-project.github.io/draupnir-documentation/bot/synapse-http-antispam> for details.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        # Removed option for those migrating from the Mjolnir module - mkRemovedOption module does *not* work with submodules.
+        assertion = !(cfg.settings ? protectedRooms);
+        message = "Unset ${opt.settings}.protectedRooms, as it is unsupported on Draupnir. Add these rooms via `!draupnir rooms add` instead.";
+      }
+    ];
+
+    systemd.services.draupnir = {
+      description = "Draupnir - a moderation bot for Matrix";
+      wants = [
+        "network-online.target"
+        "matrix-synapse.service"
+        "conduit.service"
+        "dendrite.service"
+      ];
+      after = [
+        "network-online.target"
+        "matrix-synapse.service"
+        "conduit.service"
+        "dendrite.service"
+      ];
+      wantedBy = [ "multi-user.target" ];
+
+      startLimitIntervalSec = 0;
+      serviceConfig = {
+        ExecStart = toString (
+          [
+            (lib.getExe cfg.package)
+            "--draupnir-config"
+            configFile
+          ]
+          ++ lib.optionals (cfg.secrets.accessToken != null) [
+            "--access-token-path"
+            "%d/access_token"
+          ]
+          ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [
+            "--pantalaimon-password-path"
+            "%d/pantalaimon_password"
+          ]
+          ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [
+            "--http-antispam-authorization-path"
+            "%d/http_antispam_authorization"
+          ]
+        );
+
+        WorkingDirectory = "/var/lib/draupnir";
+        StateDirectory = "draupnir";
+        StateDirectoryMode = "0700";
+        ProtectHome = true;
+        PrivateDevices = true;
+        Restart = "on-failure";
+        RestartSec = "5s";
+        DynamicUser = true;
+        LoadCredential =
+          lib.optionals (cfg.secrets.accessToken != null) [
+            "access_token:${cfg.secrets.accessToken}"
+          ]
+          ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [
+            "pantalaimon_password:${cfg.secrets.pantalaimon.password}"
+          ]
+          ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [
+            "http_antispam_authorization:${cfg.secrets.web.synapseHTTPAntispam.authorization}"
+          ];
+      };
+    };
+  };
+
+  meta = {
+    doc = ./draupnir.md;
+    maintainers = with lib.maintainers; [
+      RorySys
+      emilylange
+    ];
+  };
+}

From d6413ba43682273de9595d4193f64209ff8d770e Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Thu, 25 Apr 2024 12:54:56 +0000
Subject: [PATCH 1379/1497] nixosTests.draupnir: init

Co-authored-by: emilylange <git@emilylange.de>
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
---
 nixos/tests/all-tests.nix            |   1 +
 nixos/tests/matrix/draupnir.nix      | 150 +++++++++++++++++++++++++++
 pkgs/by-name/dr/draupnir/package.nix |   6 +-
 3 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/matrix/draupnir.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a2236c4f779b..6d8df81ee60c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -409,6 +409,7 @@ in
   domination = runTest ./domination.nix;
   dovecot = handleTest ./dovecot.nix { };
   drawterm = discoverTests (import ./drawterm.nix);
+  draupnir = runTest ./matrix/draupnir.nix;
   drbd = runTest ./drbd.nix;
   druid = handleTestOn [ "x86_64-linux" ] ./druid { };
   drupal = runTest ./drupal.nix;
diff --git a/nixos/tests/matrix/draupnir.nix b/nixos/tests/matrix/draupnir.nix
new file mode 100644
index 000000000000..18dae8b2fffb
--- /dev/null
+++ b/nixos/tests/matrix/draupnir.nix
@@ -0,0 +1,150 @@
+{
+  lib,
+  ...
+}:
+
+{
+  name = "draupnir";
+  meta.maintainers = with lib.maintainers; [
+    RorySys
+    emilylange
+  ];
+
+  nodes = {
+    homeserver =
+      { pkgs, ... }:
+      {
+        services.matrix-synapse = {
+          enable = true;
+          log.root.level = "WARNING";
+          settings = {
+            database.name = "sqlite3";
+            registration_shared_secret = "supersecret-registration";
+
+            listeners = [
+              {
+                bind_addresses = [
+                  "::"
+                ];
+                port = 8008;
+                resources = [
+                  {
+                    compress = true;
+                    names = [ "client" ];
+                  }
+                  {
+                    compress = false;
+                    names = [ "federation" ];
+                  }
+                ];
+                tls = false;
+                type = "http";
+                x_forwarded = false;
+              }
+            ];
+          };
+        };
+
+        specialisation.draupnir = {
+          inheritParentConfig = true;
+
+          configuration.services.draupnir = {
+            enable = true;
+            settings = {
+              homeserverUrl = "http://localhost:8008";
+              managementRoom = "#moderators:homeserver";
+            };
+            secrets = {
+              accessToken = "/tmp/draupnir-access-token";
+            };
+          };
+        };
+
+        environment.systemPackages = with pkgs; [
+          curl
+          jq
+          (writers.writePython3Bin "test_draupnir_in_matrix"
+            {
+              libraries = [ python3Packages.matrix-nio ];
+              flakeIgnore = [ "E501" ];
+            }
+            ''
+              import asyncio
+              from nio import AsyncClient, MatrixRoom, RoomMemberEvent, RoomMessageNotice
+
+
+              async def main() -> None:
+                  client = AsyncClient("http://localhost:8008", "moderator")
+
+                  async def member_callback(room: MatrixRoom, event: RoomMemberEvent) -> None:
+                      if event.membership == "join" and event.sender == "@draupnir:homeserver":
+                          await client.room_send(
+                              room_id=room.room_id,
+                              message_type="m.room.message",
+                              content={
+                                  "msgtype": "m.text",
+                                  "body": "!draupnir status"
+                              }
+                          )
+
+                  async def message_callback(room: MatrixRoom, event: RoomMessageNotice) -> None:
+                      print(f"{event.sender}: {event.body}")
+                      if event.sender == "@draupnir:homeserver":
+                          await client.close()
+                          exit(0)
+
+                  client.add_event_callback(member_callback, RoomMemberEvent)
+                  client.add_event_callback(message_callback, RoomMessageNotice)
+
+                  print(await client.login("password"))
+
+                  room = await client.room_create(
+                      name="Moderators",
+                      alias="moderators",
+                      invite=["@draupnir:homeserver"],
+                      power_level_override={
+                          "users": {
+                              "@draupnir:homeserver": 100,
+                              "@moderator:homeserver": 100,
+                          }
+                      }
+                  )
+                  print(room)
+
+                  print(await client.join(room.room_id))
+
+                  await client.sync_forever(timeout=30000)
+
+
+              asyncio.run(main())
+            ''
+          )
+        ];
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      import json
+
+      homeserver.wait_for_unit("matrix-synapse.service")
+      homeserver.wait_until_succeeds("curl --fail -L http://localhost:8008/")
+
+      homeserver.succeed("matrix-synapse-register_new_matrix_user -u draupnir -p password --no-admin")
+      homeserver.succeed("matrix-synapse-register_new_matrix_user -u moderator -p password --no-admin")
+
+      # get draupnir access token
+      payload = json.dumps({ "type": "m.login.password", "user": "draupnir", "password": "password" })
+      homeserver.succeed(
+          f"curl --fail --json '{payload}' http://localhost:8008/_matrix/client/v3/login"
+          + " | jq -r .access_token"
+          + " | tee /tmp/draupnir-access-token"
+       )
+
+      homeserver.succeed("${nodes.homeserver.system.build.toplevel}/specialisation/draupnir/bin/switch-to-configuration test")
+      homeserver.wait_for_unit("draupnir.service")
+
+      print(homeserver.succeed("test_draupnir_in_matrix >&2", timeout=60))
+    '';
+}
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 9fbc2e62e9b9..3670dd5d13bb 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -12,6 +12,7 @@
   fetchYarnDeps,
   stdenv,
   cctools,
+  nixosTests,
 }:
 
 # docs: https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#yarn2nix-javascript-yarn2nix
@@ -95,7 +96,10 @@ mkYarnPackage rec {
 
   distPhase = "true";
 
-  passthru.updateScript = ./update.sh;
+  passthru = {
+    tests = { inherit (nixosTests) draupnir; };
+    updateScript = ./update.sh;
+  };
 
   meta = with lib; {
     description = "A moderation tool for Matrix";

From a969291ab1d200012e9a5c0a4f32839a0bce7fad Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 4 Jun 2025 00:07:51 +0200
Subject: [PATCH 1380/1497] treewide: use https when meta.homepage redirects to
 https

---
 pkgs/applications/graphics/yacreader/default.nix            | 2 +-
 pkgs/applications/misc/lyx/default.nix                      | 2 +-
 pkgs/applications/science/math/mathematica/default.nix      | 2 +-
 pkgs/applications/video/vdr/default.nix                     | 2 +-
 pkgs/by-name/ba/bakoma_ttf/package.nix                      | 2 +-
 pkgs/by-name/bl/bleachbit/package.nix                       | 2 +-
 pkgs/by-name/ca/catdvi/package.nix                          | 2 +-
 pkgs/by-name/ej/ejs/package.nix                             | 2 +-
 pkgs/by-name/ek/ekho/package.nix                            | 2 +-
 pkgs/by-name/el/elvis/package.nix                           | 2 +-
 pkgs/by-name/fl/flamegraph/package.nix                      | 2 +-
 pkgs/by-name/fl/fluxbox/package.nix                         | 2 +-
 pkgs/by-name/fu/fusionInventory/package.nix                 | 2 +-
 pkgs/by-name/ga/galculator/package.nix                      | 2 +-
 pkgs/by-name/ga/galen/package.nix                           | 2 +-
 pkgs/by-name/ga/gambit-project/package.nix                  | 2 +-
 pkgs/by-name/ge/geant4/package.nix                          | 2 +-
 pkgs/by-name/gf/gfie/package.nix                            | 2 +-
 pkgs/by-name/gk/gkrellm/package.nix                         | 2 +-
 pkgs/by-name/he/hex-a-hop/package.nix                       | 2 +-
 pkgs/by-name/li/libdivecomputer/package.nix                 | 2 +-
 pkgs/by-name/ma/makemkv/package.nix                         | 2 +-
 pkgs/by-name/ma/matrix-brandy/package.nix                   | 2 +-
 pkgs/by-name/me/merkaartor/package.nix                      | 2 +-
 pkgs/by-name/on/oncall/package.nix                          | 2 +-
 pkgs/by-name/pe/perseus/package.nix                         | 2 +-
 pkgs/by-name/pi/pixman/package.nix                          | 2 +-
 pkgs/by-name/po/pocl/package.nix                            | 2 +-
 pkgs/by-name/se/selendroid/package.nix                      | 2 +-
 pkgs/by-name/su/substudy/package.nix                        | 2 +-
 pkgs/by-name/sy/synfigstudio/package.nix                    | 2 +-
 pkgs/by-name/te/tet/package.nix                             | 2 +-
 pkgs/by-name/wa/wallabag/package.nix                        | 2 +-
 pkgs/by-name/xc/xcowsay/package.nix                         | 2 +-
 pkgs/development/libraries/cxxtest/default.nix              | 2 +-
 pkgs/development/libraries/pcre/default.nix                 | 2 +-
 pkgs/development/python-modules/i-pi/default.nix            | 2 +-
 pkgs/development/python-modules/supervisor/default.nix      | 2 +-
 pkgs/development/python-modules/xstatic-bootbox/default.nix | 2 +-
 pkgs/development/tools/alloy/default.nix                    | 4 ++--
 pkgs/servers/dns/nsd/default.nix                            | 2 +-
 pkgs/top-level/perl-packages.nix                            | 2 +-
 42 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index dcde6f9ae3ee..d66f9957aeb1 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Comic reader for cross-platform reading and managing your digital comic collection";
-    homepage = "http://www.yacreader.com";
+    homepage = "https://www.yacreader.com";
     license = lib.licenses.gpl3;
     mainProgram = "YACReader";
     maintainers = [ ];
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 62b7d58859d6..8a89807bd6fe 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -54,7 +54,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "WYSIWYM frontend for LaTeX, DocBook";
-    homepage = "http://www.lyx.org";
+    homepage = "https://www.lyx.org";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.vcunat ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 6ce5ee7a4eb0..278d92a49a4e 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -72,7 +72,7 @@ callPackage ./generic.nix {
   );
   meta = with lib; {
     description = "Wolfram Mathematica computational software system";
-    homepage = "http://www.wolfram.com/mathematica/";
+    homepage = "https://www.wolfram.com/mathematica/";
     license = licenses.unfree;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index 0b80ad8186b2..9d776fd67047 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "http://www.tvdr.de/";
+    homepage = "https://www.tvdr.de/";
     description = "Video Disc Recorder";
     maintainers = [ maintainers.ck3d ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/ba/bakoma_ttf/package.nix b/pkgs/by-name/ba/bakoma_ttf/package.nix
index fa3e0e40f773..f941343fb170 100644
--- a/pkgs/by-name/ba/bakoma_ttf/package.nix
+++ b/pkgs/by-name/ba/bakoma_ttf/package.nix
@@ -21,6 +21,6 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
-    homepage = "http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/";
+    homepage = "https://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/";
   };
 }
diff --git a/pkgs/by-name/bl/bleachbit/package.nix b/pkgs/by-name/bl/bleachbit/package.nix
index 44290eb6c51f..83fe2c62eb06 100644
--- a/pkgs/by-name/bl/bleachbit/package.nix
+++ b/pkgs/by-name/bl/bleachbit/package.nix
@@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
   strictDeps = false;
 
   meta = with lib; {
-    homepage = "http://bleachbit.sourceforge.net";
+    homepage = "https://bleachbit.sourceforge.net";
     description = "Program to clean your computer";
     longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
     license = licenses.gpl3;
diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix
index f6c3becb41fd..cdbe3bddc5b5 100644
--- a/pkgs/by-name/ca/catdvi/package.nix
+++ b/pkgs/by-name/ca/catdvi/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   meta = with lib; {
-    homepage = "http://catdvi.sourceforge.net";
+    homepage = "https://catdvi.sourceforge.net";
     description = "DVI to plain text translator";
     license = licenses.gpl2Plus;
     maintainers = [ ];
diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix
index 90934f9002ec..60737a1dbf6f 100644
--- a/pkgs/by-name/ej/ejs/package.nix
+++ b/pkgs/by-name/ej/ejs/package.nix
@@ -29,7 +29,7 @@ buildNpmPackage {
 
   meta = {
     description = "Embedded JavaScript templates";
-    homepage = "http://ejs.co";
+    homepage = "https://ejs.co";
     license = lib.licenses.asl20;
     mainProgram = "ejs";
     maintainers = with lib.maintainers; [ momeemt ];
diff --git a/pkgs/by-name/ek/ekho/package.nix b/pkgs/by-name/ek/ekho/package.nix
index 13f62d3fe065..5eb0b9662ec7 100644
--- a/pkgs/by-name/ek/ekho/package.nix
+++ b/pkgs/by-name/ek/ekho/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Chinese text-to-speech software";
-    homepage = "http://www.eguidedog.net/ekho.php";
+    homepage = "https://www.eguidedog.net/ekho.php";
     longDescription = ''
       Ekho (余音) is a free, open source and multilingual text-to-speech (TTS)
       software. It supports Cantonese (Chinese dialect spoken in Hong Kong and
diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix
index ce4c70ee3085..6804167f09a3 100644
--- a/pkgs/by-name/el/elvis/package.nix
+++ b/pkgs/by-name/el/elvis/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "http://elvis.the-little-red-haired-girl.org/";
+    homepage = "https://elvis.the-little-red-haired-girl.org/";
     description = "Vi clone for Unix and other operating systems";
     license = lib.licenses.free;
     mainProgram = "elvis";
diff --git a/pkgs/by-name/fl/flamegraph/package.nix b/pkgs/by-name/fl/flamegraph/package.nix
index 762cfb68c8d1..520f6c286657 100644
--- a/pkgs/by-name/fl/flamegraph/package.nix
+++ b/pkgs/by-name/fl/flamegraph/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
       cddl
       gpl2Plus
     ];
-    homepage = "http://www.brendangregg.com/flamegraphs.html";
+    homepage = "https://www.brendangregg.com/flamegraphs.html";
     description = "Visualization for profiled code";
     mainProgram = "flamegraph.pl";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/fl/fluxbox/package.nix b/pkgs/by-name/fl/fluxbox/package.nix
index 791e05b57669..a65978083289 100644
--- a/pkgs/by-name/fl/fluxbox/package.nix
+++ b/pkgs/by-name/fl/fluxbox/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       fast, desktop experience. It is written in C++ and licensed
       under MIT license.
     '';
-    homepage = "http://fluxbox.org/";
+    homepage = "https://fluxbox.org/";
     license = licenses.mit;
     maintainers = [ ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/fu/fusionInventory/package.nix b/pkgs/by-name/fu/fusionInventory/package.nix
index 4c73b269217c..f07e449bab80 100644
--- a/pkgs/by-name/fu/fusionInventory/package.nix
+++ b/pkgs/by-name/fu/fusionInventory/package.nix
@@ -97,7 +97,7 @@ perlPackages.buildPerlPackage rec {
   outputs = [ "out" ];
 
   meta = with lib; {
-    homepage = "http://www.fusioninventory.org";
+    homepage = "https://www.fusioninventory.org";
     description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX";
     license = lib.licenses.gpl2Only;
     maintainers = [ maintainers.phile314 ];
diff --git a/pkgs/by-name/ga/galculator/package.nix b/pkgs/by-name/ga/galculator/package.nix
index 4f86d789a1aa..08458baca22d 100644
--- a/pkgs/by-name/ga/galculator/package.nix
+++ b/pkgs/by-name/ga/galculator/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = false;
 
   meta = {
-    homepage = "http://galculator.sourceforge.net/";
+    homepage = "https://galculator.sourceforge.net/";
     description = "GTK algebraic and RPN calculator";
     longDescription = ''
       galculator is a GTK-based calculator. Its main features include:
diff --git a/pkgs/by-name/ga/galen/package.nix b/pkgs/by-name/ga/galen/package.nix
index 863f8a77636d..4f604e82418f 100644
--- a/pkgs/by-name/ga/galen/package.nix
+++ b/pkgs/by-name/ga/galen/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://galenframework.com";
+    homepage = "https://galenframework.com";
     description = "Automated layout testing for websites";
     mainProgram = "galen";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix
index cb3d63379136..72e5d77136c3 100644
--- a/pkgs/by-name/ga/gambit-project/package.nix
+++ b/pkgs/by-name/ga/gambit-project/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Open-source collection of tools for doing computation in game theory";
-    homepage = "http://www.gambit-project.org";
+    homepage = "https://www.gambit-project.org";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ t4ccer ];
     platforms = with lib.platforms; unix ++ windows;
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index d06e2b8e39f3..8f0ad718f4e7 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
       Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
       The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
     '';
-    homepage = "http://www.geant4.org";
+    homepage = "https://www.geant4.org";
     license = licenses.g4sl;
     maintainers = with maintainers; [
       omnipotententity
diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix
index acd0a99a4de4..efd8202a761e 100644
--- a/pkgs/by-name/gf/gfie/package.nix
+++ b/pkgs/by-name/gf/gfie/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries";
-    homepage = "http://greenfishsoftware.org/gfie.php";
+    homepage = "https://greenfishsoftware.org/gfie.php";
     license = with lib.licenses; [ gpl3 ];
     maintainers = with lib.maintainers; [ pluiedev ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index aada0333d9d8..99bdbe267416 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
       supports applying themes to match its appearance to your window
       manager, Gtk, or any other theme.
     '';
-    homepage = "http://gkrellm.srcbox.net";
+    homepage = "https://gkrellm.srcbox.net";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/he/hex-a-hop/package.nix b/pkgs/by-name/he/hex-a-hop/package.nix
index 8cb03266da08..8581262f850f 100644
--- a/pkgs/by-name/he/hex-a-hop/package.nix
+++ b/pkgs/by-name/he/hex-a-hop/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Puzzle game based on hexagonal tiles";
     mainProgram = "hex-a-hop";
-    homepage = "http://hexahop.sourceforge.net";
+    homepage = "https://hexahop.sourceforge.net";
     license = with lib.licenses; [
       gpl2Plus # Main code
       cc-by-30 # Assets
diff --git a/pkgs/by-name/li/libdivecomputer/package.nix b/pkgs/by-name/li/libdivecomputer/package.nix
index e2ac2746af6a..e81111f4a800 100644
--- a/pkgs/by-name/li/libdivecomputer/package.nix
+++ b/pkgs/by-name/li/libdivecomputer/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "http://www.libdivecomputer.org";
+    homepage = "https://www.libdivecomputer.org";
     description = "Cross-platform and open source library for communication with dive computers from various manufacturers";
     mainProgram = "dctool";
     maintainers = [ maintainers.mguentner ];
diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix
index a664daaeb4d5..776d387ac61c 100644
--- a/pkgs/by-name/ma/makemkv/package.nix
+++ b/pkgs/by-name/ma/makemkv/package.nix
@@ -130,7 +130,7 @@ libsForQt5.mkDerivation {
       licenses.unfree
       licenses.lgpl21
     ];
-    homepage = "http://makemkv.com";
+    homepage = "https://makemkv.com";
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ jchw ];
   };
diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix
index 7c46b34b6c77..4d768943462d 100644
--- a/pkgs/by-name/ma/matrix-brandy/package.nix
+++ b/pkgs/by-name/ma/matrix-brandy/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    homepage = "http://brandy.matrixnetwork.co.uk/";
+    homepage = "https://brandy.matrixnetwork.co.uk/";
     description = "Matrix Brandy BASIC VI for Linux, Windows, MacOSX";
     mainProgram = "brandy";
     license = licenses.gpl2Plus;
diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix
index 8d3abd715a43..c56f9ce4b8a1 100644
--- a/pkgs/by-name/me/merkaartor/package.nix
+++ b/pkgs/by-name/me/merkaartor/package.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OpenStreetMap editor";
-    homepage = "http://merkaartor.be/";
+    homepage = "https://merkaartor.be/";
     license = lib.licenses.gpl2Plus;
     mainProgram = "merkaartor";
     maintainers = with lib.maintainers; [ sikmir ];
diff --git a/pkgs/by-name/on/oncall/package.nix b/pkgs/by-name/on/oncall/package.nix
index bfa1578ce7d5..f2f246aceb85 100644
--- a/pkgs/by-name/on/oncall/package.nix
+++ b/pkgs/by-name/on/oncall/package.nix
@@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = {
     description = "Calendar web-app designed for scheduling and managing on-call shifts";
-    homepage = "http://oncall.tools";
+    homepage = "https://oncall.tools";
     changelog = "https://github.com/linkedin/oncall/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ onny ];
diff --git a/pkgs/by-name/pe/perseus/package.nix b/pkgs/by-name/pe/perseus/package.nix
index 4b39d2e91395..8e83890ea2f9 100644
--- a/pkgs/by-name/pe/perseus/package.nix
+++ b/pkgs/by-name/pe/perseus/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       around datasets arising from point samples, images, distance
       matrices and so forth.
     '';
-    homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html";
+    homepage = "https://people.maths.ox.ac.uk/nanda/perseus/index.html";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ erikryb ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/pi/pixman/package.nix b/pkgs/by-name/pi/pixman/package.nix
index dcf1fad292eb..94d742f374e3 100644
--- a/pkgs/by-name/pi/pixman/package.nix
+++ b/pkgs/by-name/pi/pixman/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    homepage = "http://pixman.org";
+    homepage = "https://pixman.org";
     description = "Low-level library for pixel manipulation";
     license = licenses.mit;
     platforms = platforms.all;
diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix
index 671b6592bb2f..f9d70e39c395 100644
--- a/pkgs/by-name/po/pocl/package.nix
+++ b/pkgs/by-name/po/pocl/package.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "portable open source (MIT-licensed) implementation of the OpenCL standard";
-    homepage = "http://portablecl.org";
+    homepage = "https://portablecl.org";
     changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/se/selendroid/package.nix b/pkgs/by-name/se/selendroid/package.nix
index 170ef05845b4..c8bf6602a6d6 100644
--- a/pkgs/by-name/se/selendroid/package.nix
+++ b/pkgs/by-name/se/selendroid/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    homepage = "http://selendroid.io/";
+    homepage = "https://selendroid.io/";
     description = "Test automation for native or hybrid Android apps and the mobile web";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/su/substudy/package.nix b/pkgs/by-name/su/substudy/package.nix
index ea1a89dac4dc..681ea499573d 100644
--- a/pkgs/by-name/su/substudy/package.nix
+++ b/pkgs/by-name/su/substudy/package.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Learn foreign languages using audio and subtitles extracted from video files";
-    homepage = "http://www.randomhacks.net/substudy";
+    homepage = "https://www.randomhacks.net/substudy";
     license = licenses.asl20;
     mainProgram = "substudy";
     maintainers = with maintainers; [ paveloom ];
diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix
index c8dfde12d0c5..1305449b2c69 100644
--- a/pkgs/by-name/sy/synfigstudio/package.nix
+++ b/pkgs/by-name/sy/synfigstudio/package.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "2D animation program";
-    homepage = "http://www.synfig.org";
+    homepage = "https://www.synfig.org";
     license = licenses.gpl3Plus;
     maintainers = [ ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/by-name/te/tet/package.nix b/pkgs/by-name/te/tet/package.nix
index 017e57547d72..f7bf33c98e13 100644
--- a/pkgs/by-name/te/tet/package.nix
+++ b/pkgs/by-name/te/tet/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
 
   meta = {
     description = "Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
-    homepage = "http://tetworks.opengroup.org/Products/tet.htm";
+    homepage = "https://tetworks.opengroup.org/Products/tet.htm";
     license = lib.licenses.artistic1;
     platforms = lib.platforms.unix;
     maintainers = [ ];
diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 8507debfb3f9..5080e1241ac5 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
       It extracts content so that you can read it when you have time.
     '';
     license = licenses.mit;
-    homepage = "http://wallabag.org";
+    homepage = "https://wallabag.org";
     changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}";
     maintainers = with maintainers; [ schneefux ];
     platforms = platforms.all;
diff --git a/pkgs/by-name/xc/xcowsay/package.nix b/pkgs/by-name/xc/xcowsay/package.nix
index 0802fe96c877..9d002fbcdbb2 100644
--- a/pkgs/by-name/xc/xcowsay/package.nix
+++ b/pkgs/by-name/xc/xcowsay/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://www.doof.me.uk/xcowsay";
+    homepage = "https://www.doof.me.uk/xcowsay";
     description = "Tool to display a cute cow and messages";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ das_j ];
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix
index 187a9c8470ab..b33ebe91bece 100644
--- a/pkgs/development/libraries/cxxtest/default.nix
+++ b/pkgs/development/libraries/cxxtest/default.nix
@@ -43,7 +43,7 @@ buildPythonApplication rec {
   dontWrapPythonPrograms = true;
 
   meta = with lib; {
-    homepage = "http://github.com/CxxTest/cxxtest";
+    homepage = "https://github.com/CxxTest/cxxtest";
     description = "Unit testing framework for C++";
     mainProgram = "cxxtestgen";
     license = licenses.lgpl3;
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index ac6f192e3706..e335a0d3068e 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = "http://www.pcre.org/";
+    homepage = "https://www.pcre.org/";
     description = "Library for Perl Compatible Regular Expressions";
     license = lib.licenses.bsd3;
 
diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 325dfebbbd41..a2fec769a594 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
       gpl3Only
       mit
     ];
-    homepage = "http://ipi-code.org/";
+    homepage = "https://ipi-code.org/";
     platforms = platforms.linux;
     maintainers = [ maintainers.sheepforce ];
   };
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index f6c58350610b..61ec354edeb8 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "System for controlling process state under UNIX";
-    homepage = "http://supervisord.org/";
+    homepage = "https://supervisord.org/";
     changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst";
     license = licenses.free; # http://www.repoze.org/LICENSE.txt
     maintainers = with maintainers; [ zimbatm ];
diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix
index 419e05188930..7dc54dc30748 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = "http://bootboxjs.com";
+    homepage = "https://bootboxjs.com";
     description = "Bootboxjs packaged static files for python";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 170c1705bd34..3bfc729b15ed 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -58,8 +58,8 @@ let
           finds structures that satisfy them. Structures are displayed graphically,
           and their appearance can be customized for the domain at hand.
         '';
-        homepage = "http://alloytools.org/";
-        downloadPage = "http://alloytools.org/download.html";
+        homepage = "https://alloytools.org/";
+        downloadPage = "https://alloytools.org/download.html";
         sourceProvenance = with sourceTypes; [ binaryBytecode ];
         license = licenses.mit;
         platforms = platforms.unix;
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 68ca82a57dfb..5f0d784f6c45 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    homepage = "http://www.nlnetlabs.nl";
+    homepage = "https://www.nlnetlabs.nl";
     description = "Authoritative only, high performance, simple and open source name server";
     license = licenses.bsd3;
     platforms = platforms.unix;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a3497aea8bbd..6d9f31dc446f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9495,7 +9495,7 @@ with self;
     doCheck = false;
     meta = {
       description = "Code coverage metrics for Perl";
-      homepage = "http://www.pjcj.net/perl.html";
+      homepage = "https://www.pjcj.net/perl.html";
       license = with lib.licenses; [
         artistic1
         gpl1Plus

From 0fb2cd5d830500c4cd0c01282b50be9536576b0e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 16:32:39 +0200
Subject: [PATCH 1381/1497] cnspec: move to pkgs/by-name

---
 .../cnspec/default.nix => by-name/cn/cnspec/package.nix}      | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{tools/security/cnspec/default.nix => by-name/cn/cnspec/package.nix} (100%)

diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/by-name/cn/cnspec/package.nix
similarity index 100%
rename from pkgs/tools/security/cnspec/default.nix
rename to pkgs/by-name/cn/cnspec/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 339dc8a399fe..ee5bc98d5ee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11590,10 +11590,6 @@ with pkgs;
 
   breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
 
-  cnspec = callPackage ../tools/security/cnspec {
-    buildGoModule = buildGo123Module;
-  };
-
   colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
 
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });

From 7e7cf1ce2fe2e5742db5ebea58cada7f16cc3d7d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 21 May 2025 22:43:59 -0400
Subject: [PATCH 1382/1497] nixos-generate-config: Add a flake default to the
 conf file

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ae09839d071d..1038fadec37d 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -49,6 +49,7 @@ if (-e "/etc/nixos-generate-config.conf") {
         $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
     }
     $kernel = $cfg->val("Defaults", "Kernel") // $kernel;
+    $flake = $cfg->val("Defaults", "Flake") // $flake;
 }
 
 for (my $n = 0; $n < scalar @ARGV; $n++) {

From e8acefccde2b5b8a20453c2ea6b060696e3ad057 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 6 Jun 2025 16:38:40 +0200
Subject: [PATCH 1383/1497] cnspec: 11.53.2 -> 11.57.2

Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.53.2...refs/tags/v11.57.2

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.57.2
---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index a8ac0d309e96..94a1d36b6a89 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.53.2";
+  version = "11.57.2";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-SYgtdIyqK3T5N6XcpjazdphwALOcReeNswVgR4K6/Pg=";
+    hash = "sha256-cmqOlfoVMHlX5E55Fboo7zBVy+MDZFj3PBS/mvZQw0c=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-sxAyJsVcBrwUX1w3Kr8Z451RINUPTwJPlmY/yeXSofk=";
+  vendorHash = "sha256-uehEZCj/U+xmdLt7E/Tsbog5GT78CcgxO8ZOB9QFqis=";
 
   subPackages = [ "apps/cnspec" ];
 

From 2a1290b206bc2a2392ef030a63cb8c2f3d5ba8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= <kubukoz@gmail.com>
Date: Fri, 6 Jun 2025 16:42:50 +0200
Subject: [PATCH 1384/1497] metals: 1.5.3 -> 1.6.0

---
 pkgs/by-name/me/metals/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix
index 6a97121ff564..a913e17d150b 100644
--- a/pkgs/by-name/me/metals/package.nix
+++ b/pkgs/by-name/me/metals/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "metals";
-  version = "1.5.3";
+  version = "1.6.0";
 
   deps = stdenv.mkDerivation {
     name = "metals-deps-${finalAttrs.version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-jxrAtlD+s3yjcDWYLoN7mr8RozutItCv8dt28/UoVjk=";
+    outputHash = "sha256-+6u/nnaoCBEQCwhvPs1WQzMnppz7KEWWd1TlzbKYpAU=";
   };
 
   nativeBuildInputs = [

From d5960b9e0318c33ca2a4c44e7d2ff74587608011 Mon Sep 17 00:00:00 2001
From: gustavderdrache <gustavderdrache@gmail.com>
Date: Fri, 6 Jun 2025 10:45:28 -0400
Subject: [PATCH 1385/1497] nixos-generate-config: Add test for Flake=1 option

---
 nixos/tests/nixos-generate-config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix
index c887403bbda3..175849bcac62 100644
--- a/nixos/tests/nixos-generate-config.nix
+++ b/nixos/tests/nixos-generate-config.nix
@@ -46,5 +46,11 @@
     machine.succeed("rm -rf /etc/nixos")
     machine.succeed("nixos-generate-config --flake")
     machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")
+
+    machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg")
+    machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf")
+    machine.succeed("nixos-generate-config")
+    machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")
+    machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg")
   '';
 }

From 34aefd5ed345bf529a14c6d327c81d8aaa70de68 Mon Sep 17 00:00:00 2001
From: wenxuanjun <wenxuanjun@yahoo.com>
Date: Sat, 7 Jun 2025 00:09:24 +0800
Subject: [PATCH 1386/1497] nekoray: fix icon not shown

---
 pkgs/by-name/ne/nekoray/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix
index 5275ff38d4a3..07c75a213e98 100644
--- a/pkgs/by-name/ne/nekoray/package.nix
+++ b/pkgs/by-name/ne/nekoray/package.nix
@@ -71,8 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     install -Dm755 nekoray "$out/share/nekoray/nekoray"
-
-    install -Dm644 "$src/res/public/nekobox.png" "$out/share/pixmaps/nekoray.png"
+    install -Dm644 "$src/res/public/nekobox.png" "$out/share/icons/hicolor/256x256/apps/nekoray.png"
 
     mkdir -p "$out/bin"
     ln -s "$out/share/nekoray/nekoray" "$out/bin"
@@ -90,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   desktopItems = [
     (makeDesktopItem {
       name = "nekoray";
-      desktopName = "nekoray";
+      desktopName = "Nekoray";
       exec = "nekoray";
       icon = "nekoray";
       comment = finalAttrs.meta.description;

From 1e6cf3ce4fb45a9d4ca422b45043e78189f66489 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 6 Jun 2025 18:20:58 +0200
Subject: [PATCH 1387/1497] pre-commit: unbreak darwin

---
 pkgs/by-name/pr/pre-commit/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index 1e0791e70f16..a6ce5d508873 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -12,12 +12,14 @@
   perl,
   cabal-install,
   julia,
+  julia-bin,
   pre-commit,
 }:
 
 with python3Packages;
 let
   i686Linux = stdenv.buildPlatform.system == "i686-linux";
+  julia' = if lib.meta.availableOn stdenv.hostPlatform julia then julia else julia-bin;
 in
 buildPythonApplication rec {
   pname = "pre-commit";
@@ -61,7 +63,7 @@ buildPythonApplication rec {
       pytestCheckHook
       re-assert
       cabal-install
-      julia
+      julia'
     ]
     ++ lib.optionals (!i686Linux) [
       # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a

From 07dd7435ee2a3fdef3f03227d121eb705d06bc7a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:05 +0200
Subject: [PATCH 1388/1497] electron_34-bin: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index ab7370d0d55f..d11cd6dfd364 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8",
-            "aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9",
-            "armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef",
+            "aarch64-darwin": "56c27f79c298bd21f6a0434b70776633ce9971667edf22783b4b3f0051646248",
+            "aarch64-linux": "2172a9fa02331ba9c645dd6a6c5c6c07235e902c0aebb61b123d2f6c3ea0121f",
+            "armv7l-linux": "03514c1e42d4215972add90eb828221aec29278113ecf6761ec014aee92b3c4e",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6",
-            "x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5"
+            "x86_64-darwin": "fb13c7bf7f01529e0084433166f6b66b149407d8f950ca176fde20f023ee64b6",
+            "x86_64-linux": "da78b040068b6f0d41b3ccc5e5d26f1130bcdeba83f23ebbdae416c26bcf80e2"
         },
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "hashes": {

From 6d5dbf6fae055bd5f4d655c48c925d31ac8a01aa Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:16 +0200
Subject: [PATCH 1389/1497] electron-chromedriver_34: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index cdaaf85176c2..f2b95261700f 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52",
-            "aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01",
-            "armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518",
+            "aarch64-darwin": "a3078146762ff67f27dd97470a9d2b4b5a04c182c6fcc5c949303e9a666b8d73",
+            "aarch64-linux": "b0a9aa381fb4b12822408d8ca668b64cbc67c1b18b8a4e5dedd2d0ad7b3513f9",
+            "armv7l-linux": "61a62d8b3d5604a098dc03cac7c89a325ff478d896921e286aabfd22735c64b1",
             "headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
-            "x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97",
-            "x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95"
+            "x86_64-darwin": "aa2ac2aa0dbe410ca152e85ceaf5baeb2cccb28bac7b52b866468edd5e6eb113",
+            "x86_64-linux": "1a6b534f65c47d2e839f5da0efeeb449cebe622e731b624ccc8c91f493eeec4f"
         },
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "hashes": {

From 7d88bd44155d663632aad535e32ad57156c994f3 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:26 +0200
Subject: [PATCH 1390/1497] electron_35-bin: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index d11cd6dfd364..d7980b762dc0 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47",
-            "aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d",
-            "armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c",
-            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
-            "x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf",
-            "x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4"
+            "aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108",
+            "aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f",
+            "armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3",
+            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
+            "x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847",
+            "x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5"
         },
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "hashes": {

From 0e153293e68b27add2f69228b9b4cc8dab615311 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:36 +0200
Subject: [PATCH 1391/1497] electron-chromedriver_35: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index f2b95261700f..aa197de72f20 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4",
-            "aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa",
-            "armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d",
-            "headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
-            "x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a",
-            "x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0"
+            "aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4",
+            "aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191",
+            "armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65",
+            "headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
+            "x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862",
+            "x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d"
         },
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "hashes": {

From 53cbc1a396c2bfaefa140b150a3492fd3c618c32 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:47 +0200
Subject: [PATCH 1392/1497] electron_36-bin: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index d7980b762dc0..91b5a1b967af 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e",
-            "aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf",
-            "armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995",
-            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
-            "x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03",
-            "x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e"
+            "aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d",
+            "aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c",
+            "armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635",
+            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
+            "x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91",
+            "x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c"
         },
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From 6d9e078ea6de978a7d8245e5ecf0c8ff4b715b5b Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:18:57 +0200
Subject: [PATCH 1393/1497] electron-chromedriver_36: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index aa197de72f20..cfed30b50ec1 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340",
-            "aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1",
-            "armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6",
-            "headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
-            "x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1",
-            "x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a"
+            "aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2",
+            "aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e",
+            "armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e",
+            "headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
+            "x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5",
+            "x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca"
         },
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From e237be9a454d3ac772db3163d582faf582c1dc25 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:42:49 +0200
Subject: [PATCH 1394/1497] electron-source.electron_34: 34.5.7 -> 34.5.8

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.8
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.7...v34.5.8
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index f181728bc62c..a328a6a0e3d2 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=",
+                    "hash": "sha256-ABlVuW0EUsFUyuIaugoI09EsHF+g7fxRSS/bOaOAkjg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v34.5.7"
+                    "tag": "v34.5.8"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1274,7 +1274,7 @@
         "electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
         "modules": "132",
         "node": "20.19.1",
-        "version": "34.5.7"
+        "version": "34.5.8"
     },
     "35": {
         "chrome": "134.0.6998.205",

From 84093de5993565084a19f4bc1776b885ff71ed88 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:59:48 +0200
Subject: [PATCH 1395/1497] electron-source.electron_35: 35.5.0 -> 35.5.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.5.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.5.0...v35.5.1
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index a328a6a0e3d2..a2069edcb3de 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1334,10 +1334,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=",
+                    "hash": "sha256-jIEeMTY8D4o2cCmk2RupGKu9HTVFjNI+90QZlXNrOWM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v35.5.0"
+                    "tag": "v35.5.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2583,7 +2583,7 @@
         "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
         "modules": "133",
         "node": "22.15.1",
-        "version": "35.5.0"
+        "version": "35.5.1"
     },
     "36": {
         "chrome": "136.0.7103.115",

From 308e77ddac6ade9b4771711c16f8e603bd3fbfb9 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 19:33:18 +0200
Subject: [PATCH 1396/1497] electron-source.electron_36: 36.3.2 -> 36.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v36.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.3.2...v36.4.0
- Fixes CVE-2025-5419
---
 pkgs/development/tools/electron/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index a2069edcb3de..d2e91a284230 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2586,7 +2586,7 @@
         "version": "35.5.1"
     },
     "36": {
-        "chrome": "136.0.7103.115",
+        "chrome": "136.0.7103.149",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2596,15 +2596,15 @@
                     "version": "2025-03-24"
                 }
             },
-            "version": "136.0.7103.115"
+            "version": "136.0.7103.149"
         },
         "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=",
+                    "hash": "sha256-qu3+U2o7N0MSx+nifQMAfSEjxTDIBSz/DNkEZdo5uFw=",
                     "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "136.0.7103.115",
+                    "tag": "136.0.7103.149",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2643,10 +2643,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=",
+                    "hash": "sha256-DwV8hZ6iK1Pc0j/86UnrkJ6FhOXD3eCBiOk5Y14N4jg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.3.2"
+                    "tag": "v36.4.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3898,8 +3898,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=",
-                    "rev": "5297e56d91816747d539abca52b578e5832135f0",
+                    "hash": "sha256-COlRcmBtuP/XBe9j4Qxikkz7ZSwcQhcWVe5+I0++OOk=",
+                    "rev": "150f01318cda02f1ef63dd79672eae6c81dd3301",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3908,6 +3908,6 @@
         "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
         "modules": "135",
         "node": "22.15.1",
-        "version": "36.3.2"
+        "version": "36.4.0"
     }
 }

From 7b39a05e07c11abde4e2521ae27c270209632644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 6 Jun 2025 09:33:29 -0700
Subject: [PATCH 1397/1497] docs/language-frameworks/python: don't test
 coverage etc

---
 doc/languages-frameworks/python.section.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index af951cc3e805..fb5f6c8e9a0b 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1259,6 +1259,13 @@ as many tests should be enabled as possible. Failing tests can still be
 a good indication that the package is not in a valid state.
 :::
 
+::: {.note}
+We only want to test the functionality of a package. In particular, we are not
+interested in coverage, formatting, and type checking. If pytest fails with
+`unrecognized arguments: --cov`, add `pytest-cov-stub` to `nativeCheckInputs`
+rather than `pytest-cov`.
+:::
+
 #### Using pytest {#using-pytest}
 
 Pytest is the most common test runner for python repositories. A trivial

From 364a4d0d44b67261462dd162f31f7fb2b93bf271 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:36:43 +0800
Subject: [PATCH 1398/1497] newelle: init at 0.9.7

---
 pkgs/by-name/ne/newelle/package.nix | 104 ++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 pkgs/by-name/ne/newelle/package.nix

diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix
new file mode 100644
index 000000000000..e226ca62f03b
--- /dev/null
+++ b/pkgs/by-name/ne/newelle/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  gobject-introspection,
+  desktop-file-utils,
+  libadwaita,
+  vte-gtk4,
+  gsettings-desktop-schemas,
+  gtksourceview5,
+  lsb-release,
+  bash,
+  ffmpeg,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "newelle";
+  version = "0.9.7";
+  pyproject = false; # uses meson
+
+  src = fetchFromGitHub {
+    owner = "qwersyk";
+    repo = "Newelle";
+    tag = version;
+    hash = "sha256-h0dWjnUqWcPdSbR60HF2KvQxUyYeR3qHf2GMHt/kSm0=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/utility/pip.py \
+      --replace-fail "# Manage pip path locking" "return None"
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    gobject-introspection
+    wrapGAppsHook4
+    desktop-file-utils
+    pkg-config
+  ];
+
+  buildInputs = [
+    libadwaita
+    vte-gtk4
+    gsettings-desktop-schemas
+    gtksourceview5
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    libxml2
+    pydub
+    gtts
+    speechrecognition
+    numpy
+    matplotlib
+    pylatexenc
+    pyaudio
+    pip-install-test
+    newspaper3k
+    tiktoken
+    openai
+    ollama
+    llama-index-core
+    llama-index-readers-file
+    google-genai
+    anthropic
+  ];
+
+  strictDeps = true;
+
+  postInstallCheck = ''
+    mesonCheckPhase
+  '';
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        lsb-release
+        bash
+        ffmpeg
+      ]
+    }"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/qwersyk/Newelle";
+    description = "Ultimate Virtual Assistant";
+    mainProgram = "newelle";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

From ba171fcce275cc8179eaf22eb34c9a6e79fb02f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Jun 2025 08:26:50 +0000
Subject: [PATCH 1399/1497] python3Packages.robotframework: 7.2.2 -> 7.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Remove bad meta.changelog update.]
---
 pkgs/development/python-modules/robotframework/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index a133e157ffe0..485420779a1d 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "robotframework";
-  version = "7.2.2";
+  version = "7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "robotframework";
     tag = "v${version}";
-    hash = "sha256-Kl+XjGTTiEesVi7aZJMBQQklw83ROrpaWziq+8puZKg=";
+    hash = "sha256-Hj1ZIWH0GSLJiO2AEQnGkVGbnw0h1zEorE/J1al3NWM=";
   };
 
   build-system = [ setuptools ];

From eb1a6a6b85f8c23c7871613f1e2876274fa4e7d3 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:47:16 +0800
Subject: [PATCH 1400/1497] debian-devscripts: 2.25.10 -> 2.25.14

---
 pkgs/by-name/de/debian-devscripts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index ec27b1091aba..c37453bfbfe2 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.10";
+  version = "2.25.14";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
-    hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus=";
+    hash = "sha256-z95BOgGNYFvleqCv8e6B7Tl91xPzgQHkcxIg55maXvQ=";
   };
 
   patches = [

From 59527f5170a5009246de3dbb1bd3df5acd2e0ee2 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 6 Jun 2025 16:58:06 +0200
Subject: [PATCH 1401/1497] headscale: 0.26.0 -> 0.26.1

---
 pkgs/servers/headscale/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
index f013ba355905..8d542562e43a 100644
--- a/pkgs/servers/headscale/default.nix
+++ b/pkgs/servers/headscale/default.nix
@@ -11,13 +11,13 @@
 }:
 buildGoModule rec {
   pname = "headscale";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     tag = "v${version}";
-    hash = "sha256-BzCcOUousbw+PrYM7SGDtJuTGvhpsTNOF2kQZEl6z84=";
+    hash = "sha256-LnS6K3U4RgRRV4i92zcRZtLJF1QdbORQP9ZIis9u6rk=";
   };
 
   vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk=";

From bab9d019285a938e356ef9e6f157a7644c4232f7 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 18:07:20 +0000
Subject: [PATCH 1402/1497] zipline: 4.1.1 -> 4.1.2

---
 pkgs/by-name/zi/zipline/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index f31096bfe0a7..46186f60ea81 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -29,18 +29,18 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5/qVczCypQ2HybpBzEJe9THsrT5Iu3md+IXffLJnVmQ=";
+    hash = "sha256-xxe64tGxZ2Udr+p21CKTZCHJ19ZOsdgPLlil+v+j5j4=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-zpNl6Ua4xRvBa62IHf+frnk4tWQHHF/HyEYGuUF2a78=";
+    hash = "sha256-O8RLaKff4Dj/JDeUOyf7GtcFcOu/aOuclyaZmVqVi5s=";
   };
 
   buildInputs = [ vips ];

From 669dea4759a3d74fdd877e5e359d32082d414818 Mon Sep 17 00:00:00 2001
From: aktaboot <120214979+aktaboot@users.noreply.github.com>
Date: Fri, 6 Jun 2025 20:27:59 +0200
Subject: [PATCH 1403/1497] mullvad: 2025.3 -> 2025.6 (#413876)

---
 .../networking/mullvad/mullvad.nix            | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 52a9e7dd61a6..a5b3be131c47 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -30,18 +30,28 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "mullvad";
-  version = "2025.3";
+  version = "2025.6";
 
   src = fetchFromGitHub {
     owner = "mullvad";
     repo = "mullvadvpn-app";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-IpGTqi0gSE2yXXou5fp+CryHfIKx0n3y/V4K2+ZO3k8=";
+    hash = "sha256-WWJcfnp1v1LhEElJQdLx6Gz+bj7MdgbefD6BQ4nihMs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EJ8yk11H1QB+7CGjJYY5BjBAFTDK4d02/DJOQTVGFho=";
+  cargoHash = "sha256-r6WogC25hpzw2pHa8RQOhr9SWks9RKKatpVHblfs+Nc=";
+
+  cargoBuildFlags = [
+    "-p mullvad-daemon --bin mullvad-daemon"
+    "-p mullvad-cli --bin mullvad"
+    "-p mullvad-setup --bin mullvad-setup"
+    "-p mullvad-problem-report --bin mullvad-problem-report"
+    "-p mullvad-exclude --bin mullvad-exclude"
+    "-p tunnel-obfuscation --bin tunnel-obfuscation"
+    "-p talpid-openvpn-plugin --lib"
+  ];
 
   checkFlags = [
     "--skip=version_check"
@@ -79,22 +89,14 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup =
-    # Place all binaries in the 'mullvad-' namespace, even though these
-    # specific binaries aren't used in the lifetime of the program.
+    # Files necessary for OpenVPN tunnels to work.
+    lib.optionalString enableOpenvpn ''
+      mkdir -p $out/share/mullvad
+      cp dist-assets/ca.crt $out/share/mullvad
+      ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
+      ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad
+      ln -s $out/lib/libtalpid_openvpn_plugin.so $out/share/mullvad
     ''
-      for bin in relay_list translations-converter tunnel-obfuscation; do
-        mv "$out/bin/$bin" "$out/bin/mullvad-$bin"
-      done
-    ''
-    +
-      # Files necessary for OpenVPN tunnels to work.
-      lib.optionalString enableOpenvpn ''
-        mkdir -p $out/share/mullvad
-        cp dist-assets/ca.crt $out/share/mullvad
-        ln -s ${openvpn-mullvad}/bin/openvpn $out/share/mullvad
-        ln -s ${shadowsocks-rust}/bin/sslocal $out/share/mullvad
-        ln -s $out/lib/libtalpid_openvpn_plugin.so $out/share/mullvad
-      ''
     +
       # Set the directory where Mullvad will look for its resources by default to
       # `$out/share`, so that we can avoid putting the files in `$out/bin` --
@@ -121,7 +123,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Mullvad VPN command-line client tools";
     homepage = "https://github.com/mullvad/mullvadvpn-app";
-    changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.2/CHANGELOG.md";
+    changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.6/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ cole-h ];
     mainProgram = "mullvad";

From cb742cea3fc1de19ee8aed81b1083620d010e9f0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 6 Jun 2025 20:35:31 +0200
Subject: [PATCH 1404/1497] detach: init at 0.2.3

---
 pkgs/by-name/de/detach/package.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/de/detach/package.nix

diff --git a/pkgs/by-name/de/detach/package.nix b/pkgs/by-name/de/detach/package.nix
new file mode 100644
index 000000000000..a9025beaee11
--- /dev/null
+++ b/pkgs/by-name/de/detach/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "detach";
+  version = "0.2.3";
+
+  src = fetchzip {
+    url = "http://inglorion.net/download/detach-${version}.tar.bz2";
+    hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  dontConfigure = true;
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    installShellCompletion --cmd detach \
+      --zsh contrib/zsh-completer/_detach
+  '';
+
+  doCheck = false;
+
+  meta = {
+    description = "Utility for running a command detached from the current terminal";
+    homepage = "https://inglorion.net/software/detach/";
+    license = lib.licenses.mit;
+    mainProgram = "detach";
+    maintainers = with lib.maintainers; [ pbsds ];
+    platforms = lib.platforms.unix;
+  };
+}

From 1f8a032588e2189d6ef47e31a89b3de85426db19 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 1 May 2025 10:03:02 +0200
Subject: [PATCH 1405/1497] rocksndiamonds: unreak cross

---
 pkgs/by-name/ro/rocksndiamonds/package.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
index 503c9819db46..4f99b05f6a4c 100644
--- a/pkgs/by-name/ro/rocksndiamonds/package.nix
+++ b/pkgs/by-name/ro/rocksndiamonds/package.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
     ];
   };
 
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    SDL2 # sdl2-config
+  ];
   buildInputs = [
     SDL2
     SDL2_image
@@ -40,6 +45,10 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  preConfigure = ''
+    makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB")
+  '';
+
   preBuild = ''
     dataDir="$out/share/rocksndiamonds"
     appendToVar makeFlags "BASE_PATH=$dataDir"
@@ -59,7 +68,9 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
+  # flaky with parallel building
+  # ranlib: game_bd.a: error reading bd_caveengine.o: file truncated
+  enableParallelBuilding = false;
 
   meta = with lib; {
     description = "Scrolling tile-based arcade style puzzle game";

From 3f8ae669c9fb21c3e6841d97c2456d38a8c85645 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 1 May 2025 10:03:02 +0200
Subject: [PATCH 1406/1497] rocksndiamonds: modernize

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ro/rocksndiamonds/package.nix | 54 +++++++++++-----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/ro/rocksndiamonds/package.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
index 4f99b05f6a4c..9091dc837ef4 100644
--- a/pkgs/by-name/ro/rocksndiamonds/package.nix
+++ b/pkgs/by-name/ro/rocksndiamonds/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   makeDesktopItem,
+  copyDesktopItems,
   SDL2,
   SDL2_image,
   SDL2_mixer,
@@ -10,32 +11,35 @@
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rocksndiamonds";
   version = "4.4.0.5";
 
   src = fetchurl {
-    url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz";
+    url = "https://www.artsoft.org/RELEASES/linux/rocksndiamonds/rocksndiamonds-${finalAttrs.version}-linux.tar.gz";
     hash = "sha256-8e6ZYpFoUQ4+ykHDLlKWWyUANPq1lXv7IRHYWfBOU/U=";
   };
 
-  desktopItem = makeDesktopItem {
-    name = "rocksndiamonds";
-    exec = "rocksndiamonds";
-    icon = "rocksndiamonds";
-    comment = meta.description;
-    desktopName = "Rocks'n'Diamonds";
-    genericName = "Tile-based puzzle";
-    categories = [
-      "Game"
-      "LogicGame"
-    ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "rocksndiamonds";
+      exec = finalAttrs.meta.mainProgram;
+      icon = "rocksndiamonds";
+      comment = finalAttrs.meta.description;
+      desktopName = "Rocks'n'Diamonds";
+      genericName = "Tile-based puzzle";
+      categories = [
+        "Game"
+        "LogicGame"
+      ];
+    })
+  ];
 
   strictDeps = true;
 
   nativeBuildInputs = [
     SDL2 # sdl2-config
+    copyDesktopItems
   ];
   buildInputs = [
     SDL2
@@ -46,22 +50,16 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB")
-  '';
-
-  preBuild = ''
-    dataDir="$out/share/rocksndiamonds"
-    appendToVar makeFlags "BASE_PATH=$dataDir"
+    dataDir=$out/share/rocksndiamonds
+    makeFlagsArray+=("CC=$CC" "AR=$AR" "RANLIB=$RANLIB" "BASE_PATH=$dataDir")
   '';
 
   installPhase = ''
     runHook preInstall
 
-    appDir=$out/share/applications
     iconDir=$out/share/icons/hicolor/32x32/apps
-    mkdir -p $out/bin $appDir $iconDir $dataDir
+    mkdir -p $out/bin $iconDir $dataDir
     cp rocksndiamonds $out/bin/
-    ln -s ${desktopItem}/share/applications/* $appDir/
     ln -s $dataDir/graphics/gfx_classic/icons/icon.png $iconDir/rocksndiamonds.png
     cp -r conf docs graphics levels music sounds $dataDir
 
@@ -72,12 +70,12 @@ stdenv.mkDerivation rec {
   # ranlib: game_bd.a: error reading bd_caveengine.o: file truncated
   enableParallelBuilding = false;
 
-  meta = with lib; {
+  meta = {
     description = "Scrolling tile-based arcade style puzzle game";
     mainProgram = "rocksndiamonds";
     homepage = "https://www.artsoft.org/rocksndiamonds/";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})

From 4ad7d58513de8108713245be7bef37e61da0b7d3 Mon Sep 17 00:00:00 2001
From: Alexander Reynolds <alex@theory.shop>
Date: Fri, 6 Jun 2025 14:56:21 -0400
Subject: [PATCH 1407/1497] python312Packages.conjure-python-client: init at
 3.0.0

---
 .../conjure-python-client/default.nix         | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/conjure-python-client/default.nix

diff --git a/pkgs/development/python-modules/conjure-python-client/default.nix b/pkgs/development/python-modules/conjure-python-client/default.nix
new file mode 100644
index 000000000000..4856b050ace9
--- /dev/null
+++ b/pkgs/development/python-modules/conjure-python-client/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  requests,
+  pytestCheckHook,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  version = "3.0.0";
+  pname = "conjure-python-client";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "palantir";
+    repo = "conjure-python-client";
+    tag = "${version}";
+    hash = "sha256-Ux4yn/fvfiW1mPir1lT+l9bKUnh7CNU6qNTac046H74=";
+  };
+
+  # https://github.com/palantir/conjure-python-client/blob/3.0.0/setup.py#L57
+  postPatch = ''
+    echo '__version__ = "${version}"' > ./conjure_python_client/_version.py
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+  ];
+
+  # some tests depend on a code generator that isn't available in nixpkgs
+  # https://github.com/palantir/conjure-python-client/blob/3.0.0/CONTRIBUTING.md?plain=1#L23
+  disabledTestPaths = [
+    "test/conjure/test_conjure_repr.py"
+    "test/integration_test"
+    "test/serde/test_decode_union.py"
+  ];
+
+  pythonImportsCheck = [ "conjure_python_client" ];
+
+  meta = {
+    description = "Python client and JSON encoders for use with generated Conjure clients";
+    homepage = "https://github.com/palantir/conjure-python-client";
+    changelog = "https://github.com/palantir/conjure-python-client/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ alkasm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 79acec4ff1e0..a9f6f5deb977 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2825,6 +2825,8 @@ self: super: with self; {
 
   confuse = callPackage ../development/python-modules/confuse { };
 
+  conjure-python-client = callPackage ../development/python-modules/conjure-python-client { };
+
   connect-box = callPackage ../development/python-modules/connect-box { };
 
   connected-components-3d = callPackage ../development/python-modules/connected-components-3d { };

From d6f9c4d2edb75ad2fbc767b4214aea19e64b7e47 Mon Sep 17 00:00:00 2001
From: Alexander Reynolds <alex@theory.shop>
Date: Fri, 6 Jun 2025 14:57:24 -0400
Subject: [PATCH 1408/1497] python312Packages.nominal-api: init at 0.708.0

---
 .../python-modules/nominal-api/default.nix    | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/nominal-api/default.nix

diff --git a/pkgs/development/python-modules/nominal-api/default.nix b/pkgs/development/python-modules/nominal-api/default.nix
new file mode 100644
index 000000000000..23973567b65f
--- /dev/null
+++ b/pkgs/development/python-modules/nominal-api/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  requests,
+  conjure-python-client,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal-api";
+  version = "0.708.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "nominal_api";
+    hash = "sha256-gaMQ4bLhdBkDTUoHP5Cb0vS5emNcYga5eTvV2TEWQiU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    conjure-python-client
+  ];
+
+  pythonImportsCheck = [ "nominal_api" ];
+
+  meta = {
+    description = "Generated conjure client for the Nominal API";
+    homepage = "https://pypi.org/project/nominal-api/";
+    maintainers = with lib.maintainers; [ alkasm ];
+    license = lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9f6f5deb977..a4ff04e15e93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10183,6 +10183,8 @@ self: super: with self; {
 
   nomadnet = callPackage ../development/python-modules/nomadnet { };
 
+  nominal-api = callPackage ../development/python-modules/nominal-api { };
+
   nonbloat-db = callPackage ../development/python-modules/nonbloat-db { };
 
   noneprompt = callPackage ../development/python-modules/noneprompt { };

From 1b951d5f0ba020e9849053447a434b94d8b05115 Mon Sep 17 00:00:00 2001
From: Alexander Reynolds <alex@theory.shop>
Date: Fri, 6 Jun 2025 14:58:03 -0400
Subject: [PATCH 1409/1497] python312Packages.nominal-api-protos: init at
 0.708.0

---
 .../nominal-api-protos/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/nominal-api-protos/default.nix

diff --git a/pkgs/development/python-modules/nominal-api-protos/default.nix b/pkgs/development/python-modules/nominal-api-protos/default.nix
new file mode 100644
index 000000000000..59d978720958
--- /dev/null
+++ b/pkgs/development/python-modules/nominal-api-protos/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  protobuf,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal-api-protos";
+  version = "0.708.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "nominal_api_protos";
+    hash = "sha256-EYyBRmmCq4OA6xgf4JpajUtlJClkxxPn48Wmmy2mqN4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ protobuf ];
+
+  pythonImportsCheck = [ "nominal_api_protos" ];
+
+  meta = {
+    description = "Generated protobuf client for the Nominal API";
+    homepage = "https://pypi.org/project/nominal-api-protos/";
+    maintainers = with lib.maintainers; [ alkasm ];
+    license = lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4ff04e15e93..1b7934b26cc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10185,6 +10185,8 @@ self: super: with self; {
 
   nominal-api = callPackage ../development/python-modules/nominal-api { };
 
+  nominal-api-protos = callPackage ../development/python-modules/nominal-api-protos { };
+
   nonbloat-db = callPackage ../development/python-modules/nonbloat-db { };
 
   noneprompt = callPackage ../development/python-modules/noneprompt { };

From 1e5032d31aa83eb4c03c7ee8e78ed92b32b065cb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 6 Jun 2025 21:27:08 +0200
Subject: [PATCH 1410/1497] shadow: unbreak cross eval

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sh/shadow/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index cc5a36f5afbd..58cc701e9efc 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -22,7 +22,7 @@
   tcb,
 }:
 let
-  glibc =
+  glibc' =
     if stdenv.hostPlatform != stdenv.buildPlatform then
       glibc
     else
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withTcb "--with-tcb";
 
   preBuild = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
-    substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
+    substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc'.bin}/bin/nscd
   '';
 
   postInstall = ''

From 1867adb2356a35aec34f6108b81eb6151e010bf9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 6 Jun 2025 22:30:16 +0300
Subject: [PATCH 1411/1497] Revert "llvmPackages_20: 20.1.5 -> 20.1.6"

---
 .../compilers/llvm/common/llvm/default.nix           | 12 +++++++++++-
 pkgs/development/compilers/llvm/default.nix          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index a605c17e492c..e7d12650fa47 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -294,7 +294,17 @@ stdenv.mkDerivation (
       ++
         lib.optional (lib.versionAtLeast release_version "15")
           # Just like the `llvm-lit-cfg` patch, but for `polly`.
-          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
+          (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
+      ++
+        lib.optional (lib.versions.major release_version == "20")
+          # https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
+          (
+            fetchpatch {
+              url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
+              stripLen = 1;
+              hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
+            }
+          );
 
     nativeBuildInputs =
       [
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9fc862c71751..1762da6b16a8 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -31,7 +31,7 @@ let
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
-    "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
+    "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
     "21.0.0-git".gitRelease = {
       rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
       rev-version = "21.0.0-unstable-2025-06-06";

From ae8daeb5f0e1ea2d976c8a1467e107fb40e79cb2 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 6 Jun 2025 21:30:54 +0200
Subject: [PATCH 1412/1497] python3Packages.markitdown: add missing dependency

---
 pkgs/development/python-modules/markitdown/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 8db31e31dc05..565602f2feff 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   hatchling,
   beautifulsoup4,
+  defusedxml,
   ffmpeg-headless,
   magika,
   mammoth,
@@ -45,6 +46,7 @@ buildPythonPackage rec {
 
   dependencies = [
     beautifulsoup4
+    defusedxml
     ffmpeg-headless
     lxml
     magika

From 264e9cb92811dd0ac300090264089e7eeacf4707 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 6 Jun 2025 21:58:04 +0200
Subject: [PATCH 1413/1497] treewide: remove with lib Part 3

---
 pkgs/by-name/ns/nsh/package.nix                        |  8 ++++----
 pkgs/by-name/ns/nsq/package.nix                        |  6 +++---
 pkgs/by-name/nu/nuclei-templates/package.nix           |  8 ++++----
 pkgs/by-name/nu/nuclei/package.nix                     |  6 +++---
 pkgs/by-name/nu/nucleiparser/package.nix               |  6 +++---
 pkgs/by-name/nu/numberstation/package.nix              |  6 +++---
 pkgs/by-name/nu/nurl/package.nix                       |  6 +++---
 pkgs/by-name/oa/oapi-codegen/package.nix               |  6 +++---
 pkgs/by-name/oc/ocrodjvu/package.nix                   |  8 ++++----
 pkgs/by-name/oc/ocsinventory-agent/package.nix         |  8 ++++----
 pkgs/by-name/oc/octosuite/package.nix                  |  6 +++---
 pkgs/by-name/of/offat/package.nix                      |  6 +++---
 pkgs/by-name/on/onefetch/package.nix                   |  6 +++---
 pkgs/by-name/op/opcr-policy/package.nix                |  6 +++---
 pkgs/by-name/op/openapi-changes/package.nix            |  6 +++---
 pkgs/by-name/op/opengrok/package.nix                   |  8 ++++----
 pkgs/by-name/op/openimagedenoise/package.nix           | 10 +++++-----
 pkgs/by-name/op/openjpeg/package.nix                   |  8 ++++----
 pkgs/by-name/op/openllm/package.nix                    |  6 +++---
 pkgs/by-name/op/openorienteering-mapper/package.nix    |  8 ++++----
 pkgs/by-name/op/openrisk/package.nix                   |  6 +++---
 pkgs/by-name/op/opentimestamps-client/package.nix      |  6 +++---
 pkgs/by-name/op/opentofu/package.nix                   |  6 +++---
 pkgs/by-name/op/openvswitch/package.nix                |  8 ++++----
 pkgs/by-name/op/operator-sdk/package.nix               |  8 ++++----
 pkgs/by-name/op/opkg/package.nix                       |  8 ++++----
 pkgs/by-name/op/opsdroid/package.nix                   |  8 ++++----
 pkgs/by-name/or/orbuculum/package.nix                  |  8 ++++----
 pkgs/by-name/ou/ouch/package.nix                       |  6 +++---
 pkgs/by-name/ou/outfox/package.nix                     |  8 ++++----
 pkgs/by-name/ou/outputcheck/package.nix                |  6 +++---
 pkgs/by-name/ow/owmods-cli/package.nix                 |  6 +++---
 pkgs/by-name/ow/owncloud-client/package.nix            |  8 ++++----
 pkgs/by-name/pa/packer/package.nix                     |  6 +++---
 pkgs/by-name/pa/packj/package.nix                      |  6 +++---
 pkgs/by-name/pa/pacproxy/package.nix                   |  6 +++---
 pkgs/by-name/pa/pactorio/package.nix                   |  6 +++---
 pkgs/by-name/pa/pacu/package.nix                       |  6 +++---
 pkgs/by-name/pa/padre/package.nix                      |  6 +++---
 pkgs/by-name/pa/pam_u2f/package.nix                    |  8 ++++----
 pkgs/by-name/pa/parquet-tools/package.nix              |  6 +++---
 pkgs/by-name/pa/passdetective/package.nix              |  6 +++---
 pkgs/by-name/pa/past-time/package.nix                  |  6 +++---
 pkgs/by-name/pa/pastel/package.nix                     |  6 +++---
 pkgs/by-name/pa/patch2pr/package.nix                   |  6 +++---
 pkgs/by-name/pa/patsh/package.nix                      |  6 +++---
 pkgs/by-name/pa/payload-dumper-go/package.nix          |  6 +++---
 pkgs/by-name/pd/pdfrip/package.nix                     |  6 +++---
 pkgs/by-name/pd/pdm/package.nix                        |  6 +++---
 pkgs/by-name/pe/pe-parse/package.nix                   |  8 ++++----
 pkgs/by-name/pe/peco/package.nix                       |  6 +++---
 pkgs/by-name/pe/pentestgpt/package.nix                 |  6 +++---
 pkgs/by-name/pg/pgcenter/package.nix                   |  6 +++---
 pkgs/by-name/pg/pgformatter/package.nix                |  8 ++++----
 pkgs/by-name/pg/pgmoneta/package.nix                   |  8 ++++----
 pkgs/by-name/pg/pgo-client/package.nix                 |  6 +++---
 pkgs/by-name/pg/pgtop/package.nix                      |  6 +++---
 pkgs/by-name/pg/pgweb/package.nix                      |  6 +++---
 pkgs/by-name/ph/phd2/package.nix                       |  8 ++++----
 pkgs/by-name/ph/phetch/package.nix                     |  6 +++---
 pkgs/by-name/ph/phrase-cli/package.nix                 |  6 +++---
 pkgs/by-name/pi/pika-backup/package.nix                | 10 +++++-----
 pkgs/by-name/pi/piping-server-rust/package.nix         |  6 +++---
 pkgs/by-name/pl/planus/package.nix                     |  6 +++---
 pkgs/by-name/pl/plow/package.nix                       |  6 +++---
 pkgs/by-name/po/podman/package.nix                     |  6 +++---
 pkgs/by-name/po/poethepoet/package.nix                 |  6 +++---
 pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix    |  6 +++---
 pkgs/by-name/po/poezio/package.nix                     |  6 +++---
 pkgs/by-name/po/polymake/package.nix                   |  8 ++++----
 pkgs/by-name/po/pomsky/package.nix                     |  6 +++---
 pkgs/by-name/po/pop/package.nix                        |  6 +++---
 pkgs/by-name/po/popeye/package.nix                     |  6 +++---
 pkgs/by-name/po/popsicle/package.nix                   |  8 ++++----
 pkgs/by-name/po/portal/package.nix                     |  6 +++---
 pkgs/by-name/po/portfolio-filemanager/package.nix      |  8 ++++----
 pkgs/by-name/po/postfix/package.nix                    |  8 ++++----
 pkgs/by-name/po/postgresql_jdbc/package.nix            |  8 ++++----
 pkgs/by-name/po/postmoogle/package.nix                 |  6 +++---
 pkgs/by-name/po/pouf/package.nix                       |  6 +++---
 pkgs/by-name/po/poutine/package.nix                    |  6 +++---
 pkgs/by-name/po/powerhub/package.nix                   |  6 +++---
 pkgs/by-name/po/powerline-go/package.nix               |  6 +++---
 pkgs/by-name/po/powershell-editor-services/package.nix | 10 +++++-----
 pkgs/by-name/po/powertop/package.nix                   |  8 ++++----
 pkgs/by-name/pr/pr-tracker/package.nix                 |  8 ++++----
 pkgs/by-name/pr/pre2k/package.nix                      |  6 +++---
 pkgs/by-name/pr/pretalx/package.nix                    | 10 +++++-----
 pkgs/by-name/pr/pretender/package.nix                  |  6 +++---
 pkgs/by-name/pr/probe-rs-tools/package.nix             |  6 +++---
 pkgs/by-name/pr/process-compose/package.nix            |  6 +++---
 pkgs/by-name/pr/procs/package.nix                      |  6 +++---
 pkgs/by-name/pr/programmer-calculator/package.nix      |  6 +++---
 pkgs/by-name/pr/prometheus-node-exporter/package.nix   |  6 +++---
 pkgs/by-name/pr/promptfoo/package.nix                  |  6 +++---
 pkgs/by-name/pr/promscale/package.nix                  |  6 +++---
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix      |  6 +++---
 pkgs/by-name/pr/protoc-gen-es/package.nix              |  6 +++---
 pkgs/by-name/pr/proton-caller/package.nix              |  6 +++---
 pkgs/by-name/pr/protox/package.nix                     |  6 +++---
 pkgs/by-name/pr/prowlarr/package.nix                   |  6 +++---
 pkgs/by-name/pr/proxify/package.nix                    |  6 +++---
 pkgs/by-name/pr/prs/package.nix                        |  6 +++---
 pkgs/by-name/pt/ptouch-driver/package.nix              |  8 ++++----
 pkgs/by-name/py/py-spy/package.nix                     |  6 +++---
 pkgs/by-name/py/pyrosimple/package.nix                 |  6 +++---
 pkgs/by-name/py/pysqlrecon/package.nix                 |  6 +++---
 pkgs/by-name/py/python-launcher/package.nix            |  6 +++---
 pkgs/by-name/qu/quadrapassel/package.nix               |  8 ++++----
 pkgs/by-name/qu/qutebrowser/package.nix                |  6 +++---
 pkgs/by-name/ra/radcli/package.nix                     |  8 ++++----
 pkgs/by-name/ra/rage/package.nix                       |  6 +++---
 pkgs/by-name/ra/railway/package.nix                    |  6 +++---
 pkgs/by-name/ra/rakkess/package.nix                    |  6 +++---
 pkgs/by-name/ra/range-v3/package.nix                   |  8 ++++----
 pkgs/by-name/ra/rates/package.nix                      |  6 +++---
 pkgs/by-name/rc/rcp/package.nix                        |  6 +++---
 pkgs/by-name/re/reaction/package.nix                   |  8 ++++----
 pkgs/by-name/re/ready-check/package.nix                |  6 +++---
 pkgs/by-name/re/redfishtool/package.nix                |  6 +++---
 pkgs/by-name/re/refinery-cli/package.nix               |  6 +++---
 pkgs/by-name/re/rehex/package.nix                      |  8 ++++----
 pkgs/by-name/re/remarshal_0_17/package.nix             |  6 +++---
 pkgs/by-name/re/remodel/package.nix                    |  6 +++---
 pkgs/by-name/re/reshape/package.nix                    |  6 +++---
 pkgs/by-name/re/restish/package.nix                    |  6 +++---
 pkgs/by-name/re/resvg/package.nix                      |  6 +++---
 pkgs/by-name/re/reviewdog/package.nix                  |  6 +++---
 pkgs/by-name/re/rewrk/package.nix                      |  6 +++---
 pkgs/by-name/ri/riff/package.nix                       |  6 +++---
 pkgs/by-name/ri/rime-cli/package.nix                   |  6 +++---
 pkgs/by-name/ri/rinutils/package.nix                   |  8 ++++----
 pkgs/by-name/ri/ripe-atlas-tools/package.nix           |  6 +++---
 pkgs/by-name/ri/ripgrep/package.nix                    |  6 +++---
 pkgs/by-name/ri/rita/package.nix                       |  6 +++---
 pkgs/by-name/ro/robin-map/package.nix                  |  8 ++++----
 pkgs/by-name/ro/robotframework-tidy/package.nix        |  6 +++---
 pkgs/by-name/ro/roswell/package.nix                    |  8 ++++----
 pkgs/by-name/ro/route-graph/package.nix                |  6 +++---
 pkgs/by-name/ro/routinator/package.nix                 |  6 +++---
 pkgs/by-name/rq/rqbit/package.nix                      |  6 +++---
 pkgs/by-name/rs/rsass/package.nix                      |  6 +++---
 pkgs/by-name/rs/rsbkb/package.nix                      |  6 +++---
 pkgs/by-name/rs/rsgain/package.nix                     |  8 ++++----
 pkgs/by-name/rs/rssguard/package.nix                   |  8 ++++----
 pkgs/by-name/rs/rstfmt/package.nix                     |  6 +++---
 pkgs/by-name/ru/ruler/package.nix                      |  6 +++---
 pkgs/by-name/ru/rune-languageserver/package.nix        |  6 +++---
 pkgs/by-name/ru/rune/package.nix                       |  6 +++---
 pkgs/by-name/ru/runme/package.nix                      |  6 +++---
 pkgs/by-name/ru/runpodctl/package.nix                  |  6 +++---
 pkgs/by-name/ru/rust-cbindgen/package.nix              |  6 +++---
 pkgs/by-name/ru/rust-motd/package.nix                  |  6 +++---
 pkgs/by-name/ru/rust-script/package.nix                |  6 +++---
 pkgs/by-name/ru/rustcat/package.nix                    |  6 +++---
 pkgs/by-name/ru/rustdesk-server/package.nix            |  8 ++++----
 pkgs/by-name/ru/rustscan/package.nix                   |  6 +++---
 pkgs/by-name/ru/rusty-diceware/package.nix             |  6 +++---
 pkgs/by-name/ru/rustycli/package.nix                   |  6 +++---
 pkgs/by-name/ru/rustypaste/package.nix                 |  6 +++---
 pkgs/by-name/sa/sad/package.nix                        |  6 +++---
 pkgs/by-name/sa/saga/package.nix                       | 10 +++++-----
 pkgs/by-name/sa/sagoin/package.nix                     |  6 +++---
 pkgs/by-name/sa/salt/package.nix                       |  6 +++---
 pkgs/by-name/sa/sanjuuni/package.nix                   |  6 +++---
 pkgs/by-name/sa/savvycan/package.nix                   |  8 ++++----
 pkgs/by-name/sc/scalr-cli/package.nix                  |  6 +++---
 pkgs/by-name/sc/sccache/package.nix                    |  6 +++---
 pkgs/by-name/sc/scilla/package.nix                     |  6 +++---
 pkgs/by-name/sc/scraper/package.nix                    |  6 +++---
 pkgs/by-name/sd/sd-switch/package.nix                  |  8 ++++----
 pkgs/by-name/sd/sdlpop/package.nix                     |  8 ++++----
 pkgs/by-name/se/secretscanner/package.nix              |  6 +++---
 pkgs/by-name/se/seilfahrt/package.nix                  |  6 +++---
 pkgs/by-name/se/selene/package.nix                     |  6 +++---
 pkgs/by-name/se/sem/package.nix                        |  8 ++++----
 pkgs/by-name/se/senpai/package.nix                     |  6 +++---
 pkgs/by-name/se/sentry-cli/package.nix                 |  6 +++---
 pkgs/by-name/se/sentry-native/package.nix              |  8 ++++----
 pkgs/by-name/sh/shell-gpt/package.nix                  |  6 +++---
 pkgs/by-name/sh/shellclear/package.nix                 |  6 +++---
 pkgs/by-name/sh/shelldap/package.nix                   |  8 ++++----
 pkgs/by-name/sh/shellspec/package.nix                  |  8 ++++----
 pkgs/by-name/sh/shikane/package.nix                    |  8 ++++----
 pkgs/by-name/sh/shipments/package.nix                  |  6 +++---
 pkgs/by-name/sh/showmethekey/package.nix               |  8 ++++----
 pkgs/by-name/si/sic-image-cli/package.nix              |  6 +++---
 pkgs/by-name/si/siege/package.nix                      |  8 ++++----
 pkgs/by-name/si/siglo/package.nix                      |  8 ++++----
 pkgs/by-name/si/signaturepdf/package.nix               |  8 ++++----
 pkgs/by-name/si/simple-http-server/package.nix         |  6 +++---
 pkgs/by-name/si/simple-scan/package.nix                |  8 ++++----
 pkgs/by-name/si/simplex-chat-desktop/package.nix       |  6 +++---
 pkgs/by-name/si/sipexer/package.nix                    |  6 +++---
 pkgs/by-name/si/sipvicious/package.nix                 |  6 +++---
 pkgs/by-name/si/sish/package.nix                       |  6 +++---
 pkgs/by-name/sl/slides/package.nix                     |  6 +++---
 pkgs/by-name/sl/slowlorust/package.nix                 |  6 +++---
 pkgs/by-name/sl/slumber/package.nix                    |  6 +++---
 pkgs/by-name/sm/smag/package.nix                       |  6 +++---
 pkgs/by-name/sm/smbmap/package.nix                     |  6 +++---
 pkgs/by-name/sm/smtprelay/package.nix                  |  6 +++---
 pkgs/by-name/sm/smuxi/package.nix                      |  6 +++---
 pkgs/by-name/so/soft-serve/package.nix                 |  6 +++---
 pkgs/by-name/so/solvespace/package.nix                 |  8 ++++----
 pkgs/by-name/so/sonic-server/package.nix               |  8 ++++----
 pkgs/by-name/so/soundalike/package.nix                 |  6 +++---
 pkgs/by-name/so/sozu/package.nix                       |  6 +++---
 pkgs/by-name/sp/spaceship-prompt/package.nix           |  8 ++++----
 pkgs/by-name/sp/spire/package.nix                      |  6 +++---
 pkgs/by-name/sp/sploitscan/package.nix                 |  6 +++---
 pkgs/by-name/sp/spotdl/package.nix                     |  6 +++---
 pkgs/by-name/sp/sptk/package.nix                       |  6 +++---
 pkgs/by-name/sp/sptlrx/package.nix                     |  6 +++---
 pkgs/by-name/ss/ssh-audit/package.nix                  |  8 ++++----
 pkgs/by-name/ss/ssh-mitm/package.nix                   |  6 +++---
 pkgs/by-name/ss/sshocker/package.nix                   |  6 +++---
 pkgs/by-name/ss/sslstrip/package.nix                   |  6 +++---
 pkgs/by-name/st/stackit-cli/package.nix                |  6 +++---
 pkgs/by-name/st/starboard/package.nix                  |  6 +++---
 pkgs/by-name/st/stargazer/package.nix                  |  6 +++---
 pkgs/by-name/st/starlark-rust/package.nix              |  6 +++---
 pkgs/by-name/st/static-web-server/package.nix          |  6 +++---
 pkgs/by-name/st/stayrtr/package.nix                    |  6 +++---
 pkgs/by-name/st/stc-cli/package.nix                    |  6 +++---
 pkgs/by-name/st/steamguard-cli/package.nix             |  8 ++++----
 pkgs/by-name/st/step-ca/package.nix                    |  6 +++---
 pkgs/by-name/st/stress-ng/package.nix                  |  8 ++++----
 pkgs/by-name/st/stressapptest/package.nix              |  8 ++++----
 pkgs/by-name/st/stripe-cli/package.nix                 |  6 +++---
 pkgs/by-name/st/sttr/package.nix                       |  6 +++---
 pkgs/by-name/st/stuffbin/package.nix                   |  6 +++---
 pkgs/by-name/st/stylance-cli/package.nix               |  6 +++---
 pkgs/by-name/st/stylua/package.nix                     |  6 +++---
 pkgs/by-name/su/sublime-music/package.nix              |  6 +++---
 pkgs/by-name/su/subprober/package.nix                  |  6 +++---
 pkgs/by-name/su/sudachidict/package.nix                |  8 ++++----
 pkgs/by-name/su/sudo-font/package.nix                  |  8 ++++----
 pkgs/by-name/su/superTuxKart/package.nix               |  8 ++++----
 pkgs/by-name/su/survex/package.nix                     |  8 ++++----
 pkgs/by-name/su/sushi/package.nix                      |  8 ++++----
 pkgs/by-name/sv/svd2rust/package.nix                   |  6 +++---
 pkgs/by-name/sv/svdtools/package.nix                   |  6 +++---
 pkgs/by-name/sv/svgbob/package.nix                     |  6 +++---
 pkgs/by-name/sv/svix-server/package.nix                |  6 +++---
 pkgs/by-name/sv/svlint/package.nix                     |  6 +++---
 pkgs/by-name/sw/sway-launcher-desktop/package.nix      |  8 ++++----
 pkgs/by-name/sw/swaynotificationcenter/package.nix     |  8 ++++----
 pkgs/by-name/sw/swiftbar/package.nix                   | 10 +++++-----
 pkgs/by-name/sw/switcheroo-control/package.nix         |  8 ++++----
 pkgs/by-name/sy/syft/package.nix                       |  6 +++---
 pkgs/by-name/sy/sysz/package.nix                       |  8 ++++----
 pkgs/by-name/ta/tali/package.nix                       |  8 ++++----
 pkgs/by-name/ta/tandoor-recipes/common.nix             |  6 +++---
 pkgs/by-name/ta/tauon/package.nix                      |  8 ++++----
 pkgs/by-name/te/teip/package.nix                       |  6 +++---
 pkgs/by-name/te/tektoncd-cli/package.nix               |  6 +++---
 pkgs/by-name/te/teler/package.nix                      |  6 +++---
 pkgs/by-name/te/temporal/package.nix                   |  6 +++---
 pkgs/by-name/te/termimage/package.nix                  |  6 +++---
 pkgs/by-name/te/terracognita/package.nix               |  6 +++---
 pkgs/by-name/te/terraform-ls/package.nix               |  6 +++---
 pkgs/by-name/te/terraform-plugin-docs/package.nix      |  6 +++---
 pkgs/by-name/te/terramate/package.nix                  |  6 +++---
 pkgs/by-name/te/terrascan/package.nix                  |  6 +++---
 pkgs/by-name/te/tev/package.nix                        |  8 ++++----
 pkgs/by-name/te/texlab/package.nix                     |  8 ++++----
 pkgs/by-name/th/thanos/package.nix                     |  6 +++---
 pkgs/by-name/th/thc-hydra/package.nix                  |  8 ++++----
 pkgs/by-name/th/the-way/package.nix                    |  6 +++---
 pkgs/by-name/th/theharvester/package.nix               |  6 +++---
 pkgs/by-name/th/threatest/package.nix                  |  6 +++---
 pkgs/by-name/ti/ticker/package.nix                     |  6 +++---
 pkgs/by-name/ti/tickrs/package.nix                     |  6 +++---
 pkgs/by-name/ti/tidy-viewer/package.nix                |  6 +++---
 pkgs/by-name/ti/time-decode/package.nix                |  6 +++---
 pkgs/by-name/ti/tiny/package.nix                       |  6 +++---
 pkgs/by-name/tl/tlrc/package.nix                       |  6 +++---
 pkgs/by-name/tl/tlsx/package.nix                       |  6 +++---
 pkgs/by-name/tm/tml/package.nix                        |  6 +++---
 pkgs/by-name/tr/traceroute/package.nix                 |  8 ++++----
 pkgs/by-name/tr/trafficserver/package.nix              |  8 ++++----
 pkgs/by-name/tr/transmission-remote-gtk/package.nix    |  8 ++++----
 pkgs/by-name/tr/trashy/package.nix                     |  8 ++++----
 pkgs/by-name/tr/treedome/package.nix                   |  6 +++---
 pkgs/by-name/tr/trezor-suite/package.nix               |  6 +++---
 pkgs/by-name/tr/trickest-cli/package.nix               |  6 +++---
 pkgs/by-name/tr/trivy/package.nix                      |  6 +++---
 pkgs/by-name/tr/trurl/package.nix                      |  8 ++++----
 pkgs/by-name/tu/tuckr/package.nix                      |  6 +++---
 pkgs/by-name/tu/tunnelgraf/package.nix                 |  6 +++---
 pkgs/by-name/tu/turses/package.nix                     |  8 ++++----
 pkgs/by-name/tu/tutanota-desktop/package.nix           |  8 ++++----
 pkgs/by-name/uc/uchecker/package.nix                   |  6 +++---
 pkgs/by-name/ud/udp2raw/package.nix                    |  8 ++++----
 pkgs/by-name/ud/udpx/package.nix                       |  6 +++---
 pkgs/by-name/un/uncover/package.nix                    |  6 +++---
 pkgs/by-name/un/uni/package.nix                        |  6 +++---
 pkgs/by-name/un/unifi-protect-backup/package.nix       |  6 +++---
 pkgs/by-name/un/unpaper/package.nix                    |  8 ++++----
 pkgs/by-name/un/unpoller/package.nix                   |  6 +++---
 pkgs/by-name/un/unstructured-api/package.nix           |  6 +++---
 pkgs/by-name/up/uptime-kuma/package.nix                |  6 +++---
 pkgs/by-name/us/userborn/package.nix                   |  6 +++---
 pkgs/by-name/ut/utf8cpp/package.nix                    |  8 ++++----
 pkgs/by-name/ut/utm/package.nix                        | 10 +++++-----
 pkgs/by-name/va/vals/package.nix                       |  6 +++---
 pkgs/by-name/va/vault-ssh-plus/package.nix             |  6 +++---
 pkgs/by-name/va/vault/package.nix                      |  6 +++---
 pkgs/by-name/va/vaultwarden/package.nix                |  6 +++---
 pkgs/by-name/va/vaultwarden/webvault.nix               |  6 +++---
 pkgs/by-name/vi/vieb/package.nix                       |  8 ++++----
 pkgs/by-name/vi/vifm/package.nix                       |  8 ++++----
 pkgs/by-name/vi/vitess/package.nix                     |  6 +++---
 pkgs/by-name/wa/waf-tester/package.nix                 |  6 +++---
 pkgs/by-name/wa/wafw00f/package.nix                    |  6 +++---
 pkgs/by-name/wa/wallabag/package.nix                   |  8 ++++----
 pkgs/by-name/wa/watchdogd/package.nix                  |  8 ++++----
 pkgs/by-name/wa/wavpack/package.nix                    |  8 ++++----
 pkgs/by-name/wa/wayvnc/package.nix                     |  8 ++++----
 320 files changed, 1062 insertions(+), 1062 deletions(-)

diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix
index 1d378ac5b774..fd1fd049e72f 100644
--- a/pkgs/by-name/ns/nsh/package.nix
+++ b/pkgs/by-name/ns/nsh/package.nix
@@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line shell like fish, but POSIX compatible";
     mainProgram = "nsh";
     homepage = "https://github.com/nuta/nsh";
     changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md";
     license = [
-      licenses.cc0 # or
-      licenses.mit
+      lib.licenses.cc0 # or
+      lib.licenses.mit
     ];
-    maintainers = with maintainers; [ cafkafk ];
+    maintainers = with lib.maintainers; [ cafkafk ];
   };
 
   passthru = {
diff --git a/pkgs/by-name/ns/nsq/package.nix b/pkgs/by-name/ns/nsq/package.nix
index f8290cf52916..b5ece6fe7174 100644
--- a/pkgs/by-name/ns/nsq/package.nix
+++ b/pkgs/by-name/ns/nsq/package.nix
@@ -24,11 +24,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://nsq.io/";
     description = "Realtime distributed messaging platform";
     changelog = "https://github.com/nsqio/nsq/raw/v${version}/ChangeLog.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ blakesmith ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ blakesmith ];
   };
 }
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 78563010798a..3b2e538d82b6 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -25,12 +25,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Templates for the nuclei engine to find security vulnerabilities";
     homepage = "https://github.com/projectdiscovery/nuclei-templates";
     changelog = "https://github.com/projectdiscovery/nuclei-templates/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index ff0086db8572..718f411c1867 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for configurable targeted scanning";
     longDescription = ''
       Nuclei is used to send requests across targets based on a template
@@ -47,8 +47,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/nuclei";
     changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       fab
       Misaka13514
     ];
diff --git a/pkgs/by-name/nu/nucleiparser/package.nix b/pkgs/by-name/nu/nucleiparser/package.nix
index 3b02420f1997..9cd5aac545b5 100644
--- a/pkgs/by-name/nu/nucleiparser/package.nix
+++ b/pkgs/by-name/nu/nucleiparser/package.nix
@@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec {
     "nucleiparser"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Nuclei output parser for CLI";
     homepage = "https://github.com/sinkmanu/nucleiparser";
     changelog = "https://github.com/Sinkmanu/nucleiparser/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nparser";
   };
 }
diff --git a/pkgs/by-name/nu/numberstation/package.nix b/pkgs/by-name/nu/numberstation/package.nix
index 2b2db29ab396..27197ab7ad6c 100644
--- a/pkgs/by-name/nu/numberstation/package.nix
+++ b/pkgs/by-name/nu/numberstation/package.nix
@@ -60,12 +60,12 @@ python3.pkgs.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.sr.ht/~martijnbraam/numberstation/refs/${version}";
     description = "TOTP Authentication application for mobile";
     mainProgram = "numberstation";
     homepage = "https://sr.ht/~martijnbraam/numberstation/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 4da4d7f0e896..4e0c547d0920 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -48,12 +48,12 @@ rustPlatform.buildRustPackage rec {
     GEN_ARTIFACTS = "artifacts";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to generate Nix fetcher calls from repository URLs";
     homepage = "https://github.com/nix-community/nurl";
     changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "nurl";
   };
 }
diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix
index ee2bbcf61521..5deb88e7ed80 100644
--- a/pkgs/by-name/oa/oapi-codegen/package.nix
+++ b/pkgs/by-name/oa/oapi-codegen/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
 
   ldflags = [ "-X main.noVCSVersionOverride=${version}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Go client and server OpenAPI 3 generator";
     homepage = "https://github.com/deepmap/oapi-codegen";
     changelog = "https://github.com/deepmap/oapi-codegen/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ j4m3s ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ j4m3s ];
     mainProgram = "oapi-codegen";
   };
 }
diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix
index 039660149e7b..ecd5bce8a5f6 100644
--- a/pkgs/by-name/oc/ocrodjvu/package.nix
+++ b/pkgs/by-name/oc/ocrodjvu/package.nix
@@ -63,13 +63,13 @@ python3Packages.buildPythonApplication rec {
     "-v"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Wrapper for OCR systems that allows you to perform OCR on DjVu files";
     homepage = "https://github.com/FriedrichFroebel/ocrodjvu";
     changelog = "https://github.com/FriedrichFroebel/ocrodjvu/blob/${version}/doc/changelog";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dansbandit ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dansbandit ];
     mainProgram = "ocrodjvu";
   };
 }
diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix
index 890792cd5c4a..d0a30f65e027 100644
--- a/pkgs/by-name/oc/ocsinventory-agent/package.nix
+++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix
@@ -113,7 +113,7 @@ perlPackages.buildPerlPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "OCS Inventory unified agent for Unix operating systems";
     longDescription = ''
       Open Computers and Software Inventory (OCS) is an application designed
@@ -123,12 +123,12 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://ocsinventory-ng.org";
     changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}";
     downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     mainProgram = "ocsinventory-agent";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       totoroot
       anthonyroussel
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/oc/octosuite/package.nix b/pkgs/by-name/oc/octosuite/package.nix
index f1e04885cd23..beaf6f77a857 100644
--- a/pkgs/by-name/oc/octosuite/package.nix
+++ b/pkgs/by-name/oc/octosuite/package.nix
@@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Advanced Github OSINT framework";
     mainProgram = "octosuite";
     homepage = "https://github.com/bellingcat/octosuite";
     changelog = "https://github.com/bellingcat/octosuite/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix
index 4dabb4db14d7..8c82969e8ebb 100644
--- a/pkgs/by-name/of/offat/package.nix
+++ b/pkgs/by-name/of/offat/package.nix
@@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "offat" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to test APIs for prevalent vulnerabilities";
     homepage = "https://github.com/OWASP/OFFAT/";
     changelog = "https://github.com/OWASP/OFFAT/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "offat";
   };
 }
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index d4ca51341cae..823e3767f18c 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -64,12 +64,12 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/onefetch --generate zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Git repository summary on your terminal";
     homepage = "https://github.com/o2sh/onefetch";
     changelog = "https://github.com/o2sh/onefetch/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       figsoda
       kloenk
diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index 7a9d9eb298aa..c4a5fdc98f97 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -38,7 +38,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     mainProgram = "policy";
     homepage = "https://www.openpolicyregistry.io/";
     changelog = "https://github.com/opcr-io/policy/releases/tag/v${version}";
@@ -47,8 +47,8 @@ buildGoModule rec {
       The policy CLI is a tool for building, versioning and publishing your authorization policies.
       It uses OCI standards to manage artifacts, and the Open Policy Agent (OPA) to compile and run.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       naphta
       jk
     ];
diff --git a/pkgs/by-name/op/openapi-changes/package.nix b/pkgs/by-name/op/openapi-changes/package.nix
index 014a89e7caa4..f878e338c8cf 100644
--- a/pkgs/by-name/op/openapi-changes/package.nix
+++ b/pkgs/by-name/op/openapi-changes/package.nix
@@ -35,11 +35,11 @@ buildGoModule rec {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "World's sexiest OpenAPI breaking changes detector";
     homepage = "https://pb33f.io/openapi-changes/";
     changelog = "https://github.com/pb33f/openapi-changes/releases/tag/v${version}";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ mguentner ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ mguentner ];
   };
 }
diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index 045976f632e2..834f83c5e82a 100644
--- a/pkgs/by-name/op/opengrok/package.nix
+++ b/pkgs/by-name/op/opengrok/package.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Source code search and cross reference engine";
     mainProgram = "opengrok";
     homepage = "https://opengrok.github.io/OpenGrok/";
     changelog = "https://github.com/oracle/opengrok/releases/tag/${version}";
-    license = licenses.cddl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.cddl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix
index d70de0343f30..4bb6ff2b2fbf 100644
--- a/pkgs/by-name/op/openimagedenoise/package.nix
+++ b/pkgs/by-name/op/openimagedenoise/package.nix
@@ -53,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "TBB_ROOT" "${tbb}")
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.openimagedenoise.org";
     description = "High-Performance Denoising Library for Ray Tracing";
-    license = licenses.asl20;
-    maintainers = [ maintainers.leshainc ];
-    platforms = platforms.unix;
-    changelog = "https://github.com/RenderKit/oidn/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.leshainc ];
+    platforms = lib.platforms.unix;
+    changelog = "https://github.com/RenderKit/oidn/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
 })
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 8462ce052540..37e66bf7cd6c 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -127,12 +127,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source JPEG 2000 codec written in C language";
     homepage = "https://www.openjpeg.org/";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ codyopel ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ codyopel ];
+    platforms = lib.platforms.all;
     changelog = "https://github.com/uclouvain/openjpeg/blob/v${version}/CHANGELOG.md";
   };
 }
diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix
index f25286d4608b..c5b129189acb 100644
--- a/pkgs/by-name/op/openllm/package.nix
+++ b/pkgs/by-name/op/openllm/package.nix
@@ -62,12 +62,12 @@ python.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "openllm" ];
 
-  meta = with lib; {
+  meta = {
     description = "Run any open-source LLMs, such as Llama 3.1, Gemma, as OpenAI compatible API endpoint in the cloud";
     homepage = "https://github.com/bentoml/OpenLLM";
     changelog = "https://github.com/bentoml/OpenLLM/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       happysalada
       natsukium
     ];
diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index e13124d94dac..53d907d0feb8 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -92,16 +92,16 @@ stdenv.mkDerivation rec {
       ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.openorienteering.org/apps/mapper/";
     description = "Orienteering mapmaking program";
     changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       mpickering
       sikmir
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
     mainProgram = "Mapper";
   };
 }
diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix
index 827870fab749..a59c919ff5dd 100644
--- a/pkgs/by-name/op/openrisk/package.nix
+++ b/pkgs/by-name/op/openrisk/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Tool that generates an AI-based risk score";
     homepage = "https://github.com/projectdiscovery/openrisk";
     changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "openrisk";
   };
 }
diff --git a/pkgs/by-name/op/opentimestamps-client/package.nix b/pkgs/by-name/op/opentimestamps-client/package.nix
index bb563188ca97..2b59a51f67b0 100644
--- a/pkgs/by-name/op/opentimestamps-client/package.nix
+++ b/pkgs/by-name/op/opentimestamps-client/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
     "otsclient"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to create and verify OpenTimestamps proofs";
     mainProgram = "ots";
     homepage = "https://github.com/opentimestamps/opentimestamps-client";
     changelog = "https://github.com/opentimestamps/opentimestamps-client/releases/tag/opentimestamps-client-v${version}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ erikarvstedt ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ erikarvstedt ];
   };
 }
diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 6c7c2792d443..6e7352c977d9 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -60,12 +60,12 @@ let
 
     subPackages = [ "./cmd/..." ];
 
-    meta = with lib; {
+    meta = {
       description = "Tool for building, changing, and versioning infrastructure";
       homepage = "https://opentofu.org/";
       changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md";
-      license = licenses.mpl20;
-      maintainers = with maintainers; [
+      license = lib.licenses.mpl20;
+      maintainers = with lib.maintainers; [
         nickcao
         zowoq
       ];
diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index e9fa46d811e1..ba0493a7b767 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt";
     description = "Multilayer virtual switch";
     longDescription = ''
@@ -148,13 +148,13 @@ stdenv.mkDerivation rec {
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
     '';
     homepage = "https://www.openvswitch.org/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       adamcstephens
       kmcopper
       netixx
       xddxdd
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix
index f6298e4a85c0..6650daf86c61 100644
--- a/pkgs/by-name/op/operator-sdk/package.nix
+++ b/pkgs/by-name/op/operator-sdk/package.nix
@@ -41,12 +41,12 @@ buildGoModule rec {
     wrapProgram $out/bin/operator-sdk --prefix PATH : ${lib.makeBinPath [ go ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding";
     homepage = "https://github.com/operator-framework/operator-sdk";
     changelog = "https://github.com/operator-framework/operator-sdk/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ arnarg ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ arnarg ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/op/opkg/package.nix b/pkgs/by-name/op/opkg/package.nix
index 43eb194ba962..478c606ba1e5 100644
--- a/pkgs/by-name/op/opkg/package.nix
+++ b/pkgs/by-name/op/opkg/package.nix
@@ -44,12 +44,12 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight package management system based upon ipkg";
     homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/";
     changelog = "https://git.yoctoproject.org/opkg/tree/NEWS?h=v${version}";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix
index 09733948dadf..d0a0166a1af7 100644
--- a/pkgs/by-name/op/opsdroid/package.nix
+++ b/pkgs/by-name/op/opsdroid/package.nix
@@ -63,16 +63,16 @@ python3Packages.buildPythonPackage rec {
   # Tests are not included in releases
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Open source chat-ops bot framework";
     homepage = "https://opsdroid.dev";
     changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       globin
       willibutz
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "opsdroid";
   };
 }
diff --git a/pkgs/by-name/or/orbuculum/package.nix b/pkgs/by-name/or/orbuculum/package.nix
index eeef29d76404..00c54c260a1a 100644
--- a/pkgs/by-name/or/orbuculum/package.nix
+++ b/pkgs/by-name/or/orbuculum/package.nix
@@ -49,12 +49,12 @@ stdenv.mkDerivation rec {
     cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace";
     homepage = "https://orbcode.org";
     changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ newam ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ newam ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 9044782ea4d4..539f64907e9b 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -53,12 +53,12 @@ rustPlatform.buildRustPackage rec {
 
   env.OUCH_ARTIFACTS_FOLDER = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line utility for easily compressing and decompressing files and directories";
     homepage = "https://github.com/ouch-org/ouch";
     changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       psibi
       krovuxdev
diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix
index 693d757ff9f2..5bfe4933dc47 100644
--- a/pkgs/by-name/ou/outfox/package.nix
+++ b/pkgs/by-name/ou/outfox/package.nix
@@ -70,19 +70,19 @@ stdenv.mkDerivation rec {
     makeWrapper $out/share/OutFox/OutFox $out/bin/OutFox --argv0
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Rhythm game engine forked from StepMania";
     homepage = "https://projectoutfox.com";
     changelog = "https://projectoutfox.com/releases/${version}";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
     platforms = [
       "x86_64-linux"
       "i686-linux"
       "aarch64-linux"
       "armv7l-linux"
     ];
-    maintainers = with maintainers; [ maxwell-lt ];
+    maintainers = with lib.maintainers; [ maxwell-lt ];
     mainProgram = "OutFox";
   };
 }
diff --git a/pkgs/by-name/ou/outputcheck/package.nix b/pkgs/by-name/ou/outputcheck/package.nix
index 9025c26c5ec5..3b2f06857bd4 100644
--- a/pkgs/by-name/ou/outputcheck/package.nix
+++ b/pkgs/by-name/ou/outputcheck/package.nix
@@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "OutputCheck" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for checking tool output inspired by LLVM's FileCheck";
     homepage = "https://github.com/stp/OutputCheck";
     changelog = "https://github.com/stp/OutputCheck/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fsagbuya ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fsagbuya ];
     mainProgram = "OutputCheck";
   };
 }
diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix
index 082265addff8..7c860ea74c23 100644
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@@ -61,14 +61,14 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "CLI version of the mod manager for Outer Wilds Mod Loader";
     homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli";
     downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
     changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}";
     mainProgram = "owmods";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       bwc9876
       spoonbaker
       locochoco
diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
index 1ff93232c75a..3ee82ec6f1cc 100644
--- a/pkgs/by-name/ow/owncloud-client/package.nix
+++ b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -54,15 +54,15 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Synchronise your ownCloud with your computer using this desktop client";
     homepage = "https://owncloud.org";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       qknight
       hellwolf
     ];
-    platforms = platforms.unix;
-    license = licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
     changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix
index 2205a6059f8e..8f8f0ac3baf4 100644
--- a/pkgs/by-name/pa/packer/package.nix
+++ b/pkgs/by-name/pa/packer/package.nix
@@ -31,11 +31,11 @@ buildGoModule rec {
     installShellCompletion --zsh contrib/zsh-completion/_packer
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for creating identical machine images for multiple platforms from a single source configuration";
     homepage = "https://www.packer.io";
-    license = licenses.bsl11;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsl11;
+    maintainers = with lib.maintainers; [
       zimbatm
       ma27
       techknowlogick
diff --git a/pkgs/by-name/pa/packj/package.nix b/pkgs/by-name/pa/packj/package.nix
index 831955d9ef28..e8e3f3458602 100644
--- a/pkgs/by-name/pa/packj/package.nix
+++ b/pkgs/by-name/pa/packj/package.nix
@@ -52,12 +52,12 @@ python3.pkgs.buildPythonApplication rec {
     "packj"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to detect malicious/vulnerable open-source dependencies";
     homepage = "https://github.com/ossillate-inc/packj";
     changelog = "https://github.com/ossillate-inc/packj/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "packj";
   };
 }
diff --git a/pkgs/by-name/pa/pacproxy/package.nix b/pkgs/by-name/pa/pacproxy/package.nix
index 5bb1937f7aeb..9113a731f69b 100644
--- a/pkgs/by-name/pa/pacproxy/package.nix
+++ b/pkgs/by-name/pa/pacproxy/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-0Go+xwzaT1qt+cJfcPkC8ft3eB/OZCvOi2Pnn/A/rtQ=";
 
-  meta = with lib; {
+  meta = {
     description = "No-frills local HTTP proxy server powered by a proxy auto-config (PAC) file";
     homepage = "https://github.com/williambailey/pacproxy";
     changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ terlar ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ terlar ];
     mainProgram = "pacproxy";
   };
 }
diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix
index ae57c9eac102..4dffe957b138 100644
--- a/pkgs/by-name/pa/pactorio/package.nix
+++ b/pkgs/by-name/pa/pactorio/package.nix
@@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec {
 
   GEN_ARTIFACTS = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Mod packager for factorio";
     mainProgram = "pactorio";
     homepage = "https://github.com/figsoda/pactorio";
     changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix
index 14ee0c3ab078..a2e389fba97f 100644
--- a/pkgs/by-name/pa/pacu/package.nix
+++ b/pkgs/by-name/pa/pacu/package.nix
@@ -72,12 +72,12 @@ python.pkgs.buildPythonApplication rec {
     "test_update_second_time"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "AWS exploitation framework";
     homepage = "https://github.com/RhinoSecurityLabs/pacu";
     changelog = "https://github.com/RhinoSecurityLabs/pacu/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pacu";
   };
 }
diff --git a/pkgs/by-name/pa/padre/package.nix b/pkgs/by-name/pa/padre/package.nix
index c24ee299579c..b0c23dd8d653 100644
--- a/pkgs/by-name/pa/padre/package.nix
+++ b/pkgs/by-name/pa/padre/package.nix
@@ -22,13 +22,13 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Advanced exploiting tool for Padding Oracle attacks against CBC mode encryption";
     homepage = "https://github.com/glebarez/padre";
     changelog = "https://github.com/glebarez/padre/releases/tag/v${version}";
     # https://github.com/glebarez/padre/issues/28
-    license = licenses.unfree;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "padre";
   };
 }
diff --git a/pkgs/by-name/pa/pam_u2f/package.nix b/pkgs/by-name/pa/pam_u2f/package.nix
index 772fff0f4183..749fe8ffaf6c 100644
--- a/pkgs/by-name/pa/pam_u2f/package.nix
+++ b/pkgs/by-name/pa/pam_u2f/package.nix
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
     pam_u2f = nixosTests.pam-u2f;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://developers.yubico.com/pam-u2f/";
     description = "PAM module for allowing authentication with a U2F device";
     changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ philandstuff ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ philandstuff ];
     mainProgram = "pamu2fcfg";
   };
 }
diff --git a/pkgs/by-name/pa/parquet-tools/package.nix b/pkgs/by-name/pa/parquet-tools/package.nix
index 92771bad07f5..87dcc052da56 100644
--- a/pkgs/by-name/pa/parquet-tools/package.nix
+++ b/pkgs/by-name/pa/parquet-tools/package.nix
@@ -71,12 +71,12 @@ python3Packages.buildPythonApplication rec {
     "parquet_tools"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for parquet files";
     homepage = "https://github.com/ktrueda/parquet-tools";
     changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cpcloud ];
     mainProgram = "parquet-tools";
   };
 }
diff --git a/pkgs/by-name/pa/passdetective/package.nix b/pkgs/by-name/pa/passdetective/package.nix
index 842de021361f..e26f4845690b 100644
--- a/pkgs/by-name/pa/passdetective/package.nix
+++ b/pkgs/by-name/pa/passdetective/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     "-X=main.build=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Scans command history to detect mistakenly written passwords, API keys, and secrets";
     homepage = "https://github.com/aydinnyunus/PassDetective";
     changelog = "https://github.com/aydinnyunus/PassDetective/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ octodi ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ octodi ];
     mainProgram = "PassDetective";
   };
 }
diff --git a/pkgs/by-name/pa/past-time/package.nix b/pkgs/by-name/pa/past-time/package.nix
index 249526583c13..a8f08ed4578b 100644
--- a/pkgs/by-name/pa/past-time/package.nix
+++ b/pkgs/by-name/pa/past-time/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
     "past_time"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to visualize the progress of the year based on the past days";
     homepage = "https://github.com/fabaff/past-time";
     changelog = "https://github.com/fabaff/past-time/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "past-time";
   };
 }
diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix
index 87e3cfb3887d..cee0011aaff7 100644
--- a/pkgs/by-name/pa/pastel/package.nix
+++ b/pkgs/by-name/pa/pastel/package.nix
@@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to generate, analyze, convert and manipulate colors";
     homepage = "https://github.com/sharkdp/pastel";
     changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "pastel";
   };
 }
diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix
index 08db95c2d00e..8269b2c3105c 100644
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
     version = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Create pull requests from patches without cloning the repository";
     homepage = "https://github.com/bluekeyes/patch2pr";
     changelog = "https://github.com/bluekeyes/patch2pr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ katrinafyi ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ katrinafyi ];
     mainProgram = "patch2pr";
   };
 }
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index 3e850dece1b7..5cfa94d96738 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -43,12 +43,12 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for patching shell scripts inspired by resholve";
     mainProgram = "patsh";
     homepage = "https://github.com/nix-community/patsh";
     changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/pa/payload-dumper-go/package.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix
index ede53a171dcb..4f76fac6cf8c 100644
--- a/pkgs/by-name/pa/payload-dumper-go/package.nix
+++ b/pkgs/by-name/pa/payload-dumper-go/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
 
   buildInputs = [ xz ];
 
-  meta = with lib; {
+  meta = {
     description = "Android OTA payload dumper written in Go";
     homepage = "https://github.com/ssut/payload-dumper-go";
     changelog = "https://github.com/ssut/payload-dumper-go/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aleksana ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aleksana ];
     mainProgram = "payload-dumper-go";
   };
 }
diff --git a/pkgs/by-name/pd/pdfrip/package.nix b/pkgs/by-name/pd/pdfrip/package.nix
index 7829a714331c..9eff2f0fe7e6 100644
--- a/pkgs/by-name/pd/pdfrip/package.nix
+++ b/pkgs/by-name/pd/pdfrip/package.nix
@@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec {
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PDF password cracking utility";
     homepage = "https://github.com/mufeedvh/pdfrip";
     changelog = "https://github.com/mufeedvh/pdfrip/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pdfrip";
   };
 }
diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 0eeb269bb258..340ae0077dbe 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -128,12 +128,12 @@ python.pkgs.buildPythonApplication rec {
 
   passthru.tests.version = testers.testVersion { package = pdm; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pdm-project.org";
     changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}";
     description = "Modern Python package and dependency manager supporting the latest PEP standards";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       cpcloud
       natsukium
       misilelab
diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix
index e259b51aa564..ccbb06f01e71 100644
--- a/pkgs/by-name/pe/pe-parse/package.nix
+++ b/pkgs/by-name/pe/pe-parse/package.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
     $out/bin/dump-pe ../tests/assets/example.exe
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Principled, lightweight parser for Windows portable executable files";
     homepage = "https://github.com/trailofbits/pe-parse";
     changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ arturcygan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ arturcygan ];
     mainProgram = "dump-pe";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/pe/peco/package.nix b/pkgs/by-name/pe/peco/package.nix
index 0c794fb719ae..5077d5196df3 100644
--- a/pkgs/by-name/pe/peco/package.nix
+++ b/pkgs/by-name/pe/peco/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90=";
 
-  meta = with lib; {
+  meta = {
     description = "Simplistic interactive filtering tool";
     mainProgram = "peco";
     homepage = "https://github.com/peco/peco";
     changelog = "https://github.com/peco/peco/blob/v${version}/Changes";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/by-name/pe/pentestgpt/package.nix b/pkgs/by-name/pe/pentestgpt/package.nix
index cf2bdd3d487a..d67ab642a20f 100644
--- a/pkgs/by-name/pe/pentestgpt/package.nix
+++ b/pkgs/by-name/pe/pentestgpt/package.nix
@@ -47,11 +47,11 @@ python3.pkgs.buildPythonApplication rec {
     "pentestgpt"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "GPT-empowered penetration testing tool";
     homepage = "https://github.com/GreyDGL/PentestGPT";
     changelog = "https://github.com/GreyDGL/PentestGPT/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/pg/pgcenter/package.nix b/pkgs/by-name/pg/pgcenter/package.nix
index 41025c33af03..4d5642488f58 100644
--- a/pkgs/by-name/pg/pgcenter/package.nix
+++ b/pkgs/by-name/pg/pgcenter/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pgcenter.org/";
     changelog = "https://github.com/lesovsky/pgcenter/raw/v${version}/doc/Changelog";
     description = "Command-line admin tool for observing and troubleshooting PostgreSQL";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "pgcenter";
   };
 }
diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix
index 8ee301ef4dfa..6a70d626eece 100644
--- a/pkgs/by-name/pg/pgformatter/package.nix
+++ b/pkgs/by-name/pg/pgformatter/package.nix
@@ -40,14 +40,14 @@ perlPackages.buildPerlPackage rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI";
     homepage = "https://github.com/darold/pgFormatter";
     changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
     license = [
-      licenses.postgresql
-      licenses.artistic2
+      lib.licenses.postgresql
+      lib.licenses.artistic2
     ];
     mainProgram = "pg_format";
   };
diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index 108ae819fbde..fd898ea8dd3b 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = with lib; {
+  meta = {
     description = "Backup / restore solution for PostgreSQL";
     homepage = "https://pgmoneta.github.io/";
     changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pg/pgo-client/package.nix b/pkgs/by-name/pg/pgo-client/package.nix
index cce769dee966..32a8b6358058 100644
--- a/pkgs/by-name/pg/pgo-client/package.nix
+++ b/pkgs/by-name/pg/pgo-client/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   subPackages = [ "cmd/pgo" ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI client for Crunchy PostgreSQL Kubernetes Operator";
     homepage = "https://github.com/CrunchyData/postgres-operator";
     changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
     mainProgram = "pgo";
   };
 }
diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix
index dc7414f1949f..f34ae6c2e4f4 100644
--- a/pkgs/by-name/pg/pgtop/package.nix
+++ b/pkgs/by-name/pg/pgtop/package.nix
@@ -32,12 +32,12 @@ perlPackages.buildPerlPackage rec {
     shortenPerlShebang $out/bin/pgtop
   '';
 
-  meta = with lib; {
+  meta = {
     description = "PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL";
     mainProgram = "pgtop";
     homepage = "https://github.com/cosimo/pgtop";
     changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}";
-    maintainers = [ maintainers.hagl ];
-    license = [ licenses.gpl2Only ];
+    maintainers = [ lib.maintainers.hagl ];
+    license = [ lib.licenses.gpl2Only ];
   };
 }
diff --git a/pkgs/by-name/pg/pgweb/package.nix b/pkgs/by-name/pg/pgweb/package.nix
index 28e073de8e41..cb2964bcc694 100644
--- a/pkgs/by-name/pg/pgweb/package.nix
+++ b/pkgs/by-name/pg/pgweb/package.nix
@@ -51,7 +51,7 @@ buildGoModule rec {
     integration_test = nixosTests.pgweb;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}";
     description = "Web-based database browser for PostgreSQL";
     longDescription = ''
@@ -59,9 +59,9 @@ buildGoModule rec {
       run queries and examine tables and indexes.
     '';
     homepage = "https://sosedoff.github.io/pgweb/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "pgweb";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       zupo
       luisnquin
     ];
diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix
index 96bf38706186..8ffd39b974da 100644
--- a/pkgs/by-name/ph/phd2/package.nix
+++ b/pkgs/by-name/ph/phd2/package.nix
@@ -50,12 +50,12 @@ stdenv.mkDerivation rec {
     mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://openphdguiding.org/";
     description = "Telescope auto-guidance application";
     changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ hjones2199 ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ hjones2199 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ph/phetch/package.nix b/pkgs/by-name/ph/phetch/package.nix
index b795386ced24..2e0842e7d4c9 100644
--- a/pkgs/by-name/ph/phetch/package.nix
+++ b/pkgs/by-name/ph/phetch/package.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Quick lil gopher client for your terminal, written in rust";
     mainProgram = "phetch";
     longDescription = ''
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
     '';
     changelog = "https://github.com/xvxx/phetch/releases/tag/v${version}";
     homepage = "https://github.com/xvxx/phetch";
-    license = licenses.mit;
-    maintainers = with maintainers; [ felixalbrigtsen ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ felixalbrigtsen ];
   };
 }
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index ff5cfee3099d..533e937009d5 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -23,11 +23,11 @@ buildGoModule rec {
     ln -s $out/bin/phrase-cli $out/bin/phrase
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://docs.phraseapp.com";
     description = "PhraseApp API v2 Command Line Client";
     changelog = "https://github.com/phrase/phrase-cli/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ juboba ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ juboba ];
   };
 }
diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix
index c70586e44e54..fdeeddef8479 100644
--- a/pkgs/by-name/pi/pika-backup/package.nix
+++ b/pkgs/by-name/pi/pika-backup/package.nix
@@ -72,13 +72,13 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple backups based on borg";
     homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
     changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-    teams = [ teams.gnome-circle ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+    teams = [ lib.teams.gnome-circle ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix
index 88261b5d39d7..0ab7de765cf6 100644
--- a/pkgs/by-name/pi/piping-server-rust/package.nix
+++ b/pkgs/by-name/pi/piping-server-rust/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo=";
 
-  meta = with lib; {
+  meta = {
     description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
     homepage = "https://github.com/nwtgck/piping-server-rust";
     changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "piping-server";
   };
 }
diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix
index a4c4f5254bf6..390536078587 100644
--- a/pkgs/by-name/pl/planus/package.nix
+++ b/pkgs/by-name/pl/planus/package.nix
@@ -30,15 +30,15 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/planus generate-completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Alternative compiler for flatbuffers";
     mainProgram = "planus";
     homepage = "https://github.com/planus-org/planus";
     changelog = "https://github.com/planus-org/planus/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix
index c7e0cd711d37..8a64914828e6 100644
--- a/pkgs/by-name/pl/plow/package.nix
+++ b/pkgs/by-name/pl/plow/package.nix
@@ -29,12 +29,12 @@ buildGoModule rec {
     package = plow;
   };
 
-  meta = with lib; {
+  meta = {
     description = "High-performance HTTP benchmarking tool that includes a real-time web UI and terminal display";
     homepage = "https://github.com/six-ddc/plow";
     changelog = "https://github.com/six-ddc/plow/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ecklf ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ecklf ];
     mainProgram = "plow";
   };
 }
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 7224359cb18b..e9f26b21551b 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -181,7 +181,7 @@ buildGoModule rec {
       oci-containers-podman = nixosTests.oci-containers.podman;
     };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://podman.io/";
     description = "Program for managing pods, containers and container images";
     longDescription = ''
@@ -190,8 +190,8 @@ buildGoModule rec {
       To install on NixOS, please use the option `virtualisation.podman.enable = true`.
     '';
     changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
-    license = licenses.asl20;
-    teams = [ teams.podman ];
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.podman ];
     mainProgram = "podman";
   };
 }
diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix
index fea3c32c1996..d1608d341a12 100644
--- a/pkgs/by-name/po/poethepoet/package.nix
+++ b/pkgs/by-name/po/poethepoet/package.nix
@@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "poethepoet" ];
 
-  meta = with lib; {
+  meta = {
     description = "Task runner that works well with poetry";
     homepage = "https://github.com/nat-n/poethepoet";
     changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "poe";
   };
 }
diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
index d017054aaeb1..43d6e59f3458 100644
--- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
+++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
@@ -37,11 +37,11 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Poetry plugin to simplify package updates";
     homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up";
     changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.k900 ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.k900 ];
   };
 }
diff --git a/pkgs/by-name/po/poezio/package.nix b/pkgs/by-name/po/poezio/package.nix
index b222f1c1a54f..f6146e5e8b85 100644
--- a/pkgs/by-name/po/poezio/package.nix
+++ b/pkgs/by-name/po/poezio/package.nix
@@ -48,11 +48,11 @@ python3.pkgs.buildPythonApplication rec {
     rm -r poezio
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free console XMPP client";
     homepage = "https://poez.io";
     changelog = "https://codeberg.org/poezio/poezio/src/tag/v${version}/CHANGELOG";
-    license = licenses.zlib;
-    maintainers = with maintainers; [ lsix ];
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ lsix ];
   };
 }
diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix
index 9812c8a19fe7..4997e4ce3eee 100644
--- a/pkgs/by-name/po/polymake/package.nix
+++ b/pkgs/by-name/po/polymake/package.nix
@@ -75,12 +75,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Software for research in polyhedral geometry";
     homepage = "https://www.polymake.org/doku.php";
     changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    teams = [ teams.sage ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.sage ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 73dbffd89916..749d607dfe42 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -36,15 +36,15 @@ rustPlatform.buildRustPackage rec {
   # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads''
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Portable, modern regular expression language";
     mainProgram = "pomsky";
     homepage = "https://pomsky-lang.org";
     changelog = "https://github.com/pomsky-lang/pomsky/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index d320feb46e82..4452a75aab08 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
       --zsh <($out/bin/pop completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Send emails from your terminal";
     homepage = "https://github.com/charmbracelet/pop";
     changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       caarlos0
       maaslalani
     ];
diff --git a/pkgs/by-name/po/popeye/package.nix b/pkgs/by-name/po/popeye/package.nix
index 01d4bbaa3125..31fff97a6478 100644
--- a/pkgs/by-name/po/popeye/package.nix
+++ b/pkgs/by-name/po/popeye/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
     $out/bin/popeye version | grep ${version} > /dev/null
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes cluster resource sanitizer";
     mainProgram = "popeye";
     homepage = "https://github.com/derailed/popeye";
     changelog = "https://github.com/derailed/popeye/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.bryanasdev000 ];
   };
 }
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index a7d5a90624db..1738985d7769 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
     "prefix=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Multiple USB File Flasher";
     homepage = "https://github.com/pop-os/popsicle";
     changelog = "https://github.com/pop-os/popsicle/releases/tag/${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       _13r0ck
       figsoda
     ];
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/po/portal/package.nix b/pkgs/by-name/po/portal/package.nix
index 1ec52592b8b5..2d3eeef1dfbd 100644
--- a/pkgs/by-name/po/portal/package.nix
+++ b/pkgs/by-name/po/portal/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
 
   ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3
 
-  meta = with lib; {
+  meta = {
     description = "Quick and easy command-line file transfer utility from any computer to another";
     homepage = "https://github.com/SpatiumPortae/portal";
     changelog = "https://github.com/SpatiumPortae/portal/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tennox ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tennox ];
     mainProgram = "portal";
   };
 }
diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix
index dcba59036fd6..de87e12285a1 100644
--- a/pkgs/by-name/po/portfolio-filemanager/package.nix
+++ b/pkgs/by-name/po/portfolio-filemanager/package.nix
@@ -72,14 +72,14 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Minimalist file manager for those who want to use Linux mobile devices";
     homepage = "https://github.com/tchx84/Portfolio";
     changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     mainProgram = "dev.tchx84.Portfolio";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       dotlambda
       chuangzhu
     ];
diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index 03f555ec84a3..5028c309d9b1 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -183,16 +183,16 @@ stdenv.mkDerivation rec {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.postfix.org/";
     changelog = "https://www.postfix.org/announcements/postfix-${version}.html";
     description = "Fast, easy to administer, and secure mail server";
-    license = with licenses; [
+    license = with lib.licenses; [
       ipl10
       epl20
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       globin
       dotlambda
       lewo
diff --git a/pkgs/by-name/po/postgresql_jdbc/package.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix
index 7b3846cb18df..f1358eb83455 100644
--- a/pkgs/by-name/po/postgresql_jdbc/package.nix
+++ b/pkgs/by-name/po/postgresql_jdbc/package.nix
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://jdbc.postgresql.org/";
     changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}";
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
-    license = licenses.bsd2;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd2;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
index 0f079334385e..929dfb83872d 100644
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -21,12 +21,12 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
     homepage = "https://github.com/etkecc/postmoogle";
     changelog = "https://github.com/etkecc/postmoogle/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ amuckstot30 ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ amuckstot30 ];
     mainProgram = "postmoogle";
   };
 }
diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix
index faed38561102..af0b1cc3ed20 100644
--- a/pkgs/by-name/po/pouf/package.nix
+++ b/pkgs/by-name/po/pouf/package.nix
@@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = "make PREFIX=$out copy-data";
 
-  meta = with lib; {
+  meta = {
     description = "CLI program for produce fake datas";
     homepage = "https://github.com/mothsart/pouf";
     changelog = "https://github.com/mothsart/pouf/releases/tag/${version}";
-    maintainers = with maintainers; [ mothsart ];
-    license = with licenses; [ mit ];
+    maintainers = with lib.maintainers; [ mothsart ];
+    license = with lib.licenses; [ mit ];
     mainProgram = "pouf";
   };
 }
diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix
index 7dec487e37a2..b41951ad7671 100644
--- a/pkgs/by-name/po/poutine/package.nix
+++ b/pkgs/by-name/po/poutine/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
       --zsh <($out/bin/${meta.mainProgram} completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories";
     homepage = "https://github.com/boostsecurityio/poutine";
     changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "poutine";
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix
index 40fd1ab49a46..fcd5180ae4f6 100644
--- a/pkgs/by-name/po/powerhub/package.nix
+++ b/pkgs/by-name/po/powerhub/package.nix
@@ -54,12 +54,12 @@ python3.pkgs.buildPythonApplication rec {
     cd tests/helpers
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting";
     homepage = "https://github.com/AdrianVollmer/PowerHub";
     changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "powerhub";
   };
 }
diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix
index 704b46a4a214..66c135a8689c 100644
--- a/pkgs/by-name/po/powerline-go/package.nix
+++ b/pkgs/by-name/po/powerline-go/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw=";
 
-  meta = with lib; {
+  meta = {
     description = "Powerline like prompt for Bash, ZSH and Fish";
     homepage = "https://github.com/justjanne/powerline-go";
     changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sifmelcara ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sifmelcara ];
     mainProgram = "powerline-go";
   };
 }
diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix
index 3fbf787d671d..23adf690335c 100644
--- a/pkgs/by-name/po/powershell-editor-services/package.nix
+++ b/pkgs/by-name/po/powershell-editor-services/package.nix
@@ -25,14 +25,14 @@ stdenvNoCC.mkDerivation rec {
     chmod +x $out/bin/powershell-editor-services
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Common platform for PowerShell development support in any editor or application";
     homepage = "https://github.com/PowerShell/PowerShellEditorServices";
     changelog = "https://github.com/PowerShell/PowerShellEditorServices/releases/tag/v${version}";
-    platforms = platforms.unix;
-    license = licenses.mit;
-    maintainers = with maintainers; [ sharpchen ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sharpchen ];
     mainProgram = "powershell-editor-services";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
 }
diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix
index d65f79d70ba6..7c8aafec28e6 100644
--- a/pkgs/by-name/po/powertop/package.nix
+++ b/pkgs/by-name/po/powertop/package.nix
@@ -61,16 +61,16 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     inherit (src.meta) homepage;
     changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
     description = "Analyze power consumption on Intel-based laptops";
     mainProgram = "powertop";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       fpletz
       anthonyroussel
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix
index dfee8b6db957..f929f5fdde32 100644
--- a/pkgs/by-name/pr/pr-tracker/package.nix
+++ b/pkgs/by-name/pr/pr-tracker/package.nix
@@ -25,17 +25,17 @@ rustPlatform.buildRustPackage rec {
     systemd
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.qyliss.net/pr-tracker/plain/NEWS?h=${version}";
     description = "Nixpkgs pull request channel tracker";
     longDescription = ''
       A web server that displays the path a Nixpkgs pull request will take
       through the various release channels.
     '';
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     homepage = "https://git.qyliss.net/pr-tracker";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       qyliss
       sumnerevans
     ];
diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix
index 055663b69ce9..1f8a008220ae 100644
--- a/pkgs/by-name/pr/pre2k/package.nix
+++ b/pkgs/by-name/pr/pre2k/package.nix
@@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec {
     "pre2k"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to query for the existence of pre-windows 2000 computer objects";
     homepage = "https://github.com/garrettfoster13/pre2k";
     changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pre2k";
   };
 }
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index a2dccadd422e..f1e135d438d5 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -31,15 +31,15 @@ let
     hash = "sha256-BlPmrfHbpsLI8DCldzoRudpf7T4SUpJXQA5h9o4Thek=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Conference planning tool: CfP, scheduling, speaker management";
     mainProgram = "pretalx-manage";
     homepage = "https://github.com/pretalx/pretalx";
     changelog = "https://docs.pretalx.org/changelog/#${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
-    teams = [ teams.c3d2 ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+    teams = [ lib.teams.c3d2 ];
+    platforms = lib.platforms.linux;
   };
 
   frontend = buildNpmPackage {
diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix
index 5499ba5c948c..a902c23a247a 100644
--- a/pkgs/by-name/pr/pretender/package.nix
+++ b/pkgs/by-name/pr/pretender/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Tool for handling machine-in-the-middle tasks";
     mainProgram = "pretender";
     homepage = "https://github.com/RedTeamPentesting/pretender";
     changelog = "https://github.com/RedTeamPentesting/pretender/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index 8da8a62ac711..244e14ebf756 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -62,15 +62,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=util::cargo::test::workspace_root"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for on-chip debugging and flashing of ARM chips";
     homepage = "https://probe.rs/";
     changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       xgroleau
       newam
     ];
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 5ffb72dcd49b..63ff211b5f48 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -58,12 +58,12 @@ buildGoModule rec {
       --fish <($out/bin/process-compose completion fish)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple and flexible scheduler and orchestrator to manage non-containerized applications";
     homepage = "https://github.com/F1bonacc1/process-compose";
     changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ thenonameguy ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thenonameguy ];
     mainProgram = "process-compose";
   };
 }
diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix
index 71136f1d5cff..eef9369ee4f7 100644
--- a/pkgs/by-name/pr/procs/package.nix
+++ b/pkgs/by-name/pr/procs/package.nix
@@ -37,12 +37,12 @@ rustPlatform.buildRustPackage rec {
     libiconv
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";
     changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       sciencentistguy
     ];
diff --git a/pkgs/by-name/pr/programmer-calculator/package.nix b/pkgs/by-name/pr/programmer-calculator/package.nix
index 4921ad30d153..16a32ce8057e 100644
--- a/pkgs/by-name/pr/programmer-calculator/package.nix
+++ b/pkgs/by-name/pr/programmer-calculator/package.nix
@@ -24,7 +24,7 @@ gccStdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal calculator for programmers";
     mainProgram = "pcalc";
     longDescription = ''
@@ -33,8 +33,8 @@ gccStdenv.mkDerivation rec {
     '';
     homepage = "https://alt-romes.github.io/programmer-calculator";
     changelog = "https://github.com/alt-romes/programmer-calculator/releases/tag/v${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ cjab ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
index d36c608385af..a26054c42efb 100644
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -36,13 +36,13 @@ buildGoModule rec {
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
 
-  meta = with lib; {
+  meta = {
     description = "Prometheus exporter for machine metrics";
     mainProgram = "node_exporter";
     homepage = "https://github.com/prometheus/node_exporter";
     changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       benley
       fpletz
       globin
diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index 3dda7203bd4e..c8dd41207455 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -19,12 +19,12 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality";
     mainProgram = "promptfoo";
     homepage = "https://www.promptfoo.dev/";
     changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.nathanielbrough ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nathanielbrough ];
   };
 }
diff --git a/pkgs/by-name/pr/promscale/package.nix b/pkgs/by-name/pr/promscale/package.nix
index 5c4195f7e24d..8af6ba2fa6be 100644
--- a/pkgs/by-name/pr/promscale/package.nix
+++ b/pkgs/by-name/pr/promscale/package.nix
@@ -46,13 +46,13 @@ buildGoModule rec {
     command = "promscale -version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source analytical platform for Prometheus metrics";
     mainProgram = "promscale";
     homepage = "https://github.com/timescale/promscale";
     changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       _0x4A6F
       anpin
     ];
diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 105b40ce97b4..9c1debf33bb7 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -26,13 +26,13 @@ buildGoModule rec {
     unset subPackages
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, reliable, interoperable, better gRPC";
     mainProgram = "protoc-gen-connect-go";
     homepage = "https://github.com/connectrpc/connect-go";
     changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       kilimnik
       jk
     ];
diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix
index 9c30e4d41b5c..e1dc6043821c 100644
--- a/pkgs/by-name/pr/protoc-gen-es/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-es/package.nix
@@ -47,12 +47,12 @@ buildNpmPackage rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Protobuf plugin for generating ECMAScript code";
     homepage = "https://github.com/bufbuild/protobuf-es";
     changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       felschr
       jtszalay
     ];
diff --git a/pkgs/by-name/pr/proton-caller/package.nix b/pkgs/by-name/pr/proton-caller/package.nix
index 7321597a5dc9..c8a03e5431c8 100644
--- a/pkgs/by-name/pr/proton-caller/package.nix
+++ b/pkgs/by-name/pr/proton-caller/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-AZp6Mbm9Fg+EVr31oJe6/Z8LIwapYhos8JpZzPMiwz0=";
 
-  meta = with lib; {
+  meta = {
     description = "Run Windows programs with Proton";
     changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
     homepage = "https://github.com/caverym/proton-caller";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kho-dialga ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kho-dialga ];
     mainProgram = "proton-call";
   };
 }
diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix
index 480ed5d4c0ff..ce528f4daca9 100644
--- a/pkgs/by-name/pr/protox/package.nix
+++ b/pkgs/by-name/pr/protox/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
   # tests are not included in the crate source
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of the protobuf compiler";
     mainProgram = "protox";
     homepage = "https://github.com/andrewhickman/protox";
     changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index 2368d0d7eea7..1f8fa5a9a97c 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -83,12 +83,12 @@ stdenv.mkDerivation rec {
     tests.smoke-test = nixosTests.prowlarr;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Indexer manager/proxy built on the popular arr .net/reactjs base stack";
     homepage = "https://wiki.servarr.com/prowlarr";
     changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ pizzapim ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ pizzapim ];
     mainProgram = "Prowlarr";
     platforms = [
       "aarch64-darwin"
diff --git a/pkgs/by-name/pr/proxify/package.nix b/pkgs/by-name/pr/proxify/package.nix
index 28e4313bbf33..1a313caa2423 100644
--- a/pkgs/by-name/pr/proxify/package.nix
+++ b/pkgs/by-name/pr/proxify/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-eGcCc83napjt0VBhpDiHWn7+ew77XparDJ9uyjF353w=";
 
-  meta = with lib; {
+  meta = {
     description = "Proxy tool for HTTP/HTTPS traffic capture";
     longDescription = ''
       This tool supports multiple operations such as request/response dump, filtering
@@ -27,7 +27,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/proxify";
     changelog = "https://github.com/projectdiscovery/proxify/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix
index 03f66f6f8422..916e1dfc4ecd 100644
--- a/pkgs/by-name/pr/prs/package.nix
+++ b/pkgs/by-name/pr/prs/package.nix
@@ -49,15 +49,15 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Secure, fast & convenient password manager CLI using GPG and git to sync";
     homepage = "https://gitlab.com/timvisee/prs";
     changelog = "https://gitlab.com/timvisee/prs/-/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl3Only # lib
       gpl3Only # everything else
     ];
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with lib.maintainers; [ colemickens ];
     mainProgram = "prs";
   };
 }
diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix
index 95c04d04d462..149215771fbe 100644
--- a/pkgs/by-name/pt/ptouch-driver/package.nix
+++ b/pkgs/by-name/pt/ptouch-driver/package.nix
@@ -73,14 +73,14 @@ stdenv.mkDerivation rec {
     "foomatic-rip" # cups-filters
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${version}";
     description = "Printer Driver for Brother P-touch and QL Label Printers";
     downloadPage = "https://github.com/philpem/printer-driver-ptouch";
     homepage = "https://github.com/philpem/printer-driver-ptouch";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ sascha8a ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ sascha8a ];
+    platforms = lib.platforms.linux;
     longDescription = ''
       This is ptouch-driver, a printer driver based on CUPS and foomatic,
       for the Brother P-touch and QL label printer families.
diff --git a/pkgs/by-name/py/py-spy/package.nix b/pkgs/by-name/py/py-spy/package.nix
index f0000dd4c458..31d39067dab0 100644
--- a/pkgs/by-name/py/py-spy/package.nix
+++ b/pkgs/by-name/py/py-spy/package.nix
@@ -38,13 +38,13 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_negative_linenumber_increment"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Sampling profiler for Python programs";
     mainProgram = "py-spy";
     homepage = "https://github.com/benfred/py-spy";
     changelog = "https://github.com/benfred/py-spy/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lnl7 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lnl7 ];
     platforms = lib.platforms.linux;
     # https://github.com/benfred/py-spy/pull/330
     broken = stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix
index 88af7907c8e6..8126e926f994 100644
--- a/pkgs/by-name/py/pyrosimple/package.nix
+++ b/pkgs/by-name/py/pyrosimple/package.nix
@@ -63,12 +63,12 @@ python3.pkgs.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "RTorrent client";
     homepage = "https://kannibalox.github.io/pyrosimple/";
     changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       ne9z
       vamega
     ];
diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix
index 3a5753493aeb..26f0cf92827c 100644
--- a/pkgs/by-name/py/pysqlrecon/package.nix
+++ b/pkgs/by-name/py/pysqlrecon/package.nix
@@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "pysqlrecon" ];
 
-  meta = with lib; {
+  meta = {
     description = "Offensive MSSQL toolkit";
     homepage = "https://github.com/Tw1sm/PySQLRecon";
     changelog = "https://github.com/Tw1sm/PySQLRecon/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pysqlrecon";
   };
 }
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 7d2bef8b0279..c9a36c6ea4bf 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec {
 
   useNextest = true;
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of the `py` command for Unix-based platforms";
     homepage = "https://github.com/brettcannon/python-launcher";
     changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "py";
   };
 }
diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix
index 22f020325984..0efef1f7a502 100644
--- a/pkgs/by-name/qu/quadrapassel/package.nix
+++ b/pkgs/by-name/qu/quadrapassel/package.nix
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "quadrapassel"; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Classic falling-block game, Tetris";
     mainProgram = "quadrapassel";
     homepage = "https://gitlab.gnome.org/GNOME/quadrapassel";
     changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl2Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index c16483060a98..fa09cc22d5b1 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -155,14 +155,14 @@ python3.pkgs.buildPythonApplication {
       )
     '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/qutebrowser/qutebrowser";
     changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc";
     description = "Keyboard-focused browser with a minimal GUI";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "qutebrowser";
     platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jagajaga
       rnhmjoj
       ebzzry
diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix
index f0e9bd7b59af..e0d9d2109584 100644
--- a/pkgs/by-name/ra/radcli/package.nix
+++ b/pkgs/by-name/ra/radcli/package.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation rec {
     nettle
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple RADIUS client library";
     homepage = "https://github.com/radcli/radcli";
     changelog = "https://github.com/radcli/radcli/blob/${version}/NEWS";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "radcli";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index 9c359fa71505..f6b00cb145ee 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -35,15 +35,15 @@ rustPlatform.buildRustPackage rec {
       --zsh target/*/release/completions/_*
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
     homepage = "https://github.com/str4d/rage";
     changelog = "https://github.com/str4d/rage/blob/v${version}/rage/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ]; # either at your option
-    maintainers = with maintainers; [ ryantm ];
+    maintainers = with lib.maintainers; [ ryantm ];
     mainProgram = "rage";
   };
 }
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 5c5f8c74109c..b4242a85d87b 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec {
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "railway";
     description = "Railway.app CLI";
     homepage = "https://github.com/railwayapp/cli";
     changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Crafter
       techknowlogick
     ];
diff --git a/pkgs/by-name/ra/rakkess/package.nix b/pkgs/by-name/ra/rakkess/package.nix
index 8ea988b69a57..28c2681edbc7 100644
--- a/pkgs/by-name/ra/rakkess/package.nix
+++ b/pkgs/by-name/ra/rakkess/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     "-X github.com/corneliusweig/rakkess/internal/version.version=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/corneliusweig/rakkess";
     changelog = "https://github.com/corneliusweig/rakkess/releases/tag/v${version}";
     description = "Review Access - kubectl plugin to show an access matrix for k8s server resources";
@@ -35,7 +35,7 @@ buildGoModule rec {
       the current user and all server resources, similar to
       `kubectl auth can-i --list`.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix
index 1b5d5caa8e7a..31f0fb720079 100644
--- a/pkgs/by-name/ra/range-v3/package.nix
+++ b/pkgs/by-name/ra/range-v3/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE = "-std=c++17";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Experimental range library for C++11/14/17";
     homepage = "https://github.com/ericniebler/range-v3";
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
-    license = licenses.boost;
-    platforms = platforms.all;
-    maintainers = [ ];
+    license = lib.licenses.boost;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix
index 9621e30adc04..2227593bd0bf 100644
--- a/pkgs/by-name/ra/rates/package.nix
+++ b/pkgs/by-name/ra/rates/package.nix
@@ -25,15 +25,15 @@ rustPlatform.buildRustPackage rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";
     changelog = "https://github.com/lunush/rates/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rates";
   };
 }
diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 436df90d68e9..0d842f31eed0 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec {
     "--skip=copy::copy_tests::check_default_mode"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/wykurz/rcp/releases/tag/v${version}";
     description = "Tools to efficiently copy, remove and link large filesets";
     homepage = "https://github.com/wykurz/rcp";
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     mainProgram = "rcp";
-    maintainers = with maintainers; [ wykurz ];
+    maintainers = with lib.maintainers; [ wykurz ];
     # Building procfs on an for a unsupported platform. Currently only linux and android are supported
     # (Your current target_os is macos)
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index fb28bbd643eb..6b32e4b319aa 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -34,13 +34,13 @@ buildGoModule {
     cp ip46tables nft46 $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Scan logs and take action: an alternative to fail2ban";
     homepage = "https://framagit.org/ppom/reaction";
     changelog = "https://framagit.org/ppom/reaction/-/releases/v${version}";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     mainProgram = "reaction";
-    maintainers = with maintainers; [ ppom ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ppom ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix
index 7b95d52ba120..5c9180153295 100644
--- a/pkgs/by-name/re/ready-check/package.nix
+++ b/pkgs/by-name/re/ready-check/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     "ready"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to check readiness of websites";
     homepage = "https://github.com/sesh/ready";
     changelog = "https://github.com/sesh/ready/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ready";
   };
 }
diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix
index c145f7823ea4..51a1c781d4a8 100644
--- a/pkgs/by-name/re/redfishtool/package.nix
+++ b/pkgs/by-name/re/redfishtool/package.nix
@@ -22,12 +22,12 @@ python3.pkgs.buildPythonApplication {
     python-dateutil
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python34 program that implements a command line tool for accessing the Redfish API";
     homepage = "https://github.com/DMTF/Redfishtool";
     changelog = "https://github.com/DMTF/Redfishtool/blob/${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jfvillablanca ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jfvillablanca ];
     mainProgram = "redfishtool";
   };
 }
diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix
index 56ceae80fe14..a408a67f10e9 100644
--- a/pkgs/by-name/re/refinery-cli/package.nix
+++ b/pkgs/by-name/re/refinery-cli/package.nix
@@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Run migrations for the Refinery ORM for Rust via the CLI";
     mainProgram = "refinery";
     homepage = "https://github.com/rust-db/refinery";
     changelog = "https://github.com/rust-db/refinery/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lucperkins ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lucperkins ];
   };
 }
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index a01733c04ea4..20541744e673 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Reverse Engineers' Hex Editor";
     longDescription = ''
       A cross-platform (Windows, Linux, Mac) hex editor for reverse
@@ -71,12 +71,12 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/solemnwarning/rehex";
     changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       markus1189
       wegank
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "rehex";
   };
 }
diff --git a/pkgs/by-name/re/remarshal_0_17/package.nix b/pkgs/by-name/re/remarshal_0_17/package.nix
index c3813d5c80e6..ee9e5cd08ef9 100644
--- a/pkgs/by-name/re/remarshal_0_17/package.nix
+++ b/pkgs/by-name/re/remarshal_0_17/package.nix
@@ -60,12 +60,12 @@ pythonPackages.buildPythonApplication rec {
 
   # nixpkgs-update: no auto update
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}";
     description = "Convert between TOML, YAML and JSON";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/dbohdan/remarshal";
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "remarshal";
   };
 }
diff --git a/pkgs/by-name/re/remodel/package.nix b/pkgs/by-name/re/remodel/package.nix
index 89ac00bd0169..3368c022f86c 100644
--- a/pkgs/by-name/re/remodel/package.nix
+++ b/pkgs/by-name/re/remodel/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Roblox file manipulation tool";
     mainProgram = "remodel";
     longDescription = ''
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/rojo-rbx/remodel";
     downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}";
     changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ wackbyte ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ wackbyte ];
   };
 }
diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix
index c9a5cef39e03..17209982dd42 100644
--- a/pkgs/by-name/re/reshape/package.nix
+++ b/pkgs/by-name/re/reshape/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
 
   postgresqlTestUserOptions = "LOGIN SUPERUSER";
 
-  meta = with lib; {
+  meta = {
     description = "Easy-to-use, zero-downtime schema migration tool for Postgres";
     mainProgram = "reshape";
     homepage = "https://github.com/fabianlindfors/reshape";
     changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ilyakooo0 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ilyakooo0 ];
   };
 }
diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index 4a849ef4ed27..09c9a0eeac7a 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -43,12 +43,12 @@ buildGoModule rec {
     package = restish;
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for interacting with REST-ish HTTP APIs";
     homepage = "https://rest.sh/";
     changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "restish";
   };
 }
diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix
index f736828cb521..5c5a7c4aa5bf 100644
--- a/pkgs/by-name/re/resvg/package.nix
+++ b/pkgs/by-name/re/resvg/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 -t $out/include crates/c-api/*.h
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SVG rendering library";
     homepage = "https://github.com/RazrFalcon/resvg";
     changelog = "https://github.com/RazrFalcon/resvg/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = [ ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "resvg";
   };
 }
diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix
index 6e79a2151804..2a90c7b6dfc5 100644
--- a/pkgs/by-name/re/reviewdog/package.nix
+++ b/pkgs/by-name/re/reviewdog/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-X github.com/reviewdog/reviewdog/commands.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
     mainProgram = "reviewdog";
     homepage = "https://github.com/reviewdog/reviewdog";
     changelog = "https://github.com/reviewdog/reviewdog/blob/v${version}/CHANGELOG.md";
-    maintainers = [ ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix
index 86d3063460d5..c68a403562e1 100644
--- a/pkgs/by-name/re/rewrk/package.nix
+++ b/pkgs/by-name/re/rewrk/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
     ln -s ${./Cargo.lock} Cargo.lock
   '';
 
-  meta = with lib; {
+  meta = {
     description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks";
     homepage = "https://github.com/lnx-search/rewrk";
     changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rewrk";
   };
 }
diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index 63a7972968cb..f41cbb5cd434 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool that automatically provides external dependencies for software projects";
     mainProgram = "riff";
     homepage = "https://riff.sh";
     changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ri/rime-cli/package.nix b/pkgs/by-name/ri/rime-cli/package.nix
index 3f2e31dc59bf..649acfa26bc7 100644
--- a/pkgs/by-name/ri/rime-cli/package.nix
+++ b/pkgs/by-name/ri/rime-cli/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/puddinging/rime-cli";
     changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}";
     description = "Command line tool to add customized vocabulary for Rime IME";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
     mainProgram = "rime-cli";
   };
 }
diff --git a/pkgs/by-name/ri/rinutils/package.nix b/pkgs/by-name/ri/rinutils/package.nix
index ca5717a34fdd..aa006c14c29d 100644
--- a/pkgs/by-name/ri/rinutils/package.nix
+++ b/pkgs/by-name/ri/rinutils/package.nix
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
       --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
   '';
 
-  meta = with lib; {
+  meta = {
     description = "C11 / gnu11 utilities C library by Shlomi Fish / Rindolf";
     homepage = "https://github.com/shlomif/rinutils";
     changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ri/ripe-atlas-tools/package.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
index 8ccac955b77e..31fb70a46782 100644
--- a/pkgs/by-name/ri/ripe-atlas-tools/package.nix
+++ b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
@@ -90,11 +90,11 @@ python3.pkgs.buildPythonApplication rec {
     echo "__version__ = \"${version}\"" > ripe/atlas/tools/version.py
   '';
 
-  meta = with lib; {
+  meta = {
     description = "RIPE ATLAS project tools";
     homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools";
     changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${version}/CHANGES.rst";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ raitobezarius ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ raitobezarius ];
   };
 }
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index 4e4bd6f102cb..12418a4e34fc 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -59,15 +59,15 @@ rustPlatform.buildRustPackage rec {
       echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = "https://github.com/BurntSushi/ripgrep";
     changelog = "https://github.com/BurntSushi/ripgrep/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       unlicense # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       globin
       ma27
       zowoq
diff --git a/pkgs/by-name/ri/rita/package.nix b/pkgs/by-name/ri/rita/package.nix
index d5bb24650f51..c6ede0f19ee5 100644
--- a/pkgs/by-name/ri/rita/package.nix
+++ b/pkgs/by-name/ri/rita/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     "-X=github.com/activecm/rita/config.ExactVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Framework for detecting command and control communication through network traffic analysis";
     homepage = "https://github.com/activecm/rita";
     changelog = "https://github.com/activecm/rita/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rita";
   };
 }
diff --git a/pkgs/by-name/ro/robin-map/package.nix b/pkgs/by-name/ro/robin-map/package.nix
index 55e5a663af68..c2afe76559e7 100644
--- a/pkgs/by-name/ro/robin-map/package.nix
+++ b/pkgs/by-name/ro/robin-map/package.nix
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
     homepage = "https://github.com/Tessil/robin-map";
     changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix
index b1637a4c7efd..f6119ecef724 100644
--- a/pkgs/by-name/ro/robotframework-tidy/package.nix
+++ b/pkgs/by-name/ro/robotframework-tidy/package.nix
@@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Code autoformatter for Robot Framework";
     homepage = "https://robotidy.readthedocs.io";
     changelog = "https://github.com/MarketSquare/robotframework-tidy/blob/main/docs/releasenotes/${src.tag}.rst";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ otavio ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ otavio ];
     mainProgram = "robotidy";
   };
 }
diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix
index f8f7ec658b09..45230de608aa 100644
--- a/pkgs/by-name/ro/roswell/package.nix
+++ b/pkgs/by-name/ro/roswell/package.nix
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
     curl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lisp implementation installer/manager and launcher";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hiro98 ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hiro98 ];
+    platforms = lib.platforms.unix;
     homepage = "https://github.com/roswell/roswell";
     changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog";
     mainProgram = "ros";
diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix
index 7fe1e787ccff..2e9df8012f34 100644
--- a/pkgs/by-name/ro/route-graph/package.nix
+++ b/pkgs/by-name/ro/route-graph/package.nix
@@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec {
     "route_graph"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for creating graphs of routes";
     homepage = "https://github.com/audiusGmbH/route-graph";
     changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "route-graph";
   };
 }
diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix
index becc0b690658..da2ed65e1b81 100644
--- a/pkgs/by-name/ro/routinator/package.nix
+++ b/pkgs/by-name/ro/routinator/package.nix
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU=";
 
-  meta = with lib; {
+  meta = {
     description = "RPKI Validator written in Rust";
     homepage = "https://github.com/NLnetLabs/routinator";
     changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "routinator";
   };
 
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index f5205818e20a..df92b94d790c 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -74,12 +74,12 @@ rustPlatform.buildRustPackage {
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Bittorrent client in Rust";
     homepage = "https://github.com/ikatson/rqbit";
     changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       cafkafk
       toasteruwu
     ];
diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix
index abb176e02a63..94128af96092 100644
--- a/pkgs/by-name/rs/rsass/package.nix
+++ b/pkgs/by-name/rs/rsass/package.nix
@@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-TZZweDTF5sGdrCBXh42yaBMTI9ehjHGSFQu9HzVQEdA=";
 
-  meta = with lib; {
+  meta = {
     description = "Sass reimplemented in rust with nom";
     mainProgram = "rsass";
     homepage = "https://github.com/kaj/rsass";
     changelog = "https://github.com/kaj/rsass/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix
index da1ced5f3812..bc5dfb1640a8 100644
--- a/pkgs/by-name/rs/rsbkb/package.nix
+++ b/pkgs/by-name/rs/rsbkb/package.nix
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage {
     for i in $(./rsbkb list) ; do ln -s $path $i ; done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tools to encode/decode things";
     homepage = "https://github.com/trou/rsbkb";
     changelog = "https://github.com/trou/rsbkb/releases/tag/release-${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ProducerMatt ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ProducerMatt ];
   };
 }
diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix
index be16f7d71467..3581e2d011c5 100644
--- a/pkgs/by-name/rs/rsgain/package.nix
+++ b/pkgs/by-name/rs/rsgain/package.nix
@@ -36,13 +36,13 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple, but powerful ReplayGain 2.0 tagging utility";
     mainProgram = "rsgain";
     homepage = "https://github.com/complexlogic/rsgain";
     changelog = "https://github.com/complexlogic/rsgain/blob/v${version}/CHANGELOG";
-    license = licenses.bsd2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.felipeqq2 ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.felipeqq2 ];
   };
 }
diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 3f1b74b587a0..cc98879e62b5 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple RSS/Atom feed reader with online synchronization";
     mainProgram = "rssguard";
     longDescription = ''
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/martinrotter/rssguard";
     changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       jluttine
       tebriel
     ];
diff --git a/pkgs/by-name/rs/rstfmt/package.nix b/pkgs/by-name/rs/rstfmt/package.nix
index cf4dd98ac709..f933f6e204c3 100644
--- a/pkgs/by-name/rs/rstfmt/package.nix
+++ b/pkgs/by-name/rs/rstfmt/package.nix
@@ -33,11 +33,11 @@ python3.pkgs.buildPythonApplication rec {
     "rstfmt"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Formatter for reStructuredText";
     homepage = "https://github.com/dzhu/rstfmt";
     changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix
index d68cd743aeff..b3bcd2f9c188 100644
--- a/pkgs/by-name/ru/ruler/package.nix
+++ b/pkgs/by-name/ru/ruler/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to abuse Exchange services";
     homepage = "https://github.com/sensepost/ruler";
     changelog = "https://github.com/sensepost/ruler/releases/tag/${version}";
-    license = with licenses; [ cc-by-nc-40 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ cc-by-nc-40 ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ruler";
   };
 }
diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
index 750b5a897dd9..a6440c5bac7b 100644
--- a/pkgs/by-name/ru/rune-languageserver/package.nix
+++ b/pkgs/by-name/ru/rune-languageserver/package.nix
@@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec {
     RUNE_VERSION = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Language server for the Rune Language, an embeddable dynamic programming language for Rust";
     homepage = "https://crates.io/crates/rune-languageserver";
     changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rune-languageserver";
   };
 }
diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index 61915b6e9801..cf587613b5a8 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
     RUNE_VERSION = version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Interpreter for the Rune Language, an embeddable dynamic programming language for Rust";
     homepage = "https://rune-rs.github.io/";
     changelog = "https://github.com/rune-rs/rune/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rune";
   };
 }
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index eb1d7465cfb4..ad4225ada0e2 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -70,12 +70,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Execute commands inside your runbooks, docs, and READMEs";
     mainProgram = "runme";
     homepage = "https://runme.dev";
     changelog = "https://github.com/runmedev/runme/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
index 729193992cae..b6dbfdaf8c57 100644
--- a/pkgs/by-name/ru/runpodctl/package.nix
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -21,12 +21,12 @@ buildGoModule rec {
     rm $out/bin/docs # remove the docs binary
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/runpod/runpodctl";
     description = "CLI tool to automate / manage GPU pods for runpod.io";
     changelog = "https://github.com/runpod/runpodctl/raw/v${version}/CHANGELOG.md";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.georgewhewell ];
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.georgewhewell ];
     mainProgram = "runpodctl";
   };
 }
diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index a69f3804ecb9..548e809af4ad 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -55,12 +55,12 @@ rustPlatform.buildRustPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/mozilla/cbindgen/blob/v${version}/CHANGES";
     description = "Project for generating C bindings from Rust code";
     mainProgram = "cbindgen";
     homepage = "https://github.com/mozilla/cbindgen";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix
index 9d9f4951ea74..374b4cf5e736 100644
--- a/pkgs/by-name/ru/rust-motd/package.nix
+++ b/pkgs/by-name/ru/rust-motd/package.nix
@@ -30,12 +30,12 @@ rustPlatform.buildRustPackage rec {
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     description = "Beautiful, useful MOTD generation with zero runtime dependencies";
     homepage = "https://github.com/rust-motd/rust-motd";
     changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rust-motd";
   };
 }
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index aecd1ac4f873..060f5a901af0 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
   # tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Run Rust files and expressions as scripts without any setup or compilation step";
     mainProgram = "rust-script";
     homepage = "https://rust-script.org";
     changelog = "https://github.com/fornwall/rust-script/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix
index 0d6d73f63266..3d82d3d16250 100644
--- a/pkgs/by-name/ru/rustcat/package.nix
+++ b/pkgs/by-name/ru/rustcat/package.nix
@@ -25,12 +25,12 @@ rustPlatform.buildRustPackage rec {
 
   versionCheckProgram = [ "${placeholder "out"}/bin/rcat" ];
 
-  meta = with lib; {
+  meta = {
     description = "Port listener and reverse shell";
     homepage = "https://github.com/robiot/rustcat";
     changelog = "https://github.com/robiot/rustcat/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "rcat";
   };
 }
diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix
index 33fb44e5e207..9ad7b1b5d3d0 100644
--- a/pkgs/by-name/ru/rustdesk-server/package.nix
+++ b/pkgs/by-name/ru/rustdesk-server/package.nix
@@ -43,13 +43,13 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "RustDesk Server Program";
     homepage = "https://github.com/rustdesk/rustdesk-server";
     changelog = "https://github.com/rustdesk/rustdesk-server/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       gaelreyrol
       tjni
     ];
diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix
index c012668a34fe..010f3b007c92 100644
--- a/pkgs/by-name/ru/rustscan/package.nix
+++ b/pkgs/by-name/ru/rustscan/package.nix
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec {
     "--skip=resolver_default_cloudflare"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Faster Nmap Scanning with Rust";
     homepage = "https://github.com/RustScan/RustScan";
     changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "rustscan";
   };
 }
diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix
index b57e33208c44..67f4197275ce 100644
--- a/pkgs/by-name/ru/rusty-diceware/package.nix
+++ b/pkgs/by-name/ru/rusty-diceware/package.nix
@@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Commandline diceware, with or without dice, written in Rustlang";
     homepage = "https://gitlab.com/yuvallanger/rusty-diceware";
     changelog = "https://gitlab.com/yuvallanger/rusty-diceware/-/blob/v${version}/CHANGELOG.md?ref_type=heads";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ cherrykitten ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ cherrykitten ];
     mainProgram = "diceware";
   };
 }
diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix
index 337bd547c497..5554cbc1c03c 100644
--- a/pkgs/by-name/ru/rustycli/package.nix
+++ b/pkgs/by-name/ru/rustycli/package.nix
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
   # some examples fail to compile
   cargoTestFlags = [ "--tests" ];
 
-  meta = with lib; {
+  meta = {
     description = "Access the rust playground right in terminal";
     mainProgram = "rustycli";
     homepage = "https://github.com/pwnwriter/rustycli";
     changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index c97756291304..33e57583ba0a 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Minimal file upload/pastebin service";
     homepage = "https://github.com/orhun/rustypaste";
     changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       seqizz
     ];
diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix
index 07917e201eba..5ee30cee37e3 100644
--- a/pkgs/by-name/sa/sad/package.nix
+++ b/pkgs/by-name/sa/sad/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config.toml
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to search and replace";
     homepage = "https://github.com/ms-jpq/sad";
     changelog = "https://github.com/ms-jpq/sad/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sad";
   };
 }
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 321eeb33b522..4dec9b726133 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -89,16 +89,16 @@ stdenv.mkDerivation rec {
     (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin))
   ];
 
-  meta = with lib; {
+  meta = {
     description = "System for Automated Geoscientific Analyses";
     homepage = "https://saga-gis.sourceforge.io";
     changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       michelk
       mpickering
     ];
-    teams = [ teams.geospatial ];
-    platforms = with platforms; unix;
+    teams = [ lib.teams.geospatial ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index 8d2e0bb7b656..8cd1f7735dc1 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
 
   GEN_ARTIFACTS = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line submission tool for the UMD CS Submit Server";
     homepage = "https://github.com/figsoda/sagoin";
     changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "sagoin";
   };
 }
diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix
index 7bf4fa6866df..10f8b6a59171 100644
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -71,11 +71,11 @@ python3.pkgs.buildPythonApplication rec {
   # as is it rather long.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://saltproject.io/";
     changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html";
     description = "Portable, distributed, remote execution and configuration management system";
-    maintainers = with maintainers; [ Flakebi ];
-    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ Flakebi ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index 71d96226cf07..b1ebdf489812 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -52,12 +52,12 @@ stdenv.mkDerivation rec {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/MCJack123/sanjuuni";
     description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft";
     changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}";
-    maintainers = [ maintainers.tomodachi94 ];
-    license = licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.tomodachi94 ];
+    license = lib.licenses.gpl2Plus;
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "sanjuuni";
   };
diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix
index 210bf16bbbed..6af038f35404 100644
--- a/pkgs/by-name/sa/savvycan/package.nix
+++ b/pkgs/by-name/sa/savvycan/package.nix
@@ -35,13 +35,13 @@ stdenv.mkDerivation rec {
     ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN
   '';
 
-  meta = with lib; {
+  meta = {
     description = "QT based cross platform canbus tool";
     homepage = "https://savvycan.com/";
     changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";
-    maintainers = with maintainers; [ simoneruffini ];
-    platforms = platforms.all;
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ simoneruffini ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
     mainProgram = "SavvyCAN";
     longDescription = ''
       SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse
diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix
index 3f1b52894ee0..efe605fbf45a 100644
--- a/pkgs/by-name/sc/scalr-cli/package.nix
+++ b/pkgs/by-name/sc/scalr-cli/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
 
   doCheck = false; # Skip tests as they require creating actual Scalr resources.
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool that communicates directly with the Scalr API";
     homepage = "https://github.com/Scalr/scalr-cli";
     changelog = "https://github.com/Scalr/scalr-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dylanmtaylor ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dylanmtaylor ];
     mainProgram = "scalr";
   };
 }
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 04a95c7e1bdd..137d28d27924 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec {
   # pure environment, see https://github.com/mozilla/sccache/issues/460
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Ccache with Cloud Storage";
     mainProgram = "sccache";
     homepage = "https://github.com/mozilla/sccache";
     changelog = "https://github.com/mozilla/sccache/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       doronbehar
       figsoda
     ];
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/sc/scilla/package.nix b/pkgs/by-name/sc/scilla/package.nix
index 730c647fc2fa..bc8845d062e2 100644
--- a/pkgs/by-name/sc/scilla/package.nix
+++ b/pkgs/by-name/sc/scilla/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-skip=TestIPToHostname"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Information gathering tool for DNS, ports and more";
     mainProgram = "scilla";
     homepage = "https://github.com/edoardottt/scilla";
     changelog = "https://github.com/edoardottt/scilla/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix
index 2f73d1f6a85d..0dcd8f11c7a9 100644
--- a/pkgs/by-name/sc/scraper/package.nix
+++ b/pkgs/by-name/sc/scraper/package.nix
@@ -23,12 +23,12 @@ rustPlatform.buildRustPackage rec {
     installManPage scraper.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to query HTML files with CSS selectors";
     mainProgram = "scraper";
     homepage = "https://github.com/causal-agent/scraper";
     changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix
index 72b7d5bc1555..6e15dadfbdfb 100644
--- a/pkgs/by-name/sd/sd-switch/package.nix
+++ b/pkgs/by-name/sd/sd-switch/package.nix
@@ -26,13 +26,13 @@ rustPlatform.buildRustPackage {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Systemd unit switcher for Home Manager";
     mainProgram = "sd-switch";
     homepage = "https://git.sr.ht/~rycee/sd-switch";
     changelog = "https://git.sr.ht/~rycee/sd-switch/refs/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ rycee ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ rycee ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix
index 42a29210c93e..6a82b4ad16ab 100644
--- a/pkgs/by-name/sd/sdlpop/package.nix
+++ b/pkgs/by-name/sd/sdlpop/package.nix
@@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Open-source port of Prince of Persia";
     homepage = "https://github.com/NagyD/SDLPoP";
     changelog = "https://github.com/NagyD/SDLPoP/blob/v${version}/doc/ChangeLog.txt";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ iblech ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ iblech ];
+    platforms = lib.platforms.unix;
     mainProgram = "prince";
   };
 }
diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix
index be6f24c530ff..65cc55b081d9 100644
--- a/pkgs/by-name/se/secretscanner/package.nix
+++ b/pkgs/by-name/se/secretscanner/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
     mv $out/bin/SecretScanner $out/bin/$pname
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to find secrets and passwords in container images and file systems";
     mainProgram = "secretscanner";
     homepage = "https://github.com/deepfence/SecretScanner";
@@ -56,7 +56,7 @@ buildGoModule rec {
       "x86_64-linux"
       "aarch64-linux"
     ];
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix
index 380498612a8a..8e3f018227ff 100644
--- a/pkgs/by-name/se/seilfahrt/package.nix
+++ b/pkgs/by-name/se/seilfahrt/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
 
   buildInputs = [ pandoc ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to create a wiki page from a HedgeDoc";
     homepage = "https://github.com/Nerdbergev/seilfahrt";
     changelog = "https://github.com/Nerdbergev/seilfahrt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ xgwq ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xgwq ];
     mainProgram = "seilfahrt";
   };
 }
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index c488e4b816ff..7304d51047f7 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
 
   buildNoDefaultFeatures = !robloxSupport;
 
-  meta = with lib; {
+  meta = {
     description = "Blazing-fast modern Lua linter written in Rust";
     mainProgram = "selene";
     homepage = "https://github.com/kampfkarren/selene";
     changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index 0e75dfacea5b..886b5a065d12 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     install -m755 $out/bin/cli $out/bin/sem
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cli to operate on semaphore ci (2.0)";
     homepage = "https://github.com/semaphoreci/cli";
     changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ liberatys ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ liberatys ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix
index 9812e3d934f2..f204aa91bf51 100644
--- a/pkgs/by-name/se/senpai/package.nix
+++ b/pkgs/by-name/se/senpai/package.nix
@@ -37,12 +37,12 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Your everyday IRC student";
     mainProgram = "senpai";
     homepage = "https://sr.ht/~delthas/senpai/";
     changelog = "https://git.sr.ht/~delthas/senpai/refs/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ malte-v ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ malte-v ];
   };
 }
diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index d52d0b376d99..fb1ddcae10ed 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/sentry-cli completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.sentry.io/cli/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "Command line utility to work with Sentry";
     mainProgram = "sentry-cli";
     changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ rizary ];
+    maintainers = with lib.maintainers; [ rizary ];
   };
 }
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index d684def2563d..5b320a8ac2d0 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -36,13 +36,13 @@ stdenv.mkDerivation rec {
     "-DSENTRY_BACKEND=breakpad"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/getsentry/sentry-native";
     description = "Sentry SDK for C, C++ and native applications";
     changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       wheelsandmetal
       daniel-fahey
     ];
diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix
index f7d3b6524b3f..a008b0955810 100644
--- a/pkgs/by-name/sh/shell-gpt/package.nix
+++ b/pkgs/by-name/sh/shell-gpt/package.nix
@@ -46,12 +46,12 @@ python3.pkgs.buildPythonApplication rec {
   # Tests want to read the OpenAI API key from stdin
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Access ChatGPT from your terminal";
     homepage = "https://github.com/TheR1D/shell_gpt";
     changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ SohamG ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SohamG ];
     mainProgram = "sgpt";
   };
 }
diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix
index 769810e4b2fb..0603f9df45c2 100644
--- a/pkgs/by-name/sh/shellclear/package.nix
+++ b/pkgs/by-name/sh/shellclear/package.nix
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "shellclear";
 
-  meta = with lib; {
+  meta = {
     description = "Secure shell history commands by finding sensitive data";
     homepage = "https://github.com/rusty-ferris-club/shellclear";
     changelog = "https://github.com/rusty-ferris-club/shellclear/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix
index cf69b0f05082..3144a7fdce05 100644
--- a/pkgs/by-name/sh/shelldap/package.nix
+++ b/pkgs/by-name/sh/shelldap/package.nix
@@ -50,16 +50,16 @@ perlPackages.buildPerlPackage rec {
 
   outputs = [ "out" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/mahlonsmith/shelldap/";
     description = "Handy shell-like interface for browsing LDAP servers and editing their content";
     changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG";
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [
       clerie
       tobiasBora
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "shelldap";
   };
 }
diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix
index 17f31fc13a52..b8865a877c3f 100644
--- a/pkgs/by-name/sh/shellspec/package.nix
+++ b/pkgs/by-name/sh/shellspec/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
   # "Building" the script happens in Docker
   dontBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells";
     homepage = "https://shellspec.info/";
     changelog = "https://github.com/shellspec/shellspec/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ j0hax ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ j0hax ];
+    platforms = lib.platforms.unix;
     mainProgram = "shellspec";
   };
 }
diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix
index 73a21535fc21..7c95d5bb054e 100644
--- a/pkgs/by-name/sh/shikane/package.nix
+++ b/pkgs/by-name/sh/shikane/package.nix
@@ -36,16 +36,16 @@ rustPlatform.buildRustPackage rec {
   # upstream has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Dynamic output configuration tool that automatically detects and configures connected outputs based on a set of profiles";
     homepage = "https://gitlab.com/w0lff/shikane";
     changelog = "https://gitlab.com/w0lff/shikane/-/tags/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       michaelpachec0
       natsukium
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "shikane";
   };
 }
diff --git a/pkgs/by-name/sh/shipments/package.nix b/pkgs/by-name/sh/shipments/package.nix
index f22cbed39da7..9d8a9a66a4e2 100644
--- a/pkgs/by-name/sh/shipments/package.nix
+++ b/pkgs/by-name/sh/shipments/package.nix
@@ -44,12 +44,12 @@ stdenv.mkDerivation rec {
     ))
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Postal package tracking application";
     mainProgram = "shipments";
     homepage = "https://sr.ht/~martijnbraam/shipments/";
     changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ michaelgrahamevans ];
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ michaelgrahamevans ];
   };
 }
diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix
index 092be4dbe8de..e305461485e1 100644
--- a/pkgs/by-name/sh/showmethekey/package.nix
+++ b/pkgs/by-name/sh/showmethekey/package.nix
@@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
     libxkbcommon
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Show keys you typed on screen";
     homepage = "https://showmethekey.alynx.one/";
     changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ocfox ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ocfox ];
   };
 }
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index ee93342f2d93..b5b63b8e1456 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -34,15 +34,15 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion --zsh _sic
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Accessible image processing and conversion from the terminal";
     homepage = "https://github.com/foresterre/sic";
     changelog = "https://github.com/foresterre/sic/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "sic";
   };
 }
diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix
index 2cdaf54336f3..c45f19b4d2db 100644
--- a/pkgs/by-name/si/siege/package.nix
+++ b/pkgs/by-name/si/siege/package.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     "--with-zlib=${zlib.dev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "HTTP load tester";
     homepage = "https://www.joedog.org/siege-home/";
     changelog = "https://github.com/JoeDog/siege/blob/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix
index 147a784d1dcd..b9bc3d44ef63 100644
--- a/pkgs/by-name/si/siglo/package.nix
+++ b/pkgs/by-name/si/siglo/package.nix
@@ -60,13 +60,13 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GTK app to sync InfiniTime watch with PinePhone";
     mainProgram = "siglo";
     homepage = "https://github.com/theironrobin/siglo";
     changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
-    license = licenses.mpl20;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix
index cd6af5de63de..c03942e480cb 100644
--- a/pkgs/by-name/si/signaturepdf/package.nix
+++ b/pkgs/by-name/si/signaturepdf/package.nix
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf";
     mainProgram = "signaturepdf";
     homepage = "https://pdf.24eme.fr/";
     changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ DamienCassou ];
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ DamienCassou ];
   };
 }
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index 66e8bbcdc790..2eb7e11841a8 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Simple HTTP server in Rust";
     homepage = "https://github.com/TheWaWaR/simple-http-server";
     changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       figsoda
       mephistophiles
     ];
diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index 3b1fc1c03500..05d550d7d1f6 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple scanning utility";
     mainProgram = "simple-scan";
     longDescription = ''
@@ -95,8 +95,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gitlab.gnome.org/GNOME/simple-scan";
     changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl3Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index 51e32aecd6bb..7eb7cbcdf2f2 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -39,13 +39,13 @@ appimageTools.wrapType2 {
     ignoredVersions = "-";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Desktop application for SimpleX Chat";
     mainProgram = "simplex-chat-desktop";
     homepage = "https://simplex.chat";
     changelog = "https://github.com/simplex-chat/simplex-chat/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ terryg ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ terryg ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/si/sipexer/package.nix b/pkgs/by-name/si/sipexer/package.nix
index 2923565da7d3..f7efe4cfdafa 100644
--- a/pkgs/by-name/si/sipexer/package.nix
+++ b/pkgs/by-name/si/sipexer/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU=";
 
-  meta = with lib; {
+  meta = {
     description = "Modern and flexible SIP CLI tool";
     homepage = "https://github.com/miconda/sipexer";
     changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ astro ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ astro ];
     mainProgram = "sipexer";
   };
 }
diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix
index 5d25e0858e2d..369f1634b68c 100644
--- a/pkgs/by-name/si/sipvicious/package.nix
+++ b/pkgs/by-name/si/sipvicious/package.nix
@@ -40,11 +40,11 @@ python3.pkgs.buildPythonApplication rec {
     "sipvicious"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Set of tools to audit SIP based VoIP systems";
     homepage = "https://github.com/EnableSecurity/sipvicious";
     changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix
index 8a8f78bc14b9..2570aadad400 100644
--- a/pkgs/by-name/si/sish/package.nix
+++ b/pkgs/by-name/si/sish/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "HTTP(S)/WS(S)/TCP Tunnels to localhost";
     homepage = "https://github.com/antoniomika/sish";
     changelog = "https://github.com/antoniomika/sish/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sish";
   };
 }
diff --git a/pkgs/by-name/sl/slides/package.nix b/pkgs/by-name/sl/slides/package.nix
index 59076db89ef2..6dff3aba591f 100644
--- a/pkgs/by-name/sl/slides/package.nix
+++ b/pkgs/by-name/sl/slides/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Terminal based presentation tool";
     homepage = "https://github.com/maaslalani/slides";
     changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       maaslalani
       penguwin
     ];
diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix
index 71b74b20e646..05191d690cc4 100644
--- a/pkgs/by-name/sl/slowlorust/package.nix
+++ b/pkgs/by-name/sl/slowlorust/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight slowloris (HTTP DoS) tool";
     homepage = "https://github.com/MJVL/slowlorust";
     changelog = "https://github.com/MJVL/slowlorust/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "slowlorust";
   };
 }
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 2a30e3b05680..050b02ba29b2 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-acWEinwYCCtoapFkL6XyASvFX4bqYS/HrKjlaAZabi4=";
 
-  meta = with lib; {
+  meta = {
     description = "Terminal-based HTTP/REST client";
     homepage = "https://slumber.lucaspickering.me";
     changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "slumber";
-    maintainers = with maintainers; [ javaes ];
+    maintainers = with lib.maintainers; [ javaes ];
   };
 }
diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix
index ec302ef8d20a..8093a1a7856f 100644
--- a/pkgs/by-name/sm/smag/package.nix
+++ b/pkgs/by-name/sm/smag/package.nix
@@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE=";
 
-  meta = with lib; {
+  meta = {
     description = "Easily create graphs from cli commands and view them in the terminal";
     longDescription = ''
       Easily create graphs from cli commands and view them in the terminal.
       Like the watch command but with a graph of the output.
     '';
     homepage = "https://github.com/aantn/smag";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/aantn/smag/releases/tag/v${version}";
     mainProgram = "smag";
-    maintainers = with maintainers; [ zebreus ];
+    maintainers = with lib.maintainers; [ zebreus ];
   };
 }
diff --git a/pkgs/by-name/sm/smbmap/package.nix b/pkgs/by-name/sm/smbmap/package.nix
index 1cccdda3e463..e005921d722e 100644
--- a/pkgs/by-name/sm/smbmap/package.nix
+++ b/pkgs/by-name/sm/smbmap/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "smbmap" ];
 
-  meta = with lib; {
+  meta = {
     description = "SMB enumeration tool";
     homepage = "https://github.com/ShawnDEvans/smbmap";
     changelog = "https://github.com/ShawnDEvans/smbmap/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "smbmap";
   };
 }
diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix
index 8e26c63cc584..96e717066690 100644
--- a/pkgs/by-name/sm/smtprelay/package.nix
+++ b/pkgs/by-name/sm/smtprelay/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
     "-X=main.appVersion=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/decke/smtprelay";
     description = "Simple Golang SMTP relay/proxy server";
     mainProgram = "smtprelay";
     changelog = "https://github.com/decke/smtprelay/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ juliusrickert ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ juliusrickert ];
   };
 }
diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix
index 0903db1952c0..019811234b3f 100644
--- a/pkgs/by-name/sm/smuxi/package.nix
+++ b/pkgs/by-name/sm/smuxi/package.nix
@@ -125,14 +125,14 @@ stdenv.mkDerivation rec {
     }
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://smuxi.im/";
     downloadPage = "https://smuxi.im/download/";
     changelog = "https://github.com/meebey/smuxi/releases/tag/v${version}";
     description = "irssi-inspired, detachable, cross-platform, multi-protocol (IRC, XMPP/Jabber) chat client for the GNOME desktop";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       meebey
     ];
   };
diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index 5f24aed06052..88a970818551 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -45,12 +45,12 @@ buildGoModule rec {
 
   passthru.tests = nixosTests.soft-serve;
 
-  meta = with lib; {
+  meta = {
     description = "Tasty, self-hosted Git server for the command line";
     homepage = "https://github.com/charmbracelet/soft-serve";
     changelog = "https://github.com/charmbracelet/soft-serve/releases/tag/v${version}";
     mainProgram = "soft";
-    license = licenses.mit;
-    maintainers = with maintainers; [ penguwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ penguwin ];
   };
 }
diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 8e589e257a6a..7db3f17c387f 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -92,11 +92,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
 
-  meta = with lib; {
+  meta = {
     description = "Parametric 3d CAD program";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.edef ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.edef ];
+    platforms = lib.platforms.linux;
     homepage = "https://solvespace.com";
     changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md";
   };
diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix
index 4518babafeb7..ba20e56efb3e 100644
--- a/pkgs/by-name/so/sonic-server/package.nix
+++ b/pkgs/by-name/so/sonic-server/package.nix
@@ -55,14 +55,14 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fast, lightweight and schema-less search backend";
     homepage = "https://github.com/valeriansaliou/sonic";
     changelog = "https://github.com/valeriansaliou/sonic/releases/tag/v${version}";
-    license = licenses.mpl20;
-    platforms = platforms.unix;
+    license = lib.licenses.mpl20;
+    platforms = lib.platforms.unix;
     mainProgram = "sonic";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       pleshevskiy
       anthonyroussel
     ];
diff --git a/pkgs/by-name/so/soundalike/package.nix b/pkgs/by-name/so/soundalike/package.nix
index b38b65b7422d..66a7ab3fad45 100644
--- a/pkgs/by-name/so/soundalike/package.nix
+++ b/pkgs/by-name/so/soundalike/package.nix
@@ -62,12 +62,12 @@ buildGoModule rec {
       --prefix PATH : ${lib.makeBinPath [ chromaprint ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Find duplicate audio files using acoustic fingerprints";
     homepage = "https://codeberg.org/derat/soundalike";
     changelog = "https://codeberg.org/derat/soundalike/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ atar13 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ atar13 ];
     mainProgram = "soundalike";
   };
 }
diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index a14e5f750236..3266251654f1 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
     homepage = "https://www.sozu.io";
     changelog = "https://github.com/sozu-proxy/sozu/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       gaelreyrol
     ];
diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index 1236d29e9a58..c2bfa083711c 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -33,13 +33,13 @@ stdenvNoCC.mkDerivation rec {
     ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/site-functions/prompt_spaceship_setup"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Zsh prompt for Astronauts";
     homepage = "https://github.com/denysdovhan/spaceship-prompt/";
     changelog = "https://github.com/spaceship-prompt/spaceship-prompt/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       nyanloutre
       moni
       kyleondy
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index ed97b14cd0f8..24ca45983b4c 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -38,11 +38,11 @@ buildGoModule rec {
     ln -vs $server/bin/spire-server $out/bin/spire-server
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SPIFFE Runtime Environment";
     homepage = "https://github.com/spiffe/spire";
     changelog = "https://github.com/spiffe/spire/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fkautz ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fkautz ];
   };
 }
diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix
index b58e7ef17f27..14feafe86a2b 100644
--- a/pkgs/by-name/sp/sploitscan/package.nix
+++ b/pkgs/by-name/sp/sploitscan/package.nix
@@ -33,12 +33,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "sploitscan" ];
 
-  meta = with lib; {
+  meta = {
     description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits";
     homepage = "https://github.com/xaitax/SploitScan";
     changelog = "https://github.com/xaitax/SploitScan/releases/tag/v.${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sploitscan";
   };
 }
diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix
index c27357cfc747..c57a2f03fdbf 100644
--- a/pkgs/by-name/sp/spotdl/package.nix
+++ b/pkgs/by-name/sp/spotdl/package.nix
@@ -88,12 +88,12 @@ python3.pkgs.buildPythonApplication rec {
     (lib.makeBinPath [ ffmpeg ])
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Download your Spotify playlists and songs along with album art and metadata";
     homepage = "https://github.com/spotDL/spotify-downloader";
     changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
     mainProgram = "spotdl";
   };
 }
diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix
index 79a0c8a4c501..5d8759c8e106 100644
--- a/pkgs/by-name/sp/sptk/package.nix
+++ b/pkgs/by-name/sp/sptk/package.nix
@@ -33,11 +33,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}";
     description = "Suite of speech signal processing tools";
     homepage = "https://github.com/sp-nitech/SPTK";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sp/sptlrx/package.nix b/pkgs/by-name/sp/sptlrx/package.nix
index 3dfd390d2ecb..656ae6381221 100644
--- a/pkgs/by-name/sp/sptlrx/package.nix
+++ b/pkgs/by-name/sp/sptlrx/package.nix
@@ -40,12 +40,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Spotify lyrics in your terminal";
     homepage = "https://github.com/raitonoberu/sptlrx";
     changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MoritzBoehme ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MoritzBoehme ];
     mainProgram = "sptlrx";
   };
 }
diff --git a/pkgs/by-name/ss/ssh-audit/package.nix b/pkgs/by-name/ss/ssh-audit/package.nix
index da87760dcf6c..89bac7cb7a47 100644
--- a/pkgs/by-name/ss/ssh-audit/package.nix
+++ b/pkgs/by-name/ss/ssh-audit/package.nix
@@ -37,13 +37,13 @@ python3Packages.buildPythonApplication rec {
     inherit (nixosTests) ssh-audit;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool for ssh server auditing";
     homepage = "https://github.com/jtesta/ssh-audit";
     changelog = "https://github.com/jtesta/ssh-audit/releases/tag/v${version}";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       tv
       SuperSandro2000
     ];
diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
index 49185aa82bee..4fa03112e80c 100644
--- a/pkgs/by-name/ss/ssh-mitm/package.nix
+++ b/pkgs/by-name/ss/ssh-mitm/package.nix
@@ -68,11 +68,11 @@ buildPythonApplication rec {
 
   pythonImportsCheck = [ "sshmitm" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for SSH security audits";
     homepage = "https://github.com/ssh-mitm/ssh-mitm";
     changelog = "https://github.com/ssh-mitm/ssh-mitm/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix
index 73ab4de906e5..4fccfd958c81 100644
--- a/pkgs/by-name/ss/sshocker/package.nix
+++ b/pkgs/by-name/ss/sshocker/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Tool for SSH, reverse sshfs and port forwarder";
     homepage = "https://github.com/lima-vm/sshocker";
     changelog = "https://github.com/lima-vm/sshocker/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sshocker";
   };
 }
diff --git a/pkgs/by-name/ss/sslstrip/package.nix b/pkgs/by-name/ss/sslstrip/package.nix
index 8a75e3fdb8a5..391dfade6b4b 100644
--- a/pkgs/by-name/ss/sslstrip/package.nix
+++ b/pkgs/by-name/ss/sslstrip/package.nix
@@ -40,12 +40,12 @@ python3.pkgs.buildPythonApplication rec {
     "sslstrip"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for exploiting SSL stripping attacks";
     homepage = "https://github.com/L1ghtn1ng/sslstrip";
     changelog = "https://github.com/L1ghtn1ng/sslstrip/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sslstrip";
   };
 }
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 9cdd191c82f3..5084c8b99d33 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -68,12 +68,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI to manage STACKIT cloud services";
     homepage = "https://github.com/stackitcloud/stackit-cli";
     changelog = "https://github.com/stackitcloud/stackit-cli/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ DerRockWolf ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ DerRockWolf ];
     mainProgram = "stackit";
   };
 }
diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index 26bdf9ba4afa..2b513ae3f1b3 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -70,7 +70,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/aquasecurity/starboard";
     changelog = "https://github.com/aquasecurity/starboard/releases/tag/v${version}";
     description = "Kubernetes-native security tool kit";
@@ -84,7 +84,7 @@ buildGoModule rec {
       plug-in that make security reports available through familiar Kubernetes
       tools.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix
index c48274800d3a..ff2eadc30fb8 100644
--- a/pkgs/by-name/st/stargazer/package.nix
+++ b/pkgs/by-name/st/stargazer/package.nix
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion completions/stargazer.{bash,zsh,fish}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast and easy to use Gemini server";
     mainProgram = "stargazer";
     homepage = "https://sr.ht/~zethra/stargazer/";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     changelog = "https://git.sr.ht/~zethra/stargazer/refs/${version}";
-    maintainers = with maintainers; [ gaykitty ];
+    maintainers = with lib.maintainers; [ gaykitty ];
   };
 }
diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix
index 6b5ab174261b..3295553e41d0 100644
--- a/pkgs/by-name/st/starlark-rust/package.nix
+++ b/pkgs/by-name/st/starlark-rust/package.nix
@@ -17,12 +17,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg=";
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of the Starlark language";
     homepage = "https://github.com/facebook/starlark-rust";
     changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "starlark";
   };
 }
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 86fbb36443cc..e11786d22c3a 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -33,15 +33,15 @@ rustPlatform.buildRustPackage rec {
     inherit (nixosTests) static-web-server;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Asynchronous web server for static files-serving";
     homepage = "https://static-web-server.net/";
     changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       misilelab
     ];
diff --git a/pkgs/by-name/st/stayrtr/package.nix b/pkgs/by-name/st/stayrtr/package.nix
index dc90fb2b358c..d36392b7beca 100644
--- a/pkgs/by-name/st/stayrtr/package.nix
+++ b/pkgs/by-name/st/stayrtr/package.nix
@@ -28,12 +28,12 @@ buildGoModule rec {
     package = stayrtr;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}";
     description = "RPKI-To-Router server implementation in Go";
     homepage = "https://github.com/bgp/stayrtr/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     mainProgram = "stayrtr";
-    maintainers = with maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
   };
 }
diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix
index 18a7c7c24b46..19e76087c588 100644
--- a/pkgs/by-name/st/stc-cli/package.nix
+++ b/pkgs/by-name/st/stc-cli/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ=";
 
-  meta = with lib; {
+  meta = {
     description = "Syncthing CLI Tool";
     homepage = "https://github.com/tenox7/stc";
     changelog = "https://github.com/tenox7/stc/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
     mainProgram = "stc";
   };
 }
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 2147b331caf7..e7faa8dc414f 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/steamguard completion --shell zsh) \
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}";
     description = "Linux utility for generating 2FA codes for Steam and managing Steam trade confirmations";
     homepage = "https://github.com/dyc3/steamguard-cli";
-    license = with licenses; [ gpl3Only ];
+    license = with lib.licenses; [ gpl3Only ];
     mainProgram = "steamguard";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       surfaceflinger
       sigmasquadron
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix
index 6ee922e90865..2a3a89f26918 100644
--- a/pkgs/by-name/st/step-ca/package.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -58,13 +58,13 @@ buildGoModule rec {
 
   passthru.tests.step-ca = nixosTests.step-ca;
 
-  meta = with lib; {
+  meta = {
     description = "Private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
     homepage = "https://smallstep.com/certificates/";
     changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "step-ca";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       cmcdragonkai
       techknowlogick
     ];
diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index 26073880ed57..9aae0af822db 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   # mystery, though. :-(
   enableParallelBuilding = (!stdenv.hostPlatform.isi686);
 
-  meta = with lib; {
+  meta = {
     description = "Stress test a computer system";
     longDescription = ''
       stress-ng will stress test a computer system in various selectable ways. It
@@ -94,9 +94,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ColinIanKing/stress-ng";
     downloadPage = "https://github.com/ColinIanKing/stress-ng/tags";
     changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ c0bw3b ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ c0bw3b ];
+    platforms = lib.platforms.unix;
     mainProgram = "stress-ng";
   };
 }
diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix
index ea829e2a2694..95261a62f02b 100644
--- a/pkgs/by-name/st/stressapptest/package.nix
+++ b/pkgs/by-name/st/stressapptest/package.nix
@@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
     libaio
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Userspace memory and IO stress test tool";
     homepage = "https://github.com/stressapptest/stressapptest";
     changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.unix;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.unix;
     mainProgram = "stressapptest";
   };
 }
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index d319f8e903f0..f067a21c8aeb 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -69,7 +69,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://stripe.com/docs/stripe-cli";
     changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${version}";
     description = "Command-line tool for Stripe";
@@ -83,8 +83,8 @@ buildGoModule rec {
       Tail your API request logs in real-time
       Create, retrieve, update, or delete API objects.
     '';
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       RaghavSood
       jk
       kashw2
diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix
index 1d7558fa43ea..192df215a273 100644
--- a/pkgs/by-name/st/sttr/package.nix
+++ b/pkgs/by-name/st/sttr/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
       --zsh <($out/bin/sttr completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform cli tool to perform various operations on string";
     homepage = "https://github.com/abhimanyu003/sttr";
     changelog = "https://github.com/abhimanyu003/sttr/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Ligthiago ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Ligthiago ];
     mainProgram = "sttr";
   };
 }
diff --git a/pkgs/by-name/st/stuffbin/package.nix b/pkgs/by-name/st/stuffbin/package.nix
index a5b629bf3da1..910e77d0818e 100644
--- a/pkgs/by-name/st/stuffbin/package.nix
+++ b/pkgs/by-name/st/stuffbin/package.nix
@@ -23,11 +23,11 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
     homepage = "https://github.com/knadh/stuffbin";
     changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ raitobezarius ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index 5e44efe1b338..da1be2a67419 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U=";
 
-  meta = with lib; {
+  meta = {
     description = "Library and cli tool for working with scoped CSS in rust";
     mainProgram = "stylance";
     homepage = "https://github.com/basro/stylance-rs";
     changelog = "https://github.com/basro/stylance-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ dav-wolff ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ dav-wolff ];
   };
 }
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 8a5286d419dc..77a55c8cace1 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = features;
 
-  meta = with lib; {
+  meta = {
     description = "Opinionated Lua code formatter";
     homepage = "https://github.com/johnnymorganz/stylua";
     changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "stylua";
   };
 }
diff --git a/pkgs/by-name/su/sublime-music/package.nix b/pkgs/by-name/su/sublime-music/package.nix
index 400b0c1ce10d..cd29662aba6d 100644
--- a/pkgs/by-name/su/sublime-music/package.nix
+++ b/pkgs/by-name/su/sublime-music/package.nix
@@ -96,12 +96,12 @@ python3.pkgs.buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GTK3 Subsonic/Airsonic client";
     homepage = "https://sublimemusic.app";
     changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       albakham
       sumnerevans
     ];
diff --git a/pkgs/by-name/su/subprober/package.nix b/pkgs/by-name/su/subprober/package.nix
index 394510650de1..de856aea0234 100644
--- a/pkgs/by-name/su/subprober/package.nix
+++ b/pkgs/by-name/su/subprober/package.nix
@@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "subprober" ];
 
-  meta = with lib; {
+  meta = {
     description = "Subdomain scanning tool";
     homepage = "https://github.com/RevoltSecurities/SubProber";
     changelog = "https://github.com/RevoltSecurities/SubProber/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "subprober";
   };
 }
diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix
index 87b4c8b3a71d..8a885001a346 100644
--- a/pkgs/by-name/su/sudachidict/package.nix
+++ b/pkgs/by-name/su/sudachidict/package.nix
@@ -49,13 +49,13 @@ lib.checkListOfEnum "${pname}: dict-type" [ "core" "full" "small" ] [ dict-type
       dict-type = dict-type;
     };
 
-    meta = with lib; {
+    meta = {
       description = "Lexicon for Sudachi";
       homepage = "https://github.com/WorksApplications/SudachiDict";
       changelog = "https://github.com/WorksApplications/SudachiDict/releases/tag/v${version}";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ natsukium ];
-      platforms = platforms.all;
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [ natsukium ];
+      platforms = lib.platforms.all;
       # it is a waste of space and time to build this package in hydra since it is just data
       hydraPlatforms = [ ];
     };
diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix
index 02c1b09c7757..cee7f4e3f447 100644
--- a/pkgs/by-name/su/sudo-font/package.nix
+++ b/pkgs/by-name/su/sudo-font/package.nix
@@ -21,12 +21,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Font for programmers and command line users";
     homepage = "https://www.kutilek.de/sudo-font/";
     changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
-    license = licenses.ofl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index e6bb798f9d7b..63f92ca38650 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
       --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free 3D kart racing game";
     mainProgram = "supertuxkart";
     longDescription = ''
@@ -156,11 +156,11 @@ stdenv.mkDerivation rec {
       Kart.
     '';
     homepage = "https://supertuxkart.net/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       peterhoeg
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
     changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";
   };
 }
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index 20970de616f5..a7c1186009f9 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   doCheck = (!stdenv.hostPlatform.isDarwin); # times out
   enableParallelChecking = false;
 
-  meta = with lib; {
+  meta = {
     description = "Free Software/Open Source software package for mapping caves";
     longDescription = ''
       Survex is a Free Software/Open Source software package for mapping caves,
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://survex.com/";
     changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.matthewcroughan ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.matthewcroughan ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix
index 2857f25cba5a..dfa11b986c04 100644
--- a/pkgs/by-name/su/sushi/package.nix
+++ b/pkgs/by-name/su/sushi/package.nix
@@ -77,13 +77,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/sushi";
     changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags";
     description = "Quick previewer for Nautilus";
     mainProgram = "sushi";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 62d524001654..0aabde85862b 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
     rm .cargo/config.toml
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Generate Rust register maps (`struct`s) from SVD files";
     mainProgram = "svd2rust";
     homepage = "https://github.com/rust-embedded/svd2rust";
     changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit
       asl20
     ];
-    maintainers = with maintainers; [ newam ];
+    maintainers = with lib.maintainers; [ newam ];
   };
 }
diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix
index 313d6bbdd3c2..6d08c2c65c7b 100644
--- a/pkgs/by-name/sv/svdtools/package.nix
+++ b/pkgs/by-name/sv/svdtools/package.nix
@@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-sn+Z3/p4Ek/wxwTj6uwDBFP1hFNGDb2EZ7MO0zvPjPk=";
 
-  meta = with lib; {
+  meta = {
     description = "Tools to handle vendor-supplied, often buggy SVD files";
     mainProgram = "svdtools";
     homepage = "https://github.com/stm32-rs/svdtools";
     changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ newam ];
+    maintainers = with lib.maintainers; [ newam ];
   };
 }
diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix
index 816367c1afad..7829dc504a36 100644
--- a/pkgs/by-name/sv/svgbob/package.nix
+++ b/pkgs/by-name/sv/svgbob/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
     mv $out/bin/svgbob_cli $out/bin/svgbob
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Convert your ascii diagram scribbles into happy little SVG";
     homepage = "https://github.com/ivanceras/svgbob";
     changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cafkafk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ cafkafk ];
     mainProgram = "svgbob";
   };
 }
diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix
index 1c58049e4b43..b4d79f721100 100644
--- a/pkgs/by-name/sv/svix-server/package.nix
+++ b/pkgs/by-name/sv/svix-server/package.nix
@@ -40,13 +40,13 @@ rustPlatform.buildRustPackage rec {
   # disable tests because they require postgres and redis to be running
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     mainProgram = "svix-server";
     description = "Enterprise-ready webhooks service";
     homepage = "https://github.com/svix/svix-webhooks";
     changelog = "https://github.com/svix/svix-webhooks/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ techknowlogick ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ techknowlogick ];
     broken = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin; # aws-lc-sys currently broken on darwin x86_64
   };
 }
diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index 9c680b572fe4..2823a4932e8c 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec {
     "svlint"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "SystemVerilog linter";
     mainProgram = "svlint";
     homepage = "https://github.com/dalance/svlint";
     changelog = "https://github.com/dalance/svlint/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ trepetti ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ trepetti ];
   };
 }
diff --git a/pkgs/by-name/sw/sway-launcher-desktop/package.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
index 93cc778fc4e9..66ab3118b5ba 100644
--- a/pkgs/by-name/sw/sway-launcher-desktop/package.nix
+++ b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       }
   '';
 
-  meta = with lib; {
+  meta = {
     description = "TUI Application launcher with Desktop Entry support";
     mainProgram = "sway-launcher-desktop";
     longDescription = ''
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/Biont/sway-launcher-desktop";
     changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.pyrox0 ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.pyrox0 ];
   };
 }
diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
index 675e233f9230..e9eb571eea4f 100644
--- a/pkgs/by-name/sw/swaynotificationcenter/package.nix
+++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix
@@ -92,14 +92,14 @@ stdenv.mkDerivation (finalAttrs: {
     command = "${xvfb-run}/bin/xvfb-run swaync --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple notification daemon with a GUI built for Sway";
     homepage = "https://github.com/ErikReider/SwayNotificationCenter";
     changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     mainProgram = "swaync";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       berbiche
       pedrohlc
     ];
diff --git a/pkgs/by-name/sw/swiftbar/package.nix b/pkgs/by-name/sw/swiftbar/package.nix
index bb7d7ad8ee61..f73d2b08f5e2 100644
--- a/pkgs/by-name/sw/swiftbar/package.nix
+++ b/pkgs/by-name/sw/swiftbar/package.nix
@@ -34,14 +34,14 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Powerful macOS menu bar customization tool";
     homepage = "https://swiftbar.app";
     changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}";
     mainProgram = "SwiftBar";
-    license = licenses.mit;
-    platforms = platforms.darwin;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ matteopacini ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ matteopacini ];
   };
 }
diff --git a/pkgs/by-name/sw/switcheroo-control/package.nix b/pkgs/by-name/sw/switcheroo-control/package.nix
index f6cff0ba3169..1a45d35ac3fd 100644
--- a/pkgs/by-name/sw/switcheroo-control/package.nix
+++ b/pkgs/by-name/sw/switcheroo-control/package.nix
@@ -45,13 +45,13 @@ python3Packages.buildPythonApplication rec {
     "-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "D-Bus service to check the availability of dual-GPU";
     mainProgram = "switcherooctl";
     homepage = "https://gitlab.freedesktop.org/hadess/switcheroo-control/";
     changelog = "https://gitlab.freedesktop.org/hadess/switcheroo-control/-/blob/${version}/NEWS";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index 33715336dd4c..bd0e4e231621 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -73,7 +73,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool and library for generating a Software Bill of Materials from container images and filesystems";
     homepage = "https://github.com/anchore/syft";
     changelog = "https://github.com/anchore/syft/releases/tag/v${version}";
@@ -82,8 +82,8 @@ buildGoModule rec {
       (SBOM) from container images and filesystems. Exceptional for
       vulnerability detection when used with a scanner tool like Grype.
     '';
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [
       developer-guy
       jk
       kashw2
diff --git a/pkgs/by-name/sy/sysz/package.nix b/pkgs/by-name/sy/sysz/package.nix
index 29efc02e4894..089010d00054 100644
--- a/pkgs/by-name/sy/sysz/package.nix
+++ b/pkgs/by-name/sy/sysz/package.nix
@@ -34,12 +34,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/joehillen/sysz";
     description = "Fzf terminal UI for systemctl";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ hleboulanger ];
-    platforms = platforms.unix;
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ hleboulanger ];
+    platforms = lib.platforms.unix;
     changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md";
     mainProgram = "sysz";
   };
diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix
index 475b45b7c95f..04c18c0fd4e4 100644
--- a/pkgs/by-name/ta/tali/package.nix
+++ b/pkgs/by-name/ta/tali/package.nix
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "tali"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/tali";
     changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags";
     description = "Sort of poker with dice and less money";
     mainProgram = "tali";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix
index 887fd5c92410..2d9f980fdda9 100644
--- a/pkgs/by-name/ta/tandoor-recipes/common.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/common.nix
@@ -11,10 +11,10 @@ rec {
 
   yarnHash = "sha256-IVCT1KUhShCXY5ocmOul7DMzTe6ULm32azFE8HES1vc=";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tandoor.dev/";
     changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ jvanbruegge ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ jvanbruegge ];
   };
 }
diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 656a9b158a7c..b4c8ac5cbac5 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -156,13 +156,13 @@ python3Packages.buildPythonApplication rec {
     install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linux desktop music player from the future";
     mainProgram = "tauon";
     homepage = "https://tauonmusicbox.rocks/";
     changelog = "https://github.com/Taiko2k/Tauon/releases/tag/v${version}";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ jansol ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ jansol ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index fb976e3e531f..8adf5e5b8c3f 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
       --zsh completion/zsh/_teip
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to bypass a partial range of standard input to any command";
     mainProgram = "teip";
     homepage = "https://github.com/greymd/teip";
     changelog = "https://github.com/greymd/teip/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
index abecece8ea43..4bfdc93f4f4a 100644
--- a/pkgs/by-name/te/tektoncd-cli/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli/package.nix
@@ -59,7 +59,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tekton.dev";
     changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
     description = "Provides a CLI for interacting with Tekton - tkn";
@@ -69,8 +69,8 @@ buildGoModule rec {
       Tekton CLI, tkn, together with the core component of Tekton, Tekton
       Pipelines.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       jk
       mstrangfeld
       vdemeester
diff --git a/pkgs/by-name/te/teler/package.nix b/pkgs/by-name/te/teler/package.nix
index 8b2604818705..7bbddc6c7dc5 100644
--- a/pkgs/by-name/te/teler/package.nix
+++ b/pkgs/by-name/te/teler/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
   # test require internet access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Real-time HTTP Intrusion Detection";
     longDescription = ''
       teler is an real-time intrusion detection and threat alert
@@ -35,8 +35,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/kitabisa/teler";
     changelog = "https://github.com/kitabisa/teler/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "teler.app";
   };
 }
diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index cf788adb5a66..a8ba6215c880 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -50,12 +50,12 @@ buildGoModule rec {
     package = temporal;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability";
     homepage = "https://temporal.io";
     changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jpds ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jpds ];
     mainProgram = "temporal-server";
   };
 }
diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix
index 5d172a96483a..117cdb6916a7 100644
--- a/pkgs/by-name/te/termimage/package.nix
+++ b/pkgs/by-name/te/termimage/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
     installManPage termimage.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Display images in your terminal";
     homepage = "https://github.com/nabijaczleweli/termimage";
     changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "termimage";
   };
 }
diff --git a/pkgs/by-name/te/terracognita/package.nix b/pkgs/by-name/te/terracognita/package.nix
index 42df437f594d..483d5e1d4387 100644
--- a/pkgs/by-name/te/terracognita/package.nix
+++ b/pkgs/by-name/te/terracognita/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-X github.com/cycloidio/terracognita/cmd.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
     mainProgram = "terracognita";
     homepage = "https://github.com/cycloidio/terracognita";
     changelog = "https://github.com/cycloidio/terracognita/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix
index cd50d350b84d..5a31714dda31 100644
--- a/pkgs/by-name/te/terraform-ls/package.nix
+++ b/pkgs/by-name/te/terraform-ls/package.nix
@@ -33,13 +33,13 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terraform Language Server (official)";
     mainProgram = "terraform-ls";
     homepage = "https://github.com/hashicorp/terraform-ls";
     changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       mbaillie
       jk
     ];
diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix
index 68ff44313b95..7cc2e27b7548 100644
--- a/pkgs/by-name/te/terraform-plugin-docs/package.nix
+++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix
@@ -51,12 +51,12 @@ buildGoModule rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Generate and validate Terraform plugin/provider documentation";
     homepage = "https://github.com/hashicorp/terraform-plugin-docs";
     changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     mainProgram = "tfplugindocs";
-    maintainers = with maintainers; [ lewo ];
+    maintainers = with lib.maintainers; [ lewo ];
   };
 }
diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 0f6330a48a4f..c3635e8060bc 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
     "./e2etests/core"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform";
     homepage = "https://github.com/terramate-io/terramate";
     changelog = "https://github.com/terramate-io/terramate/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       dit7ya
       asininemonkey
     ];
diff --git a/pkgs/by-name/te/terrascan/package.nix b/pkgs/by-name/te/terrascan/package.nix
index 042843b183e0..f5af04540078 100644
--- a/pkgs/by-name/te/terrascan/package.nix
+++ b/pkgs/by-name/te/terrascan/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   # Tests want to download a vulnerable Terraform project
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Detect compliance and security violations across Infrastructure";
     mainProgram = "terrascan";
     longDescription = ''
@@ -35,7 +35,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/accurics/terrascan";
     changelog = "https://github.com/tenable/terrascan/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index e92ba4b63958..0be38b5c188b 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   env.CXXFLAGS = "-include cstdint";
 
-  meta = with lib; {
+  meta = {
     description = "High dynamic range (HDR) image comparison tool";
     mainProgram = "tev";
     longDescription = ''
@@ -74,9 +74,9 @@ stdenv.mkDerivation rec {
     '';
     inherit (src.meta) homepage;
     changelog = "https://github.com/Tom94/tev/releases/tag/v${version}";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix
index 8925f8367fc6..6f355bf2e975 100644
--- a/pkgs/by-name/te/texlab/package.nix
+++ b/pkgs/by-name/te/texlab/package.nix
@@ -45,16 +45,16 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of the Language Server Protocol for LaTeX";
     homepage = "https://github.com/latex-lsp/texlab";
     changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       doronbehar
       kira-bruneau
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "texlab";
   };
 }
diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index c988e11e50b5..c3122f919545 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -50,13 +50,13 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Highly available Prometheus setup with long term storage capabilities";
     homepage = "https://github.com/thanos-io/thanos";
     changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "thanos";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       basvandijk
       anthonyroussel
     ];
diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix
index 5d974aa26ddf..b0ce1072c6af 100644
--- a/pkgs/by-name/th/thc-hydra/package.nix
+++ b/pkgs/by-name/th/thc-hydra/package.nix
@@ -69,12 +69,12 @@ stdenv.mkDerivation rec {
       --add-flags --hydra-path --add-flags "$out/bin/hydra"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Very fast network logon cracker which support many different services";
     homepage = "https://github.com/vanhauser-thc/thc-hydra"; # https://www.thc.org/
     changelog = "https://github.com/vanhauser-thc/thc-hydra/raw/v${version}/CHANGES";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ offline ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 5fde06c463a9..b85cf0efb7d2 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -33,14 +33,14 @@ rustPlatform.buildRustPackage rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal code snippets manager";
     mainProgram = "the-way";
     homepage = "https://github.com/out-of-cheese-error/the-way";
     changelog = "https://github.com/out-of-cheese-error/the-way/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     platforms = lib.platforms.unix;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       numkem
     ];
diff --git a/pkgs/by-name/th/theharvester/package.nix b/pkgs/by-name/th/theharvester/package.nix
index 3bd47f4d947e..6004621667bd 100644
--- a/pkgs/by-name/th/theharvester/package.nix
+++ b/pkgs/by-name/th/theharvester/package.nix
@@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Gather E-mails, subdomains and names from different public sources";
     longDescription = ''
       theHarvester is a very simple, yet effective tool designed to be used in the early
@@ -72,8 +72,8 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/laramies/theHarvester";
     changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       c0bw3b
       fab
       treemo
diff --git a/pkgs/by-name/th/threatest/package.nix b/pkgs/by-name/th/threatest/package.nix
index f64a14c5515c..badb6e0e2171 100644
--- a/pkgs/by-name/th/threatest/package.nix
+++ b/pkgs/by-name/th/threatest/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
       --zsh <($out/bin/threatest completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Framework for end-to-end testing threat detection rules";
     mainProgram = "threatest";
     homepage = "https://github.com/DataDog/threatest";
     changelog = "https://github.com/DataDog/threatest/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix
index ee4f302bb61c..6a1b80367232 100644
--- a/pkgs/by-name/ti/ticker/package.nix
+++ b/pkgs/by-name/ti/ticker/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
     inherit version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal stock ticker with live updates and position tracking";
     homepage = "https://github.com/achannarasappa/ticker";
     changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       siraben
       sarcasticadmin
     ];
diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix
index d9b682eb2160..e27767f23c9b 100644
--- a/pkgs/by-name/ti/tickrs/package.nix
+++ b/pkgs/by-name/ti/tickrs/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = true;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Realtime ticker data in your terminal";
     homepage = "https://github.com/tarkah/tickrs";
     changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tickrs";
   };
 }
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 09a9dcd7dbfc..22e5d10c75ca 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec {
     "--skip=build_reader_can_create_reader_without_file_specified"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";
     mainProgram = "tidy-viewer";
     homepage = "https://github.com/alexhallam/tv";
     changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix
index f7582b35cf51..c919943b7f4f 100644
--- a/pkgs/by-name/ti/time-decode/package.nix
+++ b/pkgs/by-name/ti/time-decode/package.nix
@@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "time_decode" ];
 
-  meta = with lib; {
+  meta = {
     description = "Timestamp and date decoder";
     homepage = "https://github.com/digitalsleuth/time_decode";
     changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "time-decode";
   };
 }
diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix
index 3003e119d279..8122623c3856 100644
--- a/pkgs/by-name/ti/tiny/package.nix
+++ b/pkgs/by-name/ti/tiny/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = lib.optional notificationSupport "desktop-notifications";
 
-  meta = with lib; {
+  meta = {
     description = "Console IRC client";
     homepage = "https://github.com/osa1/tiny";
     changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       Br1ght0ne
       vyp
     ];
diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index fd8c7f19b16f..e9b0ee2a1b89 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -26,12 +26,12 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion completions/{tldr.bash,_tldr,tldr.fish}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Official tldr client written in Rust";
     homepage = "https://github.com/tldr-pages/tlrc";
     changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "tldr";
-    maintainers = with maintainers; [ acuteenvy ];
+    maintainers = with lib.maintainers; [ acuteenvy ];
   };
 }
diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix
index 42062b8cd3b8..94cf073b1dd3 100644
--- a/pkgs/by-name/tl/tlsx/package.nix
+++ b/pkgs/by-name/tl/tlsx/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "TLS grabber focused on TLS based data collection";
     longDescription = ''
       A fast and configurable TLS grabber focused on TLS based data
@@ -33,7 +33,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/tlsx";
     changelog = "https://github.com/projectdiscovery/tlsx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index af5d73a40524..598f0c462528 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tiny markup language for terminal output";
     mainProgram = "tml";
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${version}";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/tr/traceroute/package.nix b/pkgs/by-name/tr/traceroute/package.nix
index 6c72db10561f..6ba67fefa912 100644
--- a/pkgs/by-name/tr/traceroute/package.nix
+++ b/pkgs/by-name/tr/traceroute/package.nix
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tracks the route taken by packets over an IP network";
     homepage = "https://traceroute.sourceforge.net/";
     changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ koral ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ koral ];
+    platforms = lib.platforms.linux;
     mainProgram = "traceroute";
   };
 }
diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix
index d484013d18e7..b4b10ef80581 100644
--- a/pkgs/by-name/tr/trafficserver/package.nix
+++ b/pkgs/by-name/tr/trafficserver/package.nix
@@ -184,7 +184,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) trafficserver; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://trafficserver.apache.org";
     changelog = "https://raw.githubusercontent.com/apache/trafficserver/${version}/CHANGELOG-${version}";
     description = "Fast, scalable, and extensible HTTP caching proxy server";
@@ -197,8 +197,8 @@ stdenv.mkDerivation rec {
       enterprises, Internet service providers (ISPs), backbone providers, and
       large intranets by maximizing existing and available bandwidth.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ midchildan ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ midchildan ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
index 2a806346c698..ff1e00036749 100644
--- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix
+++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
@@ -58,13 +58,13 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # Requires network access
 
-  meta = with lib; {
+  meta = {
     description = "GTK remote control for the Transmission BitTorrent client";
     mainProgram = "transmission-remote-gtk";
     homepage = "https://github.com/transmission-remote-gtk/transmission-remote-gtk";
     changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${version}";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix
index 3ed051316e80..a0b2a2ba96f0 100644
--- a/pkgs/by-name/tr/trashy/package.nix
+++ b/pkgs/by-name/tr/trashy/package.nix
@@ -27,17 +27,17 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/trash completions zsh) \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, fast, and featureful alternative to rm and trash-cli";
     homepage = "https://github.com/oberblastmeister/trashy";
     changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ oberblastmeister ];
+    maintainers = with lib.maintainers; [ oberblastmeister ];
     mainProgram = "trash";
     # darwin is unsupported due to https://github.com/Byron/trash-rs/issues/8
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix
index ae557127722e..d38dbf568b59 100644
--- a/pkgs/by-name/tr/treedome/package.nix
+++ b/pkgs/by-name/tr/treedome/package.nix
@@ -72,13 +72,13 @@ rustPlatform.buildRustPackage rec {
       --set WEBKIT_DISABLE_COMPOSITING_MODE 1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Local-first, encrypted, note taking application organized in tree-like structures";
     homepage = " https://codeberg.org/solver-orgz/treedome";
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     platforms = [ "x86_64-linux" ];
     mainProgram = "treedome";
-    maintainers = with maintainers; [ tengkuizdihar ];
+    maintainers = with lib.maintainers; [ tengkuizdihar ];
     changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}";
   };
 }
diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index b3df7dd19a1a..7d1bfc916c82 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -64,12 +64,12 @@ appimageTools.wrapType2 rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Trezor Suite - Desktop App for managing crypto";
     homepage = "https://suite.trezor.io";
     changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ prusnak ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ prusnak ];
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 1692571a4208..2189f9175021 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to execute Trickest workflows";
     homepage = "https://github.com/trickest/trickest-cli";
     changelog = "https://github.com/trickest/trickest-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "trickest";
   };
 }
diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index 56b5c2468148..b1263a4c2bda 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -61,7 +61,7 @@ buildGo124Module rec {
     version = "Version: ${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI";
     homepage = "https://github.com/aquasecurity/trivy";
     changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}";
@@ -73,8 +73,8 @@ buildGo124Module rec {
       application dependencies (Bundler, Composer, npm, yarn, etc.).
     '';
     mainProgram = "trivy";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       fab
       jk
     ];
diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix
index b38e2ad7bd2c..053e58c8b29d 100644
--- a/pkgs/by-name/tr/trurl/package.nix
+++ b/pkgs/by-name/tr/trurl/package.nix
@@ -50,13 +50,13 @@ stdenv.mkDerivation rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool for URL parsing and manipulation";
     homepage = "https://curl.se/trurl";
     changelog = "https://github.com/curl/trurl/releases/tag/trurl-${version}";
-    license = licenses.curl;
-    maintainers = with maintainers; [ christoph-heiss ];
-    platforms = platforms.all;
+    license = lib.licenses.curl;
+    maintainers = with lib.maintainers; [ christoph-heiss ];
+    platforms = lib.platforms.all;
     mainProgram = "trurl";
   };
 }
diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix
index 3251db7cc3a1..9b6a8d6f7a13 100644
--- a/pkgs/by-name/tu/tuckr/package.nix
+++ b/pkgs/by-name/tu/tuckr/package.nix
@@ -20,12 +20,12 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 
-  meta = with lib; {
+  meta = {
     description = "Super powered replacement for GNU Stow";
     homepage = "https://github.com/RaphGL/Tuckr";
     changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mimame ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mimame ];
     mainProgram = "tuckr";
   };
 }
diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix
index bff78ab58d49..7a479b098ba5 100644
--- a/pkgs/by-name/tu/tunnelgraf/package.nix
+++ b/pkgs/by-name/tu/tunnelgraf/package.nix
@@ -43,12 +43,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "tunnelgraf" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to manage SSH tunnel hops to many endpoints";
     homepage = "https://github.com/denniswalker/tunnelgraf";
     changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "tunnelgraf";
   };
 }
diff --git a/pkgs/by-name/tu/turses/package.nix b/pkgs/by-name/tu/turses/package.nix
index bd8a3bb27806..c6154d86df83 100644
--- a/pkgs/by-name/tu/turses/package.nix
+++ b/pkgs/by-name/tu/turses/package.nix
@@ -92,13 +92,13 @@ buildPythonPackage rec {
     rm -rf $TMP_TURSES
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Twitter client for the console";
     homepage = "https://github.com/louipc/turses";
     changelog = "https://github.com/louipc/turses/blob/v${version}/HISTORY.rst";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "turses";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 5f73b0da7adc..9dd31dbe9039 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -34,13 +34,13 @@ appimageTools.wrapType2 rec {
     allowedVersions = ".+\\.[0-9]{6}\\..+";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tuta official desktop client";
     homepage = "https://tuta.com/";
     changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}";
-    license = licenses.gpl3Only;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = [ ];
+    license = lib.licenses.gpl3Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "tutanota-desktop";
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/uc/uchecker/package.nix b/pkgs/by-name/uc/uchecker/package.nix
index 883979bd9319..98f266b0d2fe 100644
--- a/pkgs/by-name/uc/uchecker/package.nix
+++ b/pkgs/by-name/uc/uchecker/package.nix
@@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec {
     "uchecker"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple tool to detect outdated shared libraries";
     homepage = "https://github.com/cloudlinux/kcare-uchecker";
     changelog = "https://github.com/cloudlinux/kcare-uchecker/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "uchecker";
   };
 }
diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix
index 28f7b6bc10c6..9dbb322f3f14 100644
--- a/pkgs/by-name/ud/udp2raw/package.nix
+++ b/pkgs/by-name/ud/udp2raw/package.nix
@@ -43,13 +43,13 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/udp2raw" --prefix PATH : "${lib.makeBinPath [ iptables ]}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/wangyu-/udp2raw";
     description = "Tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket";
     mainProgram = "udp2raw";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}";
-    maintainers = with maintainers; [ chvp ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ chvp ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ud/udpx/package.nix b/pkgs/by-name/ud/udpx/package.nix
index eca62eced932..b5ed4bcdb78a 100644
--- a/pkgs/by-name/ud/udpx/package.nix
+++ b/pkgs/by-name/ud/udpx/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Single-packet UDP scanner";
     mainProgram = "udpx";
     homepage = "https://github.com/nullt3r/udpx";
     changelog = "https://github.com/nullt3r/udpx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/un/uncover/package.nix b/pkgs/by-name/un/uncover/package.nix
index f277cd9ca423..2cb350cf6750 100644
--- a/pkgs/by-name/un/uncover/package.nix
+++ b/pkgs/by-name/un/uncover/package.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "API wrapper to search for exposed hosts";
     longDescription = ''
       uncover is a go wrapper using APIs of well known search engines to quickly
@@ -41,8 +41,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/uncover";
     changelog = "https://github.com/projectdiscovery/uncover/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "uncover";
   };
 }
diff --git a/pkgs/by-name/un/uni/package.nix b/pkgs/by-name/un/uni/package.nix
index 9b6b291a724e..b3a8e07286ec 100644
--- a/pkgs/by-name/un/uni/package.nix
+++ b/pkgs/by-name/un/uni/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X=main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/arp242/uni";
     description = "Query the Unicode database from the commandline, with good support for emojis";
     changelog = "https://github.com/arp242/uni/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chvp ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chvp ];
     mainProgram = "uni";
   };
 }
diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix
index 481a5887bfc8..3cd927b62176 100644
--- a/pkgs/by-name/un/unifi-protect-backup/package.nix
+++ b/pkgs/by-name/un/unifi-protect-backup/package.nix
@@ -50,12 +50,12 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Python tool to backup unifi event clips in realtime";
     homepage = "https://github.com/ep1cman/unifi-protect-backup";
     changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    teams = [ teams.helsinki-systems ];
+    license = lib.licenses.mit;
+    teams = [ lib.teams.helsinki-systems ];
     mainProgram = "unifi-protect-backup";
   };
 }
diff --git a/pkgs/by-name/un/unpaper/package.nix b/pkgs/by-name/un/unpaper/package.nix
index d88104d2f379..ef5e17f08100 100644
--- a/pkgs/by-name/un/unpaper/package.nix
+++ b/pkgs/by-name/un/unpaper/package.nix
@@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
     inherit (nixosTests) paperless;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.flameeyes.eu/projects/unpaper";
     changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS";
     description = "Post-processing tool for scanned sheets of paper";
-    license = licenses.gpl2Only;
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
     mainProgram = "unpaper";
-    maintainers = [ maintainers.rycee ];
+    maintainers = [ lib.maintainers.rycee ];
   };
 }
diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix
index a8800efb688c..f8a1515b7c1f 100644
--- a/pkgs/by-name/un/unpoller/package.nix
+++ b/pkgs/by-name/un/unpoller/package.nix
@@ -26,11 +26,11 @@ buildGoModule rec {
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) unpoller; };
 
-  meta = with lib; {
+  meta = {
     description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus";
     homepage = "https://github.com/unpoller/unpoller";
     changelog = "https://github.com/unpoller/unpoller/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Frostman ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Frostman ];
   };
 }
diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index 4cd47d26c13b..a6e0bc77c337 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -181,11 +181,11 @@ stdenvNoCC.mkDerivation {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks";
     homepage = "https://github.com/Unstructured-IO/unstructured-api";
     changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }
diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix
index 1c0b8a6737df..0eab3ad985fa 100644
--- a/pkgs/by-name/up/uptime-kuma/package.nix
+++ b/pkgs/by-name/up/uptime-kuma/package.nix
@@ -46,13 +46,13 @@ buildNpmPackage rec {
 
   passthru.tests.uptime-kuma = nixosTests.uptime-kuma;
 
-  meta = with lib; {
+  meta = {
     description = "Fancy self-hosted monitoring tool";
     mainProgram = "uptime-kuma-server";
     homepage = "https://github.com/louislam/uptime-kuma";
     changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ julienmalka ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ julienmalka ];
     # FileNotFoundError: [Errno 2] No such file or directory: 'xcrun'
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix
index 5ba51b7a63f3..4ea75be06396 100644
--- a/pkgs/by-name/us/userborn/package.nix
+++ b/pkgs/by-name/us/userborn/package.nix
@@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nikstur/userborn";
     description = "Declaratively bear (manage) Linux users and groups";
     changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ nikstur ];
     mainProgram = "userborn";
   };
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index 4ab4fe494edc..e6590b444a49 100644
--- a/pkgs/by-name/ut/utf8cpp/package.nix
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/nemtrif/utfcpp";
     changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}";
     description = "UTF-8 with C++ in a Portable Way";
-    license = licenses.boost;
-    maintainers = with maintainers; [ jobojeha ];
-    platforms = platforms.all;
+    license = lib.licenses.boost;
+    maintainers = with lib.maintainers; [ jobojeha ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix
index 4e6c40ed5b2d..f7780c1606d3 100644
--- a/pkgs/by-name/ut/utm/package.nix
+++ b/pkgs/by-name/ut/utm/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Full featured system emulator and virtual machine host for iOS and macOS";
     longDescription = ''
       UTM is a full featured system emulator and virtual machine host for iOS
@@ -63,10 +63,10 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://mac.getutm.app/";
     changelog = "https://github.com/utmapp/utm/releases/tag/v${version}";
     mainProgram = "UTM";
-    license = licenses.asl20;
-    platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [
       rrbutani
       wegank
     ];
diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 8718efca779f..af436434833b 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
     command = "vals version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Helm-like configuration values loader with support for various sources";
     mainProgram = "vals";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/helmfile/vals";
     changelog = "https://github.com/helmfile/vals/releases/v${version}";
-    maintainers = with maintainers; [ stehessel ];
+    maintainers = with lib.maintainers; [ stehessel ];
   };
 }
diff --git a/pkgs/by-name/va/vault-ssh-plus/package.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix
index 0fa3a0658513..71bbb58bd362 100644
--- a/pkgs/by-name/va/vault-ssh-plus/package.nix
+++ b/pkgs/by-name/va/vault-ssh-plus/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/isometry/vault-ssh-plus";
     changelog = "https://github.com/isometry/vault-ssh-plus/releases/tag/v${version}";
     description = "Automatically use HashiCorp Vault SSH Client Key Signing with ssh(1)";
     mainProgram = "vssh";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lesuisse ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lesuisse ];
   };
 }
diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix
index 891c9d16be2a..03e333ae062b 100644
--- a/pkgs/by-name/va/vault/package.nix
+++ b/pkgs/by-name/va/vault/package.nix
@@ -66,13 +66,13 @@ buildGoModule rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.vaultproject.io/";
     description = "Tool for managing secrets";
     changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsl11;
+    license = lib.licenses.bsl11;
     mainProgram = "vault";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       rushmorem
       lnl7
       offline
diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index 077791d40554..b754b72c0ff1 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -51,12 +51,12 @@ rustPlatform.buildRustPackage rec {
     updateScript = callPackage ./update.nix { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Unofficial Bitwarden compatible server written in Rust";
     homepage = "https://github.com/dani-garcia/vaultwarden";
     changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       dotlambda
       SuperSandro2000
     ];
diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix
index 5e306c9860b0..dcd98cad345e 100644
--- a/pkgs/by-name/va/vaultwarden/webvault.nix
+++ b/pkgs/by-name/va/vaultwarden/webvault.nix
@@ -56,12 +56,12 @@ buildNpmPackage rec {
     tests = nixosTests.vaultwarden;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Integrates the web vault into vaultwarden";
     homepage = "https://github.com/dani-garcia/bw_web_builds";
     changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}";
-    platforms = platforms.all;
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    license = lib.licenses.gpl3Plus;
     inherit (vaultwarden.meta) maintainers;
   };
 }
diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix
index a292c7865065..a68bd332c639 100644
--- a/pkgs/by-name/vi/vieb/package.nix
+++ b/pkgs/by-name/vi/vieb/package.nix
@@ -65,15 +65,15 @@ buildNpmPackage rec {
 
   distPhase = ":"; # disable useless $out/tarballs directory
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vieb.dev/";
     changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}";
     description = "Vim Inspired Electron Browser";
     mainProgram = "vieb";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       tejing
     ];
-    platforms = platforms.unix;
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index 3631d453f2ec..542cd901e8c6 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -69,12 +69,12 @@ stdenv.mkDerivation rec {
     ignoredVersions = "beta";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}";
     mainProgram = "vifm";
-    maintainers = with maintainers; [ raskin ];
-    platforms = if mediaSupport then platforms.linux else platforms.unix;
-    license = licenses.gpl2;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = if mediaSupport then lib.platforms.linux else lib.platforms.unix;
+    license = lib.licenses.gpl2;
     downloadPage = "https://vifm.info/downloads.shtml";
     homepage = "https://vifm.info/";
     changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog";
diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix
index 17cb7e380973..6bfeda989da9 100644
--- a/pkgs/by-name/vi/vitess/package.nix
+++ b/pkgs/by-name/vi/vitess/package.nix
@@ -25,11 +25,11 @@ buildGoModule rec {
   # integration tests require access to syslog and root
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vitess.io/";
     changelog = "https://github.com/vitessio/vitess/releases/tag/v${version}";
     description = "Database clustering system for horizontal scaling of MySQL";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/wa/waf-tester/package.nix b/pkgs/by-name/wa/waf-tester/package.nix
index f07758b17591..ab237d8f1459 100644
--- a/pkgs/by-name/wa/waf-tester/package.nix
+++ b/pkgs/by-name/wa/waf-tester/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
     version = "waf-tester ${version}, commit none, built at unknown by unknown";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tool to test Web Application Firewalls (WAFs)";
     mainProgram = "waf-tester";
     homepage = "https://github.com/jreisinger/waf-tester";
     changelog = "https://github.com/jreisinger/waf-tester/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix
index 1065c0f4f508..56fb0ced4e5d 100644
--- a/pkgs/by-name/wa/wafw00f/package.nix
+++ b/pkgs/by-name/wa/wafw00f/package.nix
@@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "wafw00f" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to identify and fingerprint Web Application Firewalls (WAF)";
     homepage = "https://github.com/EnableSecurity/wafw00f";
     changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "wafw00f";
   };
 }
diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 5080e1241ac5..747ec30795df 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -42,17 +42,17 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "wallabag is a self hostable application for saving web pages";
     longDescription = ''
       wallabag is a self-hostable PHP application allowing you to not
       miss any content anymore. Click, save and read it when you can.
       It extracts content so that you can read it when you have time.
     '';
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://wallabag.org";
     changelog = "https://github.com/wallabag/wallabag/releases/tag/${version}";
-    maintainers = with maintainers; [ schneefux ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ schneefux ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix
index a725a78f7278..d66f8da8057f 100644
--- a/pkgs/by-name/wa/watchdogd/package.nix
+++ b/pkgs/by-name/wa/watchdogd/package.nix
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) watchdogd; };
 
-  meta = with lib; {
+  meta = {
     description = "Advanced system & process supervisor for Linux";
     homepage = "https://troglobit.com/watchdogd.html";
     changelog = "https://github.com/troglobit/watchdogd/releases/tag/${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ vifino ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ vifino ];
   };
 }
diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix
index 3dbe41e1d949..18618982b0fe 100644
--- a/pkgs/by-name/wa/wavpack/package.nix
+++ b/pkgs/by-name/wa/wavpack/package.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Hybrid audio compression format";
     homepage = "https://www.wavpack.com/";
     changelog = "https://github.com/dbry/WavPack/releases/tag/${version}";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ codyopel ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ codyopel ];
   };
 }
diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix
index f19832b77740..62e82dba79af 100644
--- a/pkgs/by-name/wa/wayvnc/package.nix
+++ b/pkgs/by-name/wa/wayvnc/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "VNC server for wlroots based Wayland compositors";
     longDescription = ''
       This is a VNC server for wlroots based Wayland compositors. It attaches
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
     mainProgram = "wayvnc";
     inherit (src.meta) homepage;
     changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}";
-    license = licenses.isc;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

From 1c6586455c5c21ad97cee4f38611959ea40f21bb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 6 Jun 2025 14:35:15 -0400
Subject: [PATCH 1414/1497] treewide: Leverage new top-level `libc` in
 bootstrap, and simplify

Picking up where #414321 left off, we can now simplify some things by
using `pkgs.libc` or `targetPackages.libc` consistently.

Individual packages should probably continue using `stdenv.cc.libc`, for
now at least, since it is possible they are given a `stdenv.cc` with an
alternative libc, but for the treewide code, the top-level `libc`
package is preferable and easier to work with.

Co-authored-by: Tristan Ross <rosscomputerguy@protonmail.com>
---
 pkgs/servers/x11/xorg/overrides.nix        |   2 +-
 pkgs/stdenv/darwin/default.nix             |   8 +-
 pkgs/stdenv/linux/default.nix              |  44 +++++----
 pkgs/stdenv/linux/make-bootstrap-tools.nix |   9 +-
 pkgs/top-level/all-packages.nix            | 102 ++++++++++-----------
 pkgs/top-level/darwin-packages.nix         |   3 +-
 pkgs/top-level/unixtools.nix               |   5 +-
 7 files changed, 93 insertions(+), 80 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 6239be5aa87c..7fa515e857f1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -242,7 +242,7 @@ self: super:
         buildPackages.stdenv.cc
       ]
       ++ lib.optionals stdenv.hostPlatform.isStatic [
-        (xorg.buildPackages.stdenv.cc.libc.static or null)
+        (xorg.buildPackages.libc.static or null)
       ];
     preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index df95cb979fb3..d7f4145ed3b9 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -132,7 +132,7 @@ let
             bintools = prevStage.darwin.binutils;
 
             isClang = true;
-            libc = prevStage.darwin.libSystem;
+            inherit (prevStage) libc;
             inherit (prevStage.llvmPackages) libcxx;
 
             inherit lib;
@@ -582,7 +582,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
 
     assert allDeps isFromNixpkgs [
       (sdkPackagesNoCC prevStage)
-      { inherit (prevStage.darwin) binutils libSystem; }
+      {
+        inherit (prevStage.darwin) binutils libSystem;
+        inherit (prevStage) libc;
+      }
     ];
 
     stageFun prevStage {
@@ -1260,6 +1263,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool;
 
     assert isFromNixpkgs prevStage.darwin.libSystem;
+    assert isFromNixpkgs prevStage.libc;
     assert isFromNixpkgs prevStage.darwin.binutils-unwrapped;
 
     assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index d30cc08eac6a..2cccf5afb3bf 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -158,8 +158,6 @@ let
     isFromBootstrapFiles = true;
   };
 
-  getLibc = stage: stage.${localSystem.libc};
-
   # This function builds the various standard environments used during
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
@@ -207,7 +205,7 @@ let
               cc = prevStage.gcc-unwrapped;
               bintools = prevStage.binutils;
               isGNU = true;
-              libc = getLibc prevStage;
+              inherit (prevStage) libc;
               inherit lib;
               inherit (prevStage) coreutils gnugrep;
               stdenvNoCC = prevStage.ccWrapperStdenv;
@@ -221,7 +219,7 @@ let
                   postFixup =
                     (a.postFixup or "")
                     + ''
-                      echo "--sysroot=${lib.getDev (getLibc prevStage)}" >> $out/nix-support/cc-cflags
+                      echo "--sysroot=${lib.getDev prevStage.libc}" >> $out/nix-support/cc-cflags
                     '';
                 }
               );
@@ -293,9 +291,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           nativeTools = false;
           nativeLibc = false;
           expand-response-params = "";
-          libc = getLibc self;
           inherit lib;
-          inherit (self) stdenvNoCC coreutils gnugrep;
+          inherit (self)
+            stdenvNoCC
+            coreutils
+            gnugrep
+            libc
+            ;
           bintools = bootstrapTools;
           runtimeShell = "${bootstrapTools}/bin/bash";
         };
@@ -320,6 +322,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # previous stage0 stdenv:
     assert isFromBootstrapFiles prevStage.binutils.bintools;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isFromBootstrapFiles prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
@@ -339,7 +342,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           binutils
           ;
 
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
 
         # A threaded perl build needs glibc/libpthread_nonshared.a,
         # which is not included in bootstrapTools, so disable threading.
@@ -374,6 +377,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     prevStage:
     assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isFromBootstrapFiles prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
@@ -393,7 +397,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           perl
           patchelf
           ;
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
         gmp = super.gmp.override { cxx = false; };
         # This stage also rebuilds binutils which will of course be used only in the next stage.
         # We inherit this until stage3, in stage4 it will be rebuilt using the adjacent bash/runtimeShell pkg.
@@ -484,6 +488,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # previous stage1 stdenv:
     assert isBuiltByBootstrapFilesCompiler prevStage.binutils-unwrapped;
     assert isFromBootstrapFiles prevStage."${localSystem.libc}";
+    assert isFromBootstrapFiles prevStage.libc;
     assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
@@ -508,6 +513,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           doCheck = false;
         });
 
+        # Avoids infinite recursion, as this is in the build-time dependencies of libc.
+        libiconv = self.libcIconv prevStage.libc;
+
         # We need libidn2 and its dependency libunistring as glibc dependency.
         # To avoid the cycle, we build against bootstrap libc, nuke references,
         # and use the result as input for our final glibc.  We also pass this pair
@@ -538,7 +546,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
         binutils = prevStage.binutils.override {
           # Rewrap the binutils with the new glibc, so both the next
           # stage's wrappers use it.
-          libc = getLibc self;
+          inherit (self) libc;
 
           # Unfortunately, when building gcc in the next stage, its LTO plugin
           # would use the final libc but `ld` would use the bootstrap one,
@@ -557,8 +565,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               mkdir -p "$out"/bin
               cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/
               chmod +w "$out"/bin/ld.bfd
-              patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \
-                --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
+              patchelf --set-interpreter '${self.libc}'/lib/ld*.so.? \
+                --set-rpath "${self.libc}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
                 "$out"/bin/ld.bfd
             '';
           };
@@ -589,6 +597,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # previous stage2 stdenv:
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByBootstrapFilesCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
@@ -625,7 +634,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           gmp = super.gmp.override { cxx = false; };
         }
         // {
-          ${localSystem.libc} = getLibc prevStage;
+          ${localSystem.libc} = prevStage.${localSystem.libc};
           gcc-unwrapped =
             (super.gcc-unwrapped.override (
               commonGccOverrides
@@ -661,6 +670,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # previous stage3 stdenv:
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isFromBootstrapFiles prevStage.coreutils;
     assert isFromBootstrapFiles prevStage.gnugrep;
@@ -684,7 +694,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           libidn2
           libunistring
           ;
-        ${localSystem.libc} = getLibc prevStage;
+        ${localSystem.libc} = prevStage.${localSystem.libc};
         # Since this is the first fresh build of binutils since stage2, our own runtimeShell will be used.
         binutils = super.binutils.override {
           # Build expand-response-params with last stage like below
@@ -702,13 +712,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           inherit (prevStage) expand-response-params;
           cc = prevStage.gcc-unwrapped;
           bintools = self.binutils;
-          libc = getLibc self;
           inherit lib;
           inherit (self)
             stdenvNoCC
             coreutils
             gnugrep
             runtimeShell
+            libc
             ;
           fortify-headers = self.fortify-headers;
         };
@@ -736,6 +746,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # which applies here as well.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.coreutils;
     assert isBuiltByNixpkgsCompiler prevStage.gnugrep;
@@ -843,7 +854,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
             libunistring
           ]
           # More complicated cases
-          ++ (map (x: lib.getOutput x (getLibc prevStage)) [
+          ++ (map (x: lib.getOutput x (prevStage.libc)) [
             "out"
             "dev"
             "bin"
@@ -893,7 +904,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               libunistring
               ;
             inherit (prevStage.gnugrep) pcre2;
-            ${localSystem.libc} = getLibc prevStage;
+            ${localSystem.libc} = prevStage.${localSystem.libc};
 
             # Hack: avoid libidn2.{bin,dev} referencing bootstrap tools.  There's a logical cycle.
             libidn2 = import ../../development/libraries/libidn2/no-bootstrap-reference.nix {
@@ -925,6 +936,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     # which applies here as well.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.${localSystem.libc};
+    assert isBuiltByNixpkgsCompiler prevStage.libc;
     assert isBuiltByNixpkgsCompiler prevStage.gcc-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.coreutils;
     assert isBuiltByNixpkgsCompiler prevStage.gnugrep;
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 61c44f0bfecb..6a1507df734d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -3,9 +3,12 @@
 }:
 
 let
-  inherit (pkgs) lib stdenv config;
-
-  libc = pkgs.stdenv.cc.libc;
+  inherit (pkgs)
+    lib
+    stdenv
+    config
+    libc
+    ;
 
   patchelf = pkgs.patchelf.overrideAttrs (previousAttrs: {
     NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or [ ]) ++ [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ca515181f1..bb6af4c209f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6181,7 +6181,7 @@ with pkgs;
   wrapBintoolsWith =
     {
       bintools,
-      libc ? if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else stdenv.cc.libc,
+      libc ? targetPackages.libc or pkgs.libc,
       ...
     }@extraArgs:
     callPackage ../build-support/bintools-wrapper (
@@ -8198,57 +8198,53 @@ with pkgs;
 
   # We can choose:
   libc =
-    if stdenv.hostPlatform == stdenv.buildPlatform then
-      # TODO get rid of this branch after the native boostrap is reworked
-      stdenv.cc.libc
+    let
+      inherit (stdenv.hostPlatform) libc;
+      # libc is hackily often used from the previous stage. This `or`
+      # hack fixes the hack, *sigh*.
+    in
+    if libc == null then
+      null
+    else if libc == "glibc" then
+      glibc
+    else if libc == "bionic" then
+      bionic
+    else if libc == "uclibc" then
+      uclibc
+    else if libc == "avrlibc" then
+      avrlibc
+    else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then
+      msp430Newlib
+    else if libc == "newlib" && stdenv.hostPlatform.isVc4 then
+      vc4-newlib
+    else if libc == "newlib" && stdenv.hostPlatform.isOr1k then
+      or1k-newlib
+    else if libc == "newlib" then
+      newlib
+    else if libc == "newlib-nano" then
+      newlib-nano
+    else if libc == "musl" then
+      musl
+    else if libc == "msvcrt" then
+      windows.mingw_w64
+    else if libc == "ucrt" then
+      windows.mingw_w64
+    else if libc == "libSystem" then
+      if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem
+    else if libc == "fblibc" then
+      freebsd.libc
+    else if libc == "oblibc" then
+      openbsd.libc
+    else if libc == "nblibc" then
+      netbsd.libc
+    else if libc == "wasilibc" then
+      wasilibc
+    else if libc == "relibc" then
+      relibc
+    else if name == "llvm" then
+      llvmPackages_20.libc
     else
-      let
-        inherit (stdenv.hostPlatform) libc;
-        # libc is hackily often used from the previous stage. This `or`
-        # hack fixes the hack, *sigh*.
-      in
-      if libc == null then
-        null
-      else if libc == "glibc" then
-        glibc
-      else if libc == "bionic" then
-        bionic
-      else if libc == "uclibc" then
-        uclibc
-      else if libc == "avrlibc" then
-        avrlibc
-      else if libc == "newlib" && stdenv.hostPlatform.isMsp430 then
-        msp430Newlib
-      else if libc == "newlib" && stdenv.hostPlatform.isVc4 then
-        vc4-newlib
-      else if libc == "newlib" && stdenv.hostPlatform.isOr1k then
-        or1k-newlib
-      else if libc == "newlib" then
-        newlib
-      else if libc == "newlib-nano" then
-        newlib-nano
-      else if libc == "musl" then
-        musl
-      else if libc == "msvcrt" then
-        windows.mingw_w64
-      else if libc == "ucrt" then
-        windows.mingw_w64
-      else if libc == "libSystem" then
-        if stdenv.hostPlatform.useiOSPrebuilt then darwin.iosSdkPkgs.libraries else darwin.libSystem
-      else if libc == "fblibc" then
-        freebsd.libc
-      else if libc == "oblibc" then
-        openbsd.libc
-      else if libc == "nblibc" then
-        netbsd.libc
-      else if libc == "wasilibc" then
-        wasilibc
-      else if libc == "relibc" then
-        relibc
-      else if name == "llvm" then
-        llvmPackages_20.libc
-      else
-        throw "Unknown libc ${libc}";
+      throw "Unknown libc ${libc}";
 
   threads =
     lib.optionalAttrs (stdenv.hostPlatform.isMinGW && !(stdenv.hostPlatform.useLLVM or false))
@@ -8772,7 +8768,7 @@ with pkgs;
         "fblibc"
       ]
     then
-      libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libc else stdenv.cc.libc)
+      libcIconv pkgs.libc
     else if stdenv.hostPlatform.isDarwin then
       darwin.libiconv
     else
@@ -8798,7 +8794,7 @@ with pkgs;
         "musl"
       ]
     then
-      lib.getBin stdenv.cc.libc
+      lib.getBin libc
     else if stdenv.hostPlatform.isDarwin then
       lib.getBin libiconv
     else if stdenv.hostPlatform.isFreeBSD then
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a24d981de2e4..b378ae9b068e 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -56,8 +56,7 @@ makeScopeWithSplicing' {
       };
 
       binutils = pkgs.wrapBintoolsWith {
-        libc =
-          if stdenv.targetPlatform != stdenv.hostPlatform then targetPackages.libc else pkgs.stdenv.cc.libc;
+        inherit (targetPackages) libc;
         bintools = self.binutils-unwrapped;
       };
 
diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index 2c983fe8a5ac..d2d678467c5f 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -95,7 +95,7 @@ let
       linux = pkgs.util-linux;
     };
     getconf = {
-      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getconf;
+      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
       # I don't see any obvious arg exec in the doc/manpage
       binlore = ''
@@ -103,8 +103,7 @@ let
       '';
     };
     getent = {
-      linux =
-        if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent;
+      linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.libc.getent else pkgs.netbsd.getent;
       darwin = pkgs.netbsd.getent;
       freebsd = pkgs.freebsd.getent;
       openbsd = pkgs.openbsd.getent;

From 20058c63c0a9c5021a3355b0c8a5e0e203728fa7 Mon Sep 17 00:00:00 2001
From: Alexander Reynolds <alex@theory.shop>
Date: Fri, 6 Jun 2025 16:07:02 -0400
Subject: [PATCH 1415/1497] python312Packages.nominal: init at 1.59.0

---
 .../python-modules/nominal/default.nix        | 75 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/nominal/default.nix

diff --git a/pkgs/development/python-modules/nominal/default.nix b/pkgs/development/python-modules/nominal/default.nix
new file mode 100644
index 000000000000..72bed6396d8f
--- /dev/null
+++ b/pkgs/development/python-modules/nominal/default.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  requests,
+  nominal-api,
+  nominal-api-protos,
+  python-dateutil,
+  conjure-python-client,
+  pandas,
+  typing-extensions,
+  click,
+  pyyaml,
+  tabulate,
+  ffmpeg-python,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "nominal";
+  version = "1.59.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nominal-io";
+    repo = "nominal-client";
+    tag = "v${version}";
+    hash = "sha256-wWy7i9lWZzDCx3cPyViLp7r7hSSDQbqdSUABX7L0LSE=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    requests
+    conjure-python-client
+    nominal-api
+    python-dateutil
+    pandas
+    typing-extensions
+    click
+    pyyaml
+    tabulate
+    ffmpeg-python
+  ];
+
+  optional-dependencies = {
+    protos = [ nominal-api-protos ];
+    # tdms = [ nptdms ]; nptdms is not in nixpkgs
+  };
+
+  nativeCheckInputs = [
+    nominal-api-protos
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "nominal"
+    "nominal.core"
+  ];
+
+  disabledTestPaths = [
+    "tests/cli/test_auth.py::test_good_request"
+  ];
+
+  meta = {
+    description = "Automate Nominal workflows in Python";
+    homepage = "https://github.com/nominal-io/nominal-client";
+    changelog = "https://github.com/nominal-io/nominal-client/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ alkasm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b7934b26cc2..5a06873b04f0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10183,6 +10183,8 @@ self: super: with self; {
 
   nomadnet = callPackage ../development/python-modules/nomadnet { };
 
+  nominal = callPackage ../development/python-modules/nominal { };
+
   nominal-api = callPackage ../development/python-modules/nominal-api { };
 
   nominal-api-protos = callPackage ../development/python-modules/nominal-api-protos { };

From 1da7506394c1087504dda1d338c2523410188691 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 4 Jun 2025 08:50:28 +0900
Subject: [PATCH 1416/1497] ocamlPackages.ffmpeg: 1.2.1 -> 1.2.5 Diff:
 https://github.com/savonet/ocaml-ffmpeg/compare/v1.2.1...v1.2.5 Changelog:
 https://github.com/savonet/ocaml-ffmpeg/releases/tag/v1.2.5

---
 pkgs/development/ocaml-modules/ffmpeg/base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index f44069429bd4..fa23d08c9d17 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 
 rec {
-  version = "1.2.1";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ffmpeg";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg=";
+    sha256 = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
   };
 
   meta = with lib; {

From 9019cc426ef42d9a3013ab8b6031bfbeaaaa5148 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 4 Jun 2025 08:53:44 +0900
Subject: [PATCH 1417/1497] ocamlPackages.ffmpeg: modernized derivation -
 Remove `with lib;` - Changed rev to tag, and sha256 to hash - Added
 meta.changelog

Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
---
 pkgs/development/ocaml-modules/ffmpeg/base.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index fa23d08c9d17..516725238eee 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -6,14 +6,17 @@ rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ffmpeg";
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
+    tag = "v${version}";
+    hash = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/savonet/ocaml-ffmpeg";
     description = "Bindings for the ffmpeg libraries";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ dandellion ];
+    changelog = "https://raw.githubusercontent.com/savonet/ocaml-ffmpeg/refs/tags/${src.tag}/CHANGES";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
+      dandellion
+    ];
   };
 }

From 86394421cd328db8782ef50db3210f40aa28e217 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 4 Jun 2025 08:54:18 +0900
Subject: [PATCH 1418/1497] ocamlPackages.ffmpeg: add @momeemt to maintainers

---
 pkgs/development/ocaml-modules/ffmpeg/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index 516725238eee..b810f46bc7ba 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -17,6 +17,7 @@ rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [
       dandellion
+      momeemt
     ];
   };
 }

From 8e2aa7dae048ec6ffc5ae2bafdc6c6ff93cd1457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 5 Jun 2025 09:41:24 -0700
Subject: [PATCH 1419/1497] rustic: simplify shell completion installation

---
 pkgs/by-name/ru/rustic/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix
index ea400d9b6ce3..d36140e462e0 100644
--- a/pkgs/by-name/ru/rustic/package.nix
+++ b/pkgs/by-name/ru/rustic/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
@@ -17,17 +18,15 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ=";
   };
 
-  useFetchCargoVendor = true;
   cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall = ''
-    for shell in {ba,fi,z}sh; do
-      $out/bin/rustic completions $shell > rustic.$shell
-    done
-
-    installShellCompletion rustic.{ba,fi,z}sh
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd rustic \
+      --bash <($out/bin/rustic completions bash) \
+      --fish <($out/bin/rustic completions fish) \
+      --zsh <($out/bin/rustic completions zsh)
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     homepage = "https://github.com/rustic-rs/rustic";
     changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/CHANGELOG.md";
-    description = "fast, encrypted, deduplicated backups powered by pure Rust";
+    description = "Fast, encrypted, deduplicated backups powered by pure Rust";
     mainProgram = "rustic";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = [

From ac3378365628e229737c15ec03f84fc72a1037a7 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Fri, 6 Jun 2025 21:44:16 +0200
Subject: [PATCH 1420/1497] graphhopper: fix and enable strictDeps

---
 pkgs/by-name/gr/graphhopper/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/graphhopper/package.nix b/pkgs/by-name/gr/graphhopper/package.nix
index 95d3e7e3b4ff..b4dd2b989b11 100644
--- a/pkgs/by-name/gr/graphhopper/package.nix
+++ b/pkgs/by-name/gr/graphhopper/package.nix
@@ -68,11 +68,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   version = version.patch;
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
     maven
   ];
 
+  strictDeps = true;
+
   configurePhase = ''
     runHook preConfigure
 

From 871b5f6e4173711ce7666e51e0f82738ef111825 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Jun 2025 23:22:41 +0200
Subject: [PATCH 1421/1497] air-formatter: 0.6.0 -> 0.7.0

Diff: https://github.com/posit-dev/air/compare/refs/tags/0.6.0...refs/tags/0.7.0

Changelog: https://github.com/posit-dev/air/blob/0.7.0/CHANGELOG.md
---
 pkgs/by-name/ai/air-formatter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 82a0f0cb5f57..37c140ed3134 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -7,20 +7,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "air";
     tag = finalAttrs.version;
-    hash = "sha256-32/wdz4CFYM/PFVSQiqYErXGHHn2KJyreiQq48vQryY=";
+    hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE=";
   };
 
   # Remove duplicate entries from cargo lock
   cargoPatches = [ ./cargo-lock.patch ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zPT47K8OGtprxQt3ZOF2xmf6IRV5rsKWXeaXlyBdVlE=";
+  cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";
 
   useNextest = true;
 

From 03246eeb803ee7c92369b0a7aaabefd9a352742c Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 4 Jun 2025 09:48:04 +0200
Subject: [PATCH 1422/1497] meraki-cli: modernize, fix cross build

---
 pkgs/tools/admin/meraki-cli/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/meraki-cli/default.nix b/pkgs/tools/admin/meraki-cli/default.nix
index 30d8dc648c8c..d164234b8eed 100644
--- a/pkgs/tools/admin/meraki-cli/default.nix
+++ b/pkgs/tools/admin/meraki-cli/default.nix
@@ -8,12 +8,13 @@
   buildPythonApplication,
   pytestCheckHook,
   requests-mock,
+  setuptools,
 }:
 
 buildPythonApplication rec {
   pname = "meraki-cli";
   version = "1.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "meraki_cli";
@@ -29,18 +30,19 @@ buildPythonApplication rec {
     "TestUpgrade"
   ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     argcomplete
     jinja2
     meraki
     rich
   ];
 
-  nativeBuildInputs = [
-    pytestCheckHook
-  ];
-
   nativeCheckInputs = [
+    pytestCheckHook
     requests-mock
   ];
 

From 34dc22cf30aa974ba266ddc79d0dbc459d825cce Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 6 Jun 2025 23:28:41 +0200
Subject: [PATCH 1423/1497] jimtcl: build against SDL2

Upstream commit: https://github.com/msteveb/jimtcl/commit/3b834e42ee5887f85d10d7e50814b29d1b81a09f

jimtcl will automatically detect the sdl major version,
and adjust its header includes accordingly.
SDL1 is basically EOL, so SDL2 is preferrable when available.
---
 pkgs/by-name/ji/jimtcl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 13181a2c0e5c..a334bca91c8c 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -10,8 +10,8 @@
 
   sqlite,
   readline,
-  SDL,
-  SDL_gfx,
+  SDL2,
+  SDL2_gfx,
   openssl,
 
   SDLSupport ? true,
@@ -41,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
       openssl
     ]
     ++ (lib.optionals SDLSupport [
-      SDL
-      SDL_gfx
+      SDL2
+      SDL2_gfx
     ]);
 
   configureFlags = [

From 8eb2c07e2a9f1ae99e150eb73f378433b35b5115 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 7 Jun 2025 05:47:19 +0800
Subject: [PATCH 1424/1497] xurls: 2.5.0-unstable-2024-11-03 -> 2.6.0

Diff: https://github.com/mvdan/xurls/compare/7c973a26c7bd6ecd8d86bb435d93ff98df2710fa...v2.6.0
---
 pkgs/by-name/xu/xurls/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/xu/xurls/package.nix b/pkgs/by-name/xu/xurls/package.nix
index b507226e60d6..3b9dc3f1f9c2 100644
--- a/pkgs/by-name/xu/xurls/package.nix
+++ b/pkgs/by-name/xu/xurls/package.nix
@@ -1,31 +1,32 @@
 {
-  buildGoModule,
   lib,
+  buildGoModule,
   fetchFromGitHub,
 }:
 
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "xurls";
-  version = "2.5.0-unstable-2024-11-03";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
-    rev = "7c973a26c7bd6ecd8d86bb435d93ff98df2710fa";
-    sha256 = "sha256-jZmlM9rs+N0ks7msmb3eJ96aTYp0qUo/1bgLAgHnvSo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cfiMrJuzm5wpVKSyhta4ovARbp5B6K30l3+I/KOsZM4=";
   };
 
-  vendorHash = "sha256-W6Z1E6a+qBdOuyHoiT6YA+CAJHBJ0FTYH8AntiKvVBY=";
+  vendorHash = "sha256-Bks47kusGgVsbNiLq3QxP/dhIp72HGYeMhdifFwY340=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Extract urls from text";
     homepage = "https://github.com/mvdan/xurls";
-    maintainers = with maintainers; [ koral ];
-    license = licenses.bsd3;
+    mainProgram = "xurls";
+    maintainers = with lib.maintainers; [ koral ];
+    license = lib.licenses.bsd3;
   };
-}
+})

From 43a09535285e06093d758e4da01c176660c70c79 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 6 Jun 2025 22:06:58 +0000
Subject: [PATCH 1425/1497] olivetin: 2025.6.1 -> 2025.6.6

---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index e39081ae01fa..099f91830fc5 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -81,13 +81,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.6.1";
+    version = "2025.6.6";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-Bd+zxVEhP7LZk74Mfai/MkML1pKlPBKm4kh4jAkC/kQ=";
+      hash = "sha256-yzAuhrkJEBErf9yYuRoq5B7PT0XA0w668AG5LNSSRFM=";
     };
 
     modRoot = "service";

From d8021655aaa12fd0f86ce98dec939837a0414bf1 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Sat, 7 Jun 2025 10:18:40 +1200
Subject: [PATCH 1426/1497] chawan: orphan

---
 pkgs/by-name/ch/chawan/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index 612e33636346..46cfb239cd66 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
     homepage = "https://sr.ht/~bptato/chawan/";
     license = lib.licenses.publicDomain;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ jtbx ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "cha";
   };
 }

From 9d0f4b82ff2c0472dc6929fc40cddc5a54c1e0b2 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Sat, 7 Jun 2025 10:18:46 +1200
Subject: [PATCH 1427/1497] soju: remove jtbx from meta.maintainers

---
 pkgs/by-name/so/soju/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix
index 8f8bc8458959..1b5af7fb121d 100644
--- a/pkgs/by-name/so/soju/package.nix
+++ b/pkgs/by-name/so/soju/package.nix
@@ -60,7 +60,6 @@ buildGoModule rec {
     maintainers = with maintainers; [
       azahi
       malte-v
-      jtbx
     ];
     mainProgram = "sojuctl";
   };

From 668252d1de48e989c79394ea20d44a3613165ab7 Mon Sep 17 00:00:00 2001
From: seridescent <seridescent@gmail.com>
Date: Fri, 6 Jun 2025 18:27:04 -0400
Subject: [PATCH 1428/1497] claude-code: 1.0.11 -> 1.0.17

---
 pkgs/by-name/cl/claude-code/package-lock.json | 9 +++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index bb7e691f0784..fe46c0b39863 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,17 +1,18 @@
 {
   "name": "claude-code",
+  "version": "1.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.11"
+        "@anthropic-ai/claude-code": "^1.0.17"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.11.tgz",
-      "integrity": "sha512-ezYfkSxCiQjReJoBJkayTpzhWRWKmfEy6Ria2TdufBmDR7Kj/iP4IY10M5JOTgB8pw7XfjYpijgnomiFZmVRbg==",
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.17.tgz",
+      "integrity": "sha512-+MX/pKOKXG2HLSh7WJIgiILdumqRgcORUX0iSQmAfn+UEoHSYSuFWZWuWBpixaa8W4tiTCC06uN4pgzinCU6jw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index f72ea6dc5994..dcf7ccb88b46 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.11";
+  version = "1.0.17";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-IXNBNjt4Sh5pR+Cz2uEZcCop9reAmQ7hObohtN0f3Ww=";
+    hash = "sha256-RxbsAehJ4zIt86ppmMB1MPg/XFrGWuumNdQbT+ytg8A=";
   };
 
-  npmDepsHash = "sha256-p5FQBBlMNcRBYKIkeeETyup5zKr2Rcxu/Jw+kFwQrHA=";
+  npmDepsHash = "sha256-tC0OyJ3t4i/CdqKUGIw5Wd9UiLYJECcbDi/suxim0/A=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c6729488de632cc9f8af5aa82edd7097ea506c36 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sat, 7 Jun 2025 00:48:50 +0200
Subject: [PATCH 1429/1497] treewide: remove with lib Part 4

---
 pkgs/by-name/_0/_0xpropo/package.nix                   |  8 ++++----
 pkgs/by-name/_3/_3270font/package.nix                  | 10 +++++-----
 pkgs/by-name/_6/_6tunnel/package.nix                   |  8 ++++----
 pkgs/by-name/a5/a52dec/package.nix                     |  8 ++++----
 pkgs/by-name/ae/aeacus/package.nix                     |  8 ++++----
 pkgs/by-name/ag/agebox/package.nix                     |  6 +++---
 pkgs/by-name/ag/agi/package.nix                        |  8 ++++----
 pkgs/by-name/ah/aha/package.nix                        |  8 ++++----
 pkgs/by-name/an/ansible-doctor/package.nix             |  6 +++---
 pkgs/by-name/an/ansible-language-server/package.nix    |  6 +++---
 pkgs/by-name/at/atasm/package.nix                      |  8 ++++----
 pkgs/by-name/at/atftp/package.nix                      |  8 ++++----
 pkgs/by-name/at/athens/package.nix                     | 10 +++++-----
 pkgs/by-name/at/atomic-swap/package.nix                |  6 +++---
 pkgs/by-name/au/audiness/package.nix                   |  6 +++---
 pkgs/by-name/au/audion/package.nix                     |  6 +++---
 pkgs/by-name/au/audiowaveform/package.nix              |  8 ++++----
 pkgs/by-name/au/augeas/package.nix                     |  8 ++++----
 pkgs/by-name/au/auth0-cli/package.nix                  |  6 +++---
 pkgs/by-name/au/authentik/package.nix                  |  8 ++++----
 pkgs/by-name/au/autobloody/package.nix                 |  6 +++---
 pkgs/by-name/au/autocorrect/package.nix                |  6 +++---
 pkgs/by-name/au/automatic-timezoned/package.nix        |  8 ++++----
 pkgs/by-name/ay/ayatana-ido/package.nix                | 10 +++++-----
 pkgs/by-name/az/azure-storage-azcopy/package.nix       |  6 +++---
 pkgs/by-name/bc/bcg729/package.nix                     |  8 ++++----
 pkgs/by-name/bp/bpfmon/package.nix                     |  8 ++++----
 pkgs/by-name/bp/bpftrace/package.nix                   |  8 ++++----
 pkgs/by-name/bt/btcd/package.nix                       |  6 +++---
 pkgs/by-name/bt/btcpayserver/package.nix               |  8 ++++----
 pkgs/by-name/bt/btop/package.nix                       |  8 ++++----
 pkgs/by-name/bt/btrfs-progs/package.nix                |  8 ++++----
 pkgs/by-name/bu/buck2/package.nix                      |  6 +++---
 pkgs/by-name/bu/bun/package.nix                        |  8 ++++----
 pkgs/by-name/cj/cjose/package.nix                      |  8 ++++----
 pkgs/by-name/cq/cq/package.nix                         |  8 ++++----
 pkgs/by-name/cs/csvq/package.nix                       |  6 +++---
 pkgs/by-name/cu/cups-printers/package.nix              |  6 +++---
 pkgs/by-name/cv/cvemap/package.nix                     |  6 +++---
 pkgs/by-name/cw/cwltool/package.nix                    |  6 +++---
 pkgs/by-name/cz/cz-cli/package.nix                     |  6 +++---
 pkgs/by-name/d2/d2/package.nix                         |  6 +++---
 pkgs/by-name/dc/dconf-editor/package.nix               |  8 ++++----
 pkgs/by-name/dd/ddcutil/package.nix                    |  8 ++++----
 pkgs/by-name/dg/dgoss/package.nix                      |  8 ++++----
 pkgs/by-name/dh/dhcpdump/package.nix                   |  8 ++++----
 pkgs/by-name/dn/dnscontrol/package.nix                 |  6 +++---
 pkgs/by-name/dn/dnsmonster/package.nix                 |  6 +++---
 pkgs/by-name/dn/dnsperf/package.nix                    |  8 ++++----
 pkgs/by-name/dn/dnsrecon/package.nix                   |  6 +++---
 pkgs/by-name/dn/dnstwist/package.nix                   |  6 +++---
 pkgs/by-name/dn/dnsx/package.nix                       |  6 +++---
 pkgs/by-name/dr/drawing/package.nix                    |  8 ++++----
 pkgs/by-name/dr/driftctl/package.nix                   |  6 +++---
 pkgs/by-name/dr/driftnet/package.nix                   |  8 ++++----
 pkgs/by-name/dr/dropbear/package.nix                   |  8 ++++----
 pkgs/by-name/du/dum/package.nix                        |  6 +++---
 pkgs/by-name/du/dump_syms/package.nix                  |  6 +++---
 pkgs/by-name/e1/e1s/package.nix                        |  6 +++---
 pkgs/by-name/e2/e2fsprogs/package.nix                  |  8 ++++----
 pkgs/by-name/ea/earlybird/package.nix                  |  6 +++---
 pkgs/by-name/ea/earthly/package.nix                    |  6 +++---
 pkgs/by-name/ea/easyeasm/package.nix                   |  6 +++---
 pkgs/by-name/ed/eduvpn-client/package.nix              |  8 ++++----
 pkgs/by-name/em/emmet-ls/package.nix                   |  6 +++---
 pkgs/by-name/eo/eog/package.nix                        |  8 ++++----
 pkgs/by-name/ep/epick/package.nix                      |  6 +++---
 pkgs/by-name/er/er-patcher/package.nix                 |  4 ++--
 pkgs/by-name/er/erofs-utils/package.nix                | 10 +++++-----
 pkgs/by-name/er/erosmb/package.nix                     |  6 +++---
 pkgs/by-name/et/etebase-server/package.nix             |  6 +++---
 pkgs/by-name/et/eternal-terminal/package.nix           |  8 ++++----
 pkgs/by-name/ev/evil-winrm/package.nix                 |  4 ++--
 pkgs/by-name/ev/evolution-data-server/package.nix      |  8 ++++----
 pkgs/by-name/ev/evtx/package.nix                       |  6 +++---
 pkgs/by-name/ex/exegol/package.nix                     |  2 +-
 pkgs/by-name/ex/exiflooter/package.nix                 |  6 +++---
 pkgs/by-name/ex/exim/package.nix                       | 10 +++++-----
 pkgs/by-name/ex/extra-container/package.nix            |  8 ++++----
 pkgs/by-name/f3/f3d/package.nix                        |  8 ++++----
 pkgs/by-name/fd/fd/package.nix                         |  6 +++---
 pkgs/by-name/ff/ffuf/package.nix                       |  6 +++---
 pkgs/by-name/fn/fnlfmt/package.nix                     |  6 +++---
 pkgs/by-name/fp/fping/package.nix                      |  8 ++++----
 pkgs/by-name/fs/fscrypt-experimental/package.nix       |  8 ++++----
 pkgs/by-name/fs/fsmon/package.nix                      |  8 ++++----
 pkgs/by-name/fs/fstar/package.nix                      |  8 ++++----
 pkgs/by-name/fu/fujprog/package.nix                    |  8 ++++----
 pkgs/by-name/fu/fulcio/package.nix                     |  6 +++---
 pkgs/by-name/gd/gdu/package.nix                        |  6 +++---
 pkgs/by-name/gf/gfxreconstruct/package.nix             |  8 ++++----
 pkgs/by-name/gg/gg-scm/package.nix                     |  4 ++--
 pkgs/by-name/gn/gnome-backgrounds/package.nix          |  8 ++++----
 pkgs/by-name/gn/gnome-keyring/package.nix              | 10 +++++-----
 pkgs/by-name/gn/gnome-klotski/package.nix              |  8 ++++----
 pkgs/by-name/gn/gnome-remote-desktop/package.nix       |  8 ++++----
 pkgs/by-name/gn/gnome-sound-recorder/package.nix       |  8 ++++----
 pkgs/by-name/gn/gnome-sudoku/package.nix               |  8 ++++----
 pkgs/by-name/gn/gnostic/package.nix                    |  6 +++---
 pkgs/by-name/gn/gnuastro/package.nix                   |  8 ++++----
 pkgs/by-name/gn/gnucap/modelgen-verilog.nix            | 10 +++++-----
 pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix           |  8 ++++----
 pkgs/by-name/gp/gpa/package.nix                        |  6 +++---
 pkgs/by-name/gp/gpsd/package.nix                       |  8 ++++----
 pkgs/by-name/gp/gptscript/package.nix                  |  6 +++---
 pkgs/by-name/gt/gtfocli/package.nix                    |  6 +++---
 pkgs/by-name/gt/gtrash/package.nix                     |  6 +++---
 pkgs/by-name/gv/gvm-libs/package.nix                   |  8 ++++----
 pkgs/by-name/gw/gwc/package.nix                        |  8 ++++----
 pkgs/by-name/h8/h8mail/package.nix                     |  6 +++---
 pkgs/by-name/hc/hck/package.nix                        |  6 +++---
 pkgs/by-name/hc/hcloud/package.nix                     |  6 +++---
 pkgs/by-name/hd/hdrop/package.nix                      |  8 ++++----
 pkgs/by-name/hf/hfinger/package.nix                    |  6 +++---
 pkgs/by-name/hj/hjson-go/package.nix                   |  6 +++---
 pkgs/by-name/hm/hmm/package.nix                        |  6 +++---
 pkgs/by-name/hs/hstsparser/package.nix                 |  6 +++---
 pkgs/by-name/ht/html5validator/package.nix             |  6 +++---
 pkgs/by-name/ht/htmldoc/package.nix                    |  8 ++++----
 pkgs/by-name/ht/htop/package.nix                       |  8 ++++----
 pkgs/by-name/ht/httm/package.nix                       |  6 +++---
 pkgs/by-name/ht/httplz/package.nix                     |  6 +++---
 pkgs/by-name/ht/httpx/package.nix                      |  6 +++---
 pkgs/by-name/hu/hurl/package.nix                       |  6 +++---
 pkgs/by-name/hu/husky/package.nix                      |  6 +++---
 .../ia/iam-policy-json-to-terraform/package.nix        |  6 +++---
 pkgs/by-name/ib/ibm-plex/package.nix                   |  8 ++++----
 pkgs/by-name/ig/igmpproxy/package.nix                  |  8 ++++----
 pkgs/by-name/ig/ignite-cli/package.nix                 |  6 +++---
 pkgs/by-name/ig/igrep/package.nix                      |  6 +++---
 pkgs/by-name/ip/ipam/package.nix                       |  6 +++---
 pkgs/by-name/ip/ipinfo/package.nix                     |  6 +++---
 pkgs/by-name/ip/ipscan/package.nix                     |  8 ++++----
 pkgs/by-name/ip/iptsd/package.nix                      |  8 ++++----
 pkgs/by-name/iw/iwgtk/package.nix                      |  8 ++++----
 pkgs/by-name/je/jetbrains-mono/package.nix             |  8 ++++----
 pkgs/by-name/jf/jfmt/package.nix                       |  6 +++---
 pkgs/by-name/jf/jfrog-cli/package.nix                  |  6 +++---
 pkgs/by-name/jj/jj/package.nix                         |  8 ++++----
 pkgs/by-name/jo/jobber/package.nix                     |  6 +++---
 pkgs/by-name/jo/joincap/package.nix                    |  6 +++---
 pkgs/by-name/jr/jrnl/package.nix                       |  6 +++---
 pkgs/by-name/js/jsonnet-language-server/package.nix    |  6 +++---
 pkgs/by-name/jw/jwt-hack/package.nix                   |  6 +++---
 pkgs/by-name/jx/jx/package.nix                         |  8 ++++----
 pkgs/by-name/k0/k0sctl/package.nix                     |  6 +++---
 pkgs/by-name/k3/k3d/package.nix                        |  8 ++++----
 pkgs/by-name/k6/k6/package.nix                         |  6 +++---
 pkgs/by-name/k8/k8s-manifest-sigstore/package.nix      |  6 +++---
 pkgs/by-name/k9/k9s/package.nix                        |  6 +++---
 pkgs/by-name/kb/kb/package.nix                         |  6 +++---
 pkgs/by-name/kb/kbs2/package.nix                       |  6 +++---
 pkgs/by-name/kh/khoj/package.nix                       |  6 +++---
 pkgs/by-name/kl/klipper-estimator/package.nix          |  6 +++---
 pkgs/by-name/kn/knit/package.nix                       |  6 +++---
 pkgs/by-name/kn/knockpy/package.nix                    |  6 +++---
 pkgs/by-name/kn/knot-dns/package.nix                   |  8 ++++----
 pkgs/by-name/kr/krabby/package.nix                     |  6 +++---
 pkgs/by-name/kr/krbjack/package.nix                    |  6 +++---
 pkgs/by-name/kr/krelay/package.nix                     |  6 +++---
 pkgs/by-name/kr/krill/package.nix                      |  6 +++---
 pkgs/by-name/ky/kyverno/package.nix                    |  6 +++---
 pkgs/by-name/ld/ldapmonitor/package.nix                |  6 +++---
 pkgs/by-name/ld/ldapnomnom/package.nix                 |  6 +++---
 pkgs/by-name/ld/ldmud/package.nix                      |  8 ++++----
 pkgs/by-name/ld/ldproxy/package.nix                    |  6 +++---
 pkgs/by-name/lf/lf/package.nix                         |  6 +++---
 pkgs/by-name/lm/lmdb/package.nix                       |  8 ++++----
 pkgs/by-name/ls/lscolors/package.nix                   |  6 +++---
 pkgs/by-name/ls/lse/package.nix                        |  8 ++++----
 pkgs/by-name/ls/lsh/package.nix                        |  4 ++--
 pkgs/by-name/lt/lttoolbox/package.nix                  |  8 ++++----
 pkgs/by-name/lx/lx-music-desktop/package.nix           |  8 ++++----
 pkgs/by-name/lx/lxd-unwrapped-lts/package.nix          |  8 ++++----
 pkgs/by-name/mb/mbtileserver/package.nix               |  6 +++---
 pkgs/by-name/mb/mbusd/package.nix                      |  8 ++++----
 pkgs/by-name/md/mdbook-emojicodes/package.nix          |  6 +++---
 pkgs/by-name/md/mdbook-i18n-helpers/package.nix        |  6 +++---
 pkgs/by-name/mm/mmseqs2/package.nix                    | 10 +++++-----
 pkgs/by-name/mm/mmtc/package.nix                       |  6 +++---
 pkgs/by-name/mq/mqtt-benchmark/package.nix             |  6 +++---
 pkgs/by-name/mq/mqtt-explorer/package.nix              |  6 +++---
 pkgs/by-name/mq/mqttx/package.nix                      |  8 ++++----
 pkgs/by-name/mu/mu/package.nix                         |  8 ++++----
 pkgs/by-name/mu/mubeng/package.nix                     |  6 +++---
 pkgs/by-name/mu/muffet/package.nix                     |  6 +++---
 pkgs/by-name/mu/mupdf/package.nix                      |  8 ++++----
 pkgs/by-name/mu/music-assistant/frontend.nix           |  6 +++---
 pkgs/by-name/mu/music-assistant/package.nix            |  6 +++---
 pkgs/by-name/mu/musl/package.nix                       |  6 +++---
 pkgs/by-name/mu/mutagen-compose/package.nix            |  6 +++---
 pkgs/by-name/mu/mutagen/package.nix                    |  8 ++++----
 pkgs/by-name/mu/mutmut/package.nix                     |  6 +++---
 pkgs/by-name/nb/nbtscanner/package.nix                 |  6 +++---
 pkgs/by-name/ng/nghttp2/package.nix                    |  8 ++++----
 pkgs/by-name/nk/nkeys/package.nix                      |  6 +++---
 pkgs/by-name/nm/nmap-formatter/package.nix             |  6 +++---
 pkgs/by-name/np/np/package.nix                         |  6 +++---
 pkgs/by-name/np/npm-check/package.nix                  |  6 +++---
 pkgs/by-name/nr/nray/package.nix                       |  8 ++++----
 pkgs/by-name/nt/ntlmrecon/package.nix                  |  6 +++---
 pkgs/by-name/nv/nvdtools/package.nix                   |  6 +++---
 pkgs/by-name/ob/obs-cli/package.nix                    |  8 ++++----
 pkgs/by-name/od/odo/package.nix                        |  6 +++---
 pkgs/by-name/oh/oha/package.nix                        |  6 +++---
 pkgs/by-name/ol/olaris-server/package.nix              |  6 +++---
 pkgs/by-name/os/osinfo-db/package.nix                  |  8 ++++----
 pkgs/by-name/os/ossutil/package.nix                    |  6 +++---
 pkgs/by-name/os/osv-detector/package.nix               |  6 +++---
 pkgs/by-name/os/osv-scanner/package.nix                |  6 +++---
 pkgs/by-name/ot/otel-cli/package.nix                   |  4 ++--
 pkgs/by-name/ot/otel-desktop-viewer/package.nix        |  6 +++---
 pkgs/by-name/ot/otpclient/package.nix                  |  8 ++++----
 pkgs/by-name/ot/ots/package.nix                        |  6 +++---
 pkgs/by-name/ov/ov/package.nix                         |  6 +++---
 pkgs/by-name/ov/overskride/package.nix                 |  8 ++++----
 pkgs/by-name/ov/oversteer/package.nix                  |  8 ++++----
 pkgs/by-name/ox/ox/package.nix                         |  6 +++---
 pkgs/by-name/pf/pfetch-rs/package.nix                  |  6 +++---
 pkgs/by-name/pk/pkger/package.nix                      |  6 +++---
 pkgs/by-name/pk/pkgtop/package.nix                     |  6 +++---
 pkgs/by-name/pm/pmacct/package.nix                     | 10 +++++-----
 pkgs/by-name/pn/pngpaste/package.nix                   |  8 ++++----
 pkgs/by-name/pn/pngquant/package.nix                   |  8 ++++----
 pkgs/by-name/ps/pscale/package.nix                     |  6 +++---
 pkgs/by-name/ps/psudohash/package.nix                  |  6 +++---
 pkgs/by-name/pu/public-sans/package.nix                |  8 ++++----
 pkgs/by-name/pu/publii/package.nix                     |  4 ++--
 pkgs/by-name/pu/pubs/package.nix                       |  6 +++---
 pkgs/by-name/pu/pueue/package.nix                      |  6 +++---
 pkgs/by-name/pu/pur/package.nix                        |  6 +++---
 pkgs/by-name/pw/pw-volume/package.nix                  |  8 ++++----
 pkgs/by-name/pw/pwdsafety/package.nix                  |  6 +++---
 pkgs/by-name/pw/pwncat/package.nix                     |  6 +++---
 pkgs/by-name/qo/qovery-cli/package.nix                 |  6 +++---
 pkgs/by-name/rb/rbspy/package.nix                      |  8 ++++----
 pkgs/by-name/rb/rbw/package.nix                        |  6 +++---
 pkgs/by-name/rh/rhoas/package.nix                      |  6 +++---
 pkgs/by-name/rk/rke/package.nix                        |  6 +++---
 pkgs/by-name/rk/rkvm/package.nix                       |  8 ++++----
 pkgs/by-name/rm/rmapi/package.nix                      |  6 +++---
 pkgs/by-name/rn/rng-tools/package.nix                  |  8 ++++----
 pkgs/by-name/rn/rnm/package.nix                        |  4 ++--
 pkgs/by-name/rn/rnr/package.nix                        |  6 +++---
 pkgs/by-name/rt/rtrtr/package.nix                      |  6 +++---
 pkgs/by-name/s3/s3fs/package.nix                       |  8 ++++----
 pkgs/by-name/s3/s3proxy/package.nix                    |  6 +++---
 pkgs/by-name/s3/s3ql/package.nix                       |  8 ++++----
 pkgs/by-name/sb/sbom-utility/package.nix               |  6 +++---
 pkgs/by-name/sf/sfrotz/package.nix                     |  8 ++++----
 pkgs/by-name/sf/sftpgo/package.nix                     |  6 +++---
 pkgs/by-name/sk/skaffold/package.nix                   |  6 +++---
 pkgs/by-name/sk/skjold/package.nix                     |  6 +++---
 pkgs/by-name/sk/skrive/package.nix                     |  8 ++++----
 pkgs/by-name/sn/sn0int/package.nix                     |  8 ++++----
 pkgs/by-name/sn/snappymail/package.nix                 |  8 ++++----
 pkgs/by-name/sn/sniffnet/package.nix                   |  6 +++---
 pkgs/by-name/sn/snixembed/package.nix                  |  8 ++++----
 pkgs/by-name/sn/snowcat/package.nix                    |  6 +++---
 pkgs/by-name/sn/snowflake/package.nix                  |  6 +++---
 pkgs/by-name/sq/sqlboiler/package.nix                  |  6 +++---
 pkgs/by-name/sq/sqlcipher/package.nix                  |  8 ++++----
 pkgs/by-name/sq/sqlfluff/package.nix                   |  6 +++---
 pkgs/by-name/sq/sqlmc/package.nix                      |  6 +++---
 pkgs/by-name/sr/srisum/package.nix                     |  8 ++++----
 pkgs/by-name/t-/t-rex/package.nix                      |  8 ++++----
 pkgs/by-name/tf/tfsec/package.nix                      |  6 +++---
 pkgs/by-name/tf/tftui/package.nix                      |  6 +++---
 pkgs/by-name/to/tockloader/package.nix                 |  6 +++---
 pkgs/by-name/to/toolbox/package.nix                    |  6 +++---
 pkgs/by-name/to/topgrade/package.nix                   |  6 +++---
 pkgs/by-name/to/tor-browser/package.nix                | 10 +++++-----
 pkgs/by-name/to/totem/package.nix                      |  8 ++++----
 pkgs/by-name/ts/tsung/package.nix                      |  8 ++++----
 pkgs/by-name/tt/ttdl/package.nix                       |  6 +++---
 pkgs/by-name/tv/tv/package.nix                         |  6 +++---
 pkgs/by-name/tw/twspace-dl/package.nix                 |  6 +++---
 pkgs/by-name/tw/twtxt/package.nix                      |  6 +++---
 pkgs/by-name/ty/typeshare/package.nix                  |  6 +++---
 pkgs/by-name/ub/ubridge/package.nix                    |  8 ++++----
 pkgs/by-name/ur/uriparser/package.nix                  |  8 ++++----
 pkgs/by-name/ur/url-parser/package.nix                 |  6 +++---
 pkgs/by-name/uw/uwhoisd/package.nix                    |  6 +++---
 pkgs/by-name/vc/vcsh/package.nix                       |  8 ++++----
 pkgs/by-name/vh/vhs/package.nix                        |  6 +++---
 pkgs/by-name/vo/vouch-proxy/package.nix                |  8 ++++----
 pkgs/by-name/vs/vscode-js-debug/package.nix            |  6 +++---
 pkgs/by-name/vt/vt-cli/package.nix                     |  6 +++---
 pkgs/by-name/vu/vultr-cli/package.nix                  |  6 +++---
 pkgs/by-name/vu/vunnel/package.nix                     |  6 +++---
 pkgs/by-name/w3/w3m/package.nix                        |  8 ++++----
 pkgs/by-name/wb/wbg/package.nix                        |  8 ++++----
 pkgs/by-name/we/webanalyze/package.nix                 |  6 +++---
 pkgs/by-name/we/websecprobe/package.nix                |  8 ++++----
 pkgs/by-name/we/websocat/package.nix                   |  6 +++---
 pkgs/by-name/we/websploit/package.nix                  |  6 +++---
 pkgs/by-name/we/weggli/package.nix                     |  6 +++---
 pkgs/by-name/wf/wf-recorder/package.nix                |  8 ++++----
 pkgs/by-name/wh/whatsapp-chat-exporter/package.nix     |  6 +++---
 pkgs/by-name/wi/widelands/package.nix                  |  8 ++++----
 pkgs/by-name/wi/wiki-tui/package.nix                   |  6 +++---
 pkgs/by-name/wi/win2xcur/package.nix                   |  6 +++---
 pkgs/by-name/wi/wishlist/package.nix                   |  6 +++---
 pkgs/by-name/wi/witness/package.nix                    |  6 +++---
 pkgs/by-name/wl/wl-clipboard-rs/package.nix            |  8 ++++----
 pkgs/by-name/wl/wlsunset/package.nix                   |  8 ++++----
 pkgs/by-name/wo/wob/package.nix                        |  8 ++++----
 pkgs/by-name/wo/woodpecker-plugin-git/package.nix      |  6 +++---
 pkgs/by-name/wo/wormhole-william/package.nix           |  6 +++---
 pkgs/by-name/wp/wp-cli/package.nix                     | 10 +++++-----
 pkgs/by-name/ws/wsl-vpnkit/package.nix                 |  6 +++---
 pkgs/by-name/ws/wslu/package.nix                       |  8 ++++----
 pkgs/by-name/wt/wtfutil/package.nix                    |  8 ++++----
 pkgs/by-name/wu/wush/package.nix                       |  6 +++---
 pkgs/by-name/wy/wyoming-faster-whisper/package.nix     |  6 +++---
 pkgs/by-name/wy/wyoming-openwakeword/package.nix       |  6 +++---
 pkgs/by-name/xa/xandikos/package.nix                   |  6 +++---
 pkgs/by-name/xc/xcat/package.nix                       |  6 +++---
 pkgs/by-name/xc/xcrawl3r/package.nix                   |  6 +++---
 pkgs/by-name/xe/xeol/package.nix                       |  6 +++---
 pkgs/by-name/xf/xfig/package.nix                       |  2 +-
 pkgs/by-name/xi/xiu/package.nix                        |  6 +++---
 pkgs/by-name/xn/xnlinkfinder/package.nix               |  6 +++---
 pkgs/by-name/xo/xortool/package.nix                    |  6 +++---
 pkgs/by-name/xp/xpano/package.nix                      |  8 ++++----
 pkgs/by-name/xp/xpipe/package.nix                      | 10 +++++-----
 pkgs/by-name/xs/xsubfind3r/package.nix                 |  6 +++---
 pkgs/by-name/ya/yamlfmt/package.nix                    |  6 +++---
 pkgs/by-name/ya/yamlpath/package.nix                   |  6 +++---
 pkgs/by-name/ya/yara/package.nix                       |  8 ++++----
 pkgs/by-name/ya/yarr/package.nix                       |  6 +++---
 pkgs/by-name/ya/yatas/package.nix                      |  6 +++---
 pkgs/by-name/yl/yle-dl/package.nix                     |  8 ++++----
 pkgs/by-name/yo/yor/package.nix                        |  6 +++---
 pkgs/by-name/yo/you-get/package.nix                    |  6 +++---
 pkgs/by-name/yo/youki/package.nix                      |  8 ++++----
 pkgs/by-name/zb/zbctl/package.nix                      |  8 ++++----
 pkgs/by-name/ze/zed/package.nix                        |  6 +++---
 pkgs/by-name/ze/zeek/package.nix                       |  8 ++++----
 pkgs/by-name/ze/zeekscript/package.nix                 |  6 +++---
 pkgs/by-name/zf/zfind/package.nix                      |  6 +++---
 pkgs/by-name/zf/zfs-autobackup/package.nix             |  6 +++---
 pkgs/by-name/zi/zigbee2mqtt_1/package.nix              |  6 +++---
 pkgs/by-name/zi/zile/package.nix                       |  8 ++++----
 pkgs/by-name/zi/zim/package.nix                        |  6 +++---
 pkgs/by-name/zi/zine/package.nix                       |  6 +++---
 pkgs/by-name/zk/zkar/package.nix                       |  6 +++---
 pkgs/by-name/zo/zola/package.nix                       |  6 +++---
 pkgs/by-name/zo/zookeeper/package.nix                  | 10 +++++-----
 pkgs/by-name/zo/zoxide/package.nix                     |  6 +++---
 pkgs/by-name/zp/zps/package.nix                        |  8 ++++----
 pkgs/by-name/zs/zs/package.nix                         |  6 +++---
 pkgs/by-name/zs/zsh-wd/package.nix                     |  8 ++++----
 pkgs/by-name/zu/zulip-term/package.nix                 |  6 +++---
 pkgs/by-name/zx/zxfer/package.nix                      |  4 ++--
 pkgs/by-name/zy/zydis/package.nix                      |  8 ++++----
 pkgs/by-name/zz/zziplib/package.nix                    |  8 ++++----
 357 files changed, 1212 insertions(+), 1212 deletions(-)

diff --git a/pkgs/by-name/_0/_0xpropo/package.nix b/pkgs/by-name/_0/_0xpropo/package.nix
index 704d8e0fdc05..66840e21f966 100644
--- a/pkgs/by-name/_0/_0xpropo/package.nix
+++ b/pkgs/by-name/_0/_0xpropo/package.nix
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Proportional version of the 0xProto font";
     homepage = "https://github.com/0xType/0xPropo";
     changelog = "https://github.com/0xType/0xPropo/releases/tag/${version}";
-    license = licenses.ofl;
-    maintainers = with maintainers; [ vinnymeller ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ vinnymeller ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/_3/_3270font/package.nix b/pkgs/by-name/_3/_3270font/package.nix
index 3df18ecf8743..bfa7ee538508 100644
--- a/pkgs/by-name/_3/_3270font/package.nix
+++ b/pkgs/by-name/_3/_3270font/package.nix
@@ -29,15 +29,15 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Monospaced font based on IBM 3270 terminals";
     homepage = "https://github.com/rbanffy/3270font";
     changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";
     license = [
-      licenses.bsd3
-      licenses.ofl
+      lib.licenses.bsd3
+      lib.licenses.ofl
     ];
-    maintainers = [ ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix
index b0f025ea297c..d852dcb47a94 100644
--- a/pkgs/by-name/_6/_6tunnel/package.nix
+++ b/pkgs/by-name/_6/_6tunnel/package.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Tunnelling for application that don't speak IPv6";
     mainProgram = "6tunnel";
     homepage = "https://github.com/wojtekka/6tunnel";
     changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ Br1ght0ne ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix
index c9223b7061fa..ca0987619bcc 100644
--- a/pkgs/by-name/a5/a52dec/package.nix
+++ b/pkgs/by-name/a5/a52dec/package.nix
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
   # but it's better to disable tests than loose ASLR on i686
   doCheck = !stdenv.hostPlatform.isi686;
 
-  meta = with lib; {
+  meta = {
     description = "ATSC A/52 stream decoder";
     homepage = "https://liba52.sourceforge.io/";
     changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${version}/ChangeLog?ref_type=tags";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ wegank ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ wegank ];
     mainProgram = "a52dec";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ae/aeacus/package.nix b/pkgs/by-name/ae/aeacus/package.nix
index b1264a51eb4b..13cee9f292c6 100644
--- a/pkgs/by-name/ae/aeacus/package.nix
+++ b/pkgs/by-name/ae/aeacus/package.nix
@@ -25,13 +25,13 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Vulnerability remediation scoring system";
     homepage = "https://github.com/elysium-suite/aeacus";
     changelog = "https://github.com/elysium-suite/aeacus/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "aeacus";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ag/agebox/package.nix b/pkgs/by-name/ag/agebox/package.nix
index 5e71b011056a..e664739e82d9 100644
--- a/pkgs/by-name/ag/agebox/package.nix
+++ b/pkgs/by-name/ag/agebox/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-X main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/slok/agebox";
     changelog = "https://github.com/slok/agebox/releases/tag/v${version}";
     description = "Age based repository file encryption gitops tool";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ lesuisse ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lesuisse ];
     mainProgram = "agebox";
   };
 }
diff --git a/pkgs/by-name/ag/agi/package.nix b/pkgs/by-name/ag/agi/package.nix
index 7287cd9eba10..2b4f1c180195 100644
--- a/pkgs/by-name/ag/agi/package.nix
+++ b/pkgs/by-name/ag/agi/package.nix
@@ -68,14 +68,14 @@ stdenvNoCC.mkDerivation rec {
     ];
   });
 
-  meta = with lib; {
+  meta = {
     description = "Android GPU Inspector";
     homepage = "https://gpuinspector.dev";
     changelog = "https://github.com/google/agi/releases/tag/v${version}";
     platforms = [ "x86_64-linux" ];
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kashw2 ];
-    sourceProvenance = with sourceTypes; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kashw2 ];
+    sourceProvenance = with lib.sourceTypes; [
       binaryBytecode
       binaryNativeCode
     ];
diff --git a/pkgs/by-name/ah/aha/package.nix b/pkgs/by-name/ah/aha/package.nix
index 279f148e1359..ebbdd7ca7348 100644
--- a/pkgs/by-name/ah/aha/package.nix
+++ b/pkgs/by-name/ah/aha/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "ANSI HTML Adapter";
     mainProgram = "aha";
     longDescription = ''
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/theZiz/aha";
     changelog = "https://github.com/theZiz/aha/blob/${version}/CHANGELOG";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl2Plus
       mpl11
     ];
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ pSub ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix
index 7f73118ba3db..40ca46b861da 100644
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -53,12 +53,12 @@ python3.pkgs.buildPythonApplication rec {
     "ansibledoctor"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Annotation based documentation for your Ansible roles";
     mainProgram = "ansible-doctor";
     homepage = "https://github.com/thegeeklab/ansible-doctor";
     changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ tboerger ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ tboerger ];
   };
 }
diff --git a/pkgs/by-name/an/ansible-language-server/package.nix b/pkgs/by-name/an/ansible-language-server/package.nix
index 5a474fa7070a..4ddf84b6e39d 100644
--- a/pkgs/by-name/an/ansible-language-server/package.nix
+++ b/pkgs/by-name/an/ansible-language-server/package.nix
@@ -34,12 +34,12 @@ buildNpmPackage rec {
   npmPackFlags = [ "--ignore-scripts" ];
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/ansible/ansible-language-server/releases/tag/v${version}";
     description = "Ansible Language Server";
     mainProgram = "ansible-language-server";
     homepage = "https://github.com/ansible/ansible-language-server";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix
index 5021f93eaf2b..d7483ec4cd2a 100644
--- a/pkgs/by-name/at/atasm/package.nix
+++ b/pkgs/by-name/at/atasm/package.nix
@@ -55,12 +55,12 @@ stdenv.mkDerivation rec {
     mv docs/* $out/share/doc/${pname}
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/CycoPH/atasm";
     description = "Commandline 6502 assembler compatible with Mac/65";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     changelog = "https://github.com/CycoPH/atasm/releases/tag/V${version}";
-    maintainers = with maintainers; [ ];
-    platforms = with platforms; unix;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/by-name/at/atftp/package.nix b/pkgs/by-name/at/atftp/package.nix
index 5bcdff69e44d..38ab992f8fc1 100644
--- a/pkgs/by-name/at/atftp/package.nix
+++ b/pkgs/by-name/at/atftp/package.nix
@@ -48,12 +48,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Advanced tftp tools";
     changelog = "https://sourceforge.net/p/atftp/code/ci/v${version}/tree/Changelog";
     homepage = "https://sourceforge.net/projects/atftp/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 8fbfa6f1b90a..55ab92826851 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -35,16 +35,16 @@ buildGoModule (finalAttrs: {
     tests.version = testers.testVersion { package = athens; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Go module datastore and proxy";
     homepage = "https://github.com/gomods/athens";
-    changelog = "https://github.com/gomods/athens/releases/tag/v${version}";
-    license = licenses.mit;
+    changelog = "https://github.com/gomods/athens/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
     mainProgram = "athens";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       katexochen
       malt3
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix
index 5267433fcf69..0d3d52c2f62d 100644
--- a/pkgs/by-name/at/atomic-swap/package.nix
+++ b/pkgs/by-name/at/atomic-swap/package.nix
@@ -40,12 +40,12 @@ buildGoModule {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/AthanorLabs/atomic-swap";
     changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${version}";
     description = "ETH-XMR atomic swap implementation";
-    license = with licenses; [ lgpl3Only ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ lgpl3Only ];
+    maintainers = with lib.maintainers; [
       happysalada
       lord-valen
     ];
diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix
index dd4235aac3a0..2a221ae10257 100644
--- a/pkgs/by-name/au/audiness/package.nix
+++ b/pkgs/by-name/au/audiness/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "audiness" ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to interact with Nessus";
     homepage = "https://github.com/audiusGmbH/audiness";
     changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "audiness";
   };
 }
diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix
index 6edf94d93dc9..9a44a37e7f40 100644
--- a/pkgs/by-name/au/audion/package.nix
+++ b/pkgs/by-name/au/audion/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-kIrbHt6aAUgdF4Jx/aUOYpiBj1+pyFLCVak6R+JN2Ug=";
 
-  meta = with lib; {
+  meta = {
     description = "Ping the host continuously and write results to a file";
     homepage = "https://github.com/audiusGmbH/audion";
     changelog = "https://github.com/audiusGmbH/audion/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "audion";
   };
 }
diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix
index ba34af45f68f..d133507c374e 100644
--- a/pkgs/by-name/au/audiowaveform/package.nix
+++ b/pkgs/by-name/au/audiowaveform/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   # One test is failing, see PR #101947
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "C++ program to generate waveform data and render waveform images from audio files";
     longDescription = ''
       audiowaveform is a C++ command-line application that generates waveform data from either MP3, WAV, FLAC, or Ogg Vorbis format audio files.
@@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/bbc/audiowaveform";
     changelog = "https://github.com/bbc/audiowaveform/blob/${version}/ChangeLog";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ edbentley ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ edbentley ];
     mainProgram = "audiowaveform";
   };
 }
diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix
index 7f1dc2d14381..92bb4e031468 100644
--- a/pkgs/by-name/au/augeas/package.nix
+++ b/pkgs/by-name/au/augeas/package.nix
@@ -62,13 +62,13 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Configuration editing tool";
-    license = licenses.lgpl21Only;
+    license = lib.licenses.lgpl21Only;
     homepage = "https://augeas.net/";
     changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${version}";
     mainProgram = "augtool";
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ offline ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index 641488703fb9..146739a8a563 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -47,12 +47,12 @@ buildGoModule rec {
 
   subPackages = [ "cmd/auth0" ];
 
-  meta = with lib; {
+  meta = {
     description = "Supercharge your developer workflow";
     homepage = "https://auth0.github.io/auth0-cli";
     changelog = "https://github.com/auth0/auth0-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
     mainProgram = "auth0";
   };
 }
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 4832148e226d..771cbbedf885 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -25,14 +25,14 @@ let
     hash = "sha256-idShMSYIrf3ViG9VFNGNu6TSjBz3Q+GJMMeCzcJwfG4=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Authentication glue you need";
     changelog = "https://github.com/goauthentik/authentik/releases/tag/version%2F${version}";
     homepage = "https://goauthentik.io/";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
     broken = stdenvNoCC.buildPlatform != stdenvNoCC.hostPlatform;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jvanbruegge
       risson
     ];
diff --git a/pkgs/by-name/au/autobloody/package.nix b/pkgs/by-name/au/autobloody/package.nix
index a07870e2c239..d2f0da7a43f4 100644
--- a/pkgs/by-name/au/autobloody/package.nix
+++ b/pkgs/by-name/au/autobloody/package.nix
@@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec {
     "autobloody"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to automatically exploit Active Directory privilege escalation paths";
     homepage = "https://github.com/CravateRouge/autobloody";
     changelog = "https://github.com/CravateRouge/autobloody/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "autobloody";
   };
 }
diff --git a/pkgs/by-name/au/autocorrect/package.nix b/pkgs/by-name/au/autocorrect/package.nix
index 24c50e0e5f54..13c8c0c6c78a 100644
--- a/pkgs/by-name/au/autocorrect/package.nix
+++ b/pkgs/by-name/au/autocorrect/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)";
     mainProgram = "autocorrect";
     homepage = "https://huacnlee.github.io/autocorrect";
     changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 9229f6a43161..a09130b6596c 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-H4bFSqt8hOH6tF2WO1mQqqmbK9U2qlFC+7swz/xj1I8=";
 
-  meta = with lib; {
+  meta = {
     description = "Automatically update system timezone based on location";
     homepage = "https://github.com/maxbrunet/automatic-timezoned";
     changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ maxbrunet ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ maxbrunet ];
+    platforms = lib.platforms.linux;
     mainProgram = "automatic-timezoned";
   };
 }
diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix
index 904788c65c51..6d50bbecd4f4 100644
--- a/pkgs/by-name/ay/ayatana-ido/package.nix
+++ b/pkgs/by-name/ay/ayatana-ido/package.nix
@@ -29,15 +29,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ayatana Display Indicator Objects";
     homepage = "https://github.com/AyatanaIndicators/ayatana-ido";
     changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog";
     license = [
-      licenses.lgpl3Plus
-      licenses.lgpl21Plus
+      lib.licenses.lgpl3Plus
+      lib.licenses.lgpl21Plus
     ];
-    maintainers = [ maintainers.nickhu ];
-    platforms = platforms.linux;
+    maintainers = [ lib.maintainers.nickhu ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 412976e8a9b1..fd6b6246a65a 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -25,11 +25,11 @@ buildGoModule rec {
     ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "New Azure Storage data transfer utility - AzCopy v10";
     homepage = "https://github.com/Azure/azure-storage-azcopy";
     changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kashw2 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kashw2 ];
   };
 }
diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix
index 4a34980a72d6..f21ffa6b0533 100644
--- a/pkgs/by-name/bc/bcg729/package.nix
+++ b/pkgs/by-name/bc/bcg729/package.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
       --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec";
     homepage = "https://linphone.org/technical-corner/bcg729";
     changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ c0bw3b ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ c0bw3b ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix
index 3671c9bf705b..1f539d04050a 100644
--- a/pkgs/by-name/bp/bpfmon/package.nix
+++ b/pkgs/by-name/bp/bpfmon/package.nix
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "BPF based visual packet rate monitor";
     mainProgram = "bpfmon";
     homepage = "https://github.com/bbonev/bpfmon";
     changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}";
-    maintainers = with maintainers; [ arezvov ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ arezvov ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 521ea29a4073..37c1061e7358 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -75,19 +75,19 @@ stdenv.mkDerivation rec {
     bpf = nixosTests.bpf;
   };
 
-  meta = with lib; {
+  meta = {
     description = "High-level tracing language for Linux eBPF";
     homepage = "https://github.com/bpftrace/bpftrace";
     changelog = "https://github.com/bpftrace/bpftrace/releases/tag/v${version}";
     mainProgram = "bpftrace";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       rvl
       thoughtpolice
       martinetd
       mfrw
       illustris
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix
index 97655efad17b..78fb2fef94e2 100644
--- a/pkgs/by-name/bt/btcd/package.nix
+++ b/pkgs/by-name/bt/btcd/package.nix
@@ -29,11 +29,11 @@ buildGoModule rec {
     cp sample-btcd.conf $DIR
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Alternative full node bitcoin implementation written in Go (golang)";
     homepage = "https://github.com/btcsuite/btcd";
     changelog = "https://github.com/btcsuite/btcd/releases/tag/v${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ _0xB10C ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ _0xB10C ];
   };
 }
diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix
index 6c1eeff9b5c6..51c60db7e47b 100644
--- a/pkgs/by-name/bt/btcpayserver/package.nix
+++ b/pkgs/by-name/bt/btcpayserver/package.nix
@@ -30,15 +30,15 @@ buildDotnetModule rec {
     mv $out/bin/{BTCPayServer,btcpayserver} || :
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Self-hosted, open-source cryptocurrency payment processor";
     homepage = "https://btcpayserver.org";
     changelog = "https://github.com/btcpayserver/btcpayserver/blob/v${version}/Changelog.md";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       kcalvinalvin
       erikarvstedt
     ];
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index aa6a0d40ecbf..4fbf5980367b 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -51,13 +51,13 @@ stdenv.mkDerivation rec {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Monitor of resources";
     homepage = "https://github.com/aristocratos/btop";
     changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       khaneliman
       rmcgibbo
     ];
diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index dead16e648bf..225d6038e37e 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -91,13 +91,13 @@ stdenv.mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Utilities for the btrfs filesystem";
     homepage = "https://btrfs.readthedocs.io/en/latest/";
     changelog = "https://github.com/kdave/btrfs-progs/raw/v${version}/CHANGES";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     mainProgram = "btrfs";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix
index 9ce373f75736..d4890b3460e4 100644
--- a/pkgs/by-name/bu/buck2/package.nix
+++ b/pkgs/by-name/bu/buck2/package.nix
@@ -140,16 +140,16 @@ stdenv.mkDerivation {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fast, hermetic, multi-language build system";
     homepage = "https://buck2.build";
     changelog = "https://github.com/facebook/buck2/releases/tag/${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
     mainProgram = "buck2";
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 7f2af2db0733..86523a3946a1 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -120,20 +120,20 @@ stdenvNoCC.mkDerivation rec {
       done
     '';
   };
-  meta = with lib; {
+  meta = {
     homepage = "https://bun.sh";
     changelog = "https://bun.sh/blog/bun-v${version}";
     description = "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     longDescription = ''
       All in one fast & easy-to-use tool. Instead of 1,000 node_modules for development, you only need bun.
     '';
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # bun core
       lgpl21Only # javascriptcore and webkit
     ];
     mainProgram = "bun";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       DAlperin
       jk
       thilobillerbeck
diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix
index 53785ab7cec0..38f042660a37 100644
--- a/pkgs/by-name/cj/cjose/package.nix
+++ b/pkgs/by-name/cj/cjose/package.nix
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl.dev}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/zmartzone/cjose";
     changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md";
     description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project";
-    license = licenses.mit;
-    maintainers = with maintainers; [ midchildan ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ midchildan ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix
index 59b7637022f7..406a874b8748 100644
--- a/pkgs/by-name/cq/cq/package.nix
+++ b/pkgs/by-name/cq/cq/package.nix
@@ -36,12 +36,12 @@ buildGraalvmNativeImage rec {
     "-H:ReflectionConfigurationFiles=${build-src}/package/reflection-config.json"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Clojure Query: A Command-line Data Processor for JSON, YAML, EDN, XML and more";
     homepage = "https://github.com/markus-wa/cq";
     changelog = "https://github.com/markus-wa/cq/releases/releases/tag/${version}";
-    license = licenses.epl20;
-    maintainers = with maintainers; [ farcaller ];
-    platforms = platforms.unix;
+    license = lib.licenses.epl20;
+    maintainers = with lib.maintainers; [ farcaller ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/cs/csvq/package.nix b/pkgs/by-name/cs/csvq/package.nix
index fa1b244dec0f..9fc475332fb4 100644
--- a/pkgs/by-name/cs/csvq/package.nix
+++ b/pkgs/by-name/cs/csvq/package.nix
@@ -24,12 +24,12 @@ buildGoModule rec {
     version = "csvq version ${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "SQL-like query language for CSV";
     mainProgram = "csvq";
     homepage = "https://mithrandie.github.io/csvq/";
     changelog = "https://github.com/mithrandie/csvq/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tomodachi94 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomodachi94 ];
   };
 }
diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix
index 754a8ee4b9c2..4cbc1a7dbb40 100644
--- a/pkgs/by-name/cu/cups-printers/package.nix
+++ b/pkgs/by-name/cu/cups-printers/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "cups_printers" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for interacting with a CUPS server";
     homepage = "https://github.com/audiusGmbH/cups-printers";
     changelog = "https://github.com/audiusGmbH/cups-printers/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cups-printers";
   };
 }
diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix
index 1e56aad3321c..df210bc5c701 100644
--- a/pkgs/by-name/cv/cvemap/package.nix
+++ b/pkgs/by-name/cv/cvemap/package.nix
@@ -26,12 +26,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to work with CVEs";
     homepage = "https://github.com/projectdiscovery/cvemap";
     changelog = "https://github.com/projectdiscovery/cvemap/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cvemap";
   };
 }
diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix
index 6cde031522fc..df62af94dcd7 100644
--- a/pkgs/by-name/cw/cwltool/package.nix
+++ b/pkgs/by-name/cw/cwltool/package.nix
@@ -99,12 +99,12 @@ py.pkgs.buildPythonApplication rec {
     "cwltool"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Common Workflow Language reference implementation";
     homepage = "https://www.commonwl.org";
     changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ veprbl ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ veprbl ];
     mainProgram = "cwltool";
   };
 }
diff --git a/pkgs/by-name/cz/cz-cli/package.nix b/pkgs/by-name/cz/cz-cli/package.nix
index 5a40f248b350..30f2b41bbffa 100644
--- a/pkgs/by-name/cz/cz-cli/package.nix
+++ b/pkgs/by-name/cz/cz-cli/package.nix
@@ -17,14 +17,14 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg=";
 
-  meta = with lib; {
+  meta = {
     description = "Commitizen command line utility";
     homepage = "https://commitizen.github.io/cz-cli";
     changelog = "https://github.com/commitizen/cz-cli/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       freezeboy
       natsukium
     ];
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix
index 8a60df382f4d..fc4e2bbb31c3 100644
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@@ -47,13 +47,13 @@ buildGo123Module rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Modern diagram scripting language that turns text to diagrams";
     mainProgram = "d2";
     homepage = "https://d2lang.com";
     changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       dit7ya
       kashw2
     ];
diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix
index 522c615e18bd..49eb2b4f121c 100644
--- a/pkgs/by-name/dc/dconf-editor/package.nix
+++ b/pkgs/by-name/dc/dconf-editor/package.nix
@@ -69,13 +69,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "GSettings editor for GNOME";
     mainProgram = "dconf-editor";
     homepage = "https://apps.gnome.org/DconfEditor/";
     changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl3Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix
index 12754468dea7..a0241abe6cc5 100644
--- a/pkgs/by-name/dd/ddcutil/package.nix
+++ b/pkgs/by-name/dd/ddcutil/package.nix
@@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.ddcutil.com/";
     description = "Query and change Linux monitor settings using DDC/CI and USB";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ rnhmjoj ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ rnhmjoj ];
     changelog = "https://github.com/rockowitz/ddcutil/blob/v${version}/CHANGELOG.md";
     mainProgram = "ddcutil";
   };
diff --git a/pkgs/by-name/dg/dgoss/package.nix b/pkgs/by-name/dg/dgoss/package.nix
index 090946d89f96..e267ed5cf799 100644
--- a/pkgs/by-name/dg/dgoss/package.nix
+++ b/pkgs/by-name/dg/dgoss/package.nix
@@ -36,13 +36,13 @@ resholve.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/goss-org/goss/blob/v${version}/extras/dgoss/README.md";
     changelog = "https://github.com/goss-org/goss/releases/tag/v${version}";
     description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       hyzual
       anthonyroussel
     ];
diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix
index 02f611df8e56..9505f5d74631 100644
--- a/pkgs/by-name/dh/dhcpdump/package.nix
+++ b/pkgs/by-name/dh/dhcpdump/package.nix
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
     runHook postBuild
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
     homepage = "https://github.com/bbonev/dhcpdump";
     changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${version}";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nickcao ];
-    license = licenses.bsd2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ nickcao ];
+    license = lib.licenses.bsd2;
     mainProgram = "dhcpdump";
   };
 }
diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index c20f49edb89d..6811e0df0e7f 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -48,12 +48,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Synchronize your DNS to multiple providers from a simple DSL";
     homepage = "https://dnscontrol.org/";
     changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
     mainProgram = "dnscontrol";
   };
 }
diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix
index 566998865506..64c40c4d9f54 100644
--- a/pkgs/by-name/dn/dnsmonster/package.nix
+++ b/pkgs/by-name/dn/dnsmonster/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-X=github.com/mosajjal/dnsmonster/util.releaseVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Passive DNS Capture and Monitoring Toolkit";
     homepage = "https://github.com/mosajjal/dnsmonster";
     changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "dnsmonster";
   };
diff --git a/pkgs/by-name/dn/dnsperf/package.nix b/pkgs/by-name/dn/dnsperf/package.nix
index 6c6abd4db0b7..a69b594b7348 100644
--- a/pkgs/by-name/dn/dnsperf/package.nix
+++ b/pkgs/by-name/dn/dnsperf/package.nix
@@ -46,14 +46,14 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Tools for DNS benchmaring";
     homepage = "https://www.dns-oarc.net/tools/dnsperf";
     changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${version}";
-    license = licenses.isc;
-    platforms = platforms.unix;
+    license = lib.licenses.isc;
+    platforms = lib.platforms.unix;
     mainProgram = "dnsperf";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       vcunat
       mfrw
     ];
diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix
index 5e51dc1b2fc6..d8841ce7c0b7 100644
--- a/pkgs/by-name/dn/dnsrecon/package.nix
+++ b/pkgs/by-name/dn/dnsrecon/package.nix
@@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "dnsrecon" ];
 
-  meta = with lib; {
+  meta = {
     description = "DNS Enumeration script";
     homepage = "https://github.com/darkoperator/dnsrecon";
     changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       c0bw3b
       fab
     ];
diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix
index 22162241e6b3..98b0eb4514d7 100644
--- a/pkgs/by-name/dn/dnstwist/package.nix
+++ b/pkgs/by-name/dn/dnstwist/package.nix
@@ -36,12 +36,12 @@ python3.pkgs.buildPythonApplication rec {
     "dnstwist"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Domain name permutation engine for detecting homograph phishing attacks";
     homepage = "https://github.com/elceef/dnstwist";
     changelog = "https://github.com/elceef/dnstwist/releases/tag/${version}";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnstwist";
   };
 }
diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix
index e7c8e68e77de..e2e6b6dd29f7 100644
--- a/pkgs/by-name/dn/dnsx/package.nix
+++ b/pkgs/by-name/dn/dnsx/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "Fast and multi-purpose DNS toolkit";
     longDescription = ''
       dnsx is a fast and multi-purpose DNS toolkit allow to run multiple
@@ -44,8 +44,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/dnsx";
     changelog = "https://github.com/projectdiscovery/dnsx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnsx";
   };
 }
diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix
index ae4ef226c1ef..86e6b711add7 100644
--- a/pkgs/by-name/dr/drawing/package.nix
+++ b/pkgs/by-name/dr/drawing/package.nix
@@ -62,13 +62,13 @@ python3.pkgs.buildPythonApplication rec {
 
   strictDeps = false;
 
-  meta = with lib; {
+  meta = {
     description = "Free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop";
     mainProgram = "drawing";
     homepage = "https://maoschanz.github.io/drawing/";
     changelog = "https://github.com/maoschanz/drawing/releases/tag/${version}";
-    maintainers = with maintainers; [ mothsart ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ mothsart ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/dr/driftctl/package.nix b/pkgs/by-name/dr/driftctl/package.nix
index 9a95d19f4e4f..715ffa1c8adf 100644
--- a/pkgs/by-name/dr/driftctl/package.nix
+++ b/pkgs/by-name/dr/driftctl/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://driftctl.com/";
     changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}";
     description = "Detect, track and alert on infrastructure drift";
@@ -56,8 +56,8 @@ buildGoModule rec {
       driftctl is a free and open-source CLI that warns of infrastructure drift
       and fills in the missing piece in your DevSecOps toolbox.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       kaction
       jk
       qjoly
diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix
index b0bff18b2955..5d5d3c54c250 100644
--- a/pkgs/by-name/dr/driftnet/package.nix
+++ b/pkgs/by-name/dr/driftnet/package.nix
@@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Watches network traffic, and picks out and displays JPEG and GIF images for display";
     homepage = "https://github.com/deiv/driftnet";
     changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ offline ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "driftnet";
   };
 }
diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index 06c2117bf19f..19fdfbb43c88 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -65,12 +65,12 @@ stdenv.mkDerivation rec {
     libxcrypt
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Small footprint implementation of the SSH 2 protocol";
     homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html";
     changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${version}/CHANGES";
-    license = licenses.mit;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ abbradar ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 928ccc53afe6..038699d17cd7 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0=";
 
-  meta = with lib; {
+  meta = {
     description = "Npm scripts runner written in Rust";
     mainProgram = "dum";
     homepage = "https://github.com/egoist/dum";
     changelog = "https://github.com/egoist/dum/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix
index 9c1c9d5a2607..67a96a2f85ce 100644
--- a/pkgs/by-name/du/dump_syms/package.nix
+++ b/pkgs/by-name/du/dump_syms/package.nix
@@ -48,12 +48,12 @@ rustPlatform.buildRustPackage {
     inherit firefox-esr-unwrapped firefox-unwrapped thunderbird-unwrapped;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/mozilla/dump_syms/blob/v${version}/CHANGELOG.md";
     description = "Command-line utility for parsing the debugging information the compiler provides in ELF or stand-alone PDB files";
     mainProgram = "dump_syms";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/mozilla/dump_syms/";
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index aacc410d5a07..ee88691c0b06 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -19,13 +19,13 @@ buildGoModule {
 
   vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
 
-  meta = with lib; {
+  meta = {
     description = "Easily Manage AWS ECS Resources in Terminal 🐱";
     homepage = "https://github.com/keidarcy/e1s";
     changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "e1s";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       zelkourban
       carlossless
     ];
diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
index 590938068d85..241f664111bf 100644
--- a/pkgs/by-name/e2/e2fsprogs/package.nix
+++ b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -88,17 +88,17 @@ stdenv.mkDerivation rec {
       [ -e $out/success ]
     '';
   };
-  meta = with lib; {
+  meta = {
     homepage = "https://e2fsprogs.sourceforge.net/";
     changelog = "https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}";
     description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl2Plus
       lgpl2Plus # lib/ext2fs, lib/e2p
       bsd3 # lib/uuid
       mit # lib/et, lib/ss
     ];
-    platforms = platforms.unix;
-    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index 336082800ba4..4ffa598fbdd5 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
     mainProgram = "earlybird";
     homepage = "https://github.com/americanexpress/earlybird";
     changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthly/package.nix
index 193cf4991cc9..02337e2e9421 100644
--- a/pkgs/by-name/ea/earthly/package.nix
+++ b/pkgs/by-name/ea/earthly/package.nix
@@ -58,12 +58,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Build automation for the container era";
     homepage = "https://earthly.dev/";
     changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       zoedsoupe
       konradmalik
     ];
diff --git a/pkgs/by-name/ea/easyeasm/package.nix b/pkgs/by-name/ea/easyeasm/package.nix
index 6a91e82846f6..d172ece3e536 100644
--- a/pkgs/by-name/ea/easyeasm/package.nix
+++ b/pkgs/by-name/ea/easyeasm/package.nix
@@ -43,12 +43,12 @@ buildGoModule rec {
       }"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Attack surface management tool";
     homepage = "https://github.com/g0ldencybersec/EasyEASM";
     changelog = "https://github.com/g0ldencybersec/EasyEASM/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "easyeasm";
   };
 }
diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix
index 6286d6e841fd..447e8a16d169 100644
--- a/pkgs/by-name/ed/eduvpn-client/package.nix
+++ b/pkgs/by-name/ed/eduvpn-client/package.nix
@@ -51,16 +51,16 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://codeberg.org/eduVPN/linux-app/raw/tag/${version}/CHANGES.md";
     description = "Linux client for eduVPN";
     homepage = "https://codeberg.org/eduVPN/linux-app";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "eduvpn-gui";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       benneti
       jwijenbergh
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix
index fa988b483e71..8bda81c23310 100644
--- a/pkgs/by-name/em/emmet-ls/package.nix
+++ b/pkgs/by-name/em/emmet-ls/package.nix
@@ -27,12 +27,12 @@ buildNpmPackage rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Emmet support based on LSP";
     homepage = "https://github.com/aca/emmet-ls";
     changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "emmet-ls";
   };
 }
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index a14ac0beaf40..09ce3ade221a 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -122,13 +122,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "GNOME image viewer";
     homepage = "https://gitlab.gnome.org/GNOME/eog";
     changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl2Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.unix;
     mainProgram = "eog";
   };
 }
diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix
index 73b8b1b3297f..5858e1bfe01f 100644
--- a/pkgs/by-name/ep/epick/package.nix
+++ b/pkgs/by-name/ep/epick/package.nix
@@ -50,12 +50,12 @@ rustPlatform.buildRustPackage rec {
     patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple color picker that lets the user create harmonic palettes with ease";
     homepage = "https://github.com/vv9k/epick";
     changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "epick";
   };
 }
diff --git a/pkgs/by-name/er/er-patcher/package.nix b/pkgs/by-name/er/er-patcher/package.nix
index e9d3c56a1c04..6f17a814ca33 100644
--- a/pkgs/by-name/er/er-patcher/package.nix
+++ b/pkgs/by-name/er/er-patcher/package.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
     patchShebangs $out/bin/er-patcher
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gurrgur/er-patcher";
     changelog = "https://github.com/gurrgur/er-patcher/releases/tag/v${version}";
     description = "Enhancement patches for Elden Ring adding ultrawide support, custom frame rate limits and more";
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec {
       This tool is based on patching the game executable through hex-edits. However it is done in a safe and non-destructive way,
       that ensures the patched executable is never run with EAC enabled (unless explicity told to do so). Use at your own risk!
     '';
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.sigmasquadron ];
     mainProgram = "er-patcher";
   };
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 849325513b88..12c7369ddd67 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -59,16 +59,16 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional fuseSupport "--enable-fuse"
     ++ lib.optional selinuxSupport "--with-selinux";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
     description = "Userspace utilities for linux-erofs file system";
-    changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [
+    changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}";
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [
       ehmry
       nikstur
       jmbaur
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix
index cc5952fa60c3..03a4f63eeb0d 100644
--- a/pkgs/by-name/er/erosmb/package.nix
+++ b/pkgs/by-name/er/erosmb/package.nix
@@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SMB network scanner";
     homepage = "https://github.com/viktor02/EroSmb";
     changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "erosmb";
   };
 }
diff --git a/pkgs/by-name/et/etebase-server/package.nix b/pkgs/by-name/et/etebase-server/package.nix
index 407bf12fbdb8..e4d8cf1c36a5 100644
--- a/pkgs/by-name/et/etebase-server/package.nix
+++ b/pkgs/by-name/et/etebase-server/package.nix
@@ -59,13 +59,13 @@ python3.pkgs.buildPythonApplication rec {
     nixosTest = nixosTests.etebase-server;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/etesync/server";
     description = "Etebase (EteSync 2.0) server so you can run your own";
     mainProgram = "etebase-server";
     changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
       felschr
       phaer
     ];
diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index d60842ae2133..e3229eebd90b 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -51,15 +51,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Remote shell that automatically reconnects without interrupting the session";
     homepage = "https://eternalterminal.dev/";
     changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       dezgeg
       jshort
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix
index c8116eaf5780..e243c55a2e44 100644
--- a/pkgs/by-name/ev/evil-winrm/package.nix
+++ b/pkgs/by-name/ev/evil-winrm/package.nix
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = bundlerUpdateScript "evil-winrm";
 
-  meta = with lib; {
+  meta = {
     description = "WinRM shell for hacking/pentesting";
     mainProgram = "evil-winrm";
     homepage = "https://github.com/Hackplayers/evil-winrm";
     changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md";
-    license = licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index ef177c079ded..f64006f7c529 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -197,12 +197,12 @@ stdenv.mkDerivation rec {
       ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Unified backend for programs that work with contacts, tasks, and calendar information";
     homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server";
     changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.lgpl2Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux; # requires libuuid
+    license = lib.licenses.lgpl2Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux; # requires libuuid
   };
 }
diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix
index d4c94cc94f75..27eceff4c130 100644
--- a/pkgs/by-name/ev/evtx/package.nix
+++ b/pkgs/by-name/ev/evtx/package.nix
@@ -23,15 +23,15 @@ rustPlatform.buildRustPackage rec {
     rm tests/test_cli_interactive.rs
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Parser for the Windows XML Event Log (EVTX) format";
     homepage = "https://github.com/omerbenamram/evtx";
     changelog = "https://github.com/omerbenamram/evtx/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ fab ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "evtx_dump";
   };
 }
diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix
index 30c19cb1ab85..c6fceb771a10 100644
--- a/pkgs/by-name/ex/exegol/package.nix
+++ b/pkgs/by-name/ex/exegol/package.nix
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "exegol" ];
 
-  meta = with lib; {
+  meta = {
     description = "Fully featured and community-driven hacking environment";
     longDescription = ''
       Exegol is a community-driven hacking environment, powerful and yet
diff --git a/pkgs/by-name/ex/exiflooter/package.nix b/pkgs/by-name/ex/exiflooter/package.nix
index 68eb8d9cab4f..f58ebd93f5ba 100644
--- a/pkgs/by-name/ex/exiflooter/package.nix
+++ b/pkgs/by-name/ex/exiflooter/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Finds geolocation on all image urls and directories";
     homepage = "https://github.com/aydinnyunus/exiflooter";
     changelog = "https://github.com/aydinnyunus/exifLooter/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ octodi ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ octodi ];
     mainProgram = "exiflooter";
   };
 }
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index 5d850645b82c..6068aad78bda 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -192,17 +192,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://exim.org/";
     description = "Mail transfer agent (MTA)";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl2Plus
       bsd3
     ];
     mainProgram = "exim";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ tv ];
-    teams = [ teams.helsinki-systems ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tv ];
+    teams = [ lib.teams.helsinki-systems ];
     changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog";
   };
 }
diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix
index b38cd67ee42c..721d9d9e0312 100644
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -35,13 +35,13 @@ stdenv.mkDerivation rec {
     " $out/bin/extra-container
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Run declarative containers without full system rebuilds";
     homepage = "https://github.com/erikarvstedt/extra-container";
     changelog = "https://github.com/erikarvstedt/extra-container/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.erikarvstedt ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.erikarvstedt ];
     mainProgram = "extra-container";
   };
 }
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index 24636fa72fd3..99cfc4f31119 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -98,16 +98,16 @@ stdenv.mkDerivation rec {
       "-DF3D_PLUGIN_BUILD_USD=ON"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Fast and minimalist 3D viewer using VTK";
     homepage = "https://f3d-app.github.io/f3d";
     changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       bcdarwin
       pbsds
     ];
-    platforms = with platforms; unix;
+    platforms = with lib.platforms; unix;
     mainProgram = "f3d";
   };
 }
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index 13c16bcff36a..e556c04e0770 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     package = fd;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple, fast and user-friendly alternative to find";
     longDescription = ''
       `fd` is a simple, fast and user-friendly alternative to `find`.
@@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/sharkdp/fd";
     changelog = "https://github.com/sharkdp/fd/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       dywedir
       figsoda
       globin
diff --git a/pkgs/by-name/ff/ffuf/package.nix b/pkgs/by-name/ff/ffuf/package.nix
index dcd519cc9a71..eea0cfb1e3e3 100644
--- a/pkgs/by-name/ff/ffuf/package.nix
+++ b/pkgs/by-name/ff/ffuf/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for web fuzzing";
     mainProgram = "ffuf";
     longDescription = ''
@@ -42,7 +42,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/ffuf/ffuf";
     changelog = "https://github.com/ffuf/ffuf/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix
index 052068710cf3..f5455d32e54d 100644
--- a/pkgs/by-name/fn/fnlfmt/package.nix
+++ b/pkgs/by-name/fn/fnlfmt/package.nix
@@ -36,13 +36,13 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Formatter for Fennel";
     homepage = src.meta.homepage;
     changelog = "${src.meta.homepage}/tree/${version}/changelog.md";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = lua.meta.platforms;
-    maintainers = with maintainers; [ chiroptical ];
+    maintainers = with lib.maintainers; [ chiroptical ];
     mainProgram = "fnlfmt";
   };
 }
diff --git a/pkgs/by-name/fp/fping/package.nix b/pkgs/by-name/fp/fping/package.nix
index f38c77f38cb8..43d41b940dc9 100644
--- a/pkgs/by-name/fp/fping/package.nix
+++ b/pkgs/by-name/fp/fping/package.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
     "--enable-ipv4"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Send ICMP echo probes to network hosts";
     homepage = "http://fping.org/";
     changelog = "https://github.com/schweikert/fping/releases/tag/v${version}";
-    license = licenses.bsd0;
+    license = lib.licenses.bsd0;
     mainProgram = "fping";
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index af8fd18c4eb3..af44287c4ac1 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -45,7 +45,7 @@ buildGoModule rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High-level tool for the management of Linux filesystem encryption";
     mainProgram = "fscrypt";
     longDescription = ''
@@ -55,8 +55,8 @@ buildGoModule rec {
     '';
     inherit (src.meta) homepage;
     changelog = "https://github.com/google/fscrypt/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/by-name/fs/fsmon/package.nix b/pkgs/by-name/fs/fsmon/package.nix
index a7f8c0683103..4e55fc183e50 100644
--- a/pkgs/by-name/fs/fsmon/package.nix
+++ b/pkgs/by-name/fs/fsmon/package.nix
@@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "FileSystem Monitor utility";
     homepage = "https://github.com/nowsecure/fsmon";
     changelog = "https://github.com/nowsecure/fsmon/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dezgeg ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.linux;
     mainProgram = "fsmon";
   };
 }
diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index 5d2561fbb7e7..c5851589257c 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -107,15 +107,15 @@ ocamlPackages.buildDunePackage rec {
     z3 = fstarZ3;
   };
 
-  meta = with lib; {
+  meta = {
     description = "ML-like functional programming language aimed at program verification";
     homepage = "https://www.fstar-lang.org";
     changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       numinit
     ];
     mainProgram = "fstar.exe";
-    platforms = with platforms; darwin ++ linux;
+    platforms = with lib.platforms; darwin ++ linux;
   };
 }
diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix
index 6366042848a3..0d6428a70c0e 100644
--- a/pkgs/by-name/fu/fujprog/package.nix
+++ b/pkgs/by-name/fu/fujprog/package.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
     libusb-compat-0_1
   ];
 
-  meta = with lib; {
+  meta = {
     description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards";
     mainProgram = "fujprog";
     homepage = "https://github.com/kost/fujprog";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ trepetti ];
-    platforms = platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ trepetti ];
+    platforms = lib.platforms.all;
     changelog = "https://github.com/kost/fujprog/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix
index 2cb09b1c94ef..ceb54c442d7e 100644
--- a/pkgs/by-name/fu/fulcio/package.nix
+++ b/pkgs/by-name/fu/fulcio/package.nix
@@ -82,7 +82,7 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sigstore/fulcio";
     changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}";
     description = "Root-CA for code signing certs - issuing certificates based on an OIDC email address";
@@ -97,8 +97,8 @@ buildGoModule rec {
       different delegation models, and to deploy and run Fulcio as a
       disconnected instance.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       lesuisse
       jk
     ];
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index ff1f3c878f3c..c8625f889714 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -47,7 +47,7 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion { package = gdu; };
 
-  meta = with lib; {
+  meta = {
     description = "Disk usage analyzer with console interface";
     longDescription = ''
       Gdu is intended primarily for SSD disks where it can fully
@@ -56,8 +56,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/dundee/gdu";
     changelog = "https://github.com/dundee/gdu/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
       fab
       zowoq
     ];
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 5c52ad7f60e4..573d6529632d 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -66,12 +66,12 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphics API Capture and Replay Tools";
     homepage = "https://github.com/LunarG/gfxreconstruct/";
     changelog = "https://github.com/LunarG/gfxreconstruct/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Flakebi ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Flakebi ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gg/gg-scm/package.nix b/pkgs/by-name/gg/gg-scm/package.nix
index e3794f8bd258..7d590d01ac6b 100644
--- a/pkgs/by-name/gg/gg-scm/package.nix
+++ b/pkgs/by-name/gg/gg-scm/package.nix
@@ -64,7 +64,7 @@ buildGoModule {
       --zsh misc/_gg.zsh
   '';
 
-  meta = with lib; {
+  meta = {
     mainProgram = "gg";
     description = "Git with less typing";
     longDescription = ''
@@ -74,6 +74,6 @@ buildGoModule {
     '';
     homepage = "https://gg-scm.io/";
     changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
index b727b46f8cb2..3704cac926f3 100644
--- a/pkgs/by-name/gn/gnome-backgrounds/package.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Default wallpaper set for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.cc-by-sa-30;
-    platforms = platforms.unix;
-    teams = [ teams.gnome ];
+    license = lib.licenses.cc-by-sa-30;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.gnome ];
   };
 }
diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix
index 1a100db5fc94..2a62bc340bf8 100644
--- a/pkgs/by-name/gn/gnome-keyring/package.nix
+++ b/pkgs/by-name/gn/gnome-keyring/package.nix
@@ -117,17 +117,17 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications";
     homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${version}/NEWS?ref_type=tags";
     license = [
       # Most of the code (some is 2Plus)
-      licenses.lgpl21Plus
+      lib.licenses.lgpl21Plus
       # Some stragglers
-      licenses.gpl2Plus
+      lib.licenses.gpl2Plus
     ];
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-klotski/package.nix b/pkgs/by-name/gn/gnome-klotski/package.nix
index 5d56a8e0f00a..cb2cf22b3647 100644
--- a/pkgs/by-name/gn/gnome-klotski/package.nix
+++ b/pkgs/by-name/gn/gnome-klotski/package.nix
@@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "gnome-klotski"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${version}/NEWS?ref_type=tags";
     description = "Slide blocks to solve the puzzle";
     mainProgram = "gnome-klotski";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index b34c9e6eae5b..7c2c8b80db4f 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -89,13 +89,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "gnome-remote-desktop"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags";
     description = "GNOME Remote Desktop server";
     mainProgram = "grdctl";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix
index d7141deddaae..8d0d97461c18 100644
--- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix
+++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix
@@ -65,13 +65,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "gnome-sound-recorder"; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple and modern sound recorder";
     mainProgram = "gnome-sound-recorder";
     homepage = "https://gitlab.gnome.org/World/vocalis";
     changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags";
-    license = licenses.gpl2Plus;
-    teams = [ teams.gnome ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.gnome ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix
index e7c934d7a60a..d2fa96c74b52 100644
--- a/pkgs/by-name/gn/gnome-sudoku/package.nix
+++ b/pkgs/by-name/gn/gnome-sudoku/package.nix
@@ -56,13 +56,13 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript { packageName = "gnome-sudoku"; };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku";
     changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags";
     description = "Test your logic skills in this number grid puzzle";
     mainProgram = "gnome-sudoku";
-    teams = [ teams.gnome ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gn/gnostic/package.nix b/pkgs/by-name/gn/gnostic/package.nix
index 5296fbb0e107..407c5dedcbd7 100644
--- a/pkgs/by-name/gn/gnostic/package.nix
+++ b/pkgs/by-name/gn/gnostic/package.nix
@@ -20,11 +20,11 @@ buildGoModule rec {
   # some tests are broken and others require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/google/gnostic";
     description = "Compiler for APIs described by the OpenAPI Specification with plugins for code generation and other API support tasks";
     changelog = "https://github.com/google/gnostic/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/gn/gnuastro/package.nix b/pkgs/by-name/gn/gnuastro/package.nix
index 50215965fe1e..09a744d5661f 100644
--- a/pkgs/by-name/gn/gnuastro/package.nix
+++ b/pkgs/by-name/gn/gnuastro/package.nix
@@ -39,12 +39,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "GNU astronomy utilities and library";
     homepage = "https://www.gnu.org/software/gnuastro/";
     changelog = "https://git.savannah.gnu.org/cgit/gnuastro.git/plain/NEWS?id=gnuastro_v${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ sikmir ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }
diff --git a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
index 9d6da894018f..d0537e3e10fc 100644
--- a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
+++ b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix
@@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
     installManPage man/*.*
   '';
 
-  meta = with lib; {
+  meta = {
     description = "gnucap modelgen to preprocess, parse and dump vams files";
     homepage = "http://www.gnucap.org/";
-    changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";
+    changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${finalAttrs.version}";
     mainProgram = "gnucap-mg-vams";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = [ maintainers.raboof ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.raboof ];
   };
 })
diff --git a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
index d4423c3c2f54..2c1243aef61e 100644
--- a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
+++ b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     "--with-libgcrypt-prefix=${libgcrypt.dev}"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${version}/ChangeLog";
     description = "Smart-card daemon to enable the use of PKCS#11 tokens with GnuPG";
     mainProgram = "gnupg-pkcs11-scd";
@@ -44,11 +44,11 @@ stdenv.mkDerivation rec {
       daemon to enable the use of PKCS#11 tokens with GnuPG.
     '';
     homepage = "https://gnupg-pkcs11.sourceforge.net/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       matthiasbeyer
       philandstuff
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix
index ac4678022c3d..349d37ba3ac7 100644
--- a/pkgs/by-name/gp/gpa/package.nix
+++ b/pkgs/by-name/gp/gpa/package.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
 
-  meta = with lib; {
+  meta = {
     changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw";
     description = "Graphical user interface for the GnuPG";
     homepage = "https://www.gnupg.org/related_software/gpa/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
     mainProgram = "gpa";
   };
 }
diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 553f2780c448..821671a9553d 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
     wrapPythonProgramsIn $out/bin "$out $pythonPath"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GPS service daemon";
     longDescription = ''
       gpsd is a service daemon that monitors one or more GPSes or AIS
@@ -153,9 +153,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gpsd.gitlab.io/gpsd/index.html";
     changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       bjornfor
       rasendubi
     ];
diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix
index 384cd441c78d..723b4967daf9 100644
--- a/pkgs/by-name/gp/gptscript/package.nix
+++ b/pkgs/by-name/gp/gptscript/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
   # Requires network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gptscript-ai/gptscript";
     changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${version}";
     description = "Build AI assistants that interact with your systems";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ jamiemagee ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ jamiemagee ];
     mainProgram = "gptscript";
   };
 }
diff --git a/pkgs/by-name/gt/gtfocli/package.nix b/pkgs/by-name/gt/gtfocli/package.nix
index 6579ba0ba645..914f968cab36 100644
--- a/pkgs/by-name/gt/gtfocli/package.nix
+++ b/pkgs/by-name/gt/gtfocli/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "GTFO Command Line Interface for search binaries commands to bypass local security restrictions";
     homepage = "https://github.com/cmd-tools/gtfocli";
     changelog = "https://github.com/cmd-tools/gtfocli/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gtfocli";
   };
 }
diff --git a/pkgs/by-name/gt/gtrash/package.nix b/pkgs/by-name/gt/gtrash/package.nix
index c1e1bd8d9297..9934836d3c94 100644
--- a/pkgs/by-name/gt/gtrash/package.nix
+++ b/pkgs/by-name/gt/gtrash/package.nix
@@ -40,12 +40,12 @@ buildGoModule rec {
       --zsh <($out/bin/gtrash completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Trash CLI manager written in Go";
     homepage = "https://github.com/umlx5h/gtrash";
     changelog = "https://github.com/umlx5h/gtrash/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ umlx5h ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ umlx5h ];
     mainProgram = "gtrash";
   };
 }
diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix
index 5f38df5e096d..982db26458f1 100644
--- a/pkgs/by-name/gv/gvm-libs/package.nix
+++ b/pkgs/by-name/gv/gvm-libs/package.nix
@@ -68,12 +68,12 @@ stdenv.mkDerivation rec {
   # causes redefinition of _FORTIFY_SOURCE
   hardeningDisable = [ "fortify3" ];
 
-  meta = with lib; {
+  meta = {
     description = "Libraries module for the Greenbone Vulnerability Management Solution";
     homepage = "https://github.com/greenbone/gvm-libs";
     changelog = "https://github.com/greenbone/gvm-libs/releases/tag/v${version}";
-    license = with licenses; [ gpl2Plus ];
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.linux;
+    license = with lib.licenses; [ gpl2Plus ];
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix
index 1fa2a34e019c..602986105379 100644
--- a/pkgs/by-name/gw/gwc/package.nix
+++ b/pkgs/by-name/gw/gwc/package.nix
@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false; # Fails to generate machine.h in time.
 
-  meta = with lib; {
+  meta = {
     description = "GUI application for removing noise (hiss, pops and clicks) from audio files";
     homepage = "https://github.com/AlisterH/gwc/";
     changelog = "https://github.com/AlisterH/gwc/blob/${version}/Changelog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ magnetophon ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/h8/h8mail/package.nix b/pkgs/by-name/h8/h8mail/package.nix
index ce9578865938..0b20d6327164 100644
--- a/pkgs/by-name/h8/h8mail/package.nix
+++ b/pkgs/by-name/h8/h8mail/package.nix
@@ -27,12 +27,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "h8mail" ];
 
-  meta = with lib; {
+  meta = {
     description = "Email OSINT & Password breach hunting tool";
     homepage = "https://github.com/khast3x/h8mail";
     changelog = "https://github.com/khast3x/h8mail/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ octodi ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ octodi ];
     mainProgram = "h8mail";
   };
 }
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index 906370d04b4b..388ce768a913 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "Close to drop in replacement for cut that can use a regex delimiter instead of a fixed string";
     homepage = "https://github.com/sstadick/hck";
     changelog = "https://github.com/sstadick/hck/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       unlicense
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       gepbird
     ];
diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 544516d13f5a..4a11032a8507 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -35,13 +35,13 @@ buildGoModule rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/hetznercloud/cli/releases/tag/v${version}";
     description = "Command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
     mainProgram = "hcloud";
     homepage = "https://github.com/hetznercloud/cli";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       zauberpony
       techknowlogick
     ];
diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix
index 9de71c9ec74f..a7aaf315e818 100644
--- a/pkgs/by-name/hd/hdrop/package.nix
+++ b/pkgs/by-name/hd/hdrop/package.nix
@@ -47,13 +47,13 @@ stdenvNoCC.mkDerivation rec {
       }"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)";
     homepage = "https://github.com/Schweber/hdrop";
     changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Schweber ];
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Schweber ];
     mainProgram = "hdrop";
   };
 }
diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix
index 0f5a2c124fed..9e992f1da767 100644
--- a/pkgs/by-name/hf/hfinger/package.nix
+++ b/pkgs/by-name/hf/hfinger/package.nix
@@ -38,12 +38,12 @@ python3.pkgs.buildPythonApplication rec {
     "hfinger"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fingerprinting tool for HTTP requests";
     mainProgram = "hfinger";
     homepage = "https://github.com/CERT-Polska/hfinger";
     changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${version}";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix
index 1cac54405c34..5c76699faba8 100644
--- a/pkgs/by-name/hj/hjson-go/package.nix
+++ b/pkgs/by-name/hj/hjson-go/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Utility to convert JSON to and from HJSON";
     homepage = "https://hjson.github.io/";
     changelog = "https://github.com/hjson/hjson-go/releases/tag/v${version}";
-    maintainers = with maintainers; [ ehmry ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+    license = lib.licenses.mit;
     mainProgram = "hjson-cli";
   };
 }
diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix
index 270227b33aea..89f3577368e5 100644
--- a/pkgs/by-name/hm/hmm/package.nix
+++ b/pkgs/by-name/hm/hmm/package.nix
@@ -27,11 +27,11 @@ rustPlatform.buildRustPackage rec {
   # https://github.com/NixOS/nixpkgs/pull/310673
   cargoPatches = [ ./rustc-serialize-fix.patch ];
 
-  meta = with lib; {
+  meta = {
     description = "Small command-line note-taking app";
     homepage = "https://github.com/samwho/hmm";
     changelog = "https://github.com/samwho/hmm/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/hs/hstsparser/package.nix b/pkgs/by-name/hs/hstsparser/package.nix
index 47b9565c5e0b..40378556ee6b 100644
--- a/pkgs/by-name/hs/hstsparser/package.nix
+++ b/pkgs/by-name/hs/hstsparser/package.nix
@@ -28,12 +28,12 @@ python3.pkgs.buildPythonApplication rec {
     "hstsparser"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to parse Firefox and Chrome HSTS databases into forensic artifacts";
     mainProgram = "hstsparser";
     homepage = "https://github.com/thebeanogamer/hstsparser";
     changelog = "https://github.com/thebeanogamer/hstsparser/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ht/html5validator/package.nix b/pkgs/by-name/ht/html5validator/package.nix
index 8692e4ad735b..7cf3e20c339f 100644
--- a/pkgs/by-name/ht/html5validator/package.nix
+++ b/pkgs/by-name/ht/html5validator/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
     export PATH="$PATH:$out/bin";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool that tests files for HTML5 validity";
     mainProgram = "html5validator";
     homepage = "https://github.com/svenkreiss/html5validator";
     changelog = "https://github.com/svenkreiss/html5validator/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ phunehehe ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ phunehehe ];
   };
 }
diff --git a/pkgs/by-name/ht/htmldoc/package.nix b/pkgs/by-name/ht/htmldoc/package.nix
index 6f5e643826c2..a2652191a926 100644
--- a/pkgs/by-name/ht/htmldoc/package.nix
+++ b/pkgs/by-name/ht/htmldoc/package.nix
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
     command = "htmldoc --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Converts HTML files to PostScript and PDF";
     homepage = "https://michaelrsweet.github.io/htmldoc";
     changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";
-    license = licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
 
     longDescription = ''
       HTMLDOC is a program that reads HTML source files or web pages and
diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix
index c36ca5ffad5c..f57a645ced6e 100644
--- a/pkgs/by-name/ht/htop/package.nix
+++ b/pkgs/by-name/ht/htop/package.nix
@@ -71,12 +71,12 @@ stdenv.mkDerivation rec {
       ${optionalPatch systemdSupport "${systemd}/lib/libsystemd.so"}
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactive process viewer";
     homepage = "https://htop.dev";
-    license = licenses.gpl2Only;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       rob
       relrod
       SuperSandro2000
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 84d1931015e7..80c4f386db76 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -39,12 +39,12 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 README.md $out/share/doc/README.md
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
     homepage = "https://github.com/kimono-koans/httm";
     changelog = "https://github.com/kimono-koans/httm/releases/tag/${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ wyndon ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ wyndon ];
     mainProgram = "httm";
   };
 }
diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix
index 695d17726b38..db7f69072bec 100644
--- a/pkgs/by-name/ht/httplz/package.nix
+++ b/pkgs/by-name/ht/httplz/package.nix
@@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : "${openssl}/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Basic http server for hosting a folder fast and simply";
     mainProgram = "httplz";
     homepage = "https://github.com/thecoshman/http";
     changelog = "https://github.com/thecoshman/http/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix
index 4c8b7761c8c4..4fcea02b4f22 100644
--- a/pkgs/by-name/ht/httpx/package.nix
+++ b/pkgs/by-name/ht/httpx/package.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
 
   versionCheckProgramArg = "-version";
 
-  meta = with lib; {
+  meta = {
     description = "Fast and multi-purpose HTTP toolkit";
     longDescription = ''
       httpx is a fast and multi-purpose HTTP toolkit allow to run multiple
@@ -43,8 +43,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/projectdiscovery/httpx";
     changelog = "https://github.com/projectdiscovery/httpx/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "httpx";
   };
 }
diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 833c3cb3942b..b1afe82a5f02 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -52,15 +52,15 @@ rustPlatform.buildRustPackage rec {
       --zsh completions/_hurlfmt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";
     changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       eonpatapon
       figsoda
     ];
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "hurl";
   };
 }
diff --git a/pkgs/by-name/hu/husky/package.nix b/pkgs/by-name/hu/husky/package.nix
index e749644bc33c..7ba0dd68e715 100644
--- a/pkgs/by-name/hu/husky/package.nix
+++ b/pkgs/by-name/hu/husky/package.nix
@@ -17,12 +17,12 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-u1dndTKvInobva+71yI2vPiwrW9vqzAJ2sDAqT9YJsg=";
 
-  meta = with lib; {
+  meta = {
     description = "Git hooks made easy 🐶 woof!";
     mainProgram = "husky";
     homepage = "https://github.com/typicode/husky";
     changelog = "https://github.com/typicode/husky/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
   };
 }
diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
index de7cbe480958..d94101db77ae 100644
--- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
+++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
@@ -17,11 +17,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-6EtOMs+Vba39hOQ029dHpHCJ9ke35PZ/em9Xye3dmvg=";
 
-  meta = with lib; {
+  meta = {
     description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document";
     homepage = "https://github.com/flosell/iam-policy-json-to-terraform";
     changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix
index 734d5344c6d8..ac07709c7b95 100644
--- a/pkgs/by-name/ib/ibm-plex/package.nix
+++ b/pkgs/by-name/ib/ibm-plex/package.nix
@@ -37,13 +37,13 @@ stdenvNoCC.mkDerivation {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "IBM Plex Typeface";
     homepage = "https://www.ibm.com/plex/";
     changelog = "https://github.com/IBM/plex/raw/v${version}/CHANGELOG.md";
-    license = licenses.ofl;
-    platforms = platforms.all;
-    maintainers = with maintainers; [
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
       romildo
       ryanccn
     ];
diff --git a/pkgs/by-name/ig/igmpproxy/package.nix b/pkgs/by-name/ig/igmpproxy/package.nix
index b3c6b196f617..a510dd42e5b1 100644
--- a/pkgs/by-name/ig/igmpproxy/package.nix
+++ b/pkgs/by-name/ig/igmpproxy/package.nix
@@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Daemon that routes multicast using IGMP forwarding";
     homepage = "https://github.com/pali/igmpproxy/";
     changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sdier ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.sdier ];
     # The maintainer is using this on linux, but if you test it on other platforms
     # please add them here!
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "igmpproxy";
   };
 }
diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix
index e968ec050628..3c870f6691f7 100644
--- a/pkgs/by-name/ig/ignite-cli/package.nix
+++ b/pkgs/by-name/ig/ignite-cli/package.nix
@@ -38,12 +38,12 @@ buildGoModule rec {
     }
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://ignite.com/";
     changelog = "https://github.com/ignite/cli/releases/tag/v${version}";
     description = "All-in-one platform to build, launch, and maintain any crypto application on a sovereign and secured blockchain";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kashw2 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kashw2 ];
     mainProgram = "ignite";
   };
 }
diff --git a/pkgs/by-name/ig/igrep/package.nix b/pkgs/by-name/ig/igrep/package.nix
index fd36e112b38b..0c12b51e0731 100644
--- a/pkgs/by-name/ig/igrep/package.nix
+++ b/pkgs/by-name/ig/igrep/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Interactive Grep";
     homepage = "https://github.com/konradsz/igrep";
     changelog = "https://github.com/konradsz/igrep/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ _0x4A6F ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "ig";
   };
 }
diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix
index 1d9223ecb78d..fea8e5c867da 100644
--- a/pkgs/by-name/ip/ipam/package.nix
+++ b/pkgs/by-name/ip/ipam/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
       --zsh <($out/bin/ipam completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cli based IPAM written in Go with PowerDNS support";
     homepage = "https://ipam.lauka.net/";
     changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "ipam";
   };
 }
diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix
index 4adcd6b5e7f7..88ffd1d860a4 100644
--- a/pkgs/by-name/ip/ipinfo/package.nix
+++ b/pkgs/by-name/ip/ipinfo/package.nix
@@ -20,11 +20,11 @@ buildGoModule rec {
   # Tests require network access
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Command Line Interface for the IPinfo API";
     homepage = "https://github.com/ipinfo/cli";
     changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix
index 47dd511afca9..d53918f86823 100644
--- a/pkgs/by-name/ip/ipscan/package.nix
+++ b/pkgs/by-name/ip/ipscan/package.nix
@@ -51,16 +51,16 @@ stdenv.mkDerivation rec {
     cp usr/share/pixmaps/ipscan.png $out/share/pixmaps/ipscan.png
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Angry IP Scanner - fast and friendly network scanner";
     mainProgram = "ipscan";
     homepage = "https://angryip.org";
     downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}";
     changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       kylesferrazza
       totoroot
     ];
diff --git a/pkgs/by-name/ip/iptsd/package.nix b/pkgs/by-name/ip/iptsd/package.nix
index 82fbed29652a..2081b92d4b98 100644
--- a/pkgs/by-name/ip/iptsd/package.nix
+++ b/pkgs/by-name/ip/iptsd/package.nix
@@ -63,16 +63,16 @@ stdenv.mkDerivation rec {
     "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ...
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/linux-surface/iptsd/releases/tag/v${version}";
     description = "Userspace daemon for Intel Precise Touch & Stylus";
     homepage = "https://github.com/linux-surface/iptsd";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "iptsd";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       tomberek
       dotlambda
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix
index c665a6488bb0..537d4af0c72a 100644
--- a/pkgs/by-name/iw/iwgtk/package.nix
+++ b/pkgs/by-name/iw/iwgtk/package.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/lib/systemd/user/iwgtk.service --subst-var out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight, graphical wifi management utility for Linux";
     homepage = "https://github.com/j-lentz/iwgtk";
     changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
+    platforms = lib.platforms.linux;
     mainProgram = "iwgtk";
   };
 }
diff --git a/pkgs/by-name/je/jetbrains-mono/package.nix b/pkgs/by-name/je/jetbrains-mono/package.nix
index 7cd572f94316..f7179b460a09 100644
--- a/pkgs/by-name/je/jetbrains-mono/package.nix
+++ b/pkgs/by-name/je/jetbrains-mono/package.nix
@@ -27,12 +27,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Typeface made for developers";
     homepage = "https://jetbrains.com/mono/";
     changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md";
-    license = licenses.ofl;
-    maintainers = with maintainers; [ vinnymeller ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ vinnymeller ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index e440594a62cb..cb3145ffc125 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-skLK+jYeR0FPxD1fVswiOWyKpzu5/qL5mk69bLEmxic=";
 
-  meta = with lib; {
+  meta = {
     description = "CLI utility to format json files";
     mainProgram = "jfmt";
     homepage = "https://github.com/scruffystuffs/jfmt.rs";
     changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ maintainers.psibi ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.psibi ];
   };
 }
diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix
index cce46dd1b58e..172b8b5b1434 100644
--- a/pkgs/by-name/jf/jfrog-cli/package.nix
+++ b/pkgs/by-name/jf/jfrog-cli/package.nix
@@ -34,13 +34,13 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/jfrog/jfrog-cli";
     description = "Client for accessing to JFrog's Artifactory and Mission Control through their respective REST APIs";
     changelog = "https://github.com/jfrog/jfrog-cli/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "jf";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       detegr
       aidalgol
     ];
diff --git a/pkgs/by-name/jj/jj/package.nix b/pkgs/by-name/jj/jj/package.nix
index 045338e45112..a4251102a237 100644
--- a/pkgs/by-name/jj/jj/package.nix
+++ b/pkgs/by-name/jj/jj/package.nix
@@ -57,7 +57,7 @@ buildGoModule (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "JSON Stream Editor (command line utility)";
     longDescription = ''
       JJ is a command line utility that provides a fast and simple way to retrieve
@@ -66,9 +66,9 @@ buildGoModule (finalAttrs: {
       that do not apply, and aborts as soon as the target value has been found or updated.
     '';
     homepage = "https://github.com/tidwall/jj";
-    changelog = "https://github.com/tidwall/jj/releases/tag/v${version}";
-    license = licenses.mit;
+    changelog = "https://github.com/tidwall/jj/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
     mainProgram = "jj";
-    maintainers = with maintainers; [ katexochen ];
+    maintainers = with lib.maintainers; [ katexochen ];
   };
 })
diff --git a/pkgs/by-name/jo/jobber/package.nix b/pkgs/by-name/jo/jobber/package.nix
index 42a79db01ba4..1f31f86b43f9 100644
--- a/pkgs/by-name/jo/jobber/package.nix
+++ b/pkgs/by-name/jo/jobber/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
     mv $out/bin/jobber{master,runner} $out/libexec/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://dshearer.github.io/jobber";
     changelog = "https://github.com/dshearer/jobber/releases/tag/v${version}";
     description = "Alternative to cron, with sophisticated status-reporting and error-handling";
-    license = licenses.mit;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ urandom ];
     mainProgram = "jobber";
   };
 }
diff --git a/pkgs/by-name/jo/joincap/package.nix b/pkgs/by-name/jo/joincap/package.nix
index 01a9a67bb985..b8d207ada2a6 100644
--- a/pkgs/by-name/jo/joincap/package.nix
+++ b/pkgs/by-name/jo/joincap/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Merge multiple pcap files together, gracefully";
     homepage = "https://github.com/assafmo/joincap";
     changelog = "https://github.com/assafmo/joincap/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "joincap";
   };
 }
diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix
index 3d0113ed4aa1..61e8e125b430 100644
--- a/pkgs/by-name/jr/jrnl/package.nix
+++ b/pkgs/by-name/jr/jrnl/package.nix
@@ -61,12 +61,12 @@ python3.pkgs.buildPythonApplication rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command line journal application that stores your journal in a plain text file";
     homepage = "https://jrnl.sh/";
     changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       bryanasdev000
       zalakain
     ];
diff --git a/pkgs/by-name/js/jsonnet-language-server/package.nix b/pkgs/by-name/js/jsonnet-language-server/package.nix
index 20a4a38df15f..d00290464177 100644
--- a/pkgs/by-name/js/jsonnet-language-server/package.nix
+++ b/pkgs/by-name/js/jsonnet-language-server/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X 'main.version=${version}'"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Language Server Protocol server for Jsonnet";
     mainProgram = "jsonnet-language-server";
     homepage = "https://github.com/grafana/jsonnet-language-server";
     changelog = "https://github.com/grafana/jsonnet-language-server/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ hardselius ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ hardselius ];
   };
 }
diff --git a/pkgs/by-name/jw/jwt-hack/package.nix b/pkgs/by-name/jw/jwt-hack/package.nix
index dee3dcaacd1e..19f6c347292b 100644
--- a/pkgs/by-name/jw/jwt-hack/package.nix
+++ b/pkgs/by-name/jw/jwt-hack/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for attacking JWT";
     homepage = "https://github.com/hahwul/jwt-hack";
     changelog = "https://github.com/hahwul/jwt-hack/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "jwt-hack";
   };
 }
diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 86f3c87e2687..050758180eb0 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -39,7 +39,7 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Command line tool for installing and using Jenkins X";
     mainProgram = "jx";
@@ -50,8 +50,8 @@ buildGoModule rec {
       Environments on Pull Requests using using Cloud Native pipelines
       from Tekton.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kalbasit ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kalbasit ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix
index 8e7f667fd1fc..17095c43edbc 100644
--- a/pkgs/by-name/k0/k0sctl/package.nix
+++ b/pkgs/by-name/k0/k0sctl/package.nix
@@ -44,13 +44,13 @@ buildGoModule rec {
     version = "version: (devel)\ncommit: v${version}\n";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Bootstrapping and management tool for k0s clusters";
     homepage = "https://k0sproject.io/";
     changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "k0sctl";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       nickcao
       qjoly
     ];
diff --git a/pkgs/by-name/k3/k3d/package.nix b/pkgs/by-name/k3/k3d/package.nix
index 722ecebf6470..ca6cc1a20c28 100644
--- a/pkgs/by-name/k3/k3d/package.nix
+++ b/pkgs/by-name/k3/k3d/package.nix
@@ -69,7 +69,7 @@ buildGoModule rec {
 
   env.GOWORK = "off";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/k3d-io/k3d/";
     changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
     description = "Helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
@@ -80,14 +80,14 @@ buildGoModule rec {
       k3d creates containerized k3s clusters. This means, that you can spin up a
       multi-node k3s cluster on a single machine using docker.
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       kuznero
       jlesquembre
       ngerstle
       jk
       ricochet
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix
index 0a5f47cea9fe..438916386118 100644
--- a/pkgs/by-name/k6/k6/package.nix
+++ b/pkgs/by-name/k6/k6/package.nix
@@ -35,13 +35,13 @@ buildGoModule rec {
       --zsh <($out/bin/k6 completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Modern load testing tool, using Go and JavaScript";
     mainProgram = "k6";
     homepage = "https://k6.io/";
     changelog = "https://github.com/grafana/k6/releases/tag/v${version}";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       offline
       bryanasdev000
       kashw2
diff --git a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
index 1427093e9429..7977fe094bde 100644
--- a/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
+++ b/pkgs/by-name/k8/k8s-manifest-sigstore/package.nix
@@ -55,12 +55,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sigstore/k8s-manifest-sigstore";
     changelog = "https://github.com/sigstore/k8s-manifest-sigstore/releases/tag/v${version}";
     description = "Kubectl plugin for signing Kubernetes manifest YAML files with sigstore";
     mainProgram = "kubectl-sigstore";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bbigras ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bbigras ];
   };
 }
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 65fe7bbd0b97..6160f1db8478 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -64,13 +64,13 @@ buildGoModule rec {
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes CLI To Manage Your Clusters In Style";
     homepage = "https://github.com/derailed/k9s";
     changelog = "https://github.com/derailed/k9s/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "k9s";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       Gonzih
       markus1189
       bryanasdev000
diff --git a/pkgs/by-name/kb/kb/package.nix b/pkgs/by-name/kb/kb/package.nix
index 0496ebc96c76..58c502af23a2 100644
--- a/pkgs/by-name/kb/kb/package.nix
+++ b/pkgs/by-name/kb/kb/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Minimalist command line knowledge base manager";
     longDescription = ''
       kb is a text-oriented minimalist command line knowledge base manager. kb
@@ -49,8 +49,8 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/gnebbia/kb";
     changelog = "https://github.com/gnebbia/kb/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wesleyjrz ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ wesleyjrz ];
     mainProgram = "kb";
   };
 }
diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix
index dd0724da5c2c..649db2a3f5da 100644
--- a/pkgs/by-name/kb/kbs2/package.nix
+++ b/pkgs/by-name/kb/kbs2/package.nix
@@ -46,12 +46,12 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/kbs2 --completions zsh)
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Secret manager backed by age";
     mainProgram = "kbs2";
     homepage = "https://github.com/woodruffw/kbs2";
     changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix
index bb462f08c2b2..ec9e03b13835 100644
--- a/pkgs/by-name/kh/khoj/package.nix
+++ b/pkgs/by-name/kh/khoj/package.nix
@@ -134,12 +134,12 @@ python3.pkgs.buildPythonApplication rec {
     "tests/test_conversation_utils.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos";
     homepage = "https://github.com/debanjum/khoj";
     changelog = "https://github.com/debanjum/khoj/releases/tag/${version}";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ dit7ya ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ dit7ya ];
     broken = true; # last successful build 2024-01-10
   };
 }
diff --git a/pkgs/by-name/kl/klipper-estimator/package.nix b/pkgs/by-name/kl/klipper-estimator/package.nix
index 0e863c58be61..33282e64f9ac 100644
--- a/pkgs/by-name/kl/klipper-estimator/package.nix
+++ b/pkgs/by-name/kl/klipper-estimator/package.nix
@@ -32,12 +32,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for determining the time a print will take using the Klipper firmware";
     homepage = "https://github.com/Annex-Engineering/klipper_estimator";
     changelog = "https://github.com/Annex-Engineering/klipper_estimator/releases/tag/v${version}";
     mainProgram = "klipper_estimator";
-    license = licenses.mit;
-    maintainers = with maintainers; [ tmarkus ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 }
diff --git a/pkgs/by-name/kn/knit/package.nix b/pkgs/by-name/kn/knit/package.nix
index 82d1a2fe8982..574dffb8799f 100644
--- a/pkgs/by-name/kn/knit/package.nix
+++ b/pkgs/by-name/kn/knit/package.nix
@@ -27,12 +27,12 @@ buildGoModule rec {
     "-X github.com/zyedidia/knit/info.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple and flexible build tool using Lua, similar to make/mk";
     mainProgram = "knit";
     homepage = "https://github.com/zyedidia/knit";
     changelog = "https://github.com/zyedidia/knit/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ DrSensor ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DrSensor ];
   };
 }
diff --git a/pkgs/by-name/kn/knockpy/package.nix b/pkgs/by-name/kn/knockpy/package.nix
index 3642043bbb43..5a3403b76d8e 100644
--- a/pkgs/by-name/kn/knockpy/package.nix
+++ b/pkgs/by-name/kn/knockpy/package.nix
@@ -41,12 +41,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "knock" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to scan subdomains";
     homepage = "https://github.com/guelfoweb/knock";
     changelog = "https://github.com/guelfoweb/knock/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "knockpy";
   };
 }
diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index a415cb289709..16da2ead4b7f 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -131,13 +131,13 @@ stdenv.mkDerivation rec {
       '';
     };
 
-  meta = with lib; {
+  meta = {
     description = "Authoritative-only DNS server from .cz domain registry";
     homepage = "https://knot-dns.cz";
     changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.vcunat ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.vcunat ];
     mainProgram = "knotd";
   };
 }
diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix
index c347a934aee5..11ea4a97ccbd 100644
--- a/pkgs/by-name/kr/krabby/package.nix
+++ b/pkgs/by-name/kr/krabby/package.nix
@@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-aJBZtRs83KwnxlgNn/5zEGCw4YUl4mRcs1dFi2uaIrc=";
 
-  meta = with lib; {
+  meta = {
     description = "Print pokemon sprites in your terminal";
     homepage = "https://github.com/yannjor/krabby";
     changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ruby0b ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ruby0b ];
     mainProgram = "krabby";
   };
 }
diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix
index 762aae312096..c916c72b7613 100644
--- a/pkgs/by-name/kr/krbjack/package.nix
+++ b/pkgs/by-name/kr/krbjack/package.nix
@@ -38,12 +38,12 @@ python3.pkgs.buildPythonApplication rec {
     "krbjack"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse";
     homepage = "https://github.com/almandin/krbjack";
     changelog = "https://github.com/almandin/krbjack/releases/tag/${version}}";
-    license = licenses.beerware;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.beerware;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "krbjack";
   };
 }
diff --git a/pkgs/by-name/kr/krelay/package.nix b/pkgs/by-name/kr/krelay/package.nix
index f5eea3642d8d..aa307041b81a 100644
--- a/pkgs/by-name/kr/krelay/package.nix
+++ b/pkgs/by-name/kr/krelay/package.nix
@@ -29,12 +29,12 @@ buildGoModule rec {
     mv $out/bin/client $out/bin/kubectl-relay
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Drop-in replacement for `kubectl port-forward` with some enhanced features";
     homepage = "https://github.com/knight42/krelay";
     changelog = "https://github.com/knight42/krelay/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ivankovnatsky ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ivankovnatsky ];
     mainProgram = "kubectl-relay";
   };
 }
diff --git a/pkgs/by-name/kr/krill/package.nix b/pkgs/by-name/kr/krill/package.nix
index dd0a41318895..c5330e51cc71 100644
--- a/pkgs/by-name/kr/krill/package.nix
+++ b/pkgs/by-name/kr/krill/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   # disable failing tests on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  meta = with lib; {
+  meta = {
     description = "RPKI Certificate Authority and Publication Server written in Rust";
     longDescription = ''
       Krill is a free, open source RPKI Certificate Authority that lets you run
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/NLnetLabs/krill";
     changelog = "https://github.com/NLnetLabs/krill/releases/tag/v${version}";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ steamwalker ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ steamwalker ];
   };
 }
diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 2d6d062173b2..ec80f38bb04d 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -47,12 +47,12 @@ buildGoModule rec {
     version = "v${version}"; # needed because testVersion uses grep -Fw
   };
 
-  meta = with lib; {
+  meta = {
     description = "Kubernetes Native Policy Management";
     mainProgram = "kyverno";
     homepage = "https://kyverno.io/";
     changelog = "https://github.com/kyverno/kyverno/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bryanasdev000 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bryanasdev000 ];
   };
 }
diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix
index 52ded0dc99dc..1aec07adfad4 100644
--- a/pkgs/by-name/ld/ldapmonitor/package.nix
+++ b/pkgs/by-name/ld/ldapmonitor/package.nix
@@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to monitor creation, deletion and changes to LDAP objects";
     mainProgram = "ldapmonitor";
     homepage = "https://github.com/p0dalirius/LDAPmonitor";
     changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${version}";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ld/ldapnomnom/package.nix b/pkgs/by-name/ld/ldapnomnom/package.nix
index 2d9557ed0ceb..7fc161682d1f 100644
--- a/pkgs/by-name/ld/ldapnomnom/package.nix
+++ b/pkgs/by-name/ld/ldapnomnom/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to anonymously bruteforce usernames from Domain controllers";
     homepage = "https://github.com/lkarlslund/ldapnomnom";
     changelog = "https://github.com/lkarlslund/ldapnomnom/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ldapnomnom";
   };
 }
diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix
index 71ba320bd654..fa85bacb6c23 100644
--- a/pkgs/by-name/ld/ldmud/package.nix
+++ b/pkgs/by-name/ld/ldmud/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     cp -v ../COPYRIGHT $out/share/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime";
     homepage = "https://ldmud.eu";
     changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY";
@@ -116,8 +116,8 @@ stdenv.mkDerivation rec {
       a driver in its own right.
     '';
     # See https://github.com/ldmud/ldmud/blob/master/COPYRIGHT
-    license = licenses.unfreeRedistributable;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ cpu ];
+    license = lib.licenses.unfreeRedistributable;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ cpu ];
   };
 }
diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix
index a1816eccef18..db31f5254b19 100644
--- a/pkgs/by-name/ld/ldproxy/package.nix
+++ b/pkgs/by-name/ld/ldproxy/package.nix
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
   # cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy
   buildAndTestSubdir = "ldproxy";
 
-  meta = with lib; {
+  meta = {
     description = "Linker Proxy: a simple tool to forward linker arguments to the actual linker executable";
     homepage = "https://github.com/esp-rs/embuild";
     changelog = "https://github.com/esp-rs/embuild/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ vpochapuis ];
+    maintainers = with lib.maintainers; [ vpochapuis ];
   };
 }
diff --git a/pkgs/by-name/lf/lf/package.nix b/pkgs/by-name/lf/lf/package.nix
index 10c678e7604d..114415680312 100644
--- a/pkgs/by-name/lf/lf/package.nix
+++ b/pkgs/by-name/lf/lf/package.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
     installShellCompletion etc/lf.{bash,zsh,fish}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal file manager written in Go and heavily inspired by ranger";
     longDescription = ''
       lf (as in "list files") is a terminal file manager written in Go. It is
@@ -47,8 +47,8 @@ buildGoModule rec {
     '';
     homepage = "https://godoc.org/github.com/gokcehan/lf";
     changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
     mainProgram = "lf";
   };
 }
diff --git a/pkgs/by-name/lm/lmdb/package.nix b/pkgs/by-name/lm/lmdb/package.nix
index e7ec894cf95b..dcb05051d155 100644
--- a/pkgs/by-name/lm/lmdb/package.nix
+++ b/pkgs/by-name/lm/lmdb/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       ln -s lmdb.pc "$dev/lib/pkgconfig/liblmdb.pc"
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightning memory-mapped database";
     longDescription = ''
       LMDB is an ultra-fast, ultra-compact key-value embedded data store
@@ -84,11 +84,11 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://symas.com/lmdb/";
     changelog = "https://git.openldap.org/openldap/openldap/-/blob/LMDB_${version}/libraries/liblmdb/CHANGES";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jb55
       vcunat
     ];
-    license = licenses.openldap;
-    platforms = platforms.all;
+    license = lib.licenses.openldap;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix
index 2f7441b9cff4..17e9a1151480 100644
--- a/pkgs/by-name/ls/lscolors/package.nix
+++ b/pkgs/by-name/ls/lscolors/package.nix
@@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec {
   # setid is not allowed in the sandbox
   checkFlags = [ "--skip=tests::style_for_setid" ];
 
-  meta = with lib; {
+  meta = {
     description = "Rust library and tool to colorize paths using LS_COLORS";
     homepage = "https://github.com/sharkdp/lscolors";
     changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
     mainProgram = "lscolors";
   };
 }
diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix
index 6d9c8caa9135..f46959a34679 100644
--- a/pkgs/by-name/ls/lse/package.nix
+++ b/pkgs/by-name/ls/lse/package.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation rec {
       --prefix PATH : ${lib.makeBinPath [ bash ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Linux enumeration tool with verbosity levels";
     homepage = "https://github.com/diego-treitos/linux-smart-enumeration";
     changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "lse.sh";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index bfa38767ab47..7e53904476f1 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -14,11 +14,11 @@ buildGoModule rec {
   };
   vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto=";
   subPackages = [ "." ];
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";
     description = "Command-Line Interface for Latitude.sh";
     homepage = "https://github.com/latitudesh/lsh";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ lib.maintainers.dzmitry-lahoda ];
   };
 }
diff --git a/pkgs/by-name/lt/lttoolbox/package.nix b/pkgs/by-name/lt/lttoolbox/package.nix
index 48db7dcea516..dd4e74203b78 100644
--- a/pkgs/by-name/lt/lttoolbox/package.nix
+++ b/pkgs/by-name/lt/lttoolbox/package.nix
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
     python3 tests/run_tests.py
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Finite state compiler, processor and helper tools used by apertium";
     homepage = "https://github.com/apertium/lttoolbox";
-    maintainers = with maintainers; [ onthestairs ];
+    maintainers = with lib.maintainers; [ onthestairs ];
     changelog = "https://github.com/apertium/lttoolbox/releases/tag/v${version}";
-    license = licenses.gpl2;
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix
index 6be8e51cc2d2..1c7805b92fcb 100644
--- a/pkgs/by-name/lx/lx-music-desktop/package.nix
+++ b/pkgs/by-name/lx/lx-music-desktop/package.nix
@@ -86,15 +86,15 @@ buildNpmPackage rec {
         --add-flags ${lib.escapeShellArg commandLineArgs}
   '';
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Music software based on Electron and Vue";
     homepage = "https://github.com/lyswhut/lx-music-desktop";
     changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     platforms = electron.meta.platforms;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "lx-music-desktop";
-    maintainers = with maintainers; [ oosquare ];
+    maintainers = with lib.maintainers; [ oosquare ];
   };
 }
diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
index f1cf3561ea2a..c924b449db26 100644
--- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
+++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix
@@ -100,15 +100,15 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Daemon based on liblxc offering a REST API to manage containers";
     homepage = "https://ubuntu.com/lxd";
     changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       agpl3Plus
     ];
-    maintainers = [ ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/mb/mbtileserver/package.nix b/pkgs/by-name/mb/mbtileserver/package.nix
index 0cfdf7ac133b..4bd5f60252f0 100644
--- a/pkgs/by-name/mb/mbtileserver/package.nix
+++ b/pkgs/by-name/mb/mbtileserver/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-yn7LcR/DvHDSRicUnWLrFZKqZti+YQoLSk3mZkDIj10=";
 
-  meta = with lib; {
+  meta = {
     description = "Simple Go-based server for map tiles stored in mbtiles format";
     mainProgram = "mbtileserver";
     homepage = "https://github.com/consbio/mbtileserver";
     changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md";
-    license = licenses.isc;
-    teams = [ teams.geospatial ];
+    license = lib.licenses.isc;
+    teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
index d3331da67f47..baba9df86a83 100644
--- a/pkgs/by-name/mb/mbusd/package.nix
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
     homepage = "https://github.com/3cky/mbusd";
     changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
     mainProgram = "mbusd";
   };
 }
diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
index 5de989c1176a..1449b7bccff4 100644
--- a/pkgs/by-name/md/mdbook-emojicodes/package.nix
+++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix
@@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0=";
 
-  meta = with lib; {
+  meta = {
     description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱";
     mainProgram = "mdbook-emojicodes";
     homepage = "https://github.com/blyxyas/mdbook-emojicodes";
     changelog = "https://github.com/blyxyas/mdbook-emojicodes/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
index c790d9bff40b..0049b257893c 100644
--- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
+++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s=";
 
-  meta = with lib; {
+  meta = {
     description = "Helpers for a mdbook i18n workflow based on Gettext";
     homepage = "https://github.com/google/mdbook-i18n-helpers";
     changelog = "https://github.com/google/mdbook-i18n-helpers/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       teutat3s
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix
index dfbfc21be257..e4e558124f97 100644
--- a/pkgs/by-name/mm/mmseqs2/package.nix
+++ b/pkgs/by-name/mm/mmseqs2/package.nix
@@ -85,13 +85,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Ultra fast and sensitive sequence search and clustering suite";
     mainProgram = "mmseqs";
     homepage = "https://mmseqs.com/";
-    changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index b7fbabd2f3f8..978efda99512 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
 
   GEN_ARTIFACTS = "artifacts";
 
-  meta = with lib; {
+  meta = {
     description = "Minimal mpd terminal client that aims to be simple yet highly configurable";
     homepage = "https://github.com/figsoda/mmtc";
     changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "mmtc";
   };
 }
diff --git a/pkgs/by-name/mq/mqtt-benchmark/package.nix b/pkgs/by-name/mq/mqtt-benchmark/package.nix
index b7dbca6aa693..85bee9c107e9 100644
--- a/pkgs/by-name/mq/mqtt-benchmark/package.nix
+++ b/pkgs/by-name/mq/mqtt-benchmark/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-ZN5tNDIisbhMMOA2bVJnE96GPdZ54HXTneFQewwJmHI=";
 
-  meta = with lib; {
+  meta = {
     description = "MQTT broker benchmarking tool";
     homepage = "https://github.com/krylovsk/mqtt-benchmark";
     changelog = "https://github.com/krylovsk/mqtt-benchmark/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mqtt-benchmark";
   };
 }
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index d9f8293dc1ad..c83aee844f79 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -168,12 +168,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "All-round MQTT client that provides a structured topic overview";
     homepage = "https://github.com/thomasnordquist/MQTT-Explorer";
     changelog = "https://github.com/thomasnordquist/MQTT-Explorer/releases/tag/v${version}";
-    license = licenses.cc-by-nd-40;
-    maintainers = with maintainers; [ tsandrini ];
+    license = lib.licenses.cc-by-nd-40;
+    maintainers = with lib.maintainers; [ tsandrini ];
     platforms = electron.meta.platforms;
     mainProgram = "mqtt-explorer";
   };
diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix
index a7fdd5940e1f..7c9328425f5d 100644
--- a/pkgs/by-name/mq/mqttx/package.nix
+++ b/pkgs/by-name/mq/mqttx/package.nix
@@ -48,13 +48,13 @@ appimageTools.wrapType2 {
       --replace-fail 'Exec=AppRun' 'Exec=${pname}'
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Powerful cross-platform MQTT 5.0 Desktop, CLI, and WebSocket client tools";
     homepage = "https://mqttx.app/";
     changelog = "https://github.com/emqx/MQTTX/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ gaelreyrol ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ gaelreyrol ];
     mainProgram = "mqttx";
   };
 }
diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix
index 26193a8a1246..50e8a88825b6 100644
--- a/pkgs/by-name/mu/mu/package.nix
+++ b/pkgs/by-name/mu/mu/package.nix
@@ -89,17 +89,17 @@ stdenv.mkDerivation rec {
   # Tests need a UTF-8 aware locale configured
   env.LANG = "C.UTF-8";
 
-  meta = with lib; {
+  meta = {
     description = "Collection of utilities for indexing and searching Maildirs";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     homepage = "https://www.djcbsoftware.nl/code/mu/";
     changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       antono
       chvp
       peterhoeg
     ];
     mainProgram = "mu";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 4a3f8e010157..35fb5632b894 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
     "-X=ktbs.dev/mubeng/common.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Proxy checker and IP rotator";
     homepage = "https://github.com/kitabisa/mubeng";
     changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mubeng";
   };
 }
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index 3723c584bff7..b746678f57bc 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-scma8hrm8e/KU2x+TIGOvaUk6nYxKIZ1eaGqs/W2I0I=";
 
-  meta = with lib; {
+  meta = {
     description = "Website link checker which scrapes and inspects all pages in a website recursively";
     homepage = "https://github.com/raviqqe/muffet";
     changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "muffet";
   };
 }
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 50344eb22589..3edd5e8d23e9 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -278,13 +278,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://mupdf.com";
     description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
     changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ fpletz ];
-    platforms = platforms.unix;
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ fpletz ];
+    platforms = lib.platforms.unix;
     mainProgram = "mupdf";
   };
 }
diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index 23f91c042213..ef056f3033b2 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -26,11 +26,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "music_assistant_frontend" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/music-assistant/frontend/releases/tag/${version}";
     description = "Music Assistant frontend";
     homepage = "https://github.com/music-assistant/frontend";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 }
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index f62bcbcd930c..f56a60fc09d3 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -173,7 +173,7 @@ python.pkgs.buildPythonApplication rec {
     tests = nixosTests.music-assistant;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/music-assistant/server/releases/tag/${version}";
     description = "Music Assistant is a music library manager for various music sources which can easily stream to a wide range of supported players";
     longDescription = ''
@@ -182,8 +182,8 @@ python.pkgs.buildPythonApplication rec {
       always-on device like a Raspberry Pi, a NAS or an Intel NUC or alike.
     '';
     homepage = "https://github.com/music-assistant/server";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "mass";
   };
 }
diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix
index d2227dd12a49..97a61412aa49 100644
--- a/pkgs/by-name/mu/musl/package.nix
+++ b/pkgs/by-name/mu/musl/package.nix
@@ -163,11 +163,11 @@ stdenv.mkDerivation rec {
 
   passthru.linuxHeaders = linuxHeaders;
 
-  meta = with lib; {
+  meta = {
     description = "Efficient, small, quality libc implementation";
     homepage = "https://musl.libc.org/";
     changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     platforms = [
       "aarch64-linux"
       "armv5tel-linux"
@@ -190,7 +190,7 @@ stdenv.mkDerivation rec {
       "s390x-linux"
       "x86_64-linux"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       thoughtpolice
       dtzWill
     ];
diff --git a/pkgs/by-name/mu/mutagen-compose/package.nix b/pkgs/by-name/mu/mutagen-compose/package.nix
index 73c85bbfd420..567d43d5a5df 100644
--- a/pkgs/by-name/mu/mutagen-compose/package.nix
+++ b/pkgs/by-name/mu/mutagen-compose/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
 
   tags = [ "mutagencompose" ];
 
-  meta = with lib; {
+  meta = {
     description = "Compose with Mutagen integration";
     homepage = "https://mutagen.io/";
     changelog = "https://github.com/mutagen-io/mutagen-compose/releases/tag/v${version}";
-    maintainers = [ maintainers.matthewpi ];
-    license = licenses.mit;
+    maintainers = [ lib.maintainers.matthewpi ];
+    license = lib.licenses.mit;
     mainProgram = "mutagen-compose";
   };
 }
diff --git a/pkgs/by-name/mu/mutagen/package.nix b/pkgs/by-name/mu/mutagen/package.nix
index 7f1177ad06b7..fdc14fa7f14e 100644
--- a/pkgs/by-name/mu/mutagen/package.nix
+++ b/pkgs/by-name/mu/mutagen/package.nix
@@ -60,12 +60,12 @@ buildGoModule rec {
       --zsh mutagen.zsh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Make remote development work with your local tools";
     homepage = "https://mutagen.io/";
     changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";
-    maintainers = [ ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix
index caaa5438d9ab..7d05a0215d94 100644
--- a/pkgs/by-name/mu/mutmut/package.nix
+++ b/pkgs/by-name/mu/mutmut/package.nix
@@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec {
     textual
   ];
 
-  meta = with lib; {
+  meta = {
     description = "mutation testing system for Python, with a strong focus on ease of use";
     mainProgram = "mutmut";
     homepage = "https://github.com/boxed/mutmut";
     changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       l0b0
       synthetica
     ];
diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix
index 7700a16fe628..ef287641bf82 100644
--- a/pkgs/by-name/nb/nbtscanner/package.nix
+++ b/pkgs/by-name/nb/nbtscanner/package.nix
@@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec {
 
   versionCheckProgramArg = "--version";
 
-  meta = with lib; {
+  meta = {
     description = "NetBIOS scanner written in Rust";
     homepage = "https://github.com/jonkgrimes/nbtscanner";
     changelog = "https://github.com/jonkgrimes/nbtscanner/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nbtscanner";
   };
 }
diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index 057aa9e93aff..c4558c101191 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     inherit curl libsoup_3;
   };
 
-  meta = with lib; {
+  meta = {
     description = "HTTP/2 C library and tools";
     longDescription = ''
       nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C.
@@ -137,8 +137,8 @@ stdenv.mkDerivation rec {
     homepage = "https://nghttp2.org/";
     changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}";
     # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/
-    license = licenses.mit;
-    maintainers = with maintainers; [ c0bw3b ];
-    platforms = platforms.all;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ c0bw3b ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix
index 2495bfee0241..e11b48b54c66 100644
--- a/pkgs/by-name/nk/nkeys/package.nix
+++ b/pkgs/by-name/nk/nkeys/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-89DGLTkt9c8jJhAX3Uo8BBtLcBbnYE0q4mCqq/RGXM4=";
 
-  meta = with lib; {
+  meta = {
     description = "Public-key signature system for NATS";
     homepage = "https://github.com/nats-io/nkeys";
     changelog = "https://github.com/nats-io/nkeys/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nk";
   };
 }
diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
index eedcf3690869..7a5cc79679f9 100644
--- a/pkgs/by-name/nm/nmap-formatter/package.nix
+++ b/pkgs/by-name/nm/nmap-formatter/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-xOS59co6FE2lJae2VtsBKcGjvmMRiGlmZKbqH++mEYk=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool that allows you to convert nmap output";
     mainProgram = "nmap-formatter";
     homepage = "https://github.com/vdjagilev/nmap-formatter";
     changelog = "https://github.com/vdjagilev/nmap-formatter/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/np/np/package.nix b/pkgs/by-name/np/np/package.nix
index 2cd7e5178eaf..9057b7f939b4 100644
--- a/pkgs/by-name/np/np/package.nix
+++ b/pkgs/by-name/np/np/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to parse, deduplicate, and query multiple port scans";
     homepage = "https://github.com/leesoh/np";
     changelog = "https://github.com/leesoh/np/releases/tag/v${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "np";
   };
 }
diff --git a/pkgs/by-name/np/npm-check/package.nix b/pkgs/by-name/np/npm-check/package.nix
index 2c4387a9dcd1..5f75bc5735d4 100644
--- a/pkgs/by-name/np/npm-check/package.nix
+++ b/pkgs/by-name/np/npm-check/package.nix
@@ -21,12 +21,12 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Check for outdated, incorrect, and unused dependencies";
     mainProgram = "npm-check";
     homepage = "https://github.com/dylang/npm-check";
     changelog = "https://github.com/dylang/npm-check/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.thomasjm ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.thomasjm ];
   };
 }
diff --git a/pkgs/by-name/nr/nray/package.nix b/pkgs/by-name/nr/nray/package.nix
index 475ac85dba52..5a0dca344f49 100644
--- a/pkgs/by-name/nr/nray/package.nix
+++ b/pkgs/by-name/nr/nray/package.nix
@@ -22,13 +22,13 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Distributed port scanner";
     homepage = "https://github.com/nray-scanner/nray";
     changelog = "https://github.com/nray-scanner/nray/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "nray";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
index 539d55e74fbf..94f47b691f32 100644
--- a/pkgs/by-name/nt/ntlmrecon/package.nix
+++ b/pkgs/by-name/nt/ntlmrecon/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     "ntlmrecon"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Information enumerator for NTLM authentication enabled web endpoints";
     mainProgram = "ntlmrecon";
     homepage = "https://github.com/pwnfoo/NTLMRecon";
     changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/nv/nvdtools/package.nix b/pkgs/by-name/nv/nvdtools/package.nix
index c703af25a703..b0ae310dcd2e 100644
--- a/pkgs/by-name/nv/nvdtools/package.nix
+++ b/pkgs/by-name/nv/nvdtools/package.nix
@@ -22,11 +22,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools to work with the feeds (vulnerabilities, CPE dictionary etc.) distributed by National Vulnerability Database";
     homepage = "https://github.com/facebookincubator/nvdtools";
     changelog = "https://github.com/facebookincubator/nvdtools/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/ob/obs-cli/package.nix b/pkgs/by-name/ob/obs-cli/package.nix
index cece45f3bf3f..53d52131ade8 100644
--- a/pkgs/by-name/ob/obs-cli/package.nix
+++ b/pkgs/by-name/ob/obs-cli/package.nix
@@ -29,13 +29,13 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "OBS-cli is a command-line remote control for OBS";
     homepage = "https://github.com/muesli/obs-cli";
     changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ flexiondotorg ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ flexiondotorg ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "obs-cli";
   };
 }
diff --git a/pkgs/by-name/od/odo/package.nix b/pkgs/by-name/od/odo/package.nix
index 2ebfc08a7669..0eecb5d228ba 100644
--- a/pkgs/by-name/od/odo/package.nix
+++ b/pkgs/by-name/od/odo/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Developer-focused CLI for OpenShift and Kubernetes";
     mainProgram = "odo";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://odo.dev";
     changelog = "https://github.com/redhat-developer/odo/releases/v${version}";
-    maintainers = with maintainers; [ stehessel ];
+    maintainers = with lib.maintainers; [ stehessel ];
   };
 }
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index e0443aa161ab..bf49a3478d1b 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -34,12 +34,12 @@ rustPlatform.buildRustPackage rec {
   # tests don't work inside the sandbox
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "HTTP load generator inspired by rakyll/hey with tui animation";
     homepage = "https://github.com/hatoo/oha";
     changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "oha";
   };
 }
diff --git a/pkgs/by-name/ol/olaris-server/package.nix b/pkgs/by-name/ol/olaris-server/package.nix
index 5449ea448ac3..bd7015506693 100644
--- a/pkgs/by-name/ol/olaris-server/package.nix
+++ b/pkgs/by-name/ol/olaris-server/package.nix
@@ -57,11 +57,11 @@ buildGoModule rec {
       wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Media manager and transcoding server";
     homepage = "https://gitlab.com/olaris/olaris-server";
     changelog = "https://gitlab.com/olaris/olaris-server/-/releases/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/os/osinfo-db/package.nix b/pkgs/by-name/os/osinfo-db/package.nix
index 121d051761de..5e39efb7c50e 100644
--- a/pkgs/by-name/os/osinfo-db/package.nix
+++ b/pkgs/by-name/os/osinfo-db/package.nix
@@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
     osinfo-db-import --dir "$out/share/osinfo" "${src}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Osinfo database of information about operating systems for virtualization provisioning tools";
     homepage = "https://gitlab.com/libosinfo/osinfo-db/";
     changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/by-name/os/ossutil/package.nix b/pkgs/by-name/os/ossutil/package.nix
index 80f5b13a7803..58ff83fd85c7 100644
--- a/pkgs/by-name/os/ossutil/package.nix
+++ b/pkgs/by-name/os/ossutil/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
   # don't run tests as they require secret access keys that only travis has
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "User friendly command line tool to access Alibaba Cloud OSS";
     homepage = "https://github.com/aliyun/ossutil";
     changelog = "https://github.com/aliyun/ossutil/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jpetrucciani ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jpetrucciani ];
     mainProgram = "ossutil";
   };
 }
diff --git a/pkgs/by-name/os/osv-detector/package.nix b/pkgs/by-name/os/osv-detector/package.nix
index 76fb133961d0..ea2b3973ab17 100644
--- a/pkgs/by-name/os/osv-detector/package.nix
+++ b/pkgs/by-name/os/osv-detector/package.nix
@@ -50,12 +50,12 @@ buildGoModule rec {
     version = "osv-detector ${version} (unknown, commit none)";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Auditing tool for detecting vulnerabilities";
     mainProgram = "osv-detector";
     homepage = "https://github.com/G-Rath/osv-detector";
     changelog = "https://github.com/G-Rath/osv-detector/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index 761c89ca810b..b6a1dbd7ce05 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -38,13 +38,13 @@ buildGoModule rec {
     package = osv-scanner;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev";
     mainProgram = "osv-scanner";
     homepage = "https://github.com/google/osv-scanner";
     changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       stehessel
       urandom
     ];
diff --git a/pkgs/by-name/ot/otel-cli/package.nix b/pkgs/by-name/ot/otel-cli/package.nix
index 0ed768400d9d..274a3b48e395 100644
--- a/pkgs/by-name/ot/otel-cli/package.nix
+++ b/pkgs/by-name/ot/otel-cli/package.nix
@@ -39,11 +39,11 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/equinix-labs/otel-cli";
     description = "Command-line tool for sending OpenTelemetry traces";
     changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       emattiza
       urandom
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index 16dc72a29d76..7eb7e5778385 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -39,12 +39,12 @@ buildGoModule rec {
     command = "otel-desktop-viewer --version";
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/CtrlSpice/otel-desktop-viewer/releases/tag/v${version}";
     description = "Receive & visualize OpenTelemtry traces locally within one CLI tool";
     homepage = "https://github.com/CtrlSpice/otel-desktop-viewer";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ gaelreyrol ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ gaelreyrol ];
     mainProgram = "otel-desktop-viewer";
   };
 }
diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix
index 663366299cef..e286f04ffbab 100644
--- a/pkgs/by-name/ot/otpclient/package.nix
+++ b/pkgs/by-name/ot/otpclient/package.nix
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
     zbar
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP";
     homepage = "https://github.com/paolostivanin/OTPClient";
     changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ alexbakker ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ alexbakker ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ot/ots/package.nix b/pkgs/by-name/ot/ots/package.nix
index e370123c6f71..861c632dbd9f 100644
--- a/pkgs/by-name/ot/ots/package.nix
+++ b/pkgs/by-name/ot/ots/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-X main.buildSource=nix"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Share end-to-end encrypted secrets with others via a one-time URL";
     mainProgram = "ots";
     homepage = "https://ots.sniptt.com";
     changelog = "https://github.com/sniptt-official/ots/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ elliot ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ elliot ];
   };
 }
diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index c181967c0f70..ca8d6a5b2b63 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -68,12 +68,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Feature-rich terminal-based text viewer";
     homepage = "https://noborus.github.io/ov";
     changelog = "https://github.com/noborus/ov/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       farcaller
       figsoda
     ];
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index 063484dc32d4..df9cef98e404 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -77,14 +77,14 @@ rustPlatform.buildRustPackage {
     glib-compile-schemas $out/share/gsettings-schemas/${name}-${version}/glib-2.0/schemas
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful";
     homepage = "https://github.com/${owner}/${name}";
     changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = name;
-    maintainers = with maintainers; [ mrcjkb ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ mrcjkb ];
+    platforms = lib.platforms.linux;
   };
 
 }
diff --git a/pkgs/by-name/ov/oversteer/package.nix b/pkgs/by-name/ov/oversteer/package.nix
index f172c3196292..81a8c2368ccc 100644
--- a/pkgs/by-name/ov/oversteer/package.nix
+++ b/pkgs/by-name/ov/oversteer/package.nix
@@ -95,13 +95,13 @@ stdenv.mkDerivation {
 
   patches = [ ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/berarma/oversteer";
     changelog = "https://github.com/berarma/oversteer/releases/tag/${version}";
     description = "Steering Wheel Manager for Linux";
     mainProgram = "oversteer";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.srounce ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.srounce ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 93980b2e1bf2..092a8b8a1fe5 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Independent Rust text editor that runs in your terminal";
     homepage = "https://github.com/curlpipe/ox";
     changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
       moni
       kachick
     ];
diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
index b01632e6a4fb..cdb0e725d122 100644
--- a/pkgs/by-name/pf/pfetch-rs/package.nix
+++ b/pkgs/by-name/pf/pfetch-rs/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg=";
 
-  meta = with lib; {
+  meta = {
     description = "Rewrite of the pfetch system information tool in Rust";
     homepage = "https://github.com/Gobidev/pfetch-rs";
     changelog = "https://github.com/Gobidev/pfetch-rs/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gobidev ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gobidev ];
     mainProgram = "pfetch";
   };
 }
diff --git a/pkgs/by-name/pk/pkger/package.nix b/pkgs/by-name/pk/pkger/package.nix
index 5dbad7a889ca..f432e341d8c2 100644
--- a/pkgs/by-name/pk/pkger/package.nix
+++ b/pkgs/by-name/pk/pkger/package.nix
@@ -20,12 +20,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Embed static files in Go binaries (replacement for gobuffalo/packr)";
     mainProgram = "pkger";
     homepage = "https://github.com/markbates/pkger";
     changelog = "https://github.com/markbates/pkger/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ flokli ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ flokli ];
   };
 }
diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix
index c730478d8410..09f4eff0fbb2 100644
--- a/pkgs/by-name/pk/pkgtop/package.nix
+++ b/pkgs/by-name/pk/pkgtop/package.nix
@@ -21,12 +21,12 @@ buildGoModule rec {
     mv $out/bin/{cmd,pkgtop}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactive package manager and resource monitor designed for the GNU/Linux";
     homepage = "https://github.com/orhun/pkgtop";
     changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "pkgtop";
   };
 }
diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix
index b00ffe4196a6..ab19c7cae498 100644
--- a/pkgs/by-name/pm/pmacct/package.nix
+++ b/pkgs/by-name/pm/pmacct/package.nix
@@ -77,16 +77,16 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Small set of multi-purpose passive network monitoring tools";
     longDescription = ''
       pmacct is a small set of multi-purpose passive network monitoring tools
       [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
     '';
     homepage = "http://www.pmacct.net/";
-    changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ _0x4A6F ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/pmacct/pmacct/blob/v${finalAttrs.version}/ChangeLog";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ _0x4A6F ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/pn/pngpaste/package.nix b/pkgs/by-name/pn/pngpaste/package.nix
index 2360b9de8d26..eb558b1bb6e8 100644
--- a/pkgs/by-name/pn/pngpaste/package.nix
+++ b/pkgs/by-name/pn/pngpaste/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     cp pngpaste $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Paste image files from clipboard to file on MacOS";
     longDescription = ''
       Paste PNG into files on MacOS, much like pbpaste does for text.
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
     '';
     homepage = "https://github.com/jcsalterego/pngpaste";
     changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md";
-    platforms = platforms.darwin;
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ samw ];
+    platforms = lib.platforms.darwin;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ samw ];
   };
 }
diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix
index 2c70fa3032e4..1473653a77d1 100644
--- a/pkgs/by-name/pn/pngquant/package.nix
+++ b/pkgs/by-name/pn/pngquant/package.nix
@@ -45,17 +45,17 @@ rustPlatform.buildRustPackage rec {
     install -Dpm0444 pngquant.1 $man/share/man/man1/pngquant.1
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pngquant.org/";
     description = "Tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
     changelog = "https://github.com/kornelski/pngquant/raw/${version}/CHANGELOG";
-    platforms = platforms.unix;
-    license = with licenses; [
+    platforms = lib.platforms.unix;
+    license = with lib.licenses; [
       gpl3Plus
       hpnd
       bsd2
     ];
     mainProgram = "pngquant";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index 58dfc057515a..bfa65a34d437 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -44,13 +44,13 @@ buildGoModule rec {
     package = pscale;
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI for PlanetScale Database";
     mainProgram = "pscale";
     changelog = "https://github.com/planetscale/cli/releases/tag/v${version}";
     homepage = "https://www.planetscale.com/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       pimeys
       kashw2
     ];
diff --git a/pkgs/by-name/ps/psudohash/package.nix b/pkgs/by-name/ps/psudohash/package.nix
index 461e70030746..d373f631ad54 100644
--- a/pkgs/by-name/ps/psudohash/package.nix
+++ b/pkgs/by-name/ps/psudohash/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Password list generator for orchestrating brute force attacks and cracking hashes";
     homepage = "https://github.com/t3l3machus/psudohash";
     changelog = "https://github.com/t3l3machus/psudohash/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ exploitoverload ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ exploitoverload ];
     mainProgram = "psudohash";
   };
 }
diff --git a/pkgs/by-name/pu/public-sans/package.nix b/pkgs/by-name/pu/public-sans/package.nix
index 30b40c3f068f..4c91fc03be41 100644
--- a/pkgs/by-name/pu/public-sans/package.nix
+++ b/pkgs/by-name/pu/public-sans/package.nix
@@ -23,12 +23,12 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Strong, neutral, principles-driven, open source typeface for text or display";
     homepage = "https://public-sans.digital.gov/";
     changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
-    license = licenses.ofl;
-    maintainers = [ ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix
index b90481040830..546632649cdc 100644
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Static Site CMS with GUI to build privacy-focused SEO-friendly website";
     mainProgram = "Publii";
     longDescription = ''
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://getpublii.com";
     changelog = "https://github.com/getpublii/publii/releases/tag/v${version}";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       urandom
       sebtm
diff --git a/pkgs/by-name/pu/pubs/package.nix b/pkgs/by-name/pu/pubs/package.nix
index 6f8772f2ac72..0aa4e6b47430 100644
--- a/pkgs/by-name/pu/pubs/package.nix
+++ b/pkgs/by-name/pu/pubs/package.nix
@@ -71,13 +71,13 @@ python3.pkgs.buildPythonApplication rec {
     "pubs"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line bibliography manager";
     mainProgram = "pubs";
     homepage = "https://github.com/pubs/pubs";
     changelog = "https://github.com/pubs/pubs/blob/v${version}/changelog.md";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
       dotlambda
     ];
   };
diff --git a/pkgs/by-name/pu/pueue/package.nix b/pkgs/by-name/pu/pueue/package.nix
index 6412b1e21a8f..4324c882cf4a 100644
--- a/pkgs/by-name/pu/pueue/package.nix
+++ b/pkgs/by-name/pu/pueue/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion pueue.{bash,fish} _pueue
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Nukesor/pueue";
     description = "Daemon for managing long running shell commands";
     longDescription = ''
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
       processed, even if you no longer have any active ssh sessions.
     '';
     changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sarcasticadmin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarcasticadmin ];
   };
 }
diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix
index 3d1723fe119b..eebb7b1284d3 100644
--- a/pkgs/by-name/pu/pur/package.nix
+++ b/pkgs/by-name/pu/pur/package.nix
@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_no_arguments_and_no_requirements_file"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for update and track the requirements";
     homepage = "https://github.com/alanhamlett/pip-update-requirements";
     changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${version}/HISTORY.rst";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pur";
   };
 }
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index deb28d104371..9687a37a3691 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-MQ21pM8aSA/OnxGPVSEVVM6yF0CeX1T0VYN27tqZru8=";
 
-  meta = with lib; {
+  meta = {
     description = "Basic interface to PipeWire volume controls";
     homepage = "https://github.com/smasher164/pw-volume";
     changelog = "https://github.com/smasher164/pw-volume/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       astro
       figsoda
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "pw-volume";
   };
 }
diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix
index b1ea4a5e23a5..1bebac09f4d2 100644
--- a/pkgs/by-name/pw/pwdsafety/package.nix
+++ b/pkgs/by-name/pw/pwdsafety/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-s"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool checking password safety";
     homepage = "https://github.com/edoardottt/pwdsafety";
     changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pwdsafety";
   };
 }
diff --git a/pkgs/by-name/pw/pwncat/package.nix b/pkgs/by-name/pw/pwncat/package.nix
index 12b54f3a4738..ccc883c001e8 100644
--- a/pkgs/by-name/pw/pwncat/package.nix
+++ b/pkgs/by-name/pw/pwncat/package.nix
@@ -19,12 +19,12 @@ python3Packages.buildPythonApplication rec {
   # Tests requires to start containers
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "TCP/UDP communication suite";
     homepage = "https://pwncat.org/";
     changelog = "https://github.com/cytopia/pwncat/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pwncat";
   };
 }
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index f401c7e070f8..522c671f073f 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -34,12 +34,12 @@ buildGoModule rec {
     command = "HOME=$(mktemp -d); ${pname} version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Qovery Command Line Interface";
     homepage = "https://github.com/Qovery/qovery-cli";
     changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "qovery-cli";
   };
 }
diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index 067eeeed9db9..1dda4c0c4149 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -57,13 +57,13 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://rbspy.github.io/";
     description = "Sampling CPU Profiler for Ruby";
     mainProgram = "rbspy";
     changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ viraptor ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index e596d75b0a59..491471bf614e 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -73,12 +73,12 @@ rustPlatform.buildRustPackage rec {
         --replace pass ${pass}/bin/pass
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Unofficial command line client for Bitwarden";
     homepage = "https://crates.io/crates/rbw";
     changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ albakham ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ albakham ];
     mainProgram = "rbw";
   };
 }
diff --git a/pkgs/by-name/rh/rhoas/package.nix b/pkgs/by-name/rh/rhoas/package.nix
index 304f15e412f1..f02f571f8920 100644
--- a/pkgs/by-name/rh/rhoas/package.nix
+++ b/pkgs/by-name/rh/rhoas/package.nix
@@ -44,12 +44,12 @@ buildGoModule rec {
     command = "HOME=$TMP rhoas version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Command Line Interface for Red Hat OpenShift Application Services";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/redhat-developer/app-services-cli";
     changelog = "https://github.com/redhat-developer/app-services-cli/releases/v${version}";
-    maintainers = with maintainers; [ stehessel ];
+    maintainers = with lib.maintainers; [ stehessel ];
     mainProgram = "rhoas";
   };
 }
diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index 66d0ad91b5df..cb5ade8756ba 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     "-X=main.VERSION=v${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/rancher/rke";
     description = "Extremely simple, lightning fast Kubernetes distribution that runs entirely within containers";
     mainProgram = "rke";
     changelog = "https://github.com/rancher/rke/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
   };
 }
diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix
index 1619646431a8..57c887bc078a 100644
--- a/pkgs/by-name/rk/rkvm/package.nix
+++ b/pkgs/by-name/rk/rkvm/package.nix
@@ -42,12 +42,12 @@ rustPlatform.buildRustPackage rec {
     inherit (nixosTests) rkvm;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Virtual KVM switch for Linux machines";
     homepage = "https://github.com/htrefil/rkvm";
     changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 38b225dc94cf..b410d3bd6670 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -19,12 +19,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Go app that allows access to the ReMarkable Cloud API programmatically";
     homepage = "https://github.com/ddvk/rmapi";
     changelog = "https://github.com/ddvk/rmapi/blob/v${version}/CHANGELOG.md";
-    license = licenses.agpl3Only;
-    maintainers = [ maintainers.nickhu ];
+    license = lib.licenses.agpl3Only;
+    maintainers = [ lib.maintainers.nickhu ];
     mainProgram = "rmapi";
   };
 }
diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix
index 32127d5a258a..fe28dc029881 100644
--- a/pkgs/by-name/rn/rng-tools/package.nix
+++ b/pkgs/by-name/rn/rng-tools/package.nix
@@ -104,13 +104,13 @@ stdenv.mkDerivation rec {
     runHook postInstallCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Random number generator daemon";
     homepage = "https://github.com/nhorman/rng-tools";
     changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       johnazoidberg
       c0bw3b
     ];
diff --git a/pkgs/by-name/rn/rnm/package.nix b/pkgs/by-name/rn/rnm/package.nix
index fa07e1d68e6b..e028f5e7f6ee 100644
--- a/pkgs/by-name/rn/rnm/package.nix
+++ b/pkgs/by-name/rn/rnm/package.nix
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
     pcre2
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://neurobin.org/projects/softwares/unix/rnm/";
     description = "Bulk rename utility";
     changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog";
     platforms = lib.platforms.all;
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "rnm";
   };
 }
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index fef4a0960a48..8341341327aa 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-lXo3BECHpiNMRMgd4XZy+b8QHbE0TZ5/P4cz+SgwqsY=";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to batch rename files and directories";
     mainProgram = "rnr";
     homepage = "https://github.com/ismaelgv/rnr";
     changelog = "https://github.com/ismaelgv/rnr/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/rt/rtrtr/package.nix b/pkgs/by-name/rt/rtrtr/package.nix
index 507652fe2dec..ef3e7d5f6c06 100644
--- a/pkgs/by-name/rt/rtrtr/package.nix
+++ b/pkgs/by-name/rt/rtrtr/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   buildNoDefaultFeatures = true;
 
-  meta = with lib; {
+  meta = {
     description = "RPKI data proxy";
     longDescription = ''
       TRTR is an RPKI data proxy, designed to collect Validated ROA Payloads
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/NLnetLabs/rtrtr";
     changelog = "https://github.com/NLnetLabs/rtrtr/blob/v${version}/Changelog.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ steamwalker ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ steamwalker ];
     mainProgram = "rtrtr";
   };
 }
diff --git a/pkgs/by-name/s3/s3fs/package.nix b/pkgs/by-name/s3/s3fs/package.nix
index 4ca4d71a8f6b..c2a056a4d5f3 100644
--- a/pkgs/by-name/s3/s3fs/package.nix
+++ b/pkgs/by-name/s3/s3fs/package.nix
@@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/s3fs $out/bin/mount.s3fs
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Mount an S3 bucket as filesystem through FUSE";
     homepage = "https://github.com/s3fs-fuse/s3fs-fuse";
     changelog = "https://github.com/s3fs-fuse/s3fs-fuse/raw/v${version}/ChangeLog";
-    maintainers = [ ];
-    license = licenses.gpl2Only;
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix
index 302e6bd4c504..6b76764f01b9 100644
--- a/pkgs/by-name/s3/s3proxy/package.nix
+++ b/pkgs/by-name/s3/s3proxy/package.nix
@@ -33,12 +33,12 @@ maven.buildMavenPackage {
       --add-flags "-jar $out/share/s3proxy/s3proxy-${version}-jar-with-dependencies.jar"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Access other storage backends via the S3 API";
     mainProgram = "s3proxy";
     homepage = "https://github.com/gaul/s3proxy";
     changelog = "https://github.com/gaul/s3proxy/releases/tag/s3proxy-${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ camelpunch ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ camelpunch ];
   };
 }
diff --git a/pkgs/by-name/s3/s3ql/package.nix b/pkgs/by-name/s3/s3ql/package.nix
index 5894d776444f..386baa6f4bb3 100644
--- a/pkgs/by-name/s3/s3ql/package.nix
+++ b/pkgs/by-name/s3/s3ql/package.nix
@@ -59,12 +59,12 @@ python3.pkgs.buildPythonApplication rec {
     ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Full-featured file system for online data storage";
     homepage = "https://github.com/s3ql/s3ql/";
     changelog = "https://github.com/s3ql/s3ql/releases/tag/s3ql-${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ rushmorem ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ rushmorem ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix
index 6ebfbcbfe73d..1849fb0dacaa 100644
--- a/pkgs/by-name/sb/sbom-utility/package.nix
+++ b/pkgs/by-name/sb/sbom-utility/package.nix
@@ -58,12 +58,12 @@ buildGoModule {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Utility that provides an API platform for validating, querying and managing BOM data";
     homepage = "https://github.com/CycloneDX/sbom-utility";
     changelog = "https://github.com/CycloneDX/sbom-utility/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ thillux ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thillux ];
     mainProgram = "sbom-utility";
   };
 }
diff --git a/pkgs/by-name/sf/sfrotz/package.nix b/pkgs/by-name/sf/sfrotz/package.nix
index 5a798b5f03b7..f4d234e2b767 100644
--- a/pkgs/by-name/sf/sfrotz/package.nix
+++ b/pkgs/by-name/sf/sfrotz/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   buildPhase = "make sdl";
   installTargets = [ "install_sfrotz" ];
 
-  meta = with lib; {
+  meta = {
     description = "Interpreter for Infocom and other Z-Machine games (SDL interface)";
     mainProgram = "sfrotz";
     longDescription = ''
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://davidgriffith.gitlab.io/frotz/";
     changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ddelabru ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ddelabru ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix
index 1ff2b8126e28..4aa8c8faddb2 100644
--- a/pkgs/by-name/sf/sftpgo/package.nix
+++ b/pkgs/by-name/sf/sftpgo/package.nix
@@ -48,7 +48,7 @@ buildGoModule rec {
 
   passthru.tests = nixosTests.sftpgo;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/drakkan/sftpgo";
     changelog = "https://github.com/drakkan/sftpgo/releases/tag/v${version}";
     description = "Fully featured and highly configurable SFTP server";
@@ -59,11 +59,11 @@ buildGoModule rec {
       local filesystem, encrypted local filesystem, S3 (compatible) Object Storage,
       Google Cloud Storage, Azure Blob Storage, SFTP.
     '';
-    license = with licenses; [
+    license = with lib.licenses; [
       agpl3Only
       unfreeRedistributable
     ]; # Software is AGPLv3, web UI is unfree
-    maintainers = with maintainers; [ thenonameguy ];
+    maintainers = with lib.maintainers; [ thenonameguy ];
     mainProgram = "sftpgo";
   };
 }
diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix
index df747abef0e4..c81e04263d39 100644
--- a/pkgs/by-name/sk/skaffold/package.nix
+++ b/pkgs/by-name/sk/skaffold/package.nix
@@ -51,7 +51,7 @@ buildGoModule rec {
       --zsh <($out/bin/skaffold completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://skaffold.dev/";
     changelog = "https://github.com/GoogleContainerTools/skaffold/releases/tag/v${version}";
     description = "Easy and Repeatable Kubernetes Development";
@@ -62,8 +62,8 @@ buildGoModule rec {
       Skaffold handles the workflow for building, pushing and deploying your application.
       It also provides building blocks and describe customizations for a CI/CD pipeline.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       vdemeester
       bryanasdev000
     ];
diff --git a/pkgs/by-name/sk/skjold/package.nix b/pkgs/by-name/sk/skjold/package.nix
index fc96ea7cd64c..f5eeaae78539 100644
--- a/pkgs/by-name/sk/skjold/package.nix
+++ b/pkgs/by-name/sk/skjold/package.nix
@@ -53,11 +53,11 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "skjold" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to Python dependencies against security advisory databases";
     homepage = "https://github.com/twu/skjold";
     changelog = "https://github.com/twu/skjold/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/sk/skrive/package.nix b/pkgs/by-name/sk/skrive/package.nix
index 1dab0a7ff345..9bc1352fa94e 100644
--- a/pkgs/by-name/sk/skrive/package.nix
+++ b/pkgs/by-name/sk/skrive/package.nix
@@ -24,13 +24,13 @@ buildGoModule rec {
     installManPage skrive.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Secure and sleek dosage logging for the terminal";
     homepage = "https://github.com/VanuPhantom/skrive";
     changelog = "https://github.com/VanuPhantom/skrive/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ freyacodes ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ freyacodes ];
     mainProgram = "skrive";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 60e876a69e43..52426cc9d075 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -50,16 +50,16 @@ rustPlatform.buildRustPackage rec {
       --zsh  <($out/bin/sn0int completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Semi-automatic OSINT framework and package manager";
     homepage = "https://github.com/kpcyrd/sn0int";
     changelog = "https://github.com/kpcyrd/sn0int/releases/tag/v${version}";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [
       fab
       xrelkd
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "sn0int";
   };
 }
diff --git a/pkgs/by-name/sn/snappymail/package.nix b/pkgs/by-name/sn/snappymail/package.nix
index bb3d11ef998f..d53ffe1017b2 100644
--- a/pkgs/by-name/sn/snappymail/package.nix
+++ b/pkgs/by-name/sn/snappymail/package.nix
@@ -31,13 +31,13 @@ stdenv.mkDerivation rec {
     cp ${includeScript} $out/include.php
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple, modern & fast web-based email client";
     homepage = "https://snappymail.eu";
     changelog = "https://github.com/the-djmaze/snappymail/blob/v${version}/CHANGELOG.md";
     downloadPage = "https://github.com/the-djmaze/snappymail/releases";
-    license = licenses.agpl3Only;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ mic92 ];
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ mic92 ];
   };
 }
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index f8d82b213b31..4a39c56cadc7 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -77,15 +77,15 @@ rustPlatform.buildRustPackage rec {
       }
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform application to monitor your network traffic with ease";
     homepage = "https://github.com/gyulyvgc/sniffnet";
     changelog = "https://github.com/gyulyvgc/sniffnet/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "sniffnet";
   };
 }
diff --git a/pkgs/by-name/sn/snixembed/package.nix b/pkgs/by-name/sn/snixembed/package.nix
index 738e2df44c16..44b5b144ff6a 100644
--- a/pkgs/by-name/sn/snixembed/package.nix
+++ b/pkgs/by-name/sn/snixembed/package.nix
@@ -31,13 +31,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Proxy StatusNotifierItems as XEmbedded systemtray-spec icons";
     homepage = "https://git.sr.ht/~steef/snixembed";
     changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}";
-    license = licenses.isc;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ figsoda ];
     mainProgram = "snixembed";
   };
 }
diff --git a/pkgs/by-name/sn/snowcat/package.nix b/pkgs/by-name/sn/snowcat/package.nix
index 960c7777b88d..91015235981b 100644
--- a/pkgs/by-name/sn/snowcat/package.nix
+++ b/pkgs/by-name/sn/snowcat/package.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/praetorian-inc/snowcat";
     changelog = "https://github.com/praetorian-inc/snowcat/releases/tag/v${version}";
     description = "Tool to audit the istio service mesh";
@@ -35,7 +35,7 @@ buildGoModule rec {
       with Istio, and begin to enumerate the required data. Optionally, you can
       point snowcat at a directory containing Kubernets YAML files.
     '';
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jk ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jk ];
   };
 }
diff --git a/pkgs/by-name/sn/snowflake/package.nix b/pkgs/by-name/sn/snowflake/package.nix
index c59e0377f6ca..f3633fa347a3 100644
--- a/pkgs/by-name/sn/snowflake/package.nix
+++ b/pkgs/by-name/sn/snowflake/package.nix
@@ -19,14 +19,14 @@ buildGoModule rec {
 
   vendorHash = "sha256-vopRE4B4WhncUdBfmBTzRbZzCU20vsHoNCYcPG4BGc0=";
 
-  meta = with lib; {
+  meta = {
     description = "System to defeat internet censorship";
     homepage = "https://snowflake.torproject.org/";
     changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bbjubjub
       yayayayaka
     ];
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 }
diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix
index ab0b9eb1c47c..ed15064493c9 100644
--- a/pkgs/by-name/sq/sqlboiler/package.nix
+++ b/pkgs/by-name/sq/sqlboiler/package.nix
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Generate a Go ORM tailored to your database schema";
     homepage = "https://github.com/volatiletech/sqlboiler";
     changelog = "https://github.com/volatiletech/sqlboiler/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mrityunjaygr8 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mrityunjaygr8 ];
     mainProgram = "sqlboiler";
   };
 }
diff --git a/pkgs/by-name/sq/sqlcipher/package.nix b/pkgs/by-name/sq/sqlcipher/package.nix
index c102af52448b..1dc4d0c66765 100644
--- a/pkgs/by-name/sq/sqlcipher/package.nix
+++ b/pkgs/by-name/sq/sqlcipher/package.nix
@@ -58,13 +58,13 @@ stdenv.mkDerivation rec {
     installManPage sqlcipher.1
   '';
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md";
     description = "SQLite extension that provides 256 bit AES encryption of database files";
     mainProgram = "sqlcipher";
     homepage = "https://www.zetetic.net/sqlcipher/";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix
index 8c5b2a38c766..4b91c874ac6f 100644
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -68,12 +68,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "sqlfluff" ];
 
-  meta = with lib; {
+  meta = {
     description = "SQL linter and auto-formatter";
     homepage = "https://www.sqlfluff.com/";
     changelog = "https://github.com/sqlfluff/sqlfluff/blob/${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sqlfluff";
   };
 }
diff --git a/pkgs/by-name/sq/sqlmc/package.nix b/pkgs/by-name/sq/sqlmc/package.nix
index 9fbf1c49f11b..9d756d6158c5 100644
--- a/pkgs/by-name/sq/sqlmc/package.nix
+++ b/pkgs/by-name/sq/sqlmc/package.nix
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "sqlmc" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to check URLs of a domain for SQL injections";
     homepage = "https://github.com/malvads/sqlmc";
     changelog = "https://github.com/malvads/sqlmc/releases/tag/${version}";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sqlmc";
   };
 }
diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix
index 085d7f7011fe..d118d9c4149f 100644
--- a/pkgs/by-name/sr/srisum/package.nix
+++ b/pkgs/by-name/sr/srisum/package.nix
@@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line utility to compute and check subresource integrity hashes";
     homepage = "https://github.com/zkat/srisum-rs";
     changelog = "https://github.com/zkat/srisum-rs/raw/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ pjjw ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ pjjw ];
+    platforms = lib.platforms.all;
     mainProgram = "srisum";
   };
 }
diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix
index 997d56ada495..27feefe81bc3 100644
--- a/pkgs/by-name/t-/t-rex/package.nix
+++ b/pkgs/by-name/t-/t-rex/package.nix
@@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Vector tile server specialized on publishing MVT tiles";
     homepage = "https://t-rex.tileserver.ch/";
     changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    teams = [ teams.geospatial ];
+    license = lib.licenses.mit;
+    teams = [ lib.teams.geospatial ];
     mainProgram = "t_rex";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     broken = true; # see https://github.com/t-rex-tileserver/t-rex/issues/320
   };
 }
diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix
index a57e58563f83..d4bd6c1441de 100644
--- a/pkgs/by-name/tf/tfsec/package.nix
+++ b/pkgs/by-name/tf/tfsec/package.nix
@@ -31,12 +31,12 @@ buildGoModule rec {
     "cmd/tfsec-checkgen"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Static analysis powered security scanner for terraform code";
     homepage = "https://github.com/aquasecurity/tfsec";
     changelog = "https://github.com/aquasecurity/tfsec/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       fab
       peterromfeldhk
     ];
diff --git a/pkgs/by-name/tf/tftui/package.nix b/pkgs/by-name/tf/tftui/package.nix
index be3d08a35b3e..9090c0961b45 100644
--- a/pkgs/by-name/tf/tftui/package.nix
+++ b/pkgs/by-name/tf/tftui/package.nix
@@ -46,12 +46,12 @@ python3Packages.buildPythonApplication rec {
       --add-flags "--disable-usage-tracking"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Textual UI to view and interact with Terraform state";
     homepage = "https://github.com/idoavrah/terraform-tui";
     changelog = "https://github.com/idoavrah/terraform-tui/releases/tag/v${version}";
-    license = licenses.asl20;
-    teams = [ teams.bitnomial ];
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.bitnomial ];
     mainProgram = "tftui";
   };
 }
diff --git a/pkgs/by-name/to/tockloader/package.nix b/pkgs/by-name/to/tockloader/package.nix
index 6fcdded82dc5..b25c57d164a9 100644
--- a/pkgs/by-name/to/tockloader/package.nix
+++ b/pkgs/by-name/to/tockloader/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for programming Tock onto hardware boards";
     mainProgram = "tockloader";
     homepage = "https://github.com/tock/tockloader";
     changelog = "https://github.com/tock/tockloader/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/to/toolbox/package.nix b/pkgs/by-name/to/toolbox/package.nix
index dcec72c5eb9e..36a28569ed89 100644
--- a/pkgs/by-name/to/toolbox/package.nix
+++ b/pkgs/by-name/to/toolbox/package.nix
@@ -51,12 +51,12 @@ buildGoModule rec {
     install profile.d/toolbox.sh -Dt $out/share/profile.d
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://containertoolbx.org";
     changelog = "https://github.com/containers/toolbox/releases/tag/${version}";
     description = "Tool for containerized command line environments on Linux";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ urandom ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ urandom ];
     mainProgram = "toolbox";
   };
 }
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 099046b2001f..803950787fb6 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -41,12 +41,12 @@ rustPlatform.buildRustPackage rec {
     installManPage topgrade.8
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Upgrade all the things";
     homepage = "https://github.com/topgrade-rs/topgrade";
     changelog = "https://github.com/topgrade-rs/topgrade/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       SuperSandro2000
       xyenon
     ];
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 2afc14771898..8982061c2f66 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -353,13 +353,13 @@ lib.warnIf (useHardenedMalloc != null)
         };
       };
 
-      meta = with lib; {
+      meta = {
         description = "Privacy-focused browser routing traffic through the Tor network";
         mainProgram = "tor-browser";
         homepage = "https://www.torproject.org/";
         changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
-        platforms = attrNames sources;
-        maintainers = with maintainers; [
+        platforms = lib.attrNames sources;
+        maintainers = with lib.maintainers; [
           felschr
           panicgh
           joachifm
@@ -368,13 +368,13 @@ lib.warnIf (useHardenedMalloc != null)
         # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
         # the compound is "libre" in a strict sense (some components place certain
         # restrictions on redistribution), it's free enough for our purposes.
-        license = with licenses; [
+        license = with lib.licenses; [
           mpl20
           lgpl21Plus
           lgpl3Plus
           free
         ];
-        sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
       };
     }
   )
diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix
index 5ad36ced402f..4682336189a4 100644
--- a/pkgs/by-name/to/totem/package.nix
+++ b/pkgs/by-name/to/totem/package.nix
@@ -108,13 +108,13 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://apps.gnome.org/Totem/";
     changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags";
     description = "Movie player for the GNOME desktop based on GStreamer";
-    teams = [ teams.gnome ];
-    license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins
-    platforms = platforms.linux;
+    teams = [ lib.teams.gnome ];
+    license = lib.licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins
+    platforms = lib.platforms.linux;
     # gst-inspect-1.0 is not smart enough for cross compiling
     broken = stdenv.buildPlatform != stdenv.hostPlatform;
   };
diff --git a/pkgs/by-name/ts/tsung/package.nix b/pkgs/by-name/ts/tsung/package.nix
index a23e464accc1..a67c1eb0bc83 100644
--- a/pkgs/by-name/ts/tsung/package.nix
+++ b/pkgs/by-name/ts/tsung/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
         --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.TemplateToolkit ]}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://tsung.erlang-projects.org/";
     changelog = "https://github.com/processone/tsung/blob/v${version}/CHANGELOG.md";
     description = "High-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc";
@@ -53,8 +53,8 @@ stdenv.mkDerivation rec {
       can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL,
       AMQP, MQTT, LDAP and Jabber/XMPP servers.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ uskudnik ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ uskudnik ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index a2d37d182987..168b4e394f0f 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-dr/hT8mVUlO0pX/OGqIqPDevflNVPD88epLZsW772Os=";
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to manage todo lists in todo.txt format";
     homepage = "https://github.com/VladimirMarkelov/ttdl";
     changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ _3JlOy-PYCCKUi ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
     mainProgram = "ttdl";
   };
 }
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index f345d8474f24..8eee130919db 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -18,12 +18,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-pg8u+1C68ilg0uhszQnsN1bRbniJd39yQHujerQx+mI=";
 
-  meta = with lib; {
+  meta = {
     description = "Format json into table view";
     mainProgram = "tv";
     homepage = "https://github.com/uzimaru0000/tv";
     changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/tw/twspace-dl/package.nix b/pkgs/by-name/tw/twspace-dl/package.nix
index 32bcf6f2e21a..64c285493888 100644
--- a/pkgs/by-name/tw/twspace-dl/package.nix
+++ b/pkgs/by-name/tw/twspace-dl/package.nix
@@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "twspace_dl" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python module to download twitter spaces";
     homepage = "https://github.com/HoloArchivists/twspace-dl";
     changelog = "https://github.com/HoloArchivists/twspace-dl/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    maintainers = [ ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "twspace_dl";
   };
 }
diff --git a/pkgs/by-name/tw/twtxt/package.nix b/pkgs/by-name/tw/twtxt/package.nix
index 0725ae0b53db..2f606414f252 100644
--- a/pkgs/by-name/tw/twtxt/package.nix
+++ b/pkgs/by-name/tw/twtxt/package.nix
@@ -35,12 +35,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_tweet_relative_datetime"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Decentralised, minimalist microblogging service for hackers";
     homepage = "https://github.com/buckket/twtxt";
     changelog = "https://github.com/buckket/twtxt/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ siraben ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ siraben ];
     mainProgram = "twtxt";
   };
 }
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index e6cea0420f30..14d2260f61c5 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -31,15 +31,15 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/typeshare completions zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command Line Tool for generating language files with typeshare";
     mainProgram = "typeshare";
     homepage = "https://github.com/1password/typeshare";
     changelog = "https://github.com/1password/typeshare/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ figsoda ];
   };
 }
diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix
index d28cff1b1799..3ff1884291f9 100644
--- a/pkgs/by-name/ub/ubridge/package.nix
+++ b/pkgs/by-name/ub/ubridge/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces";
     longDescription = ''
       uBridge is a simple application to create user-land bridges between
@@ -53,12 +53,12 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/GNS3/ubridge";
     changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "ubridge";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       primeos
       anthonyroussel
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix
index 721ea8182dc6..dbfe694b211d 100644
--- a/pkgs/by-name/ur/uriparser/package.nix
+++ b/pkgs/by-name/ur/uriparser/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeCheckInputs = [ gtest ];
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog";
     description = "Strictly RFC 3986 compliant URI parsing library";
     longDescription = ''
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       API documentation is available on uriparser website.
     '';
     homepage = "https://uriparser.github.io/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ bosu ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bosu ];
     mainProgram = "uriparse";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix
index 5b51ff56362b..36ef2165ca4a 100644
--- a/pkgs/by-name/ur/url-parser/package.nix
+++ b/pkgs/by-name/ur/url-parser/package.nix
@@ -26,12 +26,12 @@ buildGoModule rec {
     "main.BuildDate=1970-01-01"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple command-line URL parser";
     homepage = "https://github.com/thegeeklab/url-parser";
     changelog = "https://github.com/thegeeklab/url-parser/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ doronbehar ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
     mainProgram = "url-parser";
   };
 }
diff --git a/pkgs/by-name/uw/uwhoisd/package.nix b/pkgs/by-name/uw/uwhoisd/package.nix
index 3eac31c31aee..c14678502250 100644
--- a/pkgs/by-name/uw/uwhoisd/package.nix
+++ b/pkgs/by-name/uw/uwhoisd/package.nix
@@ -38,11 +38,11 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Universal WHOIS proxy server";
     homepage = "https://github.com/Lookyloo/uwhoisd";
     changelog = "https://github.com/Lookyloo/uwhoisd/blob/${version}/ChangeLog";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 7e1af72cbfd5..69bde561ce61 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -38,16 +38,16 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Version Control System for $HOME";
     homepage = "https://github.com/RichiH/vcsh";
     changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       ttuegel
       alerque
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
     mainProgram = "vcsh";
   };
 }
diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix
index bfd2c5e04626..0bda86473b72 100644
--- a/pkgs/by-name/vh/vhs/package.nix
+++ b/pkgs/by-name/vh/vhs/package.nix
@@ -52,13 +52,13 @@ buildGoModule rec {
       --zsh <($out/bin/vhs completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for generating terminal GIFs with code";
     mainProgram = "vhs";
     homepage = "https://github.com/charmbracelet/vhs";
     changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       maaslalani
       penguwin
     ];
diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix
index 1104b041708e..0eb9aeb3072b 100644
--- a/pkgs/by-name/vo/vouch-proxy/package.nix
+++ b/pkgs/by-name/vo/vouch-proxy/package.nix
@@ -27,16 +27,16 @@ buildGoModule rec {
     export VOUCH_ROOT=$PWD
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/vouch/vouch-proxy";
     description = "SSO and OAuth / OIDC login solution for NGINX using the auth_request module";
     changelog = "https://github.com/vouch/vouch-proxy/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       leona
       erictapen
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "vouch-proxy";
   };
 }
diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix
index fea245a29644..aee881ac119a 100644
--- a/pkgs/by-name/vs/vscode-js-debug/package.nix
+++ b/pkgs/by-name/vs/vscode-js-debug/package.nix
@@ -74,7 +74,7 @@ buildNpmPackage rec {
         fi
       '';
 
-  meta = with lib; {
+  meta = {
     description = "DAP-compatible JavaScript debugger";
     longDescription = ''
       This is a [DAP](https://microsoft.github.io/debug-adapter-protocol/)-based
@@ -86,7 +86,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/microsoft/vscode-js-debug";
     changelog = "https://github.com/microsoft/vscode-js-debug/blob/v${version}/CHANGELOG.md";
     mainProgram = "js-debug";
-    license = licenses.mit;
-    maintainers = with maintainers; [ zeorin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zeorin ];
   };
 }
diff --git a/pkgs/by-name/vt/vt-cli/package.nix b/pkgs/by-name/vt/vt-cli/package.nix
index 0ca91305822d..e61b557d3e0e 100644
--- a/pkgs/by-name/vt/vt-cli/package.nix
+++ b/pkgs/by-name/vt/vt-cli/package.nix
@@ -23,12 +23,12 @@ buildGoModule rec {
 
   subPackages = [ "vt" ];
 
-  meta = with lib; {
+  meta = {
     description = "VirusTotal Command Line Interface";
     homepage = "https://github.com/VirusTotal/vt-cli";
     changelog = "https://github.com/VirusTotal/vt-cli/releases/tag/${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "vt";
-    maintainers = with maintainers; [ dit7ya ];
+    maintainers = with lib.maintainers; [ dit7ya ];
   };
 }
diff --git a/pkgs/by-name/vu/vultr-cli/package.nix b/pkgs/by-name/vu/vultr-cli/package.nix
index 5f8c67d2a1bf..50b611abd1da 100644
--- a/pkgs/by-name/vu/vultr-cli/package.nix
+++ b/pkgs/by-name/vu/vultr-cli/package.nix
@@ -33,12 +33,12 @@ buildGoModule rec {
       --zsh <($out/bin/vultr-cli completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Official command line tool for Vultr services";
     homepage = "https://github.com/vultr/vultr-cli";
     changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ Br1ght0ne ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
     mainProgram = "vultr-cli";
   };
 }
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index b40a86a96d16..0661cc3cd415 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -78,12 +78,12 @@ python3.pkgs.buildPythonApplication rec {
     "test_parser"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for collecting vulnerability data from various sources";
     homepage = "https://github.com/anchore/vunnel";
     changelog = "https://github.com/anchore/vunnel/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "vunnel";
   };
 }
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index e20fffde7614..c589db734015 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -125,13 +125,13 @@ stdenv.mkDerivation rec {
     command = "w3m -version";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://w3m.sourceforge.net/";
     changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog";
     description = "Text-mode web browser";
-    maintainers = with maintainers; [ anthonyroussel ];
-    platforms = platforms.unix;
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
     mainProgram = "w3m";
   };
 }
diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix
index 47f8ac7844d4..c20f6ecbc9ac 100644
--- a/pkgs/by-name/wb/wbg/package.nix
+++ b/pkgs/by-name/wb/wbg/package.nix
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     "-Wno-error=maybe-uninitialized"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Wallpaper application for Wayland compositors";
     homepage = "https://codeberg.org/dnkl/wbg";
     changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ ];
-    platforms = with platforms; linux;
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ ];
+    platforms = with lib.platforms; linux;
     mainProgram = "wbg";
   };
 }
diff --git a/pkgs/by-name/we/webanalyze/package.nix b/pkgs/by-name/we/webanalyze/package.nix
index 906a94e6cc42..ecd0525d747a 100644
--- a/pkgs/by-name/we/webanalyze/package.nix
+++ b/pkgs/by-name/we/webanalyze/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-XPOsC+HoLytgv1fhAaO5HYSvuOP6OhjLyOYTfiD64QI=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to uncover technologies used on websites";
     homepage = "https://github.com/rverton/webanalyze";
     changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "webanalyze";
   };
 }
diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix
index 893954cd77db..8b9a59dfd1ed 100644
--- a/pkgs/by-name/we/websecprobe/package.nix
+++ b/pkgs/by-name/we/websecprobe/package.nix
@@ -28,13 +28,13 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "WebSecProbe" ];
 
-  meta = with lib; {
+  meta = {
     description = "Web Security Assessment Tool";
     homepage = "https://github.com/spyboy-productions/WebSecProbe/";
     changelog = "https://github.com/spyboy-productions/WebSecProbe/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "websecprobe";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix
index f00d2aef05f3..f0cb9eea6b99 100644
--- a/pkgs/by-name/we/websocat/package.nix
+++ b/pkgs/by-name/we/websocat/package.nix
@@ -53,12 +53,12 @@ rustPlatform.buildRustPackage rec {
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line client for WebSockets (like netcat/socat)";
     homepage = "https://github.com/vi/websocat";
     changelog = "https://github.com/vi/websocat/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       thoughtpolice
       Br1ght0ne
     ];
diff --git a/pkgs/by-name/we/websploit/package.nix b/pkgs/by-name/we/websploit/package.nix
index aafccf28a69e..f6f7cb1e79c2 100644
--- a/pkgs/by-name/we/websploit/package.nix
+++ b/pkgs/by-name/we/websploit/package.nix
@@ -32,12 +32,12 @@ python3.pkgs.buildPythonApplication rec {
     "websploit"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "High level MITM framework";
     homepage = "https://github.com/f4rih/websploit";
     changelog = "https://github.com/f4rih/websploit/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ emilytrau ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emilytrau ];
     mainProgram = "websploit";
   };
 }
diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix
index 2f12a878274e..4ba092e2ac1e 100644
--- a/pkgs/by-name/we/weggli/package.nix
+++ b/pkgs/by-name/we/weggli/package.nix
@@ -26,13 +26,13 @@ rustPlatform.buildRustPackage rec {
     version = "weggli ${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Weggli is a fast and robust semantic search tool for C and C++ codebases";
     homepage = "https://github.com/weggli-rs/weggli";
     changelog = "https://github.com/weggli-rs/weggli/releases/tag/v${version}";
     mainProgram = "weggli";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       arturcygan
       mfrw
     ];
diff --git a/pkgs/by-name/wf/wf-recorder/package.nix b/pkgs/by-name/wf/wf-recorder/package.nix
index c52dc85fa9a5..94957e0b341b 100644
--- a/pkgs/by-name/wf/wf-recorder/package.nix
+++ b/pkgs/by-name/wf/wf-recorder/package.nix
@@ -53,13 +53,13 @@ stdenv.mkDerivation rec {
     libgbm
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Utility program for screen recording of wlroots-based compositors";
     inherit (src.meta) homepage;
     changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dywedir ];
+    platforms = lib.platforms.linux;
     mainProgram = "wf-recorder";
   };
 }
diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
index 8577be591b41..e21a419b5206 100644
--- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
+++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication {
     vobject
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/KnugiHK/Whatsapp-Chat-Exporter";
     description = "WhatsApp database parser";
     changelog = "https://github.com/KnugiHK/Whatsapp-Chat-Exporter/releases/tag/${version}";
@@ -36,9 +36,9 @@ python3Packages.buildPythonApplication {
       you the history of your WhatsApp conversations inHTML and JSON. Android
       Backup Crypt12, Crypt14 and Crypt15 supported.
     '';
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "wtsexporter";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bbenno
       EstebanMacanek
     ];
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index e91f348c20f9..8a7bb56adeb9 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
       installManPage ../xdg/widelands.6
     '';
 
-  meta = with lib; {
+  meta = {
     description = "RTS with multiple-goods economy";
     homepage = "https://widelands.org/";
     longDescription = ''
@@ -102,12 +102,12 @@ stdenv.mkDerivation rec {
     '';
     changelog = "https://github.com/widelands/widelands/releases/tag/v${version}";
     mainProgram = "widelands";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       raskin
       jcumming
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     hydraPlatforms = [ ];
   };
 }
diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix
index 7257c65b558e..fbe5e76b571d 100644
--- a/pkgs/by-name/wi/wiki-tui/package.nix
+++ b/pkgs/by-name/wi/wiki-tui/package.nix
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps=";
 
-  meta = with lib; {
+  meta = {
     description = "Simple and easy to use Wikipedia Text User Interface";
     homepage = "https://github.com/builditluc/wiki-tui";
     changelog = "https://github.com/Builditluc/wiki-tui/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       lom
       builditluc
       matthiasbeyer
diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix
index f93b064d00e6..1cd7486439c6 100644
--- a/pkgs/by-name/wi/win2xcur/package.nix
+++ b/pkgs/by-name/wi/win2xcur/package.nix
@@ -20,11 +20,11 @@ python3Packages.buildPythonPackage rec {
     wand
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools that convert cursors between the Windows (*.cur, *.ani) and Xcursor format";
     homepage = "https://github.com/quantum5/win2xcur";
     changelog = "https://github.com/quantum5/win2xcur/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ teatwig ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ teatwig ];
   };
 }
diff --git a/pkgs/by-name/wi/wishlist/package.nix b/pkgs/by-name/wi/wishlist/package.nix
index cbb5a316614f..70e6459f27f1 100644
--- a/pkgs/by-name/wi/wishlist/package.nix
+++ b/pkgs/by-name/wi/wishlist/package.nix
@@ -25,12 +25,12 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Single entrypoint for multiple SSH endpoints";
     homepage = "https://github.com/charmbracelet/wishlist";
     changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       caarlos0
       penguwin
     ];
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index 39e7cb72aae3..51bb59b5cc35 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -52,7 +52,7 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target";
     longDescription = ''
       Witness prevents tampering of build materials and verifies the integrity
@@ -66,8 +66,8 @@ buildGoModule rec {
     mainProgram = "witness";
     homepage = "https://github.com/testifysec/witness";
     changelog = "https://github.com/testifysec/witness/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       fkautz
       jk
     ];
diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index 2fc26e2c3836..29f59538cc6d 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -75,17 +75,17 @@ rustPlatform.buildRustPackage rec {
       --zsh target/completions/_wl-paste
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line copy/paste utilities for Wayland, written in Rust";
     homepage = "https://github.com/YaLTeR/wl-clipboard-rs";
     changelog = "https://github.com/YaLTeR/wl-clipboard-rs/blob/v${version}/CHANGELOG.md";
-    platforms = platforms.linux;
-    license = with licenses; [
+    platforms = lib.platforms.linux;
+    license = with lib.licenses; [
       asl20
       mit
     ];
     mainProgram = "wl-clip";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       thiagokokada
       donovanglover
     ];
diff --git a/pkgs/by-name/wl/wlsunset/package.nix b/pkgs/by-name/wl/wlsunset/package.nix
index c79382a36a4e..e46433eb715d 100644
--- a/pkgs/by-name/wl/wlsunset/package.nix
+++ b/pkgs/by-name/wl/wlsunset/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     wayland-protocols
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Day/night gamma adjustments for Wayland";
     longDescription = ''
       Day/night gamma adjustments for Wayland compositors supporting
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://sr.ht/~kennylevinsen/wlsunset/";
     changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
     mainProgram = "wlsunset";
   };
 }
diff --git a/pkgs/by-name/wo/wob/package.nix b/pkgs/by-name/wo/wob/package.nix
index 9c1ab6114cf3..dd01c61248aa 100644
--- a/pkgs/by-name/wo/wob/package.nix
+++ b/pkgs/by-name/wo/wob/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = lib.optional stdenv.hostPlatform.isLinux "-Dseccomp=enabled";
 
-  meta = with lib; {
+  meta = {
     inherit (src.meta) homepage;
     description = "Lightweight overlay bar for Wayland";
     longDescription = ''
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
       inspired by xob.
     '';
     changelog = "https://github.com/francma/wob/releases/tag/${version}";
-    license = licenses.isc;
-    maintainers = with maintainers; [ primeos ];
-    platforms = platforms.linux;
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ primeos ];
+    platforms = lib.platforms.linux;
     mainProgram = "wob";
   };
 }
diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 31f5d450ff34..73e5abc30e12 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -32,12 +32,12 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion { package = woodpecker-plugin-git; };
 
-  meta = with lib; {
+  meta = {
     description = "Woodpecker plugin for cloning Git repositories";
     homepage = "https://woodpecker-ci.org/";
     changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "plugin-git";
-    maintainers = with maintainers; [ ambroisie ];
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }
diff --git a/pkgs/by-name/wo/wormhole-william/package.nix b/pkgs/by-name/wo/wormhole-william/package.nix
index aedb6c88177a..042627610880 100644
--- a/pkgs/by-name/wo/wormhole-william/package.nix
+++ b/pkgs/by-name/wo/wormhole-william/package.nix
@@ -37,12 +37,12 @@ buildGoModule rec {
       --zsh <($out/bin/wormhole-william shell-completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/psanford/wormhole-william";
     description = "End-to-end encrypted file transfers";
     changelog = "https://github.com/psanford/wormhole-william/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ psanford ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ psanford ];
     mainProgram = "wormhole-william";
   };
 }
diff --git a/pkgs/by-name/wp/wp-cli/package.nix b/pkgs/by-name/wp/wp-cli/package.nix
index c2ce0e6a9d3f..cdd3f8eb5f00 100644
--- a/pkgs/by-name/wp/wp-cli/package.nix
+++ b/pkgs/by-name/wp/wp-cli/package.nix
@@ -75,13 +75,13 @@ stdenv.mkDerivation (finalAttrs: {
     $out/bin/wp --info
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line interface for WordPress";
     homepage = "https://wp-cli.org";
-    changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.all;
+    changelog = "https://github.com/wp-cli/wp-cli/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.all;
     mainProgram = "wp";
   };
 })
diff --git a/pkgs/by-name/ws/wsl-vpnkit/package.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix
index 22d4b341d496..ee3eeb5a39cb 100644
--- a/pkgs/by-name/ws/wsl-vpnkit/package.nix
+++ b/pkgs/by-name/ws/wsl-vpnkit/package.nix
@@ -75,12 +75,12 @@ resholve.mkDerivation {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Provides network connectivity to Windows Subsystem for Linux (WSL) when blocked by VPN";
     homepage = "https://github.com/sakai135/wsl-vpnkit";
     changelog = "https://github.com/sakai135/wsl-vpnkit/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ terlar ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ terlar ];
     mainProgram = "wsl-vpnkit";
   };
 }
diff --git a/pkgs/by-name/ws/wslu/package.nix b/pkgs/by-name/ws/wslu/package.nix
index 43fb9cbbfafc..ecd287cf3873 100644
--- a/pkgs/by-name/ws/wslu/package.nix
+++ b/pkgs/by-name/ws/wslu/package.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
     "PREFIX="
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Collection of utilities for Windows Subsystem for Linux";
     homepage = "https://github.com/wslutilities/wslu";
     changelog = "https://github.com/wslutilities/wslu/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jamiemagee ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ jamiemagee ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix
index d4f638264b13..49066e647a2b 100644
--- a/pkgs/by-name/wt/wtfutil/package.nix
+++ b/pkgs/by-name/wt/wtfutil/package.nix
@@ -50,16 +50,16 @@ buildGoModule rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Personal information dashboard for your terminal";
     homepage = "https://wtfutil.com/";
     changelog = "https://github.com/wtfutil/wtf/raw/v${version}/CHANGELOG.md";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
       xiaoxiangmoe
       kalbasit
     ];
     mainProgram = "wtfutil";
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/wu/wush/package.nix b/pkgs/by-name/wu/wush/package.nix
index 884c0e590143..9990bd6ed676 100644
--- a/pkgs/by-name/wu/wush/package.nix
+++ b/pkgs/by-name/wu/wush/package.nix
@@ -25,12 +25,12 @@ buildGoModule {
 
   env.CGO_ENABLED = 0;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/coder/wush";
     description = "Transfer files between computers via WireGuard";
     changelog = "https://github.com/coder/wush/releases/tag/v${version}";
-    license = licenses.cc0;
+    license = lib.licenses.cc0;
     mainProgram = "wush";
-    maintainers = with maintainers; [ abbe ];
+    maintainers = with lib.maintainers; [ abbe ];
   };
 }
diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
index eed7fed90f28..654491f0bbba 100644
--- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
+++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix
@@ -37,12 +37,12 @@ python3Packages.buildPythonApplication rec {
   # no tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v${version}";
     description = "Wyoming Server for Faster Whisper";
     homepage = "https://github.com/rhasspy/wyoming-faster-whisper";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "wyoming-faster-whisper";
   };
 }
diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
index 83339d62cee5..3bd4d66c7431 100644
--- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix
+++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
@@ -37,12 +37,12 @@ python3Packages.buildPythonApplication rec {
     "wyoming_openwakeword"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/rhasspy/wyoming-openwakeword/blob/v${version}/CHANGELOG.md";
     description = "Open source voice assistant toolkit for many human languages";
     homepage = "https://github.com/rhasspy/wyoming-openwakeword";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "wyoming-openwakeword";
   };
 }
diff --git a/pkgs/by-name/xa/xandikos/package.nix b/pkgs/by-name/xa/xandikos/package.nix
index 0a686691caa3..e522d56bee4e 100644
--- a/pkgs/by-name/xa/xandikos/package.nix
+++ b/pkgs/by-name/xa/xandikos/package.nix
@@ -39,12 +39,12 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight CalDAV/CardDAV server";
     homepage = "https://github.com/jelmer/xandikos";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS";
-    maintainers = with maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "xandikos";
   };
 }
diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix
index 085b9f874f7b..4c55b587b193 100644
--- a/pkgs/by-name/xc/xcat/package.nix
+++ b/pkgs/by-name/xc/xcat/package.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
   doCheck = false;
   pythonImportsCheck = [ "xcat" ];
 
-  meta = with lib; {
+  meta = {
     description = "XPath injection tool";
     mainProgram = "xcat";
     longDescription = ''
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/orf/xcat";
     changelog = "https://github.com/orf/xcat/releases/tag/v${version}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/xc/xcrawl3r/package.nix b/pkgs/by-name/xc/xcrawl3r/package.nix
index 90dabee0168c..c81aba9fd2d5 100644
--- a/pkgs/by-name/xc/xcrawl3r/package.nix
+++ b/pkgs/by-name/xc/xcrawl3r/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI utility to recursively crawl webpages";
     homepage = "https://github.com/hueristiq/xcrawl3r";
     changelog = "https://github.com/hueristiq/xcrawl3r/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "xcrawl3r";
   };
 }
diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix
index 33d5ee2ff070..4ae000b5cb52 100644
--- a/pkgs/by-name/xe/xeol/package.nix
+++ b/pkgs/by-name/xe/xeol/package.nix
@@ -29,12 +29,12 @@ buildGoModule rec {
     "-X=main.gitDescription=${src.rev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Scanner for end-of-life (EOL) software and dependencies in container images, filesystems, and SBOMs";
     homepage = "https://github.com/xeol-io/xeol";
     changelog = "https://github.com/xeol-io/xeol/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "xeol";
   };
 }
diff --git a/pkgs/by-name/xf/xfig/package.nix b/pkgs/by-name/xf/xfig/package.nix
index f53ccd161b1f..f88b70103928 100644
--- a/pkgs/by-name/xf/xfig/package.nix
+++ b/pkgs/by-name/xf/xfig/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://sourceforge.net/p/mcj/xfig/ci/${version}/tree/CHANGES";
     description = "Interactive drawing tool for X11";
     mainProgram = "xfig";
diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix
index 73e497710209..f4eb72204ff7 100644
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec {
 
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     description = "Simple, high performance and secure live media server in pure Rust (RTMP[cluster]/RTSP/WebRTC[whip/whep]/HTTP-FLV/HLS";
     homepage = "https://github.com/harlanc/xiu";
     changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cafkafk ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cafkafk ];
     mainProgram = "xiu";
   };
 }
diff --git a/pkgs/by-name/xn/xnlinkfinder/package.nix b/pkgs/by-name/xn/xnlinkfinder/package.nix
index 663f659aadd3..3aae5a3ad5c2 100644
--- a/pkgs/by-name/xn/xnlinkfinder/package.nix
+++ b/pkgs/by-name/xn/xnlinkfinder/package.nix
@@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "xnLinkFinder" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target";
     homepage = "https://github.com/xnl-h4ck3r/xnLinkFinder";
     changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "xnLinkFinder";
   };
 }
diff --git a/pkgs/by-name/xo/xortool/package.nix b/pkgs/by-name/xo/xortool/package.nix
index b570a909e5f0..4ff1df19365c 100644
--- a/pkgs/by-name/xo/xortool/package.nix
+++ b/pkgs/by-name/xo/xortool/package.nix
@@ -28,11 +28,11 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "xortool" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool to analyze multi-byte XOR cipher";
     homepage = "https://github.com/hellman/xortool";
     changelog = "https://github.com/hellman/xortool/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix
index 423d2cd20a87..5eb825e97099 100644
--- a/pkgs/by-name/xp/xpano/package.nix
+++ b/pkgs/by-name/xp/xpano/package.nix
@@ -52,13 +52,13 @@ stdenv.mkDerivation rec {
     "-DXPANO_INSTALL_DESKTOP_FILES=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Panorama stitching tool";
     mainProgram = "Xpano";
     homepage = "https://krupkat.github.io/xpano/";
     changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ krupkat ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ krupkat ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 67c153fb2983..ceca00e58643 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -141,17 +141,17 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform shell connection hub and remote file manager";
     homepage = "https://github.com/xpipe-io/${pname}";
     downloadPage = "https://github.com/xpipe-io/${pname}/releases/latest";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     changelog = "https://github.com/xpipe-io/${pname}/releases/tag/${version}";
     license = [
-      licenses.asl20
-      licenses.unfree
+      lib.licenses.asl20
+      lib.licenses.unfree
     ];
-    maintainers = with maintainers; [ crschnick ];
+    maintainers = with lib.maintainers; [ crschnick ];
     platforms = [ "x86_64-linux" ];
     mainProgram = pname;
   };
diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
index c70444ee16c6..69262896eec8 100644
--- a/pkgs/by-name/xs/xsubfind3r/package.nix
+++ b/pkgs/by-name/xs/xsubfind3r/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI utility to find subdomains from curated passive online sources";
     homepage = "https://github.com/hueristiq/xsubfind3r";
     changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "xsubfind3r";
   };
 }
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index cadab5c8ba7d..937b4c764616 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -30,12 +30,12 @@ buildGoModule rec {
     package = yamlfmt;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Extensible command line tool or library to format yaml files";
     homepage = "https://github.com/google/yamlfmt";
     changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ sno2wman ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ sno2wman ];
     mainProgram = "yamlfmt";
   };
 }
diff --git a/pkgs/by-name/ya/yamlpath/package.nix b/pkgs/by-name/ya/yamlpath/package.nix
index 9f5fa770d681..36d46665e8a1 100644
--- a/pkgs/by-name/ya/yamlpath/package.nix
+++ b/pkgs/by-name/ya/yamlpath/package.nix
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
     "yamlpath"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line processors for YAML/JSON/Compatible data";
     homepage = "https://github.com/wwkimball/yamlpath";
     changelog = "https://github.com/wwkimball/yamlpath/releases/tag/v${version}";
@@ -45,8 +45,8 @@ python3.pkgs.buildPythonApplication rec {
       Command-line get/set/merge/validate/scan/convert/diff processors for YAML/JSON/Compatible data
       using powerful, intuitive, command-line friendly syntax
     '';
-    license = licenses.isc;
-    maintainers = with maintainers; [ Flakebi ];
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ Flakebi ];
 
     # No support for ruamel.yaml > 0.17.21
     # https://github.com/wwkimball/yamlpath/issues/217
diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix
index 34574c744c14..2e9417d235b5 100644
--- a/pkgs/by-name/ya/yara/package.nix
+++ b/pkgs/by-name/ya/yara/package.nix
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
 
   doCheck = enableStatic;
 
-  meta = with lib; {
+  meta = {
     description = "Tool to perform pattern matching for malware-related tasks";
     homepage = "http://Virustotal.github.io/yara/";
     changelog = "https://github.com/VirusTotal/yara/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "yara";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix
index cc3a5581b56a..1968875a61e6 100644
--- a/pkgs/by-name/ya/yarr/package.nix
+++ b/pkgs/by-name/ya/yarr/package.nix
@@ -42,13 +42,13 @@ buildGoModule rec {
     tests = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.yarr;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Yet another rss reader";
     mainProgram = "yarr";
     homepage = "https://github.com/nkanaev/yarr";
     changelog = "https://github.com/nkanaev/yarr/blob/v${version}/doc/changelog.txt";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       sikmir
       christoph-heiss
     ];
diff --git a/pkgs/by-name/ya/yatas/package.nix b/pkgs/by-name/ya/yatas/package.nix
index bd3e776c0cec..d9b9b23854e8 100644
--- a/pkgs/by-name/ya/yatas/package.nix
+++ b/pkgs/by-name/ya/yatas/package.nix
@@ -17,12 +17,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-zp5EVJe5Q6o6C0CZ8u+oEFEOy0NU5SgVN+cSc6A/jZ4=";
 
-  meta = with lib; {
+  meta = {
     description = "Tool to audit AWS infrastructure for misconfiguration or potential security issues";
     homepage = "https://github.com/padok-team/YATAS";
     changelog = "https://github.com/padok-team/YATAS/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "yatas";
   };
 }
diff --git a/pkgs/by-name/yl/yle-dl/package.nix b/pkgs/by-name/yl/yle-dl/package.nix
index 25579121bce6..d2b258ae75f1 100644
--- a/pkgs/by-name/yl/yle-dl/package.nix
+++ b/pkgs/by-name/yl/yle-dl/package.nix
@@ -48,13 +48,13 @@ python3Packages.buildPythonApplication rec {
     command = "yle-dl -h";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
     homepage = "https://aajanki.github.io/yle-dl/";
     changelog = "https://github.com/aajanki/yle-dl/blob/${version}/ChangeLog";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dezgeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.unix;
     mainProgram = "yle-dl";
   };
 }
diff --git a/pkgs/by-name/yo/yor/package.nix b/pkgs/by-name/yo/yor/package.nix
index 84f5eb42427b..8025137a2bc1 100644
--- a/pkgs/by-name/yo/yor/package.nix
+++ b/pkgs/by-name/yo/yor/package.nix
@@ -33,11 +33,11 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Extensible auto-tagger for your IaC files. The ultimate way to link entities in the cloud back to the codified resource which created it";
     homepage = "https://github.com/bridgecrewio/yor";
     changelog = "https://github.com/bridgecrewio/yor/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivankovnatsky ];
   };
 }
diff --git a/pkgs/by-name/yo/you-get/package.nix b/pkgs/by-name/yo/you-get/package.nix
index 2e4b9087713b..c9a32a82e0db 100644
--- a/pkgs/by-name/yo/you-get/package.nix
+++ b/pkgs/by-name/yo/you-get/package.nix
@@ -42,12 +42,12 @@ python3.pkgs.buildPythonApplication rec {
     "you_get"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tiny command line utility to download media contents from the web";
     homepage = "https://you-get.org";
     changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ryneeverett ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ryneeverett ];
     mainProgram = "you-get";
   };
 }
diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix
index 66aa0c0940cd..8c8d1994fc60 100644
--- a/pkgs/by-name/yo/youki/package.nix
+++ b/pkgs/by-name/yo/youki/package.nix
@@ -56,13 +56,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-nRlvvr73glmpFsWb2Pi1icZl7d85/8iX2rHnNXv4ep8=";
 
-  meta = with lib; {
+  meta = {
     description = "Container runtime written in Rust";
     homepage = "https://containers.github.io/youki/";
     changelog = "https://github.com/containers/youki/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ builditluc ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ builditluc ];
+    platforms = lib.platforms.linux;
     mainProgram = "youki";
   };
 }
diff --git a/pkgs/by-name/zb/zbctl/package.nix b/pkgs/by-name/zb/zbctl/package.nix
index f5c72fb60ffc..4e04d7b42474 100644
--- a/pkgs/by-name/zb/zbctl/package.nix
+++ b/pkgs/by-name/zb/zbctl/package.nix
@@ -34,18 +34,18 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line interface to interact with Camunda 8 and Zeebe";
     homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/";
     downloadPage = "https://github.com/camunda/zeebe/releases";
     changelog = "https://github.com/camunda/zeebe/releases/tag/${version}";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.asl20;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.asl20;
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
     ];
-    maintainers = with maintainers; [ thetallestjj ];
+    maintainers = with lib.maintainers; [ thetallestjj ];
     longDescription = ''
       A command line interface for Camunda Platform 8 designed to create and read resources inside a Zeebe broker.
       It can be used for regular development and maintenance tasks such as:
diff --git a/pkgs/by-name/ze/zed/package.nix b/pkgs/by-name/ze/zed/package.nix
index 72db6bcb5d4c..fc0e86e9647c 100644
--- a/pkgs/by-name/ze/zed/package.nix
+++ b/pkgs/by-name/ze/zed/package.nix
@@ -40,12 +40,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Novel data lake based on super-structured data";
     homepage = "https://zed.brimdata.io";
     changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       dit7ya
       knl
     ];
diff --git a/pkgs/by-name/ze/zeek/package.nix b/pkgs/by-name/ze/zeek/package.nix
index 67bf7bbb9b1f..95ae96c323f6 100644
--- a/pkgs/by-name/ze/zeek/package.nix
+++ b/pkgs/by-name/ze/zeek/package.nix
@@ -107,15 +107,15 @@ stdenv.mkDerivation rec {
     inherit broker;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Network analysis framework much different from a typical IDS";
     homepage = "https://www.zeek.org";
     changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       pSub
       tobim
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix
index 476fc11018a7..fc81ec1b707c 100644
--- a/pkgs/by-name/ze/zeekscript/package.nix
+++ b/pkgs/by-name/ze/zeekscript/package.nix
@@ -31,12 +31,12 @@ python3.pkgs.buildPythonApplication rec {
     "zeekscript"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Zeek script formatter and analyzer";
     homepage = "https://github.com/zeek/zeekscript";
     changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       fab
       tobim
     ];
diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix
index f0017eb84c8c..e14026cb1347 100644
--- a/pkgs/by-name/zf/zfind/package.nix
+++ b/pkgs/by-name/zf/zfind/package.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     "main.appVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CLI for file search with SQL like syntax.";
     longDescription = ''
       zfind allows you to search for files, including inside tar, zip, 7z and rar archives.
@@ -30,8 +30,8 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/laktak/zfind";
     changelog = "https://github.com/laktak/zfind/releases/tag/v${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "zfind";
-    maintainers = with maintainers; [ eeedean ];
+    maintainers = with lib.maintainers; [ eeedean ];
   };
 }
diff --git a/pkgs/by-name/zf/zfs-autobackup/package.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix
index cb5962321e37..fd1b5e60675d 100644
--- a/pkgs/by-name/zf/zfs-autobackup/package.nix
+++ b/pkgs/by-name/zf/zfs-autobackup/package.nix
@@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "zfs_autobackup" ];
 
-  meta = with lib; {
+  meta = {
     description = "ZFS backup, replicationand snapshot tool";
     homepage = "https://github.com/psy0rz/zfs_autobackup";
     changelog = "https://github.com/psy0rz/zfs_autobackup/releases/tag/v${version}";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
index 91485153133b..235a25af498e 100644
--- a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix
@@ -31,18 +31,18 @@ buildNpmPackage rec {
   passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_1;
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${version}";
     description = "Zigbee to MQTT bridge using zigbee-shepherd";
     homepage = "https://github.com/Koenkk/zigbee2mqtt";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     longDescription = ''
       Allows you to use your Zigbee devices without the vendor's bridge or gateway.
 
       It bridges events and allows you to control your Zigbee devices via MQTT.
       In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using.
     '';
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       sweber
       hexa
     ];
diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix
index c90fdfba6c5a..9cf7036183ab 100644
--- a/pkgs/by-name/zi/zile/package.nix
+++ b/pkgs/by-name/zi/zile/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
   gl_cv_func_fstatat_zero_flag = "yes";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.gnu.org/software/zile/";
     changelog = "https://git.savannah.gnu.org/cgit/zile.git/plain/NEWS?h=v${version}";
     description = "Zile Implements Lua Editors";
@@ -78,9 +78,9 @@ stdenv.mkDerivation rec {
       Lossy Emacs.  Zile has been written to be as similar as possible to Emacs;
       every Emacs user should feel at home.
     '';
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pSub ];
+    platforms = lib.platforms.unix;
     mainProgram = "zile";
   };
 }
diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix
index 63d15210ffb2..8330816d8e55 100644
--- a/pkgs/by-name/zi/zim/package.nix
+++ b/pkgs/by-name/zi/zim/package.nix
@@ -66,12 +66,12 @@ python3Packages.buildPythonApplication rec {
     ${python3Packages.python.interpreter} test.py
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Desktop wiki";
     homepage = "https://zim-wiki.org/";
     changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pSub ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ pSub ];
     mainProgram = "zim";
     broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790
   };
diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix
index d592b14611f7..fb9ebf1f2cd3 100644
--- a/pkgs/by-name/zi/zine/package.nix
+++ b/pkgs/by-name/zi/zine/package.nix
@@ -31,12 +31,12 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple and opinionated tool to build your own magazine";
     homepage = "https://github.com/zineland/zine";
     changelog = "https://github.com/zineland/zine/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       dit7ya
       figsoda
     ];
diff --git a/pkgs/by-name/zk/zkar/package.nix b/pkgs/by-name/zk/zkar/package.nix
index c541c980dc4a..a31fde198a15 100644
--- a/pkgs/by-name/zk/zkar/package.nix
+++ b/pkgs/by-name/zk/zkar/package.nix
@@ -22,12 +22,12 @@ buildGoModule rec {
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Java serialization protocol analysis tool";
     homepage = "https://github.com/phith0n/zkar";
     changelog = "https://github.com/phith0n/zkar/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "zkar";
   };
 }
diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix
index 9014dec615c5..2d59b4a35f00 100644
--- a/pkgs/by-name/zo/zola/package.nix
+++ b/pkgs/by-name/zo/zola/package.nix
@@ -44,13 +44,13 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests.version = testers.testVersion { package = zola; };
 
-  meta = with lib; {
+  meta = {
     description = "Fast static site generator with everything built-in";
     mainProgram = "zola";
     homepage = "https://www.getzola.org/";
     changelog = "https://github.com/getzola/zola/raw/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       dandellion
       dywedir
       _0x4A6F
diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix
index 192cba33efcd..7e0cad01d7e3 100644
--- a/pkgs/by-name/zo/zookeeper/package.nix
+++ b/pkgs/by-name/zo/zookeeper/package.nix
@@ -50,17 +50,17 @@ stdenv.mkDerivation rec {
     inherit jre;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://zookeeper.apache.org";
     description = "Apache Zookeeper";
     changelog = "https://zookeeper.apache.org/doc/r${version}/releasenotes.html";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       nathan-gs
       pradeepchhetri
       ztzg
     ];
-    platforms = platforms.unix;
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    platforms = lib.platforms.unix;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
 }
diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix
index 6d59e9786ea5..bcd33cc1d65f 100644
--- a/pkgs/by-name/zo/zoxide/package.nix
+++ b/pkgs/by-name/zo/zoxide/package.nix
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec {
       --zsh contrib/completions/_zoxide
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Fast cd command that learns your habits";
     homepage = "https://github.com/ajeetdsouza/zoxide";
     changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [
       ysndr
       cole-h
       SuperSandro2000
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index 9408d844e349..065642d495db 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
       --replace Exec=zps Exec=$out/zps \
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Small utility for listing and reaping zombie processes on GNU/Linux";
     homepage = "https://github.com/orhun/zps";
     changelog = "https://github.com/orhun/zps/releases/tag/${version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ figsoda ];
+    platforms = lib.platforms.linux;
     mainProgram = "zps";
   };
 }
diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix
index 9f6a293f0381..84e49f4e4db3 100644
--- a/pkgs/by-name/zs/zs/package.nix
+++ b/pkgs/by-name/zs/zs/package.nix
@@ -35,12 +35,12 @@ buildGoModule rec {
       --zsh <($out/bin/zs completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extremely minimal static site generator written in Go";
     homepage = "https://git.mills.io/prologic/zs";
     changelog = "https://git.mills.io/prologic/zs/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ adtya ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ adtya ];
     mainProgram = "zs";
   };
 }
diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix
index 07569ac9ce9f..e55aedc79ee2 100644
--- a/pkgs/by-name/zs/zsh-wd/package.nix
+++ b/pkgs/by-name/zs/zsh-wd/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
     installShellCompletion --zsh _wd.sh
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Jump to custom directories in zsh";
     longDescription = ''
       `wd` (warp directory) lets you jump to custom directories in zsh, without
@@ -34,9 +34,9 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://github.com/mfaerevaag/wd";
     changelog = "https://github.com/mfaerevaag/wd/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.zimeg ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.zimeg ];
     mainProgram = "wd";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix
index 45b1a8a565da..d8e3da694844 100644
--- a/pkgs/by-name/zu/zulip-term/package.nix
+++ b/pkgs/by-name/zu/zulip-term/package.nix
@@ -78,11 +78,11 @@ buildPythonApplication rec {
     (lib.makeBinPath [ libnotify ])
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Zulip's official terminal client";
     homepage = "https://github.com/zulip/zulip-terminal";
     changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/by-name/zx/zxfer/package.nix b/pkgs/by-name/zx/zxfer/package.nix
index d44eb8947779..621e4455df13 100644
--- a/pkgs/by-name/zx/zxfer/package.nix
+++ b/pkgs/by-name/zx/zxfer/package.nix
@@ -77,11 +77,11 @@ resholve.mkDerivation rec {
     execer = [ "cannot:${rsync}/bin/rsync" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Popular script for managing ZFS snapshot replication";
     homepage = "https://github.com/allanjude/zxfer";
     changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ urandom ];
     mainProgram = "zxfer";
   };
diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix
index f02b1e6b1713..e358c8b9a1d3 100644
--- a/pkgs/by-name/zy/zydis/package.nix
+++ b/pkgs/by-name/zy/zydis/package.nix
@@ -34,15 +34,15 @@ stdenv.mkDerivation rec {
   nativeCheckInputs = [ python3 ];
   passthru = { inherit zycore; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://zydis.re/";
     changelog = "https://github.com/zyantific/zydis/releases/tag/v${version}";
     description = "Fast and lightweight x86/x86-64 disassembler library";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       jbcrail
       athre0z
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix
index 867c3a3e890f..effdb4b4bd4e 100644
--- a/pkgs/by-name/zz/zziplib/package.nix
+++ b/pkgs/by-name/zz/zziplib/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     "-DBUILDTESTS=OFF"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/gdraheim/zziplib";
     changelog = "https://github.com/gdraheim/zziplib/blob/${version}/ChangeLog";
     description = "Library to extract data from files archived in a zip file";
@@ -59,11 +59,11 @@ stdenv.mkDerivation rec {
       The implementation is based only on the (free) subset of compression with
       the zlib algorithm which is actually used by the zip/unzip tools.
     '';
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl2Plus
       mpl11
     ];
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.unix;
   };
 }

From e3846c4216caf5ea1bcc1d7f69810186d22d1c0e Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sat, 31 May 2025 00:30:32 +0200
Subject: [PATCH 1430/1497] jenkins: Pin Java version to 21

Java 21 is the latest supported version by Jenkins. In order to not get
any unexpected issues, pin the Java package to 21.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index c692d25eda70..1cb0d7d042c6 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -8,7 +8,7 @@
   gnused,
   makeWrapper,
   nix,
-  openjdk,
+  jdk21,
   writeScript,
   nixosTests,
   jq,
@@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
     cp "$src" "$out/webapps/jenkins.war"
 
     # Create the `jenkins-cli` command.
-    ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
+    ${jdk21}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
       && mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar"
 
-    makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \
+    makeWrapper "${jdk21}/bin/java" "$out/bin/jenkins-cli" \
       --add-flags "-jar $out/share/jenkins-cli.jar"
   '';
 

From 640036c10ee78ad7cff305c462cb6342a961b58f Mon Sep 17 00:00:00 2001
From: h4rl <h4rldev@proton.me>
Date: Mon, 26 May 2025 12:21:36 +0200
Subject: [PATCH 1431/1497] miniaudio: export miniaudio header

---
 pkgs/by-name/mi/miniaudio/package.nix | 34 +++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mi/miniaudio/package.nix b/pkgs/by-name/mi/miniaudio/package.nix
index 5f591c1cecba..adece2e438ce 100644
--- a/pkgs/by-name/mi/miniaudio/package.nix
+++ b/pkgs/by-name/mi/miniaudio/package.nix
@@ -2,32 +2,52 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  testers,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "miniaudio";
   version = "0.11.22";
 
   src = fetchFromGitHub {
     owner = "mackron";
     repo = "miniaudio";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=";
   };
 
-  installPhase = ''
-    mkdir -p $out
-    cp -r $src/* $out/
+  postInstall = ''
+    mkdir -p $out/include
+    mkdir -p $out/lib/pkgconfig
+
+    cp $src/miniaudio.h $out/include
+    ln -s $out/include/miniaudio.h $out
+
+    cp -r $src/extras $out/
+
+    cat <<EOF >$out/lib/pkgconfig/miniaudio.pc
+    prefix=$out
+    includedir=$out/include
+
+    Name: miniaudio
+    Description: An audio playback and capture library in a single source file.
+    Version: $version
+    Cflags: -I$out/include
+    Libs: -lm -lpthread -latomic
+    EOF
   '';
 
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
   meta = with lib; {
     description = "Single header audio playback and capture library written in C";
     homepage = "https://github.com/mackron/miniaudio";
-    changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/mackron/miniaudio/blob/${finalAttrs.version}/CHANGES.md";
     license = with licenses; [
       unlicense # or
       mit0
     ];
     maintainers = [ maintainers.jansol ];
+    pkgConfigModules = [ "miniaudio" ];
     platforms = platforms.all;
   };
-}
+})

From f29a5f158bbc56a2f84ed13a352c8a2316d3f7b8 Mon Sep 17 00:00:00 2001
From: h4rl <h4rldev@proton.me>
Date: Sat, 7 Jun 2025 02:31:42 +0200
Subject: [PATCH 1432/1497] ja2-stracciatella: mark as broken

---
 pkgs/by-name/ja/ja2-stracciatella/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ja/ja2-stracciatella/package.nix b/pkgs/by-name/ja/ja2-stracciatella/package.nix
index 3fb6f4dea863..5ced41656169 100644
--- a/pkgs/by-name/ja/ja2-stracciatella/package.nix
+++ b/pkgs/by-name/ja/ja2-stracciatella/package.nix
@@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    # Fails to build on x86_64-linux as of 2025-03-16 and potentially earlier
+    broken = true;
     description = "Jagged Alliance 2, with community fixes";
     license = "SFI Source Code license agreement";
     homepage = "https://ja2-stracciatella.github.io/";

From 6686a3e463cf1615d8ea6d6560b69b6509594684 Mon Sep 17 00:00:00 2001
From: vys <hey@vyslix.dev>
Date: Fri, 6 Jun 2025 17:54:34 -0400
Subject: [PATCH 1433/1497] osu-lazer{,-bin}: 2025.605.3 -> 2025.607.0

osu-lazer: 2025.605.3 -> 2025.607.0

osu-lazer-bin: 2025.605.3 -> 2025.607.0

chore: formatted files

fixed review conflicts
---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 pkgs/by-name/os/osu-lazer/package.nix     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 78aeecb40979..de1fa81330ee 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.605.3";
+  version = "2025.607.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
+        hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
+        hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
+        hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 49bff7b68c97..057b16df671e 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.605.3";
+  version = "2025.607.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
+    hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From ba4aba08b3631a74a0fa09415837560fa3d87c92 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 10:17:18 +0800
Subject: [PATCH 1434/1497] n2048: drop

---
 pkgs/by-name/n2/n2048/package.nix | 43 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/n2/n2048/package.nix

diff --git a/pkgs/by-name/n2/n2048/package.nix b/pkgs/by-name/n2/n2048/package.nix
deleted file mode 100644
index e28b685d9f52..000000000000
--- a/pkgs/by-name/n2/n2048/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  ncurses,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "n2048";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "http://www.dettus.net/n2048/n2048_v${finalAttrs.version}.tar.gz";
-    hash = "sha256-c4bHWmdQuwyRXIm/sqw3p71pMv6VLAzIuUTaDHIWn6A=";
-  };
-
-  env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=implicit-function-declaration"
-    ];
-  };
-
-  buildInputs = [
-    ncurses
-  ];
-
-  makeFlags = [
-    "DESTDIR=$(out)"
-  ];
-
-  preInstall = ''
-    mkdir -p "$out"/{share/man,bin}
-  '';
-
-  meta = {
-    description = "Console implementation of 2048 game";
-    mainProgram = "n2048";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
-    homepage = "http://www.dettus.net/n2048/";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 096df1a9a019..bdfad72c0b0f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1286,6 +1286,7 @@ mapAliases {
 
   ### N ###
 
+  n2048 = throw "'n2048' has been removed due to lack of maintenance upstream. Consider using '_2048-in-terminal'."; # Added 2025-06-07
   ncdu_2 = ncdu; # Added 2022-07-22
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28

From 25e90088b9d2580156a9ab1f06ecf7b793326100 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 11:25:46 +0800
Subject: [PATCH 1435/1497] soulseekqt: drop

---
 .../networking/p2p/soulseekqt/default.nix     | 68 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/soulseekqt/default.nix

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
deleted file mode 100644
index 2a7a3bb37e6a..000000000000
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchzip,
-  mkDerivation,
-  appimageTools,
-  autoPatchelfHook,
-  desktop-file-utils,
-  imagemagick,
-  qtmultimedia,
-}:
-
-mkDerivation rec {
-  pname = "soulseekqt";
-  version = "2018-1-30";
-
-  src = fetchzip {
-    url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz";
-    sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg";
-  };
-
-  appextracted = appimageTools.extractType2 {
-    inherit pname version;
-    src = "${src}/SoulseekQt-2018-1-30-64bit.AppImage";
-  };
-
-  dontBuild = true;
-  dontConfigure = true;
-
-  nativeBuildInputs = [
-    imagemagick
-    autoPatchelfHook
-    desktop-file-utils
-  ];
-  buildInputs = [
-    qtmultimedia
-    stdenv.cc.cc
-  ];
-
-  installPhase = ''
-    binary="$(realpath ${appextracted}/AppRun)"
-    install -Dm755 $binary -t $out/bin
-
-    # fixup and install desktop file
-    desktop-file-install --dir $out/share/applications \
-      --set-key Exec --set-value SoulseekQt \
-      --set-key Terminal --set-value false \
-      --set-key Comment --set-value "${meta.description}" \
-      --set-key Categories --set-value Network ${appextracted}/default.desktop
-    mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop
-    #TODO: write generic code to read icon path from $binary.desktop
-    icon="$(realpath ${appextracted}/.DirIcon)"
-    for size in 16 32 48 64 72 96 128 192 256 512 1024; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$(basename $icon)
-    done
-  '';
-
-  meta = with lib; {
-    description = "Official Qt SoulSeek client";
-    homepage = "https://www.slsknet.org";
-    mainProgram = "SoulseekQt";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = [ ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 096df1a9a019..5fc03e702b89 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1768,6 +1768,7 @@ mapAliases {
   snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   soldat-unstable = opensoldat; # Added 2022-07-02
+  soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
   soundOfSorting = sound-of-sorting; # Added 2023-07-07
   SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
   SPAdes = spades; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 339dc8a399fe..3c7cf42c5f0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13997,8 +13997,6 @@ with pkgs;
 
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
 
-  soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
-
   spek = callPackage ../applications/audio/spek {
     autoreconfHook = buildPackages.autoreconfHook269;
   };

From 2772bd1e38178d52ec612d85d66c99e2bef7d031 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 11:34:01 +0800
Subject: [PATCH 1436/1497] mmsd: drop

---
 pkgs/by-name/mm/mmsd/package.nix | 39 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/mm/mmsd/package.nix

diff --git a/pkgs/by-name/mm/mmsd/package.nix b/pkgs/by-name/mm/mmsd/package.nix
deleted file mode 100644
index f52ebf4cdcef..000000000000
--- a/pkgs/by-name/mm/mmsd/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  autoreconfHook,
-  pkg-config,
-  glib,
-  dbus,
-}:
-
-stdenv.mkDerivation {
-  pname = "mmsd";
-  version = "unstable-2019-07-15";
-
-  src = fetchzip {
-    url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git/snapshot/mmsd-f4b8b32477a411180be1823fdc460b4f7e1e3c9c.tar.gz";
-    sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-    dbus
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Multimedia Messaging Service Daemon";
-    homepage = "https://01.org/ofono";
-    license = licenses.gpl2Only;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 096df1a9a019..a871cb0803c6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1248,6 +1248,7 @@ mapAliases {
   minetestserver = luanti-server; # Added 2024-11-11
   minetest-touch = luanti-client; # Added 2024-08-12
   minizip2 = pkgs.minizip-ng; # Added 2022-12-28
+  mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
   mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
   mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17

From b943bef6150169cc64fbf3db341ac5330476a90a Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 7 Jun 2025 05:50:58 +0200
Subject: [PATCH 1437/1497] lazygit: 0.51.1 -> 0.52.0

Changelog: https://github.com/jesseduffield/lazygit/releases/tag/v0.52.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.51.1...v0.52.0
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 606212d479e2..7fe7f52e89a9 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${version}";
-    hash = "sha256-PktxVf+2xOpkZBHlm9oLV4WXoz9bNaXa+cvnI9RCcRA=";
+    hash = "sha256-tbFRovaB0f+0VyX34DEXvWYjV3fipc5kbRNhm7rVMlo=";
   };
 
   vendorHash = null;

From 10606ff13f72772a40767c9046f2b8e0242a8ffe Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 7 Jun 2025 12:37:18 +0800
Subject: [PATCH 1438/1497] xed: 2024.02.22 -> 2025.03.02

Diff: https://github.com/intelxed/xed/compare/v2024.02.22...v2025.03.02
---
 pkgs/by-name/xe/xed/package.nix | 70 +++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/xe/xed/package.nix b/pkgs/by-name/xe/xed/package.nix
index 1bb99548bb5e..a880dbb718e2 100644
--- a/pkgs/by-name/xe/xed/package.nix
+++ b/pkgs/by-name/xe/xed/package.nix
@@ -4,56 +4,92 @@
   fetchFromGitHub,
   python3Packages,
   llvmPackages,
+  installShellFiles,
+  nix-update-script,
 }:
 
 let
   # mbuild is a custom build system used only to build xed
   mbuild = python3Packages.buildPythonPackage rec {
     pname = "mbuild";
-    version = "2022.07.28";
+    version = "2024.11.04";
 
     src = fetchFromGitHub {
       owner = "intelxed";
       repo = "mbuild";
-      rev = "v${version}";
-      sha256 = "sha256-nVHHiaPbf+b+RntjUGjLLGS53e6c+seXIBx7AcTtiWU=";
+      tag = "v${version}";
+      hash = "sha256-iQVykBG3tEPxI1HmqBkvO1q+K8vi64qBfVC63/rcTOk=";
+    };
+
+    meta = {
+      description = "Python-based build system used for building XED";
+      homepage = "https://github.com/intelxed/mbuild";
+      license = lib.licenses.asl20;
     };
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xed";
-  version = "2024.02.22";
+  version = "2025.03.02";
 
   src = fetchFromGitHub {
     owner = "intelxed";
     repo = "xed";
-    rev = "v${version}";
-    sha256 = "sha256-LF4iJ1/Z3OifCiir/kU3ufZqtiRLeaJeAwuBqP2BCF4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-shQYgbUC06+x+3TNdOJA6y6Wea/8lqexkgBWk3AOOMA=";
   };
 
+  postPatch = ''
+    patchShebangs mfile.py
+  '';
+
   nativeBuildInputs = [
     mbuild
+    installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.bintools ];
 
   buildPhase = ''
-    patchShebangs mfile.py
+    runHook preBuild
 
     # this will build, test and install
     ./mfile.py test --prefix $out
-    ./mfile.py examples
-    mkdir -p $out/bin
-    cp ./obj/wkit/examples/obj/xed $out/bin/
+
+    runHook postBuild
   '';
 
-  dontInstall = true; # already installed during buildPhase
+  checkPhase = ''
+    runHook preCheck
 
-  meta = with lib; {
+    ./mfile.py examples
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin obj/wkit/examples/obj/xed
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit mbuild;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "mbuild"
+      ];
+    };
+  };
+
+  meta = {
     broken = stdenv.hostPlatform.isAarch64;
     description = "Intel X86 Encoder Decoder (Intel XED)";
     homepage = "https://intelxed.github.io/";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ arturcygan ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ arturcygan ];
   };
-}
+})

From e5693625983e3c1d7381983ee66433e7f5bdab27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 04:39:27 +0000
Subject: [PATCH 1439/1497] particle-cli: 3.35.11 -> 3.36.1

---
 pkgs/by-name/pa/particle-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix
index a9c92a460687..66864caab6c3 100644
--- a/pkgs/by-name/pa/particle-cli/package.nix
+++ b/pkgs/by-name/pa/particle-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "particle-cli";
-  version = "3.35.11";
+  version = "3.36.1";
 
   src = fetchFromGitHub {
     owner = "particle-iot";
     repo = "particle-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LqQAdyaNSyWDPZEZWnUT1NLbmRkuBVn4yUXgBlU5EUI=";
+    hash = "sha256-7u0RXoUBu/aJSBVSdmheIPvQ6b6Vji2KZ2t3sNhh3kY=";
   };
 
-  npmDepsHash = "sha256-CpDZrnOZFD42jIoyGCWiYoQgA2Bn2iwaOrSx0SdihTk=";
+  npmDepsHash = "sha256-0yLu3iyHQwWId+EAXu4dlCNHvuFZeEts2r5Y+FpHPQI=";
 
   buildInputs = [
     udev

From 305ed8d9cbbe5a20396f362a64cc716c4b7501a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 04:42:12 +0000
Subject: [PATCH 1440/1497] seaweedfs: 3.88 -> 3.89

---
 pkgs/by-name/se/seaweedfs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
index 68f2a0c3c845..0024c9c74e2d 100644
--- a/pkgs/by-name/se/seaweedfs/package.nix
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "3.88";
+  version = "3.89";
 
   src = fetchFromGitHub {
     owner = "seaweedfs";
     repo = "seaweedfs";
     rev = version;
-    hash = "sha256-66yZtRF+gMSafcXQoUJ0bMuBJMDHXvImCWB3vMze/K8=";
+    hash = "sha256-qIbqgcm+qqmbKU+BZ9wrKW16yH7qz5WPijtGz2pusNg=";
   };
 
-  vendorHash = "sha256-aSNmEY82ODnxtlnQG6dZWTQfZ+zKCqLtj0DfpPcu3ik=";
+  vendorHash = "sha256-Y1ST5wKIkVKOhNVV1V9eDZ5DupQNm9mcA90Kqt3dQYQ=";
 
   subPackages = [ "weed" ];
 

From 3f1dc43dde5cfbb09b5d20ee4e8340aefad3a9e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 05:30:17 +0000
Subject: [PATCH 1441/1497] logcheck: 1.4.4 -> 1.4.5

---
 pkgs/by-name/lo/logcheck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix
index 37ba09a68109..83c54e62f1c6 100644
--- a/pkgs/by-name/lo/logcheck/package.nix
+++ b/pkgs/by-name/lo/logcheck/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "logcheck";
-  version = "1.4.4";
+  version = "1.4.5";
   _name = "logcheck_${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
-    sha256 = "sha256-1A4aknB+GVgc3F8VlqVtJjlvGLBhYS6E+w+9lXvAOGQ=";
+    sha256 = "sha256-enUxHYVhdiDQLMAnQnRjx/mvIEHgL8k/W8Jda6PMrfE=";
   };
 
   prePatch = ''

From 7243228aef57e1ebd9a93f1af8c41cd82f903e2e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 7 Jun 2025 13:31:37 +0800
Subject: [PATCH 1442/1497] uv: 0.7.11 -> 0.7.12

---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 9b474a97c1ec..7e99995299bc 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.7.11";
+  version = "0.7.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY=";
+    hash = "sha256-0ZgsGADMTjVgKUKriBkq0AEldpFxmo/5MPLoShzREO4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA=";
+  cargoHash = "sha256-uvJQlTJrD5ZEbZykllBm/7LLdqOYFvkdNEZpSyVqct0=";
 
   buildInputs = [
     rust-jemalloc-sys

From bd23e60931e4cbe85f8fbefe350b92de277791ea Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 4 Jun 2025 23:48:54 +0200
Subject: [PATCH 1443/1497] Revert "libfaketime: 0.9.10 -> 0.9.11"

This reverts commit abeb33f662ae92b2d9a2d3080c480aef3bff3b0d as it break texlive on darwin
ref. https://github.com/NixOS/nixpkgs/pull/413916
ref. https://github.com/wolfcw/libfaketime/issues/499
---
 .../0001-Remove-unsupported-clang-flags.patch | 13 ++++++++++
 pkgs/by-name/li/libfaketime/package.nix       | 25 +++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch

diff --git a/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
new file mode 100644
index 000000000000..7dfad4978005
--- /dev/null
+++ b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 2af4804..bcff809 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -80,7 +80,7 @@ PREFIX ?= /usr/local
+ LIBDIRNAME ?= /lib/faketime
+ PLATFORM ?=$(shell uname)
+ 
+-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
+ ifeq ($(PLATFORM),SunOS)
+ CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
+ endif
diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 9c7847b94567..208680a40eb8 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -9,18 +9,33 @@
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
-  version = "0.9.11";
+  version = "0.9.10";
 
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
     rev = "v${version}";
-    sha256 = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
+    sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
   };
 
-  patches = [
-    ./nix-store-date.patch
-  ];
+  patches =
+    [
+      ./nix-store-date.patch
+      (fetchpatch {
+        name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
+        url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
+        sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo=";
+      })
+      (fetchpatch {
+        name = "LFS64.patch";
+        url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
+        hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
+      })
+    ]
+    ++ (lib.optionals stdenv.cc.isClang [
+      # https://github.com/wolfcw/libfaketime/issues/277
+      ./0001-Remove-unsupported-clang-flags.patch
+    ]);
 
   postPatch = ''
     patchShebangs test src

From 665e4c13be2141ab053d71cb3b40b1ad636eb68f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 5 Jun 2025 13:03:35 +0200
Subject: [PATCH 1444/1497] libfaketime: keep 0.9.11 on linux

---
 pkgs/by-name/li/libfaketime/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 208680a40eb8..149a6f2ee5cd 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -9,18 +9,26 @@
 
 stdenv.mkDerivation rec {
   pname = "libfaketime";
-  version = "0.9.10";
+  # 0.9.10 break dict-db-wiktionary and quartus-prime-lite on linux,
+  # and 0.9.11 break everything on darwin
+  version = if stdenv.hostPlatform.isDarwin then "0.9.10" else "0.9.11";
 
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
     rev = "v${version}";
-    sha256 = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
+    sha256 =
+      if stdenv.hostPlatform.isDarwin then
+        "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="
+      else
+        "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
   };
 
   patches =
     [
       ./nix-store-date.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       (fetchpatch {
         name = "0001-libfaketime.c-wrap-timespec_get-in-TIME_UTC-macro.patch";
         url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch";
@@ -31,11 +39,9 @@ stdenv.mkDerivation rec {
         url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch";
         hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g=";
       })
-    ]
-    ++ (lib.optionals stdenv.cc.isClang [
       # https://github.com/wolfcw/libfaketime/issues/277
       ./0001-Remove-unsupported-clang-flags.patch
-    ]);
+    ];
 
   postPatch = ''
     patchShebangs test src

From 3c4d0acfe2b9ac5ff59d12372975601c9e14ee2e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 4 Jun 2025 15:47:14 +0200
Subject: [PATCH 1445/1497] libfaketime: clean

---
 pkgs/by-name/li/libfaketime/package.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index 149a6f2ee5cd..ff8cc7012712 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -7,7 +7,7 @@
   coreutils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfaketime";
   # 0.9.10 break dict-db-wiktionary and quartus-prime-lite on linux,
   # and 0.9.11 break everything on darwin
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 =
       if stdenv.hostPlatform.isDarwin then
         "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="
@@ -45,11 +45,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs test src
-    for a in test/functests/test_exclude_mono.sh src/faketime.c ; do
-      substituteInPlace $a \
-        --replace-fail /bin/bash ${stdenv.shell}
-    done
-    substituteInPlace src/faketime.c --replace-fail @DATE_CMD@ ${coreutils}/bin/date
+    substituteInPlace test/functests/test_exclude_mono.sh src/faketime.c \
+      --replace-fail /bin/bash ${stdenv.shell}
+    substituteInPlace src/faketime.c \
+      --replace-fail @DATE_CMD@ ${lib.getExe' coreutils "date"}
   '';
 
   PREFIX = placeholder "out";
@@ -70,12 +69,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Report faked system time to programs without having to change the system-wide time";
     homepage = "https://github.com/wolfcw/libfaketime/";
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.bjornfor ];
     mainProgram = "faketime";
   };
-}
+})

From fe9d231ab6c4c2c2443c166f94d6c1a9884c4fdd Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 5 Jun 2025 19:04:30 +0200
Subject: [PATCH 1446/1497] libfaketime: clean

---
 pkgs/by-name/li/libfaketime/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix
index ff8cc7012712..029a24c29398 100644
--- a/pkgs/by-name/li/libfaketime/package.nix
+++ b/pkgs/by-name/li/libfaketime/package.nix
@@ -6,6 +6,12 @@
   perl,
   coreutils,
 }:
+let
+  hashes = {
+    "0.9.10" = "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ=";
+    "0.9.11" = "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
+  };
+in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfaketime";
@@ -16,12 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "wolfcw";
     repo = "libfaketime";
-    rev = "v${finalAttrs.version}";
-    sha256 =
-      if stdenv.hostPlatform.isDarwin then
-        "sha256-DYRuQmIhQu0CNEboBAtHOr/NnWxoXecuPMSR/UQ/VIQ="
-      else
-        "sha256-a0TjHYzwbkRQyvr9Sj/DqjgLBnE1Z8kjsTQxTfGqLjE=";
+    tag = "v${finalAttrs.version}";
+    hash = hashes.${finalAttrs.version};
   };
 
   patches =

From 72caf3acb7785b0ef5ec48152ccdd2288d44bf29 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Sat, 7 Jun 2025 08:03:38 +0200
Subject: [PATCH 1447/1497] uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20,
 update repo, fixes build (#411084)

---
 pkgs/by-name/uu/uudeview/package.nix | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/uu/uudeview/package.nix b/pkgs/by-name/uu/uudeview/package.nix
index 511ccd0efd1b..211a70b7ff11 100644
--- a/pkgs/by-name/uu/uudeview/package.nix
+++ b/pkgs/by-name/uu/uudeview/package.nix
@@ -1,19 +1,21 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   tcl,
   tk,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "uudeview";
-  version = "0.5.20";
+  version = "0.5.20-unstable-2025-03-20";
 
-  src = fetchurl {
-    url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
-    sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
+  src = fetchFromGitHub {
+    owner = "hannob";
+    repo = "uudeview";
+    rev = "7640bc56aa5016cdc9c139eb1ab3ec874e47c744";
+    hash = "sha256-IdHxkrXe+2I+aJpZ0bhimXq4xEXE9HDXrL5DtCs7MKk=";
   };
 
   buildInputs = [
@@ -21,22 +23,13 @@ stdenv.mkDerivation rec {
     tk
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   configureFlags = [
     "--enable-tk=${tk.dev}"
     "--enable-tcl=${tcl}"
   ];
 
-  patches = [
-    # https://wiki.tcl.tk/3577
-    ./matherr.patch
-    # format hardening
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
-      sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
-      extraPrefix = "";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
   '';

From 1d2afc0e998abe2a1bb2c6b803ae9154717c3e24 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 4 Jun 2025 07:51:23 +0900
Subject: [PATCH 1448/1497] ocamlPackages.wasm: 2.0.1 -> 2.0.2

---
 .../ocaml-modules/wasm/default.nix            | 77 ++++++++-----------
 1 file changed, 32 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index 1abe1f060bbd..5af0836ed2ca 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,55 +1,42 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  ocaml,
-  findlib,
-  ocamlbuild,
+  menhir,
+  odoc,
+  buildDunePackage,
 }:
+buildDunePackage rec {
+  pname = "wasm";
+  version = "2.0.2";
 
-if lib.versionOlder ocaml.version "4.08" then
-  throw "wasm is not available for OCaml ${ocaml.version}"
-else
+  minimalOCamlVersion = "4.12";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-wasm";
-    version = "2.0.1";
+  src = fetchFromGitHub {
+    owner = "WebAssembly";
+    repo = "spec";
+    tag = "opam-${version}";
+    hash = "sha256-RbVGW6laC3trP6IhtA2tLrAYVbx0Oucox9FgoEvs6LQ=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "WebAssembly";
-      repo = "spec";
-      rev = "opam-${version}";
-      hash = "sha256-5eo8MIui2GxRS5X9az0NlLGZfxi5KGsTI/EaP6m/zts=";
-    };
+  postUnpack = ''
+    cd "$sourceRoot/interpreter"
+    export sourceRoot=$PWD
+  '';
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
-    strictDeps = true;
+  # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
+  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
 
-    # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
-    hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
+  nativeBuildInputs = [
+    menhir
+    odoc
+  ];
 
-    makeFlags = [
-      "-C"
-      "interpreter"
-    ];
-
-    createFindlibDestdir = true;
-
-    postInstall = ''
-      mkdir $out/bin
-      cp -L interpreter/wasm $out/bin
-    '';
-
-    meta = {
-      description = "Executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST";
-      mainProgram = "wasm";
-      license = lib.licenses.asl20;
-      maintainers = [ lib.maintainers.vbgl ];
-      homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "Library to read and write WebAssembly (Wasm) files and manipulate their AST";
+    mainProgram = "wasm";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/WebAssembly/spec/tree/main/interpreter";
+  };
+}

From 748d375bd9a6f96dc398293cd54daaea13f54d77 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 14:16:02 +0800
Subject: [PATCH 1449/1497] cordless: drop

---
 pkgs/by-name/co/cordless/package.nix | 29 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/co/cordless/package.nix

diff --git a/pkgs/by-name/co/cordless/package.nix b/pkgs/by-name/co/cordless/package.nix
deleted file mode 100644
index 28189ddc9f31..000000000000
--- a/pkgs/by-name/co/cordless/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "cordless";
-  version = "2020-11-22";
-
-  src = fetchFromGitHub {
-    owner = "Bios-Marcel";
-    repo = "cordless";
-    rev = version;
-    hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis=";
-  };
-
-  subPackages = [ "." ];
-
-  vendorHash = "sha256-XnwTqd19q+hOJZsfnFExiPDbg4pzV1Z9A6cq/jhcVgU=";
-
-  meta = with lib; {
-    homepage = "https://github.com/Bios-Marcel/cordless";
-    description = "Discord terminal client";
-    mainProgram = "cordless";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 096df1a9a019..ca12be9669ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -452,6 +452,7 @@ mapAliases {
   collada-dom = opencollada; # added 2024-02-21
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
+  cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
   coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
   corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
   cosmic-tasks = tasks; # Added 2024-07-04

From 3bc69d42d5412a1b04d2a19205a966f7725081fd Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 7 Jun 2025 09:12:12 +0200
Subject: [PATCH 1450/1497] mlt: Remove SDL1 support

mlt supports both sdl1 and sdl2, with sdl1 not being critical:
It was never enabled on darwin, even though it was technically availabe.
SDL1 is deprecated upstream, and has been replaced in nixpkgs with `SDL_compat`,
which is just a shim running through SDL2 later. If SDL2 is supported,
adding SDL1 is pointless.
---
 pkgs/by-name/ml/mlt/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 9997857befc4..82cc2dbaf76d 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -32,8 +32,6 @@
   python3,
   swig,
   qt ? null,
-  enableSDL1 ? stdenv.hostPlatform.isLinux,
-  SDL,
   enableSDL2 ? true,
   SDL2,
   gitUpdater,
@@ -104,10 +102,6 @@ stdenv.mkDerivation rec {
       (qt.qt5compat or null)
       libarchive
     ]
-    ++ lib.optionals enableSDL1 [
-      SDL
-      libX11
-    ]
     ++ lib.optionals enableSDL2 [
       SDL2
       libX11

From 78e57a633a2c6f5ce9b092f2269a2f53ea7a0359 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 07:25:00 +0000
Subject: [PATCH 1451/1497] libretro.scummvm: 0-unstable-2025-05-23 ->
 0-unstable-2025-06-03

---
 pkgs/applications/emulators/libretro/cores/scummvm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/scummvm.nix b/pkgs/applications/emulators/libretro/cores/scummvm.nix
index 5bfb8e282442..1927566bd169 100644
--- a/pkgs/applications/emulators/libretro/cores/scummvm.nix
+++ b/pkgs/applications/emulators/libretro/cores/scummvm.nix
@@ -25,13 +25,13 @@ let
 in
 mkLibretroCore {
   core = "scummvm";
-  version = "0-unstable-2025-05-23";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "scummvm";
-    rev = "e566a6432fd1951417bf78280cc7c741957fc419";
-    hash = "sha256-K78lyq1v3v55CCFLVAJStvfPltfkoGE9tj39gwPgZ44=";
+    rev = "55fcf4050ac1102638cd7975677f81ae1a2c2070";
+    hash = "sha256-GJqh34l7qC59l5zFnGGBeVIvyUCB9AfHKioqtCmjN2s=";
   };
 
   extraBuildInputs = [

From e77069c4f1542c7d0a58aaa4d8116362d46aebb6 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 15:34:09 +0800
Subject: [PATCH 1452/1497] Revert "n2048: drop"

This reverts commit ba4aba08b3631a74a0fa09415837560fa3d87c92.
---
 pkgs/by-name/n2/n2048/package.nix | 43 +++++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix        |  1 -
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/n2/n2048/package.nix

diff --git a/pkgs/by-name/n2/n2048/package.nix b/pkgs/by-name/n2/n2048/package.nix
new file mode 100644
index 000000000000..e28b685d9f52
--- /dev/null
+++ b/pkgs/by-name/n2/n2048/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  ncurses,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "n2048";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "http://www.dettus.net/n2048/n2048_v${finalAttrs.version}.tar.gz";
+    hash = "sha256-c4bHWmdQuwyRXIm/sqw3p71pMv6VLAzIuUTaDHIWn6A=";
+  };
+
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=implicit-function-declaration"
+    ];
+  };
+
+  buildInputs = [
+    ncurses
+  ];
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+  ];
+
+  preInstall = ''
+    mkdir -p "$out"/{share/man,bin}
+  '';
+
+  meta = {
+    description = "Console implementation of 2048 game";
+    mainProgram = "n2048";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
+    homepage = "http://www.dettus.net/n2048/";
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 81a23b6edbdc..c0da1d75fe1c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1286,7 +1286,6 @@ mapAliases {
 
   ### N ###
 
-  n2048 = throw "'n2048' has been removed due to lack of maintenance upstream. Consider using '_2048-in-terminal'."; # Added 2025-06-07
   ncdu_2 = ncdu; # Added 2022-07-22
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28

From cc580679f11db27fcd29dd0df5c4de3070ff8894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 10:19:24 +0000
Subject: [PATCH 1453/1497] libnick: 2025.5.3 -> 2025.6.1

---
 pkgs/by-name/li/libnick/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix
index cd28002b1158..e3f3c187ff0b 100644
--- a/pkgs/by-name/li/libnick/package.nix
+++ b/pkgs/by-name/li/libnick/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnick";
-  version = "2025.5.3";
+  version = "2025.6.1";
 
   src = fetchFromGitHub {
     owner = "NickvisionApps";
     repo = "libnick";
     tag = finalAttrs.version;
-    hash = "sha256-JibExEI5MisKZ9kEIOMzDg8A8LEM8U+ckGFfnZu+ghQ=";
+    hash = "sha256-Ir2Jke1zK4pKldQJHaT0Ju0ubz7H6nx16hDNl6u48Ck=";
   };
 
   nativeBuildInputs =

From 3cf7d02c3eb8a375653a94929361d0b278daa46a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Jun 2025 12:20:08 +0200
Subject: [PATCH 1454/1497] php83: 8.3.21 -> 8.3.22

ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.22
---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 61b3554a3489..00325c5ccb63 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.21";
-      hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ=";
+      version = "8.3.22";
+      hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs=";
     }
   );
 in

From 6bd398a5bf0d40fd3eea3a1d9137d2fd03779be7 Mon Sep 17 00:00:00 2001
From: SnO2WMaN <me@sno2wman.net>
Date: Sat, 7 Jun 2025 20:29:28 +0900
Subject: [PATCH 1455/1497] maintainers: drop sno2wman

---
 pkgs/by-name/ki/killport/package.nix | 2 +-
 pkgs/by-name/ya/yamlfmt/package.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/killport/package.nix b/pkgs/by-name/ki/killport/package.nix
index 729c2617d088..eff778436786 100644
--- a/pkgs/by-name/ki/killport/package.nix
+++ b/pkgs/by-name/ki/killport/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Command-line tool to easily kill processes running on a specified port";
     homepage = "https://github.com/jkfran/killport";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ sno2wman ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "killport";
   };
 })
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 937b4c764616..d1e4b2e5c051 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
     homepage = "https://github.com/google/yamlfmt";
     changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ sno2wman ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "yamlfmt";
   };
 }

From 0a3009efd41efbfccefe7c5e5b01f2be8a92c2c1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Jun 2025 11:41:07 +0200
Subject: [PATCH 1456/1497] pre-commit: cleanup

---
 pkgs/by-name/pr/pre-commit/package.nix | 27 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index a6ce5d508873..a0a067bf295c 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   python3Packages,
-  libiconv,
   cargo,
   coursier,
   dotnet-sdk,
@@ -14,6 +13,8 @@
   julia,
   julia-bin,
   pre-commit,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 with python3Packages;
@@ -24,9 +25,7 @@ in
 buildPythonApplication rec {
   pname = "pre-commit";
   version = "4.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.9";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pre-commit";
@@ -41,7 +40,11 @@ buildPythonApplication rec {
     ./pygrep-pythonpath.patch
   ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     cfgv
     identify
     nodeenv
@@ -55,7 +58,7 @@ buildPythonApplication rec {
       cargo
       gitMinimal
       go
-      libiconv # For rust tests on Darwin
+      # libiconv # For rust tests on Darwin
       perl
       pytest-env
       pytest-forked
@@ -64,6 +67,8 @@ buildPythonApplication rec {
       re-assert
       cabal-install
       julia'
+      versionCheckHook
+      writableTmpDirAsHomeHook
     ]
     ++ lib.optionals (!i686Linux) [
       # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
@@ -79,6 +84,7 @@ buildPythonApplication rec {
       # Node.js-related tests that are currently disabled on i686-linux.
       nodejs
     ];
+  versionCheckProgramArg = "--version";
 
   postPatch = ''
     substituteInPlace pre_commit/resources/hook-tmpl \
@@ -110,8 +116,6 @@ buildPythonApplication rec {
       export DOTNET_ROOT="${dotnet-sdk}/share/dotnet"
     ''
     + ''
-      export HOME=$(mktemp -d)
-
       git init -b master
 
       python -m venv --system-site-packages venv
@@ -213,11 +217,12 @@ buildPythonApplication rec {
     inherit gitMinimal pre-commit;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Framework for managing and maintaining multi-language pre-commit hooks";
     homepage = "https://pre-commit.com/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ borisbabic ];
+    changelog = "https://github.com/pre-commit/pre-commit/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ borisbabic ];
     mainProgram = "pre-commit";
   };
 }

From a202cd1d896471088835841e69d1b43977bef228 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 12:35:59 +0000
Subject: [PATCH 1457/1497] debianutils: 5.22 -> 5.23.1

---
 pkgs/by-name/de/debianutils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix
index af377878b5f2..451fc60a76bd 100644
--- a/pkgs/by-name/de/debianutils/package.nix
+++ b/pkgs/by-name/de/debianutils/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "debianutils";
-  version = "5.22";
+  version = "5.23.1";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "debianutils";
     rev = "debian/${finalAttrs.version}";
-    hash = "sha256-TcPWQIgCSJWvJiePqEdRK2kju9xDpl6c9+VOagDsOhs=";
+    hash = "sha256-kQFl57kusyL3kGG9pJ8j2AsKBH4245xiPoDUYHjjv1g=";
   };
 
   nativeBuildInputs = [

From 0bdfc47756c6235cc5df4d4e97cf7efc88a71142 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 12:45:04 +0000
Subject: [PATCH 1458/1497] openpgp-card-tools: 0.11.8 -> 0.11.9

---
 pkgs/by-name/op/openpgp-card-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
index 9776f4654915..cb6c21ceb2f3 100644
--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -13,18 +13,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "openpgp-card-tools";
-  version = "0.11.8";
+  version = "0.11.9";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "openpgp-card";
     repo = "openpgp-card-tools";
     rev = "v${version}";
-    hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM=";
+    hash = "sha256-kT/egkOBOomUX+fwT3OeRSZOnGeuFRLKKAXtW8nN4rw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA=";
+  cargoHash = "sha256-mZZ8veY3iqsgScfFAGYo496qxTew24R5NxYf3WjnHco=";
 
   nativeBuildInputs = [
     installShellFiles

From 955975939b97458d3b777acaa70e1da3fb0263db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 13:12:19 +0000
Subject: [PATCH 1459/1497] remind: 05.03.07 -> 05.04.00

---
 pkgs/by-name/re/remind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 3236c0a1d31b..72de15a93131 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.03.07";
+  version = "05.04.00";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-gp6YGDh7gkCk4KFaPBfD72RJLbwGNz8iVAV764bfNe8=";
+    hash = "sha256-O+rAXUl5vEBEl/S3FvBzofbcydFul0mF5NhT2Fzf6n8=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

From 6ed2e62ab12e19922f2395d0eca0016d587aa725 Mon Sep 17 00:00:00 2001
From: vinylen <victor@viclab.se>
Date: Sat, 7 Jun 2025 15:21:59 +0200
Subject: [PATCH 1460/1497] vimPlugins.checkmate-nvim: init at 2025-06-05

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f4b84f57180d..1f67f7cd764b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1960,6 +1960,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  checkmate-nvim = buildVimPlugin {
+    pname = "checkmate.nvim";
+    version = "2025-06-05";
+    src = fetchFromGitHub {
+      owner = "bngarren";
+      repo = "checkmate.nvim";
+      rev = "aabe87c58d3c30f45aadab4bef38536e9933cd4a";
+      sha256 = "1qc3i32hkp59sha7rxbil1r76krlxgqqxn9wj7qlabc99bh11d3s";
+    };
+    meta.homepage = "https://github.com/bngarren/checkmate.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   ci_dark = buildVimPlugin {
     pname = "ci_dark";
     version = "2022-03-27";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 5f3dcded1e6f..384c01050c1e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -149,6 +149,7 @@ https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
 https://github.com/ms-jpq/chadtree/,HEAD,
 https://github.com/vim-scripts/changeColorScheme.vim/,,
 https://github.com/sudormrfbin/cheatsheet.nvim/,,
+https://github.com/bngarren/checkmate.nvim/,HEAD,
 https://github.com/yunlingz/ci_dark/,,
 https://github.com/declancm/cinnamon.nvim/,HEAD,
 https://github.com/projekt0n/circles.nvim/,,

From f7a8cfb11990347e4df8a07ff4b918a4d5422468 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 7 Jun 2025 15:38:27 +0200
Subject: [PATCH 1461/1497] nixos/lasuite-docs: Set collaboration server
 allowed origins (#413190)

Without this, the collaboration server closes the websocket connection
and activity within the doc is not synchronized.
---
 nixos/modules/services/web-apps/lasuite-docs.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/web-apps/lasuite-docs.nix b/nixos/modules/services/web-apps/lasuite-docs.nix
index ee9042037a1b..26808c2e7f55 100644
--- a/nixos/modules/services/web-apps/lasuite-docs.nix
+++ b/nixos/modules/services/web-apps/lasuite-docs.nix
@@ -176,6 +176,13 @@ in
               defaultText = lib.literalExpression "https://\${cfg.domain}";
               description = "URL to the backend server base";
             };
+
+            COLLABORATION_SERVER_ORIGIN = mkOption {
+              type = types.str;
+              default = "https://${cfg.domain}";
+              defaultText = lib.literalExpression "https://\${cfg.domain}";
+              description = "Origins allowed to connect to the collaboration server";
+            };
           };
         };
         default = { };

From 661ba9dd8c9c2f704b0682324e387adb6c551fa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 14:44:38 +0000
Subject: [PATCH 1462/1497] cubeb: 0-unstable-2025-05-29 ->
 0-unstable-2025-06-03

---
 pkgs/by-name/cu/cubeb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index f399ddd06a8b..29ea331d3885 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2025-05-29";
+  version = "0-unstable-2025-06-03";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "78ee5f0efaaa395e3e1806e8ef85dcb15c7c063d";
-    hash = "sha256-PsBlZQTPiBt8Y3okFOZYhiFn58adxVlaf/hLA0doX0o=";
+    rev = "24c170b2346bb675456449f51406dac6442a84a7";
+    hash = "sha256-/XTDaG48IFPFPrEcDd3IqX4bN+VbrpaHpzd/7N8J3a8=";
   };
 
   outputs = [

From 7d82245c244769a476915121d0dd9248622b5ede Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 14:51:01 +0000
Subject: [PATCH 1463/1497] werf: 2.36.3 -> 2.37.1

---
 pkgs/by-name/we/werf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 4765870a926a..b22b2e1f65a9 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.36.3";
+  version = "2.37.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vTw2kUaCemRwZwzF6NGkqJ67A88AakbynQn55e4cnGw=";
+    hash = "sha256-FIahppFWQx1UCR7mo3oiFT1SDOoySmqc7Fc2E5XMglY=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-wo7hXzSUwT+gdtu82S88bPr2DUvBGAHIcRQ75j4mY2o=";
+  vendorHash = "sha256-u/sG/UZt76Sr3Ckiv8Nn2JnMrVsAIlSWWTvs+Yfn6eU=";
 
   subPackages = [ "cmd/werf" ];
 

From cd7501745a6a995a5f2b52ddb3114e52342e8d47 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 7 Jun 2025 10:46:55 -0400
Subject: [PATCH 1464/1497] gmnisrv: drop

Fails to build with gcc 14, unmaintained upstream for 2 years.

Link to upstream: https://git.sr.ht/~sircmpwn/gmnisrv
---
 pkgs/by-name/gm/gmnisrv/package.nix | 52 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/by-name/gm/gmnisrv/package.nix

diff --git a/pkgs/by-name/gm/gmnisrv/package.nix b/pkgs/by-name/gm/gmnisrv/package.nix
deleted file mode 100644
index 52e3feb60491..000000000000
--- a/pkgs/by-name/gm/gmnisrv/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromSourcehut,
-  pkg-config,
-  openssl,
-  mailcap,
-  scdoc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gmnisrv";
-  version = "1.0";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "gmnisrv";
-    rev = version;
-    sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ=";
-  };
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=deprecated-declarations"
-  ];
-
-  postPatch = ''
-    substituteInPlace config.sh \
-      --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"
-  '';
-
-  MIMEDB = "${mailcap}/etc/mime.types";
-  nativeBuildInputs = [
-    pkg-config
-    scdoc
-  ];
-  buildInputs = [
-    openssl
-    mailcap
-  ];
-
-  meta = with lib; {
-    description = "Simple Gemini protocol server";
-    mainProgram = "gmnisrv";
-    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      bsima
-      jb55
-    ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f0fa7d279038..5b792147b534 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -786,6 +786,7 @@ mapAliases {
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
   glxinfo = mesa-demos; # Added 2024-07-04
   gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
+  gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
   gnatboot11 = gnat-bootstrap11;
   gnatboot12 = gnat-bootstrap12;

From 39db0181a66d4ba2c9660c96252953af24f28033 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 7 Jun 2025 17:00:22 +0200
Subject: [PATCH 1465/1497] evcc: 0.204.1 -> 0.204.2

https://github.com/evcc-io/evcc/releases/tag/0.204.2
---
 pkgs/by-name/ev/evcc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 16b22ef13917..f2671bcb5d73 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "0.204.1";
+  version = "0.204.2";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-z3SwTBcCETIe2xPN9VU3mqYxd7npvrs44FkGQp56Y00=";
+    hash = "sha256-e0z1DUXEYbfSIcJBI2gpxY2hb0Tak3sFoYOi5WdsQPY=";
   };
 
   vendorHash = "sha256-dBOZ5kYQxVTWB1CTTF3L+FIsuLnVQmA7Vjid7CdJbeo=";
@@ -52,7 +52,7 @@ buildGo124Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-z64qzc3rDFByJ6Usubm9IIHfu4/i07O/zjtq2VjN7lk=";
+    hash = "sha256-Hyx9jUVF6aCPD89cxQx7dl77lCfDxcOIZVhSXx0+q0U=";
   };
 
   nativeBuildInputs = [

From 21e21bf5c38cd2a07d0c1b0fa481925715f3cf1b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 7 Jun 2025 16:09:21 +0100
Subject: [PATCH 1466/1497] minimal-bootstrap: fix the eval (rewriteURL
 fallout)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix-instantiate -A minimal-bootstrap.bash --argstr system i686-linux
    error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:37:12:
           36|
           37|   strict = derivationStrict drvAttrs;
             |            ^
           38|

       … while evaluating derivation 'bash-5.2.15'
         whose name attribute is located at pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix:85:19

       … while evaluating attribute 'PATH' of derivation 'bash-5.2.15'
         at pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix:108:11:
          107|           SHELL = "${bash_2_05}/bin/bash";
          108|           PATH = lib.makeBinPath (
             |           ^
          109|             (env.nativeBuildInputs or [ ])

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called without required argument 'rewriteURL'
       at /tmp/nixpkgs/pkgs/build-support/fetchurl/boot.nix:5:1:
            4|
            5| {
             | ^
            6|   rewriteURL,
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20f87db9d05..78cb8d022fdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11270,6 +11270,7 @@ with pkgs;
       inherit lib config;
       fetchurl = import ../build-support/fetchurl/boot.nix {
         inherit (stdenv.buildPlatform) system;
+        inherit (config) rewriteURL;
       };
       checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; };
     }

From ad3580bed9e150b11ac4026b5dd48f2eca7db234 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 7 Jun 2025 18:16:35 +0300
Subject: [PATCH 1467/1497] mesa: 25.1.2 -> 25.1.3

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.1.2...mesa-25.1.3

Changelog: https://docs.mesa3d.org/relnotes/25.1.3.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 6d4cd1704617..0e7f52736bfe 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.1.2";
+  version = "25.1.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-oE1QZyCBFdWCFq5T+Unf0GYpvCssVNOEQtPQgPbatQQ=";
+    hash = "sha256-BFncfkbpjVYO+7hYh5Ui6RACLq7/m6b8eIJ5B5lhq5Y=";
   };
 
   meta = {

From 47d5fd8b5184b799e5aa826fcfddf56bce6251df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 01:54:06 +0000
Subject: [PATCH 1468/1497] osinfo-db: 20250124 -> 20250606

---
 pkgs/by-name/os/osinfo-db/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/os/osinfo-db/package.nix b/pkgs/by-name/os/osinfo-db/package.nix
index 5e39efb7c50e..3105e22f841d 100644
--- a/pkgs/by-name/os/osinfo-db/package.nix
+++ b/pkgs/by-name/os/osinfo-db/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20250124";
+  version = "20250606";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    hash = "sha256-fKcX8JdaeYE1orOe790UNqCwaC4paFx/0B73+DolclA=";
+    hash = "sha256-mUCqR98pgHPFHc+KTcyFX0lKuGTCTNvaRr2JeVc1f+E=";
   };
 
   nativeBuildInputs = [

From 8308f5ed6a8fe8b816e5668a58cf6ebc1974d163 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 15:57:10 +0000
Subject: [PATCH 1469/1497] postgresqlPackages.pg_net: 0.14.0 -> 0.15.1

---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index ce821a3b1901..5ac42c9bb499 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.14.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
+    hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM=";
   };
 
   buildInputs = [ curl ];

From 9e783da4169c27243a2234a459f25583273a52f6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Jun 2025 18:38:22 +0200
Subject: [PATCH 1470/1497] zed-editor: 0.188.3 -> 0.189.5

Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.188.3...v0.189.5

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.189.5
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 1730a70423c0..9a0787af7f57 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -99,7 +99,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.188.3";
+  version = "0.189.5";
 
   outputs =
     [ "out" ]
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZyKFzb6/kVw/uLTmhnyrwmgyTHTwgu/WbOga409eZvg=";
+    hash = "sha256-d1d3WgUVamrYWVosljQiEPZGNNDldtM1YwZhxseX4+w=";
   };
 
   patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0Nwdw20YdezGvUCkFw6ZV55qsebIhtnIoPoHd4tgIyA=";
+  cargoHash = "sha256-YhdwCNTbBphWugguoWQqrGf2fRB5Jv40MElW6hbcxtk=";
 
   nativeBuildInputs =
     [

From 4c81d67f6930085dbe07b7e039f8546ea84b6409 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 16:41:17 +0000
Subject: [PATCH 1471/1497] python3Packages.oelint-data: 1.0.15 -> 1.0.16

---
 pkgs/development/python-modules/oelint-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 01c53b7eda78..7c6ab2de4854 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.0.15";
+  version = "1.0.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-OZtBJWjAYuwXt1ehgt6bIZPeVByXCjOcctPJGLrsxiU=";
+    hash = "sha256-t6NGD1IHRHfB2kJT0LwSpCicaan3ptagNDE2JV+IkE4=";
   };
 
   build-system = [

From 76c6760e4800d9c6b68e24999bfd98d631ed464d Mon Sep 17 00:00:00 2001
From: rucadi <ruben.cano96@gmail.com>
Date: Sat, 7 Jun 2025 19:11:51 +0200
Subject: [PATCH 1472/1497] tkmm: init at 2.0.0-beta3

---
 pkgs/by-name/tk/tkmm/deps.json    | 1222 +++++++++++++++++++++++++++++
 pkgs/by-name/tk/tkmm/package.nix  |   93 +++
 pkgs/by-name/tk/tkmm/patchTk.diff |   52 ++
 3 files changed, 1367 insertions(+)
 create mode 100644 pkgs/by-name/tk/tkmm/deps.json
 create mode 100644 pkgs/by-name/tk/tkmm/package.nix
 create mode 100644 pkgs/by-name/tk/tkmm/patchTk.diff

diff --git a/pkgs/by-name/tk/tkmm/deps.json b/pkgs/by-name/tk/tkmm/deps.json
new file mode 100644
index 000000000000..5c06c8c6e699
--- /dev/null
+++ b/pkgs/by-name/tk/tkmm/deps.json
@@ -0,0 +1,1222 @@
+[
+  {
+    "pname": "Avalonia",
+    "version": "11.2.2",
+    "hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.2.4",
+    "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.2.5",
+    "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.1.0",
+    "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.29",
+    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.1.0",
+    "hash": "sha256-xawQhivop0f7n98Xqj5fScDdF0RPPpVIoTpVs+p6T3Q="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.2.2",
+    "hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.2.5",
+    "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.1.0",
+    "hash": "sha256-CcfwmgbN+Z/uqNtgKRH2KFJwomnnkWVhZbTPF2K0Oeg="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.2.2",
+    "hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4="
+  },
+  {
+    "pname": "Avalonia.Controls.DataGrid",
+    "version": "11.2.5",
+    "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s="
+  },
+  {
+    "pname": "Avalonia.Controls.PanAndZoom",
+    "version": "11.2.0",
+    "hash": "sha256-L5lXJj9Cf/ULnMf+abEsvTfWd8ku+fe9yr7jJs0a6eM="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.2.2",
+    "hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.2.5",
+    "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.2.2",
+    "hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.2.5",
+    "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A="
+  },
+  {
+    "pname": "Avalonia.Fonts.Inter",
+    "version": "11.2.2",
+    "hash": "sha256-H1h+PQBW8vrvJnKQZ+vcFaxCVssBcuHGBQw1Jj8dMR0="
+  },
+  {
+    "pname": "Avalonia.Fonts.Inter",
+    "version": "11.2.5",
+    "hash": "sha256-cPdNS/VWH6yZ/9Ea+U5UBx6RgC0SpkhKonBxZ6InLLU="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.2.2",
+    "hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.2.5",
+    "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.2.2",
+    "hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.2.5",
+    "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.1.0",
+    "hash": "sha256-MAguJ8qTdwvgtEq5SYxyzFNsC90gcBfZxXPkFBEWx5E="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.2",
+    "hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.4",
+    "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.2.5",
+    "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.1.0",
+    "hash": "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.2.2",
+    "hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.2.5",
+    "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.2.2",
+    "hash": "sha256-+wBsbMAMDMRkZN/t94qwQgyew8eCY2RBreoTCgs3KJU="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.2.2",
+    "hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.2.5",
+    "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.2.2",
+    "hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.2.5",
+    "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.2.2",
+    "hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.2.5",
+    "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.0.10.2",
+    "hash": "sha256-zjBSlwYkck41iYP+ALJNzKeNAdRDy3f0AyIJ02ZBNAM="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.0.10.2",
+    "hash": "sha256-t9D2TMF1EDEB8aD3xdI6jzQPkcL3OhSfLlJIdOeKFz8="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.0.10.2",
+    "hash": "sha256-a2/iVI70TEx6z7mH6fzwu+cTI4BUmXymZIwDoXPCpLs="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.0.10.2",
+    "hash": "sha256-5WH4yP6nvwlLxAe7duTmSpA8cpcz5iweynYoAno3kLU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.0.10.2",
+    "hash": "sha256-rEfS+J/K3/lrl5HnahtMvHEjnh1DCFxXEJa5WtnAKRw="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.0.10.2",
+    "hash": "sha256-K2XnutskMOH/V5qnUfCrfHkGuSuhvjE40c9XuflTW7E="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.0.10.2",
+    "hash": "sha256-lLCXb4OdfrQhjp6cUVkIPJKCSXt+hkYT27gJbMXiXTw="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.0.10.2",
+    "hash": "sha256-LycONceUcjt3mNB6tl15xHlzTIzLmy8w8IAgO/Uy/Nw="
+  },
+  {
+    "pname": "AvaloniaEdit.TextMate",
+    "version": "11.1.0",
+    "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="
+  },
+  {
+    "pname": "AvaMark",
+    "version": "0.2.1",
+    "hash": "sha256-VnhJEWh7g1eWLT11oSnXpqtcQiZYMRhxfV1ezQ5c6X4="
+  },
+  {
+    "pname": "CommunityToolkit.HighPerformance",
+    "version": "8.2.2",
+    "hash": "sha256-sQ/p8t2vT1av/2CxjI27tNIVpmtUwhERLXRrIugMn08="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.0.0",
+    "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.2.2",
+    "hash": "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+  },
+  {
+    "pname": "ConfigFactory",
+    "version": "0.4.3",
+    "hash": "sha256-BBvOJB2X27YLPYP9MrJ8C3R3RMerQEF+KRLsM4TK1Ng="
+  },
+  {
+    "pname": "ConfigFactory.Avalonia",
+    "version": "0.4.3",
+    "hash": "sha256-1CTG1VfUEBPHQgqkBNjPdkS3rtahmTIHOKec0KKYHls="
+  },
+  {
+    "pname": "ConfigFactory.Core",
+    "version": "0.4.3",
+    "hash": "sha256-xwk9ejjyklQNVH9qvTBa+dDZnrT7UfLEzx7sXp8uRHc="
+  },
+  {
+    "pname": "ConsoleAppFramework",
+    "version": "5.4.1",
+    "hash": "sha256-FrK7SzxxCE2MQqiNr09EI5SBVvHvx2a/mvnb3/iIlXc="
+  },
+  {
+    "pname": "Dock.Model",
+    "version": "11.0.0.7",
+    "hash": "sha256-cwl7klOdsd8hAAGDru2q3w9OF1/a7Fe3rjx3f45+X8s="
+  },
+  {
+    "pname": "Dock.Model.Mvvm",
+    "version": "11.0.0.7",
+    "hash": "sha256-D755ODqUeWRfbjCDm4a0MY4ite+EZUKAK20Os/vG28Y="
+  },
+  {
+    "pname": "FluentAvaloniaUI",
+    "version": "2.2.0",
+    "hash": "sha256-rWlR07GfyBOAau2mSuPN0sCxlUrxfeowYO6uWDe4LM0="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.2",
+    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.2",
+    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.2",
+    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.2",
+    "hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.2",
+    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "HtmlAgilityPack",
+    "version": "1.11.61",
+    "hash": "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="
+  },
+  {
+    "pname": "Humanizer",
+    "version": "2.14.1",
+    "hash": "sha256-1wGwf5KAmDeiH0Dz8KcTdZw+UMkiNsjKOIOt/VJnnqE="
+  },
+  {
+    "pname": "Humanizer.Core",
+    "version": "2.14.1",
+    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
+  },
+  {
+    "pname": "Humanizer.Core.af",
+    "version": "2.14.1",
+    "hash": "sha256-8CCgI7OweSa53cZWZBXQ8a7VVt/NPP16zHVBZvzU9KQ="
+  },
+  {
+    "pname": "Humanizer.Core.ar",
+    "version": "2.14.1",
+    "hash": "sha256-JRoP+brQgYBZI8OccH/jaM1Z482ZWBiqU2XL3KsIPw8="
+  },
+  {
+    "pname": "Humanizer.Core.az",
+    "version": "2.14.1",
+    "hash": "sha256-ubwkbes9zrrisuXTcT4ZgOAiFsUieC6OLd4pgzxsE40="
+  },
+  {
+    "pname": "Humanizer.Core.bg",
+    "version": "2.14.1",
+    "hash": "sha256-Xv6DP1xxxGVUfP44TZasWpxgQ/DkriljvmIMtHf+nGk="
+  },
+  {
+    "pname": "Humanizer.Core.bn-BD",
+    "version": "2.14.1",
+    "hash": "sha256-6JpReIc3fkExvJIXzk6fUw56wJ78aTEg1dWQ6o+dQow="
+  },
+  {
+    "pname": "Humanizer.Core.cs",
+    "version": "2.14.1",
+    "hash": "sha256-MGL86KxSbz0PkDo9+NRj6h1fDjPZXlxAtYNf0Zreg/4="
+  },
+  {
+    "pname": "Humanizer.Core.da",
+    "version": "2.14.1",
+    "hash": "sha256-Gpw8kJbgz0KQS2mGY5tmrHqpgUO4abD7dSKIy//ONYM="
+  },
+  {
+    "pname": "Humanizer.Core.de",
+    "version": "2.14.1",
+    "hash": "sha256-Eswv8aEQoxI9MZr2CvWtBUn5X9JRZTWQjRzHJkGj80g="
+  },
+  {
+    "pname": "Humanizer.Core.el",
+    "version": "2.14.1",
+    "hash": "sha256-wCK2Uy/AV6FxPUSUM0NMbV14pAP+ss25AaVAHMQIeJA="
+  },
+  {
+    "pname": "Humanizer.Core.es",
+    "version": "2.14.1",
+    "hash": "sha256-iEHiQXKwg0ABDxh//HSrzwaVOlilQBFI96+GYzzTMwQ="
+  },
+  {
+    "pname": "Humanizer.Core.fa",
+    "version": "2.14.1",
+    "hash": "sha256-2Js7k3nvwJvxAjq3yoLn7PUY2S8+vXfgESwU4SbvjaA="
+  },
+  {
+    "pname": "Humanizer.Core.fi-FI",
+    "version": "2.14.1",
+    "hash": "sha256-jOWo43r3dhiBsV9cCoDfqK/YqWj5LejZsnfkG6mlkpA="
+  },
+  {
+    "pname": "Humanizer.Core.fr",
+    "version": "2.14.1",
+    "hash": "sha256-WCbA+f4B3g/ml7KrkHkzpU2Fj38HtWc/ujoVY5F3lk4="
+  },
+  {
+    "pname": "Humanizer.Core.fr-BE",
+    "version": "2.14.1",
+    "hash": "sha256-GydVmoEy+lwEQ1nM39QXSRhYNchqM47p7qhUEimN4Cw="
+  },
+  {
+    "pname": "Humanizer.Core.he",
+    "version": "2.14.1",
+    "hash": "sha256-MMf3qjJ+yzxjMxOR7wMWf+eErxWLqpsdWKFhjNCOsyM="
+  },
+  {
+    "pname": "Humanizer.Core.hr",
+    "version": "2.14.1",
+    "hash": "sha256-kBv2I9ns6L6D4XfXfyZS1VM6+YwF4yUkCmCA5zqvsok="
+  },
+  {
+    "pname": "Humanizer.Core.hu",
+    "version": "2.14.1",
+    "hash": "sha256-vRje+kxqOsl1JCXAE0yDKvauUumzuEhNcnhNsdIdgVM="
+  },
+  {
+    "pname": "Humanizer.Core.hy",
+    "version": "2.14.1",
+    "hash": "sha256-UL7PsK4msT5c96lk70/bVAxN63B71l8VOFtvuJQH9a0="
+  },
+  {
+    "pname": "Humanizer.Core.id",
+    "version": "2.14.1",
+    "hash": "sha256-nIl64gCuZh4D527qI2hfQRvzt1mTJUCDGMIZwpS3C/A="
+  },
+  {
+    "pname": "Humanizer.Core.is",
+    "version": "2.14.1",
+    "hash": "sha256-38vUQ1aVtlhK15kP9ZlDO0Nl0DcOA5iHx6F2SPN1gYM="
+  },
+  {
+    "pname": "Humanizer.Core.it",
+    "version": "2.14.1",
+    "hash": "sha256-4ne0VRNi9OAj3bGCQgCy1BNYKMizoHykJ/lchmCsWdc="
+  },
+  {
+    "pname": "Humanizer.Core.ja",
+    "version": "2.14.1",
+    "hash": "sha256-oAilMM8J6LumV6qv3gSIBNTm7u2L4vV38cQXtME3PhM="
+  },
+  {
+    "pname": "Humanizer.Core.ko-KR",
+    "version": "2.14.1",
+    "hash": "sha256-b70HQl2IWVPATtaYGDyJ+Z6ioPtrM53vXzfTCHYgxpQ="
+  },
+  {
+    "pname": "Humanizer.Core.ku",
+    "version": "2.14.1",
+    "hash": "sha256-8LiEH7MaapMtkHFMj7Y3pG+g0QYuIa5gD3VR9nYQn+k="
+  },
+  {
+    "pname": "Humanizer.Core.lv",
+    "version": "2.14.1",
+    "hash": "sha256-zyCsE5cD++u5shNIqCQUd+66FkUWOl+NfFrs2JduCaQ="
+  },
+  {
+    "pname": "Humanizer.Core.ms-MY",
+    "version": "2.14.1",
+    "hash": "sha256-pSdZLUi9oWo78nBh2DJunPhDR7THdZSZP0msCVbPsrY="
+  },
+  {
+    "pname": "Humanizer.Core.mt",
+    "version": "2.14.1",
+    "hash": "sha256-mkX2reEvNpx9w6gtZw+6bkrnj3Di1qgVDMr9q0IeKCw="
+  },
+  {
+    "pname": "Humanizer.Core.nb",
+    "version": "2.14.1",
+    "hash": "sha256-QvYJHqjO/SrelWYgtm8Sc7axs7J8wbJE+GbTgVw5LYs="
+  },
+  {
+    "pname": "Humanizer.Core.nb-NO",
+    "version": "2.14.1",
+    "hash": "sha256-YW8y2XkmHjwqf2fztNB3rsn3+CgslF1TclITwp0fA9g="
+  },
+  {
+    "pname": "Humanizer.Core.nl",
+    "version": "2.14.1",
+    "hash": "sha256-bQM7aXNQMBY+65NfMVQz/xYz9Ad2JC+ryXoB4lcYgmA="
+  },
+  {
+    "pname": "Humanizer.Core.pl",
+    "version": "2.14.1",
+    "hash": "sha256-IrPxHI4uQvBeMM9/8PaNueKwVkbN+1zFQlNWRjNfXEA="
+  },
+  {
+    "pname": "Humanizer.Core.pt",
+    "version": "2.14.1",
+    "hash": "sha256-XrlC15HNJFmDwLpHIUHb3Bec9A79msQCRB9Dvz8w4l0="
+  },
+  {
+    "pname": "Humanizer.Core.ro",
+    "version": "2.14.1",
+    "hash": "sha256-llXtfq4Tr5V2Q4dVD7J0IKITtpiWrFs50DAtJhcSuRI="
+  },
+  {
+    "pname": "Humanizer.Core.ru",
+    "version": "2.14.1",
+    "hash": "sha256-lD0dB3mkbFfGExwVWZk6fv24MyQQ8Cdv5OrleuZeChg="
+  },
+  {
+    "pname": "Humanizer.Core.sk",
+    "version": "2.14.1",
+    "hash": "sha256-EmyE+wssZwY6tAuEiFXGn5/yzVMZe7QEuTjOcByOXaA="
+  },
+  {
+    "pname": "Humanizer.Core.sl",
+    "version": "2.14.1",
+    "hash": "sha256-sWWxh7KZ8Y3Ps6GbBOHbU2GMsNZfkM+BOnUChf3fz4s="
+  },
+  {
+    "pname": "Humanizer.Core.sr",
+    "version": "2.14.1",
+    "hash": "sha256-/bA3LULRFn5WYmCscr5R5vaFRjeHC0xjNiF7PXEJ8r0="
+  },
+  {
+    "pname": "Humanizer.Core.sr-Latn",
+    "version": "2.14.1",
+    "hash": "sha256-43+o6oj0UNRJKiFoh57MGPSzlsWAq0eRtzlCrewDmVM="
+  },
+  {
+    "pname": "Humanizer.Core.sv",
+    "version": "2.14.1",
+    "hash": "sha256-9lXrHveKDs1y/W3Qxd+MVcohhKEU7zNPx21GBVPp/rA="
+  },
+  {
+    "pname": "Humanizer.Core.th-TH",
+    "version": "2.14.1",
+    "hash": "sha256-ldCsXINSvL2xom0SCtVQy+qX1IN5//EUoyIOwXiJ3k8="
+  },
+  {
+    "pname": "Humanizer.Core.tr",
+    "version": "2.14.1",
+    "hash": "sha256-VZnO1vMXiR7egKEKJ6lBsj7eNgxhFzakFWsYYRW4u2U="
+  },
+  {
+    "pname": "Humanizer.Core.uk",
+    "version": "2.14.1",
+    "hash": "sha256-rdvleUrKbj3c06A0O2MkgAZLtXLro9SPB1YqAGE1Vyg="
+  },
+  {
+    "pname": "Humanizer.Core.uz-Cyrl-UZ",
+    "version": "2.14.1",
+    "hash": "sha256-Qso1Iz9MTLs63x4F00kK31TZAN4AoFaFsuVzM+1z38k="
+  },
+  {
+    "pname": "Humanizer.Core.uz-Latn-UZ",
+    "version": "2.14.1",
+    "hash": "sha256-sVnkZTuEaHfMJIAZmSCqsspnKkYxK9eVBQZnAAqHNW4="
+  },
+  {
+    "pname": "Humanizer.Core.vi",
+    "version": "2.14.1",
+    "hash": "sha256-5wDt72+HdNN3mt/iJkxV9LaH13Jc1qr1vB4Lz8ahIPs="
+  },
+  {
+    "pname": "Humanizer.Core.zh-CN",
+    "version": "2.14.1",
+    "hash": "sha256-Z3qfFWyovcVT4Hqy51lgW2xGwyfI//Yfv90E0Liy1sw="
+  },
+  {
+    "pname": "Humanizer.Core.zh-Hans",
+    "version": "2.14.1",
+    "hash": "sha256-BTGkMEkQYJKRp858EU7hwNOdsHRT+w6vAMa6H8JIyX4="
+  },
+  {
+    "pname": "Humanizer.Core.zh-Hant",
+    "version": "2.14.1",
+    "hash": "sha256-N3D1z5aoGwAZ6+ZxrWMtXgacvQcgDG+aLrQQI9uysmM="
+  },
+  {
+    "pname": "Kokuban",
+    "version": "0.2.0",
+    "hash": "sha256-OMTJ6ysgHPjcHSRASrAQt4geOzjxLvi+bK2S31jTJ8o="
+  },
+  {
+    "pname": "LanguageExt.Core",
+    "version": "4.4.9",
+    "hash": "sha256-YzY22dnLm+dVgZELUD+xqsVBgaEKa4z+nQo/ARg0dDc="
+  },
+  {
+    "pname": "LibHac",
+    "version": "0.19.0",
+    "hash": "sha256-FDEmeGHbX/aCFjFbFk8QwO2rTfFizt9UKb+KFDt23hk="
+  },
+  {
+    "pname": "LoadingIndicators.Avalonia",
+    "version": "11.0.11.1",
+    "hash": "sha256-MWZletH7qoM1QLgODwiuuKbKj8Ok/V8JXEXGOWtx4IA="
+  },
+  {
+    "pname": "Markdig",
+    "version": "0.40.0",
+    "hash": "sha256-GJqbAhZZjCCnY2Cg3N4KaDVKc/IPdXgkWmTjQRvX5Jw="
+  },
+  {
+    "pname": "MenuFactory",
+    "version": "1.1.0",
+    "hash": "sha256-2rtJMpVr6EyOtMW22tMhzeoRdOmU4Og5MYRj74dZlH4="
+  },
+  {
+    "pname": "MenuFactory.Abstractions",
+    "version": "1.1.0",
+    "hash": "sha256-ZdX5AdRYO9rM5lSwr3eYJMRkoLXkRCkQ5akgTp9lwFI="
+  },
+  {
+    "pname": "MessageStudio",
+    "version": "1.1.1",
+    "hash": "sha256-N5dOPcu+XuKLXeHZonnxEm+KMashaLCZHH9n/iJfDOQ="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "7.0.0",
+    "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.12.0",
+    "hash": "sha256-mm/OKG3zPLAeTVGZtuLxSG+jpQDOchn1oyHqBBJW2Ho="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.12.0",
+    "hash": "sha256-m1i1Q5pyEq4lAoYjNE9baEjTplH8+bXx5wSA+eMmehk="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.2",
+    "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.2",
+    "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.2",
+    "hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.2",
+    "hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.2",
+    "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
+  {
+    "pname": "Octokit",
+    "version": "14.0.0",
+    "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI="
+  },
+  {
+    "pname": "Onigwrap",
+    "version": "1.0.6",
+    "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
+  },
+  {
+    "pname": "Projektanker.Icons.Avalonia",
+    "version": "9.6.1",
+    "hash": "sha256-vO6CqlO3EjzGYElIjy6r2d5b8g33P1m4EoqYuew9anM="
+  },
+  {
+    "pname": "Projektanker.Icons.Avalonia.FontAwesome",
+    "version": "9.6.1",
+    "hash": "sha256-eAoF5INE3xJkLZP6JGxRpbQUmtK1wNc5DVKgCno1DiY="
+  },
+  {
+    "pname": "ReverseMarkdown",
+    "version": "4.6.0",
+    "hash": "sha256-gxRoDW/a4jGe7gVhMtW7+QCH87QNZJLr3lEqY1yiEUo="
+  },
+  {
+    "pname": "Revrs",
+    "version": "1.0.5",
+    "hash": "sha256-13/4aFh4NQt71CsgTZxA5hJelo9o3PDhE9IU+joyMnU="
+  },
+  {
+    "pname": "Revrs",
+    "version": "1.0.6",
+    "hash": "sha256-J7RD9mALUMybtrnD0CiRxorG1j/RfG0q92JW4jCYyXw="
+  },
+  {
+    "pname": "RstbLibrary",
+    "version": "1.0.2",
+    "hash": "sha256-Y9IPmcf+FSxcgUbi8YENeLomA0doCp/nCWTJcCq8NOw="
+  },
+  {
+    "pname": "runtime.any.System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
+  },
+  {
+    "pname": "runtime.any.System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
+  },
+  {
+    "pname": "runtime.any.System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
+  },
+  {
+    "pname": "runtime.any.System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
+  },
+  {
+    "pname": "runtime.any.System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
+  },
+  {
+    "pname": "runtime.any.System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
+  },
+  {
+    "pname": "runtime.any.System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
+  },
+  {
+    "pname": "runtime.any.System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
+  },
+  {
+    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
+  },
+  {
+    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
+  },
+  {
+    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
+  {
+    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
+  },
+  {
+    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
+  },
+  {
+    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
+  },
+  {
+    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
+  },
+  {
+    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
+  },
+  {
+    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
+  },
+  {
+    "pname": "runtime.unix.System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
+  },
+  {
+    "pname": "runtime.unix.System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
+  },
+  {
+    "pname": "runtime.unix.System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
+  },
+  {
+    "pname": "SarcLibrary",
+    "version": "3.2.0",
+    "hash": "sha256-DqxaOBsPmy600jxkS4F7E+LutGsqvD8eTj2nex5O+fE="
+  },
+  {
+    "pname": "SharpCompress",
+    "version": "0.39.0",
+    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.8",
+    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.8",
+    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.Diagnostics.Contracts",
+    "version": "4.3.0",
+    "hash": "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8="
+  },
+  {
+    "pname": "System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "9.0.2",
+    "hash": "sha256-CI1z3rCDA2XnYE7hA1Hh6+rPkdIRAcswCXu/Pbaavck="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Linq",
+    "version": "4.3.0",
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
+  },
+  {
+    "pname": "System.Linq.Expressions",
+    "version": "4.3.0",
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+  },
+  {
+    "pname": "System.Linq.Queryable",
+    "version": "4.3.0",
+    "hash": "sha256-EioRexhnpSoIa96Un0syFO9CP6l1jNaXYhp5LlnaLW4="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
+  {
+    "pname": "System.ObjectModel",
+    "version": "4.3.0",
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.3.0",
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.7.0",
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.3.0",
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.3.0",
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.7.0",
+    "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
+  },
+  {
+    "pname": "System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
+  {
+    "pname": "System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.3.0",
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+  },
+  {
+    "pname": "System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.4",
+    "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.5",
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.2",
+    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
+  },
+  {
+    "pname": "System.Threading",
+    "version": "4.3.0",
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
+  },
+  {
+    "pname": "System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "TextMateSharp",
+    "version": "1.0.59",
+    "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="
+  },
+  {
+    "pname": "TextMateSharp",
+    "version": "1.0.65",
+    "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w="
+  },
+  {
+    "pname": "TextMateSharp.Grammars",
+    "version": "1.0.59",
+    "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="
+  },
+  {
+    "pname": "TextMateSharp.Grammars",
+    "version": "1.0.65",
+    "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE="
+  },
+  {
+    "pname": "Tkmm.BymlLibrary",
+    "version": "1.2.2",
+    "hash": "sha256-llMBjo/gE6laV1LlEH/LP8s7kdbwt6gCDIlFUSqq0O0="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+  },
+  {
+    "pname": "Ulid",
+    "version": "1.3.4",
+    "hash": "sha256-MyTQOrCrQa5NYcoiG51EnhybNTUrACwp1mqF+EGDgdY="
+  },
+  {
+    "pname": "VYaml",
+    "version": "0.25.1",
+    "hash": "sha256-CHaz2PLoY8nqX+qwWjDm8/BX5eLpVyZn4gYEGBVwl6g="
+  },
+  {
+    "pname": "VYaml",
+    "version": "0.28.1",
+    "hash": "sha256-tTDIsDXzeBYhuyOKZTk7HsmLa8ZeRl3MGO8pjByIwXY="
+  },
+  {
+    "pname": "VYaml.Annotations",
+    "version": "0.25.1",
+    "hash": "sha256-PayfCPXkKdKpTyhU+MCvIjGTwBaYTm33RWHxkSPcBaM="
+  },
+  {
+    "pname": "VYaml.Annotations",
+    "version": "0.28.1",
+    "hash": "sha256-vRO6fvfjdw5y2QvNaGjaktRLGykkTYlt5iq5X/5lTl4="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.4",
+    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.5",
+    "hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI="
+  }
+]
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
new file mode 100644
index 000000000000..081b4a09d8c5
--- /dev/null
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+  dotnetCorePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+  libX11,
+  glew,
+  libGL,
+  libICE,
+  libSM,
+  libXcursor,
+  libXext,
+  libXi,
+  libXrandr,
+}:
+buildDotnetModule (finalAttrs: {
+  pname = "Tkmm";
+  version = "2.0.0-beta3";
+
+  src = fetchFromGitHub {
+    owner = "TKMM-Team";
+    repo = "Tkmm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XdnNKnusvWhNy/0rQCULft6ztsB/nhTeQiN4F9LmxJE=";
+    fetchSubmodules = true;
+  };
+
+  patches = [ ./patchTk.diff ];
+
+  selfContainedBuild = true;
+
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+  projectFile = [
+    "src/Tkmm/Tkmm.csproj"
+    "src/Tkmm.CLI/Tkmm.CLI.csproj"
+  ];
+  nugetDeps = ./deps.json;
+  executables = [
+    "Tkmm"
+    "Tkmm.CLI"
+  ];
+
+  nativeBuildInputs = [ copyDesktopItems ];
+
+  runtimeDeps = [
+    # Avalonia UI
+    libX11
+    libGL
+    glew
+    libICE
+    libSM
+    libXcursor
+    libXext
+    libXi
+    libXrandr
+  ];
+
+  enableParallelBuilding = false;
+  dotnetFlags = [
+    ''-p:DefineConstants="READONLY_FS"''
+  ];
+
+  postInstall = ''
+    install -D distribution/appimage/tkmm.svg $out/share/icons/hicolor/scalable/apps/tkmm.svg
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Tears of the Kingdom Mod Manager";
+      exec = "Tkmm";
+      icon = "tkmm";
+      desktopName = "TKMM";
+      categories = [
+        "Game"
+      ];
+      comment = "Tears of the Kingdom Mod Manager";
+    })
+  ];
+
+  meta = {
+    description = "Tears of the Kingdom Mod Manager, a mod merger and manager for TotK";
+    homepage = "https://tkmm.org/";
+    license = lib.licenses.mit;
+    mainProgram = "Tkmm";
+    maintainers = with lib.maintainers; [
+      rucadi
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/tk/tkmm/patchTk.diff b/pkgs/by-name/tk/tkmm/patchTk.diff
new file mode 100644
index 000000000000..f1862b8ee989
--- /dev/null
+++ b/pkgs/by-name/tk/tkmm/patchTk.diff
@@ -0,0 +1,52 @@
+diff --git a/lib/TkSharp/TkSharp.sln b/lib/TkSharp/TkSharp.sln
+index a396543..7e5cd89 100644
+--- a/lib/TkSharp/TkSharp.sln
++++ b/lib/TkSharp/TkSharp.sln
+@@ -2,8 +2,6 @@
+ Microsoft Visual Studio Solution File, Format Version 12.00
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Merging", "TkSharp.Merging\TkSharp.Merging.csproj", "{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Debug", "TkSharp.Debug\TkSharp.Debug.csproj", "{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}"
+-EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Core", "TkSharp.Core\TkSharp.Core.csproj", "{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Data.Embedded", "TkSharp.Data.Embedded\TkSharp.Data.Embedded.csproj", "{D5BEA381-0C5C-4F95-8968-E287AF7A5E62}"
+@@ -14,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Extensions.GameBanana", "Extensions\TkSharp.Extensions.GameBanana\TkSharp.Extensions.GameBanana.csproj", "{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.DevTools", "Tools\TkSharp.DevTools\TkSharp.DevTools.csproj", "{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}"
+-EndProject
+ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FB5598AD-83AC-4235-9F06-35364AAFC83F}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TkSharp.Packaging", "TkSharp.Packaging\TkSharp.Packaging.csproj", "{ABF0ED1C-F240-4926-A772-0065E865177E}"
+@@ -32,10 +28,6 @@ Global
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ 		{DEFF5FDF-6ABF-4CF1-8825-E188C01D77EB}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{E5F7133C-0485-4FE3-9FA1-0D7BAB5A5894}.Release|Any CPU.Build.0 = Release|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{3785C128-08C5-4D0C-BDD4-4B217FE8A4F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+@@ -52,10 +44,6 @@ Global
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F}.Release|Any CPU.Build.0 = Release|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{ABF0ED1C-F240-4926-A772-0065E865177E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+@@ -67,7 +55,6 @@ Global
+ 	EndGlobalSection
+ 	GlobalSection(NestedProjects) = preSolution
+ 		{F5F2C443-90E7-4FD5-A9F5-60C94F8B6F24} = {D8795FB6-F381-4A6F-A52C-52C9ABB4E56A}
+-		{B5BC7BF1-4B0F-4EA7-B2F8-C3FCCF4E871F} = {FB5598AD-83AC-4235-9F06-35364AAFC83F}
+ 		{1356EF7B-1A17-432E-B47D-C6EF71A3B9CE} = {D8795FB6-F381-4A6F-A52C-52C9ABB4E56A}
+ 	EndGlobalSection
+ EndGlobal

From c586196e1739b21b378d27df691a764e7928c06b Mon Sep 17 00:00:00 2001
From: Peter Lehmann <peter.lehmann@hetzner.com>
Date: Sat, 7 Jun 2025 14:12:59 +0200
Subject: [PATCH 1473/1497] nixos/pdns-recursor: reload service on config
 change

---
 nixos/modules/services/networking/pdns-recursor.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 42f609128b95..04ae59b7fca9 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -287,7 +287,10 @@ in
 
     systemd.packages = [ pkgs.pdns-recursor ];
 
-    systemd.services.pdns-recursor.wantedBy = [ "multi-user.target" ];
+    systemd.services.pdns-recursor = {
+      restartTriggers = [ config.environment.etc."/pdns-recursor/recursor.yml".source ];
+      wantedBy = [ "multi-user.target" ];
+    };
 
     users.users.pdns-recursor = {
       isSystemUser = true;

From cd64f1bd874fbae5beaf0fcb39e05c2da75b16e1 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 4 Jun 2025 20:55:03 +0530
Subject: [PATCH 1474/1497] treewide: migrate nixos modules to networking.hosts

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 nixos/lib/testing/network.nix                 | 23 +++++++++----------
 .../services/cluster/kubernetes/pki.nix       |  9 +++++---
 .../virtualisation/google-compute-config.nix  | 10 ++++----
 .../virtualisation/nixos-containers.nix       | 12 ++++------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix
index 5caea2710754..2a188e480ecb 100644
--- a/nixos/lib/testing/network.nix
+++ b/nixos/lib/testing/network.nix
@@ -3,15 +3,15 @@
 let
   inherit (lib)
     attrNames
-    concatMap
+    concatMapAttrs
     concatMapStrings
-    flip
     forEach
     head
     listToAttrs
     mkDefault
     mkOption
     nameValuePair
+    optionalAttrs
     optionalString
     range
     toLower
@@ -91,23 +91,22 @@ let
         # interfaces, use the IP address corresponding to
         # the first interface (i.e. the first network in its
         # virtualisation.vlans option).
-        networking.extraHosts = flip concatMapStrings (attrNames nodes) (
-          m':
+        networking.hosts = concatMapAttrs (
+          name: config:
           let
-            config = nodes.${m'};
             hostnames =
               optionalString (
                 config.networking.domain != null
               ) "${config.networking.hostName}.${config.networking.domain} "
               + "${config.networking.hostName}\n";
           in
-          optionalString (
-            config.networking.primaryIPAddress != ""
-          ) "${config.networking.primaryIPAddress} ${hostnames}"
-          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address} ${hostnames}"
-          )
-        );
+          optionalAttrs (config.networking.primaryIPAddress != "") {
+            "${config.networking.primaryIPAddress}" = [ hostnames ];
+          }
+          // optionalAttrs (config.networking.primaryIPv6Address != "") {
+            "${config.networking.primaryIPv6Address}" = [ hostnames ];
+          }
+        ) nodes;
 
         virtualisation.qemu.options = qemuOptions;
         boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules;
diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix
index e4f8cf44e703..0453091fb9b6 100644
--- a/nixos/modules/services/cluster/kubernetes/pki.nix
+++ b/nixos/modules/services/cluster/kubernetes/pki.nix
@@ -365,9 +365,12 @@ in
         keyFile = mkDefault key;
         trustedCaFile = mkDefault caCert;
       };
-      networking.extraHosts = mkIf (config.services.etcd.enable) ''
-        127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local
-      '';
+      networking.hosts = mkIf (config.services.etcd.enable) {
+        "127.0.0.1" = [
+          "etcd.${top.addons.dns.clusterDomain}"
+          "etcd.local"
+        ];
+      };
 
       services.flannel = with cfg.certs.flannelClient; {
         kubeconfig = top.lib.mkKubeConfig "flannel" {
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 8f9e2b4f4075..3b6387a3a565 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -70,10 +70,12 @@ in
   # Rely on GCP's firewall instead
   networking.firewall.enable = mkDefault false;
 
-  # Configure default metadata hostnames
-  networking.extraHosts = ''
-    169.254.169.254 metadata.google.internal metadata
-  '';
+  networking.hosts = {
+    "169.254.169.254" = [
+      "metadata.google.internal"
+      "metadata"
+    ];
+  };
 
   networking.timeServers = [ "metadata.google.internal" ];
 
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index e5a0d37d6a9c..1854a279285d 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -1084,14 +1084,10 @@ in
           ) config.containers;
 
         # Generate /etc/hosts entries for the containers.
-        networking.extraHosts = concatStrings (
-          mapAttrsToList (
-            name: cfg:
-            optionalString (cfg.localAddress != null) ''
-              ${head (splitString "/" cfg.localAddress)} ${name}.containers
-            ''
-          ) config.containers
-        );
+        networking.hosts = lib.mapAttrs' (name: cfg: {
+          name = head (splitString "/" cfg.localAddress);
+          value = lib.optionals (cfg.localAddress != null) [ "${name}.containers" ];
+        }) config.containers;
 
         networking.dhcpcd.denyInterfaces = [
           "ve-*"

From aa68af28ed3c2f4bd7102c980c765d6ee559f7c3 Mon Sep 17 00:00:00 2001
From: vinylen <victor@viclab.se>
Date: Sat, 7 Jun 2025 20:13:41 +0200
Subject: [PATCH 1475/1497] vimPlugins.darcubox-nvim: init at 2025-06-03

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1f67f7cd764b..3164dbd7ec32 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3625,6 +3625,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  darcubox-nvim = buildVimPlugin {
+    pname = "darcubox-nvim";
+    version = "2025-06-03";
+    src = fetchFromGitHub {
+      owner = "Koalhack";
+      repo = "darcubox-nvim";
+      rev = "59754cb99fee640da1b64730a17476593af92fd3";
+      sha256 = "1xbpisq980hkdybjkd2pxdz8ghhk1a4y33ygpgi311rzx1ijapgs";
+    };
+    meta.homepage = "https://github.com/Koalhack/darcubox-nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   darkearth-nvim = buildVimPlugin {
     pname = "darkearth-nvim";
     version = "2025-04-27";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 384c01050c1e..a6cb9e43dd7b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -277,6 +277,7 @@ https://github.com/amiorin/ctrlp-z/,,
 https://github.com/ctrlpvim/ctrlp.vim/,,
 https://github.com/scottmckendry/cyberdream.nvim/,,
 https://github.com/JachymPutta/dailies.nvim/,HEAD,
+https://github.com/Koalhack/darcubox-nvim/,HEAD,
 https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
 https://github.com/rizzatti/dash.vim/,HEAD,

From 251dfdfd3eaa8f74309a8eb29a5e43b5a4150c7f Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 02:37:38 +0800
Subject: [PATCH 1476/1497] librashader: use finalAttrs

---
 pkgs/by-name/li/librashader/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index 325f42adabdb..b237f7a3fd92 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -5,14 +5,14 @@
   stdenv,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "librashader";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "SnowflakePowered";
     repo = "librashader";
-    rev = "librashader-v0.6.2";
+    tag = "librashader-v${finalAttrs.version}";
     hash = "sha256-zkvCpQ5Cq3sDOspc12/gPmNi6hn/nBe1UfWrMGi/o0Q=";
   };
 
@@ -68,4 +68,4 @@ rustPlatform.buildRustPackage {
     maintainers = with lib.maintainers; [ nadiaholmquist ];
     platforms = lib.platforms.all;
   };
-}
+})

From 13df5fa80de58dbdf167b6447f6152c474957d46 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 02:40:33 +0800
Subject: [PATCH 1477/1497] librashader: add updateScript

---
 pkgs/by-name/li/librashader/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index b237f7a3fd92..12e49d5c5919 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -1,6 +1,7 @@
 {
   fetchFromGitHub,
   lib,
+  nix-update-script,
   rustPlatform,
   stdenv,
 }:
@@ -58,6 +59,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
       runHook postInstall
     '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "librashader-v(.*)"
+    ];
+  };
+
   meta = {
     description = "RetroArch Shaders for All";
     homepage = "https://github.com/SnowflakePowered/librashader";

From 14c3dfe2098cae0f5a8a280b2c897ae3e2a3aaa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 18:54:10 +0000
Subject: [PATCH 1478/1497] signal-cli: 0.13.15 -> 0.13.16

---
 pkgs/by-name/si/signal-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index d9204abb165e..484f8226319d 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -12,12 +12,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "signal-cli";
-  version = "0.13.15";
+  version = "0.13.16";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Qe+An/AFbyN0nhKQc4Ke6ApKdZldXyw4HzbAunfb87s=";
+    hash = "sha256-L2c2UyJCNITDEvtAfPjRzjskoA3v06oI8LNw9CW4mT8=";
   };
 
   buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [

From b3346866261b6501257c5c53a99d0c51c915923d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Jun 2025 21:59:03 +0300
Subject: [PATCH 1479/1497] gentium: use finalAttrs

---
 pkgs/by-name/ge/gentium/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix
index 1a1260657dfd..2288d2510b9f 100644
--- a/pkgs/by-name/ge/gentium/package.nix
+++ b/pkgs/by-name/ge/gentium/package.nix
@@ -4,12 +4,12 @@
   fetchzip,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gentium";
   version = "6.200";
 
   src = fetchzip {
-    url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip";
+    url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${finalAttrs.version}.zip";
     hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg=";
   };
 
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation rec {
     runHook preInstall
 
     install -Dm644 *.ttf -t $out/share/fonts/truetype
-    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version}
-    cp -r documentation $out/share/doc/${pname}-${version}
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
 
     runHook postInstall
   '';
@@ -49,4 +49,4 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.ofl;
     platforms = platforms.all;
   };
-}
+})

From 718db763e8f66ec9033b8aba4b212f43b0f0ab7f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Jun 2025 21:59:43 +0300
Subject: [PATCH 1480/1497] gentium: no with lib; in meta

---
 pkgs/by-name/ge/gentium/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix
index 2288d2510b9f..4bb7d543e222 100644
--- a/pkgs/by-name/ge/gentium/package.nix
+++ b/pkgs/by-name/ge/gentium/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://software.sil.org/gentium/";
     description = "High-quality typeface family for Latin, Cyrillic, and Greek";
     longDescription = ''
@@ -42,11 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       font family, along with documentation.
     '';
     downloadPage = "https://software.sil.org/gentium/download/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       raskin
       rycee
     ];
-    license = licenses.ofl;
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
   };
 })

From 496731bdbe110fe6b79eb68f335cf01c934bb320 Mon Sep 17 00:00:00 2001
From: Benedikt Fein <fein@fim.uni-passau.de>
Date: Wed, 4 Jun 2025 19:56:45 +0200
Subject: [PATCH 1481/1497] gentium-book: init at 7.000

---
 pkgs/by-name/ge/gentium-book/package.nix | 53 ++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/ge/gentium-book/package.nix

diff --git a/pkgs/by-name/ge/gentium-book/package.nix b/pkgs/by-name/ge/gentium-book/package.nix
new file mode 100644
index 000000000000..30080ccce838
--- /dev/null
+++ b/pkgs/by-name/ge/gentium-book/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gentium-book";
+  version = "7.000";
+
+  src = fetchzip {
+    url = "http://software.sil.org/downloads/r/gentium/GentiumBook-${finalAttrs.version}.zip";
+    hash = "sha256-A/QZX8OYrifaxChC08SNOaspdnSr8PxOtYgFAwUc5WY=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://software.sil.org/gentium/";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
+    longDescription = ''
+      Gentium is a typeface family designed to enable the diverse ethnic groups
+      around the world who use the Latin, Cyrillic and Greek scripts to produce
+      readable, high-quality publications. It supports a wide range of Latin and
+      Cyrillic-based alphabets.
+
+      The design is intended to be highly readable, reasonably compact, and
+      visually attractive. The additional ‘extended’ Latin letters are designed
+      to naturally harmonize with the traditional 26 ones. Diacritics are
+      treated with careful thought and attention to their use. Gentium also
+      supports both polytonic and monotonic Greek.
+
+      This package contains the regular and italic styles for the Gentium Book
+      font family, along with documentation.
+    '';
+    downloadPage = "https://software.sil.org/gentium/download/";
+    maintainers = with lib.maintainers; [
+      b-fein
+      raskin
+      rycee
+    ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+  };
+})

From c93299fd4476ee36795f111759455633e611f374 Mon Sep 17 00:00:00 2001
From: Benedikt Fein <fein@fim.uni-passau.de>
Date: Wed, 4 Jun 2025 21:24:36 +0200
Subject: [PATCH 1482/1497] gentium-plus: rename from gentium

Upstream has named this font 'GentiumPlus' all the time, and stopped
releasing new versions of this font, but began to release a font named
simply 'Gentium' straight at version 7.000.
---
 nixos/tests/fontconfig-default-fonts.nix              | 2 +-
 pkgs/by-name/ge/{gentium => gentium-plus}/package.nix | 2 +-
 pkgs/by-name/ho/hottext/package.nix                   | 4 ++--
 pkgs/by-name/si/sile/package.nix                      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/by-name/ge/{gentium => gentium-plus}/package.nix (98%)

diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
index 674192e7bba2..e3af3aa39f99 100644
--- a/nixos/tests/fontconfig-default-fonts.nix
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -15,7 +15,7 @@
         cantarell-fonts
         twitter-color-emoji
         source-code-pro
-        gentium
+        gentium-plus
       ];
       fonts.fontconfig.defaultFonts = {
         serif = [ "Gentium Plus" ];
diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium-plus/package.nix
similarity index 98%
rename from pkgs/by-name/ge/gentium/package.nix
rename to pkgs/by-name/ge/gentium-plus/package.nix
index 4bb7d543e222..cd043d91e477 100644
--- a/pkgs/by-name/ge/gentium/package.nix
+++ b/pkgs/by-name/ge/gentium-plus/package.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gentium";
+  pname = "gentium-plus";
   version = "6.200";
 
   src = fetchzip {
diff --git a/pkgs/by-name/ho/hottext/package.nix b/pkgs/by-name/ho/hottext/package.nix
index 91e38a608a31..7bdcaa578201 100644
--- a/pkgs/by-name/ho/hottext/package.nix
+++ b/pkgs/by-name/ho/hottext/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNimPackage,
   fetchFromSourcehut,
-  gentium,
+  gentium-plus,
   makeDesktopItem,
 }:
 
@@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: {
 
   lockFile = ./lock.json;
 
-  HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
+  HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";
 
   desktopItem = makeDesktopItem {
     categories = [ "Utility" ];
diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index 5c1e5d620656..6ea63089511b 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -20,7 +20,7 @@
   libiconv,
   # FONTCONFIG_FILE
   makeFontsConf,
-  gentium,
+  gentium-plus,
 
   # passthru.tests
   runCommand,
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   FONTCONFIG_FILE = makeFontsConf {
     fontDirectories = [
-      gentium
+      gentium-plus
     ];
   };
   strictDeps = true;

From 12cdf167dea793a5ce5e5275cb99950c283733de Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 8 Jun 2025 03:17:46 +0800
Subject: [PATCH 1483/1497] asdf_2_26: fix build

---
 pkgs/development/lisp-modules/asdf/2.26.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
index 301ee66bf7cd..f32376e594bf 100644
--- a/pkgs/development/lisp-modules/asdf/2.26.nix
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"/share/doc/asdf/
     cp -r ./* "$out"/lib/common-lisp/asdf/
     cp -r doc/* "$out"/share/doc/asdf/
-    ln -s  "$out"/lib/common-lisp/{asdf/uiop,uiop}
   '';
 
   meta = with lib; {

From 4712b180854ad396f9880434eb53f3ce12878065 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 19:35:55 +0000
Subject: [PATCH 1484/1497] woodpecker-plugin-git: 2.6.4 -> 2.6.5

---
 pkgs/by-name/wo/woodpecker-plugin-git/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 73e5abc30e12..74e6a9efcad7 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = version;
-    hash = "sha256-iCB2GQ8SpuW+uT8RyMNb6cq4bbWIeMO069yq4a+nIVI=";
+    hash = "sha256-9eTkdhlgY7hDqzbgBeoW6mITYsEJFcnRcilruD6wzU4=";
   };
 
   vendorHash = "sha256-Zn2TYNyKvtmtEAlKmWBhjyzHiM0dwDT3E/LOtSzjFK0=";

From c296a9d13b61a0f8fe92e548fd16e1637534f954 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 20:05:52 +0000
Subject: [PATCH 1485/1497] simdutf: 7.2.0 -> 7.3.0

---
 pkgs/by-name/si/simdutf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 50183972f8fe..93cdf3dee761 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZfC0k1Z7nOeauHYTKjMt73qhoTn4c15dZWvICeuYhM8=";
+    hash = "sha256-P1Ryi0LdibqrHfBjq2lLBMQfB0WjLA69K3SwK/apFZM=";
   };
 
   # Fix build on darwin

From f7d136fea75c645e046f70890b5aff6e3a88498e Mon Sep 17 00:00:00 2001
From: Jakob Beckmann <f4z3r-github@pm.me>
Date: Tue, 30 Apr 2024 21:05:45 +0200
Subject: [PATCH 1486/1497] chore: add luajitPackages.sofa

---
 maintainers/maintainer-list.nix               | 11 +++++
 maintainers/scripts/luarocks-packages.csv     |  1 +
 .../lua-modules/generated-packages.nix        | 44 +++++++++++++++++++
 pkgs/development/lua-modules/overrides.nix    | 12 +++++
 4 files changed, 68 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 835ec2814e89..be7941a57f06 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7912,6 +7912,17 @@
     githubId = 11909469;
     name = "Fabian Geiselhart";
   };
+  f4z3r = {
+    email = "f4z3r-github@pm.me";
+    name = "Jakob Beckmann";
+    github = "f4z3r";
+    githubId = 32326425;
+    keys = [
+      {
+        fingerprint = "358A 6251 E2ED EDC1 9717  14A7 96A8 BA6E C871 2183";
+      }
+    ];
+  };
   fab = {
     email = "mail@fabian-affolter.ch";
     matrix = "@fabaff:matrix.org";
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 2b9c13e5071d..457505f8f0de 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -143,6 +143,7 @@ rtp.nvim,,,,,,mrcjkb
 rustaceanvim,,,,,,mrcjkb
 say,,,,,,
 serpent,,,,,,lockejan
+sofa,,,,,,f4z3r
 sqlite,,,,,,
 std._debug,,,,,,
 std.normalize,,,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d9b50a11d799..c6f870c04031 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -4706,6 +4706,50 @@ final: prev: {
     }
   ) { };
 
+  sofa = callPackage (
+    {
+      buildLuarocksPackage,
+      fetchFromGitHub,
+      fetchurl,
+      luaAtLeast,
+      luaOlder,
+      argparse,
+      compat53,
+      luatext,
+      lyaml,
+    }:
+    buildLuarocksPackage {
+      pname = "sofa";
+      version = "0.7.0-0";
+      knownRockspec =
+        (fetchurl {
+          url = "mirror://luarocks/sofa-0.7.0-0.rockspec";
+          sha256 = "0hkdm4h8yjh5zw9116cclff8q6br4yyhb7f7y7lv4ydrkxfl1lzq";
+        }).outPath;
+      src = fetchFromGitHub {
+        owner = "f4z3r";
+        repo = "sofa";
+        rev = "v0.7.0";
+        hash = "sha256-aoFmzhzWuBTbDnSWDGLbkhORlrtvVOtfIV7oq2xc0pQ=";
+      };
+
+      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      propagatedBuildInputs = [
+        argparse
+        compat53
+        luatext
+        lyaml
+      ];
+
+      meta = {
+        homepage = "https://github.com/f4z3r/sofa";
+        description = "A command execution engine powered by rofi.";
+        maintainers = with lib.maintainers; [ f4z3r ];
+        license.fullName = "MIT <http://opensource.org/licenses/MIT>";
+      };
+    }
+  ) { };
+
   sqlite = callPackage (
     {
       buildLuarocksPackage,
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 94136d9dfc52..54ce81ed2ba4 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -977,6 +977,18 @@ in
     '';
   });
 
+  sofa = prev.sofa.overrideAttrs (oa: {
+    nativeBuildInputs = oa.nativeBuildInputs ++ [
+      installShellFiles
+    ];
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd sofa \
+        --bash <($out/bin/sofa --completion bash) \
+        --fish <($out/bin/sofa --completion fish) \
+        --zsh <($out/bin/sofa --completion zsh)
+    '';
+  });
+
   sqlite = prev.sqlite.overrideAttrs (drv: {
     doCheck = stdenv.hostPlatform.isLinux;
     nativeCheckInputs = [

From b2a84e5a6c55fd35f3d5ba24f7f216a1d4895c6d Mon Sep 17 00:00:00 2001
From: Murph Murphy <murph@clurictec.com>
Date: Sat, 7 Jun 2025 15:14:05 -0600
Subject: [PATCH 1487/1497] isponsorblocktv: add darwin platforms

There are published osx artifacts and none of the python packages used are linux specific. Tested on OSX Sequoia with `--impure` and `NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1` and confirmed that functionality fully works.
---
 pkgs/by-name/is/isponsorblocktv/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix
index dd5651d38efd..c74dd294cff6 100644
--- a/pkgs/by-name/is/isponsorblocktv/package.nix
+++ b/pkgs/by-name/is/isponsorblocktv/package.nix
@@ -59,6 +59,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ lukegb ];
     mainProgram = "iSponsorBlockTV";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 386fcf3077aaedf40633b6de4b817898ba9253ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 22:04:14 +0000
Subject: [PATCH 1488/1497] phpPackages.grumphp: 2.12.0 -> 2.13.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 7a1f2fde88c4..b005fb272f82 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uA+s3ZOZIlgO2yD5jsjJUKPy3u66K/8kazDL3TUVyF8=";
+    hash = "sha256-tPMmvauFQooXYQvS5BCZN/pJzywXeiOqqmnwy64jBaA=";
   };
 
-  vendorHash = "sha256-F+9/Avu+36pN0U9meUJppo4YqyCKEblQx2rCJ7uD8PU=";
+  vendorHash = "sha256-TRK/xDrVvjJOWOh8JwKvffEV3kyR2VpveKbFn6rjGkI=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 381050065b4d373570f9930674e9fb91683e6504 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 8 Jun 2025 00:11:27 +0200
Subject: [PATCH 1489/1497] pre-commit: cleanup

---
 pkgs/by-name/pr/pre-commit/package.nix | 50 ++++++++++++++------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index a0a067bf295c..d3fe6c9f57ce 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -1,28 +1,33 @@
 {
   lib,
-  fetchFromGitHub,
+  stdenv,
   python3Packages,
-  cargo,
-  coursier,
-  dotnet-sdk,
-  gitMinimal,
-  go,
-  nodejs,
-  perl,
-  cabal-install,
+  fetchFromGitHub,
   julia,
   julia-bin,
-  pre-commit,
+
+  # tests
+  cabal-install,
+  cargo,
+  gitMinimal,
+  go,
+  perl,
   versionCheckHook,
   writableTmpDirAsHomeHook,
+  coursier,
+  dotnet-sdk,
+  nodejs,
+
+  # passthru
+  callPackage,
+  pre-commit,
 }:
 
-with python3Packages;
 let
   i686Linux = stdenv.buildPlatform.system == "i686-linux";
   julia' = if lib.meta.availableOn stdenv.hostPlatform julia then julia else julia-bin;
 in
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pre-commit";
   version = "4.2.0";
   pyproject = true;
@@ -40,11 +45,11 @@ buildPythonApplication rec {
     ./pygrep-pythonpath.patch
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     cfgv
     identify
     nodeenv
@@ -55,21 +60,22 @@ buildPythonApplication rec {
 
   nativeCheckInputs =
     [
+      cabal-install
       cargo
       gitMinimal
       go
-      # libiconv # For rust tests on Darwin
+      julia'
       perl
+      versionCheckHook
+      writableTmpDirAsHomeHook
+    ]
+    ++ (with python3Packages; [
       pytest-env
       pytest-forked
       pytest-xdist
       pytestCheckHook
       re-assert
-      cabal-install
-      julia'
-      versionCheckHook
-      writableTmpDirAsHomeHook
-    ]
+    ])
     ++ lib.optionals (!i686Linux) [
       # coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
       # JRE on i686-linux: <https://github.com/NixOS/nixpkgs/issues/314873>. When coursier gets
@@ -90,9 +96,9 @@ buildPythonApplication rec {
     substituteInPlace pre_commit/resources/hook-tmpl \
       --subst-var-by pre-commit $out
     substituteInPlace pre_commit/languages/python.py \
-      --subst-var-by virtualenv ${virtualenv}
+      --subst-var-by virtualenv ${python3Packages.virtualenv}
     substituteInPlace pre_commit/languages/node.py \
-      --subst-var-by nodeenv ${nodeenv}
+      --subst-var-by nodeenv ${python3Packages.nodeenv}
 
     patchShebangs pre_commit/resources/hook-tmpl
   '';

From 8aad240124d02c68097efa2f31afe6e28c422253 Mon Sep 17 00:00:00 2001
From: Benedikt Fein <fein@fim.uni-passau.de>
Date: Wed, 4 Jun 2025 19:48:02 +0200
Subject: [PATCH 1490/1497] gentium: init at 7.000

---
 pkgs/by-name/ge/gentium/package.nix | 53 +++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/ge/gentium/package.nix

diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix
new file mode 100644
index 000000000000..86af847e9793
--- /dev/null
+++ b/pkgs/by-name/ge/gentium/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gentium";
+  version = "7.000";
+
+  src = fetchzip {
+    url = "http://software.sil.org/downloads/r/gentium/Gentium-${finalAttrs.version}.zip";
+    hash = "sha256-RBBecFdi/yyFfBk1CcQebOuAdKNUczpwOP52zVtbc2o=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+    install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+    cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://software.sil.org/gentium/";
+    description = "High-quality typeface family for Latin, Cyrillic, and Greek";
+    longDescription = ''
+      Gentium is a typeface family designed to enable the diverse ethnic groups
+      around the world who use the Latin, Cyrillic and Greek scripts to produce
+      readable, high-quality publications. It supports a wide range of Latin and
+      Cyrillic-based alphabets.
+
+      The design is intended to be highly readable, reasonably compact, and
+      visually attractive. The additional ‘extended’ Latin letters are designed
+      to naturally harmonize with the traditional 26 ones. Diacritics are
+      treated with careful thought and attention to their use. Gentium also
+      supports both polytonic and monotonic Greek.
+
+      This package contains the regular and italic styles for the Gentium font
+      family, along with documentation.
+    '';
+    downloadPage = "https://software.sil.org/gentium/download/";
+    maintainers = with lib.maintainers; [
+      b-fein
+      raskin
+      rycee
+    ];
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+  };
+})

From 9dd340e3083d45895097969f1f314ca361a9800b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 7 Jun 2025 22:28:21 +0300
Subject: [PATCH 1491/1497] nixosTests.fontconfig-default-fonts: use Gentium
 font

As GentiumPlus will probably never be updated further by upstream.
---
 nixos/tests/fontconfig-default-fonts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
index e3af3aa39f99..4a46b3e17172 100644
--- a/nixos/tests/fontconfig-default-fonts.nix
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -15,10 +15,10 @@
         cantarell-fonts
         twitter-color-emoji
         source-code-pro
-        gentium-plus
+        gentium
       ];
       fonts.fontconfig.defaultFonts = {
-        serif = [ "Gentium Plus" ];
+        serif = [ "Gentium" ];
         sansSerif = [ "Cantarell" ];
         monospace = [ "Source Code Pro" ];
         emoji = [ "Twitter Color Emoji" ];
@@ -26,7 +26,7 @@
     };
 
   testScript = ''
-    machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")
+    machine.succeed("fc-match serif | grep '\"Gentium\"'")
     machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
     machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
     machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")

From 3e3af30ad26310e1b5c8769082de4122e17d302f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Jun 2025 22:56:44 +0000
Subject: [PATCH 1492/1497] nom: 2.8.1 -> 2.8.2

---
 pkgs/by-name/no/nom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 58fd59144f78..4ee8739d1800 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     tag = "v${version}";
-    hash = "sha256-PqoTpy+Pz5OS+7pzzdxNKeqIZRipOvHKMs9o67XzdqY=";
+    hash = "sha256-SkmY3eFEAC4EJtFpe6FwRmECIZJa/Oyb1yov75ySSH0=";
   };
 
   vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";

From f2aff81018ae4ad8a1e244335db7e77f6f7e8997 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Jun 2025 01:20:28 +0200
Subject: [PATCH 1493/1497] applyPatches: passthru outputHashAlog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes evaluation of the find-tarballs.nix script used in the tarballs
mirror pipeline.

```
$ nix-instantiate --eval --json --strict maintainers/scripts/find-tarballs.nix --arg expr 'import maintainers/scripts/all-tarballs.nix' --show-trace
[...]
error:
       … while calling anonymous lambda
         at maintainers/scripts/find-tarballs.nix:3:1:
            2|
            3| {
             | ^
            4|   expr,

       … while evaluating uniqueFiles
         at maintainers/scripts/find-tarballs.nix:105:1:
          104| in
          105| uniqueFiles
             | ^
          106|

       … while calling the 'map' builtin
         at maintainers/scripts/find-tarballs.nix:26:17:
           25|
           26|   uniqueFiles = map (x: x.file) (genericClosure {
             |                 ^
           27|     startSet = map (file: {

       … while calling the 'genericClosure' builtin
         at maintainers/scripts/find-tarballs.nix:26:34:
           25|
           26|   uniqueFiles = map (x: x.file) (genericClosure {
             |                                  ^
           27|     startSet = map (file: {

       … while evaluating type
         at maintainers/scripts/find-tarballs.nix:28:28:
           27|     startSet = map (file: {
           28|       key = with file; (if type == null then "" else type + "+") + hash;
             |                            ^
           29|       inherit file;

       error: attribute 'outputHashAlgo' missing
       at maintainers/scripts/find-tarballs.nix:38:16:
           37|     isPatch = (drv ? postFetch && drv.postFetch != "");
           38|     type = drv.outputHashAlgo;
             |                ^
           39|     name = drv.name;
```
---
 pkgs/build-support/trivial-builders/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 3cc902958ce3..ca2f33afa7b3 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -1037,6 +1037,7 @@ rec {
             "tag"
             "url"
             "outputHash"
+            "outputHashAlgo"
           ] src
         );
       in

From 13a7364eda3851a9bb104d09e0fce422a7a4eca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 00:33:29 +0000
Subject: [PATCH 1494/1497] mini-calc: 3.4.2 -> 4.0.0

---
 pkgs/by-name/mi/mini-calc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix
index 44973a67f9d7..5218c3420063 100644
--- a/pkgs/by-name/mi/mini-calc/package.nix
+++ b/pkgs/by-name/mi/mini-calc/package.nix
@@ -9,17 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mini-calc";
-  version = "3.4.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "vanilla-extracts";
     repo = "calc";
     rev = version;
-    hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0=";
+    hash = "sha256-601BmecY+jbiD39buN68MeJKd5wguH0hahHquHadsL4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DMfk0F2HSFGoGM1+JCeDlPMOYBjRumc8KXzt0xsSbh0=";
+  cargoHash = "sha256-9Ug6lyDvacj47FnLzJo4fwpXeMYxgSlMB7+2fIv5oxo=";
 
   nativeBuildInputs = [ makeWrapper ];
   postFixup = ''

From e91a6f4594d13abb104f3b3e8c92c9d51f310559 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 12 Mar 2025 18:27:54 +0100
Subject: [PATCH 1495/1497] nixosTests.keepassxc: enable dconf

Keepass tries to commit data to the service ca.desrt.dconf, which
leads to many warnings in the test log if dconf is not enabled.
---
 nixos/tests/keepassxc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix
index 1cdbdb445c3d..ae5ff332750f 100644
--- a/nixos/tests/keepassxc.nix
+++ b/nixos/tests/keepassxc.nix
@@ -17,6 +17,7 @@
       ];
 
       services.xserver.enable = true;
+      programs.dconf.enable = true;
 
       # for better OCR
       environment.etc."icewm/prefoverride".text = ''

From af9ffbb640bc2d815e36d3a1cab63766d96f356e Mon Sep 17 00:00:00 2001
From: Paul Mulders <justinkb@gmail.com>
Date: Sun, 8 Jun 2025 05:17:55 +0200
Subject: [PATCH 1496/1497] blender: fix hip support (#410748)

---
 pkgs/by-name/bl/blender/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index bd3a2e09f4f7..7cf4b1a96a6d 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -134,8 +134,8 @@ stdenv'.mkDerivation (finalAttrs: {
                   '${lib.getLib brotli}/lib/libbrotlidec.dylib'
     '')
     + (lib.optionalString hipSupport ''
-      substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
-      substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
+      substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
+      substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
     '');
 
   env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";

From 85794319e727ea666e0302ad177ca5448238c1d1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 8 Jun 2025 01:31:17 +0300
Subject: [PATCH 1497/1497] gentium: mention rename confusion in release notes

---
 doc/release-notes/rl-2511.section.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index f739ba9cd1f5..0b1b4a844d6c 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -16,6 +16,7 @@
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
+- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}