Commit Graph

46 Commits

Author SHA1 Message Date
Robert Schütz
fe8a3f1ff8 conan: 1.47.0 -> 1.49.0 2022-06-13 17:57:32 +00:00
Bjørn Forsman
1a99b8ed14 conan: 1.43.1 -> 1.47.0
I went through the pinned python deps, as the build initially failed:

  ERROR: No matching distribution found for Jinja2<4.0.0,>=3.0; python_version >= "3"

But only jinja2 (and markupsafe) could be unpinned/upgraded, the other
deps were already on their newest version that conan supports.
2022-04-18 16:13:05 +02:00
Bjørn Forsman
0d1c745d7a conan: pin distro==1.5.0 to fix build
Or else the build fails with

  ERROR: No matching distribution found for distro<=1.6.0,>=1.0.2

since distro==1.7.0 in nixpkgs now.
2022-04-18 16:12:21 +02:00
Alexander Krimm
dfdb5a946d conan: remove PyYAML version restriction 2022-01-11 20:55:40 +00:00
Niklas Thörne
a8a7e5af8d conan: 1.40.0 -> 1.43.1 2021-12-18 15:42:33 +01:00
Luke Granger-Brown
fc77b402c0 conan: 1.35.0 -> 1.40.0 2021-09-11 03:24:26 +00:00
Robert Schütz
a5de6179cb
Merge pull request #129137 from bjornfor/fix-conan
conan: fix build after python3Packages updates
2021-07-04 13:12:03 +02:00
Bjørn Forsman
9b16b5e381 conan: fix build after python3Packages updates
conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides
results in this build error:

  $ nix-build -A conan
  ...
  Found duplicated packages in closure for dependency 'six':
    six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages)
    six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages)

