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

gocryptfs: 1.6.1 -> 1.7 #64614

Merged
merged 1 commit into from Jul 16, 2019
Merged

gocryptfs: 1.6.1 -> 1.7 #64614

merged 1 commit into from Jul 16, 2019

Conversation

cw789
Copy link
Contributor

@cw789 cw789 commented Jul 11, 2019

Notes for a future gocryptfs updates
  • Delete fix-unix2syscall_darwin.go-build-failure.patch
  • Delete patches within default.nix

Motivation for this change

Just a minor package version update.
By the way, I haven't worked with go packages before.
This thing with deps2nix is for a noob as me a bit complicated to just update a package.

Not jet tested, as I still have not a practicable workflow for this here on my side.

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 nix-review --run "nix-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.

@cw789
Copy link
Contributor Author

cw789 commented Jul 11, 2019

@worldofpeace: Hello, as you're the one who have merged the last gocryptfs update,
I kindly ask if you wanna have a look on my PR.

@mmahut
Copy link
Member

mmahut commented Jul 11, 2019

@GrahamcOfBorg build gocryptfs

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build gocryptfs

building again for darwin

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I'm generating a different deps.nix locally.

The process I've done to do this was

  1. checkout gocryptfs repo locally
  2. $ git checkout v1.7
  3. $ dep2nix

Here's a gist of the diff


Additionally the build fails on darwin.
This patch upstream should fix this rfjakob/gocryptfs@b1468a7 (please use fetchpatch in patches)

pkgs/tools/filesystems/gocryptfs/default.nix Outdated Show resolved Hide resolved
pkgs/tools/filesystems/gocryptfs/default.nix Outdated Show resolved Hide resolved
@cw789
Copy link
Contributor Author

cw789 commented Jul 11, 2019

I'm generating a different deps.nix locally.

The process I've done to do this was

1. checkout `gocryptfs` repo locally

2. `$ git checkout v1.7`

3. `$ dep2nix`

Here's a gist of the diff

Additionally the build fails on darwin.
This patch upstream should fix this rfjakob/gocryptfs@b1468a7 (please use fetchpatch in patches)

Thx.

About the deps.nix I did it on the latest commit (forgot checking out v1.7).

And I'm not sure if the thing with the patches I did now is right?

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build gocryptfs

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

The patch we fetched unfortunately touched the lock file, so it won't apply.

What we can do is modify the patch by deleting the hunk that touches that file,
and having it locally in nixpkgs.

@worldofpeace
Copy link
Contributor

worldofpeace commented Jul 12, 2019

@GrahamcOfBorg build gocryptfs

@cw789
Copy link
Contributor Author

cw789 commented Jul 12, 2019

I'm exited. There was a lot I've learned until now in this little update.
@worldofpeace: Thank you very much for your assistance.

@worldofpeace
Copy link
Contributor

worldofpeace commented Jul 12, 2019

I'm exited. There was a lot I've learned until now in this little update.
@worldofpeace: Thank you very much for your assistance.

I'm glad you're excited. It's a secret that most nixpkgs reviewers are little mentors 😄

In the push I fixed a little tricky thing where we have to manually update the sys module
to have that fix, since the bug came from there too.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM, giving approval early since there's the last nitpick

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/33

@worldofpeace
Copy link
Contributor

worldofpeace commented Jul 15, 2019

@cw789 I can merge this it just needs to be squashed into one commit

@timokau
Copy link
Member

timokau commented Jul 15, 2019

@cw789 I think the best way to deal with "on next update do xyz" type of comments is to put them on the version line. People are unlikely to read all comments in a file on every update, but its hard to miss the one one the version line. Even if the updater misses it, it will show up in the diff for the reviewer.

Doesn't matter in this case, since the patch will fail to apply on update anyway. Just general advice for the future.

- Use pname instead of name
- Add patch for Darwin build
@cw789
Copy link
Contributor Author

cw789 commented Jul 16, 2019

@timokau: Thank you, for this advice.

@worldofpeace: I think I've made it.

@worldofpeace worldofpeace merged commit 99bd9bf into NixOS:master Jul 16, 2019
@worldofpeace
Copy link
Contributor

@cw789 Thanks for doing this ✨

@cw789 cw789 deleted the update_gocryptfs branch July 17, 2019 06:38
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

5 participants