diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix similarity index 70% rename from pkgs/development/tools/remarshal/default.nix rename to pkgs/development/python-modules/remarshal/default.nix index 67137fb1ed93..90024e732576 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -1,15 +1,21 @@ -{ lib, python3Packages }: +{ lib, buildPythonApplication, fetchPypi +, cbor2 +, python-dateutil +, pyyaml +, tomlkit +, u-msgpack-python +}: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "remarshal"; version = "0.14.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "16425aa1575a271dd3705d812b06276eeedc3ac557e7fd28e06822ad14cd0667"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4330bda4c683..023d6f7da5b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8355,7 +8355,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - remarshal = callPackage ../development/tools/remarshal { }; + remarshal = with python3Packages; toPythonApplication remarshal; rehex = callPackage ../applications/editors/rehex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50f4bf108def..2ef3b52af0a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7641,6 +7641,8 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; + remarshal = callPackage ../development/python-modules/remarshal { }; + rencode = callPackage ../development/python-modules/rencode { }; reparser = callPackage ../development/python-modules/reparser { };