mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Code Issues Wiki Activity

etebase-server: use buildPythonApplication...

Browse source 
...not pythonPackage. This is an app, living in pkgs/servers, so
we just use callPackage in all-packages and drop the python module.

python3.pkgs.toPythonModule could be used if a python module was needed.
Before that change legacyPackages.x86_64-linux.python311.pkgs.etebase-server.python
would give a python 3.12 release, and was therefore broken.

etebase-server = toPythonModule (pkgs.etebase-server.override {
  python3 = python;
});

would now be correct
This commit is contained in:
phaer 2024-07-12 00:35:53 +02:00
parent 48c3bb5824
commit c437fb23e1
5 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/etebase-server.nix
View file

@ -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.";
};

2
pkgs/servers/etebase/default.nix
View file

@ -14,7 +14,7 @@ let
};
};
in
python.pkgs.buildPythonPackage rec {
python.pkgs.buildPythonApplication rec {
pname = "etebase-server";
version = "0.13.1";

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };

1
pkgs/top-level/python-aliases.nix
View file

@ -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
ev3dev2 = python-ev3dev2; # added 2023-06-19
eyeD3 = eyed3; # added 2024-01-03
Fabric = fabric; # addedd 2023-02-19

2
pkgs/top-level/python-packages.nix
View file

@ -3974,8 +3974,6 @@ self: super: with self; {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
};
etebase-server = callPackage ../servers/etebase { };
eternalegypt = callPackage ../development/python-modules/eternalegypt { };
etesync = callPackage ../development/python-modules/etesync { };