From 66867a88354d9db75a72e0d1460b1437f12ed5df Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 17 Sep 2023 13:58:55 +1000
Subject: [PATCH] solc: 0.8.19 -> 0.8.21

---
 pkgs/development/compilers/solc/default.nix | 10 +++-------
 pkgs/development/compilers/solc/tests.patch | 14 --------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/compilers/solc/tests.patch

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index cd75f3d6c394..986f6f169e8b 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -45,7 +45,7 @@ let
   };
 
   pname = "solc";
-  version = "0.8.19";
+  version = "0.8.21";
   meta = with lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     homepage = "https://github.com/ethereum/solidity";
@@ -59,13 +59,9 @@ let
     # upstream suggests avoid using archive generated by github
     src = fetchzip {
       url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-      sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg=";
+      sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk=";
     };
 
-    patches = [
-      ./tests.patch
-    ];
-
     postPatch = ''
       substituteInPlace cmake/jsoncpp.cmake \
         --replace "${jsoncppUrl}" ${jsoncpp}
@@ -120,7 +116,7 @@ let
 
     src = pkgs.fetchurl {
       url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos";
-      sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0=";
+      sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI=";
     };
     dontUnpack = true;
 
diff --git a/pkgs/development/compilers/solc/tests.patch b/pkgs/development/compilers/solc/tests.patch
deleted file mode 100644
index 45e3c7581474..000000000000
--- a/pkgs/development/compilers/solc/tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/lsp.py b/test/lsp.py
-index 669951ca4..11007ae82 100755
---- a/test/lsp.py
-+++ b/test/lsp.py
-@@ -28,7 +28,8 @@ else:
-     import tty
-     # Turn off user input buffering so we get the input immediately,
-     # not only after a line break
--    tty.setcbreak(sys.stdin.fileno())
-+    if os.isatty(sys.stdin.fileno()):
-+        tty.setcbreak(sys.stdin.fileno())
- 
- 
- # Type for the pure test name without .sol suffix or sub directory