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
base: b61ad0afc2a7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5baf8f95f9aa
Choose a head ref
  • 8 commits
  • 7 files changed
  • 1 contributor

Commits on Aug 26, 2020

  1. Revert "python: sphinx_rtd_theme: 0.4.3 -> 0.5.0" 

    This reverts commit ff21fc4.

sphinx_rtd_theme 0.5.0 requires a significant amount of bootstrapping
with node packages, which are not trivial
    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    258794a View commit details
    Browse the repository at this point in the history

  2. pythonPackages.hieroglyph: disable python2

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    4a3b1f8 View commit details
    Browse the repository at this point in the history

  3. pythonPackages.chalice: fix deps

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    fcb85c4 View commit details
    Browse the repository at this point in the history

  4. pythonPackages.vulture: disable python2

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    baf247e View commit details
    Browse the repository at this point in the history

  5. pythonPackages.xpybutil: disable python2

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    744601b View commit details
    Browse the repository at this point in the history

  6. gdal: 3.0.4 -> 3.1.2.post2020-08-26 

    parsing of POPPLER_MINOR_VERSION is broken, as it doesn't truncate
leading zeroes. Leading gcc to believe it's trying to evaluate an
octal value (e.g. 08 > 72 ). However, 8 isn't a valid octal value.

Patches from master do not apply cleanly do a series of changes
done to configure.ac. So instead, a commit from master was chosen.
    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    bd6bfd5 View commit details
    Browse the repository at this point in the history

  7. python3Packages.xcffib: fix tests

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    09f4d3d View commit details
    Browse the repository at this point in the history

  8. python3Packages.chalice: fix python3 deps

    @FRidh
    Jonathan Ringer authored and FRidh committed Aug 26, 2020
    Copy the full SHA
    5baf8f9 View commit details
    Browse the repository at this point in the history