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: 5f51c52660e1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0bc0823ff72c
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 22, 2020

  1. conan: Reformat inputs list

    @nh2
    nh2 committed Mar 22, 2020
    Copy the full SHA
    3a158da 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
    @nh2
    nh2 committed Mar 22, 2020
    Copy the full SHA
    03d5611 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).
    @nh2
    nh2 committed Mar 22, 2020
    Copy the full SHA
    3e60781 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
    @nh2
    nh2 committed Mar 22, 2020
    Copy the full SHA
    f460e62 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Merge pull request #83144 from nh2/conan-1.23.0 

    Conan 1.23.0
    @nh2
    nh2 committed Mar 26, 2020
    Copy the full SHA
    0bc0823 View commit details
    Browse the repository at this point in the history