From fe47a55fa3c957bc37e32ed66147fbc4bf546fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:28:23 -0400
Subject: [PATCH 01/18] imhex: 1.33.2 -> 1.35.3

---
 pkgs/by-name/im/imhex/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index da3a2b4e20fa4..7a5535cbd5b2a 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -22,14 +22,15 @@
 }:
 
 let
-  version = "1.33.2";
-  patterns_version = "1.33.2";
+  version = "1.35.3";
+  patterns_version = "1.35.3";
 
   patterns_src = fetchFromGitHub {
+    name = "ImHex-Patterns-source-${patterns_version}";
     owner = "WerWolv";
     repo = "ImHex-Patterns";
     rev = "ImHex-v${patterns_version}";
-    hash = "sha256-5a6aFT8R8vMzPS+Y+fcDV5+olhioEpLjdMqa7qOyGsw=";
+    hash = "sha256-h86qoFMSP9ehsXJXOccUK9Mfqe+DVObfSRT4TCtK0rY=";
   };
 
 in
@@ -38,11 +39,12 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchFromGitHub {
+    name = "ImHex-source-${version}";
     fetchSubmodules = true;
     owner = "WerWolv";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-8Ehpk0TjE4itQ7D9Nx74plYwABVufuYmxfxyuSqak1c=";
+    repo = "ImHex";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8vhOOHfg4D9B9yYgnGZBpcjAjuL4M4oHHax9ad5PJtA=";
   };
 
   nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ];

From 1db62e6fb734146b49d057ca9350510fd158ad88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:59:05 -0400
Subject: [PATCH 02/18] imhex: fix RUNPATH to find libGL and plugins

---
 pkgs/by-name/im/imhex/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 7a5535cbd5b2a..a30de68669a35 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -9,6 +9,7 @@
 , capstone
 , dbus
 , libGLU
+, libGL
 , glfw3
 , file
 , perl
@@ -19,6 +20,7 @@
 , nlohmann_json
 , yara
 , rsync
+, autoPatchelfHook
 }:
 
 let
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-8vhOOHfg4D9B9yYgnGZBpcjAjuL4M4oHHax9ad5PJtA=";
   };
 
-  nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ];
+  nativeBuildInputs = [ autoPatchelfHook cmake llvm python3 perl pkg-config rsync ];
 
   buildInputs = [
     capstone
@@ -64,6 +66,14 @@ stdenv.mkDerivation rec {
     yara
   ];
 
+  # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib
+  # however, we will append to RUNPATH ourselves
+  autoPatchelfIgnoreMissingDeps = [ "*.hexpluglib" ];
+  appendRunpaths = [
+    (lib.makeLibraryPath [ libGL ])
+    "${placeholder "out"}/lib/imhex/plugins"
+  ];
+
   cmakeFlags = [
     "-DIMHEX_OFFLINE_BUILD=ON"
     "-DUSE_SYSTEM_CAPSTONE=ON"

From 3728d33b72684639dccaaae6aa6d16a26198490d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:59:47 -0400
Subject: [PATCH 03/18] imhex: nixfmt-rfc-style

---
 pkgs/by-name/im/imhex/package.nix | 62 ++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index a30de68669a35..a1b55f16899d8 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -1,26 +1,27 @@
-{ lib
-, stdenv
-, cmake
-, llvm
-, fetchFromGitHub
-, mbedtls
-, gtk3
-, pkg-config
-, capstone
-, dbus
-, libGLU
-, libGL
-, glfw3
-, file
-, perl
-, python3
-, jansson
-, curl
-, fmt_8
-, nlohmann_json
-, yara
-, rsync
-, autoPatchelfHook
+{
+  lib,
+  stdenv,
+  cmake,
+  llvm,
+  fetchFromGitHub,
+  mbedtls,
+  gtk3,
+  pkg-config,
+  capstone,
+  dbus,
+  libGLU,
+  libGL,
+  glfw3,
+  file,
+  perl,
+  python3,
+  jansson,
+  curl,
+  fmt_8,
+  nlohmann_json,
+  yara,
+  rsync,
+  autoPatchelfHook,
 }:
 
 let
@@ -49,7 +50,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-8vhOOHfg4D9B9yYgnGZBpcjAjuL4M4oHHax9ad5PJtA=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook cmake llvm python3 perl pkg-config rsync ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    llvm
+    python3
+    perl
+    pkg-config
+    rsync
+  ];
 
   buildInputs = [
     capstone
@@ -94,7 +103,10 @@ stdenv.mkDerivation rec {
     description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM";
     homepage = "https://github.com/WerWolv/ImHex";
     license = with licenses; [ gpl2Only ];
-    maintainers = with maintainers; [ kashw2 cafkafk ];
+    maintainers = with maintainers; [
+      kashw2
+      cafkafk
+    ];
     platforms = platforms.linux;
   };
 }

From 5170187ef55de549a1280a9756b982991de2afa2 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 27 Jul 2024 18:58:30 +0900
Subject: [PATCH 04/18] python312Packages.anthropic: 0.28.1 -> 0.31.2

Diff: https://github.com/anthropics/anthropic-sdk-python/compare/refs/tags/v0.28.1...v0.31.2

Changelog: https://github.com/anthropics/anthropic-sdk-python/releases/tag/v0.31.2
---
 pkgs/development/python-modules/anthropic/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index ad79271688f61..ed26deaabdec9 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.28.1";
+  version = "0.31.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n5Vmi2frUdSbrmulopwUlIO+blkf7cANoKTaTFZQdjw=";
+    hash = "sha256-cKXOIVpF+CZ542JX9flQYKSrdYkSVeNESUztB6yaATQ=";
   };
 
   build-system = [
@@ -71,6 +71,7 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Test require network access
     "tests/api_resources"
+    "tests/lib/test_bedrock.py"
   ];
 
   pytestFlagsArray = [

From 15a1c9ebb183cebb5fe4d0112e701a8a4869779c Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 28 Jul 2024 12:24:59 +0800
Subject: [PATCH 05/18] deepin.deepin-draw: 6.0.5 -> 7.0.2

---
 pkgs/desktops/deepin/apps/deepin-draw/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 980c7b3d1934f..35de0414b47e4 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-draw";
-  version = "6.0.5";
+  version = "7.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
+    hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
   };
 
   postPatch = ''
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight drawing tool for users to freely draw and simply edit images";
     mainProgram = "deepin-draw";
     homepage = "https://github.com/linuxdeepin/deepin-draw";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 8bc0c3453b2a9f875d0303bab038a766bea98d50 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 21 Dec 2023 13:37:59 +0800
Subject: [PATCH 06/18] deepin.deepin-screen-recorder: unstable-2023-07-10 ->
 6.0.6

---
 .../apps/deepin-screen-recorder/default.nix   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index c035a217171e6..3b775fb8bc642 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
@@ -8,7 +8,6 @@
 , dtkwidget
 , qt5integration
 , dde-qt-dbus-factory
-, dde-dock
 , qtbase
 , qtmultimedia
 , qtx11extras
@@ -27,22 +26,27 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-screen-recorder";
-  version = "unstable-2023-07-10";
+  version = "6.0.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1";
-    hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA=";
+    rev = version;
+    hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
   };
 
-  patches = [ ./dont_use_libPath.diff ];
+  patches = [
+    ./dont_use_libPath.diff
+  ];
 
+  # disable dock plugins, it's part of dde-shell now
   postPatch = ''
+    substituteInPlace screen_shot_recorder.pro \
+      --replace-fail " src/dde-dock-plugins" ""
     (
       shopt -s globstar
       substituteInPlace **/*.pro **/*.service **/*.desktop \
-        --replace "/usr/" "$out/"
+        --replace-quiet "/usr/" "$out/"
     )
   '';
 
@@ -56,7 +60,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     dtkwidget
     dde-qt-dbus-factory
-    dde-dock
     qtbase
     qtmultimedia
     qtx11extras
@@ -78,9 +81,6 @@ stdenv.mkDerivation rec {
     gst-plugins-good
   ]);
 
-  # Fix build failure on dtk 5.6.20
-  env.NIX_CFLAGS_COMPILE = "-std=c++14";
-
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
     "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
@@ -91,11 +91,11 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Screen recorder application for dde";
     homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 91a7e98b2589e1e6bf96da74e57d9c6f9110489d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jul 2024 07:09:46 +0000
Subject: [PATCH 07/18] sketchybar-app-font: 2.0.19 -> 2.0.20

---
 pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 91b050403a016..56bdcfd4937ac 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.19";
+  version = "2.0.20";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
-    rev = "v2.0.19";
-    hash = "sha256-4D3ONeGSvFYdeD3alzXlDxyLh6EyIC+lr4A6t7YWBaw=";
+    rev = "v2.0.20";
+    hash = "sha256-vWOVPllygKFeJe3aDOnXKdfIq9foL2V/sr1kj4VBhbc=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From 54036fe28f41435c9dcd99349447ea524106e2a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jul 2024 09:32:47 +0000
Subject: [PATCH 08/18] marimo: 0.7.11 -> 0.7.12

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

diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 44b702a12711b..2639001081e1e 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.7.11";
+  version = "0.7.12";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yyz0gCdyMHSCoyaMr+cqW4/kmEmaufAl2PrNVYCovOg=";
+    hash = "sha256-YrxxqFLSNF5KZV8dDUnr6VT4r5ECErOfguQSCdAsgO4=";
   };
 
   build-system = [ setuptools ];

From 1c9f2a0404d0705b47d6fb5f2d78d347ab635da9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 24 Jul 2024 11:59:57 -0300
Subject: [PATCH 09/18] emacsPackages.idris2-mode: updateScript

---
 .../elisp-packages/manual-packages/idris2-mode/package.nix     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 5148daad1903b..784f55c4c53df 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   melpaBuild,
   prop-menu,
+  gitUpdater,
 }:
 
 melpaBuild rec {
@@ -20,6 +21,8 @@ melpaBuild rec {
     prop-menu
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://github.com/idris-community/idris2-mode";
     description = "Emacs mode for editing Idris 2 code";

From 2014517409c5b1d71eaf819a74c1d4e20b045e89 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 28 Jul 2024 14:13:02 -0300
Subject: [PATCH 10/18] emacsPackages.idris2-mode: get rid of rec

---
 .../elisp-packages/manual-packages/idris2-mode/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 784f55c4c53df..3901b4afcc172 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -6,9 +6,12 @@
   gitUpdater,
 }:
 
-melpaBuild rec {
-  pname = "idris2-mode";
+let
   version = "1.1";
+in
+melpaBuild {
+  pname = "idris2-mode";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "idris-community";

From 66d049701d9d9e3057ff03274f3dd8a6318f4bd9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Jul 2024 16:02:59 -0300
Subject: [PATCH 11/18] emacsPackages.idris2-mode: add AndersonTorres as
 maintainer

wuyoli's latest commit is at least one year old.
---
 .../elisp-packages/manual-packages/idris2-mode/package.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 3901b4afcc172..2a7b7b571d12e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -30,6 +30,6 @@ melpaBuild {
     homepage = "https://github.com/idris-community/idris2-mode";
     description = "Emacs mode for editing Idris 2 code";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ wuyoli ];
+    maintainers = with lib.maintainers; [ wuyoli AndersonTorres ];
   };
 }

From 43fb06aa929990e6e6d44a13ba35cc28d4c91384 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 24 Jul 2024 15:52:10 -0700
Subject: [PATCH 12/18] freebsd: 14.0 -> 14.1

---
 pkgs/os-specific/bsd/freebsd/default.nix      |   2 +-
 .../{14.0 => 14.1}/bmake-no-compiler-rt.patch |   0
 .../compat-fix-typedefs-locations.patch       |   0
 .../{14.0 => 14.1}/compat-install-dirs.patch  |   0
 .../bsd/freebsd/patches/14.1/fsck-path.patch  |  18 +++
 .../install-bootstrap-Makefile.patch          |   0
 .../libc-msun-arch-subdir.patch               |   0
 .../libc-no-force--lcompiler-rt.patch         |   0
 .../{14.0 => 14.1}/libcxxrt-headers.patch     |   0
 .../libifconfig-no-internal.patch             |   0
 .../{14.0 => 14.1}/libnetbsd-do-install.patch |   0
 .../librpcsvc-include-subdir.patch            |   0
 .../patches/{14.0 => 14.1}/localedef.patch    |   4 +-
 .../{14.0 => 14.1}/mount-use-path.patch       |   0
 .../{14.0 => 14.1}/mtree-Makefile.patch       |   0
 .../no-perms-BSD.include.dist.patch           |   0
 .../patches/{14.0 => 14.1}/rc-user.patch      |   0
 .../rtld-no-force--lcompiler-rt.patch         |   0
 .../patches/{14.0 => 14.1}/sys-gnu-date.patch |   0
 .../sys-no-explicit-intrinsics-dep.patch      |   0
 .../{14.0 => 14.1}/tinfo-host-cc.patch        |   0
 .../bsd/freebsd/pkgs/compat/package.nix       |   9 +-
 pkgs/os-specific/bsd/freebsd/pkgs/csu.nix     |   3 +-
 pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix    |   4 +-
 .../os-specific/bsd/freebsd/pkgs/fsck_ffs.nix |  13 +++
 .../bsd/freebsd/pkgs/fsck_msdosfs.nix         |  10 ++
 pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix |  15 +++
 .../bsd/freebsd/pkgs/libc/package.nix         |   4 +-
 pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix  |   5 +-
 pkgs/os-specific/bsd/freebsd/pkgs/mount.nix   |   4 +-
 .../bsd/freebsd/pkgs/mount_msdosfs.nix        |   8 +-
 pkgs/os-specific/bsd/freebsd/pkgs/rc.nix      |  13 ++-
 .../bsd/freebsd/pkgs/stand-efi.nix            |   1 +
 .../bsd/freebsd/pkgs/sys/package.nix          |   7 +-
 pkgs/os-specific/bsd/freebsd/versions.json    | 106 ++++++++++++------
 pkgs/stdenv/freebsd/default.nix               |   5 +-
 pkgs/stdenv/freebsd/make-bootstrap-tools.nix  |   2 +
 pkgs/top-level/all-packages.nix               |   2 +-
 38 files changed, 179 insertions(+), 56 deletions(-)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/bmake-no-compiler-rt.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/compat-fix-typedefs-locations.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/compat-install-dirs.patch (100%)
 create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/install-bootstrap-Makefile.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/libc-msun-arch-subdir.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/libc-no-force--lcompiler-rt.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/libcxxrt-headers.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/libifconfig-no-internal.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/libnetbsd-do-install.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/librpcsvc-include-subdir.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/localedef.patch (98%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/mount-use-path.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/mtree-Makefile.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/no-perms-BSD.include.dist.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/rc-user.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/rtld-no-force--lcompiler-rt.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/sys-gnu-date.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/sys-no-explicit-intrinsics-dep.patch (100%)
 rename pkgs/os-specific/bsd/freebsd/patches/{14.0 => 14.1}/tinfo-host-cc.patch (100%)
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix

diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix
index cfe6080b020a0..1abd1af71ad2c 100644
--- a/pkgs/os-specific/bsd/freebsd/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/default.nix
@@ -4,7 +4,7 @@
   generateSplicesForMkScope,
   callPackage,
   attributePathToSplice ? [ "freebsd" ],
-  branch ? "release/14.0.0",
+  branch ? "release/14.1.0",
 }:
 
 let
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
new file mode 100644
index 0000000000000..d1e49d20103bb
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
@@ -0,0 +1,18 @@
+diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
+index 3757ed062ba5..584ada116386 100644
+--- a/sbin/fsck/fsck.c
++++ b/sbin/fsck/fsck.c
+@@ -375,11 +375,8 @@ checkfs(const char *pvfstype, const char *spec, const char *mntpt,
+ 			_exit(0);
+ 
+ 		/* Go find an executable. */
+-		execvP(execbase, _PATH_SYSPATH, __DECONST(char * const *, argv));
+-		if (spec)
+-			warn("exec %s for %s in %s", execbase, spec, _PATH_SYSPATH);
+-		else
+-			warn("exec %s in %s", execbase, _PATH_SYSPATH);
++		execvp(execbase, __DECONST(char * const *, argv));
++		warn("exec %s not found", execbase);
+ 		_exit(1);
+ 		/* NOTREACHED */
+ 
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
similarity index 98%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
index 73a0341bd3240..4800879ab0bdf 100644
--- a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
@@ -17,12 +17,12 @@ index 2d3723b49f5b..6bbff732b9d7 100644
 +++ b/lib/libc/locale/collate.h
 @@ -36,6 +36,7 @@
  #ifndef _COLLATE_H_
- #define	_COLLATE_H_
+ #define        _COLLATE_H_
  
 +#include <stdint.h>
- #include <sys/cdefs.h>
  #include <sys/types.h>
  #include <limits.h>
+ #include "xlocale_private.h"
 diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
 index 44b7e3292eae..79c30b7cf372 100644
 --- a/usr.bin/localedef/charmap.c
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
index f597d6e3705b4..5865f93674e10 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
@@ -41,9 +41,12 @@ mkDerivation {
 
       "sys/rpc/types.h"
     ]
-    ++ lib.optionals (versionData.major == 14) [ "sys/sys/bitcount.h" ]
+    ++ lib.optionals (versionData.major == 14) [
+      "sys/sys/bitcount.h"
+      "sys/sys/linker_set.h"
+      "sys/sys/module.h"
+    ]
     ++ [
-
       # Listed in Makekfile as INC
       "include/mpool.h"
       "include/ndbm.h"
@@ -64,7 +67,7 @@ mkDerivation {
     ]
     ++ [
 
-      # Listed in Makekfile as SYSINC
+      # Listed in Makefile as SYSINCS
 
       "sys/sys/capsicum.h"
       "sys/sys/caprights.h"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
index 020a08c1d01ef..5d4bad19ad1d6 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
@@ -1,6 +1,7 @@
 {
   lib,
   mkDerivation,
+  versionData,
   bsdSetupHook,
   freebsdSetupHook,
   makeMinimal,
@@ -17,7 +18,7 @@ mkDerivation {
   extraPaths = [
     "lib/Makefile.inc"
     "lib/libc/include/libc_private.h"
-  ];
+  ] ++ lib.optionals (versionData.major == 14) [ "sys/sys/param.h" ];
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
index ba55a5f651ed4..e6febd1ee2251 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
@@ -1,5 +1,7 @@
-{ mkDerivation }:
+{ lib, mkDerivation }:
 mkDerivation {
   path = "sbin/fsck";
   extraPaths = [ "sbin/mount" ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
new file mode 100644
index 0000000000000..a6082d569b5e5
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  mkDerivation,
+  libufs,
+}:
+mkDerivation {
+  path = "sbin/fsck_ffs";
+  extraPaths = [ "sbin/mount" ];
+
+  buildInputs = [ libufs ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
new file mode 100644
index 0000000000000..99b8d74ec4ed9
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
@@ -0,0 +1,10 @@
+{ lib, mkDerivation }:
+mkDerivation {
+  path = "sbin/fsck_msdosfs";
+  extraPaths = [
+    "sbin/mount"
+    "sbin/fsck"
+  ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix
new file mode 100644
index 0000000000000..6c930a51db889
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  libelf,
+  compatIfNeeded,
+}:
+mkDerivation {
+  path = "usr.sbin/kldxref";
+
+  buildInputs = [ libelf ] ++ compatIfNeeded;
+
+  # We symlink in our modules, make it follow symlinks
+  postPatch = ''
+    sed -i 's/FTS_PHYSICAL/FTS_LOGICAL/' $BSDSRCDIR/usr.sbin/kldxref/kldxref.c
+  '';
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
index a991e69265823..6d31b1fc49e33 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
@@ -187,7 +187,7 @@ mkDerivation {
       find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;
       popd
 
-      mkdir $BSDSRCDIR/lib/libcompiler_rt/i386
+      mkdir $BSDSRCDIR/lib/libcompiler_rt/i386 $BSDSRCDIR/lib/libcompiler_rt/cpu_model
       make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags
       make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags install
 
@@ -195,7 +195,7 @@ mkDerivation {
       make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install
 
       ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so  # not sure
-      mkdir $BSDSRCDIR/lib/libgcc_s/i386
+      mkdir $BSDSRCDIR/lib/libgcc_s/i386 $BSDSRCDIR/lib/libgcc_s/cpu_model
       make -C $BSDSRCDIR/lib/libgcc_s $makeFlags
       make -C $BSDSRCDIR/lib/libgcc_s $makeFlags install
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
index a116aff81f397..0a077e5aee1c3 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
@@ -1,6 +1,6 @@
 {
+  stdenv,
   mkDerivation,
-  lib,
   bsdSetupHook,
   freebsdSetupHook,
   makeMinimal,
@@ -16,7 +16,6 @@ mkDerivation {
     "sys/sys/elf64.h"
     "sys/sys/elf_common.h"
   ];
-  buildInputs = [ ];
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
@@ -25,5 +24,5 @@ mkDerivation {
     m4
   ];
 
-  meta.platforms = lib.platforms.freebsd;
+  BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
index a4885871ad1c5..69ce44762ee18 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
@@ -1,8 +1,8 @@
 {
+  lib,
   mkDerivation,
   libutil,
   libxo,
-  ...
 }:
 mkDerivation {
   path = "sbin/mount";
@@ -10,4 +10,6 @@ mkDerivation {
     libutil
     libxo
   ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
index da42260ffbad5..60e03134d36dc 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
@@ -1,6 +1,12 @@
-{ mkDerivation, libkiconv }:
+{
+  lib,
+  mkDerivation,
+  libkiconv,
+}:
 mkDerivation {
   path = "sbin/mount_msdosfs";
   extraPaths = [ "sbin/mount" ];
   buildInputs = [ libkiconv ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
index 92b645851b9c1..352d0e238de5e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
@@ -9,6 +9,7 @@
   id,
   protect,
   mount,
+  fsck,
 }:
 let
   rcDepsPath = lib.makeBinPath [
@@ -20,16 +21,24 @@ let
     id
     mount
     protect
+    fsck
   ];
 in
 mkDerivation {
   path = "libexec/rc";
   MK_TESTS = "no";
 
+  outputs = [
+    "out"
+    "services"
+  ];
+
   postPatch =
     ''
-      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
-      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" --replace-fail /var $out/var
+      substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
+      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" \
+        --replace-fail /etc $services/etc \
+        --replace-fail /var $services/var
     ''
     + (
       let
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
index c2d42af7814a4..1bb3926f2a232 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
@@ -21,6 +21,7 @@ mkDerivation {
     "lib/libc"
     "lib/liblua"
     "libexec/flua"
+    "lib/flua"
     "stand"
     "sys"
   ];
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 5bca92269212f..62a78dcded91e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -21,6 +21,7 @@
   file2c,
   bintrans,
   xargs-j,
+  kldxref,
 }:
 let
   hostArchBsd = freebsd-lib.mkBsdArch stdenv;
@@ -83,6 +84,7 @@ mkDerivation rec {
     file2c
     bintrans
     xargs-j
+    kldxref
   ];
 
   # --dynamic-linker /red/herring is used when building the kernel.
@@ -98,7 +100,10 @@ mkDerivation rec {
   ];
 
   # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too
-  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+  NIX_CFLAGS_COMPILE = [
+    "-fno-stack-protector"
+    "-Wno-unneeded-internal-declaration" # some openzfs code trips this
+  ];
 
   inherit env;
   passthru.env = env;
diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json
index 3f781b4eeaf23..198b999578640 100644
--- a/pkgs/os-specific/bsd/freebsd/versions.json
+++ b/pkgs/os-specific/bsd/freebsd/versions.json
@@ -1,15 +1,15 @@
 {
   "main": {
-    "hash": "sha256-3aUsD2yRqVvb12z2XPmhE5/u4d9bqyD2ZHH3xNmwYwU=",
+    "hash": "sha256-jQpuNjo7n5b4yXGgXR9ggTkrb4r4pFPXdunBipetw+c=",
     "ref": "main",
     "refType": "branch",
-    "rev": "aa34b1d20e44141749ffdecf16908fc1e5db4db6",
+    "rev": "82283cad12a417abfb1469d899b2d7cfb1d38f77",
     "supported": false,
     "version": {
       "branch": "CURRENT",
       "major": 15,
       "minor": 0,
-      "reldate": "1500018",
+      "reldate": "1500021",
       "release": "15.0-CURRENT",
       "revision": "15.0",
       "type": "FreeBSD",
@@ -106,6 +106,24 @@
       "version": "FreeBSD 14.0-RELEASE"
     }
   },
+  "release/14.1.0": {
+    "hash": "sha256-k4Bs5zR17wHPYrL04aUyPswYGdCWVcRYZOTCDp2VTfk=",
+    "ref": "release/14.1.0",
+    "refType": "tag",
+    "rev": "10e31f0946d820d53adc58b7d013b969e4a9a8ed",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE",
+      "major": 14,
+      "minor": 1,
+      "patch": 0,
+      "reldate": "1401000",
+      "release": "14.1-RELEASE",
+      "revision": "14.1",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.1-RELEASE"
+    }
+  },
   "releng/13.0": {
     "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=",
     "ref": "releng/13.0",
@@ -143,91 +161,109 @@
     }
   },
   "releng/13.2": {
-    "hash": "sha256-KN508aIe02Ue4TjlonO6TmAQ7DmiOOSOYrZfg5HP9AM=",
+    "hash": "sha256-1awVV7Zm3GfgZvefoLKrKhIOu1559mBCakmRo+oVAGA=",
     "ref": "releng/13.2",
     "refType": "branch",
-    "rev": "f5ac4e174fdd3497749e351c27aafb34171c5730",
-    "supported": true,
+    "rev": "f0cf0b8266eef39b13917f7bed808daf6d6a2d3e",
+    "supported": false,
     "version": {
-      "branch": "RELEASE-p11",
+      "branch": "RELEASE-p12",
       "major": 13,
       "minor": 2,
-      "patch": "11",
+      "patch": "12",
       "reldate": "1302001",
-      "release": "13.2-RELEASE-p11",
+      "release": "13.2-RELEASE-p12",
       "revision": "13.2",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.2-RELEASE-p11"
+      "version": "FreeBSD 13.2-RELEASE-p12"
     }
   },
   "releng/13.3": {
-    "hash": "sha256-g3i9q9XihesdfQxGy3oC7IMGtbWaLNwFlNzbdvS/4ng=",
+    "hash": "sha256-jvXIrlNmaGe4gyYCK/3wjm9JWBQOU0sD1LPxWykNddI=",
     "ref": "releng/13.3",
     "refType": "branch",
-    "rev": "be4f1894ef399f421bab451e8cf8557e27e5a948",
+    "rev": "deb948cd8dc2efb341ce96e1b7a56c9fbc662ba1",
     "supported": true,
     "version": {
-      "branch": "RELEASE-p2",
+      "branch": "RELEASE-p4",
       "major": 13,
       "minor": 3,
-      "patch": "2",
+      "patch": "4",
       "reldate": "1303001",
-      "release": "13.3-RELEASE-p2",
+      "release": "13.3-RELEASE-p4",
       "revision": "13.3",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.3-RELEASE-p2"
+      "version": "FreeBSD 13.3-RELEASE-p4"
     }
   },
   "releng/14.0": {
-    "hash": "sha256-15B9Nglshniokju88dEKj3BIffZ6L28L+ZuhAC3UqOI=",
+    "hash": "sha256-kQ3r/bnBiOZ6kpnouFLKWdpSiJe3FGWJ/XA6VRNFzEc=",
     "ref": "releng/14.0",
     "refType": "branch",
-    "rev": "d338712beb16ad7740bbd00bd93299a131a68045",
+    "rev": "5e23806790ef4825ac09b458d3df941748599fbb",
     "supported": true,
     "version": {
-      "branch": "RELEASE-p6",
+      "branch": "RELEASE-p8",
       "major": 14,
       "minor": 0,
-      "patch": "6",
+      "patch": "8",
       "reldate": "1400097",
-      "release": "14.0-RELEASE-p6",
+      "release": "14.0-RELEASE-p8",
       "revision": "14.0",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.0-RELEASE-p6"
+      "version": "FreeBSD 14.0-RELEASE-p8"
+    }
+  },
+  "releng/14.1": {
+    "hash": "sha256-rURDGcnMzUhz2I873d5ro+wGY+i8IOmiPJ5T+w4TcPA=",
+    "ref": "releng/14.1",
+    "refType": "branch",
+    "rev": "dcdea9e8623e83e3aef15fff0d6ead05382ad138",
+    "supported": true,
+    "version": {
+      "branch": "RELEASE-p2",
+      "major": 14,
+      "minor": 1,
+      "patch": "2",
+      "reldate": "1401000",
+      "release": "14.1-RELEASE-p2",
+      "revision": "14.1",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.1-RELEASE-p2"
     }
   },
   "stable/13": {
-    "hash": "sha256-ItC8haDdxMSZt1thpCrn8p0xxvs7Uqh/uNo1OwMalj8=",
+    "hash": "sha256-kbz6dpkCVYrTcPNJtKvX0TVQ4qULaOJ/WzCeQ4MYrFU=",
     "ref": "stable/13",
     "refType": "branch",
-    "rev": "825cb4c850f2b97cfd1b24ed421d7938bf37eee7",
+    "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34",
     "supported": true,
     "version": {
-      "branch": "STABLE",
+      "branch": "PRERELEASE",
       "major": 13,
-      "minor": 3,
+      "minor": 4,
       "reldate": "1303503",
-      "release": "13.3-STABLE",
-      "revision": "13.3",
+      "release": "13.4-PRERELEASE",
+      "revision": "13.4",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.3-STABLE"
+      "version": "FreeBSD 13.4-PRERELEASE"
     }
   },
   "stable/14": {
-    "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=",
+    "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=",
     "ref": "stable/14",
     "refType": "branch",
-    "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0",
+    "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b",
     "supported": true,
     "version": {
-      "branch": "PRERELEASE",
+      "branch": "STABLE",
       "major": 14,
       "minor": 1,
-      "reldate": "1400511",
-      "release": "14.1-PRERELEASE",
+      "reldate": "1401501",
+      "release": "14.1-STABLE",
       "revision": "14.1",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.1-PRERELEASE"
+      "version": "FreeBSD 14.1-STABLE"
     }
   }
 }
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 2a2259e840127..08768e0b9131f 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -21,7 +21,7 @@ let
   mkExtraBuildCommands0 = cc: ''
     rsrc="$out/resource-root"
     mkdir "$rsrc"
-    ln -s "${lib.getLib cc}/lib/clang/16/include" "$rsrc"
+    ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major cc.version}/include" "$rsrc"
     echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
   '';
   mkExtraBuildCommands =
@@ -87,7 +87,8 @@ let
           "bin/clang++"
           "bin/cpp"
         ];
-        version = "16";
+        # SYNCME: this version number must be synced with the one in make-bootstrap-tools.nix
+        version = "18";
       };
       libunwind = linkBootstrap {
         name = "libunwind";
diff --git a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
index d65c420fa1b71..fe133eb72a56f 100644
--- a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
@@ -48,6 +48,8 @@
   '';
   bootstrap-tools = tar-all "bootstrap-tools.tar.xz" (
     with pkgs;
+    # SYNCME: this version number must be synced with the one in default.nix
+    let llvmPackages = llvmPackages_18; in
     [
       (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp")
       coreutils
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7442b5c31d0a3..ac517ad4b67cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16031,7 +16031,7 @@ with pkgs;
     # assumption is that or any later version is good.
     choose = platform:
       /**/ if platform.isDarwin then 16
-      else if platform.isFreeBSD then 16
+      else if platform.isFreeBSD then 18
       else if platform.isOpenBSD then 18
       else if platform.isAndroid then 12
       else if platform.isLinux then 17

From 8929ca112137aa94628cbad9d66adc772c1d0b28 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 26 Jul 2024 14:05:06 -0400
Subject: [PATCH 13/18] python312Packages.traittypes: unstable-2019-06-23 ->
 0.2.1-unstable-2020-07-17

Fixes test failures, and replaces np.int with int in tests, since that
makes tests fail.
---
 .../python-modules/traittypes/default.nix     | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix
index dfc793888bac7..aa1771159fd6e 100644
--- a/pkgs/development/python-modules/traittypes/default.nix
+++ b/pkgs/development/python-modules/traittypes/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   isPy27,
   pytestCheckHook,
-  nose,
   numpy,
   pandas,
   xarray,
@@ -14,25 +12,22 @@
 
 buildPythonPackage rec {
   pname = "traittypes";
-  version = "unstable-2019-06-23";
   format = "setuptools";
+  version = "0.2.1-unstable-2020-07-17";
 
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "jupyter-widgets";
     repo = pname;
-    rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2";
-    sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs";
+    rev = "af2ebeec9e58b73a12d4cf841bd506d6eadb8868";
+    hash = "sha256-q7kt8b+yDHsWML/wCeND9PrZMVjemhzG7Ih1OtHbnTw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-intarray-test.patch";
-      url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch";
-      sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace traittypes/tests/test_traittypes.py \
+      --replace-fail "np.int" "int"
+  '';
 
   propagatedBuildInputs = [ traitlets ];
 
@@ -40,15 +35,9 @@ buildPythonPackage rec {
     numpy
     pandas
     xarray
-    nose
     pytestCheckHook
   ];
 
-  disabledTestPaths = lib.optionals (lib.versionAtLeast numpy.version "1.17") [
-    # https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87
-    "traittypes/tests/test_traittypes.py"
-  ];
-
   pythonImportsCheck = [ "traittypes" ];
 
   meta = with lib; {

From e220b2cf081e70c942e4ca117c970b710941a370 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sun, 28 Jul 2024 16:31:52 -0400
Subject: [PATCH 14/18] python312Packages.traittypes: modernize

---
 .../python-modules/traittypes/default.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix
index aa1771159fd6e..e00ebe4ce1b77 100644
--- a/pkgs/development/python-modules/traittypes/default.nix
+++ b/pkgs/development/python-modules/traittypes/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   isPy27,
   pytestCheckHook,
+  setuptools,
   numpy,
   pandas,
   xarray,
@@ -12,8 +13,8 @@
 
 buildPythonPackage rec {
   pname = "traittypes";
-  format = "setuptools";
   version = "0.2.1-unstable-2020-07-17";
+  pyproject = true;
 
   disabled = isPy27;
 
@@ -29,7 +30,9 @@ buildPythonPackage rec {
       --replace-fail "np.int" "int"
   '';
 
-  propagatedBuildInputs = [ traitlets ];
+  build-system = [ setuptools ];
+
+  dependencies = [ traitlets ];
 
   nativeCheckInputs = [
     numpy
@@ -40,10 +43,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "traittypes" ];
 
-  meta = with lib; {
+  meta = {
     description = "Trait types for NumPy, SciPy, XArray, and Pandas";
     homepage = "https://github.com/jupyter-widgets/traittypes";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }

From 17260b299f6db0f5c47b2f272995a6e339329a1e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 28 Jul 2024 22:21:43 +0200
Subject: [PATCH 15/18] lexical: 0.6.1 -> 0.7.0

Diff:
https://github.com/lexical-lsp/lexical/compare/refs/tags/v0.6.1...v0.7.0

Changelog: https://github.com/lexical-lsp/lexical/releases/tag/v0.7.0
---
 pkgs/by-name/le/lexical/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index d836b471cc8d2..18a73f2825de0 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -3,23 +3,26 @@
   beamPackages,
   fetchFromGitHub,
   elixir,
+  nix-update-script,
+  testers,
+  lexical,
 }:
 
 beamPackages.mixRelease rec {
   pname = "lexical";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "lexical-lsp";
     repo = "lexical";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gDiNjtYeEGoYoyoNmPh73EuYCvY36y9lUyLasbFrFgs=";
+    hash = "sha256-veIFr8oovEhukwkGzj02pdc6vN1FCXGz1kn4FAcMALQ=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     inherit pname version src;
 
-    hash = "sha256-xihxPfdLPr5jWFfcX2tccFUl7ND1mi9u8Dn28k6lGVA=";
+    hash = "sha256-pqghYSBeDHfeZclC7jQU0FbadioTZ6uT3+InEUSW3rY=";
   };
 
   installPhase = ''
@@ -36,11 +39,17 @@ beamPackages.mixRelease rec {
     makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" --set RELEASE_COOKIE lexical
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion { package = lexical; };
+  };
+
+  meta = {
     description = "Lexical is a next-generation elixir language server";
     homepage = "https://github.com/lexical-lsp/lexical";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/lexical-lsp/lexical/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "lexical";
     platforms = beamPackages.erlang.meta.platforms;
   };

From 58db6204aca1cd69edb6d1e39b7b56e6e6cd6a0a Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sun, 28 Jul 2024 18:41:26 -0400
Subject: [PATCH 16/18] python312Packages.biopandas: Remove nose dependency

---
 .../python-modules/biopandas/default.nix      | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index 1102457cb94d4..998974d90ee1c 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -5,11 +5,10 @@
   setuptools,
   looseversion,
   mmtf-python,
-  nose,
   numpy,
   pandas,
   pytestCheckHook,
-  pythonOlder,
+  fetchpatch2,
 }:
 
 buildPythonPackage rec {
@@ -24,6 +23,22 @@ buildPythonPackage rec {
     hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I=";
   };
 
+  patches = [
+    # Needed for below patch to apply properly
+    (fetchpatch2 {
+      name = "deprecate-mmtf-parsing.patch";
+      url = "https://github.com/BioPandas/biopandas/commit/7a1517dbe76f2c70da8edb35f90c9fa69254e726.patch?full_index=1";
+      hash = "sha256-RFtXFqUYl8GnZ319HsBwx5SUbfUDnR66Ppakdvtg/wI=";
+    })
+    # Remove nose as a dependency.
+    (fetchpatch2 {
+      name = "remove-nose.patch";
+      url = "https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f.patch?full_index=1";
+      hash = "sha256-fVl57/vGuzlYX/MBZnma1ZFCVmIpjr1k8t3bUJnb/uI=";
+      excludes = [ "setup.py" ];
+    })
+  ];
+
   pythonRelaxDeps = [ "looseversion" ];
 
   build-system = [ setuptools ];
@@ -35,10 +50,7 @@ buildPythonPackage rec {
     looseversion
   ];
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
     # require network access

From c15eea348d25d0be000efa5b6549dff56c566921 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 29 Jul 2024 01:58:55 +0200
Subject: [PATCH 17/18] nixos/nvidia: fix potential null value in versionOlder
 check

---
 nixos/modules/hardware/video/nvidia.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index b4e833186e553..98cd9dfb0add4 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -102,8 +102,8 @@ in
         driver causes it to provide its own framebuffer device, which can cause
         Wayland compositors to work when they otherwise wouldn't.
       '' // {
-        default = lib.versionAtLeast nvidia_x11.version "535";
-        defaultText = lib.literalExpression "lib.versionAtLeast nvidia_x11.version \"535\"";
+        default = lib.versionAtLeast cfg.package.version "535";
+        defaultText = lib.literalExpression "lib.versionAtLeast cfg.package.version \"535\"";
       };
 
       prime.nvidiaBusId = lib.mkOption {

From b0c051842f45617865355b7ccf43319582958f38 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sun, 28 Jul 2024 20:34:20 +0000
Subject: [PATCH 18/18] terraform-providers.bitwarden: init at 0.8.0

---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 167e52e2a7f2c..02865985be101 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -179,6 +179,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso="
   },
+  "bitwarden": {
+    "hash": "sha256-+zuKZBwoOSp3HIdxmK1FInE33/1D5nX2N7zYBCtRvHA=",
+    "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
+    "owner": "maxlaverse",
+    "repo": "terraform-provider-bitwarden",
+    "rev": "v0.8.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-u9ICJtPZveRrK5BOthvFDGkNcUiA0/Hb39KM0eIhUVI="
+  },
   "brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
     "homepage": "https://registry.terraform.io/providers/brightbox/brightbox",