From f0b96e89b10691d38a9e98dcce9ba31bc09c68f9 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Sat, 11 Jan 2025 17:01:16 -0600
Subject: [PATCH 01/44] maintainers: add mymindstorm

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ded32a943da7..95b9b6d29eb4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16452,6 +16452,13 @@
     githubId = 6295090;
     name = "Mats";
   };
+  mymindstorm = {
+    name = "Brendan Early";
+    email = "mymindstorm@evermiss.net";
+    github = "mymindstorm";
+    githubId = 27789806;
+    keys = [ { fingerprint = "52B9 A09F 788F 4D1F 0C94  9EBE EE39 A9F3 0C9D 72B5"; } ];
+  };
   mynacol = {
     github = "Mynacol";
     githubId = 26695166;

From 8855e5cbdddee60c26da516b85298f5b43ef13d4 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 26 Apr 2025 19:52:34 +0200
Subject: [PATCH 02/44] ocaml: use bytecode compiler on loongarch64-linux

---
 pkgs/development/compilers/ocaml/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index b0398fdc39cb..7a85f303fd06 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -49,7 +49,7 @@ let
 in
 
 let
-  useNativeCompilers = !stdenv.hostPlatform.isMips;
+  useNativeCompilers = !stdenv.hostPlatform.isMips && !stdenv.hostPlatform.isLoongArch64;
   inherit (lib)
     optional
     optionals

From 11fcf324796b9b78f5e2636f7e3ef3e007e35a38 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 26 Apr 2025 19:59:34 +0200
Subject: [PATCH 03/44] ocamlPackages.findlib: fix build with bytecode mode

---
 pkgs/development/tools/ocaml/findlib/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index b0d8326fc98d..4d8f48f6f1c7 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -39,10 +39,13 @@ stdenv.mkDerivation rec {
     "${placeholder "out"}/etc/findlib.conf"
   ];
 
-  buildFlags = [
-    "all"
-    "opt"
-  ];
+  buildFlags =
+    [
+      "all"
+    ]
+    ++ lib.optionals ocaml.nativeCompilers [
+      "opt"
+    ];
 
   setupHook = writeText "setupHook.sh" ''
     addOCamlPath () {

From fa60de26f61d8b7a7a2d32d10dc223bfef952451 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sun, 27 Apr 2025 11:49:08 +0200
Subject: [PATCH 04/44] opencpn: remove unused pcre dependencies

Both pcre and pcre2 aren't referenced anywhere in the codebase. Upstream removed the last reference to pcre in commit c6147abf1f2e0d16b2dae4b10fba4af2dd1eb26b, which is included in the version we ship. pcre2 was added in nixpkgs commit 51d42151e2676d637a188e1b1cad28ff13b87941, with the reasoning that pcre2 showed up during the configurePhase, which is also no longer the case
---
 pkgs/applications/misc/opencpn/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 2837666d49b1..967fdb27e09a 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -36,8 +36,6 @@
   lz4,
   libmpg123,
   makeWrapper,
-  pcre,
-  pcre2,
   pkg-config,
   portaudio,
   rapidjson,
@@ -107,8 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
       libxkbcommon
       lz4
       libmpg123
-      pcre
-      pcre2
       portaudio
       rapidjson
       sqlite

From 81a9a5d4ccff63640de77f960ce06412ebd0448c Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 27 Apr 2025 18:55:42 +0200
Subject: [PATCH 05/44] adcli: fix and enable strictDeps for cross

---
 pkgs/by-name/ad/adcli/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ad/adcli/package.nix b/pkgs/by-name/ad/adcli/package.nix
index 6ca3445c88a4..ea0f8c584789 100644
--- a/pkgs/by-name/ad/adcli/package.nix
+++ b/pkgs/by-name/ad/adcli/package.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     docbook_xsl
+    libxslt # xsltproc
     pkg-config
     util-linux
     xmlto
@@ -37,11 +38,15 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cyrus_sasl
     libkrb5
-    libxslt
     openldap
   ];
 
-  configureFlags = [ "--disable-debug" ];
+  strictDeps = true;
+
+  configureFlags = [
+    "--disable-debug"
+    "ac_cv_path_KRB5_CONFIG=${lib.getExe' (lib.getDev libkrb5) "krb5-config"}"
+  ];
 
   postPatch = ''
     substituteInPlace tools/Makefile.am \

From 43f9f5457dbda120925077d8c4a375f3ddfcccff Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 27 Apr 2025 18:55:42 +0200
Subject: [PATCH 06/44] adcli: modernize

---
 pkgs/by-name/ad/adcli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ad/adcli/package.nix b/pkgs/by-name/ad/adcli/package.nix
index ea0f8c584789..1cf15a2d1a87 100644
--- a/pkgs/by-name/ad/adcli/package.nix
+++ b/pkgs/by-name/ad/adcli/package.nix
@@ -14,7 +14,7 @@
   xmlto,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "adcli";
   version = "0.9.2";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.freedesktop.org";
     owner = "realmd";
     repo = "adcli";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
   };
 
@@ -66,15 +66,15 @@ stdenv.mkDerivation rec {
     patch_docbook doc/adcli-docs.xml
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html";
     description = "Helper library and tools for Active Directory client operations";
     mainProgram = "adcli";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
       SohamG
       anthonyroussel
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

From 15cad86455bdd28944efdca16a29c2d18406c36f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 24 Apr 2025 08:49:29 +0200
Subject: [PATCH 07/44] ocamlPackages.raylib: clean & fix

---
 .../ocaml-modules/raylib/default.nix          | 34 ++++++++++++-------
 .../ocaml-modules/raylib/raygui.nix           |  9 +++--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix
index b733001945dc..e6fbe711e7da 100644
--- a/pkgs/development/ocaml-modules/raylib/default.nix
+++ b/pkgs/development/ocaml-modules/raylib/default.nix
@@ -1,35 +1,43 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchurl,
   buildDunePackage,
   dune-configurator,
   ctypes,
   integers,
   patch,
-  gitUpdater,
+  libGL,
+  libX11,
+  libXcursor,
+  libXi,
+  libXinerama,
+  libXrandr,
 }:
 
 buildDunePackage rec {
   pname = "raylib";
   version = "1.4.0";
 
-  src = fetchFromGitHub {
-    owner = "tjammer";
-    repo = "raylib-ocaml";
-    tag = version;
-    hash = "sha256-Fh79YnmboQF5Kn3VF//JKLaIFKl8QJWVOqRexTzxF0U=";
-    # enable submodules for vendored raylib sources
-    fetchSubmodules = true;
+  src = fetchurl {
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raylib-${version}.tbz";
+    hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s=";
   };
 
-  propagatedBuildInputs = [
+  buildInputs = [
     dune-configurator
-    ctypes
-    integers
     patch
   ];
 
-  passthru.updateScript = gitUpdater { };
+  propagatedBuildInputs = [
+    ctypes
+    integers
+    libGL
+    libX11
+    libXcursor
+    libXi
+    libXinerama
+    libXrandr
+  ];
 
   meta = {
     description = "OCaml bindings for Raylib (5.0.0)";
diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix
index baa2003683dd..f4971b1b1e37 100644
--- a/pkgs/development/ocaml-modules/raylib/raygui.nix
+++ b/pkgs/development/ocaml-modules/raylib/raygui.nix
@@ -1,12 +1,17 @@
 {
   buildDunePackage,
+  fetchurl,
   raylib,
 }:
 
-buildDunePackage {
+buildDunePackage rec {
   pname = "raygui";
+  version = "1.4.0";
 
-  inherit (raylib) src version;
+  src = fetchurl {
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raygui-${version}.tbz";
+    hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs=";
+  };
 
   propagatedBuildInputs = [
     raylib

From 9f3cf981f8fc55fcf9f524a153afc5fce67ec4c1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 29 Apr 2025 22:43:52 +0200
Subject: [PATCH 08/44] rutabaga_gfx: add loongarch64-linux to bad platforms

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

diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
index 7de2e8bb476b..efaec27ec715 100644
--- a/pkgs/by-name/ru/rutabaga_gfx/package.nix
+++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix
@@ -93,5 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ qyliss ];
     platforms = platforms.darwin ++ platforms.linux;
+    # error[E0432]: unresolved import `self::consts`
+    badPlatforms = [ "loongarch64-linux" ];
   };
 })

From 7624e582f6d6aa2c466e79fc624192979d319a86 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 30 Apr 2025 13:10:34 +0200
Subject: [PATCH 09/44] codec2: add testers.testMetaPkgConfig

---
 pkgs/by-name/co/codec2/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index 23e4896dbeca..a05130bfbf01 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  testers,
   stdenv,
   buildPackages,
   fetchFromGitHub,
@@ -8,14 +9,14 @@
   lpcnetfreedv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "codec2";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "codec2";
-    rev = "${version}";
+    rev = finalAttrs.version;
     hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
   };
 
@@ -56,6 +57,8 @@ stdenv.mkDerivation rec {
       "-DLPCNET=ON"
     ];
 
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
   meta = with lib; {
     description = "Speech codec designed for communications quality speech at low data rates";
     homepage = "https://www.rowetel.com/codec2.html";
@@ -64,5 +67,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ markuskowa ];
     # generate_codebook only built for host platform
     broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    pkgConfigModules = [ "codec2" ];
   };
-}
+})

From f391fc2b91294812ab30d7e60cd849f788792604 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 30 Apr 2025 13:31:20 +0200
Subject: [PATCH 10/44] codec2: fix paths in pkg-config file

---
 pkgs/by-name/co/codec2/fix-pkg-config.patch | 13 +++++++++++++
 pkgs/by-name/co/codec2/package.nix          |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/co/codec2/fix-pkg-config.patch

diff --git a/pkgs/by-name/co/codec2/fix-pkg-config.patch b/pkgs/by-name/co/codec2/fix-pkg-config.patch
new file mode 100644
index 000000000000..58b9d13e8e3c
--- /dev/null
+++ b/pkgs/by-name/co/codec2/fix-pkg-config.patch
@@ -0,0 +1,13 @@
+diff --git a/codec2.pc.in b/codec2.pc.in
+index ecca704..94fca12 100644
+--- a/codec2.pc.in
++++ b/codec2.pc.in
+@@ -1,6 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2
++libdir=@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_INCLUDEDIR@/codec2
+ 
+ Name: codec2
+ Description: A speech codec for 2400 bit/s and below
diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index a05130bfbf01..af167085d793 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
   };
 
+  patches = [
+    # Fix nix-store path dupliucations
+    ./fix-pkg-config.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     buildPackages.stdenv.cc # needs to build a C program to run at build time

From 32f80f808c30a229a220b2baf4d58242ba7901ac Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 30 Apr 2025 14:09:28 +0200
Subject: [PATCH 11/44] codec2: use split outputs -> out, lib, dev

---
 pkgs/by-name/co/codec2/package.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index af167085d793..5eef7e5c577b 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./fix-pkg-config.patch
   ];
 
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
   nativeBuildInputs = [
     cmake
     buildPackages.stdenv.cc # needs to build a C program to run at build time
@@ -46,10 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/
   '';
 
-  # Swap keyword order to satisfy SWIG parser
-  postFixup = ''
-    sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h
-  '';
+  postFixup =
+    # Swap keyword order to satisfy SWIG parser
+    ''
+      sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h
+    ''
+    +
+      # generated cmake module is not compatible with multiple outputs
+      ''
+        substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \
+          '"''${_IMPORT_PREFIX}/include/codec2' \
+          "\"$dev/include/codec2"
+      '';
 
   cmakeFlags =
     [

From 8325af7e3aa6e922340ad1d02686d215d8b78ebc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 07:17:05 +0000
Subject: [PATCH 12/44] remind: 05.03.05 -> 05.03.06

---
 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 c5b323466b81..1d4a50e5548b 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.05";
+  version = "05.03.06";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q=";
+    hash = "sha256-zJmDx9AJntL08uBZEquho2Iud0y7WPZDGef/pSHX2h0=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

From 47f02df73f22abf5275d14e73f098286437827f8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 1 May 2025 19:49:38 +0200
Subject: [PATCH 13/44] nixos/tests/installer: don't default to aliase

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 3a7fe2d16d61..f6dcd1951a13 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -638,7 +638,7 @@ let
       clevisTest ? false,
       clevisFallbackTest ? false,
       disableFileSystems ? false,
-      selectNixPackage ? pkgs: pkgs.nixStable,
+      selectNixPackage ? pkgs: pkgs.nixVersions.stable,
     }:
     let
       isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);

From 61cfe16f4fe44eb09f85915b20134eefd4c865f4 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Tue, 25 Mar 2025 01:10:15 -0500
Subject: [PATCH 14/44] zenmap: init at 7.95 #287288

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

diff --git a/pkgs/by-name/ze/zenmap/package.nix b/pkgs/by-name/ze/zenmap/package.nix
new file mode 100644
index 000000000000..71253709da5e
--- /dev/null
+++ b/pkgs/by-name/ze/zenmap/package.nix
@@ -0,0 +1,81 @@
+{
+  gobject-introspection,
+  gtk3,
+  lib,
+  nmap,
+  python3Packages,
+  wrapGAppsHook3,
+  xterm,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "zenmap";
+  version = nmap.version;
+  pyproject = true;
+
+  src = nmap.src;
+
+  prePatch = ''
+    cd zenmap
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  buildInputs = [
+    nmap
+    gtk3
+    xterm
+  ];
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  nativeCheckInputs = [
+    nmap
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+  ];
+
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ nmap ]})
+  '';
+  postInstall = ''
+    # Icons
+    install -Dm 644 "zenmapCore/data/pixmaps/zenmap.png" -t "$out/share/pixmaps/"
+    # Desktop-files for application
+    install -Dm 644 "install_scripts/unix/zenmap.desktop" -t "$out/share/applications/"
+    install -Dm 644 "install_scripts/unix/zenmap-root.desktop" -t "$out/share/applications/"
+    install -Dm 755 "install_scripts/unix/su-to-zenmap.sh" -t "$out/bin/"
+    substituteInPlace "$out/bin/su-to-zenmap.sh" \
+        --replace-fail 'COMMAND="zenmap"' \
+                      'COMMAND="'"$out/bin/zenmap"'"' \
+        --replace-fail 'xterm' \
+                      '"${xterm}/bin/xterm"'
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    cd test
+    ${python3Packages.python.interpreter} run_tests.py 2>&1 | tee /dev/stderr | tail -n1 | grep '^OK$'
+
+    runHook postCheck
+  '';
+
+  meta = nmap.meta // {
+    description = "Offical nmap Security Scanner GUI";
+    homepage = "https://nmap.org/zenmap/";
+    maintainers = with lib.maintainers; [
+      dvaerum
+      mymindstorm
+    ];
+  };
+}

From a18ae721fdfa2d4714b9303534b85959391e6154 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 19:19:37 +0000
Subject: [PATCH 15/44] open-policy-agent: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 9588f7ee91ea..5a95a91a117b 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wWxWpJSDOaZLJ7ULdAzPFJ9YNXX3FyQRod2roaLsuis=";
+    hash = "sha256-oFtF/Uze9X1aaDzQXpZwbRXi11VnTTkkosfSSIeIxcc=";
   };
 
   vendorHash = null;

From dc9fb3e58ca7d34e15fc4a67f95f83483ef97440 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Thu, 1 May 2025 21:22:56 +0200
Subject: [PATCH 16/44] hvm: fix build

Apparently rust changed their output when panicking when going from
1.85.1 -> 1.86.0, which broke an hvm test.
---
 pkgs/by-name/hv/hvm/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix
index a6a9d39cb309..72038f23c864 100644
--- a/pkgs/by-name/hv/hvm/package.nix
+++ b/pkgs/by-name/hv/hvm/package.nix
@@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4=";
   };
 
+  # Insert empty line in expected output of rust panic in a test
+  postPatch = ''
+    sed -i '6G' tests/snapshots/run__file@empty.hvm.snap
+  '';
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo=";
 

From 0594374e874a157fdf02ee2ad558ea93072c8139 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 1 May 2025 23:08:08 +0200
Subject: [PATCH 17/44] harper: 0.31.0 -> 0.32.1

Changelog: https://github.com/Automattic/harper/releases/tag/v0.32.1
---
 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 f4524b85bc11..c88fa4a2ecac 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.31.0";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-+XO81A7F3QOGcDm/keqUHbURCQfzAHRiAlQmNzGo1IU=";
+    hash = "sha256-6W1NFZ5wRL3RxNYbgRH4qCSDNwOc3uQFeFujffusjGo=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EwWBqVTkBH4p1ljBitXtGkjUlx96Uajxc0z7DDkGawo=";
+  cargoHash = "sha256-PKqLf7UrtQp8pLIJbFgZ53iW+So6Yq7cpETARsnMFvI=";
 
   passthru.updateScript = nix-update-script { };
 

