From c54779686e7e4cf9933a2b7303f1c50ac3b42252 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 May 2023 10:21:14 +0200
Subject: [PATCH 1/2] python310Packages.univers: equalize

- add changelog to meta
- disable on unsupported Python releases
- add format
---
 .../python-modules/univers/default.nix        | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix
index 3669009d530e..718925eee087 100644
--- a/pkgs/development/python-modules/univers/default.nix
+++ b/pkgs/development/python-modules/univers/default.nix
@@ -1,21 +1,25 @@
 { lib
-, fetchPypi
-, fetchpatch
-, buildPythonPackage
-, setuptools-scm
 , attrs
+, buildPythonPackage
+, commoncode
+, fetchpatch
+, fetchPypi
 , packaging
 , pyparsing
+, pytestCheckHook
+, pythonOlder
+, saneyaml
 , semantic-version
 , semver
-, commoncode
-, pytestCheckHook
-, saneyaml
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "univers";
   version = "30.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
@@ -31,19 +35,38 @@ buildPythonPackage rec {
     })
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ];
-  nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    attrs
+    packaging
+    pyparsing
+    semantic-version
+    semver
+  ];
+
+  nativeCheckInputs = [
+    commoncode
+    pytestCheckHook
+    saneyaml
+  ];
 
   dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies
 
-  disabledTests = [ "test_codestyle" ];
+  disabledTests = [
+    "test_codestyle"
+  ];
 
-  pythonImportsCheck = [ "univers" ];
+  pythonImportsCheck = [
+    "univers"
+  ];
 
   meta = with lib; {
     description = "Library for parsing version ranges and expressions";
     homepage = "https://github.com/nexB/univers";
+    changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst";
     license = with licenses; [ asl20 bsd3 mit ];
     maintainers = with maintainers; [ armijnhemel sbruder ];
   };

From 71495d99b19d6682ae08901dd418d98b9ff04ab9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 May 2023 10:27:43 +0200
Subject: [PATCH 2/2] python310Packages.univers: 30.7.0 -> 30.10.0

Changelog: https://github.com/nexB/univers/blob/v30.10.0/CHANGELOG.rst
---
 .../python-modules/univers/default.nix        | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix
index 718925eee087..ea450651da7e 100644
--- a/pkgs/development/python-modules/univers/default.nix
+++ b/pkgs/development/python-modules/univers/default.nix
@@ -2,7 +2,6 @@
 , attrs
 , buildPythonPackage
 , commoncode
-, fetchpatch
 , fetchPypi
 , packaging
 , pyparsing
@@ -16,25 +15,16 @@
 
 buildPythonPackage rec {
   pname = "univers";
-  version = "30.7.0";
+  version = "30.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo=";
+    hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI=";
   };
 
-  patches = [
-    # Make tests work when not using virtualenv, can be dropped with the next version
-    # Upstream PR (already merged): https://github.com/nexB/univers/pull/77
-    (fetchpatch {
-      url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch";
-      hash = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY=";
-    })
-  ];
-
   nativeBuildInputs = [
     setuptools-scm
   ];
@@ -55,14 +45,18 @@ buildPythonPackage rec {
 
   dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies
 
-  disabledTests = [
-    "test_codestyle"
-  ];
-
   pythonImportsCheck = [
     "univers"
   ];
 
+  disabledTests = [
+    # No value for us
+    "test_codestyle"
+    # AssertionError starting with 30.10.0
+    "test_enhanced_semantic_version"
+    "test_semver_version"
+  ];
+
   meta = with lib; {
     description = "Library for parsing version ranges and expressions";
     homepage = "https://github.com/nexB/univers";