Merge pull request #241775 from NixOS/backport-240337-to-release-23.05

maintainers/maintainer-list.nix

@@ -3170,6 +3170,12 @@
     name = "Changsheng Wu";
     githubId = 2083950;
   };
+  conni2461 = {
+    email = "simon.hauser@outlook.com";
+    github = "Conni2461";
+    name = "Simon Hauser";
+    githubId = 15233006;
+  };
   connorbaker = {
     email = "connor.baker@tweag.io";
     matrix = "@connorbaker:matrix.org";

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

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flit-core
+}:
+
+buildPythonPackage rec {
+  pname = "bottombar";
+  version = "1.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "evalf";
+    repo = "bottombar";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  # The package only has some "interactive" tests where a user must check for
+  # the correct output and hit enter after every check
+  doCheck = false;
+  pythonImportsCheck = [
+    "bottombar"
+  ];
+
+  meta = with lib; {
+    description = "Context manager that prints a status line at the bottom of a terminal window";
+    homepage = "https://github.com/evalf/bottombar";
+    changelog = "https://github.com/evalf/bottombar/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ conni2461 ];
+  };
+}

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

@@ -5,14 +5,16 @@
 , numpy
 , treelog
 , stringly
+, flit-core
+, bottombar
 , pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "7.2";
-  format = "setuptools";
+  version = "7.3";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -20,13 +22,18 @@ buildPythonPackage rec {
     owner = "evalf";
     repo = "nutils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0=";
+    hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   propagatedBuildInputs = [
     numpy
     treelog
     stringly
+    bottombar
   ];
 
   nativeCheckInputs = [
@@ -44,9 +51,9 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Numerical Utilities for Finite Element Analysis";
+    changelog = "https://github.com/evalf/nutils/releases/tag/v${version}";
     homepage = "https://www.nutils.org/";
     license = licenses.mit;
-    broken = stdenv.hostPlatform.isAarch64;
     maintainers = with maintainers; [ Scriptkiddi ];
   };
 }

pkgs/top-level/python-packages.nix

@@ -1435,6 +1435,8 @@ self: super: with self; {
 
   boschshcpy = callPackage ../development/python-modules/boschshcpy { };
 
+  bottombar = callPackage ../development/python-modules/bottombar { };
+
   boost-histogram = callPackage ../development/python-modules/boost-histogram {
     inherit (pkgs) boost;
   };