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

perkeep: 20170505 -> 0.10.1 #43840

Merged
merged 1 commit into from Jul 23, 2018
Merged

perkeep: 20170505 -> 0.10.1 #43840

merged 1 commit into from Jul 23, 2018

Conversation

kalbasit
Copy link
Member

@kalbasit kalbasit commented Jul 20, 2018

Motivation for this change

Updating perkeep to the latest version

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

cc @cstrahan

sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n";
};

in
stdenv.mkDerivation rec {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use buildGoPackage here? Otherwise the result will depend on the go compiler at runtime.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, let me give that a try, I'll ping you once I addressed your comment. Thx @Mic92 for the review!

cp -a ${gotool} ./vendor/github.com/kisielk/gotool
mkdir -p ./vendor/golang.org/x/tools/go
cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15
buildInputs = [ git go ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does it use git?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not look like it was strictly required: https://perkeep.googlesource.com/perkeep/+/master/make.go#668

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, I will remove git as a dependency.

@kalbasit kalbasit force-pushed the update_perkeep branch 2 times, most recently from b733968 to 2fc646c Compare July 21, 2018 17:15

buildInputs = [ git go ];
buildInputs = [ go ];
Copy link
Member Author

@kalbasit kalbasit Jul 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mic92 go was imported in the stdenv.mkDerivation because perkeep insists on using a specific version of Go. How to tell buildGoPackage to use a specific version of Go? It's always adding go to both nativeBuildInputs and buildInputs, so I'm not sure that my setting it here actually makes it use this go version or not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use buildGo110Package instead of buildGoPackage for example

@kalbasit kalbasit force-pushed the update_perkeep branch 3 times, most recently from 5b112f0 to f79997a Compare July 23, 2018 20:03
Also rewrite the derivation to use buildGoPackage
@kalbasit
Copy link
Member Author

@Mic92 PTAL.

@Mic92 Mic92 merged commit 4097636 into NixOS:master Jul 23, 2018
@kalbasit kalbasit deleted the update_perkeep branch July 23, 2018 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants