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

feat: NixOS 23.11, fix python flit format

Browse source
This commit is contained in:
teutat3s 2024-01-06 11:49:51 +01:00
parent 2a1a5ce8ee
commit 19559562b2
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
flake.lock
View file

@ -6,14 +6,15 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689334118, "lastModified": 1703433843,
"narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +31,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673295039, "lastModified": 1700795494,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688380630, "lastModified": 1701787589,
"narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +76,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682203081, "lastModified": 1703113217,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,16 +91,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689503327, "lastModified": 1704295289,
"narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f64b9738da8e86195766147e9752c67fccee006c", "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -109,7 +110,7 @@
"agenix": "agenix", "agenix": "agenix",
"devshell": "devshell", "devshell": "devshell",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems" "systems": "systems_2"
} }
}, },
"systems": { "systems": {
@ -126,6 +127,21 @@
"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",

3
flake.nix
View file

@ -2,7 +2,7 @@
description = "Dev Setup"; description = "Dev Setup";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
@ -44,6 +44,7 @@
# Add additional packages you'd like to be available in your devshell # Add additional packages you'd like to be available in your devshell
# PATH here # PATH here
devshell.packages = with pkgs; [ devshell.packages = with pkgs; [
jq
]; ];
commands = [ commands = [
{ {

5
python/erpnext.nix
View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonRelaxDepsHook , pythonRelaxDepsHook
, flit-core
# Core dependencies # Core dependencies
, pycountry , pycountry
@ -34,9 +35,9 @@ buildPythonPackage rec {
sha256 = erpnextSrcHash; sha256 = erpnextSrcHash;
}; };
format = "flit"; format = "pyproject";
nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeBuildInputs = [ pythonRelaxDepsHook flit-core ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"pycountry" "pycountry"
"rapidfuzz" "rapidfuzz"

5
python/frappe.nix
View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, pythonRelaxDepsHook , pythonRelaxDepsHook
, fetchFromGitHub , fetchFromGitHub
, flit-core
# Core dependencies # Core dependencies
, babel , babel
@ -96,9 +97,9 @@ buildPythonPackage rec {
sha256 = frappeSrcHash; sha256 = frappeSrcHash;
}; };
format = "flit"; format = "pyproject";
nativeBuildInputs = [ pythonRelaxDepsHook ]; nativeBuildInputs = [ pythonRelaxDepsHook flit-core ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"Babel" "Babel"
"beautifulsoup4" "beautifulsoup4"