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: e036652424ad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: e81788363d82
Choose a head ref
  • 9 commits
  • 6 files changed
  • 5 contributors

Commits on Sep 18, 2020

  1. python3.pkgs.libiio: fix build 

    Add missing setuptools dependency.

(cherry picked from commit ce0a59c)
    @povik
    povik committed Sep 18, 2020
    Copy the full SHA
    cedbe71 View commit details
    Browse the repository at this point in the history

  2. python3.pkgs.cartopy: 0.17 -> 0.18 

    Fixes build. Formerly cartopy tests were failing, likely since update of
matplotlib to 3.3.0.

(cherry picked from commit 2047252)
    @povik
    povik authored and Jon committed Sep 18, 2020
    Copy the full SHA
    0bfcc86 View commit details
    Browse the repository at this point in the history

  3. python3Packages.requests-aws4auth: fix build 

    (cherry picked from commit 5f0f2b8)
    @wkral
    wkral authored and Jon committed Sep 18, 2020
    Copy the full SHA
    344d782 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #98201 from povik/libiio-fix-backport 

    [20.09] python3.pkgs.libiio: fix build
    @risicle
    risicle committed Sep 18, 2020
    Copy the full SHA
    4910c6b View commit details
    Browse the repository at this point in the history

  5. haskell-headed-megaparsec: disable broken build 

    The package needs megaparsec 9.x, which we don't use by default.
    @peti
    peti committed Sep 18, 2020
    Copy the full SHA
    497587a View commit details
    Browse the repository at this point in the history

  6. python3Packages.irc: fix build 

    (cherry picked from commit 7567bd6)
    @wkral
    wkral committed Sep 18, 2020
    Copy the full SHA
    fc18edd View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2020

  1. Merge pull request #98236 from wkral/backport-py-irc 

    [20.09] python3Packages.irc: fix build
    @risicle
    risicle committed Sep 19, 2020
    Copy the full SHA
    c22c22b View commit details
    Browse the repository at this point in the history

  2. python2Packages.hickle: disable 

    ```
  Processing ./hickle-4.0.1-py2-none-any.whl
  ERROR: Package 'hickle' requires a different Python: 2.7.18 not in '>=3.5'
```

(cherry picked from commit f1325cd)
    Jonathan Ringer committed Sep 19, 2020
    Copy the full SHA
    a57cd67 View commit details
    Browse the repository at this point in the history

  3. python3Packages.hickle: disable tests 

    Incompatible with astropy>=4.0

(cherry picked from commit 389ab45)
    Jonathan Ringer committed Sep 19, 2020
    Copy the full SHA
    e817883 View commit details
    Browse the repository at this point in the history