Merge master into staging-next

nixos/doc/manual/development/running-nixos-tests-interactively.section.md

@@ -44,7 +44,7 @@ As an alternative, you can proxy the guest shell to a local TCP server by first
 starting a TCP server in a terminal using the command:
 
 ```ShellSession
-$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr`
+$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr
 ```
 
 In the terminal where the test driver is running, connect to this server by

nixos/modules/services/monitoring/zabbix-proxy.nix

@@ -103,7 +103,7 @@ in
 
  port = mkOption {
  type = types.port;
- default = if cfg.database.type == "mysql" then mysql.port else pgsql.services.port;
+ default = if cfg.database.type == "mysql" then mysql.port else pgsql.settings.port;
  defaultText = literalExpression ''
  if config.${opt.database.type} == "mysql"
  then config.${options.services.mysql.port}

nixos/tests/ladybird.nix

@@ -10,9 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
  ];
 
  services.xserver.enable = true;
- environment.systemPackages = [
- pkgs.ladybird
- ];
+ programs.ladybird.enable = true;
  };
 
  enableOCR = true;

pkgs/applications/editors/vim/default.nix

@@ -26,18 +26,22 @@ stdenv.mkDerivation {
  configureFlags = [
  "--enable-multibyte"
  "--enable-nls"
- ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
  "vim_cv_toupper_broken=no"
  "--with-tlib=ncurses"
  "vim_cv_terminfo=yes"
  "vim_cv_tgetent=zero" # it does on native anyway
- "vim_cv_timer_create=yes"
  "vim_cv_tty_group=tty"
  "vim_cv_tty_mode=0660"
  "vim_cv_getcwd_broken=no"
  "vim_cv_stat_ignores_slash=yes"
  "vim_cv_memmove_handles_overlap=yes"
- ];
+ ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+ "vim_cv_timer_create=no"
+ "vim_cv_timer_create_with_lrt=yes"
+ ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [
+ "vim_cv_timer_create=yes"
+ ]);
 
  # which.sh is used to for vim's own shebang patching, so make it find
  # binaries for the host platform.

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1820,8 +1820,8 @@ let
  mktplcRef = {
  publisher = "github";
  name = "copilot";
- version = "1.180.827";
- hash = "sha256-HA1na9FoExIiAay+tEjxWKqpG2+wq4Oww77Gl2Bhciw=";
+ version = "1.200.920";
+ hash = "sha256-LMShW9GN/wsDBodVn33Ui4qW0619r13VO2rSTPVE9TQ=";
  };
 
  meta = {
@@ -1837,8 +1837,8 @@ let
  mktplcRef = {
  publisher = "github";
  name = "copilot-chat";
- version = "0.14.2024032901"; # compatible with vscode 1.88.1
- hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ=";
+ version = "0.16.2024060502"; # compatible with vscode 1.90.0
+ hash = "sha256-SAydDc3JlJzfCtbJICy3rWx8psVPdRdPfOuzR9Dqtp8=";
  };
  meta = {
  description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";

pkgs/applications/networking/browsers/ladybird/default.nix

@@ -50,21 +50,21 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ladybird";
- version = "0-unstable-2024-05-26";
+ version = "0-unstable-2024-06-04";
 
  src = fetchFromGitHub {
- owner = "SerenityOS";
- repo = "serenity";
- rev = "1a9d8e8fbe360f2d3b376ca0e13c507bd2cc6e8b";
- hash = "sha256-+g/1F/v8nTVbvtSrtyvQbeYacjTlfRpg+Htu0lRlkcU=";
+ owner = "LadybirdWebBrowser";
+ repo = "ladybird";
+ rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5";
+ hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4=";
  };
 
  patches = [
  ./nixos-font-path.patch
  ];
 
  postPatch = ''
- sed -i '/iconutil/d' CMakeLists.txt
+ sed -i '/iconutil/d' Ladybird/CMakeLists.txt
 
  # Don't set absolute paths in RPATH
  substituteInPlace Meta/CMake/lagom_install_options.cmake \
@@ -73,16 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
  '';
 
  preConfigure = ''
- cd Ladybird
-
  # Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx
  # Note that the versions of the input data packages must match the
  # expected version in the package's CMake.
 
  # Check that the versions match
- grep -F 'set(CLDR_VERSION "${cldr_version}")' ../Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1)
- grep -F 'set(TZDB_VERSION "${tzdata.version}")' ../Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1)
- grep -F 'set(CACERT_VERSION "${cacert_version}")' ../Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)
+ grep -F 'set(CLDR_VERSION "${cldr_version}")' Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1)
+ grep -F 'set(TZDB_VERSION "${tzdata.version}")' Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1)
+ grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)
 
  mkdir -p build/Caches
 

pkgs/applications/science/medicine/xmedcon/default.nix

@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
  pname = "xmedcon";
- version = "0.23.0";
+ version = "0.24.0";
 
  src = fetchurl {
  url = "mirror:https://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-g1CRJDokLDzB+1YIuVQNByBLx01CI47EwGeluqVDujk=";
+ sha256 = "sha256-9NAAXGEVgpVPS7MB8FubnYUpkihE3lET/gep8QfPhB0=";
  };
 
  buildInputs = [

pkgs/applications/version-management/git/default.nix

@@ -121,7 +121,8 @@ stdenv.mkDerivation (finalAttrs: {
  # acceptable version.
  #
  # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
- ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";
+ ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"
+ ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD";
 
  disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
  stdenv.shellPackage

pkgs/by-name/hu/hugo/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
  pname = "hugo";
- version = "0.126.3";
+ version = "0.127.0";
 
  src = fetchFromGitHub {
  owner = "gohugoio";
  repo = "hugo";
  rev = "refs/tags/v${version}";
- hash = "sha256-WWpcbY8KA/62AeIt1hH+xfgEoPle4hfH+/K7I+1xdEc=";
+ hash = "sha256-QAZP119VOPTnVXe2mtzCpB3OW/g73oA/qwR94OzISKo=";
  };
 
- vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs=";
+ vendorHash = "sha256-Og7FTCrto1l+Xpfr2zEgg/yXa7dflws0yJ2Xh9f3mbI=";
 
  doCheck = false;
 

pkgs/by-name/ja/jazz2/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
  pname = "jazz2";
- version = "2.6.0";
+ version = "2.7.0";
 
  src = fetchFromGitHub {
  owner = "deathkiller";
  repo = "jazz2-native";
  rev = finalAttrs.version;
- hash = "sha256-ZTQz6+2myUIJr2HqiwYksM7qiwXrd4+3+h1TC6FuPFU=";
+ hash = "sha256-iy5b5h6wpOlubtOwBs0X7P0wBD3QeAQwjMhgnd4YP+Q=";
  };
 
  patches = [ ./nocontent.patch ];

pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix

@@ -1,14 +1,15 @@
-{ stdenv
-, config
-, pkgs
-, lib
-, fetchFromGitHub
-, cmake
-, eigen
-, onnxruntime
-, opencv
-, cudaSupport ? config.cudaSupport
-, cudaPackages ? { }
+{
+ stdenv,
+ config,
+ pkgs,
+ lib,
+ fetchFromGitHub,
+ cmake,
+ eigen,
+ onnxruntime,
+ opencv,
+ cudaSupport ? config.cudaSupport,
+ cudaPackages ? { },
 }@inputs:
 
 let
@@ -30,34 +31,42 @@ effectiveStdenv.mkDerivation (finalAttrs: {
  hash = "sha256-5TItnPDc5WShpZAgBYeqgI9KKkk3qw/M8HPMlq/H4BM=";
  };
 
- outputs = [ "out" "cmake" ];
+ outputs = [
+ "out"
+ "cmake"
+ ];
 
  nativeBuildInputs = [
  cmake
  eigen
- ] ++ lib.optionals cudaSupport [
- cudaPackages.cuda_nvcc
- ];
+ ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
- buildInputs = [
- onnxruntime
- opencv
- ] ++ lib.optionals cudaSupport (with cudaPackages; [
- cuda_cccl # cub/cub.cuh
- libcublas # cublas_v2.h
- libcurand # curand.h
- libcusparse # cusparse.h
- libcufft # cufft.h
- cudnn # cudnn.h
- cuda_cudart
- ]);
+ buildInputs =
+ [
+ onnxruntime
+ opencv
+ ]
+ ++ lib.optionals cudaSupport (
+ with cudaPackages;
+ [
+ cuda_cccl # cub/cub.cuh
+ libcublas # cublas_v2.h
+ libcurand # curand.h
+ libcusparse # cusparse.h
+ libcufft # cufft.h
+ cudnn # cudnn.h
+ cuda_cudart
+ ]
+ );
 
- cmakeFlags = [
- (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
- (lib.cmakeBool "BUILD_SHARED_LIBS" true)
- ] ++ lib.optionals cudaSupport [
- (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
- ];
+ cmakeFlags =
+ [
+ (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
+ (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+ ]
+ ++ lib.optionals cudaSupport [
+ (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
+ ];
 
  postInstall = ''
  mkdir $cmake
@@ -67,7 +76,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
  meta = with lib; {
  description = "MaaAssistantArknights stripped-down version of FastDeploy";
  homepage = "https://github.com/MaaAssistantArknights/FastDeploy";
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
  license = licenses.asl20;
  broken = cudaSupport && stdenv.hostPlatform.system != "x86_64-linux";
  };

pkgs/by-name/ma/maa-assistant-arknights/package.nix

@@ -1,24 +1,26 @@
-{ lib
-, config
-, callPackage
-, stdenv
-, fetchFromGitHub
-, asio
-, cmake
-, eigen
-, libcpr
-, onnxruntime
-, opencv
-, isBeta ? false
-, cudaSupport ? config.cudaSupport
-, cudaPackages ? { }
+{
+ lib,
+ config,
+ callPackage,
+ stdenv,
+ overrideSDK,
+ fetchFromGitHub,
+ asio,
+ cmake,
+ libcpr,
+ onnxruntime,
+ opencv,
+ isBeta ? false,
+ cudaSupport ? config.cudaSupport,
+ cudaPackages ? { },
 }:
 
 let
  fastdeploy = callPackage ./fastdeploy-ppocr.nix { };
  sources = lib.importJSON ./pin.json;
 in
-stdenv.mkDerivation (finalAttr: {
+# https://github.com/NixOS/nixpkgs/issues/314160
+(if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation (finalAttr: {
  pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta";
  version = if isBeta then sources.beta.version else sources.stable.version;
 
@@ -33,24 +35,27 @@ stdenv.mkDerivation (finalAttr: {
  asio
  cmake
  fastdeploy.cmake
- ] ++ lib.optionals cudaSupport [
- cudaPackages.cuda_nvcc
- ];
+ ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
 
- buildInputs = [
- fastdeploy
- libcpr
- onnxruntime
- opencv
- ] ++ lib.optionals cudaSupport (with cudaPackages; [
- cuda_cccl # cub/cub.cuh
- libcublas # cublas_v2.h
- libcurand # curand.h
- libcusparse # cusparse.h
- libcufft # cufft.h
- cudnn # cudnn.h
- cuda_cudart
- ]);
+ buildInputs =
+ [
+ fastdeploy
+ libcpr
+ onnxruntime
+ opencv
+ ]
+ ++ lib.optionals cudaSupport (
+ with cudaPackages;
+ [
+ cuda_cccl # cub/cub.cuh
+ libcublas # cublas_v2.h
+ libcurand # curand.h
+ libcusparse # cusparse.h
+ libcufft # cufft.h
+ cudnn # cudnn.h
+ cuda_cudart
+ ]
+ );
 
  cmakeFlags = [
  (lib.cmakeBool "BUILD_SHARED_LIBS" true)
@@ -64,6 +69,10 @@ stdenv.mkDerivation (finalAttr: {
 
  passthru.updateScript = ./update.sh;
 
+ postPatch = ''
+ cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
+ '';
+
  postInstall = ''
  mkdir -p $out/share/${finalAttr.pname}
  mv $out/{Python,resource} $out/share/${finalAttr.pname}
@@ -74,6 +83,6 @@ stdenv.mkDerivation (finalAttr: {
  homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights";
  license = licenses.agpl3Only;
  maintainers = with maintainers; [ Cryolitia ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
  };
 })