diff options
author | Domen Kožar <domen@dev.si> | 2014-12-23 16:17:14 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-12-23 16:17:14 +0100 |
commit | 59807bf947594b925c57f6ca0e799c89bbc6f2c7 (patch) | |
tree | 13766f3b985528f1dae7ddb595d675b0bf416d8f | |
parent | 415df72d0d8dd8a96d22f5619b1d37951786f144 (diff) | |
parent | a6f35b3e600a94dd35ea54bdc43e992513086e93 (diff) | |
download | nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar.gz nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar.bz2 nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar.lz nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar.xz nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.tar.zst nixlib-59807bf947594b925c57f6ca0e799c89bbc6f2c7.zip |
Merge pull request #5445 from pmahoney/connect
connect 1.104
-rw-r--r-- | pkgs/tools/networking/connect/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 8723c53c3229..5ccbc8d0cae1 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "connect-1.95"; +let + + version = "1.104"; + +in stdenv.mkDerivation { + name = "connect-${version}"; src = fetchurl { - url = http://savannah.gnu.org/maintenance/connect.c; - sha256 = "11dx07pcanwaq71g4xh8d4blr5j7iy0ilmb0fkgpj8p22blb74mf"; + url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; + sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2"; }; - phases = "unpackPhase buildPhase fixupPhase"; - - unpackPhase = '' - cp $src connect.c - ''; + makeFlags = [ "CC=cc" ]; # gcc and/or clang compat - buildPhase = '' - mkdir -p $out/bin - gcc -o $out/bin/connect connect.c + installPhase = '' + install -D -m ugo=rx connect $out/bin/connect ''; meta = { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html; # source URL is busted there + homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = with stdenv.lib.maintainers; [ jcumming ]; |