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

telepresence: 0.67 -> 0.85 (#43116)

Browse Source
This commit is contained in:
Jaka Hudoklin 2018-07-06 19:23:43 +02:00 committed by xeji
parent fec309aee4
commit 42f1372c53
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/tools/networking/telepresence/default.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git { lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }: , python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools
, openssh, which, coreutils, iptables, bash }:
let let
sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
src = fetchgit { src = fetchgit {
url = "https://github.com/datawire/sshuttle.git"; url = "https://github.com/datawire/sshuttle.git";
rev = "8f881d131a0d5cb203c5a530d233996077f1da1e"; rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
sha256 = "0c760xhblz5mpcn5ddqpvivvgn0ixqbhpjsy50dkhgn6lymrx9bx"; sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
leaveDotGit = true; leaveDotGit = true;
}; };
@ -16,26 +17,43 @@ let
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "telepresence"; pname = "telepresence";
version = "0.67"; version = "0.85";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "datawire"; owner = "datawire";
repo = "telepresence"; repo = "telepresence";
rev = version; rev = version;
sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9"; sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper python3 ];
phases = ["unpackPhase" "installPhase"]; phases = ["unpackPhase" "installPhase"];
installPhase = '' installPhase = ''
mkdir -p $out/libexec $out/bin mkdir -p $out/libexec $out/bin
cp cli/telepresence $out/libexec/telepresence
makeWrapper $out/libexec/telepresence $out/bin/telepresence \ export PREFIX=$out
--prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]} substituteInPlace ./install.sh \
--replace "#!/bin/bash" "#!${stdenv.shell}" \
--replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \
--replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"'
./install.sh
wrapProgram $out/bin/telepresence \
--prefix PATH : ${lib.makeBinPath [
python3
sshfs-fuse
torsocks
conntrack-tools
sshuttle-telepresence
openssh
which
coreutils
iptables
bash
]}
''; '';
meta = { meta = {