Merge master into staging-next

pkgs/by-name/nb/nbmerge/package.nix

@@ -1,38 +1,32 @@
 {
   lib,
-  buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  python3Packages,
-  nbformat,
-  nose,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "nbmerge";
   version = "0.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jbn";
-    repo = pname;
+    repo = "nbmerge";
     rev = "refs/tags/v${version}";
     hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  patches = [ ./pytest-compatibility.patch ];
 
-  propagatedBuildInputs = [ nbformat ];
+  build-system = [ python3Packages.setuptools ];
 
-  nativeCheckInputs = [ nose ];
+  dependencies = [ python3Packages.nbformat ];
 
-  checkPhase = ''
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
-    runHook preCheck
 
+  postCheck = ''
     patchShebangs .
-    nosetests -v
     PATH=$PATH:$out/bin ./cli_tests.sh
-
-    runHook postCheck
   '';
 
   pythonImportsCheck = [ "nbmerge" ];

pkgs/by-name/nb/nbmerge/pytest-compatibility.patch

@@ -0,0 +1,19 @@
+diff --git a/tests/test_merge.py b/tests/test_merge.py
+index 06ee559..9d7b1af 100644
+--- a/tests/test_merge.py
++++ b/tests/test_merge.py
+@@ -1,3 +1,4 @@
++import io
+ import os
+ import sys
+ import unittest
+@@ -21,8 +22,7 @@ def file_names_from(file_paths):
+ 
+ class TestMerge(unittest.TestCase):
+     def setUp(self):
+-        if not hasattr(sys.stdout, "getvalue"):
+-            self.fail("need to run in buffered mode")
++        sys.stdout = io.StringIO()
+ 
+     def _validate_merged_three(self, merged):
+         self.assertEqual(len(merged.cells), 6)

pkgs/by-name/se/serpl/package.nix

@@ -8,7 +8,7 @@
 }:
 let
   pname = "serpl";
-  version = "0.1.30";
+  version = "0.1.34";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -16,12 +16,12 @@ rustPlatform.buildRustPackage {
     owner = "yassinebridi";
     repo = "serpl";
     rev = version;
-    hash = "sha256-ZltOhlx9aPD5vO9eTpoXWR6qXUwB+jW+tATkwX9UlIU=";
+    hash = "sha256-U6fcpFe95rM3GXu7OJhhGkpV1yQNUukqRpGeOtd8UhU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  cargoHash = "sha256-FDS9JOmOtWOajB1tSd7QyW/KutRujs+3KjXxlNktrDM=";
+  cargoHash = "sha256-YAp7r7I/LX/4T93auGusTLPKpuZd3XzZ4HP6gOR0DZ0=";
 
   postFixup = ''
     # Serpl needs ripgrep to function properly.

pkgs/development/compilers/dotnet/vmr.nix

@@ -41,7 +41,7 @@ let
     isDarwin
     buildPlatform
     targetPlatform;
-  inherit (darwin) cctools;
+  inherit (darwin) cctools-llvm;
   inherit (swiftPackages) apple_sdk swift;
 
   releaseManifest = lib.importJSON releaseManifestFile;
@@ -59,7 +59,7 @@ let
     dontUnpack = true;
     installPhase = ''
       mkdir -p "$out/bin"
-      ln -s "${cctools}/bin/dwarfdump" "$out/bin"
+      ln -s "${cctools-llvm}/bin/dwarfdump" "$out/bin"
     '';
   };
 

pkgs/development/compilers/swift/compiler/default.nix

@@ -364,6 +364,9 @@ in stdenv.mkDerivation {
     ''}
   '';
 
+  # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0'
+  hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs";
+
   configurePhase = ''
     export SWIFT_SOURCE_ROOT="$PWD"
     mkdir -p ../build
@@ -702,7 +705,6 @@ in stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; linux ++ darwin;
-    broken = stdenv.isDarwin;
     # Swift doesn't support 32-bit Linux, unknown on other platforms.
     badPlatforms = lib.platforms.i686;
     timeout = 86400; # 24 hours.

pkgs/development/python-modules/mkl-service/default.nix

@@ -3,30 +3,44 @@
   buildPythonPackage,
   fetchFromGitHub,
   cython,
+  setuptools,
   mkl,
-  nose,
+  pytestCheckHook,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "mkl-service";
   version = "2.4.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "IntelPython";
     repo = "mkl-service";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY=";
+    hash = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY=";
   };
 
-  MKLROOT = mkl;
+  build-system = [
+    cython
+    setuptools
+  ];
 
-  nativeCheckInputs = [ nose ];
+  env.MKLROOT = mkl;
-  nativeBuildInputs = [ cython ];
+
-  propagatedBuildInputs = [
+  dependencies = [ mkl ];
-    mkl
+
-    six
+  pythonImportsCheck = [ "mkl" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    cd $out
+  '';
+
+  disabledTests = [
+    # require SIMD compilation
+    "test_cbwr_all"
+    "test_cbwr_branch"
   ];
 
   meta = with lib; {

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

@@ -1,33 +1,40 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   buildPythonPackage,
-  nose,
+  setuptools,
   minimock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mypgoclient";
-  version = "1.8";
+  version = "1.9";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "mygpoclient";
     rev = version;
-    sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp";
+    hash = "sha256-McHllitWiBiCdNuJlUg6K/vgr2l3ychu+KOx3r/UCv0=";
   };
 
-  nativeCheckInputs = [
+  postPatch = ''
-    nose
+    substituteInPlace mygpoclient/*_test.py \
-    minimock
+      --replace-quiet "assertEquals" "assertEqual" \
-  ];
+      --replace-quiet "assert_" "assertTrue"
-
-  checkPhase = ''
-    nosetests
   '';
 
-  doCheck = (!stdenv.isDarwin);
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "mygpoclient" ];
+
+  nativeCheckInputs = [
+    minimock
+    pytestCheckHook
+  ];
+
+  __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
     description = "Gpodder.net client library";

pkgs/misc/tmux-plugins/default.nix

@@ -496,12 +496,18 @@ in rec {
   power-theme = mkTmuxPlugin {
     pluginName = "power";
     rtpFilePath = "tmux-power.tmux";
-    version = "unstable-2020-11-18";
+    version = "unstable-2024-05-12";
     src = pkgs.fetchFromGitHub {
       owner = "wfxr";
       repo = "tmux-power";
-      rev = "aec44aa5e00cc39eb71c668b1d73823270058e7d";
+      rev = "16bbde801378a70512059541d104c5ae35be32b9";
-      sha256 = "11nm8cylx10d565g17acy0bj12n6dcbxp71zca2bmg0j1dq859cm";
+      hash = "sha256-IyYQyIONMnVBwhhcI3anOPxKpv2TfI2KZgJ5o5JtZ8I=";
+    };
+    meta = with lib; {
+      description = "Tmux powerline theme";
+      homepage = "https://github.com/wfxr/tmux-power";
+      license = licenses.mit;
+      platforms = platforms.unix;
     };
   };
 

pkgs/top-level/python-aliases.nix

@@ -314,6 +314,7 @@ mapAliases ({
   mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
   multi_key_dict = multi-key-dict; # added 2023-11-05
   mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
+  nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
   net2grid = gridnet; # add 2022-04-22
   nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
   ninja-python = ninja; # add 2022-08-03

pkgs/top-level/python-packages.nix

@@ -8835,8 +8835,6 @@ self: super: with self; {
 
   nbmake = callPackage ../development/python-modules/nbmake { };
 
-  nbmerge = callPackage ../development/python-modules/nbmerge { };
-
   nbsmoke = callPackage ../development/python-modules/nbsmoke { };
 
   nbsphinx = callPackage ../development/python-modules/nbsphinx { };