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

sambaMaster: init at 4.8_2017-12-25 #33256

Merged
merged 5 commits into from Jan 26, 2018
Merged

sambaMaster: init at 4.8_2017-12-25 #33256

merged 5 commits into from Jan 26, 2018

Conversation

lukeadams
Copy link
Contributor

@lukeadams lukeadams commented Dec 31, 2017

Motivation for this change

Samba 4.8 releases around March 2018. sambaMaster may be useful for those who would like to test experimental macOS Time Machine support, which is what I'm using this for.

To use this on NixOS:
services.samba.package = pkgs.sambaMaster;
To enable TM for a share, add the following to the share definition:
"fruit:aapl" = "yes";
"fruit:time machine" = "yes";
"vfs objects" = "catia fruit streams_xattr";

Currently master piggybacks off of the 4.x definition with minimal modifications (overrideAttrs+override)

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.

@lukeadams
Copy link
Contributor Author

lukeadams commented Jan 1, 2018

@garbas
Copy link
Member

garbas commented Jan 9, 2018

@GrahamcOfBorg test samba

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-linux



  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 27092  100 27092    0     0  27092      0  0:00:01 --:--:--  0:00:01 45304

fetching path ‘/nix/store/lcz15kqnmm40pwjlnlclr8m2b6gncxag-nixos-test-driver’...
fetching path ‘/nix/store/5hx1kiwg3zp3is41pfyrq67bdrpym0bw-zstd-1.3.3’...
building path(s) ‘/nix/store/xv9xbqmlzxb0b3aai73m13iy0v36r8yg-append-initrd-secrets’
killing process 53947
killing process 53945
killing process 53946
error: a ‘aarch64-linux’ is required to build ‘/nix/store/5kvcmpvrm9bd27a8rniymiq0qir035c5-append-initrd-secrets.drv’, but I am a ‘x86_64-linux’

@garbas
Copy link
Member

garbas commented Jan 9, 2018

@lukeadams can you confirm that samba tests works after this PR? our @GrahamcOfBorg is having problems.
@grahamc is above error known? looks like some problem with x86_64-linux vs. aarch64-linux

@lukeadams
Copy link
Contributor Author

lukeadams commented Jan 10, 2018

@garbas
Samba tests work! The tests check samba not sambaMaster by default (although the patch and service commits affect both).
Also ran tests with sambaMaster and they passed as well.

I'm currently running this on my NAS without issue.

@lukeadams
Copy link
Contributor Author

lukeadams commented Jan 26, 2018

Rebased onto 0f5f904, also bumped version. (2018-01-25)
Resolved merge conflict in the process.
Tests still pass for both samba and sambaMaster

@garbas garbas merged commit bdf4eeb into NixOS:master Jan 26, 2018
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