JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #108259 from r-burns/pythonix

Browse Source 
python3Packages.pythonix: 0.1.6 -> 0.1.7, fix python module
This commit is contained in:
Jörg Thalheim 2021-01-06 10:19:43 +00:00 committed by GitHub
commit ce28a489a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -6031,7 +6031,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 { };