diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2018-10-06 15:21:28 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-06 15:21:28 +0200 |
commit | a134b9a3dd181ed21567a1068012d7075f8bcdd7 (patch) | |
tree | d55dd547caf11d30c1e18bc1f0bd08f17aa3ef26 /pkgs | |
parent | d2608d29a211a4bc35314dfadbc8c6d8914867ec (diff) | |
download | nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar.gz nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar.bz2 nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar.lz nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar.xz nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.tar.zst nixlib-a134b9a3dd181ed21567a1068012d7075f8bcdd7.zip |
telepresence: 0.85 -> 0.93 (#47966)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/telepresence/default.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 23 deletions
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 54d54a76fcb3..2eca68a98f68 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git -, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools -, openssh, which, coreutils, iptables, bash }: +{ lib, stdenv, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git +, sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils +, iptables, bash }: let sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { @@ -15,47 +15,35 @@ let postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; }); -in stdenv.mkDerivation rec { +in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.85"; - name = "${pname}-${version}"; + version = "0.93"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj"; + sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d"; }; - buildInputs = [ makeWrapper python3 ]; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/libexec $out/bin - - export PREFIX=$out - 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 + buildInputs = [ makeWrapper ]; + postInstall = '' wrapProgram $out/bin/telepresence \ --prefix PATH : ${lib.makeBinPath [ - python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence openssh - which coreutils iptables bash ]} ''; + doCheck = false; + meta = { homepage = https://www.telepresence.io/; description = "Local development against a remote Kubernetes or OpenShift cluster"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0f2356264a3..e9e5fc39b2a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5543,7 +5543,9 @@ with pkgs; teleport = callPackage ../servers/teleport {}; - telepresence = callPackage ../tools/networking/telepresence { }; + telepresence = callPackage ../tools/networking/telepresence { + pythonPackages = python3Packages; + }; termplay = callPackage ../tools/misc/termplay { }; |