momo/erpnext-nix
3
0
Fork 0
forked from axeman/erpnext-nix
Code Pull requests Activity

Compare commits

base: momo:updates-2024-09
Branches Tags
momo:main
momo:updates-2024-09
axeman:updates-2024-09
axeman:main
..
compare: axeman:main
Branches Tags
axeman:updates-2024-09
axeman:main
momo:main
momo:updates-2024-09

No commits in common. "updates-2024-09" and "main" have entirely different histories.
updates-20 ... main

11 changed files with 127 additions and 100 deletions
Show stats Expand all files Collapse all files

23
flake.lock
View file

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"lastModified": 1703433843,
"narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
"owner": "ryantm",
"repo": "agenix",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"rev": "417caa847f9383e111d1397039c9d4337d024bf0",
"type": "github"
},
"original": {
@ -49,14 +49,17 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"lastModified": 1701787589,
"narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=",
"owner": "numtide",
"repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e",
"type": "github"
},
"original": {
@ -88,16 +91,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"lastModified": 1704295289,
"narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}

3
flake.nix
View file

@ -2,12 +2,13 @@
description = "Dev Setup";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
systems.url = "github:nix-systems/default";
devshell.url = "github:numtide/devshell";
devshell.inputs.nixpkgs.follows = "nixpkgs";
devshell.inputs.systems.follows = "systems";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";

8
modules/erpnext.nix
View file

@ -316,20 +316,14 @@ in
];
};
path = [
pkgs.bash
pkgs.mariadb-client
];
environment = {
PYTHON_PATH = "${penv}/${pkgs.python3.sitePackages}";
};
unitConfig = {
StartLimitBurst = "5";
StartLimitIntervalSec = "30";
};
serviceConfig = defaultServiceConfig // {
TimeoutStartSec = "600s";
TimeoutStartSec = "300s";
Restart = "on-failure";
RestartSec = "5s";
ExecStartPre = assert cfg.adminPasswordFile != null && cfg.database.rootPasswordFile != null; pkgs.writeScript "erpnext-web-init" ''
#!/bin/sh
if ! test -e ${escapeShellArg "${cfg.workDir}/.db-created"}; then

23
python-overlay.nix
View file

@ -18,15 +18,24 @@ final: prev: {
email-reply-parser = pyFinal.callPackage ./python/email-reply-parser.nix {};
maxminddb-geolite2 = pyFinal.callPackage ./python/maxminddb-geolite2.nix {};
psycopg2-binary = pyFinal.callPackage ./python/psycopg2-binary.nix {};
sql-metadata = pyFinal.callPackage ./python/sql-metadata.nix {};
traceback-with-variables = pyFinal.callPackage ./python/traceback-with-variables.nix {};
pydantic = pyFinal.callPackage ./python/pydantic.nix {};
#fastapi = pyPrev.fastapi.overridePythonAttrs (oldAttrs: (rec {
# propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
# pyPrev.pydantic-settings
# pyPrev.pydantic-extra-types
# ];
#}));
versioningit = pyPrev.versioningit.overridePythonAttrs (oldAttrs: (rec {
version = "2.2.1";
src = pyPrev.fetchPypi {
inherit version;
inherit (oldAttrs) pname;
hash = "sha256-DlgkLXq9phrmNZalSUrp7WMayF2Ls8yOF24yU8pLy7U=";
};
}));
fastapi = pyPrev.fastapi.overridePythonAttrs (oldAttrs: (rec {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
pyPrev.pydantic-settings
pyPrev.pydantic-extra-types
];
}));
plaid-python = pyPrev.plaid-python.overridePythonAttrs (oldAttrs: (rec {
version = "7.2.1";

9
python/barcodenumber.nix
View file

@ -4,13 +4,10 @@
}:
buildPythonPackage rec {
pname = "barcodenumber";
version = "0.5.0";
format = "wheel";
version = "0.2.1";
src = fetchPypi {
inherit format pname version;
python = "py3";
dist = "py3";
sha256 = "sha256-VZfHLwSF9aDoy5L1x4O2mu8/f2ijYKgyjCrQ1KKY5Ho=";
inherit pname version;
sha256 = "sha256-nW8+m32i42kLR4oC4lrKoBkFYgKHgpZPGAFNJvtLMhc=";
};
propagatedBuildInputs = [ ];
nativeBuildInputs = [ ];

3
python/bench.nix
View file

@ -32,9 +32,6 @@ buildPythonPackage rec {
};
format = "pyproject";
postPatch = ''
substituteInPlace pyproject.toml --replace-fail 'hatchling>=1.6.0,<=1.21.0' 'hatchling<=1.24.2'
'';
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "jinja2" "python-crontab" "semantic-version" ];

3
python/erpnext.nix
View file

@ -14,7 +14,6 @@
# Integration dependencies
, googlemaps
, plaid-python
, python-stdnum
, python-youtube
, pypng
}:
@ -41,7 +40,6 @@ buildPythonPackage rec {
"pycountry"
"rapidfuzz"
"Unidecode"
"python-youtube"
];
propagatedBuildInputs = [
@ -55,7 +53,6 @@ buildPythonPackage rec {
# Integration dependencies
googlemaps
plaid-python
python-stdnum
python-youtube
# used for QR code generation
pypng

36
python/frappe.nix
View file

@ -68,8 +68,6 @@
, xlrd
, zxcvbn
, markdownify
, tomli
, sql-metadata
# Integration dependencies
, boto3
@ -99,38 +97,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ pythonRelaxDepsHook flit-core ];
pythonRelaxDeps = [
"babel"
"pypdf"
"weasyprint"
"pydyf"
"bleach"
"cairocffi"
"chardet"
"cssutils"
"gunicorn"
"ipython"
"phonenumbers"
"pyopenssl"
"pydantic"
"pyotp"
"python-dateutil"
"pytz"
"rauth"
"redis"
"hiredis"
"requests"
"rq"
"sentry-sdk"
"markdownify"
"boto3"
"dropbox"
"google-api-python-client"
"google-auth-oauthlib"
"google-auth"
"posthog"
];
propagatedBuildInputs = [
babel
click
@ -195,8 +161,6 @@ buildPythonPackage rec {
xlrd
zxcvbn
markdownify
tomli
sql-metadata
# integration dependencies
boto3

85
python/pydantic.nix Normal file
View file

@ -0,0 +1,85 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, hatchling
, hatch-fancy-pypi-readme
, libxcrypt
, annotated-types
, pydantic-core
, typing-extensions
, email-validator
, dirty-equals
, faker
, pytestCheckHook
, pytest-mock
}:
buildPythonPackage rec {
pname = "pydantic";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pydantic";
repo = "pydantic";
rev = "refs/tags/v${version}";
hash = "sha256-toqrWg8bYzc3UmvG/YmXawfmT8nqaA9fxy24k1cdj+M=";
};
buildInputs = lib.optionals (pythonOlder "3.9") [
libxcrypt
];
nativeBuildInputs = [
hatch-fancy-pypi-readme
hatchling
];
propagatedBuildInputs = [
annotated-types
pydantic-core
typing-extensions
];
passthru.optional-dependencies = {
email = [
email-validator
];
};
nativeCheckInputs = [
dirty-equals
faker
pytest-mock
pytestCheckHook
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
preCheck = ''
export HOME=$(mktemp -d)
substituteInPlace pyproject.toml \
--replace "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \
--replace "'--benchmark-group-by', 'group'," "" \
--replace "'--benchmark-warmup', 'on'," "" \
--replace "'--benchmark-disable'," ""
'';
disabledTestPaths = [
"tests/benchmarks"
# avoid cyclic dependency
"tests/test_docs.py"
];
pythonImportsCheck = [ "pydantic" ];
meta = with lib; {
description = "Data validation and settings management using Python type hinting";
homepage = "https://github.com/pydantic/pydantic";
changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md";
license = licenses.mit;
maintainers = with maintainers; [ wd15 ];
};
}

20
python/sql-metadata.nix
View file

@ -1,20 +0,0 @@
{
buildPythonPackage,
fetchPypi,
poetry-core,
sqlparse,
}:
buildPythonPackage rec {
pname = "sql-metadata";
version = "2.11.0";
src = fetchPypi {
pname = "sql_metadata";
inherit version;
sha256 = "sha256-8jtwjOVYIh8so3YOtKuFa0+AVAtc9RczrZeRO8VGhis=";
};
format = "pyproject";
propagatedBuildInputs = [
poetry-core
sqlparse
];
}

14
srcs/pin.nix
View file

@ -1,12 +1,12 @@
{
benchVersion = "5.22.9";
erpnextVersion = "15.36.1";
frappeVersion = "15.39.2";
benchVersion = "5.19.0";
erpnextVersion = "15.9.1";
frappeVersion = "15.8.1";
hashes = {
"benchSrcHash" = "sha256-VOsAd7l09/GPf4eRV/Vrdj6XPLQS19/cq1h4Vym174A=";
"erpnextSrcHash" = "sha256-fECwtuMWOCRydcfWSx4CXLp5SWzWGIQ5yWOlsDsdDQI=";
"benchSrcHash" = "sha256-y8nx4vFVQggwGv2MWQ88WczgVbPxPybZV38FF5u5aWI=";
"erpnextSrcHash" = "sha256-nkXN0PTcWt1nSy3eRdBF2h0WMdAC79qWzaj9kXRsG2I=";
"erpnextYarnHash" = "1farnqrfnzshpbpx4nyarw13g8m3389ix3hrc4661xxm887lz5fv";
"frappeSrcHash" = "sha256-mArEVtkdVpiaHgr6u+cGCKjTL0pFJ2dXJw/dExh0atI=";
"frappeYarnHash" = "0ahch2jazvpigwjhk872i00paachya3ym3zjyc3dl5ris851qyss";
"frappeSrcHash" = "sha256-FDUUNbULPmMY6dDgbMHrxXD8pK1AP+T7kG7mY9MmMDg=";
"frappeYarnHash" = "0rj2v69siagwjz632hyaii5ni24fp434cznaxpi8978fq07qx6l9";
};
}