Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 944236a0f1c8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7db53cc31253
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 23, 2020

  1. python2.pkgs.ipython: use the proper python2 lexer 

    Since pygments 2.5 `PythonLexer` refers to python3 [1]. We have to be
explicit if we want to use python2.

[1] https://pygments.org/docs/changelog/
    @timokau
    timokau committed Jan 23, 2020
    Copy the full SHA
    66675b5 View commit details

  2. python2.pkgs.sphinx: user proper python2 lexer

    @timokau
    timokau committed Jan 23, 2020
    Copy the full SHA
    0811a69 View commit details

  3. Merge pull request #78348 from timokau/pygments-lexer-fix 

    python2.pkgs.ipython, python2.pkgs.sphinx: use proper python2 lexer
    @timokau
    timokau authored Jan 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7db53cc View commit details
Showing with 39 additions and 0 deletions.
  1. +10 −0 pkgs/development/python-modules/ipython/5.nix
  2. +7 −0 pkgs/development/python-modules/sphinx/2.nix
  3. +22 −0 pkgs/development/python-modules/sphinx/python2-lexer.patch
10 changes: 10 additions & 0 deletions pkgs/development/python-modules/ipython/5.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchPypi
, fetchpatch
# Build dependencies
, glibcLocales
# Test dependencies
@@ -36,6 +37,15 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'gnureadline'" " "
'';

patches = [
# Use the proper pygments lexer for python2 (https://github.com/ipython/ipython/pull/12095)
(fetchpatch {
name = "python2-lexer.patch";
url = "https://github.com/ipython/ipython/pull/12095/commits/8805293b5e4bce9150cc2ad9c5d6d984849ae447.patch";
sha256 = "16p4gl7a49v76w33j39ih7yspy6x2d14p9bh4wdpg9cafhw9nbc0";
})
];

buildInputs = [ glibcLocales ];

checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;
7 changes: 7 additions & 0 deletions pkgs/development/python-modules/sphinx/2.nix
View file
Original file line number Diff line number Diff line change
@@ -60,6 +60,13 @@ buildPythonPackage rec {
# Lots of tests. Needs network as well at some point.
doCheck = false;

patches = [
# Since pygments 2.5, PythonLexer refers to python3. If we want to use
# python2, we need to explicitly specify Python2Lexer.
# Not upstreamed since there doesn't seem to be any upstream maintenance
# branch for 1.8 (and this patch doesn't make any sense for 2.x).
./python2-lexer.patch
];
# https://github.com/NixOS/nixpkgs/issues/22501
# Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
postPatch = ''
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/sphinx/python2-lexer.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index ac2bd1b06..63ca52de2 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
from pygments.formatters import HtmlFormatter, LatexFormatter
from pygments.lexer import Lexer # NOQA
from pygments.lexers import get_lexer_by_name, guess_lexer
-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
CLexer, TextLexer, RstLexer
from pygments.styles import get_style_by_name
from pygments.util import ClassNotFound
@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)

lexers = dict(
none = TextLexer(stripnl=False),
- python = PythonLexer(stripnl=False),
+ python = Python2Lexer(stripnl=False),
python3 = Python3Lexer(stripnl=False),
pycon = PythonConsoleLexer(stripnl=False),
pycon3 = PythonConsoleLexer(python3=True, stripnl=False),