From 6a93340438ba874a88c21718cc0e3ccba22a07b1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 1 May 2025 14:02:26 -0700
Subject: [PATCH 18/44] python3Packages.greatfet: relax dependency on ipython
 #zhf

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

diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index bbe8269f1203..9d55399d9b09 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -39,6 +39,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "ipython" ];
+
   dependencies = [
     cmsis-svd
     future

From 9f7b537b0098ce5166d86575dd44cc4e5691555b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 May 2025 00:04:03 +0200
Subject: [PATCH 19/44] obs-studio-plugins.looking-glass-obs: fix the build
 against sdl2-compat

---
 .../applications/video/obs-studio/plugins/looking-glass-obs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
index c9fbda2b4e35..a79db9013a5f 100644
--- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
+++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
@@ -4,6 +4,7 @@
   cmake,
   libbfd,
   SDL2,
+  libGL,
   obs-studio,
   looking-glass-client,
 }:
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     obs-studio
     libbfd
     SDL2
+    libGL
   ];
 
   env.NIX_CFLAGS_COMPILE = "-mavx";

From 29ac8c4b8e08938163769c7693eb5342307f1131 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 May 2025 00:03:22 +0200
Subject: [PATCH 20/44] tangerine: fix the build against sdl2-compat

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

diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 8616fd77907b..a9e249ac2a60 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -6,6 +6,7 @@
   cmake,
   ncurses,
   SDL2,
+  libGL,
   libX11,
 }:
 
@@ -32,6 +33,7 @@ stdenv.mkDerivation {
   buildInputs = [
     ncurses
     SDL2
+    libGL
     libX11
   ];
 

From 8700a0c2727a32f6daa0fe80e8b28a8260e9cd94 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 May 2025 00:16:29 +0200
Subject: [PATCH 21/44] surreal-engine: fix build with sdl2-compat

---
 pkgs/by-name/su/surreal-engine/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix
index 71376ed3d3eb..4a6766060d3d 100644
--- a/pkgs/by-name/su/surreal-engine/package.nix
+++ b/pkgs/by-name/su/surreal-engine/package.nix
@@ -9,6 +9,7 @@
   openal,
   pkg-config,
   SDL2,
+  libX11,
   stdenv,
   vulkan-loader,
   wayland,
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     openal
     SDL2
+    libX11
     vulkan-loader
     wayland
     waylandpp

From 7e952470be42c271b473c4abc31d6716a9ef2c34 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 2 May 2025 00:17:57 +0200
Subject: [PATCH 22/44] unvanquished: fix build against sdl2-compat

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

diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix
index ef32e161cd3f..0729b5f6b7f9 100644
--- a/pkgs/by-name/un/unvanquished/package.nix
+++ b/pkgs/by-name/un/unvanquished/package.nix
@@ -20,6 +20,7 @@
   libpng,
   libvorbis,
   libwebp,
+  libX11,
   lua5,
   makeDesktopItem,
   ncurses,
@@ -171,6 +172,7 @@ stdenv.mkDerivation rec {
     libvorbis
     libjpeg
     libwebp
+    libX11
     libpng
   ];
 

From 03c44317c8eeddae4a4fc4ec0ee85df1300f52e7 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Thu, 1 May 2025 16:19:22 -0700
Subject: [PATCH 23/44] haskellPackages.ghcWithHoogle: add `passthru.hoogle`

Package sets built with `haskellPackages.ghcWithHoogle` provide a Hoogle
executable which points to a Hoogle database, but there's no way to
programmatically access the derivation containing the Hoogle database
from the package set.

This adds a `passthru.hoogle` attribute to package sets built with
`haskellPackages.ghcWithHoogle`, and a `passthru.database` helper to
derivations built with `haskellPackages.hoogleWithPackages`.
---
 .../haskell-modules/hoogle-local-wrapper.sh   |  2 +-
 pkgs/development/haskell-modules/hoogle.nix   | 24 +++++++++++++++----
 .../haskell-modules/with-packages-wrapper.nix |  8 ++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
index 223d19b70f03..e5b63669ae73 100644
--- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
+++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
@@ -2,4 +2,4 @@
 
 COMMAND=$1
 shift
-exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@"
+exec @hoogle@/bin/hoogle "$COMMAND" --database @database@ "$@"
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 9237f0fda59f..d20fc0f2978c 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -8,6 +8,7 @@
   buildPackages,
   haskellPackages,
   writeText,
+  runCommand,
 }:
 
 # This argument is a function which selects a list of Haskell packages from any
@@ -40,8 +41,11 @@ let
       # we grab the doc outputs
       (map (lib.getOutput "doc") packages);
 
+  # Hoogle database path, relative to `$out`.
+  databasePath = "share/doc/hoogle/default.hoo";
+
 in
-buildPackages.stdenv.mkDerivation {
+buildPackages.stdenv.mkDerivation (finalAttrs: {
   name = "hoogle-with-packages";
   buildInputs = [
     ghc
@@ -101,8 +105,10 @@ buildPackages.stdenv.mkDerivation {
       )
     }
 
+    databasePath="$out/"${lib.escapeShellArg databasePath}
+
     echo building hoogle database
-    hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle
+    hoogle generate --database "$databasePath" --local=$out/share/doc/hoogle
 
     echo building haddock index
     # adapted from GHC's gen_contents_index
@@ -122,13 +128,23 @@ buildPackages.stdenv.mkDerivation {
     echo finishing up
     mkdir -p $out/bin
     substitute ${wrapper} $out/bin/hoogle \
-        --subst-var out --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by database "$databasePath" \
         --subst-var-by hoogle ${hoogle}
     chmod +x $out/bin/hoogle
   '';
 
   passthru = {
     isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix
+
+    # The path to the Hoogle database.
+    database = "${finalAttrs.finalPackage}/${databasePath}";
+
+    tests.can-search-database = runCommand "can-search-database" { } ''
+      # This succeeds even if no results are found, but `Prelude.map` should
+      # always be available.
+      ${finalAttrs.finalPackage}/bin/hoogle search Prelude.map > $out
+    '';
   };
 
   meta = {
@@ -137,4 +153,4 @@ buildPackages.stdenv.mkDerivation {
     hydraPlatforms = with lib.platforms; none;
     maintainers = with lib.maintainers; [ ttuegel ];
   };
-}
+})
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 020dc12651b0..b1b227d2dcc2 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -47,9 +47,9 @@ selectPackages:
 let
   inherit (haskellPackages) llvmPackages ghc;
 
-  packages =
-    selectPackages haskellPackages
-    ++ lib.optional withHoogle (hoogleWithPackages selectPackages);
+  hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;
+
+  packages = selectPackages haskellPackages ++ [ hoogleWithPackages' ];
 
   isGhcjs = ghc.isGhcjs or false;
   isHaLVM = ghc.isHaLVM or false;
@@ -202,6 +202,8 @@ else
     passthru = {
       inherit (ghc) version meta;
 
+      hoogle = hoogleWithPackages';
+
       # Inform users about backwards incompatibilities with <= 21.05
       override =
         _:

From ea1585a7ff9cd588096aba4a297451d29d61b5ff Mon Sep 17 00:00:00 2001
From: aoli-al <aoli.al@hotmail.com>
Date: Thu, 1 May 2025 20:35:10 -0400
Subject: [PATCH 24/44] maintainers: add aoli-al

---
 maintainers/maintainer-list.nix                      | 6 ++++++
 pkgs/development/compilers/jetbrains-jdk/default.nix | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a95930545f9..2edc4d4121a0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1789,6 +1789,12 @@
     githubId = 19378309;
     name = "Simon Struck";
   };
+  aoli-al = {
+    email = "aoli.al@hotmail.com";
+    github = "aoli-al";
+    githubId = 5557706;
+    name = "Ao Li";
+  };
   aorith = {
     email = "aomanu+nixpkgs@gmail.com";
     github = "aorith";
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 05878b579703..49182468edd8 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -172,7 +172,10 @@ jdk.overrideAttrs (oldAttrs: rec {
     '';
     homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
     inherit (jdk.meta) license platforms mainProgram;
-    maintainers = with maintainers; [ edwtjo ];
+    maintainers = with maintainers; [
+      edwtjo
+      aoli-al
+    ];
 
     broken = stdenv.hostPlatform.isDarwin;
   };

From 8c0b8866e249ec80af3927056d6199e969f183a2 Mon Sep 17 00:00:00 2001
From: Niko Cantero <97130632+nyabinary@users.noreply.github.com>
Date: Thu, 1 May 2025 21:03:00 -0400
Subject: [PATCH 25/44] high-tide: init at 0-unstable-2025-05-01

---
 pkgs/by-name/hi/high-tide/package.nix | 70 +++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/hi/high-tide/package.nix

diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
new file mode 100644
index 000000000000..ff68daa49623
--- /dev/null
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  wrapGAppsHook4,
+  meson,
+  ninja,
+  pkg-config,
+  blueprint-compiler,
+  desktop-file-utils,
+  libadwaita,
+  gst_all_1,
+  libsecret,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "high-tide";
+  version = "0-unstable-2025-05-01";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "Nokse22";
+    repo = "high-tide";
+    rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc";
+    hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ=";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    meson
+    ninja
+    pkg-config
+    blueprint-compiler
+    desktop-file-utils
+  ];
+
+  buildInputs =
+    [ libadwaita ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      gst-plugins-bad
+      libsecret
+    ]);
+
+  dependencies = with python3Packages; [
+    pygobject3
+    tidalapi
+    requests
+    mpd2
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  meta = {
+    description = "Libadwaita TIDAL client for Linux";
+    homepage = "https://github.com/Nokse22/high-tide";
+    license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "HighTide";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      griffi-gh
+    ];
+    platforms = lib.platforms.linux;
+  };
+}

From 8946bd281380431bfcde19f7a7ad80d28b9813de Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 1 May 2025 21:05:47 -0500
Subject: [PATCH 26/44] vimPlugins.bloat-nvim: init at 2025-04-30

---
 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 51cedb444466..1ab5959ed15b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1609,6 +1609,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  bloat-nvim = buildVimPlugin {
+    pname = "bloat.nvim";
+    version = "2025-04-30";
+    src = fetchFromGitHub {
+      owner = "dundalek";
+      repo = "bloat.nvim";
+      rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1";
+      sha256 = "0ah5c84172wkc75zx5ll2dp9y3r867lik29aw5mm7i3lj530p0ri";
+    };
+    meta.homepage = "https://github.com/dundalek/bloat.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   block-nvim = buildVimPlugin {
     pname = "block.nvim";
     version = "2023-10-10";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index aac6e5d81bfd..b296c0478293 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -122,6 +122,7 @@ https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,
+https://github.com/dundalek/bloat.nvim/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,
 https://github.com/blueballs-theme/blueballs-neovim/,,
 https://github.com/uloco/bluloco.nvim/,,

From 5d8b18f3641ea18c5f352f92e5e9ac817784a165 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 02:20:14 +0000
Subject: [PATCH 27/44] candy-icons: 0-unstable-2025-04-14 ->
 0-unstable-2025-04-23

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

diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix
index 7f1a91366241..06c97dfc84c3 100644
--- a/pkgs/by-name/ca/candy-icons/package.nix
+++ b/pkgs/by-name/ca/candy-icons/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "candy-icons";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-04-23";
 
   src = fetchFromGitHub {
     owner = "EliverLara";
     repo = "candy-icons";
-    rev = "2ba176007c40957b43d26b7a9be2c9f23a480e98";
-    hash = "sha256-6eWxf13ZBknN7IeLICpmDXu4GdxubkGJ9D4/ZEuOvfs=";
+    rev = "1763fc1f476e6c2ba7ca8df878645815b808ebca";
+    hash = "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk=";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 08b5c11cb56e63ca6eb8908044e4f84c5618d280 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Fri, 2 May 2025 10:48:57 +0800
Subject: [PATCH 28/44] tm: unbreak

---
 .../by-name/tm/tm/missing-string-header.patch | 24 +++++++++++++++++++
 pkgs/by-name/tm/tm/package.nix                |  5 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/tm/tm/missing-string-header.patch

diff --git a/pkgs/by-name/tm/tm/missing-string-header.patch b/pkgs/by-name/tm/tm/missing-string-header.patch
new file mode 100644
index 000000000000..134102400a6d
--- /dev/null
+++ b/pkgs/by-name/tm/tm/missing-string-header.patch
@@ -0,0 +1,24 @@
+diff --git a/unix_client.c b/unix_client.c
+index 920910a..6d608fd 100644
+--- a/unix_client.c
++++ b/unix_client.c
+@@ -8,6 +8,7 @@
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ #include "main.h"
+ #include "handlers.h"
+diff --git a/unix_server.c b/unix_server.c
+index 5cf93ed..d3c51c9 100644
+--- a/unix_server.c
++++ b/unix_server.c
+@@ -8,6 +8,7 @@
+ #include <assert.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>
diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix
index 45208fa35399..48c40568fdbc 100644
--- a/pkgs/by-name/tm/tm/package.nix
+++ b/pkgs/by-name/tm/tm/package.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  patches = [
+    # fix using strncpy and strlen without including string.h
+    ./missing-string-header.patch
+  ];
+
   postPatch = ''
     sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile
   '';

From 5e181b7db1d05b37edb2918113aab51e797a5a8e Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Fri, 2 May 2025 10:52:24 +0800
Subject: [PATCH 29/44] tm: mordenize

---
 pkgs/by-name/tm/tm/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix
index 48c40568fdbc..c181cddd6f81 100644
--- a/pkgs/by-name/tm/tm/package.nix
+++ b/pkgs/by-name/tm/tm/package.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAtts: {
   pname = "tm";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${version}.tar.gz";
-    sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0";
+    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz";
+    hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
     sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal mixer - multiplexer for the i/o of terminal applications";
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "tm";
   };
-}
+})

From a738b32c8f06f0175a43d1d2b7225cab3672851f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 2 May 2025 05:43:21 +0000
Subject: [PATCH 30/44] dialect: fix cross compilation

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

diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix
index a72f896d87bc..b119fccc63be 100644
--- a/pkgs/by-name/di/dialect/package.nix
+++ b/pkgs/by-name/di/dialect/package.nix
@@ -68,10 +68,13 @@ python3.pkgs.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  postFixup = ''
+    patchShebangs --update --host $out/share/dialect/search_provider
+  '';
+
   doCheck = false;
 
-  # handle setup hooks better
-  strictDeps = false;
+  strictDeps = true;
 
   passthru.updateScript = nix-update-script { };
 

From 36123f13aed7ffaf518ea626b6389774040bc616 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 06:43:07 +0000
Subject: [PATCH 31/44] python312Packages.sbom2dot: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix
index e03d3801b0c0..cdb9ee48e7df 100644
--- a/pkgs/development/python-modules/sbom2dot/default.nix
+++ b/pkgs/development/python-modules/sbom2dot/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sbom2dot";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "sbom2dot";
     tag = "v${version}";
-    hash = "sha256-xrphhTbIyqe0CqQOpJSyzTWbGYFFOKdyWJTTAlURkoo=";
+    hash = "sha256-g6IAGZCLRVxF0f6JEcxNaAKWYlTDt0zYSchsz6hDgdg=";
   };
 
   build-system = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/v${version}";
