From 17aee523be0198fac7bd2b629c29a681ffb056f8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 1 Sep 2023 13:04:43 +0200
Subject: [PATCH] python311Packages.riscv-config: 3.5.2 -> 3.13.1

Diff: https://github.com/riscv-software-src/riscv-config/compare/refs/tags/3.5.2...3.13.1

Changelog: https://github.com/riscv-software-src/riscv-config/blob/3.13.1/CHANGELOG.md
---
 .../python-modules/riscv-config/default.nix   | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix
index 409c3a0d7ed1..7ded790ec53e 100644
--- a/pkgs/development/python-modules/riscv-config/default.nix
+++ b/pkgs/development/python-modules/riscv-config/default.nix
@@ -1,38 +1,44 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
+, cerberus
 , fetchFromGitHub
 , fetchpatch
-, lib
-, cerberus
+, pythonOlder
 , pyyaml
 , ruamel-yaml
 }:
 
 buildPythonPackage rec {
   pname = "riscv-config";
-  version = "3.5.2";
+  version = "3.13.1";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "riscv-software-src";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw=";
+    hash = "sha256-SnUt6bsTEC7abdQr0nWyNOAJbW64B1K3yy1McfkdxAc=";
   };
 
-  patches = [
-    # Remove when updating to v3.8.0+
-    (fetchpatch {
-      name = "remove-dangling-pip-import.patch";
-      url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch";
-      hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E=";
-    })
+  propagatedBuildInputs = [
+    cerberus
+    pyyaml
+    ruamel-yaml
   ];
 
-  propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ];
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "riscv_config"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/riscv/riscv-config";
     description = "RISC-V configuration validator";
+    homepage = "https://github.com/riscv/riscv-config";
+    changelog = "https://github.com/riscv-software-src/riscv-config/blob/${version}/CHANGELOG.md";
     maintainers = with maintainers; [ genericnerdyusername ];
     license = licenses.bsd3;
   };