From fd2a0bdd6bd430c57fd1bb6dc489cb218e043142 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 26 Dec 2022 18:38:21 +0100
Subject: [PATCH] python3Packages.antlr4-python-runtime: remove versioned
 variants

The python package set cannot support multiple versions of a package,
since they would collide when different versions would be used at the
same time. This can too easily happen through transitive propagation,
which is why we don't support it.
---
 pkgs/development/python-modules/hydra/default.nix     | 4 ++--
 pkgs/development/python-modules/omegaconf/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                    | 8 ++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix
index cbd2502305bd..f858e39cfdaa 100644
--- a/pkgs/development/python-modules/hydra/default.nix
+++ b/pkgs/development/python-modules/hydra/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, antlr4_9-python3-runtime
+, antlr4-python3-runtime
 , buildPythonPackage
 , fetchFromGitHub
 , importlib-resources
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    antlr4_9-python3-runtime
+    antlr4-python3-runtime
     omegaconf
   ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 5aa772310bd9..82524a627f6b 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,5 +1,5 @@
 { lib
-, antlr4_9-python3-runtime
+, antlr4-python3-runtime
 , buildPythonPackage
 , fetchFromGitHub
 , jre_minimal
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    antlr4_9-python3-runtime
+    antlr4-python3-runtime
     pyyaml
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0526970704a9..5f80001e94fa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -488,13 +488,9 @@ self: super: with self; {
 
   ansiwrap = callPackage ../development/python-modules/ansiwrap { };
 
-  antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
-    antlr4 = pkgs.antlr4_8;
+  antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
+    inherit (pkgs) antlr4;
   };
-  antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
-    antlr4 = pkgs.antlr4_9;
-  };
-  antlr4-python3-runtime = self.antlr4_8-python3-runtime;
 
   anyascii = callPackage ../development/python-modules/anyascii { };