Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

waypoint: init at 0.1.5 #103754

Merged
merged 1 commit into from Dec 21, 2020
Merged

waypoint: init at 0.1.5 #103754

merged 1 commit into from Dec 21, 2020

Conversation

@06kellyjac
Copy link
Contributor

@06kellyjac 06kellyjac commented Nov 13, 2020

Motivation for this change

Init waypoint at 0.1.5
Based on @winpat's pr #100994
I'm happy for any of my modifications to be coppied over & delete this branch. I'll put a PR in upstream so we can probably use make bin as is.

Resolves the injection issue issue

nixpkgs_waypoint

Removed the dontPatchELF stuff because none of it seems to actually be passed through by buildGoModule and I'm not comfortable changing it.

Things done

I ran the init and the build but it could do with more testing.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS (x86_64)
    • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@winpat
Copy link
Member

@winpat winpat commented Nov 14, 2020

Great job! I closed my PR.

Should be able to test this tomorrow.

@winpat
Copy link
Member

@winpat winpat commented Nov 16, 2020

LGTM. All the issues I had with my original expressions are resolved.

@winpat
winpat approved these changes Nov 16, 2020
@06kellyjac
Copy link
Contributor Author

@06kellyjac 06kellyjac commented Nov 16, 2020

It's looking like -static isn't going to be added upstream.
I've tried a bunch of things to get it working without it but no luck so far.

I'm also happy to add back in the git stuff for setting the version if you'd like

@winpat
Copy link
Member

@winpat winpat commented Nov 17, 2020

I'm also happy to add back in the git stuff for setting the version if you'd like

That sounds like a good idea.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 23, 2020

Result of nixpkgs-review pr 103754 run on x86_64-linux 1

1 package built:
  • waypoint
@06kellyjac
Copy link
Contributor Author

@06kellyjac 06kellyjac commented Nov 29, 2020

@winpat actually it looks like fetchgit with leaveDotGit isn't a great idea in its current state #100498 #64319 (comment)
TIL

@06kellyjac
Copy link
Contributor Author

@06kellyjac 06kellyjac commented Nov 29, 2020

Also it doesn't look like there's going to be much progress investigating the issue so I'm happy with it as is & I don't want to keep you and others waiting by leaving this in review if it's working well with everything we've tried so far

@06kellyjac 06kellyjac marked this pull request as ready for review Nov 29, 2020
@06kellyjac
Copy link
Contributor Author

@06kellyjac 06kellyjac commented Dec 16, 2020

/marvin opt-in
/status needs_reviewer

@marvin-mk2
Copy link

@marvin-mk2 marvin-mk2 bot commented Dec 16, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@marvin-mk2 marvin-mk2 bot requested a review from kisik21 Dec 16, 2020
Copy link
Contributor

@kisik21 kisik21 left a comment

First of all, let me tell that I love reviewing Nixpkgs PRs because sometimes I discover a gem of a package that I instantly fall in love with the moment I see it. This is one of these gems.

I've read and followed the tutorial with a Node app while using Waypoint built out of this derivation, and it was seamless. No errors, it works perfectly. LGTM.

/status needs_merger

@marvin-mk2 marvin-mk2 bot added needs_merger and removed awaiting_reviewer labels Dec 16, 2020
@marvin-mk2 marvin-mk2 bot requested a review from Ekleog Dec 16, 2020
@marvin-mk2 marvin-mk2 bot added awaiting_merger and removed needs_merger labels Dec 16, 2020
@marvin-mk2
Copy link

@marvin-mk2 marvin-mk2 bot commented Dec 20, 2020

Reminder: Please review!

Reminder: This Pull Request is awaiting merger. If you are the assigned reviewer with commit permission, please have a look. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR will be put back in the needs_reviewer queue in one day.

Co-authored-by: Patrick Winter <patrickwinter@posteo.ch>
@06kellyjac 06kellyjac force-pushed the 06kellyjac:waypoint branch from 07abbe3 to 6c83949 Dec 21, 2020
@06kellyjac
Copy link
Contributor Author

@06kellyjac 06kellyjac commented Dec 21, 2020

Added the extra flags to reduce size as requested.
Results:

before:
103.4 MB - waypoint
 45.4 MB - waypoint-entrypoint

after:
 90.7 MB - waypoint
 40.3 MB - waypoint-entrypoint

waypoint init and waypoint build still work on the waypoint-example projects (I tried docker/static)

@ofborg ofborg bot requested a review from winpat Dec 21, 2020
@06kellyjac 06kellyjac requested a review from SuperSandro2000 Dec 21, 2020
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 21, 2020

Result of nixpkgs-review pr 103754 run on x86_64-linux 1

1 package built:
  • waypoint
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 21, 2020

Result of nixpkgs-review pr 103754 run on x86_64-darwin 1

@SuperSandro2000 SuperSandro2000 merged commit b333263 into NixOS:master Dec 21, 2020
19 checks passed
19 checks passed
tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6c83949"; rev="6c839492e845df684323d91b9f5de42ab16f564c"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
waypoint, waypoint.passthru.tests on aarch64-linux Success
Details
waypoint, waypoint.passthru.tests on x86_64-linux Success
Details
@06kellyjac 06kellyjac deleted the 06kellyjac:waypoint branch Dec 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants