From be78fd8b77e6135cac52494434d3287606ca3677 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 12 Aug 2021 13:20:41 +0800
Subject: [PATCH] pythonparser: bump

---
 artiq-fast/default.nix                |  1 -
 artiq-fast/pkgs/python-deps.nix       |  7 +++---
 artiq-fast/pkgs/pythonparserver.patch | 35 ---------------------------
 3 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 artiq-fast/pkgs/pythonparserver.patch

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 34e46d8..7316327 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -46,7 +46,6 @@ let
       src = import ./conda/fake-source.nix { inherit pkgs; } {
         name = "pythonparser";
         inherit (pythonDeps.pythonparser) version src;
-        extraSrcCommands = "patch -p1 < ${./pkgs/pythonparserver.patch}";
         dependencies = ["regex"];
       };
     };
diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix
index 8d44e9f..ca2e50e 100644
--- a/artiq-fast/pkgs/python-deps.nix
+++ b/artiq-fast/pkgs/python-deps.nix
@@ -28,14 +28,13 @@ rec {
 
   pythonparser = python3Packages.buildPythonPackage rec {
     pname = "pythonparser";
-    version = "1.3";
+    version = "1.4";
     src = fetchFromGitHub {
       owner = "m-labs";
       repo = "pythonparser";
-      rev = "5b391fe86f43bb9f4f96c5bc0532e2a112db2936";
-      sha256 = "1gw1fk4y2l6bwq0fg2a9dfc1rvq8cv492dyil96amjdhsxvnx35b";
+      rev = "5413ee5c9f8760e95c6acd5d6e88dabb831ad201";
+      sha256 = "1b9p3pjnfaiaf2k0a3iq39aj2vymfxx139hqdqkd3q4awrwy1957";
     };
-    patches = [ ./pythonparserver.patch ];
     propagatedBuildInputs = with python3Packages; [ regex ];
   };
 
diff --git a/artiq-fast/pkgs/pythonparserver.patch b/artiq-fast/pkgs/pythonparserver.patch
deleted file mode 100644
index 109d0c3..0000000
--- a/artiq-fast/pkgs/pythonparserver.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/pythonparser/lexer.py b/pythonparser/lexer.py
-index a62eaf1..c70e85a 100644
---- a/pythonparser/lexer.py
-+++ b/pythonparser/lexer.py
-@@ -79,6 +79,8 @@ class Lexer:
-         (3, 4): _reserved_3_1,
-         (3, 5): _reserved_3_5,
-         (3, 6): _reserved_3_5,
-+        (3, 7): _reserved_3_5,
-+        (3, 8): _reserved_3_5,
-     }
-     """
-     A map from a tuple (*major*, *minor*) corresponding to Python version to
-@@ -102,6 +104,8 @@ class Lexer:
-         (3, 4): _string_prefixes_3_3,
-         (3, 5): _string_prefixes_3_3,
-         (3, 6): _string_prefixes_3_6,
-+        (3, 7): _string_prefixes_3_6,
-+        (3, 8): _string_prefixes_3_6,
-     }
-     """
-     A map from a tuple (*major*, *minor*) corresponding to Python version to
-diff --git a/pythonparser/parser.py b/pythonparser/parser.py
-index 10c741d..62b93e1 100644
---- a/pythonparser/parser.py
-+++ b/pythonparser/parser.py
-@@ -419,7 +419,7 @@ class Parser(object):
-             self.expr_stmt_1     = self.expr_stmt_1__26
-             self.yield_expr      = self.yield_expr__26
-             return
--        elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6)):
-+        elif version in ((3, 0), (3, 1), (3, 2), (3, 3), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)):
-             if version == (3, 0):
-                 self.with_stmt       = self.with_stmt__26 # lol
-             else: