public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-02-28 16:32:57 +00:00
parent 8615f026a4 a9d24cedeb
commit 3b4765c9e5
302 changed files with 13274 additions and 2727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/socat/2.x.nix
+2 -2
View File
@@ -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 ];
pkgs/tools/networking/socat/default.nix
+2 -2
View File
@@ -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 ];