+    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/${src.tag}";
     description = "Create a dependency graph of the components within a SBOM";
     homepage = "https://github.com/anthonyharrison/sbom2dot";
     license = lib.licenses.asl20;

From 06458578441016b3573f496afacf213872966494 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 06:43:10 +0000
Subject: [PATCH 32/44] sbom2dot: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix
index e03d3801b0c0..cdb9ee48e7df 100644
--- a/pkgs/development/python-modules/sbom2dot/default.nix
+++ b/pkgs/development/python-modules/sbom2dot/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sbom2dot";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "sbom2dot";
     tag = "v${version}";
-    hash = "sha256-xrphhTbIyqe0CqQOpJSyzTWbGYFFOKdyWJTTAlURkoo=";
+    hash = "sha256-g6IAGZCLRVxF0f6JEcxNaAKWYlTDt0zYSchsz6hDgdg=";
   };
 
   build-system = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/v${version}";
+    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/${src.tag}";
     description = "Create a dependency graph of the components within a SBOM";
     homepage = "https://github.com/anthonyharrison/sbom2dot";
     license = lib.licenses.asl20;

From d10d917f07cf79899384dd1743a37b290f20f81a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 May 2025 08:55:38 +0200
Subject: [PATCH 33/44] wapiti: skip failing tests on darwin

