From 36acd90a17fdd1f202c0b8fc47890ed8f471c41e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 12 Feb 2025 09:24:14 +0100
Subject: [PATCH] python312Packages.cramjam: 2.8.3 -> 2.9.1-unstable-2025-01-04

Diff:
https://github.com/milesgranger/pyrus-cramjam/compare/refs/tags/v2.8.3...61564e7761e38e5ec55e7939ccd6a276c2c55d11

Changelog: https://github.com/milesgranger/cramjam/releases/tag/v2.9.1
---
 .../python-modules/cramjam/default.nix        | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix
index dc35cbc2c6ff..750ff3fa7076 100644
--- a/pkgs/development/python-modules/cramjam/default.nix
+++ b/pkgs/development/python-modules/cramjam/default.nix
@@ -3,8 +3,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   rustPlatform,
-  stdenv,
-  libiconv,
+
+  # tests
   hypothesis,
   numpy,
   pytest-xdist,
@@ -13,30 +13,30 @@
 
 buildPythonPackage rec {
   pname = "cramjam";
-  version = "2.8.3";
+  # 2.9.1 ships with experimental decoders that were having issues.
+  # They were removed afterwards but the change has not been released yet:
+  # https://github.com/milesgranger/cramjam/pull/197
+  # TODO: update to the next stable release when available
+  version = "2.9.1-unstable-2025-01-04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "milesgranger";
-    repo = "pyrus-cramjam";
-    tag = "v${version}";
-    hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE=";
+    repo = "cramjam";
+    rev = "61564e7761e38e5ec55e7939ccd6a276c2c55d11";
+    hash = "sha256-KTYTelQdN5EIJFbyQgrYcayqkAQQSNF+SHqUFFHf1Z8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    hash = "sha256-Gpj/LUCx/ivYlmxNJnEZr8caEfV4OaQwEPNjz7vobsw=";
+    inherit pname src version;
+    hash = "sha256-Jw9zbgcrX3pofW7E8b4xzZYKj3h6ufCVLjv2xD/qONo=";
   };
 
-  buildAndTestSubdir = "cramjam-python";
-
   nativeBuildInputs = with rustPlatform; [
     cargoSetupHook
     maturinBuildHook
   ];
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
-
   nativeCheckInputs = [
     hypothesis
     numpy
@@ -44,22 +44,23 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [ "cramjam-python/tests" ];
+  env = {
+    # Makes tests less flaky by relaxing performance constraints
+    # https://github.com/HypothesisWorks/hypothesis/issues/3713
+    CI = true;
+  };
 
   disabledTestPaths = [
-    "cramjam-python/benchmarks/test_bench.py"
-    # test_variants.py appears to be flaky
-    #
-    # https://github.com/NixOS/nixpkgs/pull/311584#issuecomment-2117656380
-    "cramjam-python/tests/test_variants.py"
+    "benchmarks/test_bench.py"
   ];
 
   pythonImportsCheck = [ "cramjam" ];
 
-  meta = with lib; {
+  meta = {
     description = "Thin Python bindings to de/compression algorithms in Rust";
     homepage = "https://github.com/milesgranger/pyrus-cramjam";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ veprbl ];
+    changelog = "https://github.com/milesgranger/cramjam/releases/tag/v${version}";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }