From b365ab88d2498b4c59d369ee5aede57415b640f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 15:28:25 +0000
Subject: [PATCH 01/36] zpaqfranz: 60.9 -> 60.10

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

diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index ca0675c1be5b..58c02c2afe9e 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "60.9";
+  version = "60.10";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-7X1nmJ6X1oRMzB3L/oKe3ARY02ZimUD09KO4fukxTyg=";
+    hash = "sha256-crUXsIFQwGwH6hxqaO1KLzRRWphcUxmkvNlRT6lXlBg=";
   };
 
   nativeBuildInputs = [

From 461bcf7be40c228236238d044a2b72acd77771c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 12:45:00 +0000
Subject: [PATCH 02/36] slint-lsp: 1.8.0 -> 1.9.1

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

diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index 50a47c9be9b0..ca982ef4187e 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -37,14 +37,14 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "slint-lsp";
-  version = "1.8.0";
+  version = "1.9.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Shgcjr0mlUNAobMAarZ7dFnXgPGzBHXs2KnUDT/8I2A=";
+    hash = "sha256-/Upnl3VcR5ynT70gWMGAs/xvolMKsZeaGd+TWgxl/Pg=";
   };
 
-  cargoHash = "sha256-wyzrFg3hwsJ7SV8KGLKo+gNHzLFpnMx9/jgMalGkufY=";
+  cargoHash = "sha256-JgKK+NyRF3mIRarHmwCk2b1HsBUXZX/l2e843exZk2g=";
 
   nativeBuildInputs = [
     cmake

From 69d60cea13b6fab6d2aff5ae50f6d9ec6df47f33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 20:52:17 +0000
Subject: [PATCH 03/36] trealla: 2.62.1 -> 2.63.10

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 904885189d23..c0c823371cc7 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.62.1";
+  version = "2.63.10";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0R9Vfjo4/tC6Wh4YSQdv4BG5hMD9ZI/rjrbg1/LX5k8=";
+    hash = "sha256-LGikCupqzUZ2CG63c8aEeJHX+8nNMUaaYzAGQC+YHqM=";
   };
 
   postPatch = ''

From e27a36b69fcbce51e4e6829b969cb091e74ae699 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 21:43:32 +0000
Subject: [PATCH 04/36] marksman: 2024-12-04 -> 2024-12-18

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

diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix
index 6b0d61ee8913..73404de17624 100644
--- a/pkgs/development/tools/marksman/default.nix
+++ b/pkgs/development/tools/marksman/default.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "marksman";
-  version = "2024-12-04";
+  version = "2024-12-18";
 
   src = fetchFromGitHub {
     owner = "artempyanykh";
     repo = "marksman";
     rev = version;
-    sha256 = "sha256-0GpEspf6CuswWCjFdzQ+T3GXFKclL7GLmx9HeO4hdA8=";
+    sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to=";
   };
 
   projectFile = "Marksman/Marksman.fsproj";

From 8345b3fb18de55be3d98d9395dc807778d670c5e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 23 Dec 2024 10:04:06 +0000
Subject: [PATCH 05/36] nano: 8.2 -> 8.3

Changes: https://lists.gnu.org/archive/html/info-gnu/2024-12/msg00005.html
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index f353e39d2d17..f88249db0a54 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -32,11 +32,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nano";
-  version = "8.2";
+  version = "8.3";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s=";
+    hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4=";
   };
 
   nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;

From 5bf9e8fd840bf3f87aa72b35f7017ae02faf0ccc Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Mon, 23 Dec 2024 16:17:06 +0200
Subject: [PATCH 06/36] newsboat: Only install useful binaries in package

---
 pkgs/by-name/ne/newsboat/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 5c6bfcfd8852..f2bff0839b53 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -99,6 +99,13 @@ rustPlatform.buildRustPackage rec {
     updateScript = nix-update-script { };
   };
 
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 newsboat $out/bin/newsboat
+    install -Dm755 podboat $out/bin/podboat
+    runHook postInstall
+  '';
+
   meta = {
     homepage = "https://newsboat.org/";
     changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";

From eaa8cb32b2e8e72a881257451be949ff2fa71742 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 24 Dec 2024 01:18:28 +0900
Subject: [PATCH 07/36] nushell: 0.100.0 -> 0.101.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/shells/nushell/default.nix         | 6 +++---
 pkgs/shells/nushell/plugins/formats.nix | 2 +-
 pkgs/shells/nushell/plugins/gstat.nix   | 2 +-
 pkgs/shells/nushell/plugins/polars.nix  | 2 +-
 pkgs/shells/nushell/plugins/query.nix   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index eab87fd8c5b5..1d3e9c26a610 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "0.100.0";
+  version = "0.101.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     rev = "refs/tags/${version}";
-    hash = "sha256-lbVvKpaG9HSm2W+NaVUuEOxTNUIf0iRATTVDKFPjqV4=";
+    hash = "sha256-Ptctp2ECypmSd0BHa6l09/U7wEjtLsvRSQV/ISz9+3w=";
   };
 
-  cargoHash = "sha256-omC/qcpgy65Md1MC0QGUVCRVNl9sWlFcCRxdS4aeU+g=";
+  cargoHash = "sha256-KOIVlF8V5bdtGIFbboTQpVSieETegA6iF7Hi6/F+2bE=";
 
   nativeBuildInputs =
     [ pkg-config ]
diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix
index a16ed6995e52..7e2112d491a5 100644
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@@ -12,7 +12,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_formats";
   inherit (nushell) version src;
-  cargoHash = "sha256-Ftjcic/2rN5cYlzD7C9HyWWm4a37+s/mqRMHH4+4uBA=";
+  cargoHash = "sha256-igmSU2ziLfQbcEvHiQcuU8I8SeEN34gimBlcXtfuC0o=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix
index 4d18ec9e971d..47ab2ea27ead 100644
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -12,7 +12,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_gstat";
   inherit (nushell) version src;
-  cargoHash = "sha256-IGOT3tlFUjnD5DBbi8zERPcL7OiP8lwKtK4GVOR53xU=";
+  cargoHash = "sha256-xoiKsn3XkKkw+KpgnIPFw78JN3ERxkj+2SgrCoe9HOU=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix
index b69cddcacce9..caccd2f62f00 100644
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_polars";
   inherit (nushell) version src;
 
-  cargoHash = "sha256-CMrq0UVJxXoyHo9OvatW9tlknqzOuK70NI8H/ZgbYBY=";
+  cargoHash = "sha256-rzTXVde0ZqgJQb1Hs3nvo9v1k+0UKkgKlTym4pukvuk=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs =
diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix
index 75af8490dedb..041c26db8754 100644
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -14,7 +14,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_query";
   inherit (nushell) version src;
-  cargoHash = "sha256-xztQzfe/ZjG3YvQMDN3ADtWIcjUr3thPxbPjOKKvB9Q=";
+  cargoHash = "sha256-OuunFi3zUIgxWol30btAR71TU7Jc++IhlZuM56KpM/Q=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs =

From 929f5f6dd22239614d4bd4b3c78b6848d896702a Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 24 Dec 2024 01:18:49 +0900
Subject: [PATCH 08/36] nushellPlugins.units: 0.1.3 -> 0.1.4

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/shells/nushell/plugins/units.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index bf1211e56128..d929d0286071 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_units";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     repo = "nu_plugin_units";
     owner = "JosephTLyons";
     rev = "v${version}";
-    hash = "sha256-zPN18ECzh2/l0kxp+Vyp3d9kCq3at/7SqMYbV3WDV3I=";
+    hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg=";
   };
-  cargoHash = "sha256-6NWyuErdxj7//wW4L7ijW4RiWqdwbeTrelIjpisAGkg=";
+  cargoHash = "sha256-if8uvDRwr6p5VENdls9mIfECiu/zDybcpkphZLHRHe8=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From 784b98a5e727488a9be0de310bb2687c0c487ece Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 24 Dec 2024 02:05:25 +0900
Subject: [PATCH 09/36] nushellPlugins.highlight: 1.3.2+0.99.0 -> 1.4.2+0.101.0

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/shells/nushell/plugins/highlight.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index a63ba5e7f82f..14a6b9678f0c 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -11,15 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_highlight";
-  version = "1.3.2+0.99.0";
+  version = "1.4.2+0.101.0";
 
   src = fetchFromGitHub {
     repo = "nu-plugin-highlight";
     owner = "cptpiepmatz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rYS5Nqk+No1BhmEPzl+MX+aCH8fzHqdp8U8PKYSWVcc=";
+    hash = "sha256-YE8O3KL0SSu6FYFyMCNpyd4WLefVQP7FSNr82D+Jwqs=";
+    fetchSubmodules = true;
   };
-  cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0=";
+
+  cargoHash = "sha256-LDVKZLktP4+W04O8EDkMs8dgViHyzA/b7k+/oJS2pro=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From fd4b759fd5af5e8cef0b73a966df509ee8018450 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 24 Dec 2024 02:05:41 +0900
Subject: [PATCH 10/36] nushellPlugins.highlight: fix description

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/shells/nushell/plugins/highlight.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index 14a6b9678f0c..efb7bb99087d 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    description = "A nushell plugin that will inspect a file and return information based on it's magic number.";
+    description = "A nushell plugin for syntax highlighting.";
     mainProgram = "nu_plugin_highlight";
     homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight";
     license = licenses.mit;

From 5d7fe511677e63016795e4d9266d8d4a910fc6c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 04:02:10 +0000
Subject: [PATCH 11/36] alglib: 4.03.0 -> 4.04.0

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

diff --git a/pkgs/by-name/al/alglib/package.nix b/pkgs/by-name/al/alglib/package.nix
index 414a884ce0d9..270e0195c306 100644
--- a/pkgs/by-name/al/alglib/package.nix
+++ b/pkgs/by-name/al/alglib/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alglib3";
-  version = "4.03.0";
+  version = "4.04.0";
 
   src = fetchurl {
     url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
-    sha256 = "sha256-k7/U9Tq2ND8+qd8tHZP9Gq1okJF3tMNej3WE/6NkBYI=";
+    sha256 = "sha256-nPHllbcr1Hi3RzyOqvkZtACLJT2Gutu8WlItFJpnIUQ=";
   };
 
   nativeBuildInputs = [

From 94cf6ebcd47e149cc97d321c1d26ac2c5cf33371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 06:02:09 +0000
Subject: [PATCH 12/36] stackit-cli: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 5b987702f8f8..d9819c60973d 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-gqNWdZUQHT7Oa222+cbFgbmTBeg9nM/ot0WSVSCzMn8=";
+    hash = "sha256-M3VUpe8M2O2EXjD9/+YNa7Q7l0Q/WXbIhObyFa/Wg18=";
   };
 
-  vendorHash = "sha256-f7SkRCe8AknhCCJ79iKqC4BeSW/jM33LdA6HTQpa+3o=";
+  vendorHash = "sha256-eAyex6OqQc/nLWpCbmjyjxPf3pdK9wPAc8eARwiCrIs=";
 
   subPackages = [ "." ];
 

From ef0cdab2483080236da1090515df9823ac6a7d74 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Dec 2024 16:13:56 +0800
Subject: [PATCH 13/36] fetchgitlab: nixfmt

---
 pkgs/build-support/fetchgitlab/default.nix | 105 +++++++++++++++------
 1 file changed, 78 insertions(+), 27 deletions(-)

diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 749883f2365e..62a8c88d3fe6 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -1,36 +1,87 @@
-{ lib, fetchgit, fetchzip }:
+{
+  lib,
+  fetchgit,
+  fetchzip,
+}:
 
 lib.makeOverridable (
-# gitlab example
-{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
-, fetchSubmodules ? false, leaveDotGit ? false
-, deepClone ? false, forceFetchGit ? false
-, sparseCheckout ? []
-, ... # For hash agility
-} @ args:
+  # gitlab example
+  {
+    owner,
+    repo,
+    rev,
+    protocol ? "https",
+    domain ? "gitlab.com",
+    name ? "source",
+    group ? null,
+    fetchSubmodules ? false,
+    leaveDotGit ? false,
+    deepClone ? false,
+    forceFetchGit ? false,
+    sparseCheckout ? [ ],
+    ... # For hash agility
+  }@args:
 
-let
-  slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);
-  escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
-  escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
-  passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "forceFetchGit" "leaveDotGit" "deepClone" ];
+  let
+    slug = lib.concatStringsSep "/" (
+      (lib.optional (group != null) group)
+      ++ [
+        owner
+        repo
+      ]
+    );
+    escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
+    escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
+    passthruAttrs = removeAttrs args [
+      "protocol"
+      "domain"
+      "owner"
+      "group"
+      "repo"
+      "rev"
+      "fetchSubmodules"
+      "forceFetchGit"
+      "leaveDotGit"
+      "deepClone"
+    ];
 
-  useFetchGit = fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != []);
-  fetcher = if useFetchGit then fetchgit else fetchzip;
+    useFetchGit =
+      fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != [ ]);
+    fetcher = if useFetchGit then fetchgit else fetchzip;
 
-  gitRepoUrl = "${protocol}://${domain}/${slug}.git";
+    gitRepoUrl = "${protocol}://${domain}/${slug}.git";
 
-  fetcherArgs = (if useFetchGit then {
-    inherit rev deepClone fetchSubmodules sparseCheckout leaveDotGit;
-    url = gitRepoUrl;
-  } else {
-    url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
+    fetcherArgs =
+      (
+        if useFetchGit then
+          {
+            inherit
+              rev
+              deepClone
+              fetchSubmodules
+              sparseCheckout
+              leaveDotGit
+              ;
+            url = gitRepoUrl;
+          }
+        else
+          {
+            url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
 
-    passthru = {
-      inherit gitRepoUrl;
-    };
-  }) // passthruAttrs // { inherit name; };
-in
+            passthru = {
+              inherit gitRepoUrl;
+            };
+          }
+      )
+      // passthruAttrs
+      // {
+        inherit name;
+      };
+  in
 
-fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev owner repo; }
+  fetcher fetcherArgs
+  // {
+    meta.homepage = "${protocol}://${domain}/${slug}/";
+    inherit rev owner repo;
+  }
 )

From 4616db6469a88b99875e7804b8a21448e6ba61ef Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Dec 2024 16:15:05 +0800
Subject: [PATCH 14/36] fetchgitlab: add tag argument

---
 pkgs/build-support/fetchgitlab/default.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 62a8c88d3fe6..aef76270d5ec 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -9,7 +9,8 @@ lib.makeOverridable (
   {
     owner,
     repo,
-    rev,
+    rev ? null,
+    tag ? null,
     protocol ? "https",
     domain ? "gitlab.com",
     name ? "source",
@@ -22,6 +23,12 @@ lib.makeOverridable (
     ... # For hash agility
   }@args:
 
+  assert (
+    lib.assertMsg (lib.xor (tag == null) (
+      rev == null
+    )) "fetchFromGitLab requires one of either `rev` or `tag` to be provided (not both)."
+  );
+
   let
     slug = lib.concatStringsSep "/" (
       (lib.optional (group != null) group)
@@ -31,7 +38,9 @@ lib.makeOverridable (
       ]
     );
     escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
-    escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
+    escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] (
+      if tag != null then "refs/tags/" + tag else rev
+    );
     passthruAttrs = removeAttrs args [
       "protocol"
       "domain"
@@ -39,6 +48,7 @@ lib.makeOverridable (
       "group"
       "repo"
       "rev"
+      "tag"
       "fetchSubmodules"
       "forceFetchGit"
       "leaveDotGit"
@@ -58,6 +68,7 @@ lib.makeOverridable (
             inherit
               rev
               deepClone
+              tag
               fetchSubmodules
               sparseCheckout
               leaveDotGit
@@ -82,6 +93,11 @@ lib.makeOverridable (
   fetcher fetcherArgs
   // {
     meta.homepage = "${protocol}://${domain}/${slug}/";
-    inherit rev owner repo;
+    inherit
+      tag
+      rev
+      owner
+      repo
+      ;
   }
 )

From e64344cb7e53990eeb94728c37fb126cd05423b5 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Dec 2024 16:12:06 +0800
Subject: [PATCH 15/36] fetchgitiles: add tag argument

---
 pkgs/build-support/fetchgitiles/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgitiles/default.nix b/pkgs/build-support/fetchgitiles/default.nix
index 7dc26dfdf2f9..409f2f4e2bd6 100644
--- a/pkgs/build-support/fetchgitiles/default.nix
+++ b/pkgs/build-support/fetchgitiles/default.nix
@@ -3,24 +3,36 @@
 lib.makeOverridable (
   {
     url,
-    rev,
+    rev ? null,
+    tag ? null,
     name ? "source",
     ...
   }@args:
 
+  assert (
+    lib.assertMsg (lib.xor (tag == null) (
+      rev == null
+    )) "fetchFromGitiles requires one of either `rev` or `tag` to be provided (not both)."
+  );
+
+  let
+    realrev = (if tag != null then "refs/tags/" + tag else rev);
+  in
+
   fetchzip (
     {
       inherit name;
-      url = "${url}/+archive/${rev}.tar.gz";
+      url = "${url}/+archive/${realrev}.tar.gz";
       stripRoot = false;
       meta.homepage = url;
     }
     // removeAttrs args [
       "url"
+      "tag"
       "rev"
     ]
   )
   // {
-    inherit rev;
+    inherit rev tag;
   }
 )

From 446b013ec787228fe8d8ae04c76788812b54ec13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 13:35:20 +0000
Subject: [PATCH 16/36] nixos-anywhere: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix
index 051992de6746..a9d60383bad4 100644
--- a/pkgs/by-name/ni/nixos-anywhere/package.nix
+++ b/pkgs/by-name/ni/nixos-anywhere/package.nix
@@ -31,12 +31,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixos-anywhere";
-  version = "1.5.0";
+  version = "1.6.0";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nixos-anywhere";
     rev = finalAttrs.version;
-    hash = "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y=";
+    hash = "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk=";
   };
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''

From 99ab831a06acf12767c938c57d8bf3d869cd4bb2 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 09:47:00 -0500
Subject: [PATCH 17/36] erlang: fix updateScript

---
 pkgs/development/interpreters/erlang/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 499d3b7f879f..df349d965743 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -250,7 +250,7 @@ stdenv.mkDerivation (
           if [ "$latest" != "${version}" ]; then
             nixpkgs="$(git rev-parse --show-toplevel)"
             nix_file="$nixpkgs/pkgs/development/interpreters/erlang/${major}.nix"
-            update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file"
+            update-source-version ${baseName}_${major} "$latest" --version-key=version --print-changes --file="$nix_file"
           else
             echo "${baseName}R${major} is already up-to-date"
           fi

From 1670e92cea08e76a0a1ae26003ca7955c1e4277f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 14:44:13 +0000
Subject: [PATCH 18/36] erlang_25: 25.3.2.15 -> 25.3.2.16

---
 pkgs/development/interpreters/erlang/25.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix
index d1c6e0aff3c9..dd2e5e945bb4 100644
--- a/pkgs/development/interpreters/erlang/25.nix
+++ b/pkgs/development/interpreters/erlang/25.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "25.3.2.15";
-  sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8=";
+  version = "25.3.2.16";
+  sha256 = "sha256-fo2wRC+Yb5Tfw6dgDhHv77SFtFMYYKnAZqQSapkWkEw=";
 }

From e3946b20c18ed877c8ecc155d621bd7a8826d423 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 14:52:35 +0000
Subject: [PATCH 19/36] erlang_26: 26.2.5.4 -> 26.2.5.6

---
 pkgs/development/interpreters/erlang/26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix
index e7c256d1de78..6a91f3795d09 100644
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "26.2.5.4";
-  sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y=";
+  version = "26.2.5.6";
+  sha256 = "sha256-5FsLAhbWqXjP18UQGNkbNQmFXlHiNoLY1aTzutLubZI=";
 }

From 94ae2805dcb3788c1268c107d9dddcec030c9fd2 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 14:53:28 +0000
Subject: [PATCH 20/36] erlang_27: 27.1.2 -> 27.2

---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 91845a1bc28a..9085ecf4017c 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.1.2";
-  sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg=";
+  version = "27.2";
+  sha256 = "sha256-8kRneNkDErUX/AiWy8WDCpFxxS1w4DfM+5V6Hz8D8wM=";
 }

From f19ecdeb7f55153f4464d0cbfbb93905af88bc48 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 10:39:58 -0500
Subject: [PATCH 21/36] elixir: remove deprecated versions 1.10-1.13

These versions no longer receive security updates.
---
 doc/languages-frameworks/beam.section.md      | 16 +++++++--------
 pkgs/development/beam-modules/default.nix     | 20 -------------------
 pkgs/development/interpreters/elixir/1.10.nix |  9 ---------
 pkgs/development/interpreters/elixir/1.11.nix |  9 ---------
 pkgs/development/interpreters/elixir/1.12.nix |  9 ---------
 pkgs/development/interpreters/elixir/1.13.nix |  9 ---------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/beam-packages.nix              |  4 ----
 8 files changed, 9 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/interpreters/elixir/1.10.nix
 delete mode 100644 pkgs/development/interpreters/elixir/1.11.nix
 delete mode 100644 pkgs/development/interpreters/elixir/1.12.nix
 delete mode 100644 pkgs/development/interpreters/elixir/1.13.nix

diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md
index 2aac65900b9a..3e3f4e8bf4ac 100644
--- a/doc/languages-frameworks/beam.section.md
+++ b/doc/languages-frameworks/beam.section.md
@@ -296,7 +296,7 @@ Usually, we need to create a `shell.nix` file and do our development inside of t
 
 with pkgs;
 let
-  elixir = beam.packages.erlang_24.elixir_1_12;
+  elixir = beam.packages.erlang_24.elixir_1_18;
 in
 mkShell {
   buildInputs = [ elixir ];
@@ -311,18 +311,18 @@ If you need to use an overlay to change some attributes of a derivation, e.g. if
 
 ```nix
 let
-  elixir_1_13_1_overlay = (self: super: {
-      elixir_1_13 = super.elixir_1_13.override {
-        version = "1.13.1";
-        sha256 = "sha256-t0ic1LcC7EV3avWGdR7VbyX7pGDpnJSW1ZvwvQUPC3w=";
+  elixir_1_18_1_overlay = (self: super: {
+      elixir_1_18 = super.elixir_1_18.override {
+        version = "1.18.1";
+        sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
       };
     });
-  pkgs = import <nixpkgs> { overlays = [ elixir_1_13_1_overlay ]; };
+  pkgs = import <nixpkgs> { overlays = [ elixir_1_18_1_overlay ]; };
 in
 with pkgs;
 mkShell {
   buildInputs = [
-    elixir_1_13
+    elixir_1_18
   ];
 }
 ```
@@ -338,7 +338,7 @@ let
   # define packages to install
   basePackages = [
     git
-    # replace with beam.packages.erlang.elixir_1_13 if you need
+    # replace with beam.packages.erlang.elixir_1_18 if you need
     beam.packages.erlang.elixir
     nodejs
     postgresql_14
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 23649ca76f26..1824694274cb 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -65,26 +65,6 @@ let
         debugInfo = true;
       };
 
-      elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix {
-        inherit erlang;
-        debugInfo = true;
-      };
-
-      elixir_1_12 = lib'.callElixir ../interpreters/elixir/1.12.nix {
-        inherit erlang;
-        debugInfo = true;
-      };
-
-      elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix {
-        inherit erlang;
-        debugInfo = true;
-      };
-
-      elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix {
-        inherit erlang;
-        debugInfo = true;
-      };
-
       # Remove old versions of elixir, when the supports fades out:
       # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 
diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix
deleted file mode 100644
index 04f4b5af240b..000000000000
--- a/pkgs/development/interpreters/elixir/1.10.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ mkDerivation }:
-
-# How to obtain `sha256`:
-# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
-mkDerivation {
-  version = "1.10.4";
-  sha256 = "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv";
-  minimumOTPVersion = "21";
-}
diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix
deleted file mode 100644
index 6e5a30a9dd7d..000000000000
--- a/pkgs/development/interpreters/elixir/1.11.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ mkDerivation }:
-
-# How to obtain `sha256`:
-# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
-mkDerivation {
-  version = "1.11.4";
-  sha256 = "sha256-qCX6hRWUbW+E5xaUhcYxRAnhnvncASUJck8lESlcDvk=";
-  minimumOTPVersion = "21";
-}
diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix
deleted file mode 100644
index 0ea014e36d70..000000000000
--- a/pkgs/development/interpreters/elixir/1.12.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ mkDerivation }:
-
-# How to obtain `sha256`:
-# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
-mkDerivation {
-  version = "1.12.3";
-  sha256 = "sha256-Jo9ZC5cSBVpjVnGZ8tEIUKOhW9uvJM/h84+VcnrT0R0=";
-  minimumOTPVersion = "22";
-}
diff --git a/pkgs/development/interpreters/elixir/1.13.nix b/pkgs/development/interpreters/elixir/1.13.nix
deleted file mode 100644
index 452c3c5413ec..000000000000
--- a/pkgs/development/interpreters/elixir/1.13.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ mkDerivation }:
-
-# How to obtain `sha256`:
-# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
-mkDerivation {
-  version = "1.13.4";
-  sha256 = "sha256-xGKq62wzaIfgZN2j808fL3b8ykizQVPuePWzsy2HKfw=";
-  minimumOTPVersion = "22";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c15b3d3fd6..ce6de34cae81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,7 +7177,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_27 erlang_26 erlang_25 erlang_24
-    elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
+    elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14
     elixir-ls;
 
   erlang_nox = beam_nox.interpreters.erlang;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 59aeda1931b3..a646ba0dc3b3 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -68,10 +68,6 @@ in
       elixir_1_16
       elixir_1_15
       elixir_1_14
-      elixir_1_13
-      elixir_1_12
-      elixir_1_11
-      elixir_1_10
       elixir-ls
       lfe
       lfe_2_1

From e780bc8e5e3c25ee131dc99c92c119203c2886f7 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 24 Dec 2024 16:33:16 +0000
Subject: [PATCH 22/36] wesnoth: pin to boost183 to restore the build

Without the change `wesnoth` fails on `master` as
https://hydra.nixos.org/build/282695639/nixlog/1:

    /build/source/src/server/common/server_base.cpp:84:27: error: call of overloaded 'spawn(boost::asio::io_service&, server_base::start_server()::<lambda(boost::asio::yield_context)>)' is ambiguous
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c15b3d3fd6..28054cc66fac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17031,6 +17031,8 @@ with pkgs;
 
   wesnoth = callPackage ../games/wesnoth {
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
+    # fails to build against latest boost
+    boost = boost183;
     # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
     lua = lua5_4.override {
       postConfigure = ''

From 665e085e8f5b18c8f2fcfde3983f588b59b41316 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 25 Dec 2024 00:34:53 +0800
Subject: [PATCH 23/36] osu-lazer-bin: 2024.1219.2 -> 2024.1224.1

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 272a0b225708..88ce164999ae 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2024.1219.2";
+  version = "2024.1224.1";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-kzGerNcaop39zqv3+w5hkgLZzhH6PfCPhZfGk9f9/Z8=";
+        hash = "sha256-p/1rmz+CnuVl72wOKJpHFkJv64vKRoMSV15KRUgjhu0=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-kWcdynu3m8MehpNjkk10VN9/z8ixu/cZI9HuTY/79dk=";
+        hash = "sha256-jVEjqpKJsFC+rSwSNokKxYarwB4CybWSG8gdtxocFZ4=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-qNkuiDA4LiWqwpYFrBDvV5VoOwO6Ei8jHGIgVKSErdo=";
+        hash = "sha256-9qZ5XNAII2I4PemNGrWuUCY1Syq5PH3NBc2/Jj5tcoQ=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From c63f77dd44691f38e32b9b6c514e590d6ea7176b Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Wed, 25 Dec 2024 00:35:04 +0800
Subject: [PATCH 24/36] osu-lazer: 2024.1219.2 -> 2024.1224.1

---
 pkgs/by-name/os/osu-lazer/deps.json   | 24 ++++++++++++------------
 pkgs/by-name/os/osu-lazer/package.nix |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 0e7be190c28d..20e4fd1fbccf 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -581,23 +581,23 @@
   },
   {
     "pname": "OpenTabletDriver",
-    "version": "0.6.4",
-    "hash": "sha256-tTk8ezYrMs/Kj+snMvWq9Ae7WLU4pq5NpFHEZV8WjJM="
+    "version": "0.6.5",
+    "hash": "sha256-tn24wONDXJOL3lhSOGI1ZS1sVsdKGr798r35DgmU+pA="
   },
   {
     "pname": "OpenTabletDriver.Configurations",
-    "version": "0.6.4",
-    "hash": "sha256-9QqvSck5Ofn3clWQzwGoTHX6k5d1nUxjD56UeIBx+1A="
+    "version": "0.6.5",
+    "hash": "sha256-+6y3GkGaIYqEgzAV/Q04vxvB5UyrsT7NQR5mIWOIhCI="
   },
   {
     "pname": "OpenTabletDriver.Native",
-    "version": "0.6.4",
-    "hash": "sha256-4vNnamnIVNpVBOPXyyJcbj0pe/aixGLmvXzq3vkUXMs="
+    "version": "0.6.5",
+    "hash": "sha256-QLWzpV1YeMozcR38guHv5rT8cNnuwm92NGAvdXua1U4="
   },
   {
     "pname": "OpenTabletDriver.Plugin",
-    "version": "0.6.4",
-    "hash": "sha256-9jORi42+oYFdNEin9lYWMBGrktyTBMAl5sfr1jxAbVE="
+    "version": "0.6.5",
+    "hash": "sha256-czzfFsCBu9989ML7FvDUZrBtaf3K4bBhmuaU9Y1h3vk="
   },
   {
     "pname": "PolySharp",
@@ -636,8 +636,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2024.1206.0",
-    "hash": "sha256-2XouXC/uahqY1ldHvNWyobxGYXEQJky65g8EL7fL5Zw="
+    "version": "2024.1224.0",
+    "hash": "sha256-Ci0tblihnKxv8c0vgYvTDTfu2Fl6huEsl/2/SDdh5CQ="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -651,8 +651,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2024.1219.1",
-    "hash": "sha256-KyZeNkTissfZAusvWYUdZ3+YujrcTfkZDyzt99i4fkg="
+    "version": "2024.1224.0",
+    "hash": "sha256-EtruxGvWQQzWGtpQAb58j6Hdsv2GKNf/eSwPV3qti/Q="
   },
   {
     "pname": "ppy.osuTK.NS20",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 417b890b8b9a..f375bd2a3ddd 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.1219.2";
+  version = "2024.1224.1";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-uRaMVd3FH6094MxplLNG0JJnO+7s805TI0aeDN/rRVY=";
+    hash = "sha256-T9KYb+fVcCWtb33ImHyoipJqsLr2em4GoYyvsSgIWx0=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From cd9c3b884baa1c6f50768a89f39966e1f137a5f1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 24 Dec 2024 17:28:46 +0100
Subject: [PATCH 25/36] python312Packages.langchain: fix build - disable some
 test paths

---
 .../python-modules/langchain/default.nix      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index ad7821606b96..c9788da19f19 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -59,7 +59,10 @@ buildPythonPackage rec {
 
   buildInputs = [ bash ];
 
-  pythonRelaxDeps = [ "tenacity" ];
+  pythonRelaxDeps = [
+    "numpy"
+    "tenacity"
+  ];
 
   dependencies = [
     aiohttp
@@ -118,6 +121,21 @@ buildPythonPackage rec {
     "test_aliases_hidden"
   ];
 
+  disabledTestPaths = [
+    # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
+    "tests/unit_tests/chains/test_conversation.py"
+    # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
+    "tests/unit_tests/chains/test_memory.py"
+    # pydantic.errors.PydanticUserError: `ConversationSummaryBufferMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryBufferMemory.model_rebuild()`.
+    "tests/unit_tests/chains/test_summary_buffer_memory.py"
+    "tests/unit_tests/output_parsers/test_fix.py"
+    "tests/unit_tests/chains/test_llm_checker.py"
+    # TypeError: Can't instantiate abstract class RunnableSerializable[RetryOutputParserRetryChainInput, str] without an implementation for abstract method 'invoke'
+    "tests/unit_tests/output_parsers/test_retry.py"
+    # pydantic.errors.PydanticUserError: `LLMSummarizationCheckerChain` is not fully defined; you should define `BaseCache`, then call `LLMSummarizationCheckerChain.model_rebuild()`.
+    "tests/unit_tests/chains/test_llm_summarization_checker.py"
+  ];
+
   pythonImportsCheck = [ "langchain" ];
 
   passthru = {

From ee4442b36c1ed53fe4b16fd08690ba57a9221151 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 24 Dec 2024 19:13:08 +0100
Subject: [PATCH 26/36] python312Packages.langchain-community: fix build,
 disable some tests

---
 .../python-modules/langchain-community/default.nix         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index cccbca601e32..50b3992a9b61 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -53,6 +53,7 @@ buildPythonPackage rec {
   build-system = [ poetry-core ];
 
   pythonRelaxDeps = [
+    "numpy"
     "pydantic-settings"
     "tenacity"
   ];
@@ -107,6 +108,12 @@ buildPythonPackage rec {
     # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778
     "test_table_info"
     "test_sql_database_run"
+    # pydantic.errors.PydanticUserError: `SQLDatabaseToolkit` is not fully defined; you should define `BaseCache`, then call `SQLDatabaseToolkit.model_rebuild()`.
+    "test_create_sql_agent"
+    # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`.
+    "test_proper_inputs"
+    # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`.
+    "test_variable_key_naming"
   ];
 
   meta = {

From 1085d73012e1d55823fd95887e1731b12549e066 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 24 Dec 2024 19:29:46 +0100
Subject: [PATCH 27/36] python312Packages.langchain-mongodb: fix build

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

diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix
index 0c1422bbeb59..78a3a9b06431 100644
--- a/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -36,6 +36,10 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
   dependencies = [
     langchain-core
     numpy

From 1164f22461091d5b985f328aad3f1c055c6c058e Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 24 Dec 2024 20:08:04 +0100
Subject: [PATCH 28/36] python312Packages.langchain-chroma: fix build

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

diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index 1ec6ce71ed5d..939759afb2b4 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -28,7 +28,10 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "chromadb" ];
+  pythonRelaxDeps = [
+    "chromadb"
+    "numpy"
+  ];
 
   dependencies = [
     langchain-core

From 1e73e22f30d7ea6f6fbca53142f49ebaf81940a0 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 24 Dec 2024 14:35:26 -0500
Subject: [PATCH 29/36] elixir: add maximumOTPVersion assertion

---
 pkgs/development/interpreters/elixir/1.14.nix |  1 +
 pkgs/development/interpreters/elixir/1.15.nix |  1 +
 pkgs/development/interpreters/elixir/1.16.nix |  1 +
 .../interpreters/elixir/generic-builder.nix   | 32 ++++++++++++++++---
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix
index 1b20938a6108..173941779e40 100644
--- a/pkgs/development/interpreters/elixir/1.14.nix
+++ b/pkgs/development/interpreters/elixir/1.14.nix
@@ -5,4 +5,5 @@ mkDerivation {
   sha256 = "sha256-bCCTjFT+FG1hz+0H6k/izbCmi0JgO3Kkqc3LWWCs5Po=";
   # https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "23";
+  maximumOTPVersion = "26";
 }
diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix
index fe11d552a837..4ed8e67bb8e4 100644
--- a/pkgs/development/interpreters/elixir/1.15.nix
+++ b/pkgs/development/interpreters/elixir/1.15.nix
@@ -4,5 +4,6 @@ mkDerivation {
   sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
   # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
+  maximumOTPVersion = "26";
   escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.16.nix b/pkgs/development/interpreters/elixir/1.16.nix
index fdd9dff12700..1fdb4094494e 100644
--- a/pkgs/development/interpreters/elixir/1.16.nix
+++ b/pkgs/development/interpreters/elixir/1.16.nix
@@ -4,5 +4,6 @@ mkDerivation {
   sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
   # https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
+  maximumOTPVersion = "26";
   escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 64582c98c45b..fb7d83c8cf42 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -16,6 +16,7 @@
   version,
   erlang ? inputs.erlang,
   minimumOTPVersion,
+  maximumOTPVersion ? null,
   sha256 ? null,
   rev ? "v${version}",
   src ? fetchFromGitHub {
@@ -28,14 +29,37 @@
 
 let
   inherit (lib)
-    getVersion
-    versionAtLeast
-    optional
+    assertMsg
     concatStringsSep
+    getVersion
+    optional
+    optionalString
+    toInt
+    versions
+    versionAtLeast
+    versionOlder
     ;
 
+  compatibilityMsg = ''
+    Unsupported elixir and erlang OTP combination.
+
+    elixir ${version}
+    erlang OTP ${getVersion erlang} is not >= ${minimumOTPVersion} ${
+      optionalString (maximumOTPVersion != null) "and <= ${maximumOTPVersion}"
+    }
+
+    See https://hexdocs.pm/elixir/${version}/compatibility-and-deprecations.html
+  '';
+
+  maxShiftMajor = builtins.toString ((toInt (versions.major maximumOTPVersion)) + 1);
+  maxAssert =
+    if (maximumOTPVersion == null) then
+      true
+    else
+      versionOlder (versions.major (getVersion erlang)) maxShiftMajor;
 in
-assert versionAtLeast (getVersion erlang) minimumOTPVersion;
+assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg;
+assert assertMsg maxAssert compatibilityMsg;
 
 stdenv.mkDerivation ({
   pname = "${baseName}";

From f308a423a3c81be77ed307108368dcbc2975adca Mon Sep 17 00:00:00 2001
From: Justin Wood <me@ankhers.dev>
Date: Thu, 19 Dec 2024 16:56:38 -0500
Subject: [PATCH 30/36] elixir_1_18: init at 1.18.1

Co-authored-by: Filip Vavera <github@sgiath.dev>
---
 pkgs/development/beam-modules/default.nix     | 5 +++++
 pkgs/development/interpreters/elixir/1.18.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix               | 2 +-
 pkgs/top-level/beam-packages.nix              | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/elixir/1.18.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 1824694274cb..e8e7d9edceaa 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -45,6 +45,11 @@ let
       # BEAM-based languages.
       elixir = elixir_1_17;
 
+      elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix {
+        inherit erlang;
+        debugInfo = true;
+      };
+
       elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix {
         inherit erlang;
         debugInfo = true;
diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix
new file mode 100644
index 000000000000..640181a6a2af
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.18.nix
@@ -0,0 +1,8 @@
+{ mkDerivation }:
+mkDerivation {
+  version = "1.18.1";
+  sha256 = "sha256-zJNAoyqSj/KdJ1Cqau90QCJihjwHA+HO7nnD1Ugd768=";
+  # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
+  minimumOTPVersion = "25";
+  escriptPath = "lib/elixir/scripts/generate_app.escript";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce6de34cae81..dda81076666c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,7 +7177,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_27 erlang_26 erlang_25 erlang_24
-    elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14
+    elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14
     elixir-ls;
 
   erlang_nox = beam_nox.interpreters.erlang;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index a646ba0dc3b3..92aac4a8d8ee 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -64,6 +64,7 @@ in
     # `beam.packages.erlang_24.elixir`.
     inherit (self.packages.erlang)
       elixir
+      elixir_1_18
       elixir_1_17
       elixir_1_16
       elixir_1_15

From 3f559b72fe3c25811e22dfbcd5a584ed0de29929 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 24 Dec 2024 23:02:21 +0100
Subject: [PATCH 31/36] pylyzer: 0.0.74 -> 0.0.75

Diff: https://github.com/mtshiba/pylyzer/compare/None...v0.0.75

Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.75
---
 pkgs/by-name/py/pylyzer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index 43420e572d59..6e7e8c7e761d 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.74";
+  version = "0.0.75";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     tag = "v${version}";
-    hash = "sha256-NVCFwISPRTNgs4hn9ezp2Xb4r7xytziIByVSKyqt/lo=";
+    hash = "sha256-N0a13nuHL6UuaSTowiEGu0VszW9QTqAmgsUOJXDhj8Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mNFRP6mT4mKKKg05nJcdd8qy6YFxWVADHIU9uGrEcng=";
+  cargoHash = "sha256-LJaAcMajDLrpAKmYATN2xWKmoXaZzOyACzVe4vi4+vU=";
 
   nativeBuildInputs = [
     git
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Fast static code analyzer & language server for Python";
     homepage = "https://github.com/mtshiba/pylyzer";
-    changelog = "https://github.com/mtshiba/pylyzer/releases/tag/${src.tag}";
+    changelog = "https://github.com/mtshiba/pylyzer/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     mainProgram = "pylyzer";

From 11676f8aa9850ef92fc4710d354ce2b24a08a38f Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 12 Nov 2024 14:34:41 +0000
Subject: [PATCH 32/36] minetest: format

Format to match the new standards in nixpkgs
---
 pkgs/games/minetest/default.nix | 192 +++++++++++++++++---------------
 1 file changed, 103 insertions(+), 89 deletions(-)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index b783765df88b..ce7fee501eb3 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,43 +1,44 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gitUpdater
-, cmake
-, coreutils
-, libpng
-, bzip2
-, curl
-, libogg
-, jsoncpp
-, libjpeg
-, libGLU
-, openal
-, libvorbis
-, sqlite
-, luajit
-, freetype
-, gettext
-, doxygen
-, ncurses
-, graphviz
-, xorg
-, gmp
-, libspatialindex
-, leveldb
-, postgresql
-, hiredis
-, libiconv
-, ninja
-, prometheus-cpp
-, OpenGL
-, OpenAL ? openal
-, Carbon
-, Cocoa
-, Kernel
-, buildClient ? true
-, buildServer ? true
-, SDL2
-, useSDL2 ? false
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  cmake,
+  coreutils,
+  libpng,
+  bzip2,
+  curl,
+  libogg,
+  jsoncpp,
+  libjpeg,
+  libGLU,
+  openal,
+  libvorbis,
+  sqlite,
+  luajit,
+  freetype,
+  gettext,
+  doxygen,
+  ncurses,
+  graphviz,
+  xorg,
+  gmp,
+  libspatialindex,
+  leveldb,
+  postgresql,
+  hiredis,
+  libiconv,
+  ninja,
+  prometheus-cpp,
+  OpenGL,
+  OpenAL ? openal,
+  Carbon,
+  Cocoa,
+  Kernel,
+  buildClient ? true,
+  buildServer ? true,
+  SDL2,
+  useSDL2 ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -81,56 +82,66 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs = [
-    jsoncpp
-    gettext
-    freetype
-    sqlite
-    curl
-    bzip2
-    ncurses
-    gmp
-    libspatialindex
-  ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    OpenGL
-    OpenAL
-    Carbon
-    Cocoa
-    Kernel
-  ] ++ lib.optionals buildClient [
-    libpng
-    libjpeg
-    libGLU
-    openal
-    libogg
-    libvorbis
-  ] ++ lib.optionals (buildClient && useSDL2) [
-    SDL2
-  ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
-    xorg.libX11
-    xorg.libXi
-  ] ++ lib.optionals buildServer [
-    leveldb
-    postgresql
-    hiredis
-    prometheus-cpp
-  ];
+  buildInputs =
+    [
+      jsoncpp
+      gettext
+      freetype
+      sqlite
+      curl
+      bzip2
+      ncurses
+      gmp
+      libspatialindex
+    ]
+    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      OpenGL
+      OpenAL
+      Carbon
+      Cocoa
+      Kernel
+    ]
+    ++ lib.optionals buildClient [
+      libpng
+      libjpeg
+      libGLU
+      openal
+      libogg
+      libvorbis
+    ]
+    ++ lib.optionals (buildClient && useSDL2) [
+      SDL2
+    ]
+    ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
+      xorg.libX11
+      xorg.libXi
+    ]
+    ++ lib.optionals buildServer [
+      leveldb
+      postgresql
+      hiredis
+      prometheus-cpp
+    ];
 
-  postPatch = ''
-    substituteInPlace src/filesys.cpp \
-      --replace-fail "/bin/rm" "${coreutils}/bin/rm"
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
-  '';
+  postPatch =
+    ''
+      substituteInPlace src/filesys.cpp \
+        --replace-fail "/bin/rm" "${coreutils}/bin/rm"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
+    '';
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchShebangs $out
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv $out/minetest.app $out/Applications
-  '';
+  postInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      patchShebangs $out
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications
+      mv $out/minetest.app $out/Applications
+    '';
 
   doCheck = true;
 
@@ -144,7 +155,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Infinite-world block sandbox game";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ fpletz fgaz ];
+    maintainers = with maintainers; [
+      fpletz
+      fgaz
+    ];
     mainProgram = if buildClient then "minetest" else "minetestserver";
   };
 })

From c006b91a85bc853d7375eb98d97b289fa9fdf0eb Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 11 Nov 2024 15:31:49 +0000
Subject: [PATCH 33/36] minetest: 5.9.1 -> 5.10.0

Diff: https://github.com/minetest/minetest/compare/5.9.1...5.10.0
---
 .../0000-mark-rm-for-substitution.patch       | 13 +++++++++
 pkgs/games/minetest/default.nix               | 29 ++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/games/minetest/0000-mark-rm-for-substitution.patch

diff --git a/pkgs/games/minetest/0000-mark-rm-for-substitution.patch b/pkgs/games/minetest/0000-mark-rm-for-substitution.patch
new file mode 100644
index 000000000000..8890dc2544a0
--- /dev/null
+++ b/pkgs/games/minetest/0000-mark-rm-for-substitution.patch
@@ -0,0 +1,13 @@
+diff --git a/src/filesys.cpp b/src/filesys.cpp
+index 8881eb2ca..e02d87a9f 100644
+--- a/src/filesys.cpp
++++ b/src/filesys.cpp
+@@ -384,7 +384,7 @@ bool RecursiveDelete(const std::string &path)
+ 	if (child_pid == 0) {
+ 		// Child
+ 		std::array<const char*, 4> argv = {
+-			"rm",
++			"@RM_COMMAND@",
+ 			"-rf",
+ 			path.c_str(),
+ 			nullptr
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index ce7fee501eb3..f77eb46ff613 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   gitUpdater,
+  substitute,
   cmake,
   coreutils,
   libpng,
@@ -43,15 +44,30 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minetest";
-  version = "5.9.1";
+  version = "5.10.0";
 
   src = fetchFromGitHub {
     owner = "minetest";
     repo = "minetest";
     rev = finalAttrs.version;
-    hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w=";
+    hash = "sha256-sumwm8mJghpSriVflMQSHQM4BTmAhfI/Wl/FroLTVts=";
   };
 
+  patches = [
+    (substitute {
+      src = ./0000-mark-rm-for-substitution.patch;
+      substitutions = [
+        "--subst-var-by"
+        "RM_COMMAND"
+        "${coreutils}/bin/rm"
+      ];
+    })
+  ];
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
+  '';
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_CLIENT" buildClient)
     (lib.cmakeBool "BUILD_SERVER" buildServer)
@@ -125,15 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
       prometheus-cpp
     ];
 
-  postPatch =
-    ''
-      substituteInPlace src/filesys.cpp \
-        --replace-fail "/bin/rm" "${coreutils}/bin/rm"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
-    '';
-
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
       patchShebangs $out

From 451ef3994777bb62b136cafd8e95ebbb36277b49 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 11 Nov 2024 16:25:03 +0000
Subject: [PATCH 34/36] minetest: rename to luanti

Moved to pkgs/by-name
Added and updated aliases
Added release note
---
 .../manual/release-notes/rl-2505.section.md   |  2 ++
 .../0000-mark-rm-for-substitution.patch       |  0
 .../lu/luanti/package.nix}                    | 28 ++++++++-----------
 pkgs/top-level/aliases.nix                    |  7 +++--
 pkgs/top-level/all-packages.nix               |  7 ++---
 5 files changed, 20 insertions(+), 24 deletions(-)
 rename pkgs/{games/minetest => by-name/lu/luanti}/0000-mark-rm-for-substitution.patch (100%)
 rename pkgs/{games/minetest/default.nix => by-name/lu/luanti/package.nix} (86%)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 1caa762d4ebf..a358e5d1007a 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -121,6 +121,8 @@
 
 - `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.
 
+- `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details.
+
 - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
 
 - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
diff --git a/pkgs/games/minetest/0000-mark-rm-for-substitution.patch b/pkgs/by-name/lu/luanti/0000-mark-rm-for-substitution.patch
similarity index 100%
rename from pkgs/games/minetest/0000-mark-rm-for-substitution.patch
rename to pkgs/by-name/lu/luanti/0000-mark-rm-for-substitution.patch
diff --git a/pkgs/games/minetest/default.nix b/pkgs/by-name/lu/luanti/package.nix
similarity index 86%
rename from pkgs/games/minetest/default.nix
rename to pkgs/by-name/lu/luanti/package.nix
index f77eb46ff613..b1ecde1e43dc 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -31,11 +31,7 @@
   libiconv,
   ninja,
   prometheus-cpp,
-  OpenGL,
-  OpenAL ? openal,
-  Carbon,
-  Cocoa,
-  Kernel,
+  darwin,
   buildClient ? true,
   buildServer ? true,
   SDL2,
@@ -43,7 +39,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "minetest";
+  pname = "luanti";
   version = "5.10.0";
 
   src = fetchFromGitHub {
@@ -85,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
     (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
     (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share")
-    (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/minetest")
+    (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/luanti")
     (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man")
     (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale")
 
@@ -113,11 +109,11 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libiconv
-      OpenGL
-      OpenAL
-      Carbon
-      Cocoa
-      Kernel
+      darwin.apple_sdk.frameworks.OpenGL
+      darwin.apple_sdk.frameworks.OpenAL
+      darwin.apple_sdk.frameworks.Carbon
+      darwin.apple_sdk.frameworks.Cocoa
+      darwin.apple_sdk.frameworks.Kernel
     ]
     ++ lib.optionals buildClient [
       libpng
@@ -147,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
-      mv $out/minetest.app $out/Applications
+      mv $out/luanti.app $out/Applications
     '';
 
   doCheck = true;
@@ -158,14 +154,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    homepage = "https://minetest.net/";
-    description = "Infinite-world block sandbox game";
+    homepage = "https://www.luanti.org/";
+    description = "An open source voxel game engine (formerly Minetest)";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [
       fpletz
       fgaz
     ];
-    mainProgram = if buildClient then "minetest" else "minetestserver";
+    mainProgram = if buildClient then "luanti" else "luantiserver";
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 05c5d2924793..d7a6b1472926 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -828,9 +828,10 @@ mapAliases {
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
   mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
   mime-types = mailcap; # Added 2022-01-21
-  minetest-touch = minetestclient; # Added 2024-08-12
-  minetestclient_5 = minetestclient; # Added 2023-12-11
-  minetestserver_5 = minetestserver; # Added 2023-12-11
+  minetest = luanti; # Added 2024-11-11
+  minetestclient = luanti-client; # Added 2024-11-11
+  minetestserver = luanti-server; # Added 2024-11-11
+  minetest-touch = luanti-client; # Added 2024-08-12
   minizip2 = pkgs.minizip-ng; # Added 2022-12-28
   mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
   mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17755c49a668..a694f39b4b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16773,11 +16773,8 @@ with pkgs;
   minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
   minecraft-server = minecraftServers.vanilla; # backwards compatibility
 
-  minetest = callPackage ../games/minetest {
-    inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel;
-  };
-  minetestclient = minetest.override { buildServer = false; };
-  minetestserver = minetest.override { buildClient = false; };
+  luanti-client = luanti.override { buildServer = false; };
+  luanti-server = luanti.override { buildClient = false; };
 
   mnemosyne = callPackage ../games/mnemosyne {
     python = python3;

From a70c3d18ccd3bd2c8c1fc3f90f8866681104e5b2 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 13 Nov 2024 09:38:14 +0000
Subject: [PATCH 35/36] luanti: add jk to maintainers list

---
 pkgs/by-name/lu/luanti/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix
index b1ecde1e43dc..e370c28dc14c 100644
--- a/pkgs/by-name/lu/luanti/package.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -161,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [
       fpletz
       fgaz
+      jk
     ];
     mainProgram = if buildClient then "luanti" else "luantiserver";
   };

From 13bb42f293220b4bf465c172677f3fc532aeec00 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Tue, 24 Dec 2024 13:53:13 -0800
Subject: [PATCH 36/36] darktable: Update deps to make cmake stop complaining
 and fix nix-update script.

---
 pkgs/by-name/da/darktable/package.nix | 35 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix
index 41c63a54bc4f..df3bb7986b35 100644
--- a/pkgs/by-name/da/darktable/package.nix
+++ b/pkgs/by-name/da/darktable/package.nix
@@ -16,6 +16,7 @@
   # buildInputs
   SDL2,
   adwaita-icon-theme,
+  alsa-lib,
   cairo,
   curl,
   exiv2,
@@ -31,9 +32,14 @@
   json-glib,
   lcms2,
   lensfun,
+  lerc,
   libaom,
   libavif,
+  libdatrie,
+  libepoxy,
   libexif,
+  libgcrypt,
+  libgpg-error,
   libgphoto2,
   libheif,
   libjpeg,
@@ -42,21 +48,29 @@
   librsvg,
   libsecret,
   libsoup_2_4,
+  libsysprof-capture,
+  libthai,
   libtiff,
   libwebp,
   libxslt,
   lua,
+  util-linux,
   openexr_3,
   openjpeg,
   osm-gps-map,
-  pcre,
+  pcre2,
   portmidi,
   pugixml,
   sqlite,
   # Linux only
   colord,
   colord-gtk,
+  libselinux,
+  libsepol,
   libX11,
+  libXdmcp,
+  libxkbcommon,
+  libXtst,
   ocl-icd,
   # Darwin only
   gtk-mac-integration,
@@ -89,6 +103,7 @@ stdenv.mkDerivation rec {
     [
       SDL2
       adwaita-icon-theme
+      alsa-lib
       cairo
       curl
       exiv2
@@ -104,9 +119,14 @@ stdenv.mkDerivation rec {
       json-glib
       lcms2
       lensfun
+      lerc
       libaom
       libavif
+      libdatrie
+      libepoxy
       libexif
+      libgcrypt
+      libgpg-error
       libgphoto2
       libheif
       libjpeg
@@ -115,14 +135,17 @@ stdenv.mkDerivation rec {
       librsvg
       libsecret
       libsoup_2_4
+      libsysprof-capture
+      libthai
       libtiff
       libwebp
       libxslt
       lua
+      util-linux
       openexr_3
       openjpeg
       osm-gps-map
-      pcre
+      pcre2
       portmidi
       pugixml
       sqlite
@@ -130,7 +153,12 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       colord
       colord-gtk
+      libselinux
+      libsepol
       libX11
+      libXdmcp
+      libxkbcommon
+      libXtst
       ocl-icd
     ]
     ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration
@@ -173,7 +201,8 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "release-";
-    url = "https://github.com/darktable-org/darktable";
+    odd-unstable = true;
+    url = "https://github.com/darktable-org/darktable.git";
   };
 
   meta = {