Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c5250873c | ||
|
|
5ae87c610b | ||
|
|
fa88858062 | ||
|
|
d233798113 |
No files matched your search
@@ -50,6 +50,7 @@ in
|
|||||||
apps = [
|
apps = [
|
||||||
pkgs.frappix.erpnext
|
pkgs.frappix.erpnext
|
||||||
pkgs.frappix.hrms
|
pkgs.frappix.hrms
|
||||||
|
pkgs.frappix.insights
|
||||||
pkgs.frappix.default_thai_company
|
pkgs.frappix.default_thai_company
|
||||||
];
|
];
|
||||||
sites = {
|
sites = {
|
||||||
@@ -59,6 +60,7 @@ in
|
|||||||
"frappe"
|
"frappe"
|
||||||
"erpnext"
|
"erpnext"
|
||||||
"hrms"
|
"hrms"
|
||||||
|
"insights"
|
||||||
"default_thai_company"
|
"default_thai_company"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ let
|
|||||||
domain = "git.b4l.co.th";
|
domain = "git.b4l.co.th";
|
||||||
owner = "newedge";
|
owner = "newedge";
|
||||||
repo = "default_thai_company";
|
repo = "default_thai_company";
|
||||||
rev = "c8fb98374989a22d0c907aa44877f247391a49ac";
|
rev = "b4c7274dce7ad6eaa486391b0a8d3e29f6da848f";
|
||||||
sha256 = "sha256-c+pqds4l3Laldgf3+Rj2Ug693kFJYDB1j4a15j4U5SY=";
|
sha256 = "sha256-8yb9ntayP9zpboydtOWzeAQOK27v6fydVIOTrWCuvFY=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildPythonPackage (finalAttrs: {
|
buildPythonPackage (finalAttrs: {
|
||||||
|
|||||||
@@ -2,8 +2,15 @@
|
|||||||
# Must be applied after frappixFrappeOverlay (needs prev.frappix).
|
# Must be applied after frappixFrappeOverlay (needs prev.frappix).
|
||||||
final: prev: {
|
final: prev: {
|
||||||
frappix = prev.frappix.overrideScope (
|
frappix = prev.frappix.overrideScope (
|
||||||
ffinal: _fprev: {
|
ffinal: fprev: {
|
||||||
default_thai_company = ffinal.callPackage ./default-thai-company.nix { };
|
default_thai_company = ffinal.callPackage ./default-thai-company.nix { };
|
||||||
|
|
||||||
|
# insights' after_migrate hook opens the "Site DB" data source via
|
||||||
|
# ibis.mysql, whose backend imports MySQLdb (mysqlclient) since ibis 10.
|
||||||
|
# Upstream frappix only ships ibis-framework without the mysql extra.
|
||||||
|
insights = fprev.insights.overridePythonAttrs (old: {
|
||||||
|
dependencies = old.dependencies ++ [ final.python3.pkgs.mysqlclient ];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user