Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3.pkgs.sphinxcontrib-openapi: switch back to upstream #211156

Merged
merged 1 commit into from
Jan 17, 2023
Merged

python3.pkgs.sphinxcontrib-openapi: switch back to upstream #211156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, deepmerge
, fetchFromGitHub
, fetchPypi
, fetchpatch
, isPy27
, setuptools-scm
Expand All @@ -14,23 +14,12 @@

buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
version = "unstable-2022-08-26";
version = "0.8.0";
disabled = isPy27;

# Switch to Cilums' fork of openapi, which uses m2r instead of mdinclude,
# as m2r is unmaintained and incompatible with the version of mistune.
# See
# https://github.com/cilium/cilium/commit/b9862461568dd41d4dc8924711d4cc363907270b and
# https://github.com/cilium/openapi/commit/cd829a05caebd90b31e325d4c9c2714b459d135f
# for details.
# PR to switch upstream sphinx-contrib/openapi from m2r to sphinx-mdinclude:
# https://github.com/sphinx-contrib/openapi/pull/127
# (once merged, we should switch away from that fork again)
src = fetchFromGitHub {
owner = "cilium";
repo = "openapi";
rev = "0ea3332fa6482114f1a8248a32a1eacb61aebb69";
hash = "sha256-a/oVMg9gGTD+NClfpC2SpjbY/mIcZEVLLOR0muAg5zY=";
src = fetchPypi {
inherit pname version;
hash = "sha256-rO1qloTOgU5qVHURMyA6Ug7rC3UOjICqPUiFJ9RsLzA=";
};

nativeBuildInputs = [ setuptools-scm ];
Expand Down