---
 pkgs/by-name/wa/wapiti/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix
index ca2abf9ab6fe..c17e22420581 100644
--- a/pkgs/by-name/wa/wapiti/package.nix
+++ b/pkgs/by-name/wa/wapiti/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   python3Packages,
   fetchpatch,
@@ -148,10 +149,15 @@ python3Packages.buildPythonApplication rec {
     "test_attack_unifi"
   ];
 
-  disabledTestPaths = [
-    # Requires sslyze which is obsolete and was removed
-    "tests/attack/test_mod_ssl.py"
-  ];
+  disabledTestPaths =
+    [
+      # Requires sslyze which is obsolete and was removed
+      "tests/attack/test_mod_ssl.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db'
+      "tests/web/test_persister.py"
+    ];
 
   pythonImportsCheck = [ "wapitiCore" ];
 

From 6071c86c00814fb60f37ca7eb5268be629633016 Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Fri, 25 Apr 2025 14:44:58 +0900
Subject: [PATCH 34/44] tzf-rs: init at 1.0.0

---
 pkgs/by-name/tz/tzf-rs/package.nix | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/tz/tzf-rs/package.nix

diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix
new file mode 100644
index 000000000000..65c380b832e5
--- /dev/null
+++ b/pkgs/by-name/tz/tzf-rs/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tzf-rs";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ringsaturn";
+    repo = "tzf-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cYi8FsB1aR0h1HxqkdFlLwCLzRwVM9Ak1LtjHezCSe0=";
+  };
+
+  cargoHash = "sha256-9bUQpEP+vc3xwWCicHpl+56OYz3huirSOA4yw1iaxaY=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A 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;
+    maintainers = with lib.maintainers; [ pcboy ];
+    mainProgram = "tzf";
+    platforms = lib.platforms.unix;
+  };
+})

From 556933f144456d4ae5fad894ab61f3b93ef91f9c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:05:57 +0300
Subject: [PATCH 35/44] linux_6_14: 6.14.4 -> 6.14.5

---
 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 ce54d477f6ab..a2edd9e862d4 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -32,7 +32,7 @@
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.4",
-        "hash": "sha256:0fak7y9dr5rxzmi4m545kz7pyk2c91dkj4k7i2jgnl80ga6z4lll"
+        "version": "6.14.5",
+        "hash": "sha256:02gl4hdxzijyyk57jsr85grdkxs2yi2gkvqa043kbamy5g2pw818"
     }
 }

From 41351bf070c2db32b6461ae165ab07c670749ddc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:00 +0300
Subject: [PATCH 36/44] linux_6_12: 6.12.25 -> 6.12.26

---
 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 a2edd9e862d4..d399d45e4dd2 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:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr"
     },
     "6.12": {
-        "version": "6.12.25",
-        "hash": "sha256:141visdf85iw011ncp77csmkahvn598lqvhi493a4g31dw7piby8"
+        "version": "6.12.26",
+        "hash": "sha256:1jivbv08j43rn0dn7xmwxb178b305cyxbp82h71r6n22qwif4ba0"
     },
     "6.13": {
         "version": "6.13.12",

From 231f3b88b59585196cb03db2841fef566842d12b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:04 +0300
Subject: [PATCH 37/44] linux_6_6: 6.6.88 -> 6.6.89

---
 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 d399d45e4dd2..6ef9713d8e20 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:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb"
     },
     "6.6": {
-        "version": "6.6.88",
-        "hash": "sha256:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr"
+        "version": "6.6.89",
+        "hash": "sha256:005s3vf1fkcv3fady2ax9azyc4lj8p4flhn20h3srr38c39zf6n2"
     },
     "6.12": {
         "version": "6.12.26",

From 065ab048abff7579babb90f15942b59d3bb5a9f4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:10 +0300
Subject: [PATCH 38/44] linux_6_1: 6.1.135 -> 6.1.136

---
 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 6ef9713d8e20..139602c54390 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:0zg817b9bbpl80cjmxgmxivi6xr80hng704mdl6m5knrl0v4ay5j"
     },
     "6.1": {
-        "version": "6.1.135",
-        "hash": "sha256:1fbyjprj65b1blb033lcy9y4bkh9jb7m06h6qph739wnzzhpmlg9"
+        "version": "6.1.136",
+        "hash": "sha256:0wdhgaa578x7jhhq2p2g272gyb12818ifan4c5zan6npp6dhf756"
     },
     "5.15": {
         "version": "5.15.180",

From a51c31546f15d7ea2a02c0f0ed28658a5fae536c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:13 +0300
Subject: [PATCH 39/44] linux_5_15: 5.15.180 -> 5.15.181

---
 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 139602c54390..1c61e37dfc97 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:0wdhgaa578x7jhhq2p2g272gyb12818ifan4c5zan6npp6dhf756"
     },
     "5.15": {
-        "version": "5.15.180",
-        "hash": "sha256:0ffdy7zhp25z75n49j4rs8fs79icbmz1yy7k3xgcl2p6pfw6h7zm"
+        "version": "5.15.181",
+        "hash": "sha256:0f6sc0wyd1gdx2kvbvp5sx6il780fdmjr4j0bcci1s7skrnl6iik"
     },
     "5.10": {
         "version": "5.10.236",

From d6d2a5fb9c21e0ce04ebd3ee81ffe49997a6679a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:17 +0300
Subject: [PATCH 40/44] linux_5_10: 5.10.236 -> 5.10.237

---
 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 1c61e37dfc97..d0ddc386a1b3 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:0f6sc0wyd1gdx2kvbvp5sx6il780fdmjr4j0bcci1s7skrnl6iik"
     },
     "5.10": {
-        "version": "5.10.236",
-        "hash": "sha256:12gv03hbddwm4nl8xxdvdr983nbh2lzrl4jr9p5kmv9rgn7wr9bd"
+        "version": "5.10.237",
+        "hash": "sha256:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"
     },
     "5.4": {
         "version": "5.4.292",

From cacac1fde031364e322d06bae341c82b75bf4fb7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 2 May 2025 11:06:20 +0300
Subject: [PATCH 41/44] linux_5_4: 5.4.292 -> 5.4.293

---
 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 d0ddc386a1b3..5edbe112a8f1 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:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"
     },
     "5.4": {
-        "version": "5.4.292",
-        "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb"
+        "version": "5.4.293",
+        "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
     },
     "6.6": {
         "version": "6.6.89",

From da0fd3c8e49e02dc3524eebc05b65cca5ea5ead6 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 2 May 2025 11:11:59 +0200
Subject: [PATCH 42/44] aligator: exclude another failing test on x86_64-darwin

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

diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix
index 6b80cc99aac9..7c26ac68aa57 100644
--- a/pkgs/by-name/al/aligator/package.nix
+++ b/pkgs/by-name/al/aligator/package.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
       # ignore one failing test for now
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout")
+      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
     ];
 
   # Fontconfig error: Cannot load default config file: No such file: (null)

From be3cbddd940b03954a0e35b6397bf3064da68a16 Mon Sep 17 00:00:00 2001
From: Alexander <blue.coral070@slmails.com>
Date: Tue, 29 Apr 2025 23:49:34 -0500
Subject: [PATCH 43/44] libxeddsa: init at 2.0.0

---
 .../libraries/libxeddsa/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/libxeddsa/default.nix

diff --git a/pkgs/development/libraries/libxeddsa/default.nix b/pkgs/development/libraries/libxeddsa/default.nix
new file mode 100644
index 000000000000..94375ee932b2
--- /dev/null
+++ b/pkgs/development/libraries/libxeddsa/default.nix
@@ -0,0 +1,39 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  cmake,
+  libsodium,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxeddsa";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "libxeddsa";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libsodium ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
+    description = "Toolkit around Curve25519 and Ed25519 key pairs";
+    homepage = "https://github.com/Syndace/libxeddsa";
+    changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ axler1 ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b76f5e434c84..dcf2d2b007de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10273,6 +10273,8 @@ with pkgs;
   };
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
+  libxeddsa = callPackage ../development/libraries/libxeddsa { };
+
   libxkbcommon = libxkbcommon_8;
   libxml2 = callPackage ../development/libraries/libxml2 {
     python = python3;

From bf2d0fcde3a3dd6caf38ba2a763bc5f879a3f756 Mon Sep 17 00:00:00 2001
From: Alexander <blue.coral070@slmails.com>
Date: Wed, 30 Apr 2025 00:01:56 -0500
Subject: [PATCH 44/44] python312Packages.xeddsa: init at 1.1.0

---
 .../li/libxeddsa/package.nix}                 |  2 +-
 .../python-modules/xeddsa/default.nix         | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            |  2 +
 4 files changed, 58 insertions(+), 3 deletions(-)
 rename pkgs/{development/libraries/libxeddsa/default.nix => by-name/li/libxeddsa/package.nix} (94%)
 create mode 100644 pkgs/development/python-modules/xeddsa/default.nix

diff --git a/pkgs/development/libraries/libxeddsa/default.nix b/pkgs/by-name/li/libxeddsa/package.nix
similarity index 94%
rename from pkgs/development/libraries/libxeddsa/default.nix
rename to pkgs/by-name/li/libxeddsa/package.nix
index 94375ee932b2..7b33a5a3f02a 100644
--- a/pkgs/development/libraries/libxeddsa/default.nix
+++ b/pkgs/by-name/li/libxeddsa/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = with lib.teams; [ ngi ];
-    maintainers = with lib.maintainers; [ axler1 ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/python-modules/xeddsa/default.nix b/pkgs/development/python-modules/xeddsa/default.nix
new file mode 100644
index 000000000000..fba8c0793e66
--- /dev/null
+++ b/pkgs/development/python-modules/xeddsa/default.nix
@@ -0,0 +1,55 @@
+{
+  buildPythonPackage,
+  lib,
+  fetchFromGitHub,
+  setuptools,
+  cffi,
+  libsodium,
+  libxeddsa,
+  pytestCheckHook,
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "xeddsa";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "python-xeddsa";
+    tag = "v${version}";
+    hash = "sha256-636zsJXD8EtLDXMIkJTON0g3sg0EPrMzcfR7SUrURac=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<74" "setuptools"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [
+    libsodium
+    libxeddsa
+  ];
+
+  dependencies = [ cffi ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "xeddsa" ];
+
+  meta = {
+    description = "Python bindings to libxeddsa";
+    homepage = "https://github.com/Syndace/python-xeddsa";
+    changelog = "https://github.com/Syndace/python-xeddsa/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcf2d2b007de..b76f5e434c84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10273,8 +10273,6 @@ with pkgs;
   };
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
-  libxeddsa = callPackage ../development/libraries/libxeddsa { };
-
   libxkbcommon = libxkbcommon_8;
   libxml2 = callPackage ../development/libraries/libxml2 {
     python = python3;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abbdf0421c2f..98d903137a08 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19110,6 +19110,8 @@ self: super: with self; {
 
   xdxf2html = callPackage ../development/python-modules/xdxf2html { };
 
+  xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { });
+
   xen = toPythonModule (pkgs.xen.override { python3Packages = self; });
 
   xformers = callPackage ../development/python-modules/xformers { };