Merge master into staging-next

lib/licenses.nix

@@ -792,7 +792,7 @@ lib.mapAttrs mkLicense ({
 
   lens = {
     fullName = "Lens Terms of Service Agreement";
-    url = "https://k8slens.dev/licenses/tos";
+    url = "https://k8slens.dev/legal/tos";
     free = false;
   };
 

nixos/modules/programs/gnupg.nix

@@ -58,7 +58,7 @@ in
       defaultText = lib.literalMD "matching the configured desktop environment or `pkgs.pinentry-curses`";
       description = ''
         Which pinentry package to use. The path to the mainProgram as defined in
-        the package's meta attriutes will be set in /etc/gnupg/gpg-agent.conf.
+        the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf.
         If not set by the user, it'll pick an appropriate flavor depending on the
         system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce,
         gnome3 on all other systems with X enabled, curses otherwise).

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

@@ -4297,8 +4297,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.11.0";
-          hash = "sha256-CJn5pSZB+f5Eo7DvkJbP0iEzBbuBQC3FSZwxbxlrq58=";
+          version = "1.12.0";
+          hash = "sha256-go7H9DS1uJkzKowIQ2riSPOZRC737/Q0AWxzHIcBwg4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

pkgs/applications/editors/vscode/generic.nix

@@ -63,7 +63,8 @@ let
   # extension tooling without significant pain.
   fhs = { additionalPkgs ? pkgs: [ ] }: buildFHSEnv {
     # also determines the name of the wrapped command
-    name = executableName;
+    pname = executableName;
+    inherit version;
 
     # additional libraries which are commonly needed for extensions
     targetPkgs = pkgs: (with pkgs; [

pkgs/by-name/ca/cargo-spellcheck/package.nix

@@ -2,8 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , stdenv
-, Security
-, SystemConfiguration
+, apple-sdk_11
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   preCheck = "HOME=$(mktemp -d)";
 

pkgs/by-name/ga/gamescope/package.nix

@@ -33,7 +33,6 @@
 , lib
 , makeBinaryWrapper
 , nix-update-script
-, writeShellScriptBin
 , enableExecutable ? true
 , enableWsi ? true
 }:
@@ -101,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
 
     # calls git describe to encode its own version into the build
-    (writeShellScriptBin "git" "echo ${finalAttrs.version}")
+    (buildPackages.writeShellScriptBin "git" "echo ${finalAttrs.version}")
   ] ++ lib.optionals enableExecutable [
     makeBinaryWrapper
     glslang

pkgs/by-name/li/libevdevc/package.nix

@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPackages,
+}:
 
 stdenv.mkDerivation rec {
   pname = "libevdevc";
@@ -12,12 +17,15 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace common.mk \
-      --replace /bin/echo ${coreutils}/bin/echo
+      --replace-fail /bin/echo ${buildPackages.coreutils}/bin/echo
     substituteInPlace include/module.mk \
-      --replace /usr/include /include
+      --replace-fail /usr/include /include
   '';
 
-  makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "LIBDIR=/lib"
+  ];
 
   # causes redefinition of _FORTIFY_SOURCE
   hardeningDisable = [ "fortify3" ];

pkgs/by-name/sh/shairport-sync/package.nix

@@ -52,13 +52,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shairport-sync";
-  version = "4.3.4";
+  version = "4.3.5";
 
   src = fetchFromGitHub {
     repo = "shairport-sync";
     owner = "mikebrady";
     rev = "refs/tags/${version}";
-    hash = "sha256:1y8dh1gdffq38hgy6x1228l51l6p56iaiqlflw7w1dcbgw15llcd";
+    hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/su/sums/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sums";
-  version = "0.11";
+  version = "0.13";
 
   src = fetchFromGitLab {
     owner = "leesonwai";
     repo = "sums";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-D8BkrStS6IwkWy8J7YRHIhyJ68kX4Dky0Vbphn6CsVM=";
+    hash = "sha256-DztSQcaH/k5EOvsrVA/DdgNSEHtz4Nr938tIhC94Gu8=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ty/typstyle/package.nix

@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typstyle";
-  version = "0.12.5";
+  version = "0.12.6";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-28+B7lov2sUBDZUGHKBL1XzOM9q43idllQ0CPlZEdOw=";
+    hash = "sha256-g7GudDxmTq7dRjrVrUAxJXaduQbX/g0By+hNhzicn+g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-rSPXfGZXwrnCeG9RgjQdKQkacI4phzRF3AwfKu17Yvc=";
+  cargoHash = "sha256-e9//IvqACYErcxC7s4+PGyw6S+4xtrbfu1io0X4iR9k=";
 
   # Disabling tests requiring network access
   checkFlags = [

pkgs/by-name/zo/zoom-us/package.nix

@@ -49,23 +49,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.2.10.43047";
-  versions.x86_64-darwin = "6.2.10.43047";
-  versions.x86_64-linux = "6.2.10.4983";
+  versions.aarch64-darwin = "6.2.11.43613";
+  versions.x86_64-darwin = "6.2.11.43613";
+  versions.x86_64-linux = "6.2.11.5069";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-i6ZO6Gp0PL200oklp7NJ56jGKF/nvuo54EazyfBU0Eo=";
+      hash = "sha256-3W0ohT62vn6vdzGq4YVcaM1kEe9oRxWOavGP/+1fhZc=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-lqmRjIre20VG9gkd7ISosABwYdLaHQDnSPYFKJZKh4Q=";
+      hash = "sha256-NnnY31fj0Bl1DLEghajf1bH2/bCewzzWZGP4bvIvvyk=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-lPUKxkXI3yB/fCY05kQSJhTGSsU6v+t8nq5H6FLwhrk=";
+      hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
     };
   };
 

pkgs/development/python-modules/flask-allowed-hosts/default.nix

@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "flask-allowed-hosts";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "flask_allowed_hosts";
-    hash = "sha256-l25bZlJkOVI+S+HtAK22ZGULP95evx2NASA9ViIax7Q=";
+    hash = "sha256-LL0Vm33R0BYo8IKyjAzpvO7ls4EfcPx3cx3OU6OsE6s=";
   };
 
   build-system = [ setuptools ];

pkgs/development/web/nodejs/nodejs.nix

@@ -321,6 +321,9 @@ let
         "test-watch-mode-files_watcher"
       ] ++ lib.optionals (!lib.versionAtLeast version "22") [
         "test-tls-multi-key"
+      ] ++ lib.optionals stdenv.hostPlatform.is32bit [
+        # utime (actually utimensat) fails with EINVAL on 2038 timestamp
+        "test-fs-utimes-y2K38"
       ] ++ lib.optionals stdenv.buildPlatform.isDarwin [
         # Disable tests that don’t work under macOS sandbox.
         "test-macos-app-sandbox"

pkgs/top-level/all-packages.nix

@@ -6957,9 +6957,6 @@ with pkgs;
   cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {
-    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
-  };
   cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };