From b63f62510f7b573a6f712ce7df5e21921cd2cdc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2024 01:12:13 +0000
Subject: [PATCH 01/30] libmysqlconnectorcpp: 8.4.0 -> 9.0.0

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

diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index fb4207060033..21e648e5a998 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmysqlconnectorcpp";
-  version = "8.4.0";
+  version = "9.0.0";
 
   src = fetchurl {
     url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
-    hash = "sha256-VAs9O00g7Pn5AL9Vu6hwcY5QZy9U+izbEkrfOFeWzos=";
+    hash = "sha256-7XEbT3sf/fyadgSOGVr/KH4tFd3evgvKhRsJ4UFCKzA=";
   };
 
   nativeBuildInputs = [

From f8378d5909058a4b9389cc36cd2c43ef317425fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Aug 2024 11:41:39 +0000
Subject: [PATCH 02/30] python312Packages.pyfwup: 0.5.0 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix
index 5203a2bcf98c..82ec5095ac2c 100644
--- a/pkgs/development/python-modules/pyfwup/default.nix
+++ b/pkgs/development/python-modules/pyfwup/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pyfwup";
-  version = "0.5.0";
+  version = "0.5.2";
 
   pyproject = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "greatscottgadgets";
     repo = "pyfwup";
     rev = "refs/tags/${version}";
-    hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE=";
+    hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44=";
   };
 
   dependencies = [

From b060a3333f782c689d9b431da2c8dce356dc7a29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Sep 2024 03:17:02 +0000
Subject: [PATCH 03/30] rdkafka: 2.4.0 -> 2.5.3

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

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 3b9580840f4d..a748f3a86c57 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rdkafka";
-  version = "2.4.0";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "librdkafka";
     rev = "v${version}";
-    sha256 = "sha256-RLjshOnMmCdlv73M8siIvBZ5kVG3v2XttkLVPU+BHY4=";
+    sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg=";
   };
 
   nativeBuildInputs = [ pkg-config python3 which ];

From 39930dc3d99cb30974658f12529a93ed88dacfd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 16:32:05 +0000
Subject: [PATCH 04/30] storj-uplink: 1.110.3 -> 1.111.4

---
 pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix
index 171b547ece4a..f25fcb8786d2 100644
--- a/pkgs/applications/networking/sync/storj-uplink/default.nix
+++ b/pkgs/applications/networking/sync/storj-uplink/default.nix
@@ -5,18 +5,18 @@
 
 buildGoModule rec {
   pname = "storj-uplink";
-  version = "1.110.3";
+  version = "1.111.4";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     rev = "v${version}";
-    hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc=";
+    hash = "sha256-WwqB0la3JBJ5074Y0erOIC60++pLLbFF3LhekbRBUWA=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU=";
+  vendorHash = "sha256-dA/XMBnFRDBqBlYz3j0Q6E7asmrixG71Vv52F9WX8ew=";
 
   ldflags = [ "-s" "-w" ];
 

From 1de931f2335ca890d5a87565ca4065641027618c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 9 Sep 2024 18:36:09 +0200
Subject: [PATCH 05/30] python312Packages.pyfwup: drop
 setuptools-git-versioning

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

diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix
index 82ec5095ac2c..ae3bb2ca109b 100644
--- a/pkgs/development/python-modules/pyfwup/default.nix
+++ b/pkgs/development/python-modules/pyfwup/default.nix
@@ -6,7 +6,6 @@
   tqdm,
   libusb1,
   setuptools,
-  setuptools-git-versioning,
   pythonOlder,
 }:
 
@@ -25,16 +24,19 @@ buildPythonPackage rec {
     hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
   dependencies = [
     pyusb
     tqdm
     libusb1
   ];
 
-  build-system = [
-    setuptools
-    setuptools-git-versioning
-  ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [
     "fwup"

From 97fa413da66cc3d31e03a6818398143c3fd6103b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 18:16:27 +0000
Subject: [PATCH 06/30] mpvScripts.memo: 0-unstable-2024-07-02 ->
 0-unstable-2024-09-03

---
 pkgs/applications/video/mpv/scripts/memo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix
index 7795d1e7b992..0b6022e3de3c 100644
--- a/pkgs/applications/video/mpv/scripts/memo.nix
+++ b/pkgs/applications/video/mpv/scripts/memo.nix
@@ -7,13 +7,13 @@
 
 buildLua {
   pname = "memo";
-  version = "0-unstable-2024-07-02";
+  version = "0-unstable-2024-09-03";
 
   src = fetchFromGitHub {
     owner = "po5";
     repo = "memo";
-    rev = "43ad5bc37d4ac63a00dd2a8f15b9028789467da7";
-    hash = "sha256-nHJ1x5R4Rw2YjB3Li3ZFbI3ZdLSqddJFzJlni4NjpH0=";
+    rev = "e0624611438b2e19ef4b7e24f53461c9d0304b07";
+    hash = "sha256-6+fI3TdBDfKcozxLcsykavgi17ywqRRhyiMK7PgAzGs=";
   };
 
   passthru.updateScript = unstableGitUpdater { };

From d6e2708f7fdfc1f6e1c094aa98ab76912466078b Mon Sep 17 00:00:00 2001
From: Daniel Albert <git@esclear.de>
Date: Mon, 9 Sep 2024 22:25:21 +0200
Subject: [PATCH 07/30] stalwart-mail: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index c2a1d339caea..959b4d2c2fe5 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -26,7 +26,7 @@ let
   # See upstream issue for rocksdb 9.X support
   # https://github.com/stalwartlabs/mail-server/issues/407
   rocksdb = rocksdb_8_11;
-  version = "0.9.3";
+  version = "0.9.4";
 in
 rustPlatform.buildRustPackage {
   pname = "stalwart-mail";
@@ -36,11 +36,11 @@ rustPlatform.buildRustPackage {
     owner = "stalwartlabs";
     repo = "mail-server";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XjHm9jBpBQcf1qaZJLDSSrPK9Nqi3olG0pMXHdNUjbg=";
+    hash = "sha256-GDi7kRwI0GujQBJXItQpYZT1I1Hz3DUMyTixJ/lQySY=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-sFYvEKZVTS5v37CpIl/KjoOY0iWCHLgIJFUdht5SjJY=";
+  cargoHash = "sha256-7gJi6sykmKRuZZ8svXWlktHnwr78zaE2jxVIt+sZPHg=";
 
   patches = [
     # Remove "PermissionsStartOnly" from systemd service files,

From 1882c39f9318d0ce7c1a0bc5147880523f202380 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 00:40:47 +0000
Subject: [PATCH 08/30] containerd: 1.7.21 -> 1.7.22

---
 pkgs/applications/virtualization/containerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 810a493ffc60..3b9dcf0bfad4 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.7.21";
+  version = "1.7.22";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    hash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI=";
+    hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk=";
   };
 
   vendorHash = null;

From 5451a0b34cb1110656fb4f820edfbda3339e9d15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 00:43:14 +0000
Subject: [PATCH 09/30] cp2k: 2024.2 -> 2024.3

---
 pkgs/applications/science/chemistry/cp2k/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix
index f12dfda5d2c1..70d6c515d3d7 100644
--- a/pkgs/applications/science/chemistry/cp2k/default.nix
+++ b/pkgs/applications/science/chemistry/cp2k/default.nix
@@ -58,13 +58,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cp2k";
-  version = "2024.2";
+  version = "2024.3";
 
   src = fetchFromGitHub {
     owner = "cp2k";
     repo = "cp2k";
     rev = "v${version}";
-    hash = "sha256-KXxqzapdPZggFlxX1rkNcxEYb2+aQIPFclFspxII7aE=";
+    hash = "sha256-TeVQ0wVUx6d4knwMi9z3LjQZ4ELE6s1TnvwfFz8jbYk=";
     fetchSubmodules = true;
   };
 

From bc5569b45a25c6d0ac01b1e9e5078fd373893e53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 01:01:43 +0000
Subject: [PATCH 10/30] go-mockery: 2.45.0 -> 2.45.1

---
 pkgs/development/tools/go-mockery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
index 64471895050a..99f1cc7cf378 100644
--- a/pkgs/development/tools/go-mockery/default.nix
+++ b/pkgs/development/tools/go-mockery/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-mockery";
-  version = "2.45.0";
+  version = "2.45.1";
 
   src = fetchFromGitHub {
     owner = "vektra";
     repo = "mockery";
     rev = "v${version}";
-    sha256 = "sha256-k7mR5UJ9kk/jkjzqpS43/CrbNYPUCz4wJR2j/8HUd5c=";
+    sha256 = "sha256-9zekTcbojUtVaiA6JiWhY78qyDleNIreFwO3kTmffFg=";
   };
 
   preCheck = ''

From 10cec032c8880680c87a1b60ba6042ab7df265a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 01:02:43 +0000
Subject: [PATCH 11/30] crun: 1.16.1 -> 1.17

---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 8b375e1e4c42..5dca484e5e9e 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "1.16.1";
+  version = "1.17";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    hash = "sha256-OhDzScs8xGs7kRn/xZRPwyqIszD0OuuY4ymrJ9QVDvM=";
+    hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA=";
     fetchSubmodules = true;
   };
 

From ea498c7af0eb2dc6bb226ff9bd8fbced991c7bf7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 01:25:14 +0000
Subject: [PATCH 12/30] netbird-ui: 0.28.9 -> 0.29.0

---
 pkgs/tools/networking/netbird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index c4bce67ff89d..b65ad77b4527 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.28.9";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     rev = "v${version}";
-    hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw=";
+    hash = "sha256-wzAvu8G1VJ/JLLxHwe4po/DkuLoAixLOx6XVatQThm8=";
   };
 
-  vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk=";
+  vendorHash = "sha256-YvfzqKjNxs2xaK0YSw3fNKluF3kIKu2KNSHhaLewNIw=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From 5da4fa1dd6835e8d8c7dc398c5728b330dde415e Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Mon, 9 Sep 2024 19:40:47 -0700
Subject: [PATCH 13/30] stdenv/freebsd: don't inherit curl from previous stage

This was adding dependencies on the bootstrap files for longer than
necessary.
---
 pkgs/stdenv/freebsd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 08768e0b9131..667905f264b0 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -485,7 +485,6 @@ in
       # we can import the foundational libs from boot-0
       # we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0
       curl = prevStage.curlReal;
-      curlReal = super.curl;
       inherit (prevStage)
         fetchurl
         python3
@@ -511,7 +510,6 @@ in
     name = "freebsd";
     overrides = prevStage: self: super: {
       __bootstrapArchive = bootstrapArchive;
-      curl = prevStage.curlReal;
       fetchurl = prevStage.fetchurlReal;
       freebsd = super.freebsd.overrideScope (
         self': super': { localesPrev = prevStage.freebsd.localesReal; }

From bdbabe8896adcf9ff5a3dd65aa033a16ff6d3fd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 12:31:24 +0000
Subject: [PATCH 14/30] cri-o-unwrapped: 1.30.5 -> 1.31.0

---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 5d38b21ec679..0524e0d69990 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.30.5";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    hash = "sha256-snhuV4hqbqMJK8Fg6vJGJoQ3heCFULK1iIQQB65kiR0=";
+    hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8=";
   };
   vendorHash = null;
 

From af2f74585f9fb5b517aea0592491809b1cb36a01 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Sep 2024 08:58:51 -0300
Subject: [PATCH 15/30] {xine-lib,xine-ui}: migrate to by-name

---
 .../video/xine/lib.nix => by-name/xi/xine-lib/package.nix}     | 0
 .../video/xine/ui.nix => by-name/xi/xine-ui/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                | 3 ---
 3 files changed, 3 deletions(-)
 rename pkgs/{applications/video/xine/lib.nix => by-name/xi/xine-lib/package.nix} (100%)
 rename pkgs/{applications/video/xine/ui.nix => by-name/xi/xine-ui/package.nix} (100%)

diff --git a/pkgs/applications/video/xine/lib.nix b/pkgs/by-name/xi/xine-lib/package.nix
similarity index 100%
rename from pkgs/applications/video/xine/lib.nix
rename to pkgs/by-name/xi/xine-lib/package.nix
diff --git a/pkgs/applications/video/xine/ui.nix b/pkgs/by-name/xi/xine-ui/package.nix
similarity index 100%
rename from pkgs/applications/video/xine/ui.nix
rename to pkgs/by-name/xi/xine-ui/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdc85bebc9df..d7609bba15c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34513,9 +34513,6 @@ with pkgs;
 
   xfractint = callPackage ../applications/graphics/xfractint { };
 
-  xine-ui = callPackage ../applications/video/xine/ui.nix { };
-  xine-lib = callPackage ../applications/video/xine/lib.nix { };
-
   xlsxgrep = callPackage ../applications/search/xlsxgrep { };
 
   xmind = callPackage ../applications/misc/xmind { };

From 6ff2266896bc12ab0d3270bdae7d19c68be34842 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 7 Sep 2024 22:18:24 +0100
Subject: [PATCH 16/30] xine-lib: 1.2.13 -> 1.2.13-unstable-2024-06-29

Includes fixes for FFmpeg 7.
---
 pkgs/by-name/xi/xine-lib/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index 641243ee77c6..426d5a6c1363 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchurl
+, fetchhg
 , aalib
 , alsa-lib
 , autoreconfHook
@@ -31,11 +31,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xine-lib";
-  version = "1.2.13";
+  version = "1.2.13-unstable-2024-06-29";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8=";
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/xine/xine-lib-1.2";
+    rev = "53845e2f6b1f3b69328de5c030c0ab27eb8f043d";
+    hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg=";
   };
 
   outputs = [ "out" "dev" "man" ];

From 1f15da3c69db0b60c74e85e92c2d5157319a682b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 7 Sep 2024 22:18:24 +0100
Subject: [PATCH 17/30] xine-ui: 0.99.14 -> 0.99.14-unstable-2024-08-26

---
 pkgs/by-name/xi/xine-ui/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index 84631a8c4579..d597c50e3b7f 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -1,7 +1,8 @@
 { lib
 , stdenv
-, fetchurl
+, fetchhg
 , autoreconfHook
+, perl
 , curl
 , libXext
 , libXft
@@ -23,11 +24,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xine-ui";
-  version = "0.99.14";
+  version = "0.99.14-unstable-2024-08-26";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM=";
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/xine/xine-ui";
+    rev = "2beaad6bb92e6732585f68af2e346a24e5ad53a5";
+    hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4=";
   };
 
   outputs = [ "out" "dev" "lib" "man" ];
@@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     pkg-config
     shared-mime-info
+    perl
   ];
 
   buildInputs = [

From d24640b9dd6c71ddcaa72fe20464d6ff81d10323 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Sep 2024 10:09:07 -0300
Subject: [PATCH 18/30] xine-lib: set strictDeps to true

---
 pkgs/by-name/xi/xine-lib/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index 426d5a6c1363..64a2b003892d 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -79,9 +79,11 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
   ];
 
+  env.NIX_LDFLAGS = "-lxcb-shm";
+
   enableParallelBuilding = true;
 
-  env.NIX_LDFLAGS = "-lxcb-shm";
+  strictDeps = true;
 
   meta = {
     homepage = "https://xine.sourceforge.net/";

From 8cd10b74ee99008036c0cf54ea9cc39a7e12faba Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Sep 2024 13:31:10 -0300
Subject: [PATCH 19/30] xine-lib: nixfmt-rfc-style

---
 pkgs/by-name/xi/xine-lib/package.nix | 81 +++++++++++++++-------------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix
index 64a2b003892d..f0e26e4fe020 100644
--- a/pkgs/by-name/xi/xine-lib/package.nix
+++ b/pkgs/by-name/xi/xine-lib/package.nix
@@ -1,32 +1,33 @@
-{ lib
-, stdenv
-, fetchhg
-, aalib
-, alsa-lib
-, autoreconfHook
-, ffmpeg
-, flac
-, libGL
-, libGLU
-, libX11
-, libXext
-, libXinerama
-, libXv
-, libcaca
-, libcdio
-, libmng
-, libmpcdec
-, libpulseaudio
-, libtheora
-, libv4l
-, libvorbis
-, libxcb
-, ncurses
-, perl
-, pkg-config
-, speex
-, vcdimager
-, zlib
+{
+  lib,
+  aalib,
+  alsa-lib,
+  autoreconfHook,
+  fetchhg,
+  ffmpeg,
+  flac,
+  libGL,
+  libGLU,
+  libX11,
+  libXext,
+  libXinerama,
+  libXv,
+  libcaca,
+  libcdio,
+  libmng,
+  libmpcdec,
+  libpulseaudio,
+  libtheora,
+  libv4l,
+  libvorbis,
+  libxcb,
+  ncurses,
+  perl,
+  pkg-config,
+  speex,
+  stdenv,
+  vcdimager,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg=";
   };
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -55,8 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libX11
+    libX11
+    libXext
     libXext
     libXinerama
+    libXinerama
+    libXv
     libXv
     libcaca
     libcdio
@@ -67,16 +76,12 @@ stdenv.mkDerivation (finalAttrs: {
     libv4l
     libvorbis
     libxcb
+    libxcb
     ncurses
     perl
     speex
     vcdimager
     zlib
-    libX11
-    libXext
-    libXinerama
-    libXv
-    libxcb
   ];
 
   env.NIX_LDFLAGS = "-lxcb-shm";
@@ -88,7 +93,11 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://xine.sourceforge.net/";
     description = "High-performance, portable and reusable multimedia playback engine";
-    license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl2Plus
+    ];
+    # No useful mainProgram
     maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.linux;
   };

From a2a1553246c209bb996e5668749fbdb781fca2e4 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Sep 2024 10:08:50 -0300
Subject: [PATCH 20/30] xine-ui: set strictDeps to true

---
 pkgs/by-name/xi/xine-ui/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index d597c50e3b7f..07777c36ebe6 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
     LIRC_LIBS="-L ${lirc}/lib -llirc_client";
   };
 
+  strictDeps = true;
+
   postInstall = ''
     substituteInPlace $out/share/applications/xine.desktop \
       --replace "MimeType=;" "MimeType="

From fef89792a8a040a04be8da4f02b6d78ed4246318 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 9 Sep 2024 13:31:42 -0300
Subject: [PATCH 21/30] xine-ui: nixfmt-rfc-style

- postInstall no longer necessary
- use lib.* functions
- meta.mainProgram
---
 pkgs/by-name/xi/xine-ui/package.nix | 62 +++++++++++++++--------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix
index 07777c36ebe6..ddbd29be94c1 100644
--- a/pkgs/by-name/xi/xine-ui/package.nix
+++ b/pkgs/by-name/xi/xine-ui/package.nix
@@ -1,25 +1,26 @@
-{ lib
-, stdenv
-, fetchhg
-, autoreconfHook
-, perl
-, curl
-, libXext
-, libXft
-, libXi
-, libXinerama
-, libXtst
-, libXv
-, libXxf86vm
-, libjpeg
-, libpng
-, lirc
-, ncurses
-, pkg-config
-, readline
-, shared-mime-info
-, xine-lib
-, xorgproto
+{
+  lib,
+  autoreconfHook,
+  curl,
+  fetchhg,
+  libXext,
+  libXft,
+  libXi,
+  libXinerama,
+  libXtst,
+  libXv,
+  libXxf86vm,
+  libjpeg,
+  libpng,
+  lirc,
+  ncurses,
+  perl,
+  pkg-config,
+  readline,
+  shared-mime-info,
+  stdenv,
+  xine-lib,
+  xorgproto,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4=";
   };
 
-  outputs = [ "out" "dev" "lib" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+    "man"
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -62,21 +68,17 @@ stdenv.mkDerivation (finalAttrs: {
   configureFlags = [ "--with-readline=${readline.dev}" ];
 
   env = {
-    LIRC_CFLAGS="-I${lirc}/include";
-    LIRC_LIBS="-L ${lirc}/lib -llirc_client";
+    LIRC_CFLAGS = "-I${lib.getInclude lirc}/include";
+    LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client";
   };
 
   strictDeps = true;
 
-  postInstall = ''
-    substituteInPlace $out/share/applications/xine.desktop \
-      --replace "MimeType=;" "MimeType="
-  '';
-
   meta = {
     homepage = "https://xine.sourceforge.net/";
     description = "Xlib-based frontend for Xine video player";
     license = lib.licenses.gpl2Plus;
+    mainProgram = "xine";
     maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.linux;
   };

From fd27888c61a7069fd0ccf8089fe1f974dd0fe152 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Tue, 10 Sep 2024 08:41:15 -0700
Subject: [PATCH 22/30] maintainers: add targeted fix for missing
 pkgs/by-name/.../package.nix files to maintainers/scripts/build.nix

---
 maintainers/scripts/build.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix
index ca401700b4a6..0783651df8f4 100644
--- a/maintainers/scripts/build.nix
+++ b/maintainers/scripts/build.nix
@@ -12,7 +12,27 @@
 # nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux
 
 let
-  pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]);
+  # This avoids a common situation for maintainers, where due to Git's behavior of not tracking
+  # directories, they have an empty directory somewhere in `pkgs/by-name`. Because that directory
+  # exists, `pkgs/top-level/by-name-overlay.nix` picks it up and attempts to read `package.nix` out
+  # of it... which doesn't exist, since it's empty.
+  #
+  # We don't want to run the code below on every instantiation of `nixpkgs`, as the `pkgs/by-name`
+  # eval machinery is quite performance sensitive. So we use the internals of the `by-name` overlay
+  # to implement our own way to avoid an evaluation failure for this script.
+  #
+  # See <https://github.com/NixOS/nixpkgs/issues/338227> for more motivation for this code block.
+  overlay = self: super: {
+    _internalCallByNamePackageFile =
+      file: if builtins.pathExists file then super._internalCallByNamePackageFile file else null;
+  };
+
+  nixpkgsArgs = removeAttrs args [ "maintainer" "overlays" ] // {
+    overlays = args.overlays or [] ++ [ overlay ];
+  };
+
+  pkgs = import ./../../default.nix nixpkgsArgs;
+
   maintainer_ = pkgs.lib.maintainers.${maintainer};
   packagesWith = cond: return: set:
     (pkgs.lib.flatten

From 607ff34a7eb5f154ea199f5392c86d1d4a6210d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 16:18:24 +0000
Subject: [PATCH 23/30] zsh-wd: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix
index dec73b722765..bf861684d2af 100644
--- a/pkgs/by-name/zs/zsh-wd/package.nix
+++ b/pkgs/by-name/zs/zsh-wd/package.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "wd";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mfaerevaag";
     repo = "wd";
     rev = "v${version}";
-    sha256 = "sha256-Zc49X/8T66xnDkfotf0p6AVyHHd4P3eNDMOsO1sUryY=";
+    sha256 = "sha256-rHHCnHa0/t2ij+6rExgvNt2EFBnkgs6l7oE6zL+xc58=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 205451066098a5ada6b4335a62c5fb6994075c74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 17:17:18 +0000
Subject: [PATCH 24/30] systemfd: 0.4.3 -> 0.4.4

---
 pkgs/development/tools/systemfd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix
index f0e23b0ced47..041f88111b00 100644
--- a/pkgs/development/tools/systemfd/default.nix
+++ b/pkgs/development/tools/systemfd/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.4.3";
+  version = "0.4.4";
 
 in
 rustPlatform.buildRustPackage {
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     repo = "systemfd";
     owner = "mitsuhiko";
     rev = version;
-    sha256 = "sha256-Ypt9/dqDrurhiEhahVk8gG3QxP2ZKTeL7F0IVUGE8Kw=";
+    sha256 = "sha256-U+pBKuoMhyIOhLl1nzmxk5yFt9nOq/KZ6rx9JhalLmM=";
   };
 
-  cargoHash = "sha256-1t+yYqPDMEI39kieGkm+EUVzDBsTlDWQ7iGyjepjc7s=";
+  cargoHash = "sha256-k8FgdNVjFYO/lflVzRQUwHvdy4+eCNTnTYImdfy1GaQ=";
 
   meta = {
     description = "Convenient helper for passing sockets into another process";

From cf5a46368bfdef67223de8206c01370b106e12ab Mon Sep 17 00:00:00 2001
From: HexoKnight <harvey.gream@gmail.com>
Date: Tue, 10 Sep 2024 22:45:27 +0100
Subject: [PATCH 25/30] lib/types: fix toCoerced's typeMerge

---
 lib/tests/modules.sh                                   | 3 +++
 lib/tests/modules/declare-coerced-value-no-default.nix | 9 +++++++++
 lib/types.nix                                          | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 lib/tests/modules/declare-coerced-value-no-default.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index a14fe8cb30a5..2a48d88cbf73 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -294,6 +294,9 @@ checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix
 checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix
 checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
+# Check coerced option merging.
+checkConfigError 'The option .value. in .*/declare-coerced-value.nix. is already declared in .*/declare-coerced-value-no-default.nix.' config.value ./declare-coerced-value.nix ./declare-coerced-value-no-default.nix
+
 # Check coerced value with unsound coercion
 checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
diff --git a/lib/tests/modules/declare-coerced-value-no-default.nix b/lib/tests/modules/declare-coerced-value-no-default.nix
new file mode 100644
index 000000000000..820913f920c3
--- /dev/null
+++ b/lib/tests/modules/declare-coerced-value-no-default.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
+    };
+  };
+}
diff --git a/lib/types.nix b/lib/types.nix
index 8b1d19ff2c61..86b717afd122 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1035,7 +1035,7 @@ rec {
         getSubOptions = finalType.getSubOptions;
         getSubModules = finalType.getSubModules;
         substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
-        typeMerge = t1: t2: null;
+        typeMerge = t: null;
         functor = (defaultFunctor name) // { wrapped = finalType; };
         nestedTypes.coercedType = coercedType;
         nestedTypes.finalType = finalType;

From 8dcc6f23e34253ad37c750d591fafcd0ecd78d6d Mon Sep 17 00:00:00 2001
From: David <158768360+anewdi@users.noreply.github.com>
Date: Mon, 9 Sep 2024 01:26:07 +0200
Subject: [PATCH 26/30] ffmpegthumbnailer: Make thumbnailer file point to
 absolute path

Allows use with nautilus(bubblewrap) even if installed in home.packages
---
 pkgs/development/libraries/ffmpegthumbnailer/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 10e9b70d42ed..ff1a8615ab79 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
       --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
   '';
 
+  postInstall = ''
+    substituteInPlace $out/share/thumbnailers/ffmpegthumbnailer.thumbnailer \
+      --replace-fail '=ffmpegthumbnailer' "=$out/bin/ffmpegthumbnailer"
+  '';
+
   meta = with lib; {
     description = "Lightweight video thumbnailer";
     longDescription = "FFmpegthumbnailer is a lightweight video

From bb25a6d4d3bc709eb81ece06530822e7473c2c3d Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 10 Sep 2024 22:27:52 -0300
Subject: [PATCH 27/30] xen: 4.17.4 -> 4.17.5

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/applications/virtualization/xen/4.17/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix
index 6887696fcfe9..2bf93a79be0d 100644
--- a/pkgs/applications/virtualization/xen/4.17/default.nix
+++ b/pkgs/applications/virtualization/xen/4.17/default.nix
@@ -16,9 +16,6 @@ let
     with upstreamPatches;
     [
       QUBES_REPRODUCIBLE_BUILDS
-      XSA_458
-      XSA_460
-      XSA_461
     ]
   );
 in
@@ -26,12 +23,12 @@ in
 callPackage (import ../generic/default.nix {
   pname = "xen";
   branch = "4.17";
-  version = "4.17.4";
+  version = "4.17.5";
   latest = false;
   pkg = {
     xen = {
-      rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";
-      hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";
+      rev = "430ce6cd936546ad883ecd1c85ddea32d790604b";
+      hash = "sha256-UoMdXRW0yWSaQPPV0rgoTZVO2ghdnqWruBHn7+ZjKzI=";
       patches = [ ] ++ upstreamPatchList;
     };
     qemu = {

From 3f4c2cdd133148fc397e500bd6e81f47a98bcc7f Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 10 Sep 2024 22:28:05 -0300
Subject: [PATCH 28/30] xen: 4.18.2 -> 4.18.3

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/applications/virtualization/xen/4.18/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix
index ed2df662e26e..2aa731b6f244 100644
--- a/pkgs/applications/virtualization/xen/4.18/default.nix
+++ b/pkgs/applications/virtualization/xen/4.18/default.nix
@@ -16,9 +16,6 @@ let
     with upstreamPatches;
     [
       QUBES_REPRODUCIBLE_BUILDS
-      XSA_458
-      XSA_460
-      XSA_461
     ]
   );
 in
@@ -26,12 +23,12 @@ in
 callPackage (import ../generic/default.nix {
   pname = "xen";
   branch = "4.18";
-  version = "4.18.2";
+  version = "4.18.3";
   latest = false;
   pkg = {
     xen = {
-      rev = "d152a0424677d8b78e00ed1270a583c5dafff16f";
-      hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY=";
+      rev = "bd51e573a730efc569646379cd59ccba967cde97";
+      hash = "sha256-OFiFdpPCXR+sWjzFHCORtY4DkWyggvxkcsGdgEyO1ts=";
       patches = [ ] ++ upstreamPatchList;
     };
     qemu = {

From 0d319ecd53b646985675c699deab7097e572e1ac Mon Sep 17 00:00:00 2001
From: 4ever2 <3417013+4ever2@users.noreply.github.com>
Date: Wed, 11 Sep 2024 05:51:15 +0200
Subject: [PATCH 29/30] coqPackages.ElmExtraction: init at 0.1.0 (#326305)

---
 maintainers/maintainer-list.nix               |  6 +++
 .../coq-modules/ElmExtraction/default.nix     | 52 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/coq-modules/ElmExtraction/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 41f9005cbc97..9a8cfd339a28 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -243,6 +243,12 @@
     github = "48cf";
     githubId = 32851089;
   };
+  _4ever2 = {
+    email = "eske@cs.au.dk";
+    github = "4ever2";
+    githubId = 3417013;
+    name = "Eske Nielsen";
+  };
   _6543 = {
     email = "6543@obermui.de";
     github = "6543";
diff --git a/pkgs/development/coq-modules/ElmExtraction/default.nix b/pkgs/development/coq-modules/ElmExtraction/default.nix
new file mode 100644
index 000000000000..0a7a22c812a2
--- /dev/null
+++ b/pkgs/development/coq-modules/ElmExtraction/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  mkCoqDerivation,
+  which,
+  coq,
+  metacoq,
+  version ? null,
+}:
+
+with lib;
+mkCoqDerivation {
+  pname = "ElmExtraction";
+  repo = "coq-elm-extraction";
+  owner = "AU-COBRA";
+  domain = "github.com";
+
+  inherit version;
+  defaultVersion =
+    with versions;
+    switch
+      [
+        coq.coq-version
+        metacoq.version
+      ]
+      [
+        {
+          cases = [
+            (range "8.17" "8.20")
+            (range "1.3.1" "1.3.2")
+          ];
+          out = "0.1.0";
+        }
+      ]
+      null;
+
+  release."0.1.0".sha256 = "EWjubBHsxAl2HuRAfJI3B9qzP2mj89eh0CUc8y7/7Ds=";
+
+  releaseRev = v: "v${v}";
+
+  propagatedBuildInputs = [
+    coq.ocamlPackages.findlib
+    metacoq
+  ];
+
+  postPatch = ''patchShebangs ./tests/process-extraction-examples.sh'';
+
+  meta = {
+    description = "A framework for extracting Coq programs to Elm";
+    maintainers = with maintainers; [ _4ever2 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 1c47a2a4691e..8ab66479fd1f 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -60,6 +60,7 @@ let
       corn = callPackage ../development/coq-modules/corn {};
       deriving = callPackage ../development/coq-modules/deriving {};
       dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
+      ElmExtraction = callPackage ../development/coq-modules/ElmExtraction {};
       equations = callPackage ../development/coq-modules/equations { };
       extructures = callPackage ../development/coq-modules/extructures { };
       fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};

From d2df1fd9415aecc5959965c16f6af3941deb3b8b Mon Sep 17 00:00:00 2001
From: 4ever2 <3417013+4ever2@users.noreply.github.com>
Date: Tue, 10 Sep 2024 21:59:39 +0200
Subject: [PATCH 30/30] coqPackages.metacoq: update for coq 8.20

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

diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index ef1a2131af2c..c79261aa174f 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -16,6 +16,7 @@ let
       { case = "8.17"; out = "1.3.1-8.17"; }
       { case = "8.18"; out = "1.3.1-8.18"; }
       { case = "8.19"; out = "1.3.2-8.19"; }
+      { case = "8.20"; out = "1.3.2-8.20"; }
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
@@ -33,6 +34,7 @@ let
     "1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY=";
     "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64=";
     "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA=";
+    "1.3.2-8.20".sha256 = "sha256-4J7Ly4Fc2E/I6YqvzTLntVVls5t94OUOjVMKJyyJdw8=";
   };
   releaseRev = v: "v${v}";