Unverified Commit a2ce2ef2 authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #255581 from kashw2/solc

parents f58d86bf 66867a88

pkgs/development/compilers/solc/default.nix

+3 −7
Original line number Diff line number Diff line
@@ -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;

pkgs/development/compilers/solc/tests.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
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