Merge master into staging-next

2025-02-20 19:16:11 +00:00 · 2024-05-09 06:01:00 +00:00 · 2024-05-09 06:01:00 +00:00 · ff72686a96
commit ff72686a96
parent 3a16e8c6ba 1b8f21cb61
19 changed files with 1085 additions and 233 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -113,6 +113,14 @@
        - pkgs/applications/editors/jupyter-kernels/**/*
        - pkgs/applications/editors/jupyter/**/*

+"6.topic: k3s":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/services/cluster/k3s/**/*
+        - nixos/tests/k3s/**/*
+        - pkgs/applications/networking/cluster/k3s/**/*
+
 "6.topic: kernel":
  - any:
    - changed-files:
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
-, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage
-, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }:
+, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused
+, callPackage, file ? null, gettext ? null, enableNls ? true, enableTiny ? false
+}:

 assert enableNls -> (gettext != null);

@ -14,11 +15,11 @@ let

 in stdenv.mkDerivation rec {
  pname = "nano";
-  version = "7.2";
+  version = "8.0";

  src = fetchurl {
    url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY=";
+    sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ=";
  };

  nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
@ -32,7 +33,9 @@ in stdenv.mkDerivation rec {
    (lib.enableFeature enableTiny "tiny")
  ];

-  postInstall = if enableTiny then null else ''
+  postInstall = if enableTiny then
+    null
+  else ''
    cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
  '';

--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -2234,6 +2234,27 @@ let
        };
      };

