From d32e0ff9e08c584844eb8cdd8b7bc35cd94c78cc Mon Sep 17 00:00:00 2001 From: Igor Brylyov Date: Sun, 3 Sep 2023 23:24:37 +0300 Subject: [PATCH] add test-script for python debug --- flake.lock | 75 +------------------ flake.nix | 8 +- .../python-modules/test-script/default.nix | 25 +++++++ 3 files changed, 34 insertions(+), 74 deletions(-) create mode 100644 pkgs/development/python-modules/test-script/default.nix diff --git a/flake.lock b/flake.lock index bb41b35..85a3495 100644 --- a/flake.lock +++ b/flake.lock @@ -19,21 +19,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -51,42 +36,7 @@ "type": "github" } }, - "mach-nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "pypi-deps-db": "pypi-deps-db" - }, - "locked": { - "lastModified": 1623312259, - "narHash": "sha256-RkqyGWezwVOII2LTJFKVH6UXjSXybMucbuyOjFWiSdE=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "ca166a5062e26f6852ff0a6e854fd7563a48afe4", - "type": "github" - }, - "original": { - "id": "mach-nix", - "ref": "conda-beta", - "type": "indirect" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1622797669, - "narHash": "sha256-xIyWeoYExzF0KNaKcqfxEX58fN4JTIQxTJWbsAujllc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1690924695, "narHash": "sha256-1yshNzds/qJztMoJk0Sa2xhKwSLaOAuepR6ABWbrgRU=", @@ -102,7 +52,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1687112859, "narHash": "sha256-oJhMiKnJeb47gTxyyIgAJf+aWC4IbVmG3wgL3ZVJ0Eg=", @@ -118,34 +68,17 @@ "type": "github" } }, - "pypi-deps-db": { - "flake": false, - "locked": { - "lastModified": 1622970040, - "narHash": "sha256-u//RFnae/XMIhoy83G2uH2Qu/1LiUhVCdwwY1xj4Ufs=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "be6591698c67a86a69c81fef72167e38d038a9fc", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "mach-nix": "mach-nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "ros-flake": "ros-flake" } }, "ros-flake": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1690347395, diff --git a/flake.nix b/flake.nix index 6c89ba5..b79c81b 100644 --- a/flake.nix +++ b/flake.nix @@ -35,15 +35,17 @@ }); # robossembler custom packages; defined here for share between devShells and packages - blender = pkgs.callPackage ./pkgs/misc/blender { }; + blender = pkgs.callPackage ./pkgs/misc/blender + { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; bpy = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/bpy { }; pysdf = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/pysdf { }; mayo = pkgs.libsForQt5.callPackage ./pkgs/misc/mayo { }; darknet = pkgs.callPackage ./pkgs/misc/darknet { }; fstl = pkgs.libsForQt5.callPackage ./pkgs/misc/fstl { }; - open3d = pkgs.callPackage ./open3d.nix { }; + open3d = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/open3d { }; unified-planning = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/unified-planning { }; blenderproc = pkgs.python3Packages.callPackage ./blenderproc.nix { }; + test-script = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/test-script { }; webdataset = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/webdataset { }; ansitable = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/ansitable { }; megapose6d = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/megapose6d { webdataset = webdataset; }; @@ -61,7 +63,7 @@ }; packages = { - inherit mayo blender bpy pysdf fstl darknet unified-planning slic3r megapose6d; + inherit mayo blender bpy pysdf fstl darknet unified-planning slic3r megapose6d test-script; gazebo = ros.humble.gazebo; }; diff --git a/pkgs/development/python-modules/test-script/default.nix b/pkgs/development/python-modules/test-script/default.nix new file mode 100644 index 0000000..837bdb6 --- /dev/null +++ b/pkgs/development/python-modules/test-script/default.nix @@ -0,0 +1,25 @@ +{ writers, python3Packages }: +writers.writePython3Bin "test-script" { libraries = []; } '' +import sys +import os + + +def my_function(): + arg = sys.argv[1] + number = int(arg) + if (number == 1): + os.makedirs('13') + if (number == 2): + raise Exception("error") + if (number == 3): + print(200) + print(200) + print(200) + print(200) + print(200) + print(200) + + +if __name__ == '__main__': + my_function() +'' \ No newline at end of file