From 3ce6eee3a90e60e2692b516b26675402cfb93654 Mon Sep 17 00:00:00 2001
From: Simon Hauser <Simon-Hauser@outlook.de>
Date: Wed, 28 Jun 2023 15:21:49 +0200
Subject: [PATCH 1/3] maintainers: add conni2461

(cherry picked from commit 73833971e314fd61ca28fa14abe37381b2f1829a)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0dd36f76c687..62fdbfed2d9d 100644
--- a/maintainers/maintainer-list.nix
+++ b/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";

From 7d8f64457b94f9b7274c2a543f751eafba6d0c08 Mon Sep 17 00:00:00 2001
From: Simon Hauser <Simon-Hauser@outlook.de>
Date: Wed, 28 Jun 2023 15:22:24 +0200
Subject: [PATCH 2/3] python3Packages.bottombar: init at 1.0

(cherry picked from commit 2f6f50e8e711bf03fe707372f4d91b3353448ceb)
---
 .../python-modules/bottombar/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/bottombar/default.nix

diff --git a/pkgs/development/python-modules/bottombar/default.nix b/pkgs/development/python-modules/bottombar/default.nix
new file mode 100644
index 000000000000..e3e9bb38cc11
--- /dev/null
+++ b/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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 441a6afa092b..aac270138ce0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1437,6 +1437,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;
   };

From fe5356eb499a810c097ac159da433a410e03f4f4 Mon Sep 17 00:00:00 2001
From: Max Hausch <max.hausch@helsinki-systems.de>
Date: Wed, 28 Jun 2023 16:42:33 +0200
Subject: [PATCH 3/3] python3Packages.nutils: 7.2 -> 7.3

(cherry picked from commit 8a05296acc89a9019da6691890f7aa60b2abd54b)
---
 .../development/python-modules/nutils/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index 9a3cfb2b48e4..da52ca153e48 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/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 ];
   };
 }