From 628baff52e7d1f7b8abc8bf6acbc54b608474e99 Mon Sep 17 00:00:00 2001 From: Igor Brylyov Date: Tue, 5 Sep 2023 15:26:04 +0300 Subject: [PATCH] Update unified_planning to 1.0.0 and origin github repo --- flake.nix | 9 ++++----- .../python-modules/unified-planning/default.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index b79c81b..f11e76e 100644 --- a/flake.nix +++ b/flake.nix @@ -35,8 +35,7 @@ }); # robossembler custom packages; defined here for share between devShells and packages - blender = pkgs.callPackage ./pkgs/misc/blender - { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; + blender = pkgs.callPackage ./pkgs/misc/blender { }; 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 { }; @@ -112,16 +111,16 @@ devShells.default = let my-python-packages = p: with p; [ - bpy pysdf - unified-planning + unified-planning pybullet scipy spatialmath + bpy ]; in pkgs.mkShell { - packages = [ (pkgs.python3.withPackages my-python-packages) pkgs.freecad mayo ]; + packages = [ (pkgs.python3.withPackages my-python-packages) pkgs.freecad mayo pkgs.bashInteractive ]; buildInputs = [ ]; # Run when the shell is started up diff --git a/pkgs/development/python-modules/unified-planning/default.nix b/pkgs/development/python-modules/unified-planning/default.nix index bfff4d7..540411f 100644 --- a/pkgs/development/python-modules/unified-planning/default.nix +++ b/pkgs/development/python-modules/unified-planning/default.nix @@ -53,14 +53,14 @@ let in buildPythonPackage rec { pname = "unified-planning"; - version = "unstable-2023-03-01"; + version = "1.0.0"; format = "setuptools"; src = fetchFromGitHub { - owner = "movefasta"; + owner = "aiplan4eu"; repo = "unified-planning"; - rev = "e58a76e5a128731112155b52dfb03384272eafab"; - hash = "sha256-KN7br09YYfhdOsuTvnwArW6yOyZ0sZDCt7B0ymbMVqM="; + rev = "f9eba2544d15b26f91880c1e5e274e8597276ba7"; + hash = "sha256-ZBZZQFXCe0q5bPx5wNMCmj5ckGoWi9ybUY41NNtWPLo="; }; propagatedBuildInputs = (with python3.pkgs; [ @@ -81,8 +81,8 @@ buildPythonPackage rec { meta = with lib; { description = "The AIPlan4EU Unified Planning Library"; - homepage = "https://github.com/movefasta/unified-planning"; + homepage = "https://github.com/aiplan4eu/unified-planning"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ movefasta ]; }; }