From 736e9ff05c95a630f7f950565a85ea3b656d6916 Mon Sep 17 00:00:00 2001
From: Ratchanan Srirattanamet <peathot@hotmail.com>
Date: Mon, 3 Mar 2025 11:31:54 +0000
Subject: [PATCH 01/79] .devcontainer: add commands to adjust permissions under
 Codespaces

This commit does 2 things:

- Remove "default permission" from ACL table of /tmp. This is to prevent
  "error: suspicious ownership or permission on '<...>' for output
  'out'; rejecting this build output" error. See:
  https://github.com/NixOS/nix/issues/6680#issuecomment-1230902525
- Set permission of /dev/kvm so that it can be used by NixOS tests.

Note that this is tested on GitHub Codespaces only; I'm not sure how
VSCode's local devcontainer handling will react. Although I've added a
guard code in case /dev/kvm does not exist in that environment.
---
 .devcontainer/devcontainer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 02b2f9f0273d..bc54d8698499 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,6 +9,10 @@
       "extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
     }
   },
+  // Fixup permissions inside container.
+  // https://github.com/NixOS/nix/issues/6680#issuecomment-1230902525
+  "postCreateCommand": "sudo apt-get install -y acl",
+  "postStartCommand": "sudo setfacl -k /tmp; if [ -e /dev/kvm ]; then sudo chgrp $(id -g) /dev/kvm; fi",
   "customizations": {
     "vscode": {
       "extensions": [

From a25892a72b3e1d5d5dc48d2243a6003f2e8adb7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 22:58:37 +0000
Subject: [PATCH 02/79] python312Packages.llama-index-llms-openai: 0.3.29 ->
 0.3.33

---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 0a25cba9384c..c4c506a436fe 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.3.29";
+  version = "0.3.33";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-320v9zhSpHGAlPawJmRWnSirpLeEi0SlEEQMdvE8Lic=";
+    hash = "sha256-ESlCyiIcIjPtLPmV/a8IZfK3+SldmwHFp/yu83PBrIc=";
   };
 
   pythonRemoveDeps = [

From f89d1aaed86ce88d7861f6b679782dc10e0cc836 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Apr 2025 19:48:06 +0000
Subject: [PATCH 03/79] maestro: 1.39.13 -> 1.40.0

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

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 519d00a71ffe..0ca564799a9b 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "1.39.13";
+  version = "1.40.0";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-J1Gy12VF5C7OTDCOs4s7sWuwixZR1tz4hQyRxKcwahM=";
+    hash = "sha256-K0KSlSA2Jyeqck0CXZw3kh0qexIvL6vDn3EhAtIzCJc=";
   };
 
   dontUnpack = true;

From e0629c4b1dacdedf1dd1d48e093a8fcbcc53c1ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 07:34:36 +0000
Subject: [PATCH 04/79] k9s: 0.50.3 -> 0.50.4

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

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index b03a5a4c82e6..99f19e4a9e3b 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.50.3";
+  version = "0.50.4";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     rev = "v${version}";
-    hash = "sha256-kv52OcQqi88kdGuWjZxE3+tSANOpTSbATrmJitUUicA=";
+    hash = "sha256-JosFo7/JgM7tVMXY+OjASXnbwVYoJ5WGtgR5LTxaAYY=";
   };
 
   ldflags = [
@@ -33,7 +33,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-FliIL1yMEvsvrjemaV5B++6OBQMXU/9EvBD1hiEwnnw=";
+  vendorHash = "sha256-uWdSeHYbDvRWwKAd/wwUsI7uEtX6aunsB1+cRmfBNUc=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

From 78407998b75f9906539461e20c6581ae7b820aba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Apr 2025 20:05:47 +0000
Subject: [PATCH 05/79] flyctl: 0.3.106 -> 0.3.110

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

diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index f2b675d11c61..9930434671c1 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.106";
+  version = "0.3.110";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-RGpf9R5tEss5gD/WfZ/wWRNPGJiFpUvcTX7H+cfjPzg=";
+    hash = "sha256-zZlTVpqW96SSY1Lsgyax8bJ1VfErPet8YX5nUep8Auo=";
   };
 
-  vendorHash = "sha256-QaCBeSCaA5MyagpAG5SC46YefhQD1UgFqK5jo0UqnUo=";
+  vendorHash = "sha256-QrjK5p5eCfQ4eEgaUhUq4Ps1E8ZPee0698a7tGZYHWo=";
 
   subPackages = [ "." ];
 

From b4ed4d0dd072f08e089d059caaca1042c8b9e3bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 04:27:34 +0000
Subject: [PATCH 06/79] qmk: 1.1.6 -> 1.1.7

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

diff --git a/pkgs/by-name/qm/qmk/package.nix b/pkgs/by-name/qm/qmk/package.nix
index cc093b06d4dc..01015abaca56 100644
--- a/pkgs/by-name/qm/qmk/package.nix
+++ b/pkgs/by-name/qm/qmk/package.nix
@@ -14,12 +14,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "qmk";
-  version = "1.1.6";
+  version = "1.1.7";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3ENs26vy+M7G261FPeODK+AbrI5+nBkHXCmGbuIqi1A=";
+    hash = "sha256-4Qhzsa5GAAeSgt7FZsRWIVO1ZB+010WtBv9SV38Xgto=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From b539faee2468dca12dd6e6631ecf8038a4df448c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 06:51:35 +0000
Subject: [PATCH 07/79] calcure: 3.1 -> 3.2.1

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

diff --git a/pkgs/by-name/ca/calcure/package.nix b/pkgs/by-name/ca/calcure/package.nix
index e9b4f4745906..1ef4bef9ccfc 100644
--- a/pkgs/by-name/ca/calcure/package.nix
+++ b/pkgs/by-name/ca/calcure/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "calcure";
-  version = "3.1";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anufrievroman";
     repo = "calcure";
     tag = version;
-    hash = "sha256-ufrJbc3WMY88VEsUHlWxQ1m0iupts4zNusvQL8YAqJc=";
+    hash = "sha256-YFX70gtNcIXG5XIuMlz47nmtjt/2oHzi6cajcj+DAyQ=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Modern TUI calendar and task manager with minimal and customizable UI";
     mainProgram = "calcure";
     homepage = "https://github.com/anufrievroman/calcure";
-    changelog = "https://github.com/anufrievroman/calcure/releases/tag/${version}";
+    changelog = "https://github.com/anufrievroman/calcure/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ dit7ya ];
   };

From ada8313fceaf7d248fe6b988f05ef63eb95fe712 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 11:28:14 +0000
Subject: [PATCH 08/79] mihomo-party: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix
index ecdc61aebd4b..637a8e5f57b6 100644
--- a/pkgs/by-name/mi/mihomo-party/package.nix
+++ b/pkgs/by-name/mi/mihomo-party/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation rec {
   pname = "mihomo-party";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src =
     let
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     fetchurl {
       url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb";
       hash = selectSystem {
-        x86_64-linux = "sha256-hJnb0K3ytw0ITwL6dY1klSG260WrZQiHhz4FRZ0idI4=";
-        aarch64-linux = "sha256-6hAB1QezewgKI2We0zDTK+vNgxcMP2AEmGZqdSbMcWQ=";
+        x86_64-linux = "sha256-IzOW36nJS8SBc3o6/E6eGdBi9I7JApmWydk1x0gEWUw=";
+        aarch64-linux = "sha256-AKOATvsAqX1CkoQrMQzVlbf2x+BzIP4bcj49vPRIkEg=";
       };
     };
 

From d790a900af73c2a63d4753793ca799267841bda1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 13:01:34 +0000
Subject: [PATCH 09/79] trytond: 7.4.9 -> 7.4.10

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

diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index 9b36ce309eb5..7f2ae47dcb5b 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "7.4.9";
+  version = "7.4.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yH0dIRVBPKOjzk+36HGHN13ffhD4y+ZCC123s33YfMA=";
+    hash = "sha256-kzoZDcHNPjmsNxrQ11MAksK+24nI1YNmONQd21s3weA=";
   };
 
   build-system = [ setuptools ];

From 0a69878d0a3f8a8ecd11e9dac51194d2c9ebd043 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 14:11:30 +0000
Subject: [PATCH 10/79] spring-boot-cli: 3.4.4 -> 3.4.5

---
 pkgs/by-name/sp/spring-boot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
index 54cf2cec0a6a..934421885cef 100644
--- a/pkgs/by-name/sp/spring-boot-cli/package.nix
+++ b/pkgs/by-name/sp/spring-boot-cli/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spring-boot-cli";
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchzip {
     url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip";
-    hash = "sha256-+dhYpd8qrsYZ5a5xuOsym/Oa0vkB0z1ZWNP9eGgcQv8=";
+    hash = "sha256-ZGOhxeKkUF0kLPTp6oSa1s1rYs7H75uptITf3xvxXJU=";
   };
 
   nativeBuildInputs = [

From a14cf94e8f93faa175bad24c061ed241629fe39c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 17:05:26 +0000
Subject: [PATCH 11/79] refine: 0.5.7 -> 0.5.8

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

diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index b7f4a012fb8f..b7257e415063 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -35,7 +35,7 @@ in
 
 python3Packages.buildPythonApplication rec {
   pname = "refine";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = false; # uses meson
 
   src = fetchFromGitLab {
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
     owner = "TheEvilSkeleton";
     repo = "Refine";
     tag = version;
-    hash = "sha256-Ew/FCCJxgc5ybc/o6tEYP65G24sEmVLoeMTu9/cCjVQ=";
+    hash = "sha256-56aJQAeLpecoq7lcw2Cgd8XzpO0mXv+lBG+Qv28Ae1I=";
   };
 
   nativeBuildInputs = [

From e8d419298f6a1c4b20c8d58dca12611517140e5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 21:23:52 +0000
Subject: [PATCH 12/79] python312Packages.django-modeltranslation: 0.19.13 ->
 0.19.14

---
 .../python-modules/django-modeltranslation/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 0d50673fd183..65bcd446d902 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "django-modeltranslation";
-  version = "0.19.13";
+  version = "0.19.14";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "deschler";
     repo = "django-modeltranslation";
     tag = "v${version}";
-    hash = "sha256-mn3dGSJbujULPT/PBAVvd1hlCukMItC4Z8dIZ+MWZ2w=";
+    hash = "sha256-jvVzSltq4wkSmndyyOGxldXJVpydmCCrHMGTGiMUNA0=";
   };
 
   build-system = [ setuptools ];

From 9164752091eea3419697218a0a044de1a7926071 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 18:41:25 +0000
Subject: [PATCH 13/79] vitess: 21.0.4 -> 22.0.0

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

diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix
index 2ac1779863af..2d3a3c0d57c1 100644
--- a/pkgs/by-name/vi/vitess/package.nix
+++ b/pkgs/by-name/vi/vitess/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "vitess";
-  version = "21.0.4";
+  version = "22.0.0";
 
   src = fetchFromGitHub {
     owner = "vitessio";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-QapbbLZ/wDCKYQW98l780PT4ZEXAbhW0o4Zk2MlG6DQ=";
+    hash = "sha256-YfFGKOYlsCy9mSjtRB+ajmXnXIB8Awjm54DGGhTnu5U=";
   };
 
-  vendorHash = "sha256-Bc9rhfGSjqhDQBOPS4noW8qJ4P5xLtVcokRhDbqP3a0=";
+  vendorHash = "sha256-0rgosDZn/DZcEK8f1JE2ICiOQX1GU2H93EEAlvesNE8=";
 
   buildInputs = [ sqlite ];
 

From 0b20bf199971418c8af679cff49d164ecf6d89ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 01:08:12 +0000
Subject: [PATCH 14/79] monit: 5.35.0 -> 5.35.1

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

diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix
index f0a2e64e1048..d4c0c79e03b3 100644
--- a/pkgs/by-name/mo/monit/package.nix
+++ b/pkgs/by-name/mo/monit/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "monit";
-  version = "5.35.0";
+  version = "5.35.1";
 
   src = fetchurl {
     url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";
-    hash = "sha256-6VIqeLlU6u6TPEgQ23uZo2+UHgIsorAVcBhdTOQdjxI=";
+    hash = "sha256-d6TAI+4Gru1IU23+tJ2WqGip64EGw+LojKtTe7xylRs=";
   };
 
   nativeBuildInputs =

From 0ee89b1ecbebe59cb2c1e434a09c63f0e44cc597 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 05:15:00 +0000
Subject: [PATCH 15/79] icewm: 3.7.3 -> 3.7.4

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

diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index 4cc9de283d48..af4beddf775d 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -41,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "icewm";
-  version = "3.7.3";
+  version = "3.7.4";
 
   src = fetchFromGitHub {
     owner = "ice-wm";
     repo = "icewm";
     tag = finalAttrs.version;
-    hash = "sha256-A9LLVIU00ddINMiiuBapp4dc4/w8Z+TeC+zXV1CtTCE=";
+    hash = "sha256-lrYMx7UlVXQg6HlyajuxpV9liHXka0K/pJLrquTX2XQ=";
   };
 
   strictDeps = true;

From cb5d3b5cd5fe5dc1d4faff6006a6ed09ebaa5364 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 07:17:23 +0000
Subject: [PATCH 16/79] honeymarker: 0.2.1 -> 0.2.12

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

diff --git a/pkgs/by-name/ho/honeymarker/package.nix b/pkgs/by-name/ho/honeymarker/package.nix
index b1538db6752a..24ee5c7b9519 100644
--- a/pkgs/by-name/ho/honeymarker/package.nix
+++ b/pkgs/by-name/ho/honeymarker/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule rec {
   pname = "honeymarker";
-  version = "0.2.1";
-  vendorHash = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU=";
+  version = "0.2.12";
+  vendorHash = "sha256-jtDjy8Y2S5/Ujtv+dtoRZ4SP66sSP7yer97fwdNZEpg=";
 
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "honeymarker";
     rev = "v${version}";
-    hash = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4=";
+    hash = "sha256-28NCAtx3MHlwm44IUlI0DzUaycH9cPN8ZdEhhQtdciU=";
   };
 
   meta = with lib; {

From 709349f6f350e7b810084cb532403fcf54dec2f8 Mon Sep 17 00:00:00 2001
From: Nick Bathum <nickbathum@gmail.com>
Date: Fri, 20 Dec 2024 15:02:42 -0500
Subject: [PATCH 17/79] gradle: add toolchain paths to gradle.properties

Enable IntelliJ IDEA gradle projects to use the overridden javaToolchains
fix #207153

remove environment paths. no longer needed
---
 .../tools/build-managers/gradle/default.nix    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 893caa3cfee3..7e2c0bd43cde 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -91,15 +91,9 @@ rec {
       installPhase =
         with builtins;
         let
-          toolchain = rec {
-            prefix = x: "JAVA_TOOLCHAIN_NIX_${toString x}";
-            varDefs = (lib.imap0 (i: x: "${prefix i} ${x}") javaToolchains);
-            varNames = lib.imap0 (i: x: prefix i) javaToolchains;
-            property = " -Porg.gradle.java.installations.fromEnv='${concatStringsSep "," varNames}'";
-          };
-          varDefs = concatStringsSep "\n" (
-            map (x: "  --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs)
-          );
+          # set toolchains via installations.path property in gradle.properties.
+          # See https://docs.gradle.org/current/userguide/toolchains.html#sec:custom_loc
+          toolchainPaths = "org.gradle.java.installations.paths=${concatStringsSep "," javaToolchains}";
           jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else "";
           jnaFlag =
             if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else "";
@@ -111,9 +105,11 @@ rec {
           gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
           test -f $gradle_launcher_jar
           makeWrapper ${java}/bin/java $out/bin/gradle \
-            ${varDefs}
+            --set JAVA_HOME ${java} \
             ${jnaFlag} \
-            --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"
+            --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
+
+          echo "${toolchainPaths}" > $out/lib/gradle/gradle.properties
         '';
 
       dontFixup = !stdenv.hostPlatform.isLinux;

From 5eee7d2cc2a81c698ab53dcf06612da5ef2e3757 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 3 May 2025 20:42:17 -0400
Subject: [PATCH 18/79] tidal-hifi: add missing exec in desktop entry

---
 pkgs/by-name/ti/tidal-hifi/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index 930780f48c3f..c7314ecfa706 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -3,8 +3,6 @@
   buildNpmPackage,
   fetchFromGitHub,
   callPackage,
-  libdbusmenu,
-  xdg-utils,
   makeShellWrapper,
   copyDesktopItems,
   makeDesktopItem,
@@ -106,13 +104,6 @@ buildNpmPackage {
     copyDesktopItems
   ];
 
-  runtimeDependencies = [
-    (lib.getLib systemd)
-    libnotify
-    libdbusmenu
-    xdg-utils
-  ];
-
   npmDepsHash = "sha256-TNhD/ZkqJtsidAEIOL/WmJZw09BuFgd4ECnzbieNhVY=";
   forceGitDeps = true;
   makeCacheWritable = true;
@@ -134,6 +125,7 @@ buildNpmPackage {
 
   desktopItems = [
     (makeDesktopItem {
+      exec = "tidal-hifi";
       name = "TIDAL Hi-Fi";
       desktopName = "tidal-hifi";
       genericName = "TIDAL Hi-Fi";
@@ -189,8 +181,7 @@ buildNpmPackage {
       $out/share/tidal-hifi/lib*GL*
 
     # replace bundled vulkan-loader
-    rm "$out/share/tidal-hifi/libvulkan.so.1"
-    ln -s -t "$out/share/tidal-hifi" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
+    ln -sf -t "$out/share/tidal-hifi" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1"
 
     makeShellWrapper "$out/share/tidal-hifi/tidal-hifi" "$out/bin/tidal-hifi" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \

From 1dda6c1752018ab83b9bad1b3c784efbb0fe9354 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 31 Mar 2025 23:50:21 +0200
Subject: [PATCH 19/79] eigenpy: run unit tests

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

diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 2bbf0264e321..8797618041c4 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage rec {
 
   cmakeFlags = [
     "-DINSTALL_DOCUMENTATION=ON"
+    "-DBUILD_TESTING=ON"
     "-DBUILD_TESTING_SCIPY=ON"
   ];
 
@@ -50,6 +51,8 @@ buildPythonPackage rec {
     numpy
   ];
 
+  preInstallCheck = "make test";
+
   pythonImportsCheck = [ "eigenpy" ];
 
   meta = with lib; {

From 2a12441d01cadcdea6bf0f69653c2ef7ca2b576d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 4 May 2025 11:59:31 +0200
Subject: [PATCH 20/79] python3Packages.eigenpy: add graphviz

---
 pkgs/development/python-modules/eigenpy/default.nix | 11 ++++++++++-
 pkgs/top-level/python-packages.nix                  |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 8797618041c4..701d729e85d8 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -2,13 +2,21 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # nativeBuildInputs
   cmake,
   doxygen,
+  graphviz,
+  scipy,
+
+  # buildInputs
   boost,
+
+  # propagatedBuildInputs
   eigen,
   jrl-cmakemodules,
   numpy,
-  scipy,
+
 }:
 
 buildPythonPackage rec {
@@ -40,6 +48,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cmake
     doxygen
+    graphviz
     scipy
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfb8c27718d7..edc13191d773 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4375,7 +4375,9 @@ self: super: with self; {
 
   eheimdigital = callPackage ../development/python-modules/eheimdigital { };
 
-  eigenpy = callPackage ../development/python-modules/eigenpy { };
+  eigenpy = callPackage ../development/python-modules/eigenpy {
+    inherit (pkgs) graphviz; # need the `dot` program, not the python module
+  };
 
   einops = callPackage ../development/python-modules/einops { };
 

From d5072052afd83df4db1cf9d020853046631509b1 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 4 May 2025 12:10:53 +0200
Subject: [PATCH 21/79] eigenpy: fix Fontconfig errors

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

diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 701d729e85d8..746e3a6a2d3e 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  fontconfig,
+
   # nativeBuildInputs
   cmake,
   doxygen,
@@ -45,6 +47,12 @@ buildPythonPackage rec {
 
   strictDeps = true;
 
+  # Fontconfig error: No writable cache directories
+  preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
+
+  # Fontconfig error: Cannot load default config file: No such file: (null)
+  env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
+
   nativeBuildInputs = [
     cmake
     doxygen

From 214942d52b19a005f8f0dc406da29d76e12084d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 25 Mar 2025 09:24:03 -0400
Subject: [PATCH 22/79] lilypond: modernise

---
 pkgs/misc/lilypond/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 3892a3d733b6..07a0a42eff1e 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    sha256 = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw=";
+    hash = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw=";
   };
 
   postInstall = ''
@@ -76,7 +76,8 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl
+    substituteInPlace scripts/build/mf2pt1.pl \
+      --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
     export HOME=$TMPDIR/home
   '';
 
@@ -121,15 +122,15 @@ stdenv.mkDerivation rec {
     supportedFeatures = [ "commit" ];
   };
 
-  meta = with lib; {
+  meta = {
     description = "Music typesetting system";
     homepage = "http://lilypond.org/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       marcweber
       yurrriq
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 
   FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf {

From 9fc299d5951371146ad8ac0ae21bc755959732c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 25 Mar 2025 09:28:49 -0400
Subject: [PATCH 23/79] lilypond: fix metadata

---
 pkgs/misc/lilypond/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 07a0a42eff1e..c126ad08128f 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -124,8 +124,12 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Music typesetting system";
-    homepage = "http://lilypond.org/";
-    license = lib.licenses.gpl3;
+    homepage = "https://lilypond.org/";
+    license = with lib.licenses; [
+      gpl3Plus # most code
+      gpl3Only # ly/articulate.ly
+      ofl # mf/
+    ];
     maintainers = with lib.maintainers; [
       marcweber
       yurrriq

From 9ec03f822341afbe050dafa3a21e4f6e0508b14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 25 Mar 2025 09:53:14 -0400
Subject: [PATCH 24/79] lilypond: enable strictDeps

---
 pkgs/misc/lilypond/default.nix | 57 +++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index c126ad08128f..accba97801c3 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -7,9 +7,12 @@
   texinfo,
   imagemagick,
   texi2html,
+  extractpdfmark,
   guile,
   python3,
   gettext,
+  glib,
+  gmp,
   flex,
   perl,
   bison,
@@ -21,9 +24,6 @@
   pango,
   fontforge,
   help2man,
-  zip,
-  netpbm,
-  groff,
   freefont_ttf,
   makeFontsConf,
   makeWrapper,
@@ -81,36 +81,43 @@ stdenv.mkDerivation rec {
     export HOME=$TMPDIR/home
   '';
 
-  nativeBuildInputs = [
-    autoreconfHook
-    bison
-    flex
-    makeWrapper
+  strictDeps = true;
+
+  depsBuildBuild = [
     pkg-config
   ];
 
-  buildInputs = [
-    ghostscript
-    texinfo
-    imagemagick
-    texi2html
-    guile
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
     dblatex
-    tex
-    zip
-    netpbm
-    python3
-    gettext
-    perl
+    extractpdfmark
+    flex # for flex binary
     fontconfig
-    freetype
-    pango
     fontforge
+    gettext
+    ghostscript
+    guile
     help2man
-    groff
-    t1utils
-    boehmgc
+    imagemagick
+    makeWrapper
+    perl
+    pkg-config
+    python3
     rsync
+    t1utils
+    tex
+    texi2html
+    texinfo
+  ];
+
+  buildInputs = [
+    boehmgc
+    flex # FlexLexer.h
+    freetype
+    glib
+    gmp
+    pango
   ];
 
   autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh";

From 5323742558411221038c90765de6242b0727337a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 25 Mar 2025 10:12:18 -0400
Subject: [PATCH 25/79] lilypond-unstable: 2.25.24 -> 2.25.25; lilypond: switch
 to fetchzip

---
 pkgs/misc/lilypond/default.nix  | 6 +++---
 pkgs/misc/lilypond/unstable.nix | 8 ++++----
 pkgs/misc/lilypond/update.sh    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index accba97801c3..bd7b8b95546c 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchzip,
   ghostscript,
   gyre-fonts,
   texinfo,
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
   pname = "lilypond";
   version = "2.24.4";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw=";
+    hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";
   };
 
   postInstall = ''
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index eb856d392db1..e1ada341b288 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -1,14 +1,14 @@
 {
   lib,
-  fetchurl,
+  fetchzip,
   lilypond,
 }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.24";
-  src = fetchurl {
+  version = "2.25.25";
+  src = fetchzip {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-1n6mJBbZcfQYsmrjWxcG/EtIyF9uHNRVT7fX3+zoXc4=";
+    hash = "sha256-OO3yXA2PgOuUUR4Bo5wP4PieBvIxV1N9hPiapOB6cAE=";
   };
 
   passthru.updateScript = {
diff --git a/pkgs/misc/lilypond/update.sh b/pkgs/misc/lilypond/update.sh
index e9c3f48805af..a2dc8e48242d 100755
--- a/pkgs/misc/lilypond/update.sh
+++ b/pkgs/misc/lilypond/update.sh
@@ -21,5 +21,5 @@ echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]"
 
 # update hash
 PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash)
-NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 $(nix eval --raw -f default.nix $ATTR.src.url)))
+NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url)))
 sed -i "s|$PREV|$NEXT|" "$FILE"

From f731ebd198e12d2f8f870aaa4584d29f04290246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:46:28 -0400
Subject: [PATCH 26/79] lilypond: enable docs

---
 pkgs/misc/lilypond/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index bd7b8b95546c..2377cebb484c 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -34,10 +34,11 @@
   texliveSmall,
   tex ? texliveSmall.withPackages (
     ps: with ps; [
-      lh
-      metafont
       epsf
       fontinst
+      fontware
+      lh
+      metafont
     ]
   ),
 }:
@@ -69,7 +70,6 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--disable-documentation"
     # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no".
     "--with-urwotf-dir=${ghostscript.fonts}/share/fonts"
     "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
@@ -129,12 +129,16 @@ stdenv.mkDerivation rec {
     supportedFeatures = [ "commit" ];
   };
 
+  # documentation makefile uses "out" for different purposes, hence we explicitly set it to an empty string
+  makeFlags = [ "out=" ];
+
   meta = {
     description = "Music typesetting system";
     homepage = "https://lilypond.org/";
     license = with lib.licenses; [
       gpl3Plus # most code
       gpl3Only # ly/articulate.ly
+      fdl13Plus # docs
       ofl # mf/
     ];
     maintainers = with lib.maintainers; [

From 7b6b409755263f2c388f9b24030396167f16ffed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 4 May 2025 12:44:13 -0400
Subject: [PATCH 27/79] lilypond: remove dead code

---
 pkgs/misc/lilypond/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 2377cebb484c..733aa6288957 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -3,7 +3,6 @@
   lib,
   fetchzip,
   ghostscript,
-  gyre-fonts,
   texinfo,
   imagemagick,
   texi2html,
@@ -69,16 +68,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags = [
-    # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no".
-    "--with-urwotf-dir=${ghostscript.fonts}/share/fonts"
-    "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
-  ];
-
   preConfigure = ''
     substituteInPlace scripts/build/mf2pt1.pl \
       --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
-    export HOME=$TMPDIR/home
   '';
 
   strictDeps = true;

From f3a4d6de9c4588821d877ca28c9de4d18a19332e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 4 May 2025 23:33:39 +0200
Subject: [PATCH 28/79] libint: 2.10.2 -> 2.11.0

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

diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index 00fc01bd5d8d..dbf62d6db2a9 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -128,7 +128,7 @@ assert (
 
 let
   pname = "libint";
-  version = "2.10.2";
+  version = "2.11.0";
 
   meta = {
     description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions";
@@ -151,7 +151,7 @@ let
       owner = "evaleev";
       repo = pname;
       rev = "v${version}";
-      hash = "sha256-pxSqW3K76RURy1nhWJKtFNWsiSpU8jPtd+ZMICEr0IY=";
+      hash = "sha256-z5D3wX+AFBM4KcU77Rwma8lgqx8vwDmerFxu0mC1XCk=";
     };
 
     # Replace hardcoded "/bin/rm" with normal "rm"

From d390b0082175ce20ce8ae12533d916a73e890001 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 May 2025 00:17:40 +0000
Subject: [PATCH 29/79] nixpacks: 1.35.0 -> 1.37.0

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

diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index 71e128d01568..2212d9ca0606 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.35.0";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
     rev = "v${version}";
-    hash = "sha256-lWd8y/gZTLza9WrIBSsqg0TUkmwzvcZE97kj+NnHrSI=";
+    hash = "sha256-1Kw5vOE8UhGWlSjBX/wMiUyRvCYwha343RiGAXEcFXw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-BuQNJTvL7vxAAS86ENTqgFbneaRo/W+C1rhTmF9BgUM=";
+  cargoHash = "sha256-rmndlNqUtGpSBLclyoTL01CP3qgCNoTmOnpR+9ux/VE=";
 
   # skip test due FHS dependency
   doCheck = false;

From 738004c59b0a9d615c02df04a1391d2c5127009d Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 5 May 2025 11:37:12 +1000
Subject: [PATCH 30/79] firezone-gateway: 1.4.6 -> 1.4.8

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

diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 54949d548167..1530340cf7f1 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-gateway";
-  version = "1.4.6";
+  version = "1.4.8";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${version}";
-    hash = "sha256-ra5ZWPwNhyZEc9pBkcITvQyomgQ22yiWI16dnv1Fm3E=";
+    hash = "sha256-C5zCo9G21xrrPzabD/8Tiil8D1RlRG8+3/jLTf5/pTQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5B9nvFanHXZV8p8m2vsRLC5pSzwL2lX+V651oV8joJs=";
+  cargoHash = "sha256-eJfRTtLHYOc3M3dOP/VvrC6Qm2ovoR6LQSgCPwntc1M=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
   RUSTFLAGS = "--cfg system_certs";

From 7ba0a20b80188edd1a5998d498a2e173067b6ce8 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 5 May 2025 11:42:09 +1000
Subject: [PATCH 31/79] firezone-gui-client: 1.4.9 -> 1.4.12

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

diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix
index 35ebc5c3cb2a..04212a7b5a06 100644
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@@ -24,12 +24,12 @@
   copyDesktopItems,
 }:
 let
-  version = "1.4.9";
+  version = "1.4.12";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gui-client-${version}";
-    hash = "sha256-nOf7+48WUzQ7VmP7PFo07ZhtgyG7VOI/Hb/rXyBU5o0=";
+    hash = "sha256-jvrkAbXHFWdNInDCrktC7eMZQ2a/rzUxfCOny7nHQmQ=";
   };
 
   frontend = stdenvNoCC.mkDerivation rec {
@@ -39,7 +39,7 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version;
       src = "${src}/rust/gui-client";
-      hash = "sha256-9ywC920EF6UxkXHs+0WWaU8fr5J35/C+0nNGbSVHESE=";
+      hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
     };
     pnpmRoot = "rust/gui-client";
 
@@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec {
   inherit version src;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ltxyI3Xoute0/HHXYU4XdFjcQ9zSLx6ZzAZFEjDk6zw=";
+  cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gui-client";
   RUSTFLAGS = "--cfg system_certs";

From 46b5f3638fd0da00ff2f1ac652bac9cba0cc8aa1 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 5 May 2025 11:53:42 +1000
Subject: [PATCH 32/79] firezone-headless-client: 1.4.6 -> 1.4.7

---
 pkgs/by-name/fi/firezone-headless-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index 952d4ec93edf..38b01292bb9c 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-headless-client";
-  version = "1.4.6";
+  version = "1.4.7";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "headless-client-${version}";
-    hash = "sha256-ra5ZWPwNhyZEc9pBkcITvQyomgQ22yiWI16dnv1Fm3E=";
+    hash = "sha256-2zRuOY8D6NEopKg13bvJoTR7uXZ4wm40VFvR3NRKqJc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-5B9nvFanHXZV8p8m2vsRLC5pSzwL2lX+V651oV8joJs=";
+  cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "headless-client";
   RUSTFLAGS = "--cfg system_certs";

From 007afb833f9ca390082a59a350628ede653048dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 May 2025 06:42:02 +0000
Subject: [PATCH 33/79] alacritty-theme: 0-unstable-2025-03-20 ->
 0-unstable-2025-04-30

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

diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix
index 5df6dc00cd65..67e81be125bf 100644
--- a/pkgs/by-name/al/alacritty-theme/package.nix
+++ b/pkgs/by-name/al/alacritty-theme/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (self: {
   pname = "alacritty-theme";
-  version = "0-unstable-2025-03-20";
+  version = "0-unstable-2025-04-30";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "86c578469e2bf784faf6f916883bf48349ff4f6d";
-    hash = "sha256-0phAQvPPiwE7MneaN7XoLZKPgAIDGYf3fYvYUjhbts8=";
+    rev = "2f97742d8d7c65f5b0562d124c1efd5e28294a97";
+    hash = "sha256-zc/saPCspfLA9mddnRmFiqYfdmBs/o5bgnQlD5lm7Ls=";
     sparseCheckout = [ "themes" ];
   };
 

From cd2ccdd6aa3789f3ed0a3298a117f1254850378b Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 9 Apr 2025 12:39:06 +0200
Subject: [PATCH 34/79] zulu24: init at 24.0.0

---
 pkgs/development/compilers/zulu/24.nix | 58 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/compilers/zulu/24.nix

diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix
new file mode 100644
index 000000000000..28e876e4ca0b
--- /dev/null
+++ b/pkgs/development/compilers/zulu/24.nix
@@ -0,0 +1,58 @@
+{
+  callPackage,
+  enableJavaFX ? false,
+  ...
+}@args:
+
+let
+  # For 24 JDK FX is newer than regular JDK?
+  zuluVersion = if enableJavaFX then "24.28.85" else "24.28.83";
+in
+callPackage ./common.nix (
+  {
+    # Details from https://www.azul.com/downloads/?version=java-24&package=jdk
+    # Note that the latest build may differ by platform
+    dists = {
+      x86_64-linux = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-y8jiE5yECh96pHYZFM0Q/JTiVcm5a0PONYJDLYydCT0="
+          else
+            "sha256-Kf6gF8A8ZFIhujEgjlENeuSPVzW6QWnVZcRst35/ZvI=";
+      };
+
+      aarch64-linux = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-H6YD8uhk9rTpd+3/S1+7QVzpCi6jykWKyu7RPxMx/sI="
+          else
+            "sha256-6J7szd/ax9xCMNA9efw9Bhgv/VwQFXz5glWIoj+UYIc=";
+      };
+
+      x86_64-darwin = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-lMdbPkUdXyNcye8uMxGIhZTErrTI0P0SnqMS+8+Rjqg="
+          else
+            "sha256-e7KJtJ9+mFFSdKCj68thfTXguWH5zXaSSb9phzXf/lQ=";
+      };
+
+      aarch64-darwin = {
+        inherit zuluVersion;
+        jdkVersion = "24.0.0";
+        hash =
+          if enableJavaFX then
+            "sha256-oR2x0vphBGgh3KkEkLAcmtIMNONny9/b32z9jLR98X0="
+          else
+            "sha256-7yXLOJCK0RZ8V1vsexOGxGR9NAwi/pCl95BlO8E8nGU=";
+      };
+    };
+  }
+  // builtins.removeAttrs args [ "callPackage" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d35d3f0b7e8..f1fc48cfecc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6597,6 +6597,7 @@ with pkgs;
   zulu17 = callPackage ../development/compilers/zulu/17.nix { };
   zulu21 = callPackage ../development/compilers/zulu/21.nix { };
   zulu23 = callPackage ../development/compilers/zulu/23.nix { };
+  zulu24 = callPackage ../development/compilers/zulu/24.nix { };
   zulu = zulu21;
 
   ### DEVELOPMENT / INTERPRETERS

From 71dd692741a1c8d6c7d3a1da83c6c7d2be73c459 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 1 May 2025 11:24:20 +0200
Subject: [PATCH 35/79] openjdk24: init at 24+36

---
 .../24/patches/fix-java-home-jdk24.patch      | 13 ++++++++
 .../read-truststore-from-env-jdk24.patch      | 30 +++++++++++++++++++
 .../compilers/openjdk/24/source.json          |  6 ++++
 .../development/compilers/openjdk/generic.nix | 28 +++++++++++++----
 pkgs/top-level/all-packages.nix               |  5 ++++
 pkgs/top-level/java-packages.nix              |  1 +
 6 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch
 create mode 100644 pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch
 create mode 100644 pkgs/development/compilers/openjdk/24/source.json

diff --git a/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch b/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch
new file mode 100644
index 000000000000..8196ffba753c
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch
@@ -0,0 +1,13 @@
+--- a/src/hotspot/os/linux/os_linux.cpp	2025-04-08 14:43:06.765198522 +0200
++++ b/src/hotspot/os/linux/os_linux.cpp	2025-04-08 14:43:27.890301990 +0200
+@@ -2758,9 +2758,7 @@
+   assert(ret, "cannot locate libjvm");
+   char *rp = nullptr;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = os::realpath(dli_fname, buf, buflen);
+-  }
+-  if (rp == nullptr) {
++    snprintf(buf, buflen, "%s", dli_fname);
+     return;
+   }
+ 
diff --git a/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch b/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch
new file mode 100644
index 000000000000..7ca74359c529
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch
@@ -0,0 +1,30 @@
+--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-06-26 21:48:25.000000000 -0400
++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+      *
+      * The preference of the default trusted KeyStore is:
+      *    javax.net.ssl.trustStore
++     *    system environment variable JAVAX_NET_SSL_TRUSTSTORE
+      *    jssecacerts
+      *    cacerts
+      */
+@@ -125,7 +126,8 @@
+         static TrustStoreDescriptor run() {
+             // Get the system properties for trust store.
+             String storePropName = System.getProperty(
+-                    "javax.net.ssl.trustStore", jsseDefaultStore);
++                    "javax.net.ssl.trustStore",
++                    System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));
+             String storePropType = System.getProperty(
+                     "javax.net.ssl.trustStoreType",
+                     KeyStore.getDefaultType());
+@@ -137,6 +139,9 @@
+             String temporaryName = "";
+             File temporaryFile = null;
+             long temporaryTime = 0L;
++            if (storePropName == null) {
++                storePropName = jsseDefaultStore;
++            }
+             if (!"NONE".equals(storePropName)) {
+                 String[] fileNames =
+                         new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openjdk/24/source.json b/pkgs/development/compilers/openjdk/24/source.json
new file mode 100644
index 000000000000..7bc62f8b38bf
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/24/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-ogWq6oLyZzzvxGTqEEoPMXdtfbobUyXcC5bXXxBxfuo=",
+  "owner": "openjdk",
+  "repo": "jdk24u",
+  "rev": "refs/tags/jdk-24+36"
+}
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 21395f979b6d..a7e8791bc408 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -13,6 +13,7 @@
   lndir,
   unzip,
   ensureNewerSourcesForZipFilesHook,
+  pandoc,
 
   cpio,
   file,
@@ -76,6 +77,7 @@
   temurin-bin-17,
   temurin-bin-21,
   temurin-bin-23,
+  temurin-bin-24,
   jdk-bootstrap ?
     {
       "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;
@@ -83,6 +85,7 @@
       "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;
       "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
       "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
+      "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;
     }
     .${featureVersion},
 }:
@@ -98,6 +101,7 @@ let
   atLeast17 = lib.versionAtLeast featureVersion "17";
   atLeast21 = lib.versionAtLeast featureVersion "21";
   atLeast23 = lib.versionAtLeast featureVersion "23";
+  atLeast24 = lib.versionAtLeast featureVersion "24";
 
   tagPrefix = if atLeast11 then "jdk-" else "jdk";
   version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;
@@ -143,7 +147,9 @@ stdenv.mkDerivation (finalAttrs: {
   patches =
     [
       (
-        if atLeast21 then
+        if atLeast24 then
+          ./24/patches/fix-java-home-jdk24.patch
+        else if atLeast21 then
           ./21/patches/fix-java-home-jdk21.patch
         else if atLeast11 then
           ./11/patches/fix-java-home-jdk10.patch
@@ -151,7 +157,9 @@ stdenv.mkDerivation (finalAttrs: {
           ./8/patches/fix-java-home-jdk8.patch
       )
       (
-        if atLeast11 then
+        if atLeast24 then
+          ./24/patches/read-truststore-from-env-jdk24.patch
+        else if atLeast11 then
           ./11/patches/read-truststore-from-env-jdk10.patch
         else
           ./8/patches/read-truststore-from-env-jdk8.patch
@@ -254,6 +262,9 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals atLeast21 [
       ensureNewerSourcesForZipFilesHook
+    ]
+    ++ lib.optionals atLeast24 [
+      pandoc
     ];
 
   buildInputs =
@@ -475,10 +486,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = atLeast23;
 
-  ${if atLeast17 then "postPatch" else null} = ''
-    chmod +x configure
-    patchShebangs --build configure
-  '';
+  ${if atLeast17 then "postPatch" else null} =
+    ''
+      chmod +x configure
+      patchShebangs --build configure
+    ''
+    + lib.optionalString atLeast24 ''
+      chmod +x make/scripts/*.{template,sh,pl}
+      patchShebangs --build make/scripts
+    '';
 
   ${if !atLeast17 then "preConfigure" else null} =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1fc48cfecc9..442faa5fe99d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6061,6 +6061,11 @@ with pkgs;
   jdk23 = openjdk23;
   jdk23_headless = openjdk23_headless;
 
+  openjdk24 = javaPackages.compiler.openjdk24;
+  openjdk24_headless = javaPackages.compiler.openjdk24.headless;
+  jdk24 = openjdk24;
+  jdk24_headless = openjdk24_headless;
+
   # default JDK
   jdk = jdk21;
   jdk_headless = jdk21_headless;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index a08cb4a55c7a..770a29df445e 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -49,6 +49,7 @@ with pkgs;
       openjdk17 = mkOpenjdk "17";
       openjdk21 = mkOpenjdk "21";
       openjdk23 = mkOpenjdk "23";
+      openjdk24 = mkOpenjdk "24";
 
       # Legacy aliases
       openjdk8-bootstrap = temurin-bin.jdk-8;

From 62ae237a56f8f4fb98d81ec366e199a1c876ac83 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Wed, 9 Apr 2025 19:42:39 +0200
Subject: [PATCH 36/79] openjfx24: init at 24+29

---
 pkgs/by-name/op/openjfx/24/deps.json          | 158 ++++++++++++++++++
 pkgs/by-name/op/openjfx/24/source.json        |   6 +
 pkgs/by-name/op/openjfx/package.nix           |   2 +
 .../development/compilers/openjdk/generic.nix |   2 +
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 169 insertions(+)
 create mode 100644 pkgs/by-name/op/openjfx/24/deps.json
 create mode 100644 pkgs/by-name/op/openjfx/24/source.json

diff --git a/pkgs/by-name/op/openjfx/24/deps.json b/pkgs/by-name/op/openjfx/24/deps.json
new file mode 100644
index 000000000000..f70206d4a9f7
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/24/deps.json
@@ -0,0 +1,158 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://download.eclipse.org": {
+  "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": {
+   "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs="
+  }
+ },
+ "https://github.com": {
+  "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {
+   "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/ibm/icu#icu4j/61.1": {
+   "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=",
+   "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
+   "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
+   "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
+  },
+  "org/antlr#ST4/4.1": {
+   "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=",
+   "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw="
+  },
+  "org/antlr#antlr-master/3.5.2": {
+   "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
+  },
+  "org/antlr#antlr-runtime/3.5.2": {
+   "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
+   "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
+  },
+  "org/antlr#antlr4-master/4.7.2": {
+   "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
+  },
+  "org/antlr#antlr4-runtime/4.7.2": {
+   "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
+   "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
+  },
+  "org/antlr#antlr4/4.7.2": {
+   "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E="
+  },
+  "org/antlr#antlr4/4.7.2/complete": {
+   "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache/lucene#lucene-core/7.7.3": {
+   "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=",
+   "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo="
+  },
+  "org/apache/lucene#lucene-grouping/7.7.3": {
+   "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=",
+   "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU="
+  },
+  "org/apache/lucene#lucene-parent/7.7.3": {
+   "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU="
+  },
+  "org/apache/lucene#lucene-queries/7.7.3": {
+   "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=",
+   "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA="
+  },
+  "org/apache/lucene#lucene-queryparser/7.7.3": {
+   "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=",
+   "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI="
+  },
+  "org/apache/lucene#lucene-sandbox/7.7.3": {
+   "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=",
+   "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI="
+  },
+  "org/apache/lucene#lucene-solr-grandparent/7.7.3": {
+   "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/glassfish#javax.json/1.0.4": {
+   "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=",
+   "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ="
+  },
+  "org/glassfish#json/1.0.4": {
+   "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/junit#junit-bom/5.11.3": {
+   "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=",
+   "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.11.3": {
+   "jar": "sha256-XYFHpg9JRTlz4lDtaHAbf/BVlk/iRi/Cyx7B1tRIibo=",
+   "module": "sha256-zC4yvwDuZDSpoZ3P2fJ6z2ZaPdYy03fkdhgNies+8n0=",
+   "pom": "sha256-8Zr+CSOwGTXEDy5+ltZgN+IAi3AXkXzHBRM4N3hJYY4="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.11.3": {
+   "jar": "sha256-5iQgyZ98DVmiFZou9j5hh36cgL1yLAPKi/O9zqBQpYk=",
+   "module": "sha256-s3w9vEFSbrpeVMz/ROxUf0hVYstDyj0J2p+n2hmjBl4=",
+   "pom": "sha256-eJ43jTfEndhlTWbjrTreQY5YhK5vSHI5Ad0758nsngM="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.11.3": {
+   "jar": "sha256-D3mOvsdExOZgX9TyBy9BqOmJ4tRp4h21qmfPeZwLUew=",
+   "module": "sha256-sLUYC9HX9NFhsKCF+7JP2hbNcKfQX2Ni4asuSS0cq+w=",
+   "pom": "sha256-zOw0JKBxSUTGd7lP1QP9DByiQ84VxAFg1gzmKKr6Nf8="
+  },
+  "org/junit/jupiter#junit-jupiter/5.11.3": {
+   "jar": "sha256-rHV47+0WI2fD3cAGM44H1FcVEP2YZmQuqT1bnk7S9mU=",
+   "module": "sha256-a5pr3dlKOPEmUmh67HyBJisZkf6+vEjKmP6rxWOhKwE=",
+   "pom": "sha256-y+nzhaChO2/tjGxu0fFtxgWpJlfzslsZaDjHPZdoSAY="
+  },
+  "org/junit/platform#junit-platform-commons/1.11.3": {
+   "jar": "sha256-viYpZLC2tI3pd8YdT5Md+M9h6A51DMPzoKOc3SHBAIw=",
+   "module": "sha256-l531zqTESC/fxZCK3ItGq2q/ADbpmk0CzBjAdDyLggc=",
+   "pom": "sha256-gW69MkSncNkV2cHUDTtGUf40j0L4m3y369De4gnFIEA="
+  },
+  "org/junit/platform#junit-platform-engine/1.11.3": {
+   "jar": "sha256-AEP3L2EWZHNdqNyaMIvxLs0iNrBTOTUcR0HttNj6sNo=",
+   "module": "sha256-K5UnTIxw3eS9vEmQnxxY61qSLlQcXdO+qpx68rv6Qaw=",
+   "pom": "sha256-/ibcXakRuUtowSsiQSV6IIE1u7m4yRzBoTQzqAp6eR4="
+  },
+  "org/junit/platform#junit-platform-launcher/1.11.3": {
+   "jar": "sha256-tHJ0WSAbABG+sHQr2AdCGh/IQmsRYZMDHth4JbwtTwQ=",
+   "module": "sha256-cqqtIKPLIsFMA9WYDgJZZ1KmWe3EaylHH35c/yJWbow=",
+   "pom": "sha256-ElFDZ7k84oUOXa4jt8PWSjZuVMuLgjf5FNiD/Z26G/o="
+  },
+  "org/junit/vintage#junit-vintage-engine/5.11.3": {
+   "jar": "sha256-1YAiQZvHaz309Hmis1mdleJEZM1o+3wiZ/GhqHEhXEc=",
+   "module": "sha256-/ruKwpJtQhhJUQhtKDFqn0AfjEoUMhW4QleXCHEGBoQ=",
+   "pom": "sha256-Js5pMwDkTPg5mu0wujw7kBA6inM8/wH5DfCMDyvs2CA="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  }
+ }
+}
diff --git a/pkgs/by-name/op/openjfx/24/source.json b/pkgs/by-name/op/openjfx/24/source.json
new file mode 100644
index 000000000000..d9f8d4ef2aaf
--- /dev/null
+++ b/pkgs/by-name/op/openjfx/24/source.json
@@ -0,0 +1,6 @@
+{
+  "hash": "sha256-pXQCzNcucQAYv0Da1uE5xG6pGqxQXrTDzvFqrn7H92M=",
+  "owner": "openjdk",
+  "repo": "jfx24u",
+  "rev": "refs/tags/24+29"
+}
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 08cd2edbec5c..aef6b92888fc 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -36,11 +36,13 @@
   jdk17_headless,
   jdk21_headless,
   jdk23_headless,
+  jdk24_headless,
   jdk-bootstrap ?
     {
       "17" = jdk17_headless;
       "21" = jdk21_headless;
       "23" = jdk23_headless;
+      "24" = jdk24_headless;
     }
     .${featureVersion},
 }:
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index a7e8791bc408..2ec03b2d5df5 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -59,11 +59,13 @@
   openjfx17,
   openjfx21,
   openjfx23,
+  openjfx24,
   openjfx_jdk ?
     {
       "17" = openjfx17;
       "21" = openjfx21;
       "23" = openjfx23;
+      "24" = openjfx24;
     }
     .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 442faa5fe99d..d38f873a5919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6030,6 +6030,7 @@ with pkgs;
   openjfx17 = openjfx;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
   openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
+  openjfx24 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "24"; };
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
   openjdk8 = javaPackages.compiler.openjdk8;

From e527d18630173a7c54af821b2fe9ed315bd938e0 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Mon, 5 May 2025 11:40:34 +0200
Subject: [PATCH 37/79] openjfx24: manually add
 org.eclipse.swt.gtk.linux.aarch64 dependency

---
 pkgs/by-name/op/openjfx/24/deps.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/openjfx/24/deps.json b/pkgs/by-name/op/openjfx/24/deps.json
index f70206d4a9f7..55263fae58fe 100644
--- a/pkgs/by-name/op/openjfx/24/deps.json
+++ b/pkgs/by-name/op/openjfx/24/deps.json
@@ -4,6 +4,9 @@
  "https://download.eclipse.org": {
   "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": {
    "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs="
+  },
+  "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": {
+   "jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js="
   }
  },
  "https://github.com": {

From a602bbe57cc0fc5de1d5c4986e4adefde3d54cc6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:33:52 +0300
Subject: [PATCH 38/79] Revert "LPCNet: unbreak on clang"

This reverts commit 4a48f9d497ef818a1f86157a5773dc9c55075e34.
---
 pkgs/by-name/lp/LPCNet/package.nix | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index c7bf42a7d7e9..0fe4dbff872c 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -7,7 +7,6 @@
   codec2,
   # for tests
   octave,
-  sox,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,30 +47,13 @@ stdenv.mkDerivation (finalAttrs: {
     codec2
   ];
 
-  cmakeFlags = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
-    # unsupported option '-mfpu=' for target 'x86_64-apple-darwin'
-    "-DNEON=OFF"
-  ];
-
   nativeCheckInputs = [
     octave
-    sox
-  ];
-
-  disabledTests = lib.optionals (stdenv.cc.isClang && stdenv.hostPlatform.isAarch64) [
-    # disable tests that require NEON
-    "SIMD_functions"
   ];
 
   doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-
+  preCheck = ''
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src"
-
-    ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'
-
-    runHook postCheck
   '';
 
   meta = {

From e664969a9c6bb312c48ec869b4024a0d20ab80d1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:38:45 +0300
Subject: [PATCH 39/79] LPCNet: Remove unneeded octave from nativeCheckInputs

---
 pkgs/by-name/lp/LPCNet/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index 0fe4dbff872c..4bfebeeef716 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -5,8 +5,6 @@
   fetchurl,
   cmake,
   codec2,
-  # for tests
-  octave,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -47,10 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     codec2
   ];
 
-  nativeCheckInputs = [
-    octave
-  ];
-
   doCheck = true;
   preCheck = ''
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src"

From 1aa107b5fc0f44ebf6233ff9374cae326201123e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:52:05 +0300
Subject: [PATCH 40/79] LPCNet: Remove not doing anything prePatch

---
 pkgs/by-name/lp/LPCNet/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index 4bfebeeef716..0af7e7e3fb94 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -33,10 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
       build/${finalAttrs.finalPackage.passthru.nnmodel.name}
   '';
 
-  prePatch = ''
-    patchShebangs *.sh unittest/*.sh
-  '';
-
   nativeBuildInputs = [
     cmake
   ];

From a4c0b50672c30b1fc55eb0d55dc2ac0a12e12fe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 May 2025 12:08:32 +0000
Subject: [PATCH 41/79] python3Packages.rtfde: 0.1.2 -> 0.1.2.1

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

diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix
index f4562b0f3581..c94aef02ba88 100644
--- a/pkgs/development/python-modules/rtfde/default.nix
+++ b/pkgs/development/python-modules/rtfde/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "rtfde";
-  version = "0.1.2";
+  version = "0.1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "seamustuohy";
     repo = "RTFDE";
     tag = version;
-    hash = "sha256-zmcf9wqlKz55dOIchUC9sgW0PcTCPc52IkbIonOFlmU=";
+    hash = "sha256-dtPWgtOYpGaNRmIE7WNGJd/GWB2hQXsFJDDSHIcIjY4=";
   };
 
   build-system = [ setuptools ];
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}";
+    changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${src.tag}";
     description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies";
     homepage = "https://github.com/seamustuohy/RTFDE";
     license = lib.licenses.lgpl3Only;

From c0e22beb53f5b414e6b4dcce6c9203ce5bb79386 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 15:21:30 +0300
Subject: [PATCH 42/79] LPCNet: Remove unnecessary LD_LIBRARY_PATH in preCheck

---
 pkgs/by-name/lp/LPCNet/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index 0af7e7e3fb94..68b09909cdd8 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -42,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
-  preCheck = ''
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src"
-  '';
 
   meta = {
     description = "Experimental Neural Net speech coding for FreeDV";

From 019a74e4b9fbbe714660e85d8a0b5fb6a8a9e978 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:44:48 +0300
Subject: [PATCH 43/79] LPCNet: Add mvs as maintainer

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

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index 68b09909cdd8..b4d078afe21e 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -47,7 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Experimental Neural Net speech coding for FreeDV";
     homepage = "https://github.com/drowe67/LPCNet";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ doronbehar ];
+    maintainers = with lib.maintainers; [
+      doronbehar
+      mvs
+    ];
     platforms = lib.platforms.all;
   };
 })

From 6b903a1a704dd1325a70885c968c39c59dc91970 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:41:01 +0300
Subject: [PATCH 44/79] LPCNet: Fix Darwin build with upstream patch

---
 pkgs/by-name/lp/LPCNet/darwin.patch | 13 +++++++++++++
 pkgs/by-name/lp/LPCNet/package.nix  |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/lp/LPCNet/darwin.patch

diff --git a/pkgs/by-name/lp/LPCNet/darwin.patch b/pkgs/by-name/lp/LPCNet/darwin.patch
new file mode 100644
index 000000000000..a82ac9b330d5
--- /dev/null
+++ b/pkgs/by-name/lp/LPCNet/darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1600871..1536c55 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0))
+ # AVX and AVX2 machines will also match on SSE
+     message(STATUS "sse processor flags found or enabled.")
+     set(LPCNET_C_PROC_FLAGS -msse4.1)
+-elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0))
++elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE)
+     # RPi / ARM 32bit
+     message(STATUS "neon processor flags found or enabled.")
+     set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53)
diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index b4d078afe21e..4215450556bd 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0=";
   };
 
+  patches = [
+    # extracted from https://github.com/drowe67/LPCNet/pull/59
+    ./darwin.patch
+  ];
+
   passthru = {
     # Prebuilt neural network model that is needed during the build - can be overwritten
     nnmodel = fetchurl {

From a156b87ee5a6a8f83f48fb288638462681855e11 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:50:57 +0300
Subject: [PATCH 45/79] LPCNet: 0.5 -> 0.5-unstable-2025-01-19

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

diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix
index 4215450556bd..3737bec91de2 100644
--- a/pkgs/by-name/lp/LPCNet/package.nix
+++ b/pkgs/by-name/lp/LPCNet/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "LPCNet";
-  version = "0.5";
+  version = "0.5-unstable-2025-01-19";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "LPCNet";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0=";
+    rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
+    sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
   };
 
   patches = [

From 35c32dcda42058095ef5b99786977e18cf6e0567 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 13:49:02 +0300
Subject: [PATCH 46/79] lpcnetfreedv: remove

---
 pkgs/by-name/co/codec2/package.nix        |  4 +-
 pkgs/by-name/fr/freedv/package.nix        |  4 +-
 pkgs/by-name/lp/lpcnetfreedv/darwin.patch | 13 ------
 pkgs/by-name/lp/lpcnetfreedv/package.nix  | 51 -----------------------
 pkgs/top-level/aliases.nix                |  1 +
 5 files changed, 5 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/by-name/lp/lpcnetfreedv/darwin.patch
 delete mode 100644 pkgs/by-name/lp/lpcnetfreedv/package.nix

diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index 5eef7e5c577b..67c2698fbcce 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   cmake,
   freedvSupport ? false,
-  lpcnetfreedv,
+  LPCNet,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals freedvSupport [
-    lpcnetfreedv
+    LPCNet
   ];
 
   # we need to unset these variables from stdenv here and then set their equivalents in the cmake flags
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index 7a01ca62e4c6..30740d3c1f7d 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -11,7 +11,7 @@
   libpulseaudio,
   libsamplerate,
   libsndfile,
-  lpcnetfreedv,
+  LPCNet,
   portaudio,
   speexdsp,
   hamlib_4,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     codec2
     libsamplerate
     libsndfile
-    lpcnetfreedv
+    LPCNet
     speexdsp
     hamlib_4
     wxGTK32
diff --git a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch b/pkgs/by-name/lp/lpcnetfreedv/darwin.patch
deleted file mode 100644
index a82ac9b330d5..000000000000
--- a/pkgs/by-name/lp/lpcnetfreedv/darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1600871..1536c55 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -158,7 +158,7 @@ elseif(${SSE} AND (${SSE_PRESENT} OR ${SSE_PRESENT} GREATER 0))
- # AVX and AVX2 machines will also match on SSE
-     message(STATUS "sse processor flags found or enabled.")
-     set(LPCNET_C_PROC_FLAGS -msse4.1)
--elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0))
-+elseif(${NEON} AND (${NEON_PRESENT} OR ${NEON_PRESENT} GREATER 0) AND NOT APPLE)
-     # RPi / ARM 32bit
-     message(STATUS "neon processor flags found or enabled.")
-     set(LPCNET_C_PROC_FLAGS -mfpu=neon -march=armv8-a -mtune=cortex-a53)
diff --git a/pkgs/by-name/lp/lpcnetfreedv/package.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix
deleted file mode 100644
index bfc773ad47cd..000000000000
--- a/pkgs/by-name/lp/lpcnetfreedv/package.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchurl,
-  cmake,
-  nix-update-script,
-}:
-
-let
-  dataVersion = "191005_v1.0";
-  data = fetchurl {
-    url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
-    sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
-  };
-in
-stdenv.mkDerivation {
-  pname = "lpcnetfreedv";
-  version = "0.5-unstable-2025-01-19";
-
-  src = fetchFromGitHub {
-    owner = "drowe67";
-    repo = "LPCNet";
-    rev = "c8e51ac5e2fe674849cb53e7da44689b572cc246";
-    sha256 = "sha256-0Knoym+deTuFAyJrrD55MijVh6DlhJp3lss66BJUHiA=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  patches = [
-    # extracted from https://github.com/drowe67/LPCNet/pull/59
-    ./darwin.patch
-  ];
-
-  postPatch = ''
-    mkdir build
-    ln -s ${data} build/lpcnet_${dataVersion}.tgz
-  '';
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    homepage = "https://freedv.org/";
-    description = "Experimental Neural Net speech coding for FreeDV";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ mvs ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bbc45db63605..912d37223ef7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1808,6 +1808,7 @@ mapAliases {
   libtransmission = lib.warnOnInstantiate (transmission3Warning {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
+  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
   tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
   tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
   transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11

From 4b745cb5ddc1a31f3cbd587520806fdc0f942584 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 5 May 2025 15:19:02 +0300
Subject: [PATCH 47/79] lpcnet: Rename from LPCNet

---
 pkgs/by-name/co/codec2/package.nix              | 4 ++--
 pkgs/by-name/fr/freedv/package.nix              | 4 ++--
 pkgs/by-name/lp/{LPCNet => lpcnet}/darwin.patch | 0
 pkgs/by-name/lp/{LPCNet => lpcnet}/package.nix  | 0
 pkgs/top-level/aliases.nix                      | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/by-name/lp/{LPCNet => lpcnet}/darwin.patch (100%)
 rename pkgs/by-name/lp/{LPCNet => lpcnet}/package.nix (100%)

diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix
index 67c2698fbcce..b7c29445a81c 100644
--- a/pkgs/by-name/co/codec2/package.nix
+++ b/pkgs/by-name/co/codec2/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   cmake,
   freedvSupport ? false,
-  LPCNet,
+  lpcnet,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = lib.optionals freedvSupport [
-    LPCNet
+    lpcnet
   ];
 
   # we need to unset these variables from stdenv here and then set their equivalents in the cmake flags
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index 30740d3c1f7d..ff04378f9f7e 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -11,7 +11,7 @@
   libpulseaudio,
   libsamplerate,
   libsndfile,
-  LPCNet,
+  lpcnet,
   portaudio,
   speexdsp,
   hamlib_4,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     codec2
     libsamplerate
     libsndfile
-    LPCNet
+    lpcnet
     speexdsp
     hamlib_4
     wxGTK32
diff --git a/pkgs/by-name/lp/LPCNet/darwin.patch b/pkgs/by-name/lp/lpcnet/darwin.patch
similarity index 100%
rename from pkgs/by-name/lp/LPCNet/darwin.patch
rename to pkgs/by-name/lp/lpcnet/darwin.patch
diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/lpcnet/package.nix
similarity index 100%
rename from pkgs/by-name/lp/LPCNet/package.nix
rename to pkgs/by-name/lp/lpcnet/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 912d37223ef7..5a6d5dcf9a22 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1809,6 +1809,7 @@ mapAliases {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
   lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
+  LPCNet = lpcnet; # Added 2025-05-05
   tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
   tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
   transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11

From 3781a682a9e25b9bcd9d391faaa49823069eb231 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Mon, 5 May 2025 14:57:29 +0000
Subject: [PATCH 48/79] flutter332: init at 3.32.0-0.3.pre

---
 .../flutter/artifacts/fetch-artifacts.nix     |    4 +
 .../development/compilers/flutter/default.nix |   28 +-
 .../compilers/flutter/versions/3_32/data.json | 1040 +++++++++++++++++
 ...deregister-pub-dependencies-artifact.patch |   21 +
 .../3_32/patches/disable-auto-update.patch    |   30 +
 .../fix-ios-build-xcode-backend-sh.patch      |   69 ++
 .../gradle-flutter-tools-wrapper.patch        |   44 +
 pkgs/top-level/all-packages.nix               |    1 +
 8 files changed, 1231 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/data.json
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/deregister-pub-dependencies-artifact.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/fix-ios-build-xcode-backend-sh.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch

diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index 37d6f9509b49..2b15b448538c 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -78,6 +78,10 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
       mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
       lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
+    # Could not determine engine revision
+    + lib.optionalString (lib.versionAtLeast flutter'.version "3.32") ''
+      cp '${flutter'}/bin/internal/engine.version' "$FLUTTER_ROOT/bin/cache/engine.stamp"
+    ''
     + ''
 
       HOME="$(mktemp -d)" flutter precache ${
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index dd055799863f..ba42bc3f78ac 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -6,6 +6,7 @@
   dart,
   lib,
   stdenv,
+  runCommand,
 }:
 let
   mkCustomFlutter = args: callPackage ./flutter.nix args;
@@ -69,12 +70,27 @@ let
             };
           };
         };
-        src = fetchFromGitHub {
-          owner = "flutter";
-          repo = "flutter";
-          rev = version;
-          hash = flutterHash;
-        };
+        src =
+          let
+            source = fetchFromGitHub {
+              owner = "flutter";
+              repo = "flutter";
+              rev = version;
+              hash = flutterHash;
+            };
+          in
+          (
+            if lib.versionAtLeast version "3.32" then
+              # # Could not determine engine revision
+              (runCommand source.name { } ''
+                cp -r ${source} $out
+                chmod +w $out/bin
+                mkdir $out/bin/cache
+                cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
+              '')
+            else
+              source
+          );
       };
     in
     (mkCustomFlutter args).overrideAttrs (
diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
new file mode 100644
index 000000000000..4b043c476356
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -0,0 +1,1040 @@
+{
+  "version": "3.32.0-0.3.pre",
+  "engineVersion": "453dd7174cc6555e3e9eb5f006c86e6ec221a0d2",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
+  "channel": "beta",
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A=",
+      "x86_64-linux": "sha256-ql8yUGCPMhFI2+pfVtTZFXpb5WDKq8jAzhr0X6LXE7A="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE=",
+      "x86_64-linux": "sha256-JWv1aHPOcw2qBN0Jjn6kIMCF8hZYlh6ZbGLVa0GP5NE="
+    }
+  },
+  "dartVersion": "3.8.0-278.2.beta",
+  "dartHash": {
+    "x86_64-linux": "sha256-ux89ySr218exFOhscGhumXC1Eizdk6hvpWwxPTJDAFo=",
+    "aarch64-linux": "sha256-Ggc7HOytWwqimOKFUu4+CKtz0L4F09/fXY5BkeS/HAw=",
+    "x86_64-darwin": "sha256-etOXUGIDL4n7PmuH+g74ByXuuWjJ8JnT4iwGm4rPXYQ=",
+    "aarch64-darwin": "sha256-+7Eewv0x+V6gDqyfj5/z50whBU8NrvdidOWPPeaEAwE="
+  },
+  "flutterHash": "sha256-FqJR0PQYks2njzMgZCQSQqy2Goqp6QeN8Ej4a4EHVes=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=",
+      "aarch64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw=",
+      "x86_64-darwin": "sha256-A5AUxqKHwUYm9Mf6cqTAazCxGP+JwGpIfeMZ7vIqQUs=",
+      "x86_64-linux": "sha256-WQ7gM4i2UuaYaciT67HwYL7McBGXLYdZn748Mkghbxw="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
+      "aarch64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
+      "x86_64-darwin": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk=",
+      "x86_64-linux": "sha256-n+aperOaIbS+KxPtwBslcZT2QXTchX6TQiqM++RbCUk="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
+      "aarch64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
+      "x86_64-darwin": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY=",
+      "x86_64-linux": "sha256-MS1rqPayx4njEHm9rNjphcKwrNv1PVgL4rkgjOj42xY="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=",
+      "aarch64-linux": "sha256-Uo+NABCVVTI2aAlhoWJ4N9M+wXUtATA0bjKOhK3df84=",
+      "x86_64-darwin": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo=",
+      "x86_64-linux": "sha256-LsBWcZtzxbULYSqsUAik3DMNX8BON88udrIownJVnDo="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
+      "aarch64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
+      "x86_64-darwin": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs=",
+      "x86_64-linux": "sha256-He/H1CfAVV2+HX2z0p9aetEyJV1lCBmsDjATtdEkSMs="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-dIpU21J5zVQCQJWRINXleC7b480IHY5/8KZzBCi9TVc=",
+      "aarch64-linux": "sha256-/O/eAYa6KZwXG/w3sN2Egla+xBMqJ8hFAQktQjcVHxo=",
+      "x86_64-darwin": "sha256-9+I7GjB2ZX6gZsmxij1XB+iA0VYjoKJt4NFK22ooYes=",
+      "x86_64-linux": "sha256-ApqDXK7BVUDJY612PNn2SqX8fvHESYGv5pl0814+uzs="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
+      "aarch64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
+      "x86_64-darwin": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU=",
+      "x86_64-linux": "sha256-1VNmZdw56u0zjVl1JYom2kk6OLdxSAUEQZJKWyOieOU="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ=",
+      "x86_64-linux": "sha256-nSIm4HAFn+K7CPOVtD2DTGmWfXM1t2lD5GqXa3INTQQ="
+    }
+  },
+  "pubspecLock": {
+    "packages": {
+      "_fe_analyzer_shared": {
+        "dependency": "direct main",
+        "description": {
+          "name": "_fe_analyzer_shared",
+          "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "80.0.0"
+      },
+      "analyzer": {
+        "dependency": "direct main",
+        "description": {
+          "name": "analyzer",
+          "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.3.0"
+      },
+      "archive": {
+        "dependency": "direct main",
+        "description": {
+          "name": "archive",
+          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.6.1"
+      },
+      "args": {
+        "dependency": "direct main",
+        "description": {
+          "name": "args",
+          "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.7.0"
+      },
+      "async": {
+        "dependency": "direct main",
+        "description": {
+          "name": "async",
+          "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.13.0"
+      },
+      "boolean_selector": {
+        "dependency": "direct main",
+        "description": {
+          "name": "boolean_selector",
+          "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.2"
+      },
+      "browser_launcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "browser_launcher",
+          "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.3"
+      },
+      "built_collection": {
+        "dependency": "direct main",
+        "description": {
+          "name": "built_collection",
+          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.1.1"
+      },
+      "built_value": {
+        "dependency": "direct main",
+        "description": {
+          "name": "built_value",
+          "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "8.9.5"
+      },
+      "checked_yaml": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "checked_yaml",
+          "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.3"
+      },
+      "clock": {
+        "dependency": "direct main",
+        "description": {
+          "name": "clock",
+          "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.2"
+      },
+      "code_builder": {
+        "dependency": "direct main",
+        "description": {
+          "name": "code_builder",
+          "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.10.1"
+      },
+      "collection": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "collection",
+          "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.19.1"
+      },
+      "completion": {
+        "dependency": "direct main",
+        "description": {
+          "name": "completion",
+          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.1"
+      },
+      "convert": {
+        "dependency": "direct main",
+        "description": {
+          "name": "convert",
+          "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.2"
+      },
+      "coverage": {
+        "dependency": "direct main",
+        "description": {
+          "name": "coverage",
+          "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.11.1"
+      },
+      "crypto": {
+        "dependency": "direct main",
+        "description": {
+          "name": "crypto",
+          "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.6"
+      },
+      "csslib": {
+        "dependency": "direct main",
+        "description": {
+          "name": "csslib",
+          "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.2"
+      },
+      "dap": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dap",
+          "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.0"
+      },
+      "dds": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dds",
+          "sha256": "4e206d308bd94595af42e4a561948ef8dba211c9db47f4360c48a5a1f8b44cb5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.0"
+      },
+      "dds_service_extensions": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dds_service_extensions",
+          "sha256": "5a5f0f9af646505f5bb21159c78ae5c275cd8bdb99e1a8e27f2f395c49568743",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "devtools_shared": {
+        "dependency": "direct main",
+        "description": {
+          "name": "devtools_shared",
+          "sha256": "fa71f07006dfdf3f226ec76db95a4bad156820c081452cc99d18a4f291001bee",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "11.2.0"
+      },
+      "dtd": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dtd",
+          "sha256": "b8269bc263ef516f3fea23bb47bbbe12a808280ec57245319e538b4767ff6d18",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.5.0"
+      },
+      "dwds": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dwds",
+          "sha256": "063ca26b035fa80b7b66664d9efbc5d2acb45e139a452d59b0fe6df61a96f443",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "24.3.10"
+      },
+      "extension_discovery": {
+        "dependency": "direct main",
+        "description": {
+          "name": "extension_discovery",
+          "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.0"
+      },
+      "fake_async": {
+        "dependency": "direct main",
+        "description": {
+          "name": "fake_async",
+          "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.3.3"
+      },
+      "ffi": {
+        "dependency": "direct main",
+        "description": {
+          "name": "ffi",
+          "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.4"
+      },
+      "file": {
+        "dependency": "direct main",
+        "description": {
+          "name": "file",
+          "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.0.1"
+      },
+      "file_testing": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "file_testing",
+          "sha256": "eb0c85fd118ddc0d41c295c09f64e0924c256b071087cdc9828d5372c80d554d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.2"
+      },
+      "fixnum": {
+        "dependency": "direct main",
+        "description": {
+          "name": "fixnum",
+          "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.1"
+      },
+      "flutter_template_images": {
+        "dependency": "direct main",
+        "description": {
+          "name": "flutter_template_images",
+          "sha256": "0120589a786dbae4e86af1f61748baccd8530abd56a60e7a13479647a75222fe",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.0"
+      },
+      "frontend_server_client": {
+        "dependency": "direct main",
+        "description": {
+          "name": "frontend_server_client",
+          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.0.0"
+      },
+      "glob": {
+        "dependency": "direct main",
+        "description": {
+          "name": "glob",
+          "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.3"
+      },
+      "graphs": {
+        "dependency": "direct main",
+        "description": {
+          "name": "graphs",
+          "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.3.2"
+      },
+      "html": {
+        "dependency": "direct main",
+        "description": {
+          "name": "html",
+          "sha256": "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.15.5+1"
+      },
+      "http": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http",
+          "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.3.0"
+      },
+      "http_multi_server": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http_multi_server",
+          "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.2.2"
+      },
+      "http_parser": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http_parser",
+          "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.2"
+      },
+      "intl": {
+        "dependency": "direct main",
+        "description": {
+          "name": "intl",
+          "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.20.2"
+      },
+      "io": {
+        "dependency": "direct main",
+        "description": {
+          "name": "io",
+          "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.5"
+      },
+      "js": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "js",
+          "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.2"
+      },
+      "json_annotation": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "json_annotation",
+          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.9.0"
+      },
+      "json_rpc_2": {
+        "dependency": "direct main",
+        "description": {
+          "name": "json_rpc_2",
+          "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.3"
+      },
+      "logging": {
+        "dependency": "direct main",
+        "description": {
+          "name": "logging",
+          "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.3.0"
+      },
+      "matcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "matcher",
+          "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.12.17"
+      },
+      "meta": {
+        "dependency": "direct main",
+        "description": {
+          "name": "meta",
+          "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.16.0"
+      },
+      "mime": {
+        "dependency": "direct main",
+        "description": {
+          "name": "mime",
+          "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.0"
+      },
+      "multicast_dns": {
+        "dependency": "direct main",
+        "description": {
+          "name": "multicast_dns",
+          "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.3.3"
+      },
+      "mustache_template": {
+        "dependency": "direct main",
+        "description": {
+          "name": "mustache_template",
+          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.0"
+      },
+      "native_assets_builder": {
+        "dependency": "direct main",
+        "description": {
+          "name": "native_assets_builder",
+          "sha256": "b860044f53bafc2cf8ac374956e72007a253f84d6ca8cb912c32bce43164b254",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.13.0"
+      },
+      "native_assets_cli": {
+        "dependency": "direct main",
+        "description": {
+          "name": "native_assets_cli",
+          "sha256": "0907c5b85a21ae08dcdd0d2b75061cc614939911c2cab5ac903f35a9fbb2a50b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.13.0"
+      },
+      "native_stack_traces": {
+        "dependency": "direct main",
+        "description": {
+          "name": "native_stack_traces",
+          "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.6.0"
+      },
+      "node_preamble": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "node_preamble",
+          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.2"
+      },
+      "package_config": {
+        "dependency": "direct main",
+        "description": {
+          "name": "package_config",
+          "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.0"
+      },
+      "path": {
+        "dependency": "direct main",
+        "description": {
+          "name": "path",
+          "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.9.1"
+      },
+      "petitparser": {
+        "dependency": "direct main",
+        "description": {
+          "name": "petitparser",
+          "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "6.1.0"
+      },
+      "platform": {
+        "dependency": "direct main",
+        "description": {
+          "name": "platform",
+          "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.6"
+      },
+      "pool": {
+        "dependency": "direct main",
+        "description": {
+          "name": "pool",
+          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.5.1"
+      },
+      "process": {
+        "dependency": "direct main",
+        "description": {
+          "name": "process",
+          "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.3"
+      },
+      "pub_semver": {
+        "dependency": "direct main",
+        "description": {
+          "name": "pub_semver",
+          "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.0"
+      },
+      "pubspec_parse": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "pubspec_parse",
+          "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.5.0"
+      },
+      "shelf": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf",
+          "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.2"
+      },
+      "shelf_packages_handler": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_packages_handler",
+          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.2"
+      },
+      "shelf_proxy": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_proxy",
+          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.4"
+      },
+      "shelf_static": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_static",
+          "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.3"
+      },
+      "shelf_web_socket": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_web_socket",
+          "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "source_map_stack_trace": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_map_stack_trace",
+          "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.2"
+      },
+      "source_maps": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_maps",
+          "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.10.13"
+      },
+      "source_span": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_span",
+          "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.10.1"
+      },
+      "sprintf": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sprintf",
+          "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.0.0"
+      },
+      "sse": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sse",
+          "sha256": "4389a01d5bc7ef3e90fbc645f8e7c6d8711268adb1f511e14ae9c71de47ee32b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.7"
+      },
+      "stack_trace": {
+        "dependency": "direct main",
+        "description": {
+          "name": "stack_trace",
+          "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.12.1"
+      },
+      "standard_message_codec": {
+        "dependency": "direct main",
+        "description": {
+          "name": "standard_message_codec",
+          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.0.1+4"
+      },
+      "stream_channel": {
+        "dependency": "direct main",
+        "description": {
+          "name": "stream_channel",
+          "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.4"
+      },
+      "string_scanner": {
+        "dependency": "direct main",
+        "description": {
+          "name": "string_scanner",
+          "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.1"
+      },
+      "sync_http": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sync_http",
+          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.3.1"
+      },
+      "term_glyph": {
+        "dependency": "direct main",
+        "description": {
+          "name": "term_glyph",
+          "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.2.2"
+      },
+      "test": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "test",
+          "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.25.15"
+      },
+      "test_api": {
+        "dependency": "direct main",
+        "description": {
+          "name": "test_api",
+          "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.4"
+      },
+      "test_core": {
+        "dependency": "direct main",
+        "description": {
+          "name": "test_core",
+          "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.6.8"
+      },
+      "typed_data": {
+        "dependency": "direct main",
+        "description": {
+          "name": "typed_data",
+          "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.0"
+      },
+      "unified_analytics": {
+        "dependency": "direct main",
+        "description": {
+          "name": "unified_analytics",
+          "sha256": "d581cd7007f5a60594195ee5d35337edea7d53757e4cff5a2f5168b82ec31d05",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.0.2"
+      },
+      "usage": {
+        "dependency": "direct main",
+        "description": {
+          "name": "usage",
+          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.1"
+      },
+      "uuid": {
+        "dependency": "direct main",
+        "description": {
+          "name": "uuid",
+          "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.5.1"
+      },
+      "vm_service": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_service",
+          "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "15.0.0"
+      },
+      "vm_service_interface": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_service_interface",
+          "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "vm_snapshot_analysis": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_snapshot_analysis",
+          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.6"
+      },
+      "watcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "watcher",
+          "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.1"
+      },
+      "web": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web",
+          "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.1"
+      },
+      "web_socket": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web_socket",
+          "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.1.6"
+      },
+      "web_socket_channel": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web_socket_channel",
+          "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.2"
+      },
+      "webdriver": {
+        "dependency": "direct main",
+        "description": {
+          "name": "webdriver",
+          "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.0"
+      },
+      "webkit_inspection_protocol": {
+        "dependency": "direct main",
+        "description": {
+          "name": "webkit_inspection_protocol",
+          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.2.1"
+      },
+      "xml": {
+        "dependency": "direct main",
+        "description": {
+          "name": "xml",
+          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "6.5.0"
+      },
+      "yaml": {
+        "dependency": "direct main",
+        "description": {
+          "name": "yaml",
+          "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.3"
+      },
+      "yaml_edit": {
+        "dependency": "direct main",
+        "description": {
+          "name": "yaml_edit",
+          "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.2"
+      }
+    },
+    "sdks": {
+      "dart": ">=3.7.0 <4.0.0"
+    }
+  }
+}
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/deregister-pub-dependencies-artifact.patch
new file mode 100644
index 000000000000..c99d771299fe
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/deregister-pub-dependencies-artifact.patch
@@ -0,0 +1,21 @@
+diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
+index df67547..eacc7c4 100644
+--- a/packages/flutter_tools/lib/src/flutter_cache.dart
++++ b/packages/flutter_tools/lib/src/flutter_cache.dart
+@@ -51,16 +51,6 @@ class FlutterCache extends Cache {
+       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
+     }
+     registerArtifact(FontSubsetArtifacts(this, platform: platform));
+-    registerArtifact(
+-      PubDependencies(
+-        logger: logger,
+-        // flutter root and pub must be lazily initialized to avoid accessing
+-        // before the version is determined.
+-        flutterRoot: () => Cache.flutterRoot!,
+-        pub: () => pub,
+-        projectFactory: projectFactory,
+-      ),
+-    );
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/disable-auto-update.patch
new file mode 100644
index 000000000000..1a6871974eff
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/disable-auto-update.patch
@@ -0,0 +1,30 @@
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+index e4e474ab6e..5548599802 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
+ 
+     // Populate the cache. We call this before pub get below so that the
+     // sky_engine package is available in the flutter cache for pub to find.
+-    if (shouldUpdateCache) {
++    if (false) {
+       // First always update universal artifacts, as some of these (e.g.
+       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
+       final bool offline;
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index a1104da..1749d65 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -444,12 +444,8 @@ class FlutterCommandRunner extends CommandRunner<void> {
+           globals.analytics.suppressTelemetry();
+         }
+ 
+-        globals.flutterVersion.ensureVersionFile();
+         final bool machineFlag =
+             topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
+-        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
+-          await globals.flutterVersion.checkFlutterVersionFreshness();
+-        }
+ 
+         // See if the user specified a specific device.
+         final String? specifiedDeviceId =
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/fix-ios-build-xcode-backend-sh.patch
new file mode 100644
index 000000000000..825d40fc6176
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/fix-ios-build-xcode-backend-sh.patch
@@ -0,0 +1,69 @@
+From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
+From: Philip Hayes <philiphayes9@gmail.com>
+Date: Thu, 12 Sep 2024 13:23:00 -0700
+Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
+ `NixOS/nixpkgs` flutter
+
+This patch cleans up `xcode_backend.sh`. It now effectively just runs
+`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
+
+The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
+argv[0], even though its presence is already guaranteed (the wrapped
+`xcode_backend.dart` also relies on this env).
+
+When using nixpkgs flutter, the flutter SDK directory is composed of several
+layers, joined together using symlinks (called a `symlinkJoin`). Without this
+patch, the auto-discover traverses the symlinks into the wrong layer, and so it
+uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
+important envs/flags (like `$FLUTTER_ROOT`).
+
+Using the "unwrapped" dart then manifests in this error when compiling, since
+it doesn't see the ios build-support artifacts:
+
+```
+$ flutter run -d iphone
+Running Xcode build...
+Xcode build done.                                            6.4s
+Failed to build iOS app
+Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
+```
+---
+ packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
+index 2889d7c8e4..48b9d06c6e 100755
+--- a/packages/flutter_tools/bin/xcode_backend.sh
++++ b/packages/flutter_tools/bin/xcode_backend.sh
+@@ -6,24 +6,7 @@
+ # exit on error, or usage of unset var
+ set -euo pipefail
+ 
+-# Needed because if it is set, cd may print the path it changed to.
+-unset CDPATH
+-
+-function follow_links() (
+-  cd -P "$(dirname -- "$1")"
+-  file="$PWD/$(basename -- "$1")"
+-  while [[ -h "$file" ]]; do
+-    cd -P "$(dirname -- "$file")"
+-    file="$(readlink -- "$file")"
+-    cd -P "$(dirname -- "$file")"
+-    file="$PWD/$(basename -- "$file")"
+-  done
+-  echo "$file"
+-)
+-
+-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+-FLUTTER_ROOT="$BIN_DIR/../../.."
+-DART="$FLUTTER_ROOT/bin/dart"
+-
+-"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
++dart="${FLUTTER_ROOT}/bin/dart"
++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
++exec "${dart}" "${xcode_backend_dart}" "$@"
+-- 
+2.46.0
+
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
new file mode 100644
index 000000000000..de6080efbba8
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_32/patches/gradle-flutter-tools-wrapper.patch
@@ -0,0 +1,44 @@
+This patch introduces an intermediate Gradle build step to alter the behavior
+of flutter_tools' Gradle project, specifically moving the creation of `build`
+and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
+
+Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
+directories within the Nix Store. Resulting in read-only errors when trying to build a
+Flutter Android app at runtime.
+
+This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
+when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
+
+`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
+
+The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
+This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
+`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
+
+Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
+diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
+new file mode 100644
+index 0000000000..b2485c94b4
+--- /dev/null
++++ b/packages/flutter_tools/gradle/settings.gradle
+@@ -0,0 +1,19 @@
++rootProject.buildFileName = "/dev/null"
++
++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
++dir.mkdirs()
++def file = new File(dir, "settings.gradle")
++
++file.text = """
++rootProject.projectDir = new File("$settingsDir")
++apply from: new File("$settingsDir/settings.gradle.kts")
++
++gradle.allprojects { project ->
++  project.beforeEvaluate {
++    project.layout.buildDirectory = new File("$dir/build")
++  }
++}
++"""
++
++includeBuild(dir)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d35d3f0b7e8..206af87ab8f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5441,6 +5441,7 @@ with pkgs;
   );
   flutterPackages = flutterPackages-bin;
   flutter = flutterPackages.stable;
+  flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;
   flutter327 = flutterPackages.v3_27;
   flutter326 = flutterPackages.v3_26;

From 705c1cec9a816774e00a674ba890297b58b75f33 Mon Sep 17 00:00:00 2001
From: Viktor Sonesten <v@tmplt.dev>
Date: Thu, 10 Apr 2025 11:38:40 +0200
Subject: [PATCH 49/79] maintainers.tmplt: fix email and name

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6588d522f3b6..ee8c86765f3b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24392,10 +24392,10 @@
     name = "Travis Whitton";
   };
   tmplt = {
-    email = "tmplt@dragons.rocks";
+    email = "v@tmplt.dev";
     github = "tmplt";
     githubId = 6118602;
-    name = "Viktor";
+    name = "Viktor Sonesten";
   };
   tne = {
     email = "tne@garudalinux.org";

From 65d159f75c82f977eb405b40b3315857db5bb7db Mon Sep 17 00:00:00 2001
From: Vladimir Korolev <balodja@gmail.com>
Date: Thu, 29 Jul 2021 00:53:25 +0300
Subject: [PATCH 50/79] rpclib: init at 2.3.0

---
 pkgs/by-name/rp/rpclib/package.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/rp/rpclib/package.nix

diff --git a/pkgs/by-name/rp/rpclib/package.nix b/pkgs/by-name/rp/rpclib/package.nix
new file mode 100644
index 000000000000..d055c060cce9
--- /dev/null
+++ b/pkgs/by-name/rp/rpclib/package.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rpclib";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "rpclib";
+    repo = "rpclib";
+    rev = "v${finalAttrs.version}";
+    sha256 = "0dlbkl47zd2fkxwbn93w51wmvfr8ssp4zribn5wi4cpiky44a4g9";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "RPC library for C++, providing both a client and server implementation";
+    homepage = "https://github.com/rpclib/rpclib/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tmplt ];
+  };
+})

From f3830c02ac63d690fc9c65dc6bf0d88838fb96a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 May 2025 18:03:49 +0000
Subject: [PATCH 51/79] komodo: 1.17.1 -> 1.17.5

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

diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix
index c206ce02cc83..a280a0251edc 100644
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "komodo";
-  version = "1.17.1";
+  version = "1.17.5";
 
   src = fetchFromGitHub {
     owner = "moghtech";
     repo = "komodo";
     tag = "v${version}";
-    hash = "sha256-fYuRvaWhNjNzmMFE7Y1QB6y4rxYIbF6p5BRpu6bzrfY=";
+    hash = "sha256-vIK/4WH85qTdjXBX32F6P/XEHdsNw2Kd86btjfl13lE=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-NGAyyLAK9tI2GrV0cOmPn6CVBSOcf1JFg00eBOYdR38=";
+  cargoHash = "sha256-YCSxMcuzN1IroDfbj18yjGT0ua1xfY4l0dJ/OZhHPZw=";
 
   # disable for check. document generation is fail
   # > error: doctest failed, to rerun pass `-p komodo_client --doc`

From f27a434274687b6cb56b3418e2474f37f2be0e8d Mon Sep 17 00:00:00 2001
From: Viktor Sonesten <v@tmplt.dev>
Date: Mon, 5 May 2025 13:58:18 +0200
Subject: [PATCH 52/79] fmi-reference-fmus: init at 0.0.38

---
 .../by-name/fm/fmi-reference-fmus/package.nix | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/fm/fmi-reference-fmus/package.nix

diff --git a/pkgs/by-name/fm/fmi-reference-fmus/package.nix b/pkgs/by-name/fm/fmi-reference-fmus/package.nix
new file mode 100644
index 000000000000..e41e1223d8b9
--- /dev/null
+++ b/pkgs/by-name/fm/fmi-reference-fmus/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+
+  # Build the FMUs following the latest FMI standard
+  FMIVersion ? 3,
+}:
+
+# C.f. <https://fmi-standard.org/>
+assert lib.asserts.assertMsg (
+  FMIVersion >= 1 && FMIVersion <= 3
+) "FMIVersion must be a valid FMI specification standard: 1, 2, or 3; not ${toString FMIVersion}";
+
+# NB: this derivation does not package the fmusim executables, only
+# the FMUs.
+stdenv.mkDerivation (finalAttrs: {
+  pname = "reference-fmus";
+  version = "0.0.38";
+  src = fetchFromGitHub {
+    owner = "modelica";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-FeDKYcm9K670q1FGqy41Tp2Ag8p2JidH4z78zpHOngw=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DFMI_VERSION=${toString FMIVersion}"
+    (lib.cmakeBool "WITH_FMUSIM" false)
+  ];
+  CFLAGS = lib.optionalString (FMIVersion == 3) "-Wno-stringop-truncation";
+
+  meta = {
+    # CMakeLists.txt explicitly states support for aarch64-darwin, but
+    # the build fails in a Nix environment. C.f.
+    # <https://github.com/NixOS/nixpkgs/pull/397658#issuecomment-2851958172>.
+    broken = with stdenv.hostPlatform; isAarch64 && isDarwin;
+    description = "Functional Mock-up Units for development, testing and debugging";
+    homepage = "https://github.com/modelica/Reference-FMUs";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ tmplt ];
+    platforms = lib.platforms.all;
+  };
+})

From 5bc385e73e5a55e78577b938eaa003a0d96bb5f3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 5 May 2025 22:19:53 +0200
Subject: [PATCH 53/79] python312Packages.torch: fix tests

---
 .../python-modules/torch/tests/mk-runtime-check.nix            | 3 +--
 .../python-modules/torch/tests/mk-torch-compile-check.nix      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torch/tests/mk-runtime-check.nix b/pkgs/development/python-modules/torch/tests/mk-runtime-check.nix
index 61180a19aaba..3ead20d3eeb0 100644
--- a/pkgs/development/python-modules/torch/tests/mk-runtime-check.nix
+++ b/pkgs/development/python-modules/torch/tests/mk-runtime-check.nix
@@ -3,10 +3,9 @@
   feature,
   libraries,
   versionAttr,
-  pythonPackages,
 }:
 
-(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; })
+cudaPackages.writeGpuTestPython
   {
     inherit feature;
     inherit libraries;
diff --git a/pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix b/pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix
index 268ed5297da9..9741902dab2a 100644
--- a/pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix
+++ b/pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix
@@ -4,13 +4,12 @@
   lib,
   libraries,
   name ? if feature == null then "torch-compile-cpu" else "torch-compile-${feature}",
-  pythonPackages,
   stdenv,
 }:
 let
   deviceStr = if feature == null then "" else '', device="cuda"'';
 in
-(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; })
+cudaPackages.writeGpuTestPython
   {
     inherit name feature libraries;
     makeWrapperArgs = [

From 24cd3da526cb5c5929246a393486589159f60741 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 May 2025 20:37:43 +0000
Subject: [PATCH 54/79] databricks-cli: 0.249.0 -> 0.250.0

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

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 69813cc7e83d..03b9c1470691 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.249.0";
+  version = "0.250.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DNa/ovllWJwsja8+QXP4Z38NE2uO99kHFQsXAEbKciQ=";
+    hash = "sha256-AqXwlt7Aqi0cRoDiUfE1LFOJqtRmySuA6D4RMYOonU4=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-Nj9oQryh3tsXUoIPunl5EXKkWeT76zGTsdFaK0UuNVY=";
+  vendorHash = "sha256-tpm7eCjJuRpVnZfMZais1bHVhnQ8DxchaN1/7ljKNOo=";
 
   excludedPackages = [
     "bundle/internal"

From ba40b519928515305c12fbc7c0c0d7c50964b29a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 00:37:53 +0000
Subject: [PATCH 55/79] gancio: 1.25.1 -> 1.26.1

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

diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix
index 8ba3484d3409..ba03edd9aad3 100644
--- a/pkgs/by-name/ga/gancio/package.nix
+++ b/pkgs/by-name/ga/gancio/package.nix
@@ -19,19 +19,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gancio";
-  version = "1.25.1";
+  version = "1.26.1";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "les";
     repo = "gancio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fkX9L7SG3WNmobIxclX7LQUOxBhX70EZSgWMmK9qf5c=";
+    hash = "sha256-i69sne2kkimAuwYZb0r7LfoVOdl8v4hN0s4PzgELOrk=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-b6eEEwAVjqebBNBR9V2KCPDpoJcs2HAWQJ+eAb6zVIc=";
+    hash = "sha256-Jvp45pKeqyQN8lb8rzTryOGDTVwnETOw8OEUUnOPjEE=";
   };
 
   nativeBuildInputs = [

From 121424fc5edd8f09ecaaf776d2984c027841c87e Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Mon, 5 May 2025 20:57:31 -0400
Subject: [PATCH 56/79] mame: fix debugger

The -debug commandline option enables a general-purpose debugging UI
that is built using QT. This was broken because the QT app wrapper
was not being applied. Update the package to include wrapQtAppsHook.
---
 pkgs/applications/emulators/mame/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index 5bb99274f3fc..401e13a6b67d 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -30,6 +30,7 @@
   utf8proc,
   versionCheckHook,
   which,
+  wrapQtAppsHook,
   writeScript,
   zlib,
   darwin,
@@ -76,8 +77,6 @@ stdenv.mkDerivation rec {
     "USE_SYSTEM_LIB_ZLIB=1"
   ];
 
-  dontWrapQtApps = true;
-
   # https://docs.mamedev.org/initialsetup/compilingmame.html
   buildInputs =
     [
@@ -116,6 +115,7 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     which
+    wrapQtAppsHook
   ];
 
   patches = [

From 989a26e1f23b6b9aab9528a7b7e2fe87037f6282 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 01:40:08 +0000
Subject: [PATCH 57/79] stripe-cli: 1.26.1 -> 1.27.0

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

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 4c6ba70ed241..d319f8e903f0 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.26.1";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
     rev = "v${version}";
-    hash = "sha256-21KkeGbvI3QVT3G8Mn7y710waLhNoPtlDFz5Ji5lhhI=";
+    hash = "sha256-tV76A1qnsaj3Zp9W9aMrmvVVWjxgjUUkIwNSxdLaakk=";
   };
   vendorHash = "sha256-T8vrEbR240ihkLDG4vu0s+MxKJ5nOLm0aseDgK9EPPE=";
 

From c12a5cda3032f6cf78165fc1207c6d8d0facfe28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 01:41:18 +0000
Subject: [PATCH 58/79] mdbook: 0.4.48 -> 0.4.49

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

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 57ad9750434f..c08a936952c3 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
 }:
 let
-  version = "0.4.48";
+  version = "0.4.49";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-ZCV8BSoaYIhNZV3Spsd7rsp8D2zTZSdWMuicQrgax2I=";
+    hash = "sha256-X+ptqzAOjCX2Tt5jDfH/jdUy99WrITGfzDj+F2DoI5w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZpfzAzqVL7/GaI4C7X0UqZAPFT/Y/OCQ53wDcmgM2zI=";
+  cargoHash = "sha256-ZPJkSMcxyTOivfwThPfaO6oRkfewH048rrCDCwCtE8c=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cbd28e2530e09bff43e235a7b5dcd098d6eb5020 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 00:09:25 +0000
Subject: [PATCH 59/79] python312Packages.pep8-naming: 0.14.1 -> 0.15.0

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

diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix
index 3999c6ded295..1fe6fb584c6a 100644
--- a/pkgs/development/python-modules/pep8-naming/default.nix
+++ b/pkgs/development/python-modules/pep8-naming/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "pep8-naming";
-  version = "0.14.1";
+  version = "0.15.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
     tag = version;
-    hash = "sha256-uIVk8+5rVEIBZLz70WUi0O6/Q9ERptJ3b7314gLPeHk=";
+    hash = "sha256-LOHPLS0BtKsocghi3K24VitlRCwyHbYZB6916i7Gj9c=";
   };
 
   propagatedBuildInputs = [ flake8 ];
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Check PEP-8 naming conventions, plugin for flake8";
     homepage = "https://github.com/PyCQA/pep8-naming";
-    changelog = "https://github.com/PyCQA/pep8-naming/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/PyCQA/pep8-naming/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ eadwu ];
   };

From 9dadf4be1b0a347b8ab5193c97b143f39fc03dc5 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 6 May 2025 12:01:30 +0900
Subject: [PATCH 60/79] python3Packages.pep8-naming: build with pypa-builder

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

diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix
index 1fe6fb584c6a..17f0146c72b7 100644
--- a/pkgs/development/python-modules/pep8-naming/default.nix
+++ b/pkgs/development/python-modules/pep8-naming/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   flake8,
   python,
   pythonOlder,
@@ -10,18 +11,20 @@
 buildPythonPackage rec {
   pname = "pep8-naming";
   version = "0.15.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "PyCQA";
-    repo = pname;
+    repo = "pep8-naming";
     tag = version;
     hash = "sha256-LOHPLS0BtKsocghi3K24VitlRCwyHbYZB6916i7Gj9c=";
   };
 
-  propagatedBuildInputs = [ flake8 ];
+  build-system = [ setuptools ];
+
+  dependencies = [ flake8 ];
 
   checkPhase = ''
     runHook preCheck

From f2e528f86be125cedcccfcefc6260db52de2eae5 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 4 May 2025 14:45:33 -0700
Subject: [PATCH 61/79] ponyc: arm64 and Darwin fixes

Fix -fpic/-fPIC on arm64. Re-enable tests on Darwin with a new patch.
---
 .../po/ponyc/disable-networking-tests.patch   | 38 ++++++++++++++++---
 .../po/ponyc/disable-process-tests.patch      | 26 +++++++++++++
 pkgs/by-name/po/ponyc/package.nix             | 24 +++++++++---
 3 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/by-name/po/ponyc/disable-process-tests.patch

diff --git a/pkgs/by-name/po/ponyc/disable-networking-tests.patch b/pkgs/by-name/po/ponyc/disable-networking-tests.patch
index b3d83483a5f8..a5f35792ec5a 100644
--- a/pkgs/by-name/po/ponyc/disable-networking-tests.patch
+++ b/pkgs/by-name/po/ponyc/disable-networking-tests.patch
@@ -1,16 +1,42 @@
+From e49f97eb4b0fd27b26437638db7984fbcfd3a14f Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Sun, 4 May 2025 15:46:07 -0700
+Subject: [PATCH] net: disable tests in the Nix sandbox
+
+---
+ packages/net/_test.pony | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
 diff --git a/packages/net/_test.pony b/packages/net/_test.pony
-index 9044dfb1..f0ea10f7 100644
+index 05462eb2..c0c6cdfa 100644
 --- a/packages/net/_test.pony
 +++ b/packages/net/_test.pony
-@@ -26,11 +26,6 @@ actor \nodoc\ Main is TestList
-       test(_TestTCPThrottle)
-     end
+@@ -15,25 +15,8 @@ actor \nodoc\ Main is TestList
+   new make() => None
  
+   fun tag tests(test: PonyTest) =>
+-    // Tests below function across all systems and are listed alphabetically
++    // (@numinit): only this test works in the Nix sandbox:
+     test(_TestTCPConnectionFailed)
+-    test(_TestTCPExpect)
+-    test(_TestTCPExpectOverBufferSize)
+-    test(_TestTCPMute)
+-    test(_TestTCPProxy)
+-    test(_TestTCPUnmute)
+-    test(_TestTCPWritev)
+-
+-    // Tests below exclude windows and are listed alphabetically
+-    ifdef not windows then
+-      test(_TestTCPConnectionToClosedServerFailed)
+-      test(_TestTCPThrottle)
+-    end
+-
 -    // Tests below exclude osx and are listed alphabetically
 -    ifdef not osx then
 -      test(_TestBroadcast)
 -    end
--
+ 
  class \nodoc\ _TestPing is UDPNotify
    let _h: TestHelper
-   let _ip: NetAddress
+-- 
+2.47.0
diff --git a/pkgs/by-name/po/ponyc/disable-process-tests.patch b/pkgs/by-name/po/ponyc/disable-process-tests.patch
new file mode 100644
index 000000000000..e4ee0656655b
--- /dev/null
+++ b/pkgs/by-name/po/ponyc/disable-process-tests.patch
@@ -0,0 +1,26 @@
+From 77d703b11d298f6be88b04f7e8ca85de139e82be Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Mon, 5 May 2025 20:34:02 -0700
+Subject: [PATCH] process: disable KillLongRunningChild test
+
+---
+ packages/process/_test.pony | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/packages/process/_test.pony b/packages/process/_test.pony
+index fe9fdb04..756588f9 100644
+--- a/packages/process/_test.pony
++++ b/packages/process/_test.pony
+@@ -18,7 +18,8 @@ actor \nodoc\ Main is TestList
+     test(_TestChdir)
+     test(_TestExpect)
+     test(_TestFileExecCapabilityIsRequired)
+-    test(_TestKillLongRunningChild)
++    // (@booxter/@numinit) Appears to be flaky.
++    // test(_TestKillLongRunningChild)
+     test(_TestLongRunningChild)
+     test(_TestNonExecutablePathResultsInExecveError)
+     test(_TestPrintvOrdering)
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 77979b862a05..2fcb07cb780b 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -19,6 +19,7 @@
   which,
   z3,
   cctools,
+  procps,
 }:
 
 stdenv.mkDerivation (rec {
@@ -73,6 +74,7 @@ stdenv.mkDerivation (rec {
     [
       # Sandbox disallows network access, so disabling problematic networking tests
       ./disable-networking-tests.patch
+      ./disable-process-tests.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       (replaceVars ./fix-darwin-build.patch {
@@ -102,10 +104,19 @@ stdenv.mkDerivation (rec {
         --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
-  preBuild = ''
-    make libs build_flags=-j$NIX_BUILD_CORES
-    make configure build_flags=-j$NIX_BUILD_CORES
-  '';
+  preBuild =
+    ''
+      extraFlags=(build_flags=-j$NIX_BUILD_CORES)
+    ''
+    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      # See this relnote about building on Raspbian:
+      # https://github.com/ponylang/ponyc/blob/0.46.0/.release-notes/0.45.2.md
+      extraFlags+=(pic_flag=-fPIC)
+    ''
+    + ''
+      make libs "''${extraFlags[@]}"
+      make configure "''${extraFlags[@]}"
+    '';
 
   makeFlags = [
     "PONYC_VERSION=${version}"
@@ -117,8 +128,9 @@ stdenv.mkDerivation (rec {
     "-Wno-error=implicit-fallthrough"
   ];
 
-  # make: *** [Makefile:222: test-full-programs-release] Killed: 9
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  doCheck = true;
+
+  nativeCheckInputs = [ procps ];
 
   installPhase =
     ''

From f1909d639c422f04451b13dd9af842bfcdc4a77a Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 6 May 2025 15:17:39 +1000
Subject: [PATCH 62/79] libsForQt5.libopenshot-audio: 0.3.3 -> 0.4.0

release: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.4.0
---
 .../0001-undef-fpret-on-aarch64-darwin.patch        | 13 -------------
 .../libraries/libopenshot-audio/default.nix         |  9 ++-------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch

diff --git a/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch b/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch
deleted file mode 100644
index c391f77dda8b..000000000000
--- a/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h
-index 2593790..0b5983d 100644
---- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h
-+++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h
-@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param
- typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...);
- static inline MsgSendSuperFn getMsgSendSuperFn() noexcept   { return (MsgSendSuperFn) (void*) objc_msgSendSuper; }
- 
--#if ! JUCE_IOS
-+#if JUCE_INTEL && ! JUCE_IOS
- typedef double (*MsgSendFPRetFn) (id, SEL op, ...);
- static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept   { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; }
- #endif
diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix
index 8e861f455809..bbd92ab9e625 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/development/libraries/libopenshot-audio/default.nix
@@ -17,20 +17,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot-audio";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA=";
+    hash = "sha256-FTSITx6GoH1cGWeWNWtz1Ih+zozK8aA+u54Y4s0DylQ=";
   };
 
-  patches = [
-    # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24
-    ./0001-undef-fpret-on-aarch64-darwin.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     doxygen

From 937de3982775f0432ffc4405d14e2f3e057ed328 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 6 May 2025 15:18:26 +1000
Subject: [PATCH 63/79] libsForQt5.libopenshot: 0.3.3 -> 0.4.0

release: https://github.com/OpenShot/libopenshot/releases/tag/v0.4.0
---
 pkgs/development/libraries/libopenshot/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix
index 478e5e50ade8..2d8798acff10 100644
--- a/pkgs/development/libraries/libopenshot/default.nix
+++ b/pkgs/development/libraries/libopenshot/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k=";
+    hash = "sha256-zroTnJRYIIglhha6jQvaVNTgnIV6kUWcu7s5zEvgH6Q=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -69,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_RUBY" false)
+    (lib.cmakeBool "ENABLE_PYTHON" true)
+    (lib.cmakeOptionType "filepath" "PYTHON_EXECUTABLE" (lib.getExe python3))
     (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages)
   ];
 

From 8bdf8af6c54ed892d109298652a82b0b27c32f98 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 6 May 2025 15:20:04 +1000
Subject: [PATCH 64/79] libsForQt5.libopenshot: unpin python

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

diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 2fab1e0d8527..1555a92859f7 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -190,9 +190,7 @@ makeScopeWithSplicing' {
 
         liblastfm = callPackage ../development/libraries/liblastfm { };
 
-        libopenshot = callPackage ../development/libraries/libopenshot {
-          python3 = pkgs.python311;
-        };
+        libopenshot = callPackage ../development/libraries/libopenshot { };
 
         packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
 

From f83cccf6ff64bba2b45d9f9e19ab950aec2b82f5 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 6 May 2025 15:20:31 +1000
Subject: [PATCH 65/79] openshot-qt: unpin python

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6215f373cde0..0258778397e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5779,9 +5779,7 @@ with pkgs;
       graalvmDrv = graalvmPackages.graalvm-ce;
     }).override;
 
-  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt {
-    python3 = python311;
-  };
+  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
 
   inherit (callPackage ../development/compilers/julia { })
     julia_19-bin

From 206a32a8b9129c81d89b557dcf591e94fa550ba8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 5 May 2025 18:19:17 +0200
Subject: [PATCH 66/79] hercules-ci-*.nix: 2.24 -> 2.28

This is a "megarepo" update where dependents rely on the exact
version of their dependency internally, hence the single commit.
(The bindings had an interface change)

The commonality of these updates is support for the new Nix version,
hence the title, but this also fixes a linking issue involving the
nixVersion symbol.

    dlopen(/nix/store/448nl79c6bci4pqxhq22g2gb3d8qwljw-nix-2.24.14/lib/libnixmain.dylib, 0x0005): symbol not found in flat namespace '__ZN3nix10nixVersionE'
---
 pkgs/development/haskell-modules/configuration-nix.nix        | 2 +-
 .../replacements-by-name/hercules-ci-agent.nix                | 4 ++--
 .../replacements-by-name/hercules-ci-cnix-expr.nix            | 4 ++--
 .../replacements-by-name/hercules-ci-cnix-store.nix           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ab3a42259dc0..72cb136791f3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1317,7 +1317,7 @@ builtins.intersectAttrs super {
     overrideCabal
       (old: {
         passthru = old.passthru or { } // {
-          nixPackage = pkgs.nixVersions.nix_2_24;
+          nixPackage = pkgs.nixVersions.nix_2_28;
         };
       })
       (
diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
index cd605465d060..17bd33cc1358 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
@@ -80,8 +80,8 @@
 }:
 mkDerivation {
   pname = "hercules-ci-agent";
-  version = "0.10.5";
-  sha256 = "ab1c2370dbfdca7d7b67cb1985648edabf40d99f01b88a98d6961a2706c0e591";
+  version = "0.10.6";
+  sha256 = "5551c8eda390b48da6801f8f8580dc770e6e2fa2adf467ea7afd174748816fd6";
   isLibrary = true;
   isExecutable = true;
   setupHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
index 902521b22a60..5a652312b469 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
@@ -30,8 +30,8 @@
 }:
 mkDerivation {
   pname = "hercules-ci-cnix-expr";
-  version = "0.3.6.5";
-  sha256 = "0adbd451815bb6ea7388c0477fe6e114e0ba019819027709855e7834aedcb6df";
+  version = "0.4.0.0";
+  sha256 = "ba6dadda0a14e456780df018a610209ef288ed6562ad5843cb8d19d38fc026ed";
   setupHaskellDepends = [
     base
     Cabal
diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
index 3ded910b3eda..fc535cd23911 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
@@ -24,8 +24,8 @@
 }:
 mkDerivation {
   pname = "hercules-ci-cnix-store";
-  version = "0.3.6.1";
-  sha256 = "35e3d21f9bbc1c83187af22a2532d227fc42a5cf3cf683a86be7bb7180f10d5e";
+  version = "0.3.7.0";
+  sha256 = "6feba2a6e1a267bc69b67962ed6eaa3510b1ae31c411fdb4e6670763d175d3b1";
   setupHaskellDepends = [
     base
     Cabal

From 01fb9591f9ab950bf9231be550e1f4b2b75e5754 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 6 May 2025 10:44:09 +0300
Subject: [PATCH 67/79] lpcnet: Fix tests on aarch64-linux

---
 pkgs/by-name/lp/lpcnet/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/lp/lpcnet/package.nix b/pkgs/by-name/lp/lpcnet/package.nix
index 3737bec91de2..75865e7abb69 100644
--- a/pkgs/by-name/lp/lpcnet/package.nix
+++ b/pkgs/by-name/lp/lpcnet/package.nix
@@ -5,6 +5,7 @@
   fetchurl,
   cmake,
   codec2,
+  sox,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -47,6 +48,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
+  nativeCheckInputs = [
+    # NOTE: From some reason, the tests pass without this on x86_64-linux, but
+    # not on aarch64-linux, although the relevant test is not enabled
+    # conditionally, see:
+    # https://github.com/drowe67/LPCNet/blob/c8e51ac5e2fe674849cb53e7da44689b572cc246/CMakeLists.txt#L220-L225
+    sox
+  ];
 
   meta = {
     description = "Experimental Neural Net speech coding for FreeDV";

From a190ba0c1eacb63c55dfd963873dd68525a0a05d Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 6 May 2025 09:46:45 +0200
Subject: [PATCH 68/79] vimPlugins.nvim-dbee: fix update script

https://nixpkgs-update-logs.nix-community.org/vimPlugins.nvim-dbee/2025-05-05.log
---
 .../editors/vim/plugins/non-generated/nvim-dbee/default.nix  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix
index f9a58eddbf33..90f8aabb2a82 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-dbee/default.nix
@@ -21,7 +21,8 @@ let
     pname = "dbee-bin";
     inherit version;
 
-    src = "${src}/dbee";
+    inherit src;
+    sourceRoot = "${src.name}/dbee";
 
     vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A=";
     buildInputs = [
@@ -51,7 +52,7 @@ vimUtils.buildVimPlugin {
 
   passthru = {
     updateScript = nix-update-script {
-      attrPath = "vimPlugins.nvim-dbee.dbee-lib";
+      attrPath = "vimPlugins.nvim-dbee.dbee-bin";
     };
 
     # needed for the update script

From 795f25b7735363c0e84695ee9989cef4ae6b6ec6 Mon Sep 17 00:00:00 2001
From: Viktor Sonesten <v@tmplt.dev>
Date: Wed, 23 Apr 2025 12:00:39 +0200
Subject: [PATCH 69/79] python312Packages.fmpy: init at 0.3.23

Release notes via
https://github.com/CATIA-Systems/FMPy/releases/tag/v0.3.23

Co-authored-by: Vladimir Korolev <balodja@gmail.com>
Co-authored-by: Doron Behar <doron.behar@gmail.com>
---
 .../0001-gui-override-Qt6-libexec-path.patch  |  10 +
 ...undials-override-shared-object-paths.patch |  10 +
 ...nt-create-lockfile-with-explicit-r-w.patch |  44 ++++
 .../python-modules/fmpy/default.nix           | 232 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 5 files changed, 298 insertions(+)
 create mode 100644 pkgs/development/python-modules/fmpy/0001-gui-override-Qt6-libexec-path.patch
 create mode 100644 pkgs/development/python-modules/fmpy/0002-sundials-override-shared-object-paths.patch
 create mode 100644 pkgs/development/python-modules/fmpy/0003-remoting-client-create-lockfile-with-explicit-r-w.patch
 create mode 100644 pkgs/development/python-modules/fmpy/default.nix

diff --git a/pkgs/development/python-modules/fmpy/0001-gui-override-Qt6-libexec-path.patch b/pkgs/development/python-modules/fmpy/0001-gui-override-Qt6-libexec-path.patch
new file mode 100644
index 000000000000..80c4933df6ad
--- /dev/null
+++ b/pkgs/development/python-modules/fmpy/0001-gui-override-Qt6-libexec-path.patch
@@ -0,0 +1,10 @@
+--- a/src/fmpy/gui/__init__.py
++++ b/src/fmpy/gui/__init__.py
+@@ -15,6 +15,7 @@ def compile_resources():
+
+     if os.name == 'posix':
+         pyside_dir = pyside_dir / 'Qt' / 'libexec'
++    pyside_dir = Path("@qt6libexec@")
+
+     gui_dir = Path(__file__).parent
+     forms_dir = gui_dir / 'forms'
diff --git a/pkgs/development/python-modules/fmpy/0002-sundials-override-shared-object-paths.patch b/pkgs/development/python-modules/fmpy/0002-sundials-override-shared-object-paths.patch
new file mode 100644
index 000000000000..c4364763d09c
--- /dev/null
+++ b/pkgs/development/python-modules/fmpy/0002-sundials-override-shared-object-paths.patch
@@ -0,0 +1,10 @@
+--- a/src/fmpy/sundials/libraries.py
++++ b/src/fmpy/sundials/libraries.py
+@@ -9,6 +9,7 @@ if platform_tuple == 'aarch64_darwin':
+     library_dir = library_dir / 'x86_64-darwin'
+ else:
+     library_dir = library_dir / platform_tuple
++library_dir = Path("@cvode@") / 'lib'
+
+ # load SUNDIALS shared libraries
+ sundials_nvecserial     = cdll.LoadLibrary(str(library_dir / f'sundials_nvecserial{sharedLibraryExtension}'))
diff --git a/pkgs/development/python-modules/fmpy/0003-remoting-client-create-lockfile-with-explicit-r-w.patch b/pkgs/development/python-modules/fmpy/0003-remoting-client-create-lockfile-with-explicit-r-w.patch
new file mode 100644
index 000000000000..35c96a25a72d
--- /dev/null
+++ b/pkgs/development/python-modules/fmpy/0003-remoting-client-create-lockfile-with-explicit-r-w.patch
@@ -0,0 +1,44 @@
+From bf0f536776d2554a99af3fbcc08fa4c43bba1c7e Mon Sep 17 00:00:00 2001
+From: Viktor Sonesten <v@tmplt.dev>
+Date: Mon, 5 May 2025 17:40:10 +0200
+Subject: [PATCH] remoting/client: create lockfile with explicit r+w
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the compilation error below, which is triggered in hardened
+build environments (e.g. NixOS):
+
+       > In file included from /nix/store/aaaaaaaa-glibc-2.40-66-dev/include/fcntl.h:341,
+       >                  from /build/source/native/remoting/client_tcp.cpp:12:
+       > In function ‘int open(const char*, int, ...)’,
+       >     inlined from ‘void* fmi2Instantiate(fmi2String, fmi2Type, fmi2String, fmi2String, const fmi2CallbackFunctions*, fmi2Boolean, fmi2Boolean)’ at /build/source/native/remoting/client_tcp.cpp:217:28:
+       > /nix/store/aaaaaaaa-glibc-2.40-66-dev/include/bits/fcntl2.h:52:31: error: call to ‘__open_missing_mode’ declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
+       >    52 |           __open_missing_mode ();
+       >       |           ~~~~~~~~~~~~~~~~~~~~^~
+
+In short: O_CREAT without explicit mode params may generate a file
+with suid/sgid. Error triggered by _FORTIFY_SOURCE. This commit
+explicitly creates the file with read/write permissions for the file
+owner.
+
+Adopted from https://github.com/facebook/hhvm/issues/168
+---
+ native/remoting/client_tcp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/native/remoting/client_tcp.cpp b/native/remoting/client_tcp.cpp
+index 708c895..7acbc80 100644
+--- a/native/remoting/client_tcp.cpp
++++ b/native/remoting/client_tcp.cpp
+@@ -214,7 +214,7 @@ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2Str
+         // create lock file
+         const char *lockFilePath = tempnam(NULL, "");
+
+-        int lockFile = open(lockFilePath, O_CREAT | O_EXCL);
++        int lockFile = open(lockFilePath, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+
+         if (lockFile == -1) {
+             s_logger(s_componentEnvironment, instanceName, fmi2Error, "error", "Failed to create lock file %s.", lockFilePath);
+--
+2.47.1
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
new file mode 100644
index 000000000000..fd66b5f34bd2
--- /dev/null
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -0,0 +1,232 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  cmake,
+  sundials,
+  lapack,
+  attrs,
+  lark,
+  lxml,
+  rpclib,
+  msgpack,
+  numpy,
+  scipy,
+  pytz,
+  dask,
+  requests,
+  matplotlib,
+  pyqtgraph,
+  notebook,
+  plotly,
+  hatchling,
+  pyside6,
+  jinja2,
+  flask,
+  dash,
+  dash-bootstrap-components,
+  qt6,
+  fmpy,
+  runCommand,
+  enableRemoting ? true,
+  versionCheckHook,
+  fmi-reference-fmus,
+  replaceVars,
+}:
+buildPythonPackage rec {
+  pname = "fmpy";
+  version = "0.3.23";
+  disabled = pythonOlder "3.10";
+  pyproject = true;
+
+  # Bumping version? Make sure to look through the commit history for
+  # bumped native/build_cvode.py pins (see above).
+  src = fetchFromGitHub {
+    owner = "CATIA-Systems";
+    repo = "FMPy";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-4jBYOymurGCbjT0WQjIRNsztwOXBYVTGLdc4kNSTOZw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    pyqtgraph
+    pyside6
+    attrs
+    lark
+    lxml
+    msgpack
+    numpy
+    scipy
+    pytz
+    dask
+    requests
+    matplotlib
+    pyqtgraph
+    notebook
+    plotly
+    rpclib
+    fmpy.passthru.cvode
+    pyside6
+    jinja2
+    flask
+    dash
+    dash-bootstrap-components
+  ];
+
+  dontUseCmakeConfigure = true;
+  dontUseCmakeBuildDir = true;
+
+  patches = [
+    (replaceVars ./0001-gui-override-Qt6-libexec-path.patch {
+      qt6libexec = "${qt6.qtbase}/libexec/";
+    })
+    (replaceVars ./0002-sundials-override-shared-object-paths.patch {
+      inherit (fmpy.passthru) cvode;
+    })
+    # Upstream does not accept pull requests for unknown legal
+    # reasons, see:
+    # <https://github.com/CATIA-Systems/FMPy/blob/v0.3.23/docs/contributing.md?plain=1#L60-L63>.
+    # Thus a fix is vendored here until patched by maintainer. C.f.
+    # <https://github.com/CATIA-Systems/FMPy/pull/762>
+    ./0003-remoting-client-create-lockfile-with-explicit-r-w.patch
+  ];
+
+  # Make forced includes of other systems' artifacts optional in order
+  # to pass build (otherwise vendored upstream from CI)
+  postPatch = ''
+    sed --in-place 's/force-include/source/g' pyproject.toml
+  '';
+
+  # Don't run upstream build scripts as they are too specialized.
+  # cvode is already built, so we only need to build native binaries.
+  # We run these cmake builds and then run the standard
+  # buildPythonPackage phases.
+  preBuild =
+    ''
+      cmakeFlags="-S native/src -B native/src/build -D CVODE_INSTALL_DIR=${passthru.cvode}"
+      cmakeConfigurePhase
+      cmake --build native/src/build --config Release
+    ''
+    + lib.optionalString (enableRemoting && stdenv.isLinux) ''
+      # reimplementation of native/build_remoting.py
+      cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
+      cmakeConfigurePhase
+      cmake --build remoting/linux64 --config Release
+    ''
+    # C.f. upstream build-wheel CI job
+    + ''
+      python native/copy_sources.py
+
+      # reimplementation of native/compile_resources.py
+      pushd src/
+      python -c "from fmpy.gui import compile_resources; compile_resources()"
+      popd
+    '';
+
+  pythonImportsCheck = [
+    "fmpy"
+    "fmpy.cross_check"
+    "fmpy.cswrapper"
+    "fmpy.examples"
+    "fmpy.fmucontainer"
+    "fmpy.logging"
+    "fmpy.gui"
+    "fmpy.gui.generated"
+    "fmpy.ssp"
+    "fmpy.sundials"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru = {
+    # From sundials, build only the CVODE solver. C.f.
+    # src/native/build_cvode.py
+    cvode =
+      (sundials.overrideAttrs (prev: {
+        # hash copied from native/build_cvode.py
+        version = "5.3.0";
+        src = fetchurl {
+          url = "https://github.com/LLNL/sundials/releases/download/v5.3.0/sundials-5.3.0.tar.gz";
+          sha256 = "88dff7e11a366853d8afd5de05bf197a8129a804d9d4461fb64297f1ef89bca7";
+        };
+
+        cmakeFlags =
+          prev.cmakeFlags
+          ++ lib.mapAttrsToList (option: enable: lib.cmakeBool option enable) {
+            # only build the CVODE solver
+            BUILD_CVODE = true;
+
+            BUILD_CVODES = false;
+            BUILD_ARKODE = false;
+            BUILD_IDA = false;
+            BUILD_IDAS = false;
+            BUILD_KINSOL = false;
+          };
+
+        # FMPy searches for sundials without the "lib"-prefix; strip it
+        # and symlink the so-files into existance.
+        postFixup = ''
+          pushd $out/lib
+          for so in *.so; do
+            ln --verbose --symbolic $so ''${so#lib}
+          done
+          popd
+        '';
+      })).override
+        {
+          lapackSupport = false;
+          lapack.isILP64 = stdenv.hostPlatform.is64bit;
+          blas = lapack;
+          kluSupport = false;
+        };
+
+    # Simulate reference FMUs from
+    # <https://github.com/modelica/Reference-FMUs>.
+    #
+    # Just check that the execution passes; don't verify any numerical
+    # results, but save them in case of future or manual check use.
+    tests.simulate-reference-fmus = runCommand "${pname}-simulate-reference-fmus" { } ''
+      mkdir $out
+      # NB(find ! -name): Clocks.fmu is marked TODO upstream and is of a
+      # FMI type that FMPy doesn't support currently (ModelExchange)
+      for fmu in $(find ${fmi-reference-fmus}/*.fmu ! -name "Clocks.fmu"); do
+        name=$(basename $fmu)
+        echo "--- START $name ---"
+        ${fmpy}/bin/fmpy simulate $fmu \
+          --fmi-logging \
+          --output-file $out/$name.csv \
+          | tee $out/$name.out
+      done
+    '';
+  };
+
+  meta = {
+    # A logging.dylib is built but is not packaged correctly so as to
+    # be found. C.f.
+    # <https://logs.ofborg.org/?key=nixos/nixpkgs.397658&attempt_id=9d7cb742-db51-4d9e-99ca-49425d87d14d>
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Simulate Functional Mockup Units (FMUs) in Python";
+    homepage = "https://github.com/CATIA-Systems/FMPy";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ tmplt ];
+    # Supported platforms are not exhaustively and explicitly stated,
+    # but inferred from the artifacts that are vendored in upstream CI
+    # builds. C.f.
+    # <https://github.com/CATIA-Systems/FMPy/blob/v0.3.23/pyproject.toml?plain=1#L71-L112>
+    platforms = lib.platforms.x86_64 ++ [ "i686-windows" ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9bd03dc24f39..b4aa2321c157 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5124,6 +5124,8 @@ self: super: with self; {
 
   flynt = callPackage ../development/python-modules/flynt { };
 
+  fmpy = callPackage ../development/python-modules/fmpy { };
+
   fnllm = callPackage ../development/python-modules/fnllm { };
 
   fnv-hash-fast = callPackage ../development/python-modules/fnv-hash-fast { };

From da8114d3382082e933b819d2a389641a548859d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 08:16:09 +0000
Subject: [PATCH 70/79] oils-for-unix: 0.28.0 -> 0.29.0

---
 pkgs/by-name/oi/oils-for-unix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix
index f24534264f92..21409f1658e8 100644
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "oils-for-unix";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchurl {
     url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz";
-    hash = "sha256-Jm0UsW2Q1KB/53SIHq+g7Nu8hBHPHHX4tuJWNwtmjjU=";
+    hash = "sha256-NP21Px29K4dC73TNOkbYer/NoY0NZF8pdixP3bmis6w=";
   };
 
   postPatch = ''

From 0ec3b2c9524c3fa599e3b1e2553e363e6db90bf1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 09:52:26 +0200
Subject: [PATCH 71/79] amazon-q-cli: 1.8.0 -> 1.9.1

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index fb941a20c72e..6ca3ba1d0494 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amazon-q-cli";
-  version = "1.8.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
     tag = "v${version}";
-    hash = "sha256-fOz9oz+xNwX2Bzl6szgQ9oai6lqP+EzbaCNzHPUT2cA=";
+    hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8=";
+  cargoHash = "sha256-7zUgWLGTZx3Ex7RYxb3eZimWdy6AxkNwpCDUwiAr2JE=";
 
   cargoBuildFlags = [
     "-p"
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    mv $out/bin/q_cli $out/bin/amazon-q
+    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
   '';
 
   meta = {
@@ -67,6 +67,7 @@ rustPlatform.buildRustPackage rec {
       mit
       asl20
     ];
+    mainProgram = "amazon-q";
     maintainers = [ lib.maintainers.jamesward ];
     platforms = lib.platforms.linux;
   };

From 33bac1c2ccca63b568b307d968a87b4b5b2e4435 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 10:20:41 +0200
Subject: [PATCH 72/79] amazon-q-cli: use `finalAttrs` pattern

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 6ca3ba1d0494..404cad014e9b 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -5,14 +5,14 @@
   protobuf_26,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
   version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA=";
   };
 
@@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.jamesward ];
     platforms = lib.platforms.linux;
   };
-}
+})

From a6390c8ad7bb95fe0e5d84724d91cb7d857dc295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 09:00:35 +0000
Subject: [PATCH 73/79] werf: 2.35.4 -> 2.35.8

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index b3c8ae469dc7..cc144e717e26 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.35.4";
+  version = "2.35.8";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bp0KtTsKSBfCLwKfHseLKnGh9ub09+FC841y0I+KNtw=";
+    hash = "sha256-akrhVRjoWrBdSrYWe4MZnCAMdT2KfXxAI4oBvrHBwC8=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-vWjFdwcVbw8lxJl2mR54O8DpiwbGzyCy50Heu7NFLA8=";
+  vendorHash = "sha256-9caBSJ/eMEdVQ55eebjibtsZJOMZk4OcP1D/NckWxCQ=";
 
   subPackages = [ "cmd/werf" ];
 

From 1032a46ffe4ba4f56919a9643443a9a6791811ed Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 7 Jan 2019 01:32:53 +0000
Subject: [PATCH 74/79] grml-zsh-config: remove unecessary dependencies

The buildInputs that used to be here appear to have been put here in the
hope that they would be installed and made available automatically as a
result of installing this package, but that isn't how buildInputs work.

They could be provided by using substituteInPlace to point the package
towards the Nix versions of these packages, but since this is a shell
configuration, I think it makes more sense (and is easier) to use
whatever versions of those commands are available at runtime.
---
 pkgs/by-name/gr/grml-zsh-config/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index b3ba15f3e364..25164b54e280 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -2,10 +2,6 @@
   stdenv,
   fetchFromGitHub,
   lib,
-  zsh,
-  coreutils,
-  inetutils,
-  procps,
   txt2tags,
 }:
 stdenv.mkDerivation rec {
@@ -21,11 +17,6 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   nativeBuildInputs = [ txt2tags ];
-  buildInputs = [
-    zsh
-    coreutils
-    procps
-  ] ++ lib.optional stdenv.hostPlatform.isLinux inetutils;
 
   buildPhase = ''
     cd doc

From 800f89ce4fd86c8fe10feb5e124fa65326f3c39d Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 11:15:26 +0200
Subject: [PATCH 75/79] mcphost: init at 0.7.1

---
 pkgs/by-name/mc/mcphost/package.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcphost/package.nix

diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
new file mode 100644
index 000000000000..485d91a0da40
--- /dev/null
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "mcphost";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "mark3labs";
+    repo = "mcphost";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4vKzrT/1pEupiW3IaQV6d4Y2QHKNBH8sCA4TP8qn+50=";
+  };
+
+  vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw=";
+
+  meta = {
+    description = "A CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP";
+    homepage = "https://github.com/mark3labs/mcphost";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "mcphost";
+  };
+})

From 57c566abdc68181e66998dc667f1d10f861bddac Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 10:43:49 +0200
Subject: [PATCH 76/79] amazon-q-cli: add `versionCheckHook`

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 404cad014e9b..32bd757e68a3 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   rustPlatform,
   protobuf_26,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -24,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "-p"
     "q_cli"
   ];
+
+  nativeBuildInputs = [
+    protobuf_26
+  ];
+
+  postInstall = ''
+    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
+  '';
+
   cargoTestFlags = [
     "-p"
     "q_cli"
@@ -52,13 +62,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=init_lint_zsh_pre_zshrc"
   ];
 
-  nativeBuildInputs = [
-    protobuf_26
-  ];
-
-  postInstall = ''
-    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
-  '';
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/amazon-q";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Amazon Q Developer AI coding agent CLI";

From 722064067cd18ca93493eee802dd3e689f994d77 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 30 Apr 2025 16:50:45 +0200
Subject: [PATCH 77/79] snipe-it: 8.1.0 -> 8.1.2

Release notes:
  - https://github.com/grokability/snipe-it/releases/tag/v8.1.1
  - https://github.com/grokability/snipe-it/releases/tag/v8.1.2
Changelog: https://github.com/grokability/snipe-it/compare/v8.1.0...v8.1.2

Mostly contains UI fixes and improvements
---
 pkgs/by-name/sn/snipe-it/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index 23b5928f1888..79b4a7d62a56 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -9,16 +9,16 @@
 
 php84.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.1.0";
+  version = "8.1.2";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/yIuoyHkONv94J+MOeahVDXhHbwW1scfwNqcO3NaDwA=";
+    hash = "sha256-tF7lTkmowJAEz2BGNWK2yHkPYafS9Rs5Z98snsbCNQU=";
   };
 
-  vendorHash = "sha256-+TGloF4V/r9lgO5itk2MnQNj3Fsgq8cwUB5zbA1ZQWM=";
+  vendorHash = "sha256-wVRmvxcrsu5ZBPYrIx9p4+ddWTgBBaeLvyqFMPj3iIg=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"

From 96e6ba6d8f1a7036e741d4e56b89b0f72a12ac7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 May 2025 10:25:27 +0000
Subject: [PATCH 78/79] python3Packages.oelint-data: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index eda30fc39c76..c143499144bb 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.0.10";
+  version = "1.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-lBy/aGxcmJ3v5f+0YAJtuk0IK4WpL5iFrgKjyoLswro=";
+    hash = "sha256-i3HxvEaWfrRwOSXZiqukyiUl24pYQnH0JO+Are3AWrc=";
   };
 
   build-system = [

From 04b88953a025f339b458745bc506258fab960000 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 12 Apr 2025 23:38:34 +0200
Subject: [PATCH 79/79] python313Packages.wandb: 0.19.8 -> 0.19.10

https://github.com/wandb/wandb/releases/tag/v0.19.10
---
 .../python-modules/wandb/default.nix          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 524f49e5a7ef..9f6fce682714 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -71,17 +71,18 @@
   soundfile,
   tenacity,
   torch,
+  torchvision,
   tqdm,
   writableTmpDirAsHomeHook,
 }:
 
 let
-  version = "0.19.8";
+  version = "0.19.10";
   src = fetchFromGitHub {
     owner = "wandb";
     repo = "wandb";
     tag = "v${version}";
-    hash = "sha256-hveMyGeu9RhdtWMbV/4GQ4KUNfjSt0CKyW7Yx8QtlLM=";
+    hash = "sha256-SptjImAK0hDAr7UZjUMWnAVB1bxyzoATlyrPek5Tm48=";
   };
 
   gpu-stats = rustPlatform.buildRustPackage {
@@ -92,7 +93,7 @@ let
     sourceRoot = "${src.name}/gpu_stats";
 
     useFetchCargoVendor = true;
-    cargoHash = "sha256-KrwZh8OoVwImfYDmvT2Je2MYyiTZVQYngwvVC+7fTzI=";
+    cargoHash = "sha256-kkWvTLduxFVIEvi4e65QQ7S0kHTRJ8XW028o430L91s=";
 
     checkFlags = [
       # fails in sandbox
@@ -119,9 +120,9 @@ let
 
     # hardcode the `gpu_stats` binary path.
     postPatch = ''
-      substituteInPlace pkg/monitor/gpu.go \
+      substituteInPlace pkg/monitor/gpuresourcemanager.go \
         --replace-fail \
-          'cmdPath, err := getGPUStatsCmdPath()' \
+          'cmdPath, err := getGPUCollectorCmdPath()' \
           'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)'
     '';
 
@@ -137,6 +138,18 @@ let
     versionCheckProgramArg = "--version";
     doInstallCheck = true;
 
+    checkFlags =
+      let
+        skippedTests = [
+          # gpu sampling crashes in the sandbox
+          "TestSystemMonitor_BasicStateTransitions"
+          "TestSystemMonitor_RepeatedCalls"
+          "TestSystemMonitor_UnexpectedTransitions"
+          "TestSystemMonitor_FullCycle"
+        ];
+      in
+      [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
+
     __darwinAllowLocalNetworking = true;
 
     meta.mainProgram = "wandb-core";
@@ -238,6 +251,7 @@ buildPythonPackage rec {
     soundfile
     tenacity
     torch
+    torchvision
     tqdm
     writableTmpDirAsHomeHook
   ];