diff --git a/pkgs/by-name/om/omniorbpy/package.nix b/pkgs/development/python-modules/omniorbpy/default.nix similarity index 52% rename from pkgs/by-name/om/omniorbpy/package.nix rename to pkgs/development/python-modules/omniorbpy/default.nix index a288dc34c648..c541ddd2ba7d 100644 --- a/pkgs/by-name/om/omniorbpy/package.nix +++ b/pkgs/development/python-modules/omniorbpy/default.nix @@ -1,54 +1,58 @@ { lib, - stdenv, + buildPythonPackage, fetchurl, omniorb, pkg-config, - python3, + python, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "omniorbpy"; version = "4.3.2"; + pyproject = false; src = fetchurl { - url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2"; + url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2"; hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs="; }; - nativeBuildInputs = [ - pkg-config + outputs = [ + "out" + "dev" ]; - propagatedBuildInputs = [ - omniorb - ]; + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ omniorb ]; configureFlags = [ "--with-omniorb=${omniorb}" "PYTHON_PREFIX=$out" - "PYTHON=${lib.getExe python3}" + "PYTHON=${python.interpreter}" ]; # Transform omniidl_be into a PEP420 namespace postInstall = '' - rm $out/${python3.sitePackages}/omniidl_be/__init__.py - rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc + rm $out/${python.sitePackages}/omniidl_be/__init__.py + rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc ''; # Ensure both python & cxx backends are available - doInstallCheck = true; - postInstallCheck = '' - export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH - ${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python" - ''; - + pythonImportsCheck = [ + "omniidl_be.cxx" + "omniidl_be.python" + "omniORB" + ]; meta = with lib; { description = "Python backend for omniorb"; homepage = "http://omniorb.sourceforge.net"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; + license = with licenses; [ + gpl2Plus + lgpl21Plus + ]; maintainers = with maintainers; [ nim65s ]; platforms = platforms.unix; }; -}) +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9231aecd6e8..32b947ce2e1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9190,6 +9190,8 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omniorbpy = callPackage ../development/python-modules/omniorbpy { }; + omorfi = callPackage ../development/python-modules/omorfi { }; omrdatasettools = callPackage ../development/python-modules/omrdatasettools { };