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

Commits on Nov 28, 2019

  1. pythonPackages.astroquery: fix build 

    The patch from upstream repository has been included in the latest
release (0.3.10), so we don't need it anymore.
    @smaret
    smaret committed Nov 28, 2019

    Unverified

    The key that signed this doesn't have usage flags that allow signing.
    GPG key ID: 86E30E5A0F5FC59C
    Learn about vigilant mode
    Copy the full SHA
    eb16eb5 View commit details

  2. pythonPackages.astroquery: fix build (#74479) 

    pythonPackages.astroquery: fix build
    @Mic92
    Mic92 authored Nov 28, 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
    19c8402 View commit details
Showing with 0 additions and 58 deletions.
  1. +0 −54 pkgs/development/python-modules/astroquery/conftest-astropy-3-fix.patch
  2. +0 −4 pkgs/development/python-modules/astroquery/default.nix
54 changes: 0 additions & 54 deletions pkgs/development/python-modules/astroquery/conftest-astropy-3-fix.patch
View file

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/python-modules/astroquery/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,6 @@ buildPythonPackage rec {
sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab";
};

# Fix tests using conftest.py from HEAD in the upstream GitHub
# repository.
patches = [ ./conftest-astropy-3-fix.patch ];

propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];

nativeBuildInputs = [ astropy-helpers ];