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: 1d59cdcb2a96
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0752cf064167
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 5, 2020

  1. Remove no longer needed patch.

    @mildlyincompetent
    mildlyincompetent committed Jan 5, 2020

    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
    1b8794e View commit details

  2. Merge pull request #76993 from mildlyincompetent/fix-scikit-build 

    Fix scikit-build by removing no longer needed patch.
    @roberth
    roberth authored Jan 5, 2020

    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
    0752cf0 View commit details
Showing with 0 additions and 16 deletions.
  1. +0 −3 pkgs/development/python-modules/scikit-build/default.nix
  2. +0 −13 pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch
3 changes: 0 additions & 3 deletions pkgs/development/python-modules/scikit-build/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,9 +12,6 @@ buildPythonPackage rec {
sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526";
};

# Fixes incorrect specified requirement (part of next release)
patches = [ ./fix_pytestrunner_req.patch ];

propagatedBuildInputs = [ wheel setuptools packaging ];
checkInputs = [
cmake ninja cython codecov coverage six pathpy
13 changes: 0 additions & 13 deletions pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch
View file

This file was deleted.