Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90529eee7f36
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08bd71704950
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 30, 2020

  1. pythonPackages.scikit-build: fix python3.8 bug 

    Python3.8 removes ``platform.linux_distribution()`` call,
must use ``pythonPackages.distro`` to get same information.
Closes #83305
Upstream PR: https://www.github.com/scikit-build/scikit-build/pull/458
Also formatting.

(cherry picked from commit c8dd834)
    @drewrisinger
    drewrisinger committed Mar 30, 2020
    Copy the full SHA
    53264c9 View commit details

  2. Merge pull request #83774 from drewrisinger/release-20.03 

    [20.03] pythonPackages.scikit-build: fix python3.8 bug
    @bhipple
    bhipple authored Mar 30, 2020
    Copy the full SHA
    08bd717 View commit details
Showing with 58 additions and 11 deletions.
  1. +58 −11 pkgs/development/python-modules/scikit-build/default.nix
69 changes: 58 additions & 11 deletions pkgs/development/python-modules/scikit-build/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
{ lib, buildPythonPackage, fetchPypi, wheel, setuptools, packaging
, cmake, ninja, cython, codecov, coverage, six, virtualenv, pathpy
, pytest, pytestcov, pytest-virtualenv, pytest-mock, pytestrunner
, requests, flake8 }:
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, distro
, packaging
, setuptools
, wheel
# Test Inputs
, cmake
, codecov
, coverage
, cython
, flake8
, ninja
, pathpy
, pytest
, pytestcov
, pytest-mock
, pytestrunner
, pytest-virtualenv
, requests
, six
, virtualenv
}:

buildPythonPackage rec {
pname = "scikit-build";
@@ -12,15 +33,41 @@ buildPythonPackage rec {
sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526";
};

propagatedBuildInputs = [ wheel setuptools packaging ];
checkInputs = [
cmake ninja cython codecov coverage six pathpy
pytest pytestcov pytest-mock pytest-virtualenv pytestrunner
requests flake8
propagatedBuildInputs = [
distro
packaging
setuptools
wheel
];
checkInputs = [
cmake
codecov
coverage
cython
flake8
ninja
pathpy
pytest
pytestcov
pytest-mock
pytestrunner
pytest-virtualenv
requests
six
virtualenv
];

dontUseCmakeConfigure = true;

# scikit-build PR #458. Remove in version > 0.10.0
patches = [
(fetchpatch {
name = "python38-platform_linux_distribution-fix-458";
url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch";
sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv";
})
];

disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
"test_hello_develop" # tries setuptools develop install
"test_source_distribution" # pip has no way to install missing dependencies
@@ -35,9 +82,9 @@ buildPythonPackage rec {
'';

meta = with lib; {
homepage = http://scikit-build.org/;
description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions";
homepage = "http://scikit-build.org/";
license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code
maintainers = [ maintainers.FlorianFranzen ];
maintainers = with maintainers; [ FlorianFranzen ];
};
}