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

flake: set nixpkgs to nixos-23.05

Browse source 
This change makes the nixos module more compatible with pub-solar/os
This commit is contained in:
teutat3s 2023-07-18 02:30:30 +02:00
parent 9c8a36de8b
commit 5519e0d6fe
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -90,16 +90,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689534811, "lastModified": 1689503327,
"narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "rev": "f64b9738da8e86195766147e9752c67fccee006c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "Dev Setup"; description = "Dev Setup";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";

2
modules/erpnext.nix
View file

@ -204,7 +204,7 @@ in
redis_socketio = "redis://${cfg.redis.host}:${toString cfg.redis.port}?db=0"; redis_socketio = "redis://${cfg.redis.host}:${toString cfg.redis.port}?db=0";
socketio_port = "${toString cfg.socketIoPort}"; socketio_port = "${toString cfg.socketIoPort}";
}; };
commonSiteConfigFile = pkgs.writeText "erpnext-common_site_config.json" (builtins.toJSON commonSiteConfig); commonSiteConfigFile = pkgs.writeText "erpnext-common_site_config.json" (builtins.toJSON commonSiteConfig);
defaultServiceConfig = { defaultServiceConfig = {
User = cfg.user; User = cfg.user;

1
python/frappe.nix
View file

@ -126,6 +126,7 @@ buildPythonPackage rec {
"pypng" "pypng"
"pytz" "pytz"
"redis" "redis"
"requests"
"rq" "rq"
"tenacity" "tenacity"
"WeasyPrint" "WeasyPrint"