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

rclone: 1.33 -> 1.35 #21598

Merged
merged 1 commit into from Jan 3, 2017
Merged

rclone: 1.33 -> 1.35 #21598

merged 1 commit into from Jan 3, 2017

Conversation

danielfullmer
Copy link
Contributor

@danielfullmer danielfullmer commented Jan 2, 2017

Motivation for this change

Updated rclone to 1.35. Note that the go dependencies are included under the vendor/ directory of the source files. So, there is no need to include them in the deps.json file, as discussed in go2nix#21

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
    • Linux
  • 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.

@mention-bot
Copy link

@danielfullmer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dguibert, @zimbatm and @zraexy to be potential reviewers.

};

goDeps = ./deps.nix;

meta = {
Copy link
Member

Choose a reason for hiding this comment

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

You could use meta = with stdenv.lib; ... to make it a little less verbose.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated

@@ -1,219 +0,0 @@
# This file was generated by go2nix.
Copy link
Member

Choose a reason for hiding this comment

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

What happened to all the dependencies?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I can tell, this file is no longer necessary. The rclone project pins and includes its own go dependencies under the vendor subdirectory. See https://github.com/ncw/rclone/tree/master/vendor
Moreover, go2nix has been updated to take the vendor subdirectory into account when computing deps.nix. See go2nix#21 In fact, running go2nix on this project now produces an empty deps.nix file.

Copy link
Member

Choose a reason for hiding this comment

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

Ah that explains it, was just curious.

@LnL7 LnL7 merged commit 3ac20e9 into NixOS:master Jan 3, 2017
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