teleport: init at v2.4.0 #33853

tomberek · 2018-01-14T09:10:51Z

Motivation for this change

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

tomberek · 2018-01-14T09:22:03Z

Took a few tries to fix some whitespace conflicts to all-packages.nix, sorry.

nlewo

I didn't really reviewed your PR yet since I think you should try to use go2nix V2 branch. This version of go2nix uses Gopkg.lock file which is available in teleport, so you should be able to generate deps.nix file.

nlewo · 2018-01-14T19:44:31Z

pkgs/servers/teleport/default.nix

+
+  goPackagePath = "github.com/gravitational/teleport";
+  buildPhase = ''
+runHook preBuild


Indentation

tomberek · 2018-01-14T23:00:32Z

Thanks. I was not aware of the V2. This application does have a few quirks to build/install. I’ll push an update if the end result is cleaner.

tomberek · 2018-01-15T03:36:14Z

@nlewo Took a while to get v2 working. The deps.nix file is now populated. Sadly much of the cruft was still needed to build correctly.

nlewo · 2018-01-15T09:40:31Z

@tomberek I agree it's not documented... but there is a default.nix inside :)

Did you try to specify which subpackages you want to build? For instance:

buildGoPackage rec {
  name = "teleport-unstable-${version}";
  version = "2.4.0";

  goPackagePath = "github.com/gravitational/teleport";
  subPackages = [ "tool/tctl" ];
  # This repo has a private submodule "e" which fetchgit cannot handle
  # without failing. Using fetchurl instead on the latest tagged release.
  src = fetchurl {
    url = "https://github.com/gravitational/teleport/archive/v2.4.0.tar.gz";
    sha256 = "01qcr6vml3ias3gbkqjnb5fmc6ap1fd5mi52ygn3agafy63jb5rd";
  };
  goDeps = ./deps.nix;

  meta = {
    description = "A SSH CA management suite";
    homepage = "https://gravitational.com/teleport/";
    license = stdenv.lib.licenses.asl20;
    maintainers = [ stdenv.lib.maintainers.tomberek ];
    platforms = stdenv.lib.platforms.linux;
  };
}

tomberek · 2018-01-15T11:13:35Z

@nlewo Thanks for the simplifications. (this is my first go package for nixpkgs).

nlewo

Last remarks form my side :)

nlewo · 2018-01-15T13:56:58Z

pkgs/servers/teleport/default.nix

+
+  dontStrip = true;
+
+  # This repo has a private submodule "e" which fetchgit cannot handle


It seems the commit you were using (df6caeae7d90e520478244d583cd9e60d924fb32) is not the commit ID for the tag 2.4.0. So, maybe there is a diff between the deps you genreated and the soruce code you are using.

You can fetch an archive for a particular commit ID on github or

Set this attribute: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchgit/default.nix#L16 or

Generate deps by checking out tag 2.4.0

Correct, that was master a few days ago. Good catch. But we're not longer using deps... so meh.

nlewo · 2018-01-15T13:57:42Z

pkgs/servers/teleport/default.nix

+{ stdenv, buildGoPackage, zip, fetchurl, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "teleport-unstable-${version}";


Remove "unstable" from the name

kamilchm · 2018-01-16T11:28:33Z

pkgs/servers/teleport/default.nix

+  };
+  */
+
+  goDeps = ./deps.nix;


Try to ignore goDeps here, there's missing vendor scaning logic in go2nix v2. Packages from Gopkg.lock should be added to deps.nix only when they doesn't exists in vendor dir.

I confirm this works well without deps.nix.
I didn't realize goBuildPackage uses the vendor directory and I don't really know what to think about this: I like to be able to know what are the build requires by querying the Nix store and this is no longer possible when the vendor directorys used. But this is another story:)

For now, I think we could remove deps.nix.

removing....

tomberek · 2018-01-17T01:35:39Z

@kamilchm @nlewo Thanks for the review!

nlewo · 2018-01-31T13:35:08Z

@Mic92 could you have a look please?

Mic92 · 2018-02-01T10:28:32Z

