From ffd16f7647dd7a7fda56106e05bc2b42d4eea0f6 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Wed, 15 Jan 2025 15:06:58 +0000
Subject: [PATCH 01/48] zabbix70: 7.0.7 -> 7.0.8

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 3d4f6d1fa7e3..8b6197ee6755 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
 generic: {
   v70 = generic {
-    version = "7.0.7";
-    hash = "sha256-GZv0OAXCkiVl1yhhFuH1fv/qormFwa/IK/urHmp1RIM=";
+    version = "7.0.8";
+    hash = "sha256-VYfyJ/ASjQgG5VyWWB9iNNanG+3v2pCZFkwLXyWmdYI=";
     vendorHash = null;
   };
   v64 = generic {

From 48d96f4be3f39712e0f416d0eb5e5a3794a5cacd Mon Sep 17 00:00:00 2001
From: Adriano Caloiaro <code@adriano.fyi>
Date: Wed, 1 Jan 2025 09:50:02 -0700
Subject: [PATCH 02/48] di-tui: init at 1.11.1

---
 pkgs/by-name/di/di-tui/package.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/di/di-tui/package.nix

diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
new file mode 100644
index 000000000000..439237d27497
--- /dev/null
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  nix-update-script,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "di-tui";
+  version = "1.11.1";
+
+  src = fetchFromGitHub {
+    owner = "acaloiaro";
+    repo = "di-tui";
+    rev = "v${version}";
+    hash = "sha256-jX+2wdnkJPEtCWoMNbwgn3c+LsEktYa5lIfSXY0Wsew=";
+  };
+
+  vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A simple terminal UI player for di.fm";
+    homepage = "https://github.com/acaloiaro/di-tui";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.acaloiaro ];
+    mainProgram = "di-tui";
+  };
+}

From 5f7b18b5af51a615080d60d39f3ffcd38e5bae68 Mon Sep 17 00:00:00 2001
From: Adriano Caloiaro <code@adriano.fyi>
Date: Wed, 29 Jan 2025 07:26:55 -0700
Subject: [PATCH 03/48] maintainers: add acaloiaro

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 694ac60eb114..7c395ae9121a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -499,6 +499,18 @@
     githubId = 1517066;
     name = "Aiken Cairncross";
   };
+  acaloiaro = {
+    email = "code@adriano.fyi";
+    githubId = 3331648;
+    github = "acaloiaro";
+    matrix = "@adriano@beeper.com";
+    name = "Adriano Caloiaro";
+    keys = [
+      {
+        fingerprint = "DCBD 2175 8A30 9C1F 41D7  A0FC 890F FDB1 1860 FE1C";
+      }
+    ];
+  };
   a-camarillo = {
     name = "Anthony Camarillo";
     email = "anthony.camarillo.96@gmail.com";

From e3610c39f74dc41a592d2b0af50368a33398dc8e Mon Sep 17 00:00:00 2001
From: jjtt <3908945+jjtt@users.noreply.github.com>
Date: Sun, 17 Nov 2024 20:06:34 +0200
Subject: [PATCH 04/48] maintainers: add jjtt

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0072f5ab6826..7882d9226edd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10892,6 +10892,11 @@
     githubId = 691552;
     name = "Jamie McClymont";
   };
+  jjtt = {
+    github = "jjtt";
+    githubId = 3908945;
+    name = "Juho Törmä";
+  };
   jk = {
     email = "hello+nixpkgs@j-k.io";
     matrix = "@j-k:matrix.org";

From 59a791c1970848c3d0827eb295fdb3bf49e043fb Mon Sep 17 00:00:00 2001
From: jjtt <3908945+jjtt@users.noreply.github.com>
Date: Wed, 29 Jan 2025 20:24:46 +0200
Subject: [PATCH 05/48] cfv: init at 3.1.0

---
 pkgs/by-name/cf/cfv/package.nix | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/cf/cfv/package.nix

diff --git a/pkgs/by-name/cf/cfv/package.nix b/pkgs/by-name/cf/cfv/package.nix
new file mode 100644
index 000000000000..dcac59f78f1d
--- /dev/null
+++ b/pkgs/by-name/cf/cfv/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  pkgs,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "cfv";
+  version = "3.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cfv-project";
+    repo = "cfv";
+    tag = "v${version}";
+    sha256 = "1wxf30gsijsdvhv5scgkq0bqi8qi4dgs9dwppdrca5wxgy7a8sn5";
+  };
+
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    cd test
+    python3 test.py
+    runHook postCheck
+  '';
+
+  nativeCheckInputs = [
+    pkgs.cksfv
+  ];
+
+  meta = {
+    description = "Utility to verify and create a wide range of checksums";
+    homepage = "https://github.com/cfv-project/cfv";
+    changelog = "https://github.com/cfv-project/cfv/releases/tag/v${version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ jjtt ];
+    mainProgram = "cfv";
+  };
+}

From 5ad45e8e4d6fdb372af759bbfaabce741821dbea Mon Sep 17 00:00:00 2001
From: jjtt <3908945+jjtt@users.noreply.github.com>
Date: Wed, 29 Jan 2025 20:37:47 +0200
Subject: [PATCH 06/48] cfv: avoid file descriptor warn from tests

See: https://github.com/cfv-project/cfv/issues/22
---
 pkgs/by-name/cf/cfv/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cf/cfv/package.nix b/pkgs/by-name/cf/cfv/package.nix
index dcac59f78f1d..46d62a01571b 100644
--- a/pkgs/by-name/cf/cfv/package.nix
+++ b/pkgs/by-name/cf/cfv/package.nix
@@ -24,6 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   checkPhase = ''
     runHook preCheck
     cd test
+    ulimit -n 4096
     python3 test.py
     runHook postCheck
   '';

From 3366dda7f46e67a7e45ddb97fe1f704504fcc3bd Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 2 Feb 2025 11:26:58 +0100
Subject: [PATCH 07/48] python312Packages.pymatreader: 0.0.31 -> 1.0.0

---
 .../python-modules/pymatreader/default.nix       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pymatreader/default.nix b/pkgs/development/python-modules/pymatreader/default.nix
index 486e88a313a4..d51b4d0b59cf 100644
--- a/pkgs/development/python-modules/pymatreader/default.nix
+++ b/pkgs/development/python-modules/pymatreader/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  setuptools,
+  hatchling,
   h5py,
   numpy,
   scipy,