+      jackmacwindows.vscode-computercraft = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-computercraft";
+          publisher = "jackmacwindows";
+          version = "1.1.1";
+          hash = "sha256-ec1I3oQ06iMdSUcqf8yA3GjE7Aqa0PiLzRQLwFcL0KU=";
+        };
+        postInstall = ''
+          # Remove superflouous images to reduce closure size
+          rm $out/$installPrefix/images/*.gif
+        '';
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.vscode-computercraft/changelog";
+          description = "A Visual Studio Code extension for ComputerCraft and CC: Tweaked auto-completion";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.vscode-computercraft";
+          homepage = "https://github.com/MCJack123/vscode-computercraft";
+          license = lib.licenses.mit;
+          maintainers = with lib.maintainers; [ tomodachi94 ];
+        };
+      };
+
      jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };

      james-yu.latex-workshop = buildVscodeMarketplaceExtension {
--- a/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/pkgs/applications/networking/cluster/opentofu/default.nix
@ -14,13 +14,13 @@
 let
  package =  buildGoModule rec {
    pname = "opentofu";
-    version = "1.7.0";
+    version = "1.7.1";

    src = fetchFromGitHub {
      owner = "opentofu";
      repo = "opentofu";
      rev = "v${version}";
-      hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE=";
+      hash = "sha256-201zceUedEl93nyglWJo0f9SDfFX31toP0MzzHQeJds=";
    };

    vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -166,8 +166,8 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.8.2";
-    hash = "sha256-c9RzdmaTXMOi4oP++asoysDpt/BSvBK/GmEDDGViSl0=";
+    version = "1.8.3";
+    hash = "sha256-4W1Cs3PAGn43eGDK15qSvN+gLdkkoFIwhejcJsCqcYA=";
    vendorHash = "sha256-2+ctm1lJjCHITWV7BqoqgBlXKjNT4lueAt4F3UtoL9Q=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@ -1,6 +1,7 @@
 { stdenv
 , lib
 , callPackage
+, fetchgit
 , fetchurl
 , fetchpatch
 , makeWrapper
@ -68,6 +69,12 @@ stdenv.mkDerivation rec {
    hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw=";
  };

+  clad_src = fetchgit {
+    url = "https://github.com/vgvassilev/clad";
+    rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files!
+    hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI=";
+  };
+
  nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
  propagatedBuildInputs = [
    nlohmann_json
@ -131,6 +138,23 @@ stdenv.mkDerivation rec {
    substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
      --replace 'set(lcgpackages ' '#set(lcgpackages '

+    # We have to bypass the connection check, because it would disable clad.
+    # This should probably be fixed upstream with a flag to disable the
+    # connectivity check!
+    substituteInPlace CMakeLists.txt \
+      --replace 'if(NO_CONNECTION)' 'if(FALSE)'
+    substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \
+      --replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)'
+    # Make sure that clad is not downloaded when building
+    substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
+      --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""'
+    # Make sure that clad is finding the right llvm version
+    substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
+      --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm'
+    # Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32
+    substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \
+      --replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})'
+
    substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \
      --replace 'add_clang_symlink(''${link} clang)' ""

@ -151,40 +175,18 @@ stdenv.mkDerivation rec {
  '';

  cmakeFlags = [
-    "-Drpath=ON"
    "-DCMAKE_INSTALL_BINDIR=bin"
    "-DCMAKE_INSTALL_LIBDIR=lib"
    "-DCMAKE_INSTALL_INCLUDEDIR=include"
    "-Dbuiltin_llvm=OFF"
-    "-Dbuiltin_freetype=OFF"
-    "-Dbuiltin_gtest=OFF"
-    "-Dbuiltin_nlohmannjson=OFF"
-    "-Dbuiltin_openui5=ON"
-    "-Dclad=OFF"
-    "-Ddavix=ON"
-    "-Ddcache=OFF"
    "-Dfail-on-missing=ON"
-    "-Dfftw3=OFF"
    "-Dfitsio=OFF"
-    "-Dfortran=OFF"
    "-Dgnuinstall=ON"
-    "-Dimt=ON"
-    "-Dgviz=OFF"
-    "-Dhttp=ON"
    "-Dmysql=OFF"
-    "-Dodbc=OFF"
-    "-Dopengl=ON"
    "-Dpgsql=OFF"
-    "-Dpythia8=OFF"
-    "-Droot7=ON"
    "-Dsqlite=OFF"
-    "-Dssl=ON"
-    "-Dtmva=ON"
    "-Dtmva-pymva=OFF"
    "-Dvdt=OFF"
-    "-Dwebgui=ON"
-    "-Dxml=ON"
-    "-Dxrootd=ON"
  ]
  ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include"
  ++ lib.optionals stdenv.isDarwin [
@ -195,6 +197,9 @@ stdenv.mkDerivation rec {
    "-Druntime_cxxmodules=OFF"
  ];

+  # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra
+  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ];
+
  postInstall = ''
    for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do
      wrapProgram "$out/bin/$prog" \
@ -251,7 +256,7 @@ stdenv.mkDerivation rec {
  setupHook = ./setup-hook.sh;

  meta = with lib; {
-    homepage = "https://root.cern.ch/";
+    homepage = "https://root.cern/";
    description = "A data analysis framework";
    platforms = platforms.unix;
    maintainers = [ maintainers.guitargeek maintainers.veprbl ];
--- a/pkgs/applications/science/misc/root/setup-hook.sh
+++ b/pkgs/applications/science/misc/root/setup-hook.sh
@ -12,8 +12,8 @@ thisroot () {

 postHooks+=(thisroot)

-addRootInludePath() {
+addRootIncludePath() {
    addToSearchPath ROOT_INCLUDE_PATH $1/include
 }

-addEnvHooks "$targetOffset" addRootInludePath
+addEnvHooks "$targetOffset" addRootIncludePath
--- a/pkgs/applications/science/misc/root/sw_vers.patch
+++ b/pkgs/applications/science/misc/root/sw_vers.patch
@ -48,7 +48,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
   #---Set Linker flags----------------------------------------------------------------------
 -  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
 else (CMAKE_SYSTEM_NAME MATCHES Darwin)
-   MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
+   MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know what to do. Stop cmake at this point.")
 endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
 diff a/config/root-config.in b/config/root-config.in
 --- a/config/root-config.in
--- a/pkgs/applications/version-management/gh/default.nix
+++ b/pkgs/applications/version-management/gh/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "gh";
-  version = "2.49.0";
+  version = "2.49.1";

  src = fetchFromGitHub {
    owner = "cli";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-4aT8ThZt2Dlp2RjaGBiTgw2IPantSnTJPhP5Tel755Q=";
+    hash = "sha256-9Qr1goFmHV4rNEB849dF9+qEEMOWanCyAcNpXwuQxOo=";
  };

-  vendorHash = "sha256-p+1Knx+z1M3m8VjsvBfY6D1Gs5va5Z8QFExv5397wHU=";
+  vendorHash = "sha256-FztCYs6db6f3niAru/vPpcze84nqwzspoJsdqmdkJmk=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/au/autosuspend/package.nix
+++ b/pkgs/by-name/au/autosuspend/package.nix
@ -7,15 +7,15 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "autosuspend";
-  version = "6.1.1";
+  version = "7.0.0";

-  disabled = python3.pythonOlder "3.8";
+  disabled = python3.pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "languitar";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y=";
+    hash = "sha256-AJ0ZWRxqhBJEics6XnIVWyf7pJI8MphQU4LRqSYYNSQ=";
  };

  postPatch = ''
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
  pname = "nezha-agent";
-  version = "0.16.5";
+  version = "0.16.6";

  src = fetchFromGitHub {
    owner = "nezhahq";
    repo = "agent";
    rev = "v${version}";
-    hash = "sha256-WRHYI3/6qrVZRa4ANA6VBBJCaINP1N8Xjy0GWO4LqgA=";
+    hash = "sha256-+78WrkFMY2dfqU3ShmzQgR1ZgEKyb9COUjlIf695OM8=";
  };

-  vendorHash = "sha256-AtcRfvYBgTZJz9dpsMgacnV8RNi2Ph7QgUrcE6zzTo8=";
+  vendorHash = "sha256-kqu3+hO0juxI5qbczVFg0GF+pljmePFbKd59a14U7Pg=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@ -6,7 +6,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "pyprland";
-  version = "2.2.16";
+  version = "2.2.17";
  format = "pyproject";

  disabled = python3Packages.pythonOlder "3.10";
@ -14,8 +14,8 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "hyprland-community";
    repo = "pyprland";
-    rev = version;
-    hash = "sha256-zT+ixOM+by13iM78CHkQqTS9LCLFspHNyEjd7P2psUE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-S1bIIazrBWyjF8tOcIk0AwwWq9gbpTKNsjr9iYA5lKk=";
  };

  nativeBuildInputs = with python3Packages; [ poetry-core ];
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  darwin,
+}:
 rustPlatform.buildRustPackage rec {
  pname = "slumber";
  version = "1.1.0";
@ -14,12 +20,13 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-AK/+1tCdvNucIbxwyqOt/TbOaJPVDOKFEx5NqW2Yd4U=";

+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
+
  meta = with lib; {
    description = "Terminal-based HTTP/REST client";
    homepage = "https://slumber.lucaspickering.me";
    license = licenses.mit;
    mainProgram = "slumber";
    maintainers = with maintainers; [ javaes ];
-    broken = stdenv.isDarwin || stdenv.isAarch64;
  };
 }
--- a/pkgs/by-name/ta/tabby/Cargo.lock
+++ b/pkgs/by-name/ta/tabby/Cargo.lock
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@ -2,6 +2,7 @@
 , lib
 , rustPlatform
 , fetchFromGitHub
+, nix-update-script
 , stdenv

 , git
@ -31,7 +32,7 @@ let
  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix

  pname = "tabby";
-  version = "0.8.3";
+  version = "0.10.0";


  availableAccelerations = flatten [
@ -77,7 +78,7 @@ let
  # to use a specific device type as it is relying on llama-cpp only being
  # built to use one type of device.
  #
-  # See: https://github.com/TabbyML/tabby/blob/v0.8.3/crates/llama-cpp-bindings/include/engine.h#L20
+  # See: https://github.com/TabbyML/tabby/blob/v0.10.0/crates/llama-cpp-bindings/include/engine.h#L20
  #
  llamaccpPackage = llama-cpp.override {
    rocmSupport = enableRocm;
@ -107,7 +108,7 @@ rustPlatform.buildRustPackage {
    owner = "TabbyML";
    repo = "tabby";
    rev = "v${version}";
-    hash = "sha256-+5Q5XKfh7+g24y2hBqJC/jNEoRytDdcRdn838xc7c8w=";
+    hash = "sha256-Oi4KY2H6/dSBydjvPmycdinXUWCdbbhV32wKRvjjnuo=";
    fetchSubmodules = true;
  };

@ -116,6 +117,7 @@ rustPlatform.buildRustPackage {
    outputHashes = {
      "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4=";
      "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA=";
+      "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=";
    };
  };

@ -152,6 +154,8 @@ rustPlatform.buildRustPackage {
  # file cannot create directory: /var/empty/local/lib64/cmake/Llama
  doCheck = false;

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    homepage = "https://github.com/TabbyML/tabby";
    changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}";
--- a/pkgs/by-name/un/unison/package.nix
+++ b/pkgs/by-name/un/unison/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "unison";
-  version = "2.53.4";
+  version = "2.53.5";

  src = fetchFromGitHub {
    owner = "bcpierce00";
    repo = "unison";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0=";
+    hash = "sha256-XCdK38jG7tRI+/Zk72JVY8a/pPJF6KVaf8l2s3hgxLs=";
  };

  strictDeps = true;
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@ -16,12 +16,12 @@

 buildPythonPackage rec {
  pname = "mplhep";
-  version = "0.3.47";
+  version = "0.3.48";
  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-GDLI/Y6tWiI5JcmQJ7BnwvKPGwdAwJDN4yGOgINcdB8=";
+    hash = "sha256-rAIiaTTSf1xINdadjHk32KOpW4SMg8jdwFt8z1oiLis=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
@ -26,13 +26,18 @@ in
 localPython.pkgs.buildPythonApplication rec {
  pname = "aws-encryption-sdk-cli";
  version = "4.1.0";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM=";
  };

-  propagatedBuildInputs = with localPython.pkgs; [
+  build-system = with localPython.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with localPython.pkgs; [
    attrs
    aws-encryption-sdk
    base64io
@ -45,7 +50,7 @@ localPython.pkgs.buildPythonApplication rec {
  nativeCheckInputs = with localPython.pkgs; [
    mock
    pytest-mock
-    pytestCheckHook
+    pytest7CheckHook
  ];

  disabledTestPaths = [
--- a/pkgs/tools/games/steamtinkerlaunch/default.nix
+++ b/pkgs/tools/games/steamtinkerlaunch/default.nix
@ -1,11 +1,11 @@
 { bash
+, fetchFromGitHub
 , gawk
 , git
-, gnugrep
-, fetchFromGitHub
 , lib
 , makeWrapper
-, stdenv
+, procps
+, stdenvNoCC
 , unixtools
 , unzip
 , wget
@ -14,15 +14,15 @@
 , yad
 }:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "steamtinkerlaunch";
-  version = "12.12";
+  version = "12.12-unstable-2024-05-03";

  src = fetchFromGitHub {
    owner = "sonic2kk";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-oigHNfg5rHxRabwUs66ye+chJzivmCIw8mg/GaJLPkg=";
+    repo = "steamtinkerlaunch";
+    rev = "59b421b2f3686120a076909a4a158824cd4ef05e";
+    hash = "sha256-CGtSGAm+52t2zFsPJEsm76w+FEHhbOd9NYuerGa31tc=";
  };

  # hardcode PROGCMD because #150841
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
      bash
      gawk
      git
-      gnugrep
+      procps
      unixtools.xxd
      unzip
      wget
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
    mainProgram = "steamtinkerlaunch";
    homepage = "https://github.com/sonic2kk/steamtinkerlaunch";
    license = licenses.gpl3;
-    maintainers = with maintainers; [ urandom ];
+    maintainers = with maintainers; [ urandom surfaceflinger ];
    platforms = lib.platforms.linux;
  };
 }