axeman/erpnext-nix
1
0
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

wip: use nixos-unstable

Browse source 
update frappe
update erpnext
refactor versions
This commit is contained in:
teutat3s 2023-06-05 19:19:43 +02:00
parent 2bcd75eb09
commit cb9630c787
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
18 changed files with 346 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1 +1,2 @@
result result
*.qcow2

84
flake.lock
View file

@ -1,78 +1,23 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1685655444,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2362848adf8def2866fabbffc50462e929d7fffb", "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1635350005,
"narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-20.09",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"pip2nix": { "pip2nix": {
"inputs": { "flake": false,
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": { "locked": {
"lastModified": 1681921436, "lastModified": 1681921436,
"narHash": "sha256-jrUOMhpOFxrgCXNgMWz475nKZdMiSQb0+nbaIqQORSM=", "narHash": "sha256-jrUOMhpOFxrgCXNgMWz475nKZdMiSQb0+nbaIqQORSM=",
@ -89,9 +34,9 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pip2nix": "pip2nix" "pip2nix": "pip2nix",
"systems": "systems"
} }
}, },
"systems": { "systems": {
@ -108,21 +53,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

20
flake.nix
View file

@ -1,23 +1,26 @@
{ {
description = "Dev Setup"; description = "Dev Setup";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.systems.url = "github:nix-systems/default";
inputs.pip2nix = { inputs.pip2nix = {
url = "github:nix-community/pip2nix"; url = "github:nix-community/pip2nix";
flake = false; flake = false;
}; };
outputs = {nixpkgs, flake-utils, pip2nix, ...}: outputs = {nixpkgs, systems, pip2nix, ...}:
let let
pkgs = system: import nixpkgs { eachSystem = nixpkgs.lib.genAttrs (import systems);
inherit system; pkgs = import nixpkgs {
system = "x86_64-linux";
overlays = [ overlays = [
(import ./python-overlay.nix) (import ./python-overlay.nix)
(import ./overlay.nix) (import ./overlay.nix)
]; ];
}; };
packages = flake-utils.lib.eachDefaultSystem (system: rec { in
{
packages = eachSystem (system: {
devEnv = pkgs.buildEnv { devEnv = pkgs.buildEnv {
name = "erpnext-nix-dev-env"; name = "erpnext-nix-dev-env";
paths = [ paths = [
@ -33,11 +36,10 @@
}); });
nixosConfigurations = { nixosConfigurations = {
test-vm = nixpkgs.lib.nixosSystem { test-vm = nixpkgs.lib.nixosSystem {
pkgs = pkgs "x86_64-linux"; inherit pkgs;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [./test-vm/configuration.nix]; modules = [./test-vm/configuration.nix];
}; };
}; };
in {inherit packages nixosConfigurations;}; };
} }

61
frappe-tilde-versions
View file

@ -1,61 +0,0 @@
Babel 2.12.1
Click 8.1.3
filelock 3.8.0
filetype 1.2.0
GitPython 3.1.30
Jinja2 3.1.2
Pillow 9.3.0
PyJWT 2.4.0
PyPDF2 2.1.0
PyPika 0.48.9
PyQRCode 1.2.1
PyYAML 6.0
RestrictedPython 6.0
Werkzeug 2.2.2
Whoosh 2.7.4
beautifulsoup4 4.9.3
bleach-allowlist 1.0.3
bleach 3.3.0
chardet 4.0.0
croniter 1.3.5
cryptography 39.0.1
email-reply-parser 0.5.12
git-url-parse 1.2.2
gunicorn 20.1.0
html5lib 1.1
ipython 8.10.0
ldap3 2.9
markdown2 2.4.0
num2words 0.5.10
oauthlib 3.2.1
openpyxl 3.0.7
passlib 1.7.4
pdfkit 1.0.0
premailer 3.8.0
psutil 5.9.1
psycopg2-binary 2.9.1
pyOpenSSL 23.0.0
pycryptodome 3.10.1
pydantic 1.10.2
pyotp 2.6.0
python-dateutil 2.8.1
rauth 0.7.3
redis 4.5.4
hiredis 2.0.0
requests-oauthlib 1.3.0
requests 2.27.1
rq 1.11.1
semantic-version 2.10.0
sqlparse 0.4.1
tenacity 8.0.1
terminaltables 3.1.0
traceback-with-variables 2.0.4
xlrd 2.0.1
zxcvbn 4.4.28
markdownify 0.11.2
boto3 1.18.49
dropbox 11.7.0
google-api-python-client 2.2.0
google-auth-oauthlib 0.4.4
google-auth 1.29.0
posthog 3.0.1

12
node/erpnext-app.nix
View file

@ -7,7 +7,17 @@
, nodePackages , nodePackages
}: }:
let let
src = import ../srcs/erpnext.nix {inherit fetchFromGitHub; }; pinData = import ../srcs/pin.nix;
inherit (pinData) erpnextVersion;
inherit (pinData.hashes) erpnextSrcHash;
src = fetchFromGitHub {
owner = "frappe";
repo = "erpnext";
rev = "v${erpnextVersion}";
hash = erpnextSrcHash;
};
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
sha256 = "sha256-Vho4BSbxcsVYExLvUaeoc3xIpbXoCUP/4jw4RwGnWGY="; sha256 = "sha256-Vho4BSbxcsVYExLvUaeoc3xIpbXoCUP/4jw4RwGnWGY=";

12
node/frappe-app.nix
View file

@ -7,7 +7,17 @@
, nodePackages , nodePackages
}: }:
let let
src = import ../srcs/frappe.nix {inherit fetchFromGitHub; }; pinData = import ../srcs/pin.nix;
inherit (pinData) frappeVersion;
inherit (pinData.hashes) frappeSrcHash;
src = fetchFromGitHub {
owner = "frappe";
repo = "frappe";
rev = "v${frappeVersion}";
hash = frappeSrcHash;
};
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
sha256 = "sha256-PBdMUz9gJIoQaqQYbdk+xnd8CyZPmdeyz/9WznCb4Ss="; sha256 = "sha256-PBdMUz9gJIoQaqQYbdk+xnd8CyZPmdeyz/9WznCb4Ss=";

2
node/frappe-erpnext-assets.nix
View file

@ -29,4 +29,6 @@ runCommand "frappe-erpnext-apps-sites" {buildInputs = [yarn]; } ''
mkdir -p $out/share/sites mkdir -p $out/share/sites
cp -r sites/assets $out/share/sites/assets cp -r sites/assets $out/share/sites/assets
ln -s ${frappe-app}/share/apps/frappe/node_modules $out/share/sites/assets/frappe/node_modules
ln -s ${erpnext-app}/share/apps/erpnext/node_modules $out/share/sites/assets/erpnext/node_modules
'' ''

138
python-overlay.nix
View file

@ -22,14 +22,14 @@ self: super: {
taxjar = pyself.callPackage ./python/taxjar.nix {}; taxjar = pyself.callPackage ./python/taxjar.nix {};
traceback-with-variables = pyself.callPackage ./python/traceback-with-variables.nix {}; traceback-with-variables = pyself.callPackage ./python/traceback-with-variables.nix {};
barcodenumber = pysuper.barcodenumber.overridePythonAttrs (oldAttrs: (rec { #barcodenumber = pysuper.barcodenumber.overridePythonAttrs (oldAttrs: (rec {
version = "0.5.0"; # version = "0.5.0";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-VZfHLwSF9aDoy5L1x4O2mu8/f2ijYKgyjCrQ1KKY5Ho="; # sha256 = "sha256-VZfHLwSF9aDoy5L1x4O2mu8/f2ijYKgyjCrQ1KKY5Ho=";
}; # };
})); #}));
bleach = pysuper.bleach.overridePythonAttrs (oldAttrs: (rec { bleach = pysuper.bleach.overridePythonAttrs (oldAttrs: (rec {
version = "3.3.1"; version = "3.3.1";
src = pysuper.fetchPypi { src = pysuper.fetchPypi {
@ -38,14 +38,14 @@ self: super: {
sha256 = "sha256-MGSDpal5VHQWCtV/zj3dG1BVHpge7Y4VpYLTTO8oqvo="; sha256 = "sha256-MGSDpal5VHQWCtV/zj3dG1BVHpge7Y4VpYLTTO8oqvo=";
}; };
})); }));
phonenumbers = pysuper.phonenumbers.overridePythonAttrs (oldAttrs: (rec { #phonenumbers = pysuper.phonenumbers.overridePythonAttrs (oldAttrs: (rec {
version = "8.12.40"; # version = "8.12.40";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-APKVWkVrRY+barDSQykEnD5zWMRN/Bl5/kkIztQPHrg="; # sha256 = "sha256-APKVWkVrRY+barDSQykEnD5zWMRN/Bl5/kkIztQPHrg=";
}; # };
})); #}));
plaid-python = pysuper.plaid-python.overridePythonAttrs (oldAttrs: (rec { plaid-python = pysuper.plaid-python.overridePythonAttrs (oldAttrs: (rec {
version = "7.2.1"; version = "7.2.1";
src = pysuper.fetchPypi { src = pysuper.fetchPypi {
@ -58,51 +58,51 @@ self: super: {
# Integration tests require API keys and internet access # Integration tests require API keys and internet access
checkPhase = "py.test -rxs ./tests/unit"; checkPhase = "py.test -rxs ./tests/unit";
})); }));
pycountry = pysuper.pycountry.overridePythonAttrs (oldAttrs: (rec { #pycountry = pysuper.pycountry.overridePythonAttrs (oldAttrs: (rec {
version = "20.7.3"; # version = "20.7.3";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-gQhKU9NFQ0TAKS3uvCD80KFIjBNtSQAxLL1GXPVSy0I="; # sha256 = "sha256-gQhKU9NFQ0TAKS3uvCD80KFIjBNtSQAxLL1GXPVSy0I=";
}; # };
})); #}));
pymysql = pysuper.pymysql.overridePythonAttrs (oldAttrs: (rec { #pymysql = pysuper.pymysql.overridePythonAttrs (oldAttrs: (rec {
version = "1.0.3"; # version = "1.0.3";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-PdqUPvNpQGinXWnQcXVdvsrO4a35ofxbIGgw0rZ9Jeg="; # sha256 = "sha256-PdqUPvNpQGinXWnQcXVdvsrO4a35ofxbIGgw0rZ9Jeg=";
}; # };
format = "pyproject"; # format = "pyproject";
buildInputs = [pysuper.setuptools]; # buildInputs = [pysuper.setuptools];
})); #}));
pypng = pysuper.pypng.overridePythonAttrs (oldAttrs: (rec { #pypng = pysuper.pypng.overridePythonAttrs (oldAttrs: (rec {
version = "0.20220715.0"; # version = "0.20220715.0";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-c5xDO6lvB4MV3lTA25da7lN8vD4dCuTtmqsMoeQn4sE="; # sha256 = "sha256-c5xDO6lvB4MV3lTA25da7lN8vD4dCuTtmqsMoeQn4sE=";
}; # };
})); #}));
pytz = pysuper.pytz.overridePythonAttrs (oldAttrs: (rec { #pytz = pysuper.pytz.overridePythonAttrs (oldAttrs: (rec {
version = "2022.1"; # version = "2022.1";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc="; # sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc=";
}; # };
})); #}));
redis = pysuper.redis.overridePythonAttrs (oldAttrs: (rec { #redis = pysuper.redis.overridePythonAttrs (oldAttrs: (rec {
version = "3.5.3"; # version = "3.5.3";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
inherit (oldAttrs) pname; # inherit (oldAttrs) pname;
sha256 = "sha256-Dn4M/KhmDeqLfVzYxPbF4p4R8xFYwLCukaOX8A5aBaI="; # sha256 = "sha256-Dn4M/KhmDeqLfVzYxPbF4p4R8xFYwLCukaOX8A5aBaI=";
}; # };
pythonImportsCheck = []; # pythonImportsCheck = [];
# tests require a running redis # # tests require a running redis
doCheck = false; # doCheck = false;
})); #}));
tweepy = pysuper.tweepy.overridePythonAttrs (oldAttrs: (rec { tweepy = pysuper.tweepy.overridePythonAttrs (oldAttrs: (rec {
version = "3.10.0"; version = "3.10.0";
src = pysuper.fetchPypi { src = pysuper.fetchPypi {
@ -113,14 +113,14 @@ self: super: {
doCheck = false; doCheck = false;
pythonImportsCheck = []; pythonImportsCheck = [];
})); }));
unidecode = pysuper.unidecode.overridePythonAttrs (oldAttrs: (rec { #unidecode = pysuper.unidecode.overridePythonAttrs (oldAttrs: (rec {
version = "1.2.0"; # version = "1.2.0";
src = pysuper.fetchPypi { # src = pysuper.fetchPypi {
inherit version; # inherit version;
pname = "Unidecode"; # pname = "Unidecode";
sha256 = "sha256-jXOpfTh6lWkiNE9rdCQ8LGdxWUZZd4dEstvarY9rcn0="; # sha256 = "sha256-jXOpfTh6lWkiNE9rdCQ8LGdxWUZZd4dEstvarY9rcn0=";
}; # };
})); #}));
}; };
}; };
} }

17
python/bench.nix
View file

@ -15,16 +15,31 @@
, setuptools , setuptools
, tomli , tomli
}: }:
let
pinData = import ../srcs/pin.nix;
inherit (pinData) benchVersion;
inherit (pinData.hashes) benchSrcHash;
in
buildPythonPackage rec { buildPythonPackage rec {
pname = "frappe-bench"; pname = "frappe-bench";
version = "5.16.2"; version = "5.16.2";
src = fetchFromGitHub {
owner = "frappe";
repo = "bench";
rev = "v${benchVersion}";
hash = benchSrcHash;
};
format = "pyproject"; format = "pyproject";
src = import ../srcs/bench.nix {inherit fetchFromGitHub; };
nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "jinja2" "python-crontab" "semantic-version" ]; pythonRelaxDeps = [ "jinja2" "python-crontab" "semantic-version" ];
buildInputs = [ buildInputs = [
hatchling hatchling
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
click click
gitpython gitpython

31
python/erpnext.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonRelaxDepsHook
, fetchFromGitHub , fetchFromGitHub
, taxjar , taxjar
@ -13,12 +14,32 @@
, googlemaps , googlemaps
, python-stdnum , python-stdnum
, frappe , frappe
, bench
}: }:
let
pinData = import ../srcs/pin.nix;
inherit (pinData) erpnextVersion;
inherit (pinData.hashes) erpnextSrcHash;
in
buildPythonPackage rec { buildPythonPackage rec {
pname = "erpnext"; pname = "erpnext";
version = "14.24.3"; version = erpnextVersion;
src = fetchFromGitHub {
owner = "frappe";
repo = pname;
rev = "v${erpnextVersion}";
hash = erpnextSrcHash;
};
format = "flit"; format = "flit";
src = import ../srcs/erpnext.nix {inherit fetchFromGitHub; };
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [
"pycountry"
"Unidecode"
];
propagatedBuildInputs = [ propagatedBuildInputs = [
taxjar taxjar
gocardless-pro gocardless-pro
@ -32,4 +53,10 @@ buildPythonPackage rec {
python-stdnum python-stdnum
frappe frappe
]; ];
#nativeCheckInputs = [
# bench
#];
#checkPhase = ''
# bench --site test_site run-tests --app erpnext
#'';
} }

73
python/frappe.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , pythonRelaxDepsHook
, fetchFromGitHub , fetchFromGitHub
# core dependencies # core dependencies
@ -47,8 +47,9 @@
, psutil , psutil
, psycopg2-binary , psycopg2-binary
, pyasn1 , pyasn1
, pyopenssl , pycountry
, pycryptodome , pycryptodome
, pyopenssl
, pyotp , pyotp
, pypng , pypng
, python-dateutil , python-dateutil
@ -69,8 +70,9 @@
, xlrd , xlrd
, zxcvbn , zxcvbn
, markdownify , markdownify
, bench
# integration dependencie # integration dependencies
, boto3 , boto3
, dropbox , dropbox
, google-api-python-client , google-api-python-client
@ -79,11 +81,56 @@
, google-auth , google-auth
, posthog , posthog
}: }:
let
pinData = import ../srcs/pin.nix;
inherit (pinData) frappeVersion;
inherit (pinData.hashes) frappeSrcHash;
in
buildPythonPackage rec { buildPythonPackage rec {
pname = "frappe"; pname = "frappe";
version = "14.36.1"; version = frappeVersion;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${frappeVersion}";
hash = frappeSrcHash;
};
format = "flit"; format = "flit";
src = import ../srcs/frappe.nix { inherit fetchFromGitHub; } ;
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [
"Babel"
"beautifulsoup4"
"boto3"
"cairocffi"
"Click"
"cryptography"
"filelock"
"google-api-python-client"
"google-auth"
"hiredis"
"ipython"
"openpyxl"
"phonenumbers"
"Pillow"
"premailer"
"pyasn1"
"pycountry"
"pycryptodome"
"PyJWT"
"PyMySQL"
"pyOpenSSL"
"pyotp"
"pypng"
"pytz"
"redis"
"rq"
"tenacity"
"WeasyPrint"
];
propagatedBuildInputs = [ propagatedBuildInputs = [
babel babel
click click
@ -128,8 +175,9 @@ buildPythonPackage rec {
psutil psutil
psycopg2-binary psycopg2-binary
pyasn1 pyasn1
pyopenssl pycountry
pycryptodome pycryptodome
pyopenssl
pyotp pyotp
pypng pypng
python-dateutil python-dateutil
@ -160,4 +208,17 @@ buildPythonPackage rec {
google-auth google-auth
posthog posthog
]; ];
#nativeCheckInputs = [
# bench
# redis
#];
#checkPhase = ''
# tmp=$(mktemp -d)
# cd $tmp
# bench -v init frappe-bench --skip-assets
# cd frappe-bench
# mkdir -p sites/test_site
# bench --site test_site run-tests --app frappe
#'';
} }

20
python/redisearch.nix
View file

@ -1,9 +1,10 @@
{ { buildPythonPackage
buildPythonPackage, , fetchPypi
fetchPypi, , pythonRelaxDepsHook
redis, , unittestCheckHook
rejson, , redis
hiredis , rejson
, hiredis
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "redisearch"; pname = "redisearch";
@ -12,9 +13,16 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "sha256-V1rNWhOhB/8AXUVyoTa1A7Evpb8mr8N70R9qkj8exzw="; sha256 = "sha256-V1rNWhOhB/8AXUVyoTa1A7Evpb8mr8N70R9qkj8exzw=";
}; };
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [
"redis"
];
propagatedBuildInputs = [ propagatedBuildInputs = [
redis redis
rejson rejson
hiredis hiredis
]; ];
nativeCheckInputs = [
unittestCheckHook
];
} }

16
python/rejson.nix
View file

@ -1,8 +1,9 @@
{ { buildPythonPackage
buildPythonPackage, , pythonRelaxDepsHook
fetchPypi, , unittestCheckHook
redis, , fetchPypi
six , redis
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rejson"; pname = "rejson";
@ -11,8 +12,13 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "sha256-vs3hNSAAUAi3ls5WyxKOsiUC18addIJv81HNQ79zvJc="; sha256 = "sha256-vs3hNSAAUAi3ls5WyxKOsiUC18addIJv81HNQ79zvJc=";
}; };
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [
"redis"
];
propagatedBuildInputs = [ propagatedBuildInputs = [
redis redis
six six
]; ];
doCheck = false;
} }

7
srcs/bench.nix
View file

@ -1,7 +0,0 @@
{fetchFromGitHub}:
fetchFromGitHub {
owner = "frappe";
repo = "bench";
rev = "v5.16.2";
sha256 = "sha256-SF/RwY54OKXTDIYz4LsQIR03QoCKPIGey60DO8TdonY=";
}

7
srcs/erpnext.nix
View file

@ -1,7 +0,0 @@
{fetchFromGitHub}:
fetchFromGitHub {
owner = "frappe";
repo = "erpnext";
rev = "v14.24.3";
sha256 = "sha256-zovdbpTp9fTpY7kAs4J8EiPh+EjqUOtVUk+rDYMfYDk=";
}

8
srcs/frappe.nix
View file

@ -1,8 +0,0 @@
{fetchFromGitHub}:
fetchFromGitHub {
owner = "akshaymankar";
repo = "frappe";
rev = "d4d3cbc12d3e40f104500866a2bf468d128e2e32";
sha256 = "sha256-+z/IeK3bFGYxnvWCR6GTgik25lSReJvRCbV7MsoUA/g=";
}

10
srcs/pin.nix Normal file
View file

@ -0,0 +1,10 @@
{
frappeVersion = "14.37.0";
erpnextVersion = "14.26.0";
benchVersion = "5.16.2";
hashes = {
"benchSrcHash" = "sha256-SF/RwY54OKXTDIYz4LsQIR03QoCKPIGey60DO8TdonY=";
"erpnextSrcHash" = "sha256-hPOgHADkrylc6OCbDyXCQfSYe5wliIhNcXpLE0hxmJ0=";
"frappeSrcHash" = "sha256-f0BkNByKtqXaG6L4+llwy9kmI8gbjvZdKzkzrbA6PI4=";
};
}

101
test-vm/configuration.nix
View file

@ -64,35 +64,68 @@ with lib;
group = "erpnext"; group = "erpnext";
isSystemUser = true; isSystemUser = true;
}; };
#users = {
# users.${user} = {
# uid = 327;
# group = group;
# home = server.workDir;
# };
# groups.${group}.gid = 327;
#};
systemd.services.erpnext = systemd.services.erpnext =
let let
penv = python3.buildEnv.override { name = "worker1";
extraLibs = [ user = "erpnext";
python3.pkgs.frappe group = "erpnext";
python3.pkgs.erpnext server = {
python3.pkgs.bench bind = "127.0.0.1:9090";
]; workDir = "/var/lib/erpnext";
}; };
in in {
{
enable = true; enable = true;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "mysql.service" "redis.service" "redis-socketio.service" ]; after = [ "mysql.service" "redis.service" "redis-socketio.service" ];
description = "ERPNext"; description = "ERPNext";
confinement = {
enable = true;
packages = [ ];
};
script = ''
export PYTHON_PATH=${penv}/${python3.sitePackages}
cat > /frappe-bench/sites/apps.txt <<EOF environment =
let
penv = pkgs.python3.buildEnv.override {
extraLibs = [
pkgs.python3.pkgs.frappe
pkgs.python3.pkgs.erpnext
pkgs.python3.pkgs.bench
];
};
in {
PYTHONPATH = "${penv}/${pkgs.python3.sitePackages}/";
};
#confinement = {
# enable = true;
# packages = [ ];
#};
serviceConfig = {
#User = "erpnext";
#NoNewPrivileges = true;
Type = "simple";
BindReadOnlyPaths = [
"${pkgs.frappe-app}/share/apps/frappe:/frappe-bench/apps/frappe"
"${pkgs.erpnext-app}/share/apps/erpnext:/frappe-bench/apps/erpnext"
"${pkgs.frappe-erpnext-assets}/share/sites/assets:/frappe-bench/sites/assets"
# "${penv}:/frappe-bench/env"
];
ExecStartPre = pkgs.writeScript "erpnext-server.${name}-init" ''
#!/bin/sh
mkdir -p ${server.workDir}/sites
chown ${user}:${group} ${server.workDir}
cat > ${server.workDir}/sites/apps.txt <<EOF
frappe frappe
erpnext erpnext
EOF EOF
cat >/frape-bench/sites/common_site_config.json <<EOF cat > ${server.workDir}/sites/common_site_config.json <<EOF
{ {
"db_host": "localhost", "db_host": "localhost",
"db_port": 3306, "db_port": 3306,
@ -101,32 +134,32 @@ with lib;
"redis_cache": "redis://localhost:6379?db=0", "redis_cache": "redis://localhost:6379?db=0",
"redis_queue": "redis://localhost:6379?db=1", "redis_queue": "redis://localhost:6379?db=1",
"redis_socketio": "redis://localhost:6379?db=2", "redis_socketio": "redis://localhost:6379?db=2",
"socketio_port": 3000 "socketio_port": 12311
} }
EOF EOF
cd "${server.workDir}/sites"
# Upstream initializes the DB with this command # Upstream initializes the DB with this command
# TODO: Make this idempotent
cd /frappe-bench/sites
bench new-site localhost --mariadb-root-password password --admin-password admin bench new-site localhost --mariadb-root-password password --admin-password admin
bench --site localhost install-app erpnext bench --site localhost install-app erpnext
echo "Workdir: $tmp"
# TODO: Run these as systemd units
node $tmp/apps/frappe/socketio.js & node $tmp/apps/frappe/socketio.js &
gunicorn --chdir="$tmp/sites" --bind=0.0.0.0:9090 --threads=4 --workers=2 --worker-class=gthread --worker-tmp-dir=/dev/shm --timeout=120 --preload frappe.app:application
''; '';
serviceConfig = { ExecStart = ''
User = "erpnext"; ${pkgs.python3Packages.gunicorn}/bin/gunicorn frappe.app:application --name ${name} \
NoNewPrivileges = true; --chdir="${server.workDir}/sites" \
Type = "simple"; --user ${user} \
BindReadOnlyPaths = [ --group ${group} \
"${frappe-app}/share/apps/frappe:/frappe-bench/apps/frappe" --bind=${server.bind} \
"${erpnext-app}/share/apps/erpnext:/frappe-bench/apps/erpnext" --pid ${server.workDir}/gunicorn-${name}.pid \
"${frappe-erpnext-assets}/share/sites/assets:/frappe-bench/sites/assets" --threads=4 \
# "${penv}:/frappe-bench/env" --workers=2 \
]; --worker-class=gthread \
--worker-tmp-dir=/dev/shm \
--timeout=120 \
--preload
'';
}; };
}; };
system.stateVersion = "23.11";
}; };
} }