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

nixos/seafile: add optional seafdav service #152069

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

Pacman99
Copy link
Contributor

@Pacman99 Pacman99 commented Dec 25, 2021

Motivation for this change

add webdav support for seafile

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.
Configuration Example
{
  services.seafile.seafdavSettings = {
    enabled = true;
    share_name = "/seafdav";
  };
  services.nginx.virtualHosts."files.example.com" = {
    locations."/seafdav".proxyPass = "http://127.0.0.1:6001/seafdav";
  };
}

@Tungsten842
Copy link
Member

Result of nixpkgs-review pr 152069 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
2 packages built:
  • python38Packages.seafdav (python39Packages.seafdav)
  • python38Packages.seafobj (python39Packages.seafobj)

Copy link
Contributor

@greizgh greizgh left a comment

Choose a reason for hiding this comment

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

Thank you for contributing this feature, I'll test and report back.

pkgs/development/python-modules/seafobj/setuptools.patch Outdated Show resolved Hide resolved
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

seafdav shouldn't be in pythonPackages, so put it in all-packages.nix and move the expression to an appropriate directory

pkgs/development/python-modules/seafdav/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/seafdav/default.nix Outdated Show resolved Hide resolved
nixos/tests/seafile.nix Outdated Show resolved Hide resolved
@Pacman99
Copy link
Contributor Author

Pacman99 commented Jan 3, 2022

Thanks! I addressed most of the code review and fixed the commit messages.

@Pacman99
Copy link
Contributor Author

Pacman99 commented Jan 3, 2022

I'm going to mark as draft until #153388 is merged

@Pacman99 Pacman99 marked this pull request as draft January 3, 2022 23:05
@Pacman99 Pacman99 marked this pull request as ready for review January 30, 2022 20:47
pkgs/development/python-modules/seafobj/default.nix Outdated Show resolved Hide resolved
pkgs/servers/seafdav/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/seafobj/default.nix Outdated Show resolved Hide resolved
pkgs/servers/seafdav/default.nix Outdated Show resolved Hide resolved
pkgs/servers/seafdav/default.nix Outdated Show resolved Hide resolved
@Pacman99
Copy link
Contributor Author

Thank you for the review! I applied everything and rebased.

Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

The last commit message should start with nixos/seafile.

pkgs/development/python-modules/seafobj/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/seafobj/default.nix Outdated Show resolved Hide resolved
@@ -0,0 +1,18 @@
+from setuptools import setup, find_packages
+
+__version__ = '7.0.0'
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this should be changed since you didn't actually package version 7.0.0.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess I packaged the pre-release of the next version, but then I'd have to predict what the next version number for seafobj would be.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Filed an issue upstream for adding setuptools support: haiwen/seafobj#57

pkgs/development/python-modules/seafobj/default.nix Outdated Show resolved Hide resolved
@Pacman99 Pacman99 force-pushed the seafdav branch 2 times, most recently from 8e08648 to f64e8e5 Compare January 31, 2022 23:27
@dotlambda dotlambda changed the title seafile: add optional seafdav service nixos/seafile: add optional seafdav service Jan 31, 2022
@dotlambda dotlambda marked this pull request as draft February 6, 2022 21:55
@dotlambda
Copy link
Member

@Pacman99 Is this done? You should sqash the last commit into the appropriate one and as said above, the third commit message should start with nixos/seafile.

@Pacman99
Copy link
Contributor Author

@Pacman99 Is this done? You should sqash the last commit into the appropriate one and as said above, the third commit message should start with nixos/seafile.

I think so, I think I can deal with the setuptools issue in the future, hopefully with an upstream fix. And I believe I've addressed all your review, let me know if I'm missing anything else.

@Pacman99 Pacman99 marked this pull request as ready for review February 11, 2022 00:11
@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 13, 2022
@shimunn
Copy link
Contributor

shimunn commented Dec 16, 2022

What's blocking this, any help needed?

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
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.

6 participants