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

Merge pull request #92743 from MasseGuillaume/fix-telepresence

Browse Source 
telepresence: fix build
This commit is contained in:
Jörg Thalheim 2020-07-08 23:34:43 +01:00 committed by GitHub
commit a468c3add9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,31 @@
{ lib, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git { lib, pythonPackages, fetchFromGitHub, makeWrapper, git
, sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils , sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils
, iptables, bash }: , iptables, bash }:
let let
sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { sshuttle-telepresence =
src = fetchgit { let
url = "https://github.com/datawire/sshuttle.git"; sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; in
sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3"; lib.overrideDerivation sshuttle (p: {
}; src = fetchFromGitHub {
owner = "datawire";
repo = "sshuttle";
rev = sshuttleTelepresenceRev;
sha256 = "1lp5b0h9v59igf8wybjn42w6ajw08blhiqmjwp4r7qnvmvmyaxhh";
};
nativeBuildInputs = p.nativeBuildInputs ++ [ git ]; SETUPTOOLS_SCM_PRETEND_VERSION="${sshuttleTelepresenceRev}";
postPatch = "rm sshuttle/tests/client/test_methods_nat.py"; postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence"; postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
}); });
in pythonPackages.buildPythonPackage rec { in pythonPackages.buildPythonPackage rec {
pname = "telepresence"; pname = "telepresence";
version = "0.104"; version = "0.105";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "datawire"; owner = "telepresenceio";
repo = "telepresence"; repo = "telepresence";
rev = version; rev = version;
sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg";