socat: 1.7.3.1 -> 1.7.3.2

fixes compatibility with openssl 1.1.0 (and libressl)
NixOS · Feb 2, 2017 · c59bde0 · c59bde0
1 parent 294be50
commit c59bde0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.3.1";
+  name = "socat-1.7.3.2";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
+    sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3";
   };
 
   buildInputs = [ openssl readline ];
 
-  patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ];
-
   hardeningEnable = [ "pie" ];
 
   meta = {

diff --git a/pkgs/tools/networking/socat/enable-ecdhe.patch b/pkgs/tools/networking/socat/enable-ecdhe.patch