As the changes in six-1.16.0 look harmless, work around the above issue
by allowing conan to use six-1.16.0.
2021-07-03 20:45:13 +02:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Alexander Krimm
362bc6785a Fix conan build caused by failing pyjwt
Ignore a failing thest in the downgraded pyjwt dependency.
See #122461 for another instance of the same problem.
2021-05-12 23:01:52 +02:00
Bjørn Forsman
9ba09d80e1
conan: unbreak by downgrading pyjwt (#121802)
Pin pyjwt to 1.7.1 (the last of the 1.x series) to fix building conan:

  ERROR: Could not find a version that satisfies the requirement PyJWT<2.0.0,>=1.4.0 (from conan)

Ref. upstream issue https://github.com/conan-io/conan/issues/8876.
2021-05-05 15:52:56 +02:00
Aaron Andersen
17c66529f6 conan: 1.27.0 -> 1.35.0 2021-04-06 22:40:32 -04:00
Mario Rodas
a1a6da5418 conan: fix build on darwin 2021-02-27 04:20:00 +00:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Drew Risinger
2396eb646d conan: 1.25.0 -> 1.27.0
Switch to fetching source from GitHub vs PyPi, which will enable running
packaging tests in the future.
2020-07-01 12:45:39 -07:00
Drew Risinger
ea5a79c4a3 conan: enable pythonPackages.six > 1.14.0 2020-07-01 12:45:39 -07:00
Drew Risinger
4454ca488c conan: 1.24.0 -> 1.25.0 2020-05-06 11:14:32 -07:00
Drew Risinger
cae48ccad3 conan: unbreak with deprecation>=2.1 2020-05-06 09:46:18 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jonathan Ringer
3583757685 conan: 1.23.0 -> 1.24.0 2020-04-07 10:50:55 -07:00
Niklas Hambüchen
f460e62d9b 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
  https://github.com/conan-io/conan/issues/4563
2020-03-22 16:34:55 +01:00
Niklas Hambüchen
03d5611ae0 conan: Remove unnecessary patching.
The pluginbase dependency is now pinned further up with commit

    244fcfc8 - conan: pin pluginbase to 0.7
2020-03-22 16:03:44 +01:00
Niklas Hambüchen
3a158da8e8 conan: Reformat inputs list 2020-03-22 15:45:49 +01:00
Jonathan Ringer
542af6df87 conan: 1.12.0 -> 1.12.3
Remove PyYAML_3
2019-11-19 09:05:12 -08:00
Frederik Rietdijk
3d00d8e4ee pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
2019-07-25 11:51:55 +02:00
Matthew Bauer
8c131d6930
Merge pull request #58182 from status-im/fix-conan
conan: fix pluginbase version requirement
2019-05-31 21:50:19 -04:00
Robert Schütz
f328510af6 conan: pin pyyaml to 3.13
Upstream requires
    PyYAML>=3.11, <3.14.0
2019-04-03 16:25:02 +02:00
Robert Schütz
244fcfc85c conan: pin pluginbase to 0.7
Upstream requires
    pluginbase>=0.5, < 1.0
2019-04-03 16:15:23 +02:00
Pedro Pombeiro
ca2e283a28
conan: fix pluginbase version requirement 2019-03-23 19:23:28 +01:00
R. RyanTM
7c860b5fd8 conan: 1.11.2 -> 1.12.0 (#55335)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/conan/versions
2019-02-14 21:53:05 +01:00
Jörg Thalheim
2eaadfa5be
conan: fix distro package version 2019-01-16 12:23:59 +00:00
HaoZeke
efe4a6d205
conan: 1.6.0 -> 1.11.2 2019-01-09 19:33:29 +05:30
Robert Schütz
a576b2ea64 conan: 1.5.2 -> 1.6.0 2018-07-26 12:43:17 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
R. RyanTM
b4d9f481f5 conan: 1.5.1 -> 1.5.2 (#43354)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/conan/versions.
2018-07-11 18:34:17 +02:00
R. RyanTM
88a183f574 conan: 1.4.5 -> 1.5.1 (#43032)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/conan/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/.conan_server-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/conan_server had a zero exit code or showed the expected version
- /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/.conan_build_info-wrapped passed the binary check.
- /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/conan_build_info passed the binary check.
- Warning: no invocation of /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/.conan-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1/bin/conan had a zero exit code or showed the expected version
- 2 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.5.1 with grep in /nix/store/c92p18la19jbr7ya0ml77gn6z9c9zagn-conan-1.5.1
- directory tree listing: https://gist.github.com/097b90f575be6117eceec5c70235c405
- du listing: https://gist.github.com/54f8f4a3882e828289ab5b96dd0fa338
2018-07-05 14:20:17 +02:00
R. RyanTM
6ab9ba6997 conan: 1.4.4 -> 1.4.5 (#42517)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/conan/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan_server-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan_server had a zero exit code or showed the expected version
- /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan_build_info-wrapped passed the binary check.
- /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan_build_info passed the binary check.
- Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/.conan-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5/bin/conan had a zero exit code or showed the expected version
- 2 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.4.5 with grep in /nix/store/gid7f7w71lbiissjcbjsjvlxhmix6i94-conan-1.4.5
- directory tree listing: https://gist.github.com/25fd7dbaab3b2c2b870221856de5199b
- du listing: https://gist.github.com/b94750efe01cb63b9541d4b897485f62
2018-06-24 20:15:14 +02:00
Frederik Rietdijk
9e10e51161 conan: fix build 2018-06-22 13:09:51 +02:00
R. RyanTM
863f11c18d conan: 1.2.3 -> 1.4.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/conan/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/.conan_server-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/conan_server had a zero exit code or showed the expected version
- /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/.conan_build_info-wrapped passed the binary check.
- /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/conan_build_info passed the binary check.
- Warning: no invocation of /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/.conan-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4/bin/conan had a zero exit code or showed the expected version
- 2 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.4.4 with grep in /nix/store/pdza6q7n1rywgra2022zvbi05fj47kjy-conan-1.4.4
- directory tree listing: https://gist.github.com/0da299922c958da51520fdd195a2d369
- du listing: https://gist.github.com/7e5d6a9b06f35b233151c026f6dd089b
2018-06-14 08:49:27 -07:00
Robert Schütz
13dadd48b5 conan: 1.1.1 -> 1.2.3 2018-04-12 15:08:22 +02:00
Timo Kaufmann
488835ec6e conan: Locally pin deps, enable tests 2018-03-15 13:48:58 +01:00
Timo Kaufmann
5fdfe61b35 conan: Fix build
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
2018-03-13 11:36:45 +01:00
Orivej Desh
3ff2a789c2 conan: 0.26.1 -> 0.28.1 2017-11-13 19:12:08 +00:00
Frederik Rietdijk
b1504b444b conan: 0.21.2 -> 0.26.2, and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
mucaho
8d5e55a0f0 conan: init at 0.21.2 2017-04-13 03:43:21 +02:00