commit 42f1372c53f0ea7ae465451b37b9039279ed3b7b · pyrox.dev/nixpkgs

+27 -9
pkgs/tools/networking/telepresence/default.nix
···

       1
       1
        
       { lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git

     

       2
       2
       -
       , python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }:

     

       2
       2
       +
       , python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools

     

       3
       3
       +
       , openssh, which, coreutils, iptables, bash }:

     

       3
       4
        
       

     

       4
       5
        
       let

     

       5
       6
        
         sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {

     

       6
       7
        
           src = fetchgit {

     

       7
       8
        
             url = "https://github.com/datawire/sshuttle.git";

     

       8
       8
       -
             rev = "8f881d131a0d5cb203c5a530d233996077f1da1e";

     

       9
       9
       -
             sha256 = "0c760xhblz5mpcn5ddqpvivvgn0ixqbhpjsy50dkhgn6lymrx9bx";

     

       9
       9
       +
             rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";

     

       10
       10
       +
             sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";

     

       10
       11
        
             leaveDotGit = true;

     

       11
       12
        
           };

     

       12
       13
        
       

     
···

       16
       17
        
         });

     

       17
       18
        
       in stdenv.mkDerivation rec {

     

       18
       19
        
         pname = "telepresence";

     

       19
       19
       -
         version = "0.67";

     

       20
       20
       +
         version = "0.85";

     

       20
       21
        
         name = "${pname}-${version}";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "datawire";

     

       24
       25
        
           repo = "telepresence";

     

       25
       26
        
           rev = version;

     

       26
       26
       -
           sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9";

     

       27
       27
       +
           sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       29
       -
         buildInputs = [ makeWrapper ];

     

       30
       30
       +
         buildInputs = [ makeWrapper python3 ];

     

       30
       31
        
       

     

       31
       32
        
         phases = ["unpackPhase" "installPhase"];

     

       32
       33
        
       

     

       33
       34
        
         installPhase = ''

     

       34
       35
        
           mkdir -p $out/libexec $out/bin

     

       35
       35
       -
           cp cli/telepresence $out/libexec/telepresence

     

       36
       36
        
       

     

       37
       37
       -
           makeWrapper $out/libexec/telepresence $out/bin/telepresence \

     

       38
       38
       -
             --prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]}

     

       37
       37
       +
           export PREFIX=$out

     

       38
       38
       +
           substituteInPlace ./install.sh \

     

       39
       39
       +
             --replace "#!/bin/bash" "#!${stdenv.shell}" \

     

       40
       40
       +
             --replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \

     

       41
       41
       +
             --replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"'

     

       42
       42
       +
           ./install.sh

     

       43
       43
       +
       

     

       44
       44
       +
           wrapProgram $out/bin/telepresence \

     

       45
       45
       +
             --prefix PATH : ${lib.makeBinPath [

     

       46
       46
       +
               python3

     

       47
       47
       +
               sshfs-fuse

     

       48
       48
       +
               torsocks

     

       49
       49
       +
               conntrack-tools

     

       50
       50
       +
               sshuttle-telepresence

     

       51
       51
       +
               openssh

     

       52
       52
       +
               which

     

       53
       53
       +
               coreutils

     

       54
       54
       +
               iptables

     

       55
       55
       +
               bash

     

       56
       56
       +
             ]}

     

       39
       57
        
         '';

     

       40
       58
        
       

     

       41
       59
        
         meta = {