Merge master into staging-next

2024-07-29 06:01:22 +00:00
parent 79381653f0 7fee7ae70f
commit 49c87f22b2
50 changed files with 337 additions and 161 deletions
@@ -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 {
@@ -3,11 +3,15 @@
  fetchFromGitHub,
  melpaBuild,
  prop-menu,
+  gitUpdater,
 }:

-melpaBuild rec {
-  pname = "idris2-mode";
+let
  version = "1.1";
+in
+melpaBuild {
+  pname = "idris2-mode";
+  inherit version;

  src = fetchFromGitHub {
    owner = "idris-community";
@@ -20,10 +24,12 @@ melpaBuild rec {
    prop-menu
  ];

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    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 ];
  };
 }
@@ -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",
@@ -1,35 +1,39 @@
-{ lib
-, stdenv
-, cmake
-, llvm
-, fetchFromGitHub
-, mbedtls
-, gtk3
-, pkg-config
-, capstone
-, dbus
-, libGLU
-, glfw3
-, file
-, perl
-, python3
-, jansson
-, curl
-, fmt_8
-, nlohmann_json
-, yara
-, rsync
+{
+  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
-  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,14 +42,23 @@ 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 ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    llvm
+    python3
+    perl
+    pkg-config
+    rsync
+  ];

  buildInputs = [
    capstone
@@ -62,6 +75,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"
@@ -82,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;
  };
 }
@@ -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;
  };
@@ -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 {
@@ -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;
  };
 }
@@ -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;
  };
 }
@@ -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 = [
@@ -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
@@ -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 ];
@@ -2,10 +2,9 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch,
  isPy27,
  pytestCheckHook,
-  nose,
+  setuptools,
  numpy,
  pandas,
  xarray,
@@ -14,47 +13,40 @@

 buildPythonPackage rec {
  pname = "traittypes";
-  version = "unstable-2019-06-23";
-  format = "setuptools";
+  version = "0.2.1-unstable-2020-07-17";
+  pyproject = true;

  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 ];
+  build-system = [ setuptools ];
+
+  dependencies = [ traitlets ];

  nativeCheckInputs = [
    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; {
+  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 ];
  };
 }
@@ -3,7 +3,7 @@
  generateSplicesForMkScope,
  callPackage,
  attributePathToSplice ? [ "freebsd" ],
-  branch ? "release/14.0.0",
+  branch ? "release/14.1.0",
 }:

 let
@@ -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 */
+ 
@@ -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
@@ -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"
@@ -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
@@ -1,5 +1,7 @@
-{ mkDerivation }:
+{ lib, mkDerivation }:
 mkDerivation {
  path = "sbin/fsck";
  extraPaths = [ "sbin/mount" ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
@@ -0,0 +1,13 @@
+{
+  lib,
+  mkDerivation,
+  libufs,
+}:
+mkDerivation {
+  path = "sbin/fsck_ffs";
+  extraPaths = [ "sbin/mount" ];
+
+  buildInputs = [ libufs ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
@@ -0,0 +1,10 @@
+{ lib, mkDerivation }:
+mkDerivation {
+  path = "sbin/fsck_msdosfs";
+  extraPaths = [
+    "sbin/mount"
+    "sbin/fsck"
+  ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
@@ -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
+  '';
+}
@@ -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

@@ -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;
 }
@@ -1,8 +1,8 @@
 {
+  lib,
  mkDerivation,
  libutil,
  libxo,
-  ...
 }:
 mkDerivation {
  path = "sbin/mount";
@@ -10,4 +10,6 @@ mkDerivation {
    libutil
    libxo
  ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
@@ -1,6 +1,12 @@
-{ mkDerivation, libkiconv }:
+{
+  lib,
+  mkDerivation,
+  libkiconv,
+}:
 mkDerivation {
  path = "sbin/mount_msdosfs";
  extraPaths = [ "sbin/mount" ];
  buildInputs = [ libkiconv ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
@@ -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
@@ -21,6 +21,7 @@ mkDerivation {
    "lib/libc"
    "lib/liblua"
    "libexec/flua"
+    "lib/flua"
    "stand"
    "sys"
  ];
@@ -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;
@@ -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",
-    "supported": true,
-    "version": {
-      "branch": "STABLE",
-      "major": 13,
-      "minor": 3,
-      "reldate": "1303503",
-      "release": "13.3-STABLE",
-      "revision": "13.3",
-      "type": "FreeBSD",
-      "version": "FreeBSD 13.3-STABLE"
-    }
-  },
-  "stable/14": {
-    "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=",
-    "ref": "stable/14",
-    "refType": "branch",
-    "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0",
+    "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34",
    "supported": true,
    "version": {
      "branch": "PRERELEASE",
+      "major": 13,
+      "minor": 4,
+      "reldate": "1303503",
+      "release": "13.4-PRERELEASE",
+      "revision": "13.4",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.4-PRERELEASE"
+    }
+  },
+  "stable/14": {
+    "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=",
+    "ref": "stable/14",
+    "refType": "branch",
+    "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b",
+    "supported": true,
+    "version": {
+      "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"
    }
  }
 }
@@ -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";
@@ -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
@@ -15974,7 +15974,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 18