@@ -12,17 +12,23 @@
 
 buildPythonPackage rec {
   pname = "pymatreader";
-  version = "0.0.31";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "obob";
     repo = "pymatreader";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-pYObmvqA49sHjpZcwXkN828R/N5CSpmr0OyyxzDiodQ=";
+    tag = "v${version}";
+    hash = "sha256-cDEGEvBSj3gmjA+8aXULwuBVk09BLQbA91CNAxgtiLA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'source = "regex_commit"' "" \
+      --replace-fail '"hatch-regex-commit"' ""
+  '';
+
+  build-system = [ hatchling ];
 
   propagatedBuildInputs = [
     h5py

From 96f4f2b988ad70bac76e07bb5b6b67b511eb3dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Tue, 28 Jan 2025 10:43:19 +0100
Subject: [PATCH 08/48] free42: fix import/export menus by switching from gtk3
 to wrapGAppsHook3 (#377260)

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

diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index ee1be3804755..b51861886c61 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   alsa-lib,
   copyDesktopItems,
-  gtk3,
+  wrapGAppsHook3,
   makeDesktopItem,
   pkg-config,
 }:
@@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     copyDesktopItems
     pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     alsa-lib
-    gtk3
   ];
 
   postPatch = ''

From 47c6ab8f4c19220590b736d345a68c128a831abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcell=20T=C3=B3th?= <elfenermarcell@gmail.com>
Date: Tue, 28 Jan 2025 11:00:12 +0100
Subject: [PATCH 09/48] free42: fix desktop icons

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

diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index b51861886c61..fa3afdf1aadb 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
       exec = "free42bin";
       type = "Application";
       comment = "A software clone of HP-42S Calculator";
+      icon = "free42";
       categories = [
         "Utility"
         "Calculator"
@@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
       exec = "free42dec";
       type = "Application";
       comment = "A software clone of HP-42S Calculator";
+      icon = "free42";
       categories = [
         "Utility"
         "Calculator"
@@ -87,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     install -m644 gtk/README $out/share/doc/free42/README-GTK
     install -m644 README $out/share/doc/free42/README
 
-    install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps
-    install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps
+    install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps/free42.xpm
+    install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps/free42.xpm
     install -m644 skins/* $out/share/free42/skins
 
     runHook postInstall

From baa7d4d6f0ee79c71e9ce46124b7156b4023b33c Mon Sep 17 00:00:00 2001
From: Benoit de Chezelles <benoit.dechezelles@gmail.com>
Date: Sat, 11 Jan 2025 08:46:43 +0100
Subject: [PATCH 10/48] rofi-file-browser: Fix build error & warnings

- Fix a hard build error due to incompatible pointer type
- Fix build on i686 where `gsize` is not a `unsigned long`
- Fix glib-related warning about deprecated functions
---
 .../rofi-file-browser/fix_build_on_i686.patch | 13 +++
 .../fix_incompatible_pointer_type.patch       | 27 ++++++
 .../fix_recent_glib_deprecation_warning.patch | 83 +++++++++++++++++++
 pkgs/by-name/ro/rofi-file-browser/package.nix |  6 ++
 4 files changed, 129 insertions(+)
 create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch
 create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch
 create mode 100644 pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch

diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch b/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch
new file mode 100644
index 000000000000..95c01a8e4ac4
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-file-browser/fix_build_on_i686.patch
@@ -0,0 +1,13 @@
+diff --git a/src/icons.c b/src/icons.c
+index eee00a4..ae476de 100644
+--- a/src/icons.c
++++ b/src/icons.c
+@@ -48,7 +48,7 @@ void request_icons_for_file ( FBFile *fbfile, int icon_size, FileBrowserIconData
+         }
+     }
+ 
+-    unsigned long num_icon_names;
++    gsize num_icon_names;
+     char** icon_names_raw = g_array_steal ( icon_names, &num_icon_names );
+ 
+     /* Create icon fetcher requests. */
diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch b/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch
new file mode 100644
index 000000000000..3108deb1fa43
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-file-browser/fix_incompatible_pointer_type.patch
@@ -0,0 +1,27 @@
+diff --git a/src/filebrowser.c b/src/filebrowser.c
+index a5a19af..59f0140 100644
+--- a/src/filebrowser.c
++++ b/src/filebrowser.c
+@@ -256,21 +256,21 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec
+         FBCmd *fbcmd = &pd->cmds[selected_line];
+         char* name = fbcmd->name != NULL ? fbcmd->name : fbcmd->cmd;
+         return rofi_force_utf8 ( name, strlen ( name ) );
+     } else {
+         int index = pd->open_custom ? pd->open_custom_index : selected_line;
+         FBFile *fbfile = &fd->files[index];
+         return rofi_force_utf8 ( fbfile->name, strlen ( fbfile->name ) );
+     }
+ }
+ 
+-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height )
++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height )
+ {
+     FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw );
+     FileBrowserFileData *fd = &pd->file_data;
+     FileBrowserIconData *id = &pd->icon_data;
+ 
+     if ( ! id->show_icons ) {
+         return NULL;
+     }
+ 
+     if ( pd->open_custom && pd->show_cmds ) {
diff --git a/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch b/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch
new file mode 100644
index 000000000000..829905de44c2
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-file-browser/fix_recent_glib_deprecation_warning.patch
@@ -0,0 +1,83 @@
+diff --git a/src/cmds.c b/src/cmds.c
+index b2f61d7..16554d8 100644
+--- a/src/cmds.c
++++ b/src/cmds.c
+@@ -108,21 +108,21 @@ void search_path_for_cmds ( FileBrowserModePrivateData *pd )
+         fbcmd->cmd = cmdstr;
+         fbcmd->name = NULL;
+         fbcmd->icon_name = NULL;
+ 
+         num_cmds++;
+     }
+ 
+     g_hash_table_steal_all ( table );
+     g_hash_table_destroy ( table );
+ 
+-    g_qsort_with_data ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL );
++    g_sort_array ( cmds, num_cmds, sizeof ( FBCmd ), compare_cmds, NULL );
+ 
+     add_cmds(cmds, num_cmds, pd);
+ 
+     g_free ( cmds );
+ }
+ 
+ void destroy_cmds ( FileBrowserModePrivateData *pd )
+ {
+     for ( int i = 0; i < pd->num_cmds; i++ ) {
+         g_free( pd->cmds[i].cmd );
+diff --git a/src/files.c b/src/files.c
+index 29a5f9c..6a15b2e 100644
+--- a/src/files.c
++++ b/src/files.c
+@@ -135,46 +135,46 @@ void load_files ( FileBrowserFileData *fd )
+     FBFile *sort_files = fd->files;
+     int num_sort_files = fd->num_files;
+     if ( ! fd->hide_parent ) {
+         sort_files++;
+         num_sort_files--;
+     }
+ 
+     /* Sort all but the parent dir. */
+     if ( fd->sort_by_type ) {
+         if ( fd->sort_by_depth ) {
+-            g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL );
++            g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth_type, NULL );
+         } else {
+-            g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL );
++            g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_type, NULL );
+         }
+     } else {
+         if ( fd->sort_by_depth ) {
+-            g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL );
++            g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files_depth, NULL );
+         } else {
+-            g_qsort_with_data ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL );
++            g_sort_array ( sort_files, num_sort_files, sizeof ( FBFile ), compare_files, NULL );
+         }
+     }
+ }
+ 
+ void change_dir ( char *path, FileBrowserFileData *pd )
+ {
+     char* new_dir = get_canonical_abs_path ( path, pd->current_dir );
+     g_free ( pd->current_dir );
+     pd->current_dir = new_dir;
+     g_chdir ( new_dir );
+ }
+ 
+ static bool match_glob_patterns ( const char *basename, FileBrowserFileData *fd )
+ {
+     int len = strlen ( basename );
+     for ( int i = 0; i < fd->num_exclude_patterns; i++ ) {
+-        if ( g_pattern_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
++        if ( g_pattern_spec_match ( fd->exclude_patterns[i], len, basename, NULL ) ) {
+             return false;
+         }
+     }
+     return true;
+ }
+ 
+ static int add_file ( const char *fpath, G_GNUC_UNUSED const struct stat *sb, int typeflag, struct FTW *ftwbuf )
+ {
+     FileBrowserFileData *fd = global_fd;
+ 
diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
index 76bd8da4488a..025851b0d4dc 100644
--- a/pkgs/by-name/ro/rofi-file-browser/package.nix
+++ b/pkgs/by-name/ro/rofi-file-browser/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    ./fix_incompatible_pointer_type.patch
+    ./fix_build_on_i686.patch
+    ./fix_recent_glib_deprecation_warning.patch
+  ];
+
   prePatch = ''
     substituteInPlace ./CMakeLists.txt \
       --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \

From c81ae66b15b168b8464ab1625c5a611f6d595028 Mon Sep 17 00:00:00 2001
From: Benoit de Chezelles <benoit.dechezelles@gmail.com>
Date: Sat, 11 Jan 2025 08:59:40 +0100
Subject: [PATCH 11/48] rofi-file-browser: add bew as maintainer

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

diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
index 025851b0d4dc..f1c266a520f9 100644
--- a/pkgs/by-name/ro/rofi-file-browser/package.nix
+++ b/pkgs/by-name/ro/rofi-file-browser/package.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
     description = "Use rofi to quickly open files";
     homepage = "https://github.com/marvinkreis/rofi-file-browser-extended";
     license = licenses.mit;
-    maintainers = with maintainers; [ jluttine ];
+    maintainers = with maintainers; [
+      bew
+      jluttine
+    ];
   };
 }

From 285e69b42fbf6b72185573839d03182a7f5216af Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 6 Feb 2025 08:31:02 +0100
Subject: [PATCH 12/48] go_1_24: rc2 -> rc3

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/development/compilers/go/1.24.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index b0f264771224..9daecc98a7aa 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -49,11 +49,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24rc2";
+  version = "1.24rc3";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-uge2hj8ggWDo8J8RyLlYJym1HP63Us5rp5o3m0+8rG0=";
+    hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE=";
   };
 
   strictDeps = true;

From 65cb8867f8b380bd7443cf1ba0520bbf9809fc60 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 6 Feb 2025 08:39:39 +0100
Subject: [PATCH 13/48] go: update 1.22 bootstrap to 1.22.12

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../development/compilers/go/bootstrap122.nix | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/compilers/go/bootstrap122.nix b/pkgs/development/compilers/go/bootstrap122.nix
index bed8c1c42197..ddd2632282d0 100644
--- a/pkgs/development/compilers/go/bootstrap122.nix
+++ b/pkgs/development/compilers/go/bootstrap122.nix
@@ -1,27 +1,27 @@
 { callPackage }:
 callPackage ./binary.nix {
-  version = "1.22.11";
+  version = "1.22.12";
   hashes = {
     # Use `print-hashes.sh ${version}` to generate the list below
-    darwin-amd64 = "c6d130066d509ccca1164d84514905b1e8dc5f5f4c25c24113f1b65ad87cd020";
-    darwin-arm64 = "3980b1d2be042a164989f2fd24f0bb306a2397d581a29c7426885578b369db5d";
-    freebsd-386 = "ab10063b2620de387b74bc2eeadc2642a960b1c97c3fc8193447977954262241";
-    freebsd-amd64 = "7910de647cab36eea010da64c07c31484a2c94e0447a0d81f339415de0def2a4";
-    freebsd-arm64 = "9b5043744bd56d36d66ed193776952dd5ebdef31302d6b209e9e87f3b3936e85";
-    freebsd-armv6l = "31cebf4d5280db96dc742fb71301eae5ca4ada5b48b76fb339a03bf857288eeb";
-    freebsd-riscv64 = "b8196ed8ee94eb4c3bbbd4147af9362ffc6b77511dabaf9beb60ac072cf00ead";
-    linux-386 = "b40ee463437e8c8f2d6c9685a0e166eaecb36615afa362eaa58459d3369f3baf";
-    linux-amd64 = "0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991";
-    linux-arm64 = "9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031";
-    linux-armv6l = "ac3ba3e0433d96b041f683e9bbb791ca39e159b3d4bb948de4ab3a2c1af1b257";
-    linux-loong64 = "83ced97550e9afc82a48d98534a2457c9662a9071a35439558a70167c8cd513b";
-    linux-mips = "e8c507c5516328e61e7af442f4901f3481859679284eff20198b4180f98fdfd9";
-    linux-mips64 = "22ad73f1762a3129b96f398f4c65fe8a63f5e5657d4bc7f14e153728777ab323";
-    linux-mips64le = "d4ad600a7c6b3c113984b1c301afec67a696a598b0f0ed2841a52c3b9051cd2d";
-    linux-mipsle = "5ebd447b07f33b57e264c80a8229e5c7e09bbc3203efdd72568e7e3267538479";
-    linux-ppc64 = "d3b8cda5a35d9ae670096d88cb8763424d1ac1c720521564eef8dc0dd68c2bc2";
-    linux-ppc64le = "963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12";
-    linux-riscv64 = "150fd528397622764285f807d3343c36d052ed8cfc390a95e6336738c53f68f4";
-    linux-s390x = "1a235afe650dee989fb37fef6aa520f35e4cd557c31453f3e82b553da3a90669";
+    darwin-amd64 = "e7bbe07e96f0bd3df04225090fe1e7852ed33af37c43a23e16edbbb3b90a5b7c";
+    darwin-arm64 = "416c35218edb9d20990b5d8fc87be655d8b39926f15524ea35c66ee70273050d";
+    freebsd-386 = "85b00f8646e84be6ce51c753d22b68a5f4d5bbfc6a82c8ca9e7489c0c5a619d8";
+    freebsd-amd64 = "a8c77e76859db3e6f3322cbe11deea5faf779e374f45df7554d2cb484ffa492a";
+    freebsd-arm64 = "f56d3b2d26acd9e720f8be503d92bb7bb5d921462ff7c92463d0fa550507ed93";
+    freebsd-armv6l = "dac691ce62ac6b9c78f45a0058d7656abedbe5665b3d49910cbd6ba12e20c2fb";
+    freebsd-riscv64 = "d147c0c8faaffed65240f3b4fe5e44e573928827b9292fb873c9712d567fa986";
+    linux-386 = "40d4c297bc2e964e9c96fe79bb323dce79b77b8b103fc7cc52e0a87c7849890f";
+    linux-amd64 = "4fa4f869b0f7fc6bb1eb2660e74657fbf04cdd290b5aef905585c86051b34d43";
+    linux-arm64 = "fd017e647ec28525e86ae8203236e0653242722a7436929b1f775744e26278e7";
+    linux-armv6l = "bcd678461bb74cda217fb5aa3cc914b2021be6d828f0c6fb4e3a36c3d7312acb";
+    linux-loong64 = "ef1644676782354369210ed6cd839ff872de886c38f287d29ac69377928edec1";
+    linux-mips = "993c685dad0a59f9f15f76a2eb9146f741ef36d808f38985bc6748b38000746d";
+    linux-mips64 = "d8aa3dea17e0175d6a57dfdf9b3b29a911ebe8c5ddbefd808eab61a842c00229";
+    linux-mips64le = "2d473895f9c1dc8c86d51eb13f8ca49b7eea46010759fd71efed3eecacf5335b";
+    linux-mipsle = "d4ba5f6215643a1d64dc159869663f71dd339598e99678e97e1c5300bb46d46d";
+    linux-ppc64 = "ab0b6dc2aa1096f256224398d4a34eac5257289146cdc2f3a62b9fc17709a3c5";
+    linux-ppc64le = "9573d30003b0796717a99d9e2e96c48fddd4fc0f29d840f212c503b03d7de112";
+    linux-riscv64 = "f03a084aabc812fdc15b29acd5e1ee18e13b3c80be22aec43990119afcaf4947";
+    linux-s390x = "e1b20935cc790fdc4c48c0e3e6dd11be57ac09e4eb302ba2cdf146276468b346";
   };
 }

