nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326398 from phaer/etebase-python

Browse Source 
etebase-server: use buildPythonApplication, default to withLdap = false
This commit is contained in:
OTABI Tomoya 2024-07-17 10:00:42 +09:00 committed by GitHub
commit 43d306e7db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 6 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.";
};

4
pkgs/servers/etebase/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, withLdap ? true
, python3
, withLdap ? false
, withPostgres ? true
, nix-update-script
, nixosTests
@ -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

@ -30189,7 +30189,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

@ -3978,8 +3978,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 { };