Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 810a56870b01
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: dde4512da9d1
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 3, 2019

  1. pythonPackages.bleach: add implicit setuptools dependency 

    Fixes error on `python -c "import bleach"`

(cherry picked from commit 31c4f79)
Signed-off-by: Jonathan Ringer <jonringer117@gmail.com>
    @elohmeier
    elohmeier authored and Jonathan Ringer committed Oct 3, 2019
    Copy the full SHA
    014afee View commit details
    Browse the repository at this point in the history

  2. python3Packages.asdf: 2.3.3 -> 2.4.2 

    Bump to fix the broken build of the package:

* Disable doctest as they're currently broken in our test env
* Loosen version constraint for `semantic_version` as it was only
  introduced to work around some deprecation warnings[1]

See also: https://hydra.nixos.org/build/102480957

ZHF #68361

[1] asdf-format/asdf@3446ae0

(cherry picked from commit 06041fd)
    @Ma27
    Ma27 committed Oct 3, 2019
    Copy the full SHA
    5d4d45f View commit details
    Browse the repository at this point in the history

  3. cachix: fix package

    @domenkozar
    domenkozar committed Oct 3, 2019
    Copy the full SHA
    dde4512 View commit details
    Browse the repository at this point in the history