b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python3Packages.pythonix: 0.1.6 -> 0.1.7, fix python module

Browse source 
Pythonix uses the same python as meson, so we need to override
meson to use the right python version or the module won't import.

Also added a pythonImportsCheck to prevent regressions.

Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
Ryan Burns 2021-01-02 12:22:42 -08:00
parent 52a4a170b9
commit f3074391a1
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/python-modules/pythonix/default.nix
View file

@ -1,23 +1,31 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }:
{ stdenv, buildPythonPackage, fetchFromGitHub, ninja, boost, meson, pkg-config, nix, isPy3k, python }:
buildPythonPackage rec {
pname = "pythonix";
version = "0.1.6";
version = "0.1.7";
format = "other";
src = fetchFromGitHub {
owner = "Mic92";
repo = "pythonix";
rev = "v${version}";
sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5";
sha256 = "1wxqv3i4bva2qq9mx670bcx0g0irjn68fvk28dwvhay9ndwcspqf";
};
disabled = !isPy3k;
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ nix boost ];
postInstall = ''
# This is typically set by pipInstallHook/eggInstallHook,
# so we have to do so manually when using meson
export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
'';
pythonImportsCheck = [ "nix" ];
meta = with stdenv.lib; {
description = ''
Eval nix code from python.

5
pkgs/top-level/python-packages.nix
View file

@ -6007,7 +6007,10 @@ in {
pythonIRClib = callPackage ../development/python-modules/pythonirclib { };
pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; };
pythonix = callPackage ../development/python-modules/pythonix {
inherit (pkgs) pkg-config;
meson = pkgs.meson.override { python3 = self.python; };
};
python-jenkins = callPackage ../development/python-modules/python-jenkins { };