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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1b23dbe6a112
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c131d69304d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 23, 2019

  1. conan: fix pluginbase version requirement

    Pedro Pombeiro committed Mar 23, 2019
    Copy the full SHA
    ca2e283 View commit details

Commits on Jun 1, 2019

  1. Merge pull request #58182 from status-im/fix-conan 

    conan: fix pluginbase version requirement
    @matthewbauer
    matthewbauer authored Jun 1, 2019
    Copy the full SHA
    8c131d6 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/tools/build-managers/conan/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/tools/build-managers/conan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -77,6 +77,11 @@ in newPython.pkgs.buildPythonApplication rec {
mkdir -p "$HOME"
'';

postPatch = ''
substituteInPlace conans/requirements_server.txt \
--replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5"
'';

meta = with lib; {
homepage = https://conan.io;
description = "Decentralized and portable C/C++ package manager";