diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-08-31 22:58:41 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-08 16:32:39 +1000 |
| commit | 2afb2ae1109018316d01d64e4a8008dbf4394e9d (patch) | |
| tree | b37f02a31d5627e8cb94b17dcf239b63ce35e798 | |
| parent | 288135531e1e665192163c5957d77ce6e1fad7c3 (diff) | |
| download | nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar.gz nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar.bz2 nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar.lz nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar.xz nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.tar.zst nixpkgs-2afb2ae1109018316d01d64e4a8008dbf4394e9d.zip | |
teleconsole: use upstream vendor
| -rw-r--r-- | pkgs/tools/misc/teleconsole/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/misc/teleconsole/deps.nix | 13 |
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 374bf9b54b2..47a792a3f92 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -13,7 +13,16 @@ buildGoPackage rec { sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; }; - goDeps = ./deps.nix; + srcTeleport = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + + preBuild = '' + cp -r ${srcTeleport} ./go/src/github.com/gravitational/teleport + ''; CGO_ENABLED = 1; buildFlags = [ "-ldflags" ]; diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix deleted file mode 100644 index f13529d4b25..00000000000 --- a/pkgs/tools/misc/teleconsole/deps.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ - # Teleport v2.0.0-alpha.4 required for build. - # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 - { - goPackagePath = "github.com/gravitational/teleport"; - fetch = { - type = "git"; - url = "https://github.com/gravitational/teleport"; - rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; - sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; - }; - } -] |