aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/networking/socat
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-02-28 16:32:57 +0000
committerRobin Gloster <mail@glob.in>2016-02-28 16:32:57 +0000
commit3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4 (patch)
tree04c567a4061b3adf6d1e0a898f39b67f27d37aea /pkgs/tools/networking/socat
parent8615f026a48cbf3f1c37b30e9b70bba6af013a12 (diff)
parenta9d24cedeb3ba97a4e23ff93fadff32280ff0ab6 (diff)
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/networking/socat')
-rw-r--r--pkgs/tools/networking/socat/2.x.nix4
-rw-r--r--pkgs/tools/networking/socat/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index a1cea034836..1f25e002159 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "socat-2.0.0-b8";
+ name = "socat-2.0.0-b9";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
- sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168";
+ sha256 = "1ll395xjv4byvv0k2zjbxk8vp3mg3y2w5paa05wv553bqsjv1vs9";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index b2704c2a203..e59e6d46080 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "socat-1.7.3.0";
+ name = "socat-1.7.3.1";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
- sha256 = "011ydc0x8camplf8l6mshs3v5fswarld8v0wf7grz6rjq18fhrq7";
+ sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
};
buildInputs = [ openssl ];