Skip to content

etebase-server: use buildPythonApplication, default to withLdap = false #326398

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

Merged
natsukium merged 2 commits into from
Jul 17, 2024
Merged

etebase-server: use buildPythonApplication, default to withLdap = false #326398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c3bb5
etebase-server: default to withLdap = false
phaer Jul 15, 2024
c437fb2
etebase-server: use buildPythonApplication...
phaer Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/etebase-server.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ in

package = mkOption {
type = types.package;
default = pkgs.python3.pkgs.etebase-server;
default = pkgs.etebase-server;
defaultText = literalExpression "pkgs.python3.pkgs.etebase-server";
description = "etebase-server package to use.";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/etebase/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, withLdap ? true
, python3
, withLdap ? false
, withPostgres ? true
, nix-update-script
, nixosTests
Expand All @@ -14,7 +14,7 @@ let
};
};
in
python.pkgs.buildPythonPackage rec {
python.pkgs.buildPythonApplication rec {
pname = "etebase-server";
version = "0.13.1";

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30201,7 +30201,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};

etebase-server = with python3Packages; toPythonApplication etebase-server;
etebase-server = callPackage ../servers/etebase {};

etesync-dav = callPackage ../applications/misc/etesync-dav { };

Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ mapAliases ({
email_validator = email-validator; # added 2022-06-22
enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
et_xmlfile = et-xmlfile; # added 2023-10-16
etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
Copy link
Member

@SuperSandro2000 SuperSandro2000 Jul 17, 2024

Choose a reason for hiding this comment

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

Suggested change
etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
etebase-server = pkgs.etebase-server; # added 2024-07-16

that should also just work

Copy link
Member Author

@phaer phaer Jul 17, 2024

Choose a reason for hiding this comment

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

You could end up with the wrong python version used, see this PRs description.

ev3dev2 = python-ev3dev2; # added 2023-06-19
eyeD3 = eyed3; # added 2024-01-03
Fabric = fabric; # addedd 2023-02-19
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3974,8 +3974,6 @@ self: super: with self; {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};

etebase-server = callPackage ../servers/etebase { };
Copy link
Member

@Aleksanaa Aleksanaa Jul 15, 2024

Choose a reason for hiding this comment

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

But do remember to add an entry in python-aliases.nix!

Copy link
Member Author

@phaer phaer Jul 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Can you explain why? We have an agreement between both maintainers of the package, @felschr and myself, to drop the python package. Are you using it?

Copy link
Member

@SuperSandro2000 SuperSandro2000 Jul 16, 2024

Choose a reason for hiding this comment

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

We always add an entry there except for extra versions. Then we can also drop the release notes entry.

Copy link
Member Author

@phaer phaer Jul 16, 2024

Choose a reason for hiding this comment

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

Ah right, sorry i misunderstood the suggestion at first. Should be fixed now?


eternalegypt = callPackage ../development/python-modules/eternalegypt { };

etesync = callPackage ../development/python-modules/etesync { };
Expand Down