Merge staging-next into staging

nixos/doc/manual/release-notes/rl-2311.section.md

@@ -204,6 +204,7 @@
 - Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`;
   see [#221181](https://github.com/NixOS/nixpkgs/issues/221181).
 
+- Package `pash` was removed due to being archived upstream. Use `powershell` as an alternative.
 
 ## Other Notable Changes {#sec-release-23.11-notable-changes}
 

pkgs/applications/science/math/sage/sage.nix

@@ -47,10 +47,11 @@ stdenv.mkDerivation rec {
   passthru = {
     tests = sage-tests;
     quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
-    doc = sagedoc;
     lib = sage-with-env.env.lib;
     with-env = sage-with-env;
     kernelspec = jupyter-kernel-definition;
+  } // lib.optionalAttrs withDoc {
+    doc = sagedoc;
   };
 
   meta = with lib; {

pkgs/development/libraries/spdlog/default.nix

@@ -31,8 +31,9 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake ];
+  # Required to build tests, even if they aren't executed
+  buildInputs = [ catch2_3 ];
   propagatedBuildInputs = [ fmt ];
-  checkInputs = [ catch2_3 ];
 
   cmakeFlags = [
     "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"

pkgs/development/python-modules/bitsandbytes/default.nix

@@ -3,12 +3,9 @@
 , fetchFromGitHub
 , python
 , pythonOlder
-, pytestCheckHook
 , setuptools
 , wheel
 , torch
-, einops
-, lion-pytorch
 , scipy
 , symlinkJoin
 }:
@@ -85,7 +82,6 @@ buildPythonPackage {
   ];
 
   doCheck = false;  # tests require CUDA and also GPU access
-  nativeCheckInputs = [ pytestCheckHook einops lion-pytorch ];
 
   pythonImportsCheck = [
     "bitsandbytes"

pkgs/development/python-modules/spacy-loggers/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "spacy-loggers";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5vmDv3EjAJHVu3sRv2S9VEFeyoORCNX4PZFV0LqTvyg=";
+    hash = "sha256-1gsL2/kVpg5RbMLmU7rv+Ubwz8RhtFLRGk1UWMb+XyQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/flock/default.nix

@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ronn ];
+  nativeBuildInputs = [ autoreconfHook ronn ];
 
   patches = [
     (fetchpatch {

pkgs/development/tools/misc/texinfo/common.nix

@@ -1,7 +1,7 @@
 { version, sha256, patches ? [] }:
 
 { lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash
-, gnulib
+, gnulib, gawk
 
 # we are a dependency of gcc, this simplifies bootstraping
 , interactive ? false, ncurses, procps
@@ -57,7 +57,8 @@ stdenv.mkDerivation {
   configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
     # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
     # fallbacks.
-    ++ optional crossBuildTools "--enable-perl-xs=no"
+    # Also prevent the buildPlatform's awk being used in the texindex script
+    ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${gawk}/bin/awk" ]
     ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];

pkgs/servers/mail/dovecot/default.nix

@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dovecot";
-  version = "2.3.20";
+  version = "2.3.21";
 
   nativeBuildInputs = [ perl pkg-config ];
   buildInputs =
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
-    hash = "sha256-yqgy65aBSKvfNe6dD1NLd5+nMsDOSpE9mrjDRpshhVI=";
+    hash = "sha256-BbEQk6ccI3wu8wmtWHUQchzJO77mgoJRVJ/BWGw2UC0=";
   };
 
   enableParallelBuilding = true;

pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix

@@ -3,11 +3,11 @@ let
   dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
 in stdenv.mkDerivation rec {
   pname = "dovecot-pigeonhole";
-  version = "0.5.20";
+  version = "0.5.21";
 
   src = fetchurl {
     url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
-    hash = "sha256-rjK9SHDqLBMorgm6IG6ewSEoBG1q/KUvu8nvf3VhfJg=";
+    hash = "sha256-HKcdJlkHZxIFinIDAojxULKwdrAwZFNHHFJhSY097Sc=";
   };
 
   buildInputs = [ dovecot openssl ];

pkgs/shells/pash/default.nix

@@ -1,30 +0,0 @@
-{ lib, fetchFromGitHub, buildDotnetPackage }:
-
-buildDotnetPackage {
-  pname = "pash";
-  version = "git-2016-07-06";
-
-  src = fetchFromGitHub {
-    owner = "Pash-Project";
-    repo = "Pash";
-    rev = "8d6a48f5ed70d64f9b49e6849b3ee35b887dc254";
-    sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f";
-  };
-
-  strictDeps = true;
-  preConfigure = "rm -rvf $src/Source/PashConsole/bin/*";
-
-  outputFiles = [ "Source/PashConsole/bin/Release/*" ];
-
-  meta = with lib; {
-    description = "An open source implementation of Windows PowerShell";
-    homepage = "https://github.com/Pash-Project/Pash";
-    maintainers = [ maintainers.fornever maintainers.vrthra ];
-    platforms = platforms.all;
-    license = with licenses; [ bsd3 gpl3 ];
-  };
-
-  passthru = {
-    shellPath = "/bin/pash";
-  };
-}

pkgs/test/make-binary-wrapper/cross.nix

@@ -2,15 +2,20 @@
 , runCommand
 , makeBinaryWrapper
 , binutils
+, lib
 , expectedArch ? stdenv.hostPlatform.parsed.cpu.name
 }:
 
+
 runCommand "make-binary-wrapper-test-cross" {
   nativeBuildInputs = [
     makeBinaryWrapper
     binutils
   ];
-  inherit expectedArch;
+  # For x86_64-linux the machine field is
+  # Advanced Micro Devices X86-64
+  # and uses a dash instead of a underscore unlike x86_64-linux in hostPlatform.parsed.cpu.name
+  expectedArch = lib.replaceStrings ["_"] ["-"] expectedArch;
 } ''
   touch prog
   chmod +x prog

pkgs/tools/networking/mosh/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config
-, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
+, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion, fetchpatch
 , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }:
 
 stdenv.mkDerivation rec {
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
     ./mosh-client_path.patch
     # Fix build with bash-completion 2.10
     ./bash_completion_datadir.patch
+
+    # Fixes build with protobuf3 23.x
+    (fetchpatch {
+      url = "https://github.com/mobile-shell/mosh/commit/eee1a8cf413051c2a9104e8158e699028ff56b26.patch";
+      hash = "sha256-CouLHWSsyfcgK3k7CvTK3FP/xjdb1pfsSXYYQj3NmCQ=";
+    })
   ];
 
   postPatch = ''
@@ -41,8 +47,6 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
   '';
 
-  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
-
   meta = with lib; {
     homepage = "https://mosh.org/";
     description = "Mobile shell (ssh replacement)";

pkgs/top-level/aliases.nix

@@ -1301,6 +1301,7 @@ mapAliases ({
   parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10
   parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22
   patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09
+  pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16
   pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22
   pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15
   pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01

pkgs/top-level/all-packages.nix

@@ -10918,9 +10918,7 @@ with pkgs;
     electron = electron_22;
   };
 
-  mosh = callPackage ../tools/networking/mosh {
-    protobuf = protobuf3_21;
-  };
+  mosh = callPackage ../tools/networking/mosh { };
 
   motrix = callPackage ../tools/networking/motrix { };
 
@@ -15422,8 +15420,6 @@ with pkgs;
 
   loksh = callPackage ../shells/loksh { };
 
-  pash = callPackage ../shells/pash { };
-
   scponly = callPackage ../shells/scponly { };
 
   rush = callPackage ../shells/rush { };