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: 8d7f2c7f3ed3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c0fcb53d9b0c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 1, 2019

  1. python3Packages.scikit-build: fix build 

    Build broke as it's attempted to run the cmake configure-phase which
won't work as this package uses cmake, but builds via a `setup.py`
rather than a `CMakeLists.txt`.

ZHF #68361

(cherry picked from commit f8c6b82)
    @Ma27
    Ma27 committed Oct 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c0fcb53 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/development/python-modules/scikit-build/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/scikit-build/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@ buildPythonPackage rec {
requests flake8
];

dontUseCmakeConfigure = true;

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