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

Commits on May 7, 2020

  1. conan: Reformat inputs list 

    (cherry picked from commit 3a158da)
    @nh2 @jonringer
    nh2 authored and jonringer committed May 7, 2020
    Copy the full SHA
    9c9e733 View commit details
    Browse the repository at this point in the history

  2. conan: Remove unnecessary patching. 

    The pluginbase dependency is now pinned further up with commit

    244fcfc - conan: pin pluginbase to 0.7

(cherry picked from commit 03d5611)
    @nh2 @jonringer
    nh2 authored and jonringer committed May 7, 2020
    Copy the full SHA
    17a6a31 View commit details
    Browse the repository at this point in the history

  3. pythonPackages.patch-ng: Init at 1.17.2. 

    Newer versions of `conan` need it.

Adding @HaoZeke as maintainer (is Conan maintainer).

(cherry picked from commit 3e60781)
    @nh2 @jonringer
    nh2 authored and jonringer committed May 7, 2020
    Copy the full SHA
    b2a6334 View commit details
    Browse the repository at this point in the history

  4. conan: 1.12.3 -> 1.23.0 

    * remove pinned dependencies where nixpkgs provides a version
  in the acceptable range
* disable tests;
  they are no longer in the Pypi archive, see
  conan-io/conan#4563

(cherry picked from commit f460e62)
    @nh2 @jonringer
    nh2 authored and jonringer committed May 7, 2020
    Copy the full SHA
    0d51e3e View commit details
    Browse the repository at this point in the history

  5. python27Packages.patch-ng: 1.17.2 -> 1.17.4 

    (cherry picked from commit b914c28)
    @r-ryantm @jonringer
    r-ryantm authored and jonringer committed May 7, 2020
    Copy the full SHA
    1105bd8 View commit details
    Browse the repository at this point in the history

  6. conan: 1.23.0 -> 1.24.0 

    (cherry picked from commit 3583757)
    @jonringer
    jonringer committed May 7, 2020
    Copy the full SHA
    14a46ab View commit details
    Browse the repository at this point in the history

  7. conan: unbreak with deprecation>=2.1 

    (cherry picked from commit cae48cc)
    @drewrisinger @jonringer
    drewrisinger authored and jonringer committed May 7, 2020
    Copy the full SHA
    1943801 View commit details
    Browse the repository at this point in the history

  8. conan: 1.24.0 -> 1.25.0 

    (cherry picked from commit 4454ca4)
    @drewrisinger @jonringer
    drewrisinger authored and jonringer committed May 7, 2020
    Copy the full SHA
    c4086f6 View commit details
    Browse the repository at this point in the history

  9. conan: unmark as broken

    @bjornfor @jonringer
    bjornfor authored and jonringer committed May 7, 2020
    Copy the full SHA
    3cb7a1c View commit details
    Browse the repository at this point in the history