diff --git a/flake.lock b/flake.lock index ce6440f..8a15ee8 100644 --- a/flake.lock +++ b/flake.lock @@ -6,14 +6,15 @@ "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1689334118, - "narHash": "sha256-djk5AZv1yU84xlKFaVHqFWvH73U7kIRstXwUAnDJPsk=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "0d8c5325fc81daf00532e3e26c6752f7bcde1143", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -30,11 +31,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -54,11 +55,11 @@ ] }, "locked": { - "lastModified": 1688380630, - "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", + "lastModified": 1701787589, + "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=", "owner": "numtide", "repo": "devshell", - "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", + "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e", "type": "github" }, "original": { @@ -75,11 +76,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -90,16 +91,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689503327, - "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", + "lastModified": 1704295289, + "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f64b9738da8e86195766147e9752c67fccee006c", + "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -109,7 +110,7 @@ "agenix": "agenix", "devshell": "devshell", "nixpkgs": "nixpkgs", - "systems": "systems" + "systems": "systems_2" } }, "systems": { @@ -126,6 +127,21 @@ "repo": "default", "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", diff --git a/flake.nix b/flake.nix index d5eeb9d..e0a0361 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Dev Setup"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; systems.url = "github:nix-systems/default"; @@ -44,6 +44,7 @@ # Add additional packages you'd like to be available in your devshell # PATH here devshell.packages = with pkgs; [ + jq ]; commands = [ { diff --git a/python/erpnext.nix b/python/erpnext.nix index 27f665a..3f45bd9 100644 --- a/python/erpnext.nix +++ b/python/erpnext.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonRelaxDepsHook +, flit-core # Core dependencies , pycountry @@ -34,9 +35,9 @@ buildPythonPackage rec { sha256 = erpnextSrcHash; }; - format = "flit"; + format = "pyproject"; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ pythonRelaxDepsHook flit-core ]; pythonRelaxDeps = [ "pycountry" "rapidfuzz" diff --git a/python/frappe.nix b/python/frappe.nix index d8a2ffc..9cf6fb3 100644 --- a/python/frappe.nix +++ b/python/frappe.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonRelaxDepsHook , fetchFromGitHub +, flit-core # Core dependencies , babel @@ -96,9 +97,9 @@ buildPythonPackage rec { sha256 = frappeSrcHash; }; - format = "flit"; + format = "pyproject"; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ pythonRelaxDepsHook flit-core ]; pythonRelaxDeps = [ "Babel" "beautifulsoup4"