From 065ac7bec901bf7d9e719f4bb0e2b883089c2f2f Mon Sep 17 00:00:00 2001
From: Maksym Balatsko <maksym.balatsko-ext@arista.com>
Date: Wed, 27 Sep 2023 07:45:14 -0700
Subject: [PATCH 1/2] python3Packages.walrus: init at 0.9.3

---
 .../python-modules/walrus/default.nix         | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/walrus/default.nix

diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
new file mode 100644
index 000000000000..2394f0fc443c
--- /dev/null
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, pkgs
+, buildPythonPackage
+, fetchFromGitHub
+, redis
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "walrus";
+  version = "0.9.3";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "coleifer";
+    repo = "walrus";
+    rev = version;
+    hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc=";
+  };
+
+  propagatedBuildInputs = [
+    redis
+  ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  preCheck = ''
+    ${pkgs.redis}/bin/redis-server &
+    REDIS_PID=$!
+  '';
+
+  postCheck = ''
+    kill $REDIS_PID
+  '';
+
+  pythonImportsCheck = [ "walrus" ];
+
+  meta = with lib; {
+    description = "Lightweight Python utilities for working with Redis";
+    homepage = "https://github.com/coleifer/walrus";
+    changelog = "https://github.com/coleifer/walrus/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbalatsko ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf7d72b5347d..02623eb7c730 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13844,6 +13844,8 @@ self: super: with self; {
 
   wallbox = callPackage ../development/python-modules/wallbox { };
 
+  walrus = callPackage ../development/python-modules/walrus { };
+
   wand = callPackage ../development/python-modules/wand { };
 
   wandb = callPackage ../development/python-modules/wandb { };

From c890002d685325f96274dc753ffb59154911805f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Oct 2023 11:14:00 +0200
Subject: [PATCH 2/2] python311Packages.walrus: disable on unsupported Python
 releases

---
 .../development/python-modules/walrus/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index 2394f0fc443c..73376590bda3 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -2,6 +2,7 @@
 , pkgs
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
 , redis
 , unittestCheckHook
 }:
@@ -11,10 +12,12 @@ buildPythonPackage rec {
   version = "0.9.3";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = "walrus";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc=";
   };
 
@@ -22,7 +25,9 @@ buildPythonPackage rec {
     redis
   ];
 
-  nativeCheckInputs = [ unittestCheckHook ];
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
 
   preCheck = ''
     ${pkgs.redis}/bin/redis-server &
@@ -33,12 +38,14 @@ buildPythonPackage rec {
     kill $REDIS_PID
   '';
 
-  pythonImportsCheck = [ "walrus" ];
+  pythonImportsCheck = [
+    "walrus"
+  ];
 
   meta = with lib; {
     description = "Lightweight Python utilities for working with Redis";
     homepage = "https://github.com/coleifer/walrus";
-    changelog = "https://github.com/coleifer/walrus/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/coleifer/walrus/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ mbalatsko ];
   };