b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Upstream incorporated the changes present in the cilium fork into their
repository, and tagged a new release (0.8.0). We can switch back to the
upstream version, rather than the temporary fork.

See https://github.com/NixOS/nixpkgs/pull/188280#issuecomment-1384088517
This commit is contained in:
Florian Klink 2023-01-16 22:15:31 +01:00
parent 7f6ecd4237
commit ca3e08f3bc
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, deepmerge
, fetchFromGitHub
, fetchPypi
, fetchpatch
, isPy27
, setuptools-scm
@ -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 ];