pkgs/servers/teleport/default.nix

+    description = "A SSH CA management suite";
+    homepage = "https://gravitational.com/teleport/";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.tomberek ];


@kimburgess do you also want to maintain this package?

I'm all good staying out of this one - I'm not affiliated with Teleport, my other PR was just to get it into the repo for ease of use.

If there's an update that needs repacking in the future I'm happy to step up as a contributor / maintainer then and help out.

tomberek force-pushed the add_teleport branch 3 times, most recently from a885fb5 to d21cdd8 Compare January 14, 2018 09:19

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Jan 14, 2018

tomberek force-pushed the add_teleport branch from d21cdd8 to ca274f5 Compare January 14, 2018 09:21

tomberek force-pushed the add_teleport branch from ca274f5 to f0dbcff Compare January 14, 2018 09:26

tomberek changed the title ~~Add teleport-v2.4.0~~ teleport: add v2.4.0 Jan 14, 2018

tomberek force-pushed the add_teleport branch from f0dbcff to ad83466 Compare January 14, 2018 09:28

tomberek changed the title ~~teleport: add v2.4.0~~ teleport: init at v2.4.0 Jan 14, 2018

nlewo requested changes Jan 14, 2018

View reviewed changes

tomberek force-pushed the add_teleport branch from ad83466 to 3854aaf Compare January 15, 2018 03:34

tomberek mentioned this pull request Jan 15, 2018

Compile master gravitational/teleport#1590

Closed

tomberek force-pushed the add_teleport branch from 3854aaf to 6a12c51 Compare January 15, 2018 11:11

nlewo requested changes Jan 15, 2018

View reviewed changes

kamilchm reviewed Jan 16, 2018

View reviewed changes

tomberek force-pushed the add_teleport branch from 6a12c51 to 15ecff8 Compare January 17, 2018 01:31

teleport: init at v2.4.0

256d147

tomberek force-pushed the add_teleport branch from 15ecff8 to 256d147 Compare January 17, 2018 01:34

nlewo approved these changes Jan 17, 2018

View reviewed changes

kamilchm approved these changes Jan 17, 2018

View reviewed changes

nlewo mentioned this pull request Jan 31, 2018

teleport: init at 2.4.0 #34456

Closed

8 tasks

teleport: use fetchFromGitHub instead of fetchurl

adfeacc

Mic92 reviewed Feb 1, 2018

View reviewed changes

Mic92 merged commit 2bd4820 into NixOS:master Feb 2, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

teleport: init at v2.4.0 #33853

teleport: init at v2.4.0 #33853

tomberek commented Jan 14, 2018 •

edited

tomberek commented Jan 14, 2018

nlewo left a comment

nlewo Jan 14, 2018

tomberek commented Jan 14, 2018

tomberek commented Jan 15, 2018

nlewo commented Jan 15, 2018

tomberek commented Jan 15, 2018

nlewo left a comment

nlewo Jan 15, 2018

tomberek Jan 17, 2018

nlewo Jan 15, 2018

tomberek Jan 17, 2018

kamilchm Jan 16, 2018 •

edited

nlewo Jan 16, 2018

tomberek Jan 17, 2018

tomberek commented Jan 17, 2018

nlewo commented Jan 31, 2018

Mic92 Feb 1, 2018

kimburgess Feb 1, 2018


		dontStrip = true;

		# This repo has a private submodule "e" which fetchgit cannot handle

teleport: init at v2.4.0 #33853

teleport: init at v2.4.0 #33853

Conversation

tomberek commented Jan 14, 2018 • edited

Motivation for this change

Things done

tomberek commented Jan 14, 2018

nlewo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomberek commented Jan 14, 2018

tomberek commented Jan 15, 2018

nlewo commented Jan 15, 2018

tomberek commented Jan 15, 2018

nlewo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kamilchm Jan 16, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomberek commented Jan 17, 2018

nlewo commented Jan 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomberek commented Jan 14, 2018 •

edited

kamilchm Jan 16, 2018 •

edited