From 8d2451762bfa92e504767dcac62cd69e3a4e4a97 Mon Sep 17 00:00:00 2001
From: emaryn <197520219+emaryn@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:44:36 +0000
Subject: [PATCH 14/48] qtscrcpy: 3.0.1 -> 3.1.0

---
 pkgs/by-name/qt/qtscrcpy/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix
index 3b93472102d7..b3233950779b 100644
--- a/pkgs/by-name/qt/qtscrcpy/package.nix
+++ b/pkgs/by-name/qt/qtscrcpy/package.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation rec {
   pname = "qtscrcpy";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src =
     (fetchFromGitHub {
       owner = "barry-ran";
       repo = "QtScrcpy";
       tag = "v${version}";
-      hash = "sha256-uAWVPmULT2aK+XVZ8eAjCbP8TgDlBDTEvKs25yZktCI=";
+      hash = "sha256-wnzJHSx+HcbtcXDDksog4SAXEf1spcuXQ6+vdysPYQY=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace QtScrcpy/QtScrcpyCore/{include/QtScrcpyCoreDef.h,src/device/server/server.h} \
-      --replace-fail 'serverVersion = "2.1.1"' 'serverVersion = "${scrcpy.version}"'
+      --replace-fail 'serverVersion = "3.1"' 'serverVersion = "${scrcpy.version}"'
     substituteInPlace QtScrcpy/util/config.cpp \
-      --replace-fail 'COMMON_SERVER_VERSION_DEF "2.1.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
+      --replace-fail 'COMMON_SERVER_VERSION_DEF "3.1"' 'COMMON_SERVER_VERSION_DEF "${scrcpy.version}"'
     substituteInPlace QtScrcpy/audio/audiooutput.cpp \
       --replace-fail 'sndcpy.sh' "$out/share/qtscrcpy/sndcpy.sh"
     substituteInPlace QtScrcpy/sndcpy/sndcpy.sh \

From c1197af4f52b51420e72f46ead50a3d8dc524c96 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Feb 2025 09:28:47 +0100
Subject: [PATCH 15/48] sqlfluff: 3.3.0 -> 3.3.1

Changelog: https://github.com/sqlfluff/sqlfluff/blob/3.3.1/CHANGELOG.md
---
 pkgs/by-name/sq/sqlfluff/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix
index e3ef6f08f1d0..edff3337e1fc 100644
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
     tag = version;
-    hash = "sha256-srsSDMvZ7lDDfDuINB0nXR2u+X+bzMqOZL9tvl9GI/s=";
+    hash = "sha256-PQSGB8723y0+cptoLHpXzXfSQFicf5tasbTEf0efA8c=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -62,6 +62,8 @@ python3.pkgs.buildPythonApplication rec {
     "test__linter__skip_dbt_model_disabled"
     "test_rules__test_helper_has_variable_introspection"
     "test__rules__std_file_dbt"
+    # Assertion failure
+    "test_html_with_external_css"
   ];
 
   pythonImportsCheck = [ "sqlfluff" ];

From 436b335c14928b849fbfba7fa38ccd4f0de47de6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Feb 2025 16:19:06 +0100
Subject: [PATCH 16/48] python312Packages.diff-cover: disable failing test

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

diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 6a21fda8b18b..7079f082b028 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -56,6 +56,9 @@ buildPythonPackage rec {
     "file_does_not_exist"
     # Comparing console output doesn't work reliable
     "console"
+    # Assertion failure
+    "test_html_with_external_css"
+    "test_style_defs"
   ];
 
   pythonImportsCheck = [ "diff_cover" ];

From b92e8eeefa29843f6b8e6416afab90a793a802a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Feb 2025 16:20:10 +0100
Subject: [PATCH 17/48] python312Packages.diff-cover: refactor

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

diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix
index 7079f082b028..c1e0f4f64b85 100644
--- a/pkgs/development/python-modules/diff-cover/default.nix
+++ b/pkgs/development/python-modules/diff-cover/default.nix
@@ -21,7 +21,7 @@
 buildPythonPackage rec {
   pname = "diff-cover";
   version = "9.2.1";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -31,9 +31,9 @@ buildPythonPackage rec {
     hash = "sha256-X6Wy1xzPXRbNIipxwsoGnZv1+j1lf2+sm02cIzeTI78=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     chardet
     jinja2
     jinja2-pluralize

From a7920d854ab23e343ec800b27a8c6c19ddb03d7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 15:40:33 +0000
Subject: [PATCH 18/48] mopac: 23.0.3 -> 23.1.0

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

diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 903b178869d6..901556bf7f51 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mopac";
-  version = "23.0.3";
+  version = "23.1.0";
 
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-y9/b+ro9CgDo0ld9q+3xaCFE9J5ssZp6W9ct6WQgD/o=";
+    hash = "sha256-E7iiAAV+QPYAuTNh0qYOvB2GS/UXQ8YjPYy+Ms7aN3M=";
   };
 
   nativeBuildInputs = [

From 9440dc204ee058c6c233a0161927cde062e0bc8c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 7 Feb 2025 16:43:23 +0100
Subject: [PATCH 19/48] python312Packages.reflex-hosting-cli: add pyyaml

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

diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index a4b7700170e4..c64f5c81cabd 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -9,6 +9,7 @@
   platformdirs,
   pydantic,
   python-dateutil,
+  pyyaml,
   rich,
   tabulate,
   typer,
@@ -38,6 +39,7 @@ buildPythonPackage rec {
     platformdirs
     pydantic
     python-dateutil
+    pyyaml
     rich
     tabulate
     typer

From d45d5d9c6d8ca770c96a197b470b5983c9b09bbc Mon Sep 17 00:00:00 2001
From: Pamplemousse <git@xaviermaso.com>
Date: Fri, 7 Feb 2025 17:17:10 +0100
Subject: [PATCH 20/48] dep-scan: fix build

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

diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix
index 561d97debfa1..bb69f4cb0f87 100644
--- a/pkgs/by-name/de/dep-scan/package.nix
+++ b/pkgs/by-name/de/dep-scan/package.nix
@@ -9,7 +9,7 @@ let
     python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec {
       version = "5.7.8";
       src = oldAttrs.src.override {
-        rev = "refs/tags/v${version}";
+        tag = "v${version}";
         hash = "sha256-R00/a9+1NctVPi+EL7K65w/e88c9oSW5xXGgno+MCXo=";
       };
     })
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "dep-scan";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-QTvxKoqBxTb/xFaIHsYe3N+7ABJ6sDd2vVcjkMbm3xI=";
   };
 

From c30829cc0cd6b1fd7e6d4c03a20088089d1bc565 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 16:08:41 +0100
Subject: [PATCH 21/48] python312Packages.blackjax: 1.2.4 -> 1.2.5

Diff: https://github.com/blackjax-devs/blackjax/compare/refs/tags/1.2.4...1.2.5

Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.2.5
---
 pkgs/development/python-modules/blackjax/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix
index 5b02bf3450d6..e89e390771a7 100644
--- a/pkgs/development/python-modules/blackjax/default.nix
+++ b/pkgs/development/python-modules/blackjax/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "blackjax";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blackjax-devs";
     repo = "blackjax";
     tag = version;
-    hash = "sha256-qaQBbRAKExRHr4Uhm5/Q1Ydon6ePsjG2PWbwSdR9QZM=";
+    hash = "sha256-2GTjKjLIWFaluTjdWdUF9Iim973y81xv715xspghRZI=";
   };
 
   build-system = [ setuptools-scm ];

From cf53cd618af9ec744e9deb57b127eb993ce847bc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 16:44:20 +0100
Subject: [PATCH 22/48] python312Packages.cvxpy: disable failing tests

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

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index de88b31cce3e..bd32bc8ebedb 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -75,6 +75,11 @@ buildPythonPackage rec {
     "test_diffcp_sdp_example"
     "test_huber"
     "test_partial_problem"
+
+    # cvxpy.error.SolverError: Solver 'CVXOPT' failed. Try another solver, or solve with verbose=True for more information.
+    "test_oprelcone_1_m1_k3_complex"
+    "test_oprelcone_1_m3_k1_complex"
+    "test_oprelcone_2"
   ];
 
   pythonImportsCheck = [ "cvxpy" ];

From 1bc4ebfb35a9f74f9b0d1d22bb3a76a47461239f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 17:13:40 +0100
Subject: [PATCH 23/48] python312Packages.qutip: add aarch64-linux to
 badPlatforms

---
 .../python-modules/qutip/default.nix          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
index d5c0dea156b0..28d8d16087e7 100644
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -17,6 +17,7 @@
   # tests
   pytestCheckHook,
   pytest-rerunfailures,
+  writableTmpDirAsHomeHook,
   python,
 
   # optional-dependencies
@@ -38,11 +39,12 @@ buildPythonPackage rec {
     hash = "sha256-5j47Wqt9i6vC3uwRzQ9+8pk+ENl5w6PvnP+830RLCls=";
   };
 
-  postPatch = ''
+  postPatch =
     # build-time constriant, used to ensure forward and backward compat
-    substituteInPlace pyproject.toml setup.cfg \
-      --replace-fail "numpy>=2.0.0" "numpy"
-  '';
+    ''
+      substituteInPlace pyproject.toml setup.cfg \
+        --replace-fail "numpy>=2.0.0" "numpy"
+    '';
 
   build-system = [
     cython_0
@@ -59,6 +61,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-rerunfailures
+    writableTmpDirAsHomeHook
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   # QuTiP tries to access the home directory to create an rc file for us.
@@ -66,7 +69,6 @@ buildPythonPackage rec {
   # This is due to the Cython-compiled modules not being in the correct location
   # of the source tree.
   preCheck = ''
-    export HOME=$(mktemp -d);
     export OMP_NUM_THREADS=$NIX_BUILD_CORES
     mkdir -p test && cd test
   '';
@@ -80,11 +82,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "qutip" ];
 
-  pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-    # Fatal Python error: Aborted
-    "--deselect=../tests/core/test_metrics.py::Test_hellinger_dist::test_monotonicity[25]"
-  ];
-
   optional-dependencies = {
     graphics = [ matplotlib ];
     ipython = [ ipython ];
@@ -104,6 +101,10 @@ buildPythonPackage rec {
       # Tests fail at ~80%
       # ../tests/test_animation.py::test_result_state Fatal Python error: Aborted
       lib.systems.inspect.patterns.isDarwin
+
+      # Several tests fail with a segfault
+      # ../tests/test_random.py::test_rand_super_bcsz[int-CSR-choi-None-rep(1)] Fatal Python error: Aborted
+      "aarch64-linux"
     ];
   };
 }

From 9eadc59459dbfbc2fdd9f1c9d4ee0312df06e6a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 22:15:25 +0000
Subject: [PATCH 24/48] lua-language-server: 3.13.5 -> 3.13.6

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

diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index 72429925b7b8..38509eed727d 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.13.5";
+  version = "3.13.6";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU=";
+    hash = "sha256-LaetDI9kNPRY4+m3gSsh6vbysRjUKHl+zunuyedjZGY=";
     fetchSubmodules = true;
   };
 

From f39eb448eb043bb0329a7f4549aae048675067a6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 00:01:50 +0100
Subject: [PATCH 25/48] python312Packages.orbax-checkpoint: 0.11.2 -> 0.11.4

Diff:
https://github.com/google/orbax/compare/refs/tags/v0.11.2...v0.11.4

Changelog:
https://github.com/google/orbax/blob/v0.11.4/checkpoint/CHANGELOG.md
---
 pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 9ede2980a7c9..9adafbe609d1 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.2";
+  version = "0.11.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-68mqz+4FJQr/mKR53L5CSenRB0SjV3dbBdtBylFW1y8=";
+    hash = "sha256-zKQcqDW0dOQIGNllrK6bPdTr8mkKU6eevdfvMGssd9w=";
   };
 
   sourceRoot = "${src.name}/checkpoint";

From ea51b761844c6748a3ef9c871207ac250bb25b33 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Feb 2025 14:35:28 -0800
Subject: [PATCH 26/48] llvmPackages.compiler-rt: drop libc-free patch

---
 .../llvm/20/compiler-rt/libc-free.patch       | 68 -------------------
 .../compilers/llvm/common/default.nix         |  7 +-
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch

diff --git a/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch b/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch
deleted file mode 100644
index e36b3414aef1..000000000000
--- a/pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5eaae2daff7722ee01eee239e131ee1f62643abe Mon Sep 17 00:00:00 2001
-From: Peter Waller <peter.waller@arm.com>
-Date: Wed, 5 Feb 2025 19:46:15 +0000
-Subject: [PATCH] [compiler-rt][AArch64] Enable libc-free builtins Linux build
-
-Without this change, libc++abi.so.1.0 fails to link with:
-
-```
-error: undefined sybol: __aarch64_sme_accessible
-```
-
-This symbol is provided by baremetal libc's such as newlib.
-
-In order to compile a libc with compiler-rt, it is necessary first to
-build a compiler-rt with no dependency on libc to acquire the builtins.
-The intended linux test requires getauxval which is provided by libc.
-
-To that end, there are examples in the wild of building a compiler-rt
-without libc by specifying -DCOMPILER_RT_BAREMETAL_BUILD=ON.
-On Linux, this gives a builtins build with (almost) no libc dependencies.
-
-See for example:
-
-https://github.com/NixOS/nixpkgs/blob/d7fe3bcaca37e79d8b3cbde4dd69edeafbd35313/pkgs/development/compilers/llvm/common/compiler-rt/default.nix#L116-L118
-
-```
-  ] ++ lib.optionals (!haveLibc || bareMetal) [
-    "-DCMAKE_C_COMPILER_WORKS=ON"
-    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
-```
-
-The above specifies that a !haveLibc build sets
-`-DCOMPILER_RT_BAREMETAL_BUILD`, which is done for example in a `pkgsLLVM` build.
-
-AIUI, acquiring such a builtins build of compiler-rt is necessary to build a
-pure LLVM toolchain, since builtins are required to build libc (and
-libcxx is required to build a full compiler-rt).
-
-The effect of falling back to unimplemented is that this early-stage
-builtins build is incapable of doing function multiversioning tests and
-falls back to behaving as-if the feature is unavailable.
-
-This behaviour changed in
-https://github.com/llvm/llvm-project/pull/119414, which introduced a
-subtle change in semantics in the removal of
-compiler-rt/lib/builtins/aarch64/sme-abi-init.c (definition of getauxval
-macro, which was bracketed by `#if defined(__linux__)`) vs the new
-definition which does not test for linux.
-
-The proposed change is reinstating things as they were before #119414.
----
- compiler-rt/lib/builtins/cpu_model/aarch64.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/builtins/cpu_model/aarch64.c b/lib/builtins/cpu_model/aarch64.c
-index 4082fd62ea11a25..50438bcc7ddd885 100644
---- a/lib/builtins/cpu_model/aarch64.c
-+++ b/lib/builtins/cpu_model/aarch64.c
-@@ -80,7 +80,7 @@ struct {
- #include "aarch64/fmv/getauxval.inc"
- #elif defined(_WIN32)
- #include "aarch64/fmv/windows.inc"
--#elif defined(ENABLE_BAREMETAL_AARCH64_FMV)
-+#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) && !defined(__linux__)
- #include "aarch64/fmv/baremetal.inc"
- #else
- #include "aarch64/fmv/unimplemented.inc"
-
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index ff3f6d0d853d..a40ffd4044b4 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1086,12 +1086,7 @@ let
           url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
           hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
           relative = "compiler-rt";
-        })
-        # Fixes baremetal
-        # PR: https://github.com/llvm/llvm-project/pull/125922
-        ++ lib.optional (lib.versionAtLeast metadata.release_version "20") (
-          metadata.getVersionFile "compiler-rt/libc-free.patch"
-        );
+        });
     in
     (
       {

From b1ffdffb010759f842ac20b1db4f81e941c2bcd7 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Fri, 24 Jan 2025 12:40:22 +0100
Subject: [PATCH 27/48] vimPlugins: disallow packaging plugins that are already
 in luaPackages

---
 .../editors/vim/plugins/generated.nix         | 230 ++----------------
 .../editors/vim/plugins/overrides.nix         |  90 ++++---
 .../editors/vim/plugins/update.py             |   2 +
 .../editors/vim/plugins/vim-plugin-names      |  13 -
 4 files changed, 64 insertions(+), 271 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index c0758b97c7c7..fa5d7c772e4a 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1420,18 +1420,7 @@ final: prev:
       sha256 = "17c41flnjp25c5gry4lq8ik8mk3pbh1qwj86rby57jr4f4wvfykk";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
-  };
-
-  blink-cmp-spell = buildVimPlugin {
-    pname = "blink-cmp-spell";
-    version = "2025-02-01";
-    src = fetchFromGitHub {
-      owner = "ribru17";
-      repo = "blink-cmp-spell";
-      rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d";
-      sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6";
-    };
-    meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+    meta.hydraPlatforms = [ ];
   };
 
   blink-cmp-git = buildVimPlugin {
@@ -1444,6 +1433,20 @@ final: prev:
       sha256 = "08hfwnjgsl88bkphpdxkdswdnc10mlxpsrk084kgzk4j19w55gyq";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
+    meta.hydraPlatforms = [ ];
+  };
+
+  blink-cmp-spell = buildVimPlugin {
+    pname = "blink-cmp-spell";
+    version = "2025-02-01";
+    src = fetchFromGitHub {
+      owner = "ribru17";
+      repo = "blink-cmp-spell";
+      rev = "38d6797dea6f72baa6e8b3bfca6da96d8fcac64d";
+      sha256 = "19pnasa446iiapgsr3z2fpk0nnrzh8g5wrzrq8n0y4q0z6spc9f6";
+    };
+    meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+    meta.hydraPlatforms = [ ];
   };
 
   blink-compat = buildVimPlugin {
@@ -1664,6 +1667,7 @@ final: prev:
       sha256 = "1s0zmpwg7z76l3ca1p426mkh33cw94m18q7rfsvnz4h4xwlsafpa";
     };
     meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   bullets-vim = buildVimPlugin {
@@ -3315,6 +3319,7 @@ final: prev:
       sha256 = "06h388vkp8nv15wbh96pza85994xf979s7kjqrli4s6y5ygw6m02";
     };
     meta.homepage = "https://github.com/netmute/ctags-lsp.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   ctrlp-cmatcher = buildVimPlugin {
@@ -4530,19 +4535,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  fidget-nvim = buildNeovimPlugin {
-    pname = "fidget.nvim";
-    version = "2025-01-08";
-    src = fetchFromGitHub {
-      owner = "j-hui";
-      repo = "fidget.nvim";
-      rev = "a0abbf18084b77d28bc70e24752e4f4fd54aea17";
-      sha256 = "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53";
-    };
-    meta.homepage = "https://github.com/j-hui/fidget.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   file-line = buildVimPlugin {
     pname = "file-line";
     version = "2016-10-21";
@@ -5104,19 +5096,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  gitsigns-nvim = buildNeovimPlugin {
-    pname = "gitsigns.nvim";
-    version = "2025-01-24";
-    src = fetchFromGitHub {
-      owner = "lewis6991";
-      repo = "gitsigns.nvim";
-      rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d";
-      sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x";
-    };
-    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   gitv = buildVimPlugin {
     pname = "gitv";
     version = "2019-08-22";
@@ -5899,19 +5878,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  image-nvim = buildNeovimPlugin {
-    pname = "image.nvim";
-    version = "2025-01-17";
-    src = fetchFromGitHub {
-      owner = "3rd";
-      repo = "image.nvim";
-      rev = "6ffafab2e98b5bda46bf227055aa84b90add8cdc";
-      sha256 = "105k4ccv18nynm70lphb4ac3ih1ad4hlh2syrhmyi1i1jwdirjgz";
-    };
-    meta.homepage = "https://github.com/3rd/image.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   img-clip-nvim = buildVimPlugin {
     pname = "img-clip.nvim";
     version = "2025-01-24";
@@ -7111,20 +7077,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  luasnip = buildNeovimPlugin {
-    pname = "luasnip";
-    version = "2025-01-04";
-    src = fetchFromGitHub {
-      owner = "l3mon4d3";
-      repo = "luasnip";
-      rev = "c9b9a22904c97d0eb69ccb9bab76037838326817";
-      sha256 = "1m9a2vka968yklknp8fcmg5lz7w0lb7rwn13b0ppy89ixy0mjxj5";
-      fetchSubmodules = true;
-    };
-    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
-    meta.hydraPlatforms = [ ];
-  };
-
   luasnip-latex-snippets-nvim = buildVimPlugin {
     pname = "luasnip-latex-snippets.nvim";
     version = "2024-11-25";
@@ -7151,19 +7103,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  lush-nvim = buildNeovimPlugin {
-    pname = "lush.nvim";
-    version = "2024-08-16";
-    src = fetchFromGitHub {
-      owner = "rktjmp";
-      repo = "lush.nvim";
-      rev = "45a79ec4acb5af783a6a29673a999ce37f00497e";
-      sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr";
-    };
-    meta.homepage = "https://github.com/rktjmp/lush.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   lushtags = buildVimPlugin {
     pname = "lushtags";
     version = "2017-04-19";
@@ -8072,6 +8011,7 @@ final: prev:
       sha256 = "06d7s9949aylda4vq36h4s9hnnp3lycwm2nrjid5vxb98gy3d3xn";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   mkdir-nvim = buildVimPlugin {
@@ -8763,19 +8703,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  neotest = buildNeovimPlugin {
-    pname = "neotest";
-    version = "2025-01-02";
-    src = fetchFromGitHub {
-      owner = "nvim-neotest";
-      repo = "neotest";
-      rev = "d66cf4e05a116957f0d3a7755a24291c7d1e1f72";
-      sha256 = "09bxarrrfnqvyv22ls6lm0y03ngcp6r372b8hy4rld902psdb11q";
-    };
-    meta.homepage = "https://github.com/nvim-neotest/neotest/";
-    meta.hydraPlatforms = [ ];
-  };
-
   neotest-bash = buildVimPlugin {
     pname = "neotest-bash";
     version = "2024-05-06";
@@ -9507,19 +9434,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  nui-nvim = buildNeovimPlugin {
-    pname = "nui.nvim";
-    version = "2024-12-10";
-    src = fetchFromGitHub {
-      owner = "MunifTanjim";
-      repo = "nui.nvim";
-      rev = "53e907ffe5eedebdca1cd503b00aa8692068ca46";
-      sha256 = "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9";
-    };
-    meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   null-ls-nvim = buildVimPlugin {
     pname = "null-ls.nvim";
     version = "2023-08-12";
@@ -9689,19 +9603,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  nvim-cmp = buildNeovimPlugin {
-    pname = "nvim-cmp";
-    version = "2025-01-23";
-    src = fetchFromGitHub {
-      owner = "hrsh7th";
-      repo = "nvim-cmp";
-      rev = "12509903a5723a876abd65953109f926f4634c30";
-      sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb";
-    };
-    meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
-    meta.hydraPlatforms = [ ];
-  };
-
   nvim-code-action-menu = buildVimPlugin {
     pname = "nvim-code-action-menu";
     version = "2023-12-11";
@@ -10417,19 +10318,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  nvim-nio = buildNeovimPlugin {
-    pname = "nvim-nio";
-    version = "2025-01-20";
-    src = fetchFromGitHub {
-      owner = "nvim-neotest";
-      repo = "nvim-nio";
-      rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662";
-      sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq";
-    };
-    meta.homepage = "https://github.com/nvim-neotest/nvim-nio/";
-    meta.hydraPlatforms = [ ];
-  };
-
   nvim-nonicons = buildVimPlugin {
     pname = "nvim-nonicons";
     version = "2023-02-04";
@@ -11367,19 +11255,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  orgmode = buildNeovimPlugin {
-    pname = "orgmode";
-    version = "2025-01-26";
-    src = fetchFromGitHub {
-      owner = "nvim-orgmode";
-      repo = "orgmode";
-      rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd";
-      sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp";
-    };
-    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
-    meta.hydraPlatforms = [ ];
-  };
-
   other-nvim = buildVimPlugin {
     pname = "other.nvim";
     version = "2024-11-30";
@@ -11524,19 +11399,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  papis-nvim = buildNeovimPlugin {
-    pname = "papis.nvim";
-    version = "2025-01-27";
-    src = fetchFromGitHub {
-      owner = "jghauser";
-      repo = "papis.nvim";
-      rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5";
-      sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx";
-    };
-    meta.homepage = "https://github.com/jghauser/papis.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   parpar-nvim = buildVimPlugin {
     pname = "parpar.nvim";
     version = "2023-09-12";
@@ -11693,19 +11555,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  plenary-nvim = buildNeovimPlugin {
-    pname = "plenary.nvim";
-    version = "2025-01-12";
-    src = fetchFromGitHub {
-      owner = "nvim-lua";
-      repo = "plenary.nvim";
-      rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66";
-      sha256 = "1h73y4ahj8rf6qiyjkm3jw9158fbkiix4kzig78jknvq8vgdgk6p";
-    };
-    meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   poimandres-nvim = buildVimPlugin {
     pname = "poimandres.nvim";
     version = "2024-10-19";
@@ -12307,20 +12156,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  rest-nvim = buildNeovimPlugin {
-    pname = "rest.nvim";
-    version = "2025-01-01";
-    src = fetchFromGitHub {
-      owner = "rest-nvim";
-      repo = "rest.nvim";
-      rev = "62606c3599bd304227457d6e20580965939b191e";
-      sha256 = "0rbp8fq0ya2rx9njxs9ynrrw4pv50rpkd1lfvvw2p1c06xr63a75";
-      fetchSubmodules = true;
-    };
-    meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   restore-view-vim = buildVimPlugin {
     pname = "restore-view-vim";
     version = "2014-11-21";
@@ -13662,6 +13497,7 @@ final: prev:
       sha256 = "18m46gj68xv6basaqzbschr60sc9xzi4dx21cvnx401bk97cqpgi";
     };
     meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   telescope-file-browser-nvim = buildVimPlugin {
@@ -13766,6 +13602,7 @@ final: prev:
       sha256 = "0n1mdiwkkciqpxjad1nngrc7px5yziyan0daxgs9jsgdqmy1lzp8";
     };
     meta.homepage = "https://github.com/ghassan0/telescope-glyph.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   telescope-live-grep-args-nvim = buildVimPlugin {
@@ -13794,19 +13631,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  telescope-manix = buildNeovimPlugin {
-    pname = "telescope-manix";
-    version = "2025-01-26";
-    src = fetchFromGitHub {
-      owner = "MrcJkb";
-      repo = "telescope-manix";
-      rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c";
-      sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp";
-    };
-    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
-    meta.hydraPlatforms = [ ];
-  };
-
   telescope-media-files-nvim = buildVimPlugin {
     pname = "telescope-media-files.nvim";
     version = "2023-02-19";
@@ -13820,19 +13644,6 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-  telescope-nvim = buildNeovimPlugin {
-    pname = "telescope.nvim";
-    version = "2025-01-08";
-    src = fetchFromGitHub {
-      owner = "nvim-telescope";
-      repo = "telescope.nvim";
-      rev = "415af52339215926d705cccc08145f3782c4d132";
-      sha256 = "1hzyqax197i36a6z1rm25grwbl0r7k3qwhybjils20lshanjqbz7";
-    };
-    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
   telescope-project-nvim = buildVimPlugin {
     pname = "telescope-project.nvim";
     version = "2024-12-01";
@@ -14052,6 +13863,7 @@ final: prev:
       sha256 = "0bp6m6b7bsw9d4iyn1b8bw3avnvjlk7pi8h941m68fw54n3mf06f";
     };
     meta.homepage = "https://github.com/rebelot/terminal.nvim/";
+    meta.hydraPlatforms = [ ];
   };
 
   terminus = buildVimPlugin {
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 5be981762200..a22e1dd11e0f 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1222,7 +1222,7 @@ in
 
   fzf-lua = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.fzf-lua;
-    propagatedBuildInputs = [ fzf ];
+    runtimeDeps = [ fzf ];
   };
 
   fzf-vim = super.fzf-vim.overrideAttrs {
@@ -1630,10 +1630,6 @@ in
     dependencies = [ self.plenary-nvim ];
   };
 
-  lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.lsp-progress-nvim;
-  };
-
   lsp_lines-nvim = callPackage ./non-generated/lsp_lines-nvim { };
 
   lspecho-nvim = super.lspecho-nvim.overrideAttrs {
@@ -1671,18 +1667,6 @@ in
     checkInputs = [ self.luasnip ];
   };
 
-  lz-n = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.lz-n;
-  };
-
-  lze = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.lze;
-  };
-
-  lzn-auto-require = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.lzn-auto-require;
-  };
-
   magma-nvim = super.magma-nvim.overrideAttrs {
     passthru.python3Dependencies =
       ps: with ps; [
@@ -1729,7 +1713,7 @@ in
     };
 
   markid = super.markid.overrideAttrs {
-    dependencies = with super; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
   };
 
   mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs {
@@ -1773,10 +1757,6 @@ in
     meta.maintainers = with lib.maintainers; [ vcunat ];
   };
 
-  middleclass = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.middleclass;
-  };
-
   mind-nvim = super.mind-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1920,12 +1900,6 @@ in
     ];
   };
 
-  neorg = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.neorg;
-
-    doInstallCheck = true;
-  };
-
   neorg-telescope = super.neorg-telescope.overrideAttrs {
     buildInputs = [ luaPackages.lua-utils-nvim ];
     dependencies = with self; [
@@ -2743,14 +2717,9 @@ in
     ];
   };
 
-  # TODO: runtimedeps
-  plenary-nvim = super.plenary-nvim.overrideAttrs {
-    postPatch = ''
-      sed -Ei lua/plenary/curl.lua \
-          -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@'
-    '';
-
-    doInstallCheck = true;
+  plenary-nvim = neovimUtils.buildNeovimPlugin {
+    luaAttr = luaPackages.plenary-nvim;
+    runtimeDeps = [ curl ];
   };
 
   poimandres-nvim = super.poimandres-nvim.overrideAttrs {
@@ -2858,18 +2827,6 @@ in
     ];
   };
 
-  rocks-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.rocks-nvim;
-  };
-
-  rocks-config-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.rocks-config-nvim;
-  };
-
-  rtp-nvim = neovimUtils.buildNeovimPlugin {
-    luaAttr = luaPackages.rtp-nvim;
-  };
-
   rustaceanvim = neovimUtils.buildNeovimPlugin {
     checkInputs = [
       # Optional integration
@@ -3018,7 +2975,7 @@ in
   };
 
   startup-nvim = super.startup-nvim.overrideAttrs {
-    dependencies = with super; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   statix = buildVimPlugin rec {
@@ -4062,3 +4019,38 @@ in
   in
   lib.genAttrs nodePackageNames nodePackage2VimPackage
 )
+// (
+  let
+    luarocksPackageNames = [
+      "fidget-nvim"
+      "gitsigns-nvim"
+      "image-nvim"
+      "lsp-progress-nvim"
+      "luasnip"
+      "lush-nvim"
+      "lz-n"
+      "lze"
+      "lzn-auto-require"
+      "middleclass"
+      "neorg"
+      "neotest"
+      "nui-nvim"
+      "nvim-cmp"
+      "nvim-nio"
+      "orgmode"
+      "papis-nvim"
+      "rest-nvim"
+      "rocks-config-nvim"
+      "rocks-nvim"
+      "rtp-nvim"
+      "telescope-manix"
+      "telescope-nvim"
+    ];
+    toVimPackage =
+      name:
+      neovimUtils.buildNeovimPlugin {
+        luaAttr = luaPackages.${name};
+      };
+  in
+  lib.genAttrs luarocksPackageNames toVimPackage
+)
diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py
index 1c449967b12d..a973a1919eff 100755
--- a/pkgs/applications/editors/vim/plugins/update.py
+++ b/pkgs/applications/editors/vim/plugins/update.py
@@ -103,6 +103,8 @@ class VimEditor(pluginupdate.Editor):
     def plugin2nix(
         self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
     ) -> str:
+        if isNeovim:
+            raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
         repo = pdesc.repo
 
         content = f"  {plugin.normalized_name} = "
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index bcc627f512ec..b6478e0959ae 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -346,7 +346,6 @@ https://github.com/lilydjwg/fcitx.vim/,fcitx5,
 https://github.com/freddiehaddad/feline.nvim/,,
 https://github.com/bakpakin/fennel.vim/,,
 https://github.com/wincent/ferret/,,
-https://github.com/j-hui/fidget.nvim/,,
 https://github.com/bogado/file-line/,,
 https://github.com/lewis6991/fileline.nvim/,,
 https://github.com/glacambre/firenvim/,HEAD,
@@ -390,7 +389,6 @@ https://github.com/ThePrimeagen/git-worktree.nvim/,,
 https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
 https://github.com/vim-scripts/gitignore.vim/,,
 https://github.com/ruifm/gitlinker.nvim/,,
-https://github.com/lewis6991/gitsigns.nvim/,,
 https://github.com/gregsexton/gitv/,,
 https://github.com/DNLHC/glance.nvim/,HEAD,
 https://github.com/gleam-lang/gleam.vim/,,
@@ -451,7 +449,6 @@ https://github.com/cocopon/iceberg.vim/,,
 https://github.com/idris-hackers/idris-vim/,,
 https://github.com/idris-community/idris2-nvim/,,
 https://github.com/edwinb/idris2-vim/,,
-https://github.com/3rd/image.nvim/,HEAD,
 https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
 https://github.com/lewis6991/impatient.nvim/,,
 https://github.com/backdround/improved-search.nvim/,HEAD,
@@ -544,10 +541,8 @@ https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
 https://github.com/nvim-java/lua-async/,HEAD,
 https://github.com/arkav/lualine-lsp-progress/,,
 https://github.com/nvim-lualine/lualine.nvim/,,
-https://github.com/l3mon4d3/luasnip/,,
 https://github.com/evesdropper/luasnip-latex-snippets.nvim/,HEAD,
 https://github.com/alvarosevilla95/luatab.nvim/,,
-https://github.com/rktjmp/lush.nvim/,,
 https://github.com/mkasa/lushtags/,,
 https://github.com/Bilal2453/luvit-meta/,HEAD,
 https://github.com/dccsillag/magma-nvim/,HEAD,
@@ -671,7 +666,6 @@ https://github.com/karb94/neoscroll.nvim/,,
 https://github.com/Shougo/neosnippet-snippets/,,
 https://github.com/Shougo/neosnippet.vim/,,
 https://github.com/kassio/neoterm/,,
-https://github.com/nvim-neotest/neotest/,HEAD,
 https://github.com/rcasia/neotest-bash/,HEAD,
 https://github.com/sidlatau/neotest-dart/,HEAD,
 https://github.com/MarkEmmons/neotest-deno/,HEAD,
@@ -728,7 +722,6 @@ https://github.com/shaunsingh/nord.nvim/,,
 https://github.com/andersevenrud/nordic.nvim/,,
 https://github.com/vigoux/notifier.nvim/,HEAD,
 https://github.com/jlesquembre/nterm.nvim/,,
-https://github.com/MunifTanjim/nui.nvim/,main,
 https://github.com/jose-elias-alvarez/null-ls.nvim/,,
 https://github.com/nacro90/numb.nvim/,,
 https://github.com/nvchad/nvchad/,HEAD,
@@ -796,7 +789,6 @@ https://github.com/gpanders/nvim-moonwalk/,,
 https://github.com/SmiteshP/nvim-navbuddy/,,
 https://github.com/smiteshp/nvim-navic/,HEAD,
 https://github.com/AckslD/nvim-neoclip.lua/,,
-https://github.com/nvim-neotest/nvim-nio/,HEAD,
 https://github.com/ya2s/nvim-nonicons/,,
 https://github.com/rcarriga/nvim-notify/,,
 https://github.com/LhKipp/nvim-nu/,HEAD,
@@ -869,7 +861,6 @@ https://github.com/tyru/open-browser-github.vim/,,
 https://github.com/tyru/open-browser.vim/,,
 https://github.com/Almo7aya/openingh.nvim/,,
 https://github.com/salkin-mada/openscad.nvim/,HEAD,
-https://github.com/nvim-orgmode/orgmode/,,
 https://github.com/rgroli/other.nvim/,HEAD,
 https://github.com/jmbuhr/otter.nvim/,,
 https://github.com/hedyhli/outline.nvim/,HEAD,
@@ -881,7 +872,6 @@ https://github.com/drewtempelmeyer/palenight.vim/,,
 https://github.com/JoosepAlviste/palenightfall.nvim/,,
 https://github.com/roobert/palette.nvim/,HEAD,
 https://github.com/NLKNguyen/papercolor-theme/,,
-https://github.com/jghauser/papis.nvim/,HEAD,
 https://github.com/dundalek/parpar.nvim/,,
 https://github.com/tmsvg/pear-tree/,,
 https://github.com/steelsojka/pears.nvim/,,
@@ -894,7 +884,6 @@ https://github.com/motus/pig.vim/,,
 https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
 https://github.com/aklt/plantuml-syntax/,,
 https://github.com/nvim-treesitter/playground/,,
-https://github.com/nvim-lua/plenary.nvim/,,
 https://github.com/olivercederborg/poimandres.nvim/,HEAD,
 https://github.com/epwalsh/pomo.nvim/,HEAD,
 https://github.com/dleonard0/pony-vim-syntax/,,
@@ -941,7 +930,6 @@ https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
 https://github.com/gabrielpoca/replacer.nvim/,HEAD,
 https://github.com/9seconds/repolink.nvim/,HEAD,
 https://github.com/stevearc/resession.nvim/,HEAD,
-https://github.com/rest-nvim/rest.nvim/,,
 https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
 https://github.com/gu-fan/riv.vim/,,
 https://github.com/kevinhwang91/rnvimr/,,
@@ -1068,7 +1056,6 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
 https://github.com/nvim-telescope/telescope-z.nvim/,,
 https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD,
 https://github.com/jvgrootveld/telescope-zoxide/,,
-https://github.com/nvim-telescope/telescope.nvim/,,
 https://github.com/luc-tielen/telescope_hoogle/,HEAD,
 https://github.com/joerdav/templ.vim/,HEAD,
 https://github.com/axelvc/template-string.nvim/,HEAD,

From b90176a221626c6c7e2449673da089b9586ee035 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 23:00:05 +0000
Subject: [PATCH 28/48] python312Packages.niaclass: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix
index aeb0b7099110..fd89e1a88422 100644
--- a/pkgs/development/python-modules/niaclass/default.nix
+++ b/pkgs/development/python-modules/niaclass/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "niaclass";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "firefly-cpp";
     repo = "NiaClass";
     tag = version;
-    hash = "sha256-2VNLXVciWInkZwk9O+U+6oU+FOVQx3InV4UVgny/B6I=";
+    hash = "sha256-cowB+nBb5vH2ntLrcctqICYcf3I4m8rw3g4vO3/rokw=";
   };
 
   pythonRelaxDeps = [
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Framework for solving classification tasks using Nature-inspired algorithms";
     homepage = "https://github.com/firefly-cpp/NiaClass";
-    changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${version}";
+    changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ firefly-cpp ];
   };

From 332c7fe132f90964639167721464d93aa25abf09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 23:00:54 +0000
Subject: [PATCH 29/48] python312Packages.python-gvm: 25.1.1 -> 26.0.0

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

diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix
index bf20f271b584..31dfd6863ab9 100644
--- a/pkgs/development/python-modules/python-gvm/default.nix
+++ b/pkgs/development/python-modules/python-gvm/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "python-gvm";
-  version = "25.1.1";
+  version = "26.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "python-gvm";
     tag = "v${version}";
-    hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y=";
+    hash = "sha256-KJiyOaoRjiMlYi50iPtJXGlQ3KYS2gYA+Q5NRSn/ATI=";
   };
 
   build-system = [ poetry-core ];

From 92c262824d525b7dd63361f18607bd66ca33b683 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 23:36:26 +0000
Subject: [PATCH 30/48] vacuum-go: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 4c4cfc91562e..46bc764d3a20 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "vacuum-go";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${version}";
-    hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo=";
+    hash = "sha256-x3AYHFQFS8PGv5bi+zg4rut7gVgQi9PS3+0YGJ47YMQ=";
   };
 
-  vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU=";
+  vendorHash = "sha256-1lr1VQU4JHg0PZbjAUmALFZJiYc+HTwrk0E/t/1qXqE=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From 2bafb0e95a6f5b71deaa059feb5a9d5505605dcc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 01:45:55 +0100
Subject: [PATCH 31/48] neovim-node-client: add versionCheckHook and
 updateScript

---
 pkgs/by-name/ne/neovim-node-client/package.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/neovim-node-client/package.nix b/pkgs/by-name/ne/neovim-node-client/package.nix
index 5fe372124b4c..4c000ed895ab 100644
--- a/pkgs/by-name/ne/neovim-node-client/package.nix
+++ b/pkgs/by-name/ne/neovim-node-client/package.nix
@@ -3,6 +3,8 @@
   buildNpmPackage,
   fetchNpmDeps,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 buildNpmPackage rec {
@@ -32,12 +34,23 @@ buildNpmPackage rec {
     ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin/neovim-node-host
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/neovim-node-host";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
-    mainProgram = "neovim-node-host";
     description = "Nvim msgpack API client and remote plugin provider";
     homepage = "https://github.com/neovim/node-client";
     changelog = "https://github.com/neovim/node-client/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fidgetingbits ];
+    mainProgram = "neovim-node-host";
   };
 }

From 8393b3761f3b50661911afa572e80e0e6c996a1f Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Fri, 7 Feb 2025 20:03:40 -0700
Subject: [PATCH 32/48] inv-sig-helper: 0-unstable-2025-01-31 ->
 0-unstable-2025-02-07

---
 pkgs/by-name/in/inv-sig-helper/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix
index 84c80d6caa50..716af6e814b7 100644
--- a/pkgs/by-name/in/inv-sig-helper/package.nix
+++ b/pkgs/by-name/in/inv-sig-helper/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage {
   pname = "inv-sig-helper";
-  version = "0-unstable-2025-01-31";
+  version = "0-unstable-2025-02-07";
 
   src = fetchFromGitHub {
     owner = "iv-org";
     repo = "inv_sig_helper";
-    rev = "40835906774cc7cdefa76b2648216afd063ad0e2";
-    hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI=";
+    rev = "ac006283c0b6821c856d6293c2ce49b61fa8c46a";
+    hash = "sha256-cQXWo+idyfFeJ2nnT8HKgjCd0Htc4pOE6aODsl3sf/8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4SuddTLbENm9D+v/DB86hJ7LNchbcwm5on3aAtUiVcc=";
+  cargoHash = "sha256-DnJL7kkcVn5dW3AoPCn829WmkaCjpDZtYUXnpiB857Q=";
 
   nativeBuildInputs = [
     pkg-config

From b6c8f0a8979fd377b9d158701b4292950ad00280 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 6 Feb 2025 11:18:00 +0100
Subject: [PATCH 33/48] udev: choose implementation with availableOn check

This means we don't have to repeat the list of platforms we can't use
systemd on, and can instead rely on the list in systemd's derivation.
This means that the right thing will happen on other platforms that
can't use systemd, one example being microblaze.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e7a7b20e32e..900b41006d34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12402,8 +12402,8 @@ with pkgs;
   };
 
   udev =
-    if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero
-    else systemdLibs;
+    if lib.meta.availableOn stdenv.hostPlatform systemdLibs then systemdLibs
+    else libudev-zero;
 
   sysvtools = sysvinit.override {
     withoutInitTools = true;

From f51384492939c906342c96cbac0b352309d685a9 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 8 Feb 2025 08:22:32 +0000
Subject: [PATCH 34/48] python313Packages.sacrebleu: refactor, add missing
 setuptools-scm

---
 .../python-modules/sacrebleu/default.nix      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix
index c9f167bbf2ee..01cd4961d213 100644
--- a/pkgs/development/python-modules/sacrebleu/default.nix
+++ b/pkgs/development/python-modules/sacrebleu/default.nix
@@ -3,6 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build-system
+  setuptools-scm,
+
   # Propagated build inputs
   portalocker,
   regex,
@@ -20,21 +23,18 @@ let
 in
 buildPythonPackage {
   inherit pname version;
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mjpost";
-    repo = pname;
+    repo = "sacrebleu";
     tag = "v${version}";
     hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc=";
   };
 
-  # postPatch = ''
-  #   substituteInPlace setup.py \
-  #     --replace "portalocker==" "portalocker>="
-  # '';
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     portalocker
     regex
     tabulate
@@ -43,7 +43,7 @@ buildPythonPackage {
     lxml
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [
     # require network access
@@ -57,12 +57,12 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "sacrebleu" ];
 
-  meta = with lib; {
+  meta = {
     description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores";
     mainProgram = "sacrebleu";
     homepage = "https://github.com/mjpost/sacrebleu";
-    changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ happysalada ];
+    changelog = "https://github.com/mjpost/sacrebleu/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

From 22b3d78d9f8a68bcbc8a4de2fe9aae21fe80187c Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 8 Feb 2025 08:22:32 +0000
Subject: [PATCH 35/48] python313Packages.sacrebleu: 2.5.0 -> 2.5.1

https://github.com/mjpost/sacrebleu/blob/v2.5.1/CHANGELOG.md
https://github.com/mjpost/sacrebleu/compare/refs/tags/v2.5.0...refs/tags/v2.5.1
---
 pkgs/development/python-modules/sacrebleu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix
index 01cd4961d213..72ea5077cd80 100644
--- a/pkgs/development/python-modules/sacrebleu/default.nix
+++ b/pkgs/development/python-modules/sacrebleu/default.nix
@@ -19,7 +19,7 @@
 }:
 let
   pname = "sacrebleu";
-  version = "2.5.0";
+  version = "2.5.1";
 in
 buildPythonPackage {
   inherit pname version;
@@ -29,7 +29,7 @@ buildPythonPackage {
     owner = "mjpost";
     repo = "sacrebleu";
     tag = "v${version}";
-    hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc=";
+    hash = "sha256-nLZotWQLrN9hB1fBuDJkvGr4SMvQz8Ucl8ybpNhf9Ic=";
   };
 
   build-system = [ setuptools-scm ];

From 8e9875265f6504b27ceb18ee97b22c81bc9ddfa1 Mon Sep 17 00:00:00 2001
From: javigomezo <mail@javigomezo.com>
Date: Sat, 8 Feb 2025 09:16:54 +0100
Subject: [PATCH 36/48] keepalived: add meta.mainProgram

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

diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix
index 7e2e8526a649..338c1908eecc 100644
--- a/pkgs/by-name/ke/keepalived/package.nix
+++ b/pkgs/by-name/ke/keepalived/package.nix
@@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.raitobezarius ];
+    mainProgram = "keepalived";
   };
 }

From 61018ca62ef5d8e79a60ad227fd66a7614192379 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 8 Feb 2025 07:40:54 +0800
Subject: [PATCH 37/48] turn-rs:3.2.0 -> 3.3.3

---
 pkgs/by-name/tu/turn-rs/package.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index 62d57d898168..c7fb7d040085 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -1,24 +1,36 @@
 {
-  rustPlatform,
   lib,
+  rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
   nix-update-script,
   nixosTests,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "turn-rs";
-  version = "3.2.0";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "mycrl";
     repo = "turn-rs";
     tag = "v${version}";
-    hash = "sha256-4I4mjG/euBL08v4xZdnrI8aTGVo5z2F2FDYtxKW1Qt8=";
+    hash = "sha256-kNE6FbHAFVWH04uTJBCRkrB0yzIjuXX3rxi2h5WmKWo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-qSYGcZdMn7uelufs6z1UQtLxrRbBGNf3o1a1jR+qiqo=";
+  cargoHash = "sha256-VHfWVEYla7iHOATC4Rv7k560O2VUqAe4ZMo/hLiSOi4=";
+
+  # By default, no features are enabled
+  # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1
+  cargoBuildFlags = [ "--all-features" ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/turn-server";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
 
   passthru = {
     updateScript = nix-update-script { };

From 44114d2703e050d4488068db68d79c3705ddf062 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Feb 2025 04:27:56 +0100
Subject: [PATCH 38/48] python3Packages.pulsectl-asyncio: fix build

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

diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
index b89dad1023a2..59974681cf1b 100644
--- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix
+++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix
@@ -21,6 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-lHVLrkFdNM8Y4t6TcXYnX8sQ4COrW3vV2sTDWeI4xZU=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg --replace-fail "pulsectl >=23.5.0,<=24.11.0" "pulsectl >=23.5.0"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [ pulsectl ];

From 33a769c951edf6acf646380a3e8f2f3fcd5cc89f Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 8 Feb 2025 11:50:30 +0100
Subject: [PATCH 39/48] python3Packages.qtile: dbus-next -> dbus-fast

It seems the StatusNotifier widget uses dbus-fast now instead of dbus-next
---
 pkgs/development/python-modules/qtile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 570fdbd61eab..d74d8209786d 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   cairocffi,
-  dbus-next,
+  dbus-fast,
   glib,
   iwlib,
   libcst,
@@ -69,7 +69,7 @@ buildPythonPackage rec {
 
   dependencies = extraPackages ++ [
     (cairocffi.override { withXcffib = true; })
-    dbus-next
+    dbus-fast
     iwlib
     libcst
     mpd2

From 97dfe7ae298ccfbaa8550ac27c72d8a5c9c586ed Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 5 Feb 2025 08:50:41 +0100
Subject: [PATCH 40/48] aporetic: init at 1.0.0

https://github.com/protesilaos/aporetic/
---
 pkgs/by-name/ap/aporetic/package.nix | 65 ++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ap/aporetic/package.nix

diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
new file mode 100644
index 000000000000..58614af2320f
--- /dev/null
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  iosevka,
+  fetchFromGitHub,
+  buildNpmPackage,
+  symlinkJoin,
+}:
+
+let
+  sets = [
+    "sans-mono"
+    "sans"
+    "serif-mono"
+    "serif"
+  ];
+  pname = "aporetic";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "protesilaos";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-5m4iT77FFsJf6N1FIsCtk5Z0IEOVUGCceXiT2n5dZUg=";
+  };
+  privateBuildPlan = src.outPath + "/private-build-plans.toml";
+  makeIosevkaFont =
+    set:
+    let
+      superBuildNpmPackage = buildNpmPackage;
+    in
+    (iosevka.override {
+      inherit set privateBuildPlan;
+      buildNpmPackage =
+        args:
+        superBuildNpmPackage (
+          args
+          // {
+            pname = "aporetic-${set}";
+            inherit version;
+
+            src = fetchFromGitHub {
+              owner = "be5invis";
+              repo = "iosevka";
+              rev = "v32.5.0";
+              hash = "sha256-MzsAkq5l4TP19UJNPW/8hvIqsJd94pADrrv8wLG6NMQ=";
+            };
+
+            npmDepsHash = "sha256-HeqwpZyHLHdMhd/UfXVBonMu+PhStrLCxAMuP/KuTT8=";
+
+            meta = with lib; {
+              inherit (src.meta) homepage;
+              description = ''
+                Customised build of the Iosevka typeface, with a consistent rounded style and overrides for almost all individual glyphs in both roman (upright) and italic (slanted) variants.
+              '';
+              license = licenses.ofl;
+              platforms = iosevka.meta.platforms;
+              maintainers = [ maintainers.DamienCassou ];
+            };
+          }
+        );
+    });
+in
+symlinkJoin {
+  inherit pname version;
+  paths = (builtins.map makeIosevkaFont sets);
+}

From 217d1f4de52b96fdc28e6b48c4559ec7d19c9d75 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 8 Feb 2025 12:00:28 +0100
Subject: [PATCH 41/48] vscode-extensions.github.copilot: 1.251.0 -> 1.266.1363

---
 pkgs/applications/editors/vscode/extensions/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 771be7809f06..a3af0288b47d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2117,8 +2117,9 @@ let
         mktplcRef = {
           publisher = "github";
           name = "copilot";
-          version = "1.251.0"; # compatible with vscode ^1.96
-          hash = "sha256-nv6lTPTPcggwMgO8a4KAF0W7gpou1399f/axnH0sS4s=";
+          # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json
+          version = "1.266.1363"; # compatible with vscode ^1.96
+          hash = "sha256-paT/fZMIjSh7Bp4bBg4ZT/c1wVc0ecQLJxulSQZjRdg=";
         };
 
         meta = {

From d9151c8ae1b87cc3766dcd2ca467f86bc7993e8b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 8 Feb 2025 12:02:48 +0100
Subject: [PATCH 42/48] vscode-extensions.github.copilot-chat: 0.24.2024121201
 -> 0.24.2025020602

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a3af0288b47d..25f5c087ecc5 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2136,8 +2136,8 @@ let
           publisher = "github";
           name = "copilot-chat";
           # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot-chat --json
-          version = "0.24.2024121201"; # compatible with vscode ^1.96
-          hash = "sha256-v3wdodDzYalz927KqqpL4IqEqLRmx1CLWdGBvZgNmpE=";
+          version = "0.24.2025020602"; # latest compatible with vscode ^1.97
+          hash = "sha256-smeBJ+yEIdbBs1eiKlPFCpYrb/nAkpnGlT9pTNnCnBI=";
         };
         meta = {
           description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";

From 0b57b99c00a488a20ec83591580cde5ee7e8877a Mon Sep 17 00:00:00 2001
From: BirdeeHub <birdee@localhost>
Date: Fri, 7 Feb 2025 19:29:46 -0800
Subject: [PATCH 43/48] vimPlugins.lze: 0.7.5 -> 0.7.9

---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4dfca48839bd..391fed541767 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -2565,14 +2565,14 @@ buildLuarocksPackage {
 lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "lze";
-  version = "0.7.5-1";
+  version = "0.7.9-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lze-0.7.5-1.rockspec";
-    sha256 = "1j5f2hs6pvlgpp9r42qlp6b1cbm4sagv373bf40xjgshzxhjf48j";
+    url    = "mirror://luarocks/lze-0.7.9-1.rockspec";
+    sha256 = "010xp1142d7rl29hbbzl8dyf8cy77dzy266kmxa16099zm245kfd";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/BirdeeHub/lze/archive/v0.7.5.zip";
-    sha256 = "1f1vmv2j3g1f54071yzgxk3np5zxsm9hmckimfs348x873bbr967";
+    url    = "https://github.com/BirdeeHub/lze/archive/v0.7.9.zip";
+    sha256 = "02klg4hl9q9wx3rdx0d92qiiyjw8agvanbicxdcsdavl9kaci8fl";
   };
 
   disabled = luaOlder "5.1";

From 04670cfe227af20dd57537ea57722c0aca38a82b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 8 Feb 2025 12:06:48 +0100
Subject: [PATCH 44/48] vscode-extensions.ms-python.mypy-type-checker: init at
 2025.1.10381011

---
 .../editors/vscode/extensions/default.nix     |  2 ++
 .../ms-python.mypy-type-checker/default.nix   | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 25f5c087ecc5..4ca91ebe85bf 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3507,6 +3507,8 @@ let
         };
       };
 
+      ms-python.mypy-type-checker = callPackage ./ms-python.mypy-type-checker { };
+
       ms-python.python = callPackage ./ms-python.python { };
 
       ms-python.debugpy = buildVscodeMarketplaceExtension {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
new file mode 100644
index 000000000000..6119ebca6c6e
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  vscode-utils,
+  mypy,
+  jq,
+  moreutils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "mypy-type-checker";
+    publisher = "ms-python";
+    version = "2025.1.10381011";
+    hash = "sha256-boKUxLOAgQJP13zX/NMhg1MtcrPVQJt5gLbxI7gVSu4=";
+  };
+
+  buildInputs = [ mypy ];
+
+  nativeBuildInputs = [
+    jq
+    moreutils
+  ];
+
+  postInstall = ''
+    jq '.contributes.configuration.properties."mypy-type-checker.path".default = "${lib.getExe mypy}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json
+  '';
+
+  meta = {
+    changelog = "https://github.com/microsoft/vscode-mypy/releases";
+    description = "VSCode extension for type checking support for Python files using Mypy";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.mypy-type-checker";
+    homepage = "https://github.com/microsoft/vscode-mypy";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

From ecd9d98879729b38bc3c347b9f2d2708f7027f5b Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sat, 8 Feb 2025 21:25:15 +1100
Subject: [PATCH 45/48] llvmPackages.openmp: Make OMPD customisable, add
 missing Python dependency

---
 .../compilers/llvm/common/openmp/default.nix        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 68c50e06abd3..8b1218c1ba67 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -14,9 +14,15 @@
 , clang-unwrapped
 , perl
 , pkg-config
+, python3
 , version
 , devExtraCmakeFlags ? []
+, ompdSupport ? true
+, ompdGdbSupport ? ompdSupport
 }:
+
+assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!";
+
 let
   pname = "openmp";
   src' =
@@ -53,9 +59,14 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [
     (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
+  ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [
+    python3
   ];
 
-  cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [
+  cmakeFlags = [
+    (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
+    (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
+  ] ++ lib.optionals (lib.versions.major release_version == "13") [
     "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails
   ] ++ lib.optionals (lib.versionAtLeast release_version "14") [
     "-DCLANG_TOOL=${clang-unwrapped}/bin/clang"

From 21a8b8d45ef459b0984e95d135ab38aa3619e352 Mon Sep 17 00:00:00 2001
From: hacker1024 <hacker1024@users.sourceforge.net>
Date: Sat, 8 Feb 2025 21:25:19 +1100
Subject: [PATCH 46/48] llvmPackages.openmp: Build static libraries when
 appropriate

---
 pkgs/development/compilers/llvm/common/openmp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 8b1218c1ba67..d6e176192b95 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (rec {
   ];
 
   cmakeFlags = [
+    (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries))
     (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
     (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
   ] ++ lib.optionals (lib.versions.major release_version == "13") [

From c006d5f0637d9a98d990e80e80b1fd932bb6025e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 8 Feb 2025 12:47:46 +0100
Subject: [PATCH 47/48] Revert "llvmPackages.openmp: Build static libraries
 when appropriate"

This reverts commit 21a8b8d45ef459b0984e95d135ab38aa3619e352.

Mass rebuild accidentally merged to master.
---
 pkgs/development/compilers/llvm/common/openmp/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index d6e176192b95..8b1218c1ba67 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation (rec {
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries))
     (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
     (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
   ] ++ lib.optionals (lib.versions.major release_version == "13") [

From fa648b2835f6cc0e77bd3b246cf8c80f126f0139 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 8 Feb 2025 12:48:22 +0100
Subject: [PATCH 48/48] Revert "llvmPackages.openmp: Make OMPD customisable,
 add missing Python dependency"

This reverts commit ecd9d98879729b38bc3c347b9f2d2708f7027f5b.

Mass rebuild accidentally merged to master.
---
 .../compilers/llvm/common/openmp/default.nix        | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 8b1218c1ba67..68c50e06abd3 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -14,15 +14,9 @@
 , clang-unwrapped
 , perl
 , pkg-config
-, python3
 , version
 , devExtraCmakeFlags ? []
-, ompdSupport ? true
-, ompdGdbSupport ? ompdSupport
 }:
-
-assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!";
-
 let
   pname = "openmp";
   src' =
@@ -59,14 +53,9 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [
     (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
-  ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [
-    python3
   ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)
-    (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)
-  ] ++ lib.optionals (lib.versions.major release_version == "13") [
+  cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [
     "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails
   ] ++ lib.optionals (lib.versionAtLeast release_version "14") [
     "-DCLANG_TOOL=${clang-unwrapped}/bin/clang"