Merge #324867: mypy 1.10.0 → 1.10.1

NixOS · Jul 11, 2024 · 6921456 · 6921456
2 parents 5955103 + 7c925eb
commit 6921456
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
@@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec {
  --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
  --replace "PYTEST_RUNNER + " ""
  substituteInPlace pyproject.toml \
- --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
+ --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
+ --replace "mypy==1.10.0" "mypy==1.10.*"
  '';
 
  nativeBuildInputs = [

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
@@ -3,6 +3,7 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
+ gitUpdater,
  pythonAtLeast,
  pythonOlder,
 
@@ -31,7 +32,7 @@
 
 buildPythonPackage rec {
  pname = "mypy";
- version = "1.10.0";
+ version = "1.10.1";
  pyproject = true;
 
  disabled = pythonOlder "3.8";
@@ -40,7 +41,10 @@ buildPythonPackage rec {
  owner = "python";
  repo = "mypy";
  rev = "refs/tags/v${version}";
- hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8=";
+ hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc=";
+ };
+ passthru.updateScript = gitUpdater {
+ rev-prefix = "v";
  };
 
  build-system = [

diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
@@ -4,6 +4,7 @@
  buildPythonPackage,
  cachecontrol,
  fetchFromGitHub,
+ fetchpatch,
  importlib-resources,
  mistune,
  mypy,
@@ -56,6 +57,11 @@ buildPythonPackage rec {
  ++ cachecontrol.optional-dependencies.filecache
  ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
+ patches = [ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch";
+ hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8=";
+ } ) ];
+
  nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen;
 
  preCheck = ''