From d54d73ca4bf2c359766cd1c6e5cdf48cc51da26c Mon Sep 17 00:00:00 2001
From: Felix Kimmel <91203390+TheRobot2105@users.noreply.github.com>
Date: Thu, 10 Apr 2025 15:12:36 +0200
Subject: [PATCH 01/33] vscode-extensions.natqe.reload: init at 0.0.7

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../extensions/natqe.reload/default.nix       | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/natqe.reload/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 56963fea4a46..a3a14a8b7385 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3758,6 +3758,8 @@ let
 
       myriad-dreamin.tinymist = callPackage ./myriad-dreamin.tinymist { };
 
+      natqe.reload = callPackage ./natqe.reload { };
+
       naumovs.color-highlight = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "color-highlight";
diff --git a/pkgs/applications/editors/vscode/extensions/natqe.reload/default.nix b/pkgs/applications/editors/vscode/extensions/natqe.reload/default.nix
new file mode 100644
index 000000000000..f23581c2b1c0
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/natqe.reload/default.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  vscode-utils,
+}:
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "reload";
+    publisher = "natqe";
+    version = "0.0.7";
+    hash = "sha256-j0Dj7YiawhPAMHe8wk8Ph4vo26IneidoGJ4C9O7Z/64=";
+  };
+  meta = {
+    description = "This extension will add reload button to status bar in the right-bottom of your VSCode editor.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=natqe.reload";
+    homepage = "https://github.com/natqe/reload";
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.therobot2105 ];
+  };
+}

From 40b9a8acac481e4281e4929911d94ee2523d380a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Tue, 13 May 2025 17:56:12 +0200
Subject: [PATCH 02/33] insync-emblem-icons: drop

It is no longer updated upstream.
---
 .../in/insync-emblem-icons/package.nix        | 39 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/in/insync-emblem-icons/package.nix

diff --git a/pkgs/by-name/in/insync-emblem-icons/package.nix b/pkgs/by-name/in/insync-emblem-icons/package.nix
deleted file mode 100644
index c6969afe2e67..000000000000
--- a/pkgs/by-name/in/insync-emblem-icons/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  dpkg,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "insync-emblem-icons";
-  version = "3.8.7.50516";
-
-  src = fetchurl rec {
-    urls = [
-      "https://cdn.insynchq.com/builds/linux/insync-emblem-icons_${finalAttrs.version}_all.deb"
-      "https://web.archive.org/web/20240409081214/${builtins.elemAt urls 0}"
-    ];
-    hash = "sha256-uALaIxETEEkjDTx331uIsb4VswWk2K0dGuDMYH8v5U8=";
-  };
-
-  nativeBuildInputs = [ dpkg ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -R usr/* $out/
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ hellwolf ];
-    homepage = "https://www.insynchq.com";
-    description = "This package contains the file manager emblem icons for Insync file manager extensions";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4ad5e23bd746..bc86d61e1a46 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -873,6 +873,7 @@ mapAliases {
   input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
   index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
   inotifyTools = inotify-tools;
+  insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
   inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
   ipfs = kubo; # Added 2022-09-27
   ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27

From 89f3632a848cba1ebcfe6e88b76c1c81389c12de Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 29 May 2025 14:31:36 +0800
Subject: [PATCH 03/33] vfox: init at 0.6.10

---
 pkgs/by-name/vf/vfox/package.nix | 51 ++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/vf/vfox/package.nix

diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix
new file mode 100644
index 000000000000..c968eb983df5
--- /dev/null
+++ b/pkgs/by-name/vf/vfox/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "vfox";
+  version = "0.6.10";
+
+  src = fetchFromGitHub {
+    owner = "version-fox";
+    repo = "vfox";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bH7rHhjmfXCOAv+K0HDyPAi+ZBfLllsGyhLSo8rpcl4=";
+  };
+
+  vendorHash = "sha256-TmWhzjjv+DkFHV4kEKpVYgQpI0Vl4aYvKR9QVpawrYA=";
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+
+  checkFlags =
+    let
+      skippedTests = [
+        # need network
+        "TestGetRequest"
+        "TestHeadRequest"
+        "TestDownloadFile"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  preCheck = ''
+    export CI=1
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Extendable version manager";
+    homepage = "https://github.com/version-fox/vfox";
+    changelog = "https://github.com/version-fox/vfox/releases/tag/v${finalAttrs.version}";
+    mainProgram = "vfox";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+})

From f5f8ebf9ee81edc12d4288f70867fff667d69f4f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 2 Jun 2025 14:12:36 +0800
Subject: [PATCH 04/33] annotator: 1.2.1 -> 2.0.0

Diff: https://github.com/phase1geo/annotator/compare/1.2.1...2.0.0
---
 pkgs/by-name/an/annotator/package.nix | 33 +++++++++++++++++----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/an/annotator/package.nix b/pkgs/by-name/an/annotator/package.nix
index 2846180b1564..554d2dad4c29 100644
--- a/pkgs/by-name/an/annotator/package.nix
+++ b/pkgs/by-name/an/annotator/package.nix
@@ -6,47 +6,56 @@
   meson,
   ninja,
   vala,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   desktop-file-utils,
+  gtk3,
   libgee,
   pantheon,
   libxml2,
   libhandy,
+  libportal-gtk4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "annotator";
-  version = "1.2.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "annotator";
-    rev = version;
-    hash = "sha256-VHvznkGvrE8o9qq+ijrIStSavq46dS8BqclWEWZ8mG8=";
+    tag = finalAttrs.version;
+    hash = "sha256-mv3fMlYB4XcAWI6O6wN8ujNRDLZlX3ef/gKdOMYEHq0=";
   };
 
+  postPatch = ''
+    substituteInPlace src/Application.vala \
+      --replace-fail 'Environment.set_variable( "GDK_BACKEND", "x11", true );' ""
+  '';
+
   nativeBuildInputs = [
     pkg-config
     meson
     ninja
     vala
-    wrapGAppsHook3
+    wrapGAppsHook4
     desktop-file-utils
   ];
 
   buildInputs = [
     libgee
-    pantheon.granite
+    pantheon.granite7
+    libportal-gtk4
     libxml2
     libhandy
+    gtk3
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Image annotation for Elementary OS";
     homepage = "https://github.com/phase1geo/Annotator";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "com.github.phase1geo.annotator";
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 76781c7f6156ee04eeb1f7d037052cf36b66769a Mon Sep 17 00:00:00 2001
From: bokicoder <1556588440@qq.com>
Date: Wed, 4 Jun 2025 22:09:36 +0800
Subject: [PATCH 05/33] shaderbg: init at 0-unstable-2024-11-26

---
 pkgs/by-name/sh/shaderbg/package.nix | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/sh/shaderbg/package.nix

diff --git a/pkgs/by-name/sh/shaderbg/package.nix b/pkgs/by-name/sh/shaderbg/package.nix
new file mode 100644
index 000000000000..c5f526f49541
--- /dev/null
+++ b/pkgs/by-name/sh/shaderbg/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  cmake,
+  pkg-config,
+  wayland-scanner,
+  wayland,
+  libGL,
+}:
+stdenv.mkDerivation {
+  pname = "shaderbg";
+  version = "0-unstable-2024-11-26";
+  src = fetchFromGitHub {
+    owner = "Mr-Pine";
+    repo = "shaderbg";
+    rev = "cf9b135069550f8d7c8411d8a53285882034331c";
+    hash = "sha256-J+fRzSTEMlT9oLVZqbstrDxuKiJTAHNTLxB8IPgdom0=";
+  };
+  nativeBuildInputs = [
+    meson
+    ninja
+    cmake
+    pkg-config
+    wayland-scanner
+  ];
+  buildInputs = [
+    wayland
+    libGL
+  ];
+  meta = {
+    description = "Shader-based live wallpaper program for compositors that support wlr-layer-shell (Sway and others)";
+    homepage = "https://github.com/Mr-Pine/shaderbg";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ bokicoder ];
+    mainProgram = "shaderbg";
+    platforms = lib.platforms.linux;
+  };
+}

From 324ca26eba519d5ee7b2d650050e4083b573d80b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 5 Jun 2025 16:03:42 +0300
Subject: [PATCH 06/33] python312Packages.granian: don't force a custom
 allocator

---
 .../python-modules/granian/default.nix        | 26 +++-------
 .../python-modules/granian/no-alloc.patch     | 50 +++++++++++++++++++
 2 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/granian/no-alloc.patch

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 6c9b5ceba619..2d9abab99bdc 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
   cacert,
@@ -14,7 +13,6 @@
   pytest-asyncio,
   websockets,
   httpx,
-  rust-jemalloc-sys,
   sniffio,
   nix-update-script,
 }:
@@ -31,6 +29,14 @@ buildPythonPackage rec {
     hash = "sha256-qJ65ILj7xLqOWmpn1UzNQHUnzFg714gntVSmYHpI65I=";
   };
 
+  # Granian forces a custom allocator for all the things it runs,
+  # which breaks some libraries in funny ways. Make it not do that,
+  # and allow the final application to make the allocator decision
+  # via LD_PRELOAD or similar.
+  patches = [
+    ./no-alloc.patch
+  ];
+
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
     hash = "sha256-swfqKp8AsxNAUc7dlce6J4dNQbNGWrCcUDc31AhuMmI=";
@@ -41,22 +47,6 @@ buildPythonPackage rec {
     maturinBuildHook
   ];
 
-  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, ... }:
-      {
-        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
   ];
diff --git a/pkgs/development/python-modules/granian/no-alloc.patch b/pkgs/development/python-modules/granian/no-alloc.patch
new file mode 100644
index 000000000000..d3dc138fb293
--- /dev/null
+++ b/pkgs/development/python-modules/granian/no-alloc.patch
@@ -0,0 +1,50 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 4e6676f..1657d61 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -40,7 +40,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] }
+ hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] }
+ itertools = "0.14"
+ log = "0.4"
+-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls"], optional = true }
+ mime_guess = "=2.0"
+ pem = "=3.0"
+ percent-encoding = "=2.3"
+@@ -56,15 +55,9 @@ tokio-stream = "0.1"
+ tokio-tungstenite = "=0.26"
+ tokio-util = { version = "0.7", features = ["codec", "rt"] }
+ 
+-[target.'cfg(not(any(target_env = "musl", target_os = "freebsd", target_os = "openbsd", target_os = "windows")))'.dependencies]
+-tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"] }
+-
+ [build-dependencies]
+ pyo3-build-config = "=0.25"
+ 
+-[features]
+-mimalloc = ["dep:mimalloc"]
+-
+ [profile.release]
+ codegen-units = 1
+ debug = false
+diff --git a/src/lib.rs b/src/lib.rs
+index 9172842..6c41005 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -1,17 +1,3 @@
+-#[cfg(not(any(
+-    target_env = "musl",
+-    target_os = "freebsd",
+-    target_os = "openbsd",
+-    target_os = "windows",
+-    feature = "mimalloc"
+-)))]
+-#[global_allocator]
+-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+-
+-#[cfg(feature = "mimalloc")]
+-#[global_allocator]
+-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+-
+ use pyo3::prelude::*;
+ use std::sync::OnceLock;
+ 

From a849a90897029a7a33ed0a8b76dc0ca936601f83 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 11:49:43 +0800
Subject: [PATCH 07/33] yubikey-personalization-gui: drop

---
 .../yubikey-personalization-gui/default.nix   | 62 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/tools/misc/yubikey-personalization-gui/default.nix

diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
deleted file mode 100644
index 1698737f2000..000000000000
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  mkDerivation,
-  pkg-config,
-  qtbase,
-  qmake,
-  imagemagick,
-  libyubikey,
-  yubikey-personalization,
-}:
-
-mkDerivation rec {
-  pname = "yubikey-personalization-gui";
-  version = "3.1.25";
-
-  src = fetchurl {
-    url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz";
-    sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    imagemagick
-  ];
-  buildInputs = [
-    yubikey-personalization
-    qtbase
-    libyubikey
-  ];
-
-  installPhase = ''
-    install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui"
-    install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1"
-
-    # Desktop files
-    install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop"
-
-    # Icons
-    install -D -m0644 resources/lin/yubikey-personalization-gui.xpm "$out/share/pixmaps/yubikey-personalization-gui.xpm"
-    install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png"
-    for SIZE in 16 24 32 48 64 96; do
-      # set modify/create for reproducible builds
-      convert -scale ''${SIZE} +set date:create +set date:modify \
-        resources/lin/yubikey-personalization-gui.png \
-        yubikey-personalization-gui.png
-
-      install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png"
-    done
-  '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    homepage = "https://developers.yubico.com/yubikey-personalization-gui";
-    description = "QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    mainProgram = "yubikey-personalization-gui";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 096df1a9a019..ffc514177b0d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2107,6 +2107,7 @@ mapAliases {
   yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
   yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
+  yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 339dc8a399fe..0e6d427e4b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9825,8 +9825,6 @@ with pkgs;
 
   yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
 
-  yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
-
   zlib = callPackage ../development/libraries/zlib {
     stdenv =
       # zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv

From d8c5a5de27af1efab38eedc5dc899b53e1291cc7 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 01:40:00 +0800
Subject: [PATCH 08/33] orbuculum: 2.1.0 -> 2.2.0

Diff: https://github.com/orbcode/orbuculum/compare/V2.1.0...V2.2.0

Changelog: https://github.com/orbcode/orbuculum/blob/V2.2.0/CHANGES.md
---
 pkgs/by-name/or/orbuculum/package.nix | 35 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/or/orbuculum/package.nix b/pkgs/by-name/or/orbuculum/package.nix
index 00c54c260a1a..53265eb820cc 100644
--- a/pkgs/by-name/or/orbuculum/package.nix
+++ b/pkgs/by-name/or/orbuculum/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchzip,
   meson,
   ninja,
   pkg-config,
@@ -9,22 +10,33 @@
   libusb1,
   ncurses,
   SDL2,
+  libelf,
 }:
 
-stdenv.mkDerivation rec {
+let
+  libdwarf = fetchzip {
+    url = "https://www.prevanders.net/libdwarf-0.7.0.tar.xz";
+    hash = "sha256-YTTbBJkDu2BSAVpvucqtg7/hFxXrxLnNAlvAL7rmkdE=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "orbuculum";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "orbcode";
     repo = "orbuculum";
-    rev = "V${version}";
-    sha256 = "sha256-Ohcc8739W/EmDjOYhcMgzEPVhzbWrUYgsPLdy4qzxhY=";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-n3+cfeN6G9n8pD5WyiHPENMJ0FN+bRVZe9pl81uvIrc=";
   };
 
-  prePatch = ''
-    substituteInPlace meson.build --replace \
-      "/etc/udev/rules.d" "$out/etc/udev/rules.d"
+  postPatch = ''
+    cp --recursive --no-preserve=mode ${libdwarf} subprojects/libdwarf-0.7.0
+    pushd subprojects/libdwarf-0.7.0
+    patch -p1 < ../packagefiles/libdwarf/0001-fix-Use-project_source_root-for-subproject-compatibi.patch
+    patch -p1 < ../packagefiles/libdwarf/0002-fix-compilation-clang.patch
+    patch -p1 < ../packagefiles/libdwarf/0003-Fixed-calloc-arguments-order.patch
+    popd
   '';
 
   nativeBuildInputs = [
@@ -38,11 +50,10 @@ stdenv.mkDerivation rec {
     libusb1
     ncurses
     SDL2
+    libelf
   ];
 
-  installFlags = [
-    "INSTALL_ROOT=$(out)/"
-  ];
+  installFlags = [ "INSTALL_ROOT=$(out)/" ];
 
   postInstall = ''
     mkdir -p $out/etc/udev/rules.d/
@@ -52,9 +63,9 @@ stdenv.mkDerivation rec {
   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";
+    changelog = "https://github.com/orbcode/orbuculum/blob/V${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ newam ];
     platforms = lib.platforms.linux;
   };
-}
+})

From a8197e35fb033734e1a10ed464bccc9b0f4a91de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jun 2025 06:48:12 +0000
Subject: [PATCH 09/33] polarity: latest-unstable-2025-05-19 ->
 latest-unstable-2025-06-06

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

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index ca1409cffdb0..0bc835322a24 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-05-19";
+  version = "latest-unstable-2025-06-06";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "b715e6529210242d79f304d34170eba8473174b2";
-    hash = "sha256-/yq6fqjkZoEw4MhsOWlRdQciA/Wqds9TgCczcVQV8Rw=";
+    rev = "421e73a38f57d0453d821332d4e25aa53476254d";
+    hash = "sha256-eugXy+BhjshhALT8ZLhA8OvtqCM8wmiuG1yuNWsAGyo=";
   };
 
   useFetchCargoVendor = true;

From cd927bba62eb66f98bdc732991c71b51ca7bcaba Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 8 Jun 2025 13:53:29 +0000
Subject: [PATCH 10/33] magic-wormhole: add updateScript

---
 pkgs/development/python-modules/magic-wormhole/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index d4cc8603e4cf..99d4b10751a9 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -34,6 +34,8 @@
   magic-wormhole-transit-relay,
   magic-wormhole-mailbox-server,
   pytestCheckHook,
+
+  gitUpdater,
 }:
 
 buildPythonPackage rec {
@@ -112,6 +114,8 @@ buildPythonPackage rec {
       --zsh wormhole_complete.zsh
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md";
     description = "Securely transfer data between computers";

From 7582e9565b299e96e1d034272b6c90bff3b00299 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 8 Jun 2025 13:53:29 +0000
Subject: [PATCH 11/33] magic-wormhole: 0.18.0 -> 0.19.2

https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.19.2/NEWS.md
https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.18.0...refs/tags/0.19.2
---
 .../python-modules/magic-wormhole/default.nix          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 99d4b10751a9..0d32ac8bcbbf 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -34,20 +34,21 @@
   magic-wormhole-transit-relay,
   magic-wormhole-mailbox-server,
   pytestCheckHook,
+  pytest-twisted,
 
   gitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.18.0";
+  version = "0.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
     tag = version;
-    hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";
+    hash = "sha256-5Tipcood5RktXY05p20hQpWhSMMnZm67I4iybjV8TcA=";
   };
 
   postPatch =
@@ -100,10 +101,13 @@ buildPythonPackage rec {
       magic-wormhole-mailbox-server
       magic-wormhole-transit-relay
       pytestCheckHook
+      pytest-twisted
     ]
     ++ optional-dependencies.dilation
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];
 
+  pytestFlagsArray = [ "src/wormhole/test" ];
+
   __darwinAllowLocalNetworking = true;
 
   postInstall = ''
@@ -119,7 +123,7 @@ buildPythonPackage rec {
   meta = {
     changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md";
     description = "Securely transfer data between computers";
-    homepage = "https://github.com/magic-wormhole/magic-wormhole";
+    homepage = "https://magic-wormhole.readthedocs.io/";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.mjoerg ];
     mainProgram = "wormhole";

From fed6847c22279a54681731a004fab0c130299296 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 8 Jun 2025 13:53:29 +0000
Subject: [PATCH 12/33] tahoe-lafs: pin magic-wormhole to version 0.18.0

---
 pkgs/by-name/ta/tahoe-lafs/package.nix | 28 +++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 207c585f297a..b761c484062d 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -1,11 +1,37 @@
 {
   lib,
-  python3Packages,
+  python3,
   fetchFromGitHub,
   texinfo,
   versionCheckHook,
 }:
 
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = self: super: {
+      # tahoe-lafs is incompatible with magic-wormhole >= 0.19.0
+      # TODO: unpin, when https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4180 is fixed
+      magic-wormhole = super.magic-wormhole.overridePythonAttrs (oldAttrs: rec {
+        version = "0.18.0";
+
+        src = fetchFromGitHub {
+          owner = "magic-wormhole";
+          repo = "magic-wormhole";
+          tag = version;
+          hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";
+        };
+
+        nativeCheckInputs = lib.filter (
+          input: (input.pname or null) != "pytest-twisted"
+        ) oldAttrs.nativeCheckInputs;
+
+        pytestFlagsArray = null;
+      });
+    };
+  };
+  python3Packages = python.pkgs;
+in
 python3Packages.buildPythonApplication rec {
   pname = "tahoe-lafs";
   version = "1.20.0";

From 10e64889dbc24b9ed7781f817db9b6791d82d4bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 9 Jun 2025 09:28:15 +0200
Subject: [PATCH 13/33] python313Packages.publicsuffixlist: 1.0.2.20250606 ->
 1.0.2.20250608

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250608-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 cec383469045..9958b7ee901e 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.20250606";
+  version = "1.0.2.20250608";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N4Lp8bRrD18DvSyg0Ye9wV/T1w2prNjHEdVDSq0wJoM=";
+    hash = "sha256-C4RywYvx5bNuor4agXBN6XpoLkxHJGMAuBocZ9FcGYM=";
   };
 
   build-system = [ setuptools ];

From 0c6d4a4a1291096aacc93dcd58e02bd708091ce9 Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Mon, 9 Jun 2025 12:00:07 +0200
Subject: [PATCH 14/33] gocatcli: 1.0.6 -> 1.1.2

Changelog: https://github.com/deadc0de6/gocatcli/releases/tag/v1.1.2
---
 pkgs/by-name/go/gocatcli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gocatcli/package.nix b/pkgs/by-name/go/gocatcli/package.nix
index e10a2e9b4c96..4dacc3737f33 100644
--- a/pkgs/by-name/go/gocatcli/package.nix
+++ b/pkgs/by-name/go/gocatcli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gocatcli";
-  version = "1.0.6";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "deadc0de6";
     repo = "gocatcli";
     tag = "v${version}";
-    hash = "sha256-qB7BDPDGcngPhd82V4FrsycFd7CNb6hPaHJQ+ECmo48=";
+    hash = "sha256-kNXuQlBLiDEbKwtSmdX4XPLyMZFyBvLKEmQdCDug4ao=";
   };
 
-  vendorHash = "sha256-gJfqnxCTKXmTH8L4qjSXzTr+LsP+jzzivfQOplRkfao=";
+  vendorHash = "sha256-gi4/ekLGh5T5D3ifW/FF+ewHesWOyhY01ZZIG6+OENo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a9300684abebaeee887b4740c2d899bd02cc0726 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Jun 2025 11:08:28 +0000
Subject: [PATCH 15/33] bicep: 0.34.44 -> 0.36.1

---
 pkgs/by-name/bi/bicep/deps.json   | 138 +++++++++++++-----------------
 pkgs/by-name/bi/bicep/package.nix |   4 +-
 2 files changed, 61 insertions(+), 81 deletions(-)

diff --git a/pkgs/by-name/bi/bicep/deps.json b/pkgs/by-name/bi/bicep/deps.json
index d7892e410068..38319800e8f0 100644
--- a/pkgs/by-name/bi/bicep/deps.json
+++ b/pkgs/by-name/bi/bicep/deps.json
@@ -11,8 +11,8 @@
   },
   {
     "pname": "Azure.Bicep.Types.Az",
-    "version": "0.2.756",
-    "hash": "sha256-fYnDKiUhKY0aWz1GFkUVGWnRJQdHaTzYaj6fP7nJkqs="
+    "version": "0.2.771",
+    "hash": "sha256-VByaJddUXteY5SNE6EsMW6s1p8bJZuM3DdPZ9jPOBkE="
   },
   {
     "pname": "Azure.Bicep.Types.K8s",
@@ -46,43 +46,33 @@
   },
   {
     "pname": "Azure.Deployments.Core",
-    "version": "1.224.0",
-    "hash": "sha256-T6z0ZTanppSVlsPMmtSiVdNJWReAg+snvM4qvMgNNNk="
-  },
-  {
-    "pname": "Azure.Deployments.Core",
-    "version": "1.241.0",
-    "hash": "sha256-f5GLoXqPz4MQa5XLKYzNCnGq/p3nWzom0o476xnSjOA="
+    "version": "1.384.0",
+    "hash": "sha256-GkARRAP79e4QtCCVF+YU8o2Lr/tMtlJB2q3UvZJ5zvw="
   },
   {
     "pname": "Azure.Deployments.DiffEngine",
-    "version": "1.241.0",
-    "hash": "sha256-qdBEMoqHD9aWeb1hMQm/QctNTtct2Y1HKzejLP8LeEg="
+    "version": "1.384.0",
+    "hash": "sha256-i+3LW2XtndizGWCjrLAfhmckicU6fFzSEhJeNL4+Rh4="
   },
   {
     "pname": "Azure.Deployments.Engine",
-    "version": "1.241.0",
-    "hash": "sha256-rOq/2I0ZErMfg/4Z3odusCIiIJHFQj6hoOqYlcmGOko="
+    "version": "1.384.0",
+    "hash": "sha256-l1yKQPexJO11HMKWhFWFdWmUidJAgzhFrudxHVF+KdA="
   },
   {
     "pname": "Azure.Deployments.Expression",
-    "version": "1.224.0",
-    "hash": "sha256-P0bncRi4VntjtNQHNZL02fa2tH8aho1Y0+lxvssY5AM="
-  },
-  {
-    "pname": "Azure.Deployments.Expression",
-    "version": "1.241.0",
-    "hash": "sha256-fu3gJsqarSjj6Qp2f4SDhTLU2rYtf6ld9J7ywwPVeqY="
+    "version": "1.384.0",
+    "hash": "sha256-FFu6uNZWXH/54EpyM2KH9cm3YYF66Lnq+w7470oTqhk="
   },
   {
     "pname": "Azure.Deployments.Extensibility",
-    "version": "1.241.0",
-    "hash": "sha256-PQyUoide4V5YZpnBzu5g2grCLr7jAgek+D5Xu9AIrag="
+    "version": "1.384.0",
+    "hash": "sha256-lOz0lIdB7RCqQJJrpjRocgJCN/luHj0GFbIrsUN5SWU="
   },
   {
     "pname": "Azure.Deployments.Extensibility.Core",
-    "version": "0.1.55",
-    "hash": "sha256-u5Xo/TkFJSOeI+/T1fWuEeFVQVT4gM6pE09jhY6b2vU="
+    "version": "0.1.67",
+    "hash": "sha256-BsBW4qFrdg8B639uc+JH0UoT/kned0rcDW8gh465VoY="
   },
   {
     "pname": "Azure.Deployments.Internal.GenerateNotice",
@@ -91,23 +81,18 @@
   },
   {
     "pname": "Azure.Deployments.JsonPath",
-    "version": "1.17.0",
-    "hash": "sha256-o0rJ3pgwijC/7h1sajlukFQOLBD5RW0d3wbXJgVvt8Q="
+    "version": "1.71.0",
+    "hash": "sha256-8nlhSCky9FB+dRYeJYgnwrQif0xa9bgB8eU6+JFVlcA="
   },
   {
     "pname": "Azure.Deployments.ResourceMetadata",
-    "version": "1.17.0",
-    "hash": "sha256-vpJNeQQw4XazLfAlgkSwhCWFZOjWkdOnTHxB1fOfv4k="
+    "version": "1.71.0",
+    "hash": "sha256-eeyDl+yiAt3BEJOU+RQ6j1NXqTbz49emHrJLUWb+Tt8="
   },
   {
     "pname": "Azure.Deployments.Templates",
-    "version": "1.224.0",
-    "hash": "sha256-4O4tUhuWhEQpw3UywSbUQvvTOUNION7sZHGEZ8M1xWo="
-  },
-  {
-    "pname": "Azure.Deployments.Templates",
-    "version": "1.241.0",
-    "hash": "sha256-DWvdU3ipGUg5c5kyJXzFQ4x1l60x+qsWGZ++7XHMNcI="
+    "version": "1.384.0",
+    "hash": "sha256-yuWJqgh0hDzQNOjMhN1Wg0MxDgvMpFaNCsvumtldrZA="
   },
   {
     "pname": "Azure.Identity",
@@ -156,18 +141,18 @@
   },
   {
     "pname": "Grpc.Core.Api",
-    "version": "2.67.0",
-    "hash": "sha256-e20szw18ddOV4euAfsJEHr74HIVzdfjV5pYvGpLVmn4="
+    "version": "2.70.0",
+    "hash": "sha256-ChN4sEBtz78sKoVMr3UY+1zsNe/Wm6I8pmaKISofVj8="
   },
   {
     "pname": "Grpc.Net.Client",
-    "version": "2.67.0",
-    "hash": "sha256-93Q3+bBl4Z4saeYq25uPFucrsdrm0fgFB+URiVRU6Ec="
+    "version": "2.70.0",
+    "hash": "sha256-THt2IXw/iMasq7kihCwEMtFo3urygINt/IR4XPjqOKM="
   },
   {
     "pname": "Grpc.Net.Common",
-    "version": "2.67.0",
-    "hash": "sha256-czx/y3JgMmxXPL/LkqFcjXhAZRllFTW2rTnm7iLtSI4="
+    "version": "2.70.0",
+    "hash": "sha256-6SuGfGOa9aKbEsPvBQc/HdoHMeQIP0AndjxK5PCp7WU="
   },
   {
     "pname": "Grpc.Tools",
@@ -179,11 +164,6 @@
     "version": "2.14.1",
     "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
   },
-  {
-    "pname": "IPNetwork2",
-    "version": "2.6.548",
-    "hash": "sha256-6N61UG/WrJWNv+bO/l9BNWA17iPIMn5G4J7maw54UPg="
-  },
   {
     "pname": "IPNetwork2",
     "version": "2.6.598",
@@ -204,20 +184,30 @@
     "version": "2.0.1.2",
     "hash": "sha256-fnp/By8n8xKa8bhvUbO2p8rlze5AvgA+z9ZvWEpL/Ls="
   },
+  {
+    "pname": "Json.More.Net",
+    "version": "2.0.2",
+    "hash": "sha256-a05C4llKu1sOBjjV+GXQqSD1FWaj7twjkx4L95qixDQ="
+  },
   {
     "pname": "Json.More.Net",
     "version": "2.1.0",
     "hash": "sha256-AdQdfQa4nD5e1QCwiEiJOn/DGs5ogyaaTwN+14E/bho="
   },
+  {
+    "pname": "Json.More.Net",
+    "version": "2.1.1",
+    "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU="
+  },
   {
     "pname": "JsonDiffPatch.Net",
-    "version": "2.1.0",
-    "hash": "sha256-lyUOusPMv1ZF3EcrEFG4Fze603CVPxLwOPmTVOy/HmU="
+    "version": "2.3.0",
+    "hash": "sha256-bnTRsBaBi8wBxMi2stp7NZ+kLYUr2+WbqWhfGIVqnb4="
   },
   {
     "pname": "JsonPatch.Net",
-    "version": "3.1.0",
-    "hash": "sha256-bvCOOiH2SruZXF+jPYlAaEkinZ040YDp9QjP3QXlCbc="
+    "version": "3.1.1",
+    "hash": "sha256-j8MZwl96BUPBSFnsb42d/JZIccDQQ1TvgBjqwafv9SQ="
   },
   {
     "pname": "JsonPatch.Net",
@@ -226,18 +216,18 @@
   },
   {
     "pname": "JsonPath.Net",
-    "version": "1.1.0",
-    "hash": "sha256-FQGPodaxHwyfRN3HhEl7N39SKsn922FiZAiDzKOYxUo="
+    "version": "1.1.6",
+    "hash": "sha256-E9lXAJOPBZA3623ggLUKmtiG1AR/ldPtCBnH6TX6bOk="
   },
   {
     "pname": "JsonPath.Net",
-    "version": "2.0.1",
-    "hash": "sha256-4UWnu5iTzOupiGYR6X9xoDQoF2KMJ30h2sn0p5TfUu4="
+    "version": "2.1.1",
+    "hash": "sha256-hE4fRI/w4VfsJFk5dU3/QnnNaLN2ZTmL3CDq1+W4YDI="
   },
   {
     "pname": "JsonPointer.Net",
-    "version": "5.0.0",
-    "hash": "sha256-OCeXHpJyHJSyh2vpnrY8nSuM4u3eNXtN6YXnJZyHnWc="
+    "version": "5.0.2",
+    "hash": "sha256-S04fnxMCJm86yc1FYHSqHznhA+90NW6QI+7rxYIyhs0="
   },
   {
     "pname": "JsonPointer.Net",
@@ -246,8 +236,8 @@
   },
   {
     "pname": "JsonSchema.Net",
-    "version": "7.0.4",
-    "hash": "sha256-sCaGr8m20DzNEkF3TS7Cb+wmvo3hYZPZwQ2bTqwlB5g="
+    "version": "7.2.3",
+    "hash": "sha256-EtIc4Sq5fv7LLWj1+WtZPYE4u/0e4+mUSMfKp2vBruo="
   },
   {
     "pname": "MediatR",
@@ -274,11 +264,6 @@
     "version": "6.0.0",
     "hash": "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="
   },
-  {
-    "pname": "Microsoft.Automata.SRM",
-    "version": "1.2.2",
-    "hash": "sha256-cVVxKqguV48WRuk2HyRP5A2b4kZd3nSVY3rMe0SRSQw="
-  },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
     "version": "1.1.1",
@@ -371,13 +356,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.1",
-    "hash": "sha256-r3iWP+kwKo4Aib8SGo91kKWR5WusLrbFHUAw5uKQeNA="
+    "version": "9.0.2",
+    "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.2",
-    "hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
+    "version": "9.0.4",
+    "hash": "sha256-5hwq73FCWAJJ8Yb1VHaaryJJhUUiVsetPTrPLlo8N9o="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
@@ -391,8 +376,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "9.0.1",
-    "hash": "sha256-uq6i0gTobSTqaNm/0XZuv8GGjFpnvgwXnCCPWl9FP9g="
+    "version": "9.0.4",
+    "hash": "sha256-l+qlHrdrqgvnveSMCO4qQx1QObAe5lMl80a4Kc3idzw="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
@@ -569,6 +554,11 @@
     "version": "9.0.2",
     "hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
   },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.4",
+    "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g="
+  },
   {
     "pname": "Microsoft.Identity.Client",
     "version": "4.67.2",
@@ -1114,11 +1104,6 @@
     "version": "4.3.0",
     "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "1.6.0",
-    "hash": "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "5.0.0",
@@ -1494,11 +1479,6 @@
     "version": "8.0.1",
     "hash": "sha256-Uj9k5meIDXlEm8V5MWyzaWz4YA+8OWHE5K8kMq0kTR4="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.2",
-    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "5.0.0",
diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
index 0b87a3f4aa14..11b584851861 100644
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule rec {
   pname = "bicep";
-  version = "0.34.44";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "bicep";
     rev = "v${version}";
-    hash = "sha256-vyPRLPTvQkwN7unlIHs6DvpjXnXyW1PDtH9hhIOgN1A=";
+    hash = "sha256-I7FBJhRLzRCsDS4pKJqi/IwuRCpjbJeeYY0BjQ2UiMk=";
   };
 
   patches = [

From e0438162e74b81f4d476b420de897e63ea7f8334 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Mon, 9 Jun 2025 15:17:55 +0300
Subject: [PATCH 16/33] material-symbols: 4.0.0-unstable-2024-05-17 ->
 4.0.0-unstable-2025-04-11

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

diff --git a/pkgs/by-name/ma/material-symbols/package.nix b/pkgs/by-name/ma/material-symbols/package.nix
index 8af5fa9d0d24..9723da48e5d2 100644
--- a/pkgs/by-name/ma/material-symbols/package.nix
+++ b/pkgs/by-name/ma/material-symbols/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation {
   pname = "material-symbols";
-  version = "4.0.0-unstable-2024-05-17";
+  version = "4.0.0-unstable-2025-04-11";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "material-design-icons";
-    rev = "ace1af08508a6562ef05055a606cf44ea583ce3b";
-    hash = "sha256-d5lojgYCXCcvcSfLWfcSKFsBGKB6Si/XreRqpkEKsa0=";
+    rev = "941fa95d7f6084a599a54ca71bc565f48e7c6d9e";
+    hash = "sha256-5bcEh7Oetd2JmFEPCcoweDrLGQTpcuaCU8hCjz8ls3M=";
     sparseCheckout = [ "variablefont" ];
   };
 

From 12b043b693d9941cce0656640ccbaba05dacfb7f Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 9 Jun 2025 08:50:27 -0700
Subject: [PATCH 17/33] pat: 0.16.0 -> 0.17.0

---
 pkgs/by-name/pa/pat/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix
index 0352ef2c6cd9..2c7288e3defa 100644
--- a/pkgs/by-name/pa/pat/package.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -5,30 +5,20 @@
   fetchFromGitHub,
   libax25,
   installShellFiles,
-  fetchpatch,
 }:
 
 buildGoModule rec {
   pname = "pat";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "la5nta";
     repo = "pat";
     rev = "v${version}";
-    hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0=";
+    hash = "sha256-2CQQKZ9ZnabMhvmbFeYBZ2iv9WJo6QR5IqROUXy7sck=";
   };
 
-  # Remove upon next release since upstream is fixed
-  # https://github.com/la5nta/pat/pull/449
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/la5nta/pat/commit/5604eac8853216d96d49d7d9947bdc514e195538.patch";
-      sha256 = "sha256-Z9uoZLlhdCslULUxGkc4ao4ptC4ImWzSrfabSA5S/PE=";
-    })
-  ];
-
-  vendorHash = "sha256-Z6p0wiOY5l++nch64BJWGXleBgUNecTDm+yVCnmXvtU=";
+  vendorHash = "sha256-ajkRUnfYHCrFBxZsJLd6ypRl9+gYz+q4C/asOJZrVYg=";
 
   ldflags = [
     "-s"

From 71364317b40a0d8d183888f5fcf516cd976952a9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 9 Jun 2025 12:29:28 -0400
Subject: [PATCH 18/33] mailcore2: drop

Unmaintained upstream for 3 years, does not compile with gcc 14.
---
 .../libraries/mailcore2/default.nix           | 95 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 1 insertion(+), 99 deletions(-)
 delete mode 100644 pkgs/development/libraries/mailcore2/default.nix

diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
deleted file mode 100644
index e1556ba78c80..000000000000
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  libetpan,
-  icu,
-  cyrus_sasl,
-  libctemplate,
-  libuchardet,
-  pkg-config,
-  glib,
-  html-tidy,
-  libxml2,
-  libuuid,
-  openssl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "mailcore2";
-
-  version = "0.6.4";
-
-  src = fetchFromGitHub {
-    owner = "MailCore";
-    repo = "mailcore2";
-    rev = version;
-    sha256 = "0a69q11z194fdfwyazjyyylx57sqs9j4lz7jwh5qcws8syqgb23z";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-  buildInputs =
-    [
-      libetpan
-      cyrus_sasl
-      libctemplate
-      libuchardet
-      html-tidy
-      libxml2
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      glib
-      icu
-      libuuid
-    ];
-
-  postPatch =
-    ''
-      substituteInPlace CMakeLists.txt \
-         --replace " icule iculx" "" \
-         --replace "tidy/tidy.h" "tidy.h" \
-         --replace "/usr/include/tidy" "${html-tidy}/include" \
-         --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
-      substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
-        --replace buffio.h tidybuffio.h
-      substituteInPlace src/core/basetypes/MCString.cpp \
-        --replace "xmlErrorPtr" "const xmlError *"
-    ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      substituteInPlace src/core/basetypes/MCICUTypes.h \
-        --replace "__CHAR16_TYPE__ UChar" "char16_t UChar"
-    '';
-
-  cmakeFlags = lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    "-DBUILD_SHARED_LIBS=ON"
-  ];
-
-  installPhase = ''
-    mkdir $out
-    cp -r src/include $out
-
-    mkdir $out/lib
-    cp src/libMailCore.* $out/lib
-  '';
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-  checkPhase = ''
-    (
-      cd unittest
-      TZ=PST8PDT ./unittestcpp ../../unittest/data
-    )
-  '';
-
-  meta = with lib; {
-    description = "Simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP";
-    homepage = "http://libmailcore.com";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1d9d50ade96b..65fd9cefde5d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1174,6 +1174,7 @@ mapAliases {
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
+  mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9465ef1cb5d8..83fda5caa5e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16244,10 +16244,6 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-  mailcore2 = callPackage ../development/libraries/mailcore2 {
-    icu = icu71;
-  };
-
   meilisearch_1_11 = callPackage ../by-name/me/meilisearch/package.nix { version = "1.11.3"; };
 
   mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };

From d8cd14eb879375a9bfbfa84af26e732e15546dd6 Mon Sep 17 00:00:00 2001
From: Treelar <me@treelar.xyz>
Date: Mon, 9 Jun 2025 23:24:19 -0700
Subject: [PATCH 19/33] yt-dlp: 2025.5.22 -> 2025.6.9

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

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 40c5e97d731b..8cfe41d577f1 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.5.22";
+  version = "2025.6.9";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-6nOFTF2rwSTymjWo+um8XUIu8yMb6+6ivfqCrBkanCk=";
+    hash = "sha256-dR9To7YTU1Ir+AX6MLvL0WZmEmU345cG6rT4w2jxEaw=";
   };
 
   build-system = with python3Packages; [

From 931f4f01f67d2d007c983b1c27fdda4e7edc4ebf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 06:46:12 +0000
Subject: [PATCH 20/33] python3Packages.craft-parts: 2.10.0 -> 2.12.0

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

diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index 3ab3e99727d8..279e41668dbe 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "craft-parts";
-  version = "2.10.0";
+  version = "2.12.0";
 
   pyproject = true;
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-parts";
     tag = version;
-    hash = "sha256-nGOLzQ+mlLHmqkknWklCIEN7HOgQznuYO1rbqUvL1N4=";
+    hash = "sha256-mm5s7lHbU9SJsS9wTkXkJpmVsGG0qVXIeaQ+TiGz/7o=";
   };
 
   patches = [ ./bash-path.patch ];

From 25f6c2b2536033ed0171a4a741afa5e1aa9d5ec5 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Jun 2025 13:06:57 +0800
Subject: [PATCH 21/33] yubikey-manager-qt: drop

---
 .../tools/misc/yubikey-manager-qt/default.nix | 98 -------------------
 .../remove-upload-import.diff                 | 16 ---
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 pkgs/tools/misc/yubikey-manager-qt/default.nix
 delete mode 100644 pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff

diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix
deleted file mode 100644
index 5dc4d4718e2b..000000000000
--- a/pkgs/tools/misc/yubikey-manager-qt/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchurl,
-  imagemagick,
-  pcsclite,
-  pyotherside,
-  python3,
-  qmake,
-  qtbase,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  yubikey-manager,
-  yubikey-personalization,
-}:
-
-mkDerivation rec {
-  pname = "yubikey-manager-qt";
-  version = "1.2.5";
-
-  src = fetchurl {
-    url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz";
-    hash = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I=";
-  };
-
-  patches = [ ./remove-upload-import.diff ];
-
-  nativeBuildInputs = [
-    python3.pkgs.wrapPython
-    qmake
-    imagemagick
-  ];
-
-  postPatch = ''
-    substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin"
-  '';
-
-  buildInputs = [
-    pyotherside
-    python3
-    qtbase
-    qtgraphicaleffects
-    qtquickcontrols2
-  ];
-
-  pythonPath = [
-    (yubikey-manager.override { python3Packages = python3.pkgs; })
-  ];
-
-  postInstall = ''
-    # Desktop files
-    install -D -m0644 resources/ykman-gui.desktop "$out/share/applications/ykman-gui.desktop"
-    substituteInPlace "$out/share/applications/ykman-gui.desktop" \
-      --replace Exec=ykman-gui "Exec=$out/bin/ykman-gui"
-
-    # Icons
-    install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico}
-    install -D -m0644 resources/icons/ykman.png "$out/share/icons/hicolor/128x128/apps/ykman.png"
-    ln -s -- "$out/share/icons/hicolor/128x128/apps/ykman.png" "$out/share/icons/hicolor/128x128/apps/ykman-gui.png"
-    for SIZE in 16 24 32 48 64 96; do
-      # set modify/create for reproducible builds
-      convert -scale ''${SIZE} +set date:create +set date:modify \
-        resources/icons/ykman.png ykman.png
-
-      imageFolder="$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps"
-      install -D -m0644 ykman.png "$imageFolder/ykman.png"
-      ln -s -- "$imageFolder/ykman.png" "$imageFolder/ykman-gui.png"
-    done
-    unset SIZE imageFolder
-  '';
-
-  qtWrapperArgs = [
-    "--prefix"
-    "LD_LIBRARY_PATH"
-    ":"
-    (lib.makeLibraryPath [
-      pcsclite
-      yubikey-personalization
-    ])
-  ];
-
-  preFixup = ''
-    buildPythonPath "$pythonPath"
-    qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
-  '';
-
-  meta = with lib; {
-    description = "Cross-platform application for configuring any YubiKey over all USB interfaces";
-    homepage = "https://developers.yubico.com/yubikey-manager-qt/";
-    knownVulnerabilities = [
-      "Yubico has announced the End of Life of YubiKey Manager QT. Upstream recommends yubioath-flutter to configure a YubiKey. yubikey-manager-qt will be dropped after NixOS 25.05."
-    ];
-    license = licenses.bsd2;
-    maintainers = [ maintainers.cbley ];
-    mainProgram = "ykman-gui";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff b/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff
deleted file mode 100644
index 3e22803a3b56..000000000000
--- a/pkgs/tools/misc/yubikey-manager-qt/remove-upload-import.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/ykman-gui/py/yubikey.py	2025-01-08 19:42:20.058393985 +0100
-+++ b/ykman-gui/py/yubikey.py	2025-01-08 19:44:12.520364702 +0100
-@@ -50,12 +50,10 @@
- if int(ykman_v.split(".")[0] ) > 4:
-     from yubikit.support import get_name
-     from ykman.device import list_all_devices, scan_devices
--    from ykman.otp import (
--    _PrepareUploadFailed as PrepareUploadFailed
--    , _prepare_upload_key as prepare_upload_key, generate_static_pw)
-+    from ykman.otp import generate_static_pw
- else:
-     from ykman import connect_to_device, scan_devices, get_name
-     from ykman.otp import PrepareUploadFailed, prepare_upload_key, generate_static_pw
- 
- from fido2.ctap2 import Ctap2, ClientPin
- 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ffc514177b0d..8151b0650080 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2107,6 +2107,7 @@ mapAliases {
   yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
   yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
+  yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e6d427e4b0d..ef5df7439db3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9823,8 +9823,6 @@ with pkgs;
 
   xgboostWithCuda = xgboost.override { cudaSupport = true; };
 
-  yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
-
   zlib = callPackage ../development/libraries/zlib {
     stdenv =
       # zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv

From 6d2386a54806519a00ac260d0549ad2550a3b25b Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 28 May 2025 09:15:20 +0200
Subject: [PATCH 22/33] microsoft-edge: re-init at 137.0.3296.68

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 293 +++++++++++++++++++++
 pkgs/by-name/mi/microsoft-edge/update.py   |  44 ++++
 pkgs/top-level/aliases.nix                 |   1 -
 3 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/mi/microsoft-edge/package.nix
 create mode 100644 pkgs/by-name/mi/microsoft-edge/update.py

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
new file mode 100644
index 000000000000..4b45e18000ec
--- /dev/null
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -0,0 +1,293 @@
+{
+  fetchurl,
+  lib,
+  makeWrapper,
+  patchelf,
+  stdenv,
+
+  # Linked dynamic libraries.
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  gtk4,
+  libdrm,
+  libglvnd,
+  libkrb5,
+  libX11,
+  libxcb,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libxkbcommon,
+  libXrandr,
+  libXrender,
+  libXScrnSaver,
+  libxshmfence,
+  libXtst,
+  libgbm,
+  nspr,
+  nss,
+  pango,
+  pipewire,
+  vulkan-loader,
+  wayland, # ozone/wayland
+
+  # Command line programs
+  coreutils,
+
+  # command line arguments which are always set e.g "--disable-gpu"
+  commandLineArgs ? "",
+
+  # Will crash without.
+  systemd,
+
+  # Loaded at runtime.
+  libexif,
+  pciutils,
+
+  # Additional dependencies according to other distros.
+  ## Ubuntu
+  curl,
+  liberation_ttf,
+  util-linux,
+  wget,
+  xdg-utils,
+  ## Arch Linux.
+  flac,
+  harfbuzz,
+  icu,
+  libopus,
+  libpng,
+  snappy,
+  speechd-minimal,
+  ## Gentoo
+  bzip2,
+  libcap,
+
+  # Necessary for USB audio devices.
+  libpulseaudio,
+  pulseSupport ? true,
+
+  adwaita-icon-theme,
+  gsettings-desktop-schemas,
+
+  # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder)
+  libva,
+  libvaSupport ? true,
+
+  # For Vulkan support (--enable-features=Vulkan)
+  addDriverRunpath,
+
+  # Edge AAD sync
+  cacert,
+  libsecret,
+
+  # Edge Specific
+  libuuid,
+}:
+
+let
+
+  opusWithCustomModes = libopus.override { withCustomModes = true; };
+
+  deps =
+    [
+      alsa-lib
+      at-spi2-atk
+      at-spi2-core
+      atk
+      bzip2
+      cacert
+      cairo
+      coreutils
+      cups
+      curl
+      dbus
+      expat
+      flac
+      fontconfig
+      freetype
+      gcc-unwrapped.lib
+      gdk-pixbuf
+      glib
+      harfbuzz
+      icu
+      libcap
+      libdrm
+      liberation_ttf
+      libexif
+      libglvnd
+      libkrb5
+      libpng
+      libX11
+      libxcb
+      libXcomposite
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libxkbcommon
+      libXrandr
+      libXrender
+      libXScrnSaver
+      libxshmfence
+      libXtst
+      libgbm
+      nspr
+      nss
+      opusWithCustomModes
+      pango
+      pciutils
+      pipewire
+      snappy
+      speechd-minimal
+      systemd
+      util-linux
+      vulkan-loader
+      wayland
+      wget
+      libsecret
+      libuuid
+    ]
+    ++ lib.optional pulseSupport libpulseaudio
+    ++ lib.optional libvaSupport libva
+    ++ [
+      gtk3
+      gtk4
+    ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "microsoft-edge";
+  version = "137.0.3296.68";
+
+  src = fetchurl {
+    url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
+    hash = "sha256-dgmQF6zpd8dAYKoTSiidk8VU6dZ/ZWEDlYD91IPaDEE=";
+  };
+
+  # With strictDeps on, some shebangs were not being patched correctly
+  # ie, $out/share/microsoft/msedge/microsoft-edge
+  strictDeps = false;
+
+  nativeBuildInputs = [
+    makeWrapper
+    patchelf
+  ];
+
+  buildInputs = [
+    # needed for XDG_ICON_DIRS
+    adwaita-icon-theme
+    glib
+    gtk3
+    gtk4
+    # needed for GSETTINGS_SCHEMAS_PATH
+    gsettings-desktop-schemas
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    ar x $src
+    tar xf data.tar.xz
+    runHook postUnpack
+  '';
+
+  rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
+  binpath = lib.makeBinPath deps;
+
+  installPhase = ''
+    runHook preInstall
+
+    appname=msedge
+    dist=stable
+
+    exe=$out/bin/microsoft-edge
+
+    mkdir -p $out/bin $out/share
+    cp -v -a opt/* $out/share
+    cp -v -a usr/share/* $out/share
+
+    # replace bundled vulkan-loader
+    rm -v $out/share/microsoft/$appname/libvulkan.so.1
+    ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+
+    substituteInPlace $out/share/microsoft/$appname/microsoft-edge \
+      --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
+    substituteInPlace $out/share/applications/microsoft-edge.desktop \
+      --replace-fail /usr/bin/microsoft-edge-$dist $exe
+    substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
+      --replace-fail /opt/microsoft/msedge $exe
+    substituteInPlace $out/share/menu/microsoft-edge.menu \
+      --replace-fail /opt $out/share \
+      --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe
+
+    for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do
+      num_and_suffix="''${icon_file##*logo_}"
+      if [ $dist = "stable" ]; then
+        icon_size="''${num_and_suffix%.*}"
+      else
+        icon_size="''${num_and_suffix%_*}"
+      fi
+      logo_output_prefix="$out/share/icons/hicolor"
+      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
+      mkdir -p "$logo_output_path"
+      mv "$icon_file" "$logo_output_path/microsoft-edge.png"
+    done
+
+    # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
+    makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \
+      --prefix LD_LIBRARY_PATH : "$rpath" \
+      --prefix PATH            : "$binpath" \
+      --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
+      --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --set CHROME_WRAPPER  "microsoft-edge-$dist" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
+    patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL*
+
+    # Edge specific set liboneauth
+    patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so
+
+    for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do
+      patchelf --set-rpath $rpath $elf
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
+    done
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.py;
+
+  meta = {
+    changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel";
+    description = "Web browser from Microsoft";
+    homepage = "https://www.microsoft.com/en-us/edge";
+    license = lib.licenses.unfree;
+    mainProgram = "microsoft-edge";
+    maintainers = with lib.maintainers; [
+      cholli
+      ulrikstrid
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
new file mode 100644
index 000000000000..e0d007c12f17
--- /dev/null
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -0,0 +1,44 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts
+
+import base64
+import textwrap
+import os
+from urllib import request
+
+from collections import OrderedDict
+from debian.deb822 import Packages
+from debian.debian_support import Version
+from os.path import abspath, dirname
+
+PIN_PATH = dirname(abspath(__file__)) + '/default.nix'
+
+def packages():
+    packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
+    handle = request.urlopen(packages_url)
+    return handle
+
+
+def latest_packages(packages: bytes):
+    latest_packages: OrderedDict[str, Packages] = {}
+    for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
+        name: str = package['Package']
+        if not name.startswith('microsoft-edge-stable'):
+            continue
+        channel = name.replace('microsoft-edge-', '')
+        if channel not in latest_packages:
+            latest_packages[channel] = package
+        else:
+            old_package = latest_packages[channel]
+            if old_package.get_version() < package.get_version():  # type: ignore
+                latest_packages[channel] = package
+    return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0]))
+
+
+def write_expression():
+    latest = latest_packages(packages())
+    version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version')
+    os.system(f'update-source-version microsoft-edge "{version}"')
+
+
+write_expression()
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 01437fbd1043..5f360b6841aa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1226,7 +1226,6 @@ mapAliases {
   microcodeAmd = microcode-amd; # Added 2024-09-08
   microcodeIntel = microcode-intel; # Added 2024-09-08
   micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24
-  microsoft-edge = throw "microsoft-edge has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
   midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
   midori-unwrapped = midori; # Added 2025-05-19

From 7671ffeeeedddae6c1a1d65adb317ac41c7596dd Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 17 May 2025 23:41:38 +0800
Subject: [PATCH 23/33] microsoft-edge: refactor

(cherry picked from commit 10b190b70a9969d73873b3c9fe0b86b1b9eb4f3c)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 40 ++++++++++++----------
 pkgs/by-name/mi/microsoft-edge/update.py   | 23 +++++++------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 4b45e18000ec..8b91f6440bf5 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -1,9 +1,10 @@
 {
-  fetchurl,
   lib,
+  stdenv,
+  fetchurl,
   makeWrapper,
   patchelf,
-  stdenv,
+  dpkg,
 
   # Linked dynamic libraries.
   alsa-lib,
@@ -92,6 +93,9 @@
   # For Vulkan support (--enable-features=Vulkan)
   addDriverRunpath,
 
+  # For QT support
+  qt6,
+
   # Edge AAD sync
   cacert,
   libsecret,
@@ -163,13 +167,13 @@ let
       wget
       libsecret
       libuuid
-    ]
-    ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional libvaSupport libva
-    ++ [
       gtk3
       gtk4
-    ];
+      qt6.qtbase
+      qt6.qtwayland
+    ]
+    ++ lib.optionals pulseSupport [ libpulseaudio ]
+    ++ lib.optionals libvaSupport [ libva ];
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -188,6 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     patchelf
+    dpkg
   ];
 
   buildInputs = [
@@ -200,13 +205,6 @@ stdenv.mkDerivation (finalAttrs: {
     gsettings-desktop-schemas
   ];
 
-  unpackPhase = ''
-    runHook preUnpack
-    ar x $src
-    tar xf data.tar.xz
-    runHook postUnpack
-  '';
-
   rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
   binpath = lib.makeBinPath deps;
 
@@ -218,9 +216,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     exe=$out/bin/microsoft-edge
 
-    mkdir -p $out/bin $out/share
-    cp -v -a opt/* $out/share
-    cp -v -a usr/share/* $out/share
+    mkdir -p $out/bin
+    cp -v -a usr/share $out/share
+    cp -v -a opt/microsoft $out/share/microsoft
 
     # replace bundled vulkan-loader
     rm -v $out/share/microsoft/$appname/libvulkan.so.1
@@ -230,6 +228,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
     substituteInPlace $out/share/applications/microsoft-edge.desktop \
       --replace-fail /usr/bin/microsoft-edge-$dist $exe
+    substituteInPlace $out/share/applications/com.microsoft.Edge.desktop \
+      --replace-fail /usr/bin/microsoft-edge-$dist $exe
     substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
       --replace-fail /opt/microsoft/msedge $exe
     substituteInPlace $out/share/menu/microsoft-edge.menu \
@@ -251,13 +251,16 @@ stdenv.mkDerivation (finalAttrs: {
 
     # "--simulate-outdated-no-au" disables auto updates and browser outdated popup
     makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtbase}/lib/qt-6/plugins" \
+      --prefix QT_PLUGIN_PATH  : "${qt6.qtwayland}/lib/qt-6/plugins" \
+      --prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
       --prefix LD_LIBRARY_PATH : "$rpath" \
       --prefix PATH            : "$binpath" \
       --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
       --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
       --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" \
       --set CHROME_WRAPPER  "microsoft-edge-$dist" \
-      --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 --wayland-text-input-version=3}}" \
       --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
@@ -286,6 +289,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       cholli
       ulrikstrid
+      emaryn
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py
index e0d007c12f17..e6c8b344d37b 100644
--- a/pkgs/by-name/mi/microsoft-edge/update.py
+++ b/pkgs/by-name/mi/microsoft-edge/update.py
@@ -1,20 +1,19 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts
 
-import base64
-import textwrap
 import os
+from collections import OrderedDict
+from os.path import abspath, dirname
 from urllib import request
 
-from collections import OrderedDict
 from debian.deb822 import Packages
 from debian.debian_support import Version
-from os.path import abspath, dirname
 
-PIN_PATH = dirname(abspath(__file__)) + '/default.nix'
+PIN_PATH = dirname(abspath(__file__)) + "/default.nix"
+
 
 def packages():
-    packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
+    packages_url = "https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages"
     handle = request.urlopen(packages_url)
     return handle
 
@@ -22,22 +21,24 @@ def packages():
 def latest_packages(packages: bytes):
     latest_packages: OrderedDict[str, Packages] = {}
     for package in Packages.iter_paragraphs(packages, use_apt_pkg=False):
-        name: str = package['Package']
-        if not name.startswith('microsoft-edge-stable'):
+        name: str = package["Package"]
+        if not name.startswith("microsoft-edge-stable"):
             continue
-        channel = name.replace('microsoft-edge-', '')
+        channel = name.replace("microsoft-edge-", "")
         if channel not in latest_packages:
             latest_packages[channel] = package
         else:
             old_package = latest_packages[channel]
             if old_package.get_version() < package.get_version():  # type: ignore
                 latest_packages[channel] = package
-    return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0]))
+    return OrderedDict(sorted(latest_packages.items(), key=lambda x: x[0]))
 
 
 def write_expression():
     latest = latest_packages(packages())
-    version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version')
+    version = Version.re_valid_version.match(latest["stable"]["Version"]).group(
+        "upstream_version"
+    )
     os.system(f'update-source-version microsoft-edge "{version}"')
 
 

From a43a45351f18d86c89065283ee4da0c40a7e600b Mon Sep 17 00:00:00 2001
From: maeve <maeve@oa.ke>
Date: Fri, 30 May 2025 11:02:07 +0100
Subject: [PATCH 24/33] maintainers: add maeve-oake

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 38e63cf29d44..da7c8af8eb83 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14907,6 +14907,13 @@
     name = "Mæve";
     keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24  80E2 9168 796A 1CC3 AEA2"; } ];
   };
+  maeve-oake = {
+    email = "maeve@oa.ke";
+    matrix = "@maeve:oa.ke";
+    github = "maeve-oake";
+    githubId = 38541651;
+    name = "maeve";
+  };
   mafo = {
     email = "Marc.Fontaine@gmx.de";
     github = "MarcFontaine";

From b65bca35bd25210888388b295e9078c217ae3f2f Mon Sep 17 00:00:00 2001
From: maeve <maeve@oa.ke>
Date: Fri, 30 May 2025 11:02:17 +0100
Subject: [PATCH 25/33] microsoft-edge: add maintainer maeve-oake

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 8b91f6440bf5..05c8c8727a54 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -290,6 +290,7 @@ stdenv.mkDerivation (finalAttrs: {
       cholli
       ulrikstrid
       emaryn
+      maeve-oake
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From b4a0df7e4dac0aba2d699aa719cf94f1cbc55a37 Mon Sep 17 00:00:00 2001
From: vinicius <viniciusvilela19@gmail.com>
Date: Mon, 2 Jun 2025 12:38:01 +0100
Subject: [PATCH 26/33] maintainers: add leleuvilela

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index da7c8af8eb83..d16e729d1ca0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13904,6 +13904,12 @@
     githubId = 567634;
     name = "Daniel Kuehn";
   };
+  leleuvilela = {
+    email = "viniciusvilela19@gmail.com";
+    github = "leleuvilela";
+    githubId = 19839085;
+    name = "Vinicius Vilela";
+  };
   lelgenio = {
     email = "lelgenio@lelgenio.com";
     github = "lelgenio";

From c02eb62cbf0778db8ab7901cd21f4e8cdafd2f0d Mon Sep 17 00:00:00 2001
From: vinicius <viniciusvilela19@gmail.com>
Date: Mon, 2 Jun 2025 12:38:54 +0100
Subject: [PATCH 27/33] microsoft-edge: add maintainer leleuvilela

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 05c8c8727a54..ee4ade1c3ab9 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -291,6 +291,7 @@ stdenv.mkDerivation (finalAttrs: {
       ulrikstrid
       emaryn
       maeve-oake
+      leleuvilela
     ];
     platforms = [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

From 66c62c75666884fc8e94fe76724a66dc32e84632 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 07:59:41 +0000
Subject: [PATCH 28/33] roave-backward-compatibility-check: 8.13.0 -> 8.14.0

---
 .../ro/roave-backward-compatibility-check/package.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 477309543f82..3200cfe2af7e 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.13.0";
+  version = "8.14.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     tag = finalAttrs.version;
-    hash = "sha256-bxjrk//n8HdHyYJpsW4qwgHptyeaNqCbiR3wWKJwPiM=";
+    hash = "sha256-4rhIaPdyyLiIhVYC4KNKbPAbVsHKnK6BOsebFjmmDeI=";
   };
 
-  vendorHash = "sha256-fhSByQzSwFrNCKr7KwJ7CYFt4zqbk4iW5JXK3iSVTnM=";
+  vendorHash = "sha256-k+zFpBHE+r0a67gqUry+luMIhJZ5wo1RpEaF4c7vAmI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 33aa613cfa439737e45f2f24610bc75a14296754 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 May 2025 18:09:59 +0000
Subject: [PATCH 29/33] scummvm: 2.9.0 -> 2.9.1

---
 pkgs/games/scummvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index de9c03b89091..5cf9d4d00150 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "scummvm";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
     rev = "v${version}";
-    hash = "sha256-4/h1bzauYWNvG7skn6afF79t0KEdgYLZoeqeqRudH7I=";
+    hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
   };
 
   nativeBuildInputs = [ nasm ];

From 5e68db132da81db61ca93e0da739dc0fe5fc5e2a Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Tue, 13 May 2025 01:04:40 +0200
Subject: [PATCH 30/33] heimdall{,-gui}: modernize and update

- bumped to 2.2.1, different upstream
- unmarked darwin as broken (at least without gui)
- added udev output
- dropped icons etc. for darwin
- made it build in windows
- added updateScript
- gui got ported to qt6 so switched it to qt6
- dropped peterhoeg from maintainers and added myself
- moved to by-name
- switched to finalAttrs pattern
- enabled strictDeps
- fixed heimdall-gui when ran with eg. `nix run`
---
 pkgs/by-name/he/heimdall/package.nix | 67 ++++++++++++++++++++++++++++
 pkgs/tools/misc/heimdall/default.nix | 67 ----------------------------
 pkgs/top-level/all-packages.nix      |  2 -
 3 files changed, 67 insertions(+), 69 deletions(-)
 create mode 100644 pkgs/by-name/he/heimdall/package.nix
 delete mode 100644 pkgs/tools/misc/heimdall/default.nix

diff --git a/pkgs/by-name/he/heimdall/package.nix b/pkgs/by-name/he/heimdall/package.nix
new file mode 100644
index 000000000000..b37c357a8382
--- /dev/null
+++ b/pkgs/by-name/he/heimdall/package.nix
@@ -0,0 +1,67 @@
+{
+  cmake,
+  enableGUI ? false,
+  fetchFromSourcehut,
+  gitUpdater,
+  lib,
+  libusb1,
+  pkg-config,
+  qt6,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "heimdall";
+  version = "2.2.1";
+
+  src = fetchFromSourcehut {
+    owner = "~grimler";
+    repo = "Heimdall";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-x+mDTT+oUJ4ffZOmn+UDk3+YE5IevXM8jSxLKhGxXSM=";
+  };
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  outputs = [
+    "out"
+    "udev"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ] ++ lib.optional enableGUI qt6.wrapQtAppsHook;
+
+  buildInputs = [
+    (libusb1.override { withStatic = stdenv.hostPlatform.isWindows; })
+  ] ++ lib.optional enableGUI qt6.qtbase;
+
+  preInstall = ''
+    mkdir -p $udev/lib/udev/rules.d
+    install -m644 -t $udev/lib/udev/rules.d $src/heimdall/60-heimdall.rules
+  '';
+
+  # heimdall cli looked up from PATH by gui
+  preFixup = lib.optional enableGUI ''
+    qtWrapperArgs+=(--prefix PATH : "$out/bin")
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "DISABLE_FRONTEND" (!enableGUI))
+  ];
+
+  meta = {
+    broken = enableGUI && !stdenv.hostPlatform.isLinux;
+    description = "Cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy devices";
+    homepage = "https://git.sr.ht/~grimler/Heimdall";
+    license = lib.licenses.mit;
+    mainProgram = if enableGUI then "heimdall-frontend" else "heimdall";
+    maintainers = with lib.maintainers; [
+      surfaceflinger
+    ];
+    platforms = with lib.platforms; unix ++ windows;
+  };
+})
diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
deleted file mode 100644
index 90af4652dad1..000000000000
--- a/pkgs/tools/misc/heimdall/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  mkDerivation,
-  fetchFromGitHub,
-  cmake,
-  zlib,
-  libusb1,
-  enableGUI ? false,
-  qtbase ? null,
-}:
-
-mkDerivation rec {
-  pname = "heimdall${lib.optionalString enableGUI "-gui"}";
-  version = "1.4.2";
-
-  src = fetchFromGitHub {
-    owner = "Benjamin-Dobell";
-    repo = "Heimdall";
-    rev = "v${version}";
-    sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz";
-  };
-
-  buildInputs = [
-    zlib
-    libusb1
-  ] ++ lib.optional enableGUI qtbase;
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}"
-    "-DLIBUSB_LIBRARY=${libusb1}"
-  ];
-
-  preConfigure =
-    ''
-      # Give ownership of the Galaxy S USB device to the logged in user.
-      substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" ""
-    '';
-
-  installPhase =
-    lib.optionalString (stdenv.hostPlatform.isDarwin && enableGUI) ''
-      mkdir -p $out/Applications
-      mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app
-      wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend
-    ''
-    + ''
-      mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d}
-      install -m755 -t $out/bin                bin/*
-      install -m644 -t $out/lib/udev/rules.d   ../heimdall/60-heimdall.rules
-      install -m644 ../Linux/README   $out/share/doc/heimdall/README.linux
-      install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx
-    '';
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    homepage = "http://www.glassechidna.com.au/products/heimdall/";
-    description = "Cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
-    mainProgram = "heimdall";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b312cf1734d..bf24872632db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3284,8 +3284,6 @@ with pkgs;
 
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { };
 
-  heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
-
   heimdall-gui = heimdall.override { enableGUI = true; };
 
   headscale = callPackage ../servers/headscale { };

From c18875a3ca658ae37286cf8abad2653fae3fce71 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 5 Jun 2025 08:45:22 +0200
Subject: [PATCH 31/33] =?UTF-8?q?ocamlPackages.dns:=2010.0.0=20=E2=86=92?=
 =?UTF-8?q?=2010.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/dns/cli.nix      | 4 ++++
 pkgs/development/ocaml-modules/dns/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/dns/resolver.nix | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix
index fad820b460f2..0c423b51db86 100644
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@@ -5,6 +5,7 @@
   dns-client-lwt,
   dns-server,
   dns-certify,
+  dns-resolver,
   dnssec,
   bos,
   cmdliner,
@@ -13,6 +14,7 @@
   mirage-crypto,
   mirage-crypto-pk,
   mirage-crypto-rng,
+  mirage-mtime,
   ohex,
   ptime,
   mtime,
@@ -39,6 +41,7 @@ buildDunePackage {
     dns-client-lwt
     dns-server
     dns-certify
+    dns-resolver
     dnssec
     bos
     cmdliner
@@ -47,6 +50,7 @@ buildDunePackage {
     mirage-crypto
     mirage-crypto-pk
     mirage-crypto-rng
+    mirage-mtime
     ohex
     ptime
     mtime
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index ed889526432b..7fb990255e8b 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -18,13 +18,13 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "10.0.0";
+  version = "10.1.0";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    hash = "sha256-dPO9BjvTE0UrpxKrmtgPrgfV/2uG/E9Wd/BNYSMtFwI=";
+    hash = "sha256-XG/qUUzsOccy5xdkZD6PuViN7gOMmRwYSsy+07QeN9I=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix
index 04daff6b5b34..e687badef235 100644
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@@ -14,7 +14,6 @@
   tcpip,
   tls,
   tls-mirage,
-  mirage-crypto-rng-mirage,
   dnssec,
   alcotest,
 }:
@@ -40,7 +39,6 @@ buildDunePackage {
     tcpip
     tls
     tls-mirage
-    mirage-crypto-rng-mirage
   ];
 
   doCheck = true;

From 17c2b94d0e9bbf4a674caef19f88ac21f3519240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 01:49:53 +0000
Subject: [PATCH 32/33] androidStudioPackages.beta: 2024.3.2.13 -> 2025.1.1.11

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 060978f29039..0f8307ca2df2 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -20,8 +20,8 @@ let
     sha256Hash = "sha256-L8s8l1/Q4AJEGvdzTLLu9sRZlkNyRDMQvK8moZXOeIE=";
   };
   betaVersion = {
-    version = "2024.3.2.13"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 4"
-    sha256Hash = "sha256-tPRTDFyKGPR1DKuJRBcwjWjNxylS/8Zv/Nd6vBmcujg=";
+    version = "2025.1.1.11"; # "Android Studio Narwhal | 2025.1.1 RC 1"
+    sha256Hash = "sha256-upx+qcrd+E4XVV94iaqZPN8w1RpcD8KfV37397nkznU=";
   };
   latestVersion = {
     version = "2025.1.2.4"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 4"

From 87a2869429aa7029e3c71d5ef86ffc1a641a0101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Jun 2025 09:29:26 +0000
Subject: [PATCH 33/33] lug-helper: 3.10 -> 3.11

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

diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix
index 0c2b4551b0a7..b45a19310749 100644
--- a/pkgs/by-name/lu/lug-helper/package.nix
+++ b/pkgs/by-name/lu/lug-helper/package.nix
@@ -15,12 +15,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   name = "lug-helper";
-  version = "3.10";
+  version = "3.11";
   src = fetchFromGitHub {
     owner = "starcitizen-lug";
     repo = "lug-helper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AEHFyKoxIdckir/S96hwR3h9PuzlB5EMWF7PPbeVPYg=";
+    hash = "sha256-RVjtAfabmBfEYUfgoXK4EZSyFC00qdo5CMkW2Op0P5A=";
   };
 
   buildInputs = [