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.

Sign up for GitHub

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

Jump to bottom

s3ql: clean up dependencies, build for release, fix tests, fix --systemd option, fix umount.s3ql #67541

Closed
wants to merge 1 commit into from
Closed

s3ql: clean up dependencies, build for release, fix tests, fix --systemd option, fix umount.s3ql #67541

wants to merge 1 commit into from

Conversation

justinlovinger
Copy link
Contributor

@justinlovinger justinlovinger commented Aug 27, 2019 •
edited

Motivation for this change

Move dependencies to proper inputs. Build for release instead of development. Fix and enable all tests. Use the correct crypography library instead of pycrypto, as per installation instructions.

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 (most) 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.
Notify maintainers

cc @rushmorem

@ofborg ofborg bot requested a review from rushmorem August 27, 2019 03:30
@justinlovinger justinlovinger changed the title s3ql: clean up dependencies, build for release, and fix tests s3ql: clean up dependencies, build for release, fix tests, fix --systemd option Sep 26, 2019
@justinlovinger justinlovinger changed the title s3ql: clean up dependencies, build for release, fix tests, fix --systemd option s3ql: clean up dependencies, build for release, fix tests, fix --systemd option, fix umount.s3ql Sep 26, 2019
@stale
Copy link

stale bot commented Jun 1, 2020

Thank you for your contributions.
This has been automatically marked as stale because it has had no activity for 180 days.
If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity.
Here are suggestions that might help resolve this more quickly:

  1. Search for maintainers and people that previously touched the
    related code and @ mention them in a comment.
  2. Ask on the NixOS Discourse. 3. Ask on the #nixos channel on
    irc.freenode.net.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
jtojnar
jtojnar reviewed Jul 7, 2020
View reviewed changes
pkgs/tools/backup/s3ql/default.nix Outdated Show resolved Hide resolved
pkgs/tools/backup/s3ql/default.nix
Comment on lines +36 to +37
psmisc # `umount.s3ql` requires `fuser`
utillinuxMinimal.bin # `umount.s3ql` requires `umount`
Copy link
Contributor

Choose a reason for hiding this comment

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

This will not put those dependencies on PATH. You will need to patch the paths in https://github.com/s3ql/s3ql/blob/02b4b5b0775e3e9fb61581d4ab917aa351802b43/src/s3ql/umount.py.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looking at my logs from the time I made this patch, umount.s3ql gave errors like FileNotFoundError: [Errno 2] No such file or directory: 'fuser': 'fuser'. Adding those packages to buildInputs did not fix the errors, but adding them to propagatedBuildInputs did. Someone who understands the role of propagatedBuildInputs better than myself may have better insight.

Copy link
Member

Choose a reason for hiding this comment

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

Please use makeWrapper instead of abusing propagatedBuildInputs.

@justinlovinger
s3ql: clean up and fix
44433ab 
Clean up dependencies,
build for release,
fix tests,
fix `--systemd` option,
and fix `umount.s3ql`.
@ofborg ofborg bot requested a review from rushmorem July 13, 2020 14:58
SuperSandro2000
SuperSandro2000 requested changes Nov 29, 2020
View reviewed changes
pkgs/tools/backup/s3ql/default.nix
Comment on lines +14 to +24
nativeBuildInputs = with python3Packages; [
cython
];
buildInputs = [
sqlite
];
checkInputs = with python3Packages; [
pytest
] ++ [
which
];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nativeBuildInputs = with python3Packages; [
cython
];
buildInputs = [
sqlite
];
checkInputs = with python3Packages; [
pytest
] ++ [
which
];
nativeBuildInputs = [ python3Packages.cython ];
buildInputs = [ sqlite ];
checkInputs = [ python3Packages.pytest which ];

pkgs/tools/backup/s3ql/default.nix
Comment on lines +36 to +37
psmisc # `umount.s3ql` requires `fuser`
utillinuxMinimal.bin # `umount.s3ql` requires `umount`
Copy link
Member

Choose a reason for hiding this comment

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

Please use makeWrapper instead of abusing propagatedBuildInputs.

@stale
Copy link

stale bot commented Jul 20, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 20, 2021
@justinlovinger
Copy link
Contributor Author

I haven't used s3ql in a while. If anyone else wants to re-open this issue with the requested changes, feel free to use my code changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lheckemann lheckemann lheckemann left review comments

@jtojnar jtojnar jtojnar left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@rushmorem rushmorem Awaiting requested review from rushmorem

Assignees
No one assigned
Labels
2.status: merge conflict 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@justinlovinger @lheckemann @jtojnar @SuperSandro2000