mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
Merge pull request #109124 from fabaff/bump-socat
socat: 1.7.3.4 -> 1.7.4.1
This commit is contained in:
commit
cc0d004530
@ -1,11 +1,19 @@
|
||||
{ stdenv, fetchurl, openssl, readline, which, nettools }:
|
||||
{ lib
|
||||
, fetchurl
|
||||
, nettools
|
||||
, openssl
|
||||
, readline
|
||||
, stdenv
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "socat-1.7.3.4";
|
||||
pname = "socat";
|
||||
version = "1.7.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
|
||||
sha256 = "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp";
|
||||
url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -22,12 +30,12 @@ stdenv.mkDerivation rec {
|
||||
checkInputs = [ which nettools ];
|
||||
doCheck = false; # fails a bunch, hangs
|
||||
|
||||
meta = {
|
||||
description = "A utility for bidirectional data transfer between two independent data channels";
|
||||
meta = with lib; {
|
||||
description = "Utility for bidirectional data transfer between two independent data channels";
|
||||
homepage = "http://www.dest-unreach.org/socat/";
|
||||
repositories.git = "git://repo.or.cz/socat.git";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ eelco ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user