From c33c576212b13e64a5d1536f4ec063651b7a4d2d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 17:38:11 -0400 Subject: [PATCH] pythonPackages.pivy: refactor move to python-modules --- .../python-modules/pivy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 12 +-------- 2 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/pivy/default.nix diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix new file mode 100644 index 000000000000..ee02f2cb5d23 --- /dev/null +++ b/pkgs/development/python-modules/pivy/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchhg +, pkgs +, isPy3k +}: + +buildPythonPackage rec { + version = "20101207"; + pname = "pivy"; + disabled = isPy3k; # Judging from SyntaxError + + src = fetchhg { + url = "https://bitbucket.org/Coin3D/pivy"; + rev = "8eab90908f2a3adcc414347566f4434636202344"; + sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; + }; + + buildInputs = [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; + + meta = with stdenv.lib; { + homepage = http://pivy.coin3d.org/; + description = "A Python binding for Coin"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 008001d3a6e8..6eb00ad092dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4635,17 +4635,7 @@ in { hypchat = callPackage ../development/python-modules/hypchat { }; - pivy = buildPythonPackage rec { - version = "20101207"; - name = "pivy-${version}"; - src = pkgs.fetchhg { - url = "https://bitbucket.org/Coin3D/pivy"; - rev = "8eab90908f2a3adcc414347566f4434636202344"; - sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; - }; - disabled = isPy3k; # Judging from SyntaxError - buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; - }; + pivy = callPackage ../development/python-modules/pivy { }; smugpy = callPackage ../development/python-modules/smugpy { };