Commit Graph

2550 Commits

Author SHA1 Message Date
github-actions[bot]
129083edcf
Merge master into staging-next 2021-12-29 06:01:11 +00:00
Jonathan Ringer
4879b9c8bd
ant: fix redirect 2021-12-28 08:52:19 -08:00
github-actions[bot]
2e759d4fd0
Merge master into staging-next 2021-12-28 12:01:23 +00:00
Jörg Thalheim
e0f45563cd
Merge pull request #152305 from r-ryantm/auto-update/bazel-remote
bazel-remote: 2.3.1 -> 2.3.3
2021-12-28 07:21:50 +00:00
Jörg Thalheim
1c854f5f0a
Merge pull request #152118 from r-ryantm/auto-update/mage
mage: 1.11.0 -> 1.12.1
2021-12-28 07:15:49 +00:00
JesusMtnez
ad4a23c292
sbt: 1.5.8 -> 1.6.0 2021-12-28 05:38:25 +01:00
github-actions[bot]
ae39fad8d0
Merge master into staging-next 2021-12-27 12:08:21 +00:00
Bobby Rong
22758bb8cb
Merge pull request #152110 from r-ryantm/auto-update/mill
mill: 0.9.10 -> 0.9.11
2021-12-27 17:46:09 +08:00
R. Ryantm
ee250452c4 bazel-remote: 2.3.1 -> 2.3.3 2021-12-27 01:39:10 +00:00
Dmitry Kalinkin
2ddda43924
Merge branch 'staging' into staging-next
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
Sergei Trofimovich
653ff61cb6
cmake: 3.21.2 -> 3.22.1 (#147818)
https://cmake.org/cmake/help/latest/release/3.22.html

Co-authored-by: Winter <winter@winter.cafe>
2021-12-25 17:06:52 -05:00
R. Ryantm
d077e20cb3 mage: 1.11.0 -> 1.12.1 2021-12-25 17:39:37 +00:00
Vladimír Čunát
dfc501756b
Merge #148396: staging-next iteration 2021-12-03 2021-12-25 18:03:46 +01:00
R. Ryantm
fb5e054a5c mill: 0.9.10 -> 0.9.11 2021-12-25 16:26:40 +00:00
R. Ryantm
8ff4f43381 bazel-remote: 2.3.0 -> 2.3.1 2021-12-24 01:35:09 +00:00
Jonathan Ringer
182e07f0d9
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/webkitgtk/default.nix
	pkgs/development/python-modules/pylast/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
2021-12-23 10:16:42 -08:00
Jonathan Ringer
5ed396a912
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
2021-12-23 10:14:19 -08:00
7c6f434c
49830d258c
Merge pull request #151790 from lorenzleutgeb/gradle
gradle: 7.3.2 -> 7.3.3, 6.9.1 -> 6.9.2, pdftk: 3.3.1 -> 3.3.2
2021-12-23 16:07:16 +00:00
Thiago Kenji Okada
f0d2218218
Merge pull request #151810 from r-ryantm/auto-update/qbs
qbs: 1.20.1 -> 1.21.0
2021-12-23 12:05:42 -03:00
R. Ryantm
81e63c985d sbt: 1.5.7 -> 1.5.8 2021-12-23 08:58:19 -05:00
Lorenz Leutgeb
fecc39fcc0 gradle: 7.3.2 -> 7.3.3, 6.9.1 -> 6.9.2 2021-12-23 14:20:48 +01:00
github-actions[bot]
0c6795fa5b
Merge master into staging-next 2021-12-23 00:01:33 +00:00
Bernardo Meurer
f403d1f791
Merge pull request #150767 from Flakebi/rocm 2021-12-22 23:35:22 +00:00
R. Ryantm
07ba360430 qbs: 1.20.1 -> 1.21.0 2021-12-22 19:15:34 +00:00
github-actions[bot]
39d035c4cf
Merge master into staging-next 2021-12-22 00:01:35 +00:00
Luke Granger-Brown
b4d776b26b
Merge pull request #138359 from lukegb/pomerium
pomerium: 0.14.7 -> 0.15.7
2021-12-21 13:47:13 -08:00
github-actions[bot]
842f26c1de
Merge master into staging-next 2021-12-21 06:01:23 +00:00
Uri Baghin
72e45af374
Merge pull request #151503 from timothyklim/bazel-4.2.2
bazel_4: 4.2.1 -> 4.2.2
2021-12-21 16:02:06 +11:00
Timothy
13c152bb1c bazel_4: 4.2.1 -> 4.2.2 2021-12-21 10:19:05 +07:00
Dmitry Kalinkin
ac40a963c9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/applications/editors/vim/common.nix
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
2021-12-20 12:09:28 -05:00
Uri Baghin
d2a93c1fc1
Merge pull request #146389 from ylecornec/ylecornec/bazel_bash_fix
Consistent PATH between ctx.actions.run and ctx.actions.run_shell
2021-12-20 10:00:16 +11:00
github-actions[bot]
3479555209
Merge staging-next into staging 2021-12-19 18:01:44 +00:00
Dmitry Kalinkin
bbea48728b
Merge pull request #151151 from veprbl/pr/libcxx_no_apple_availability
llvmPackages.libcxx: unset _LIBCPP_USE_AVAILABILITY_APPLE
2021-12-19 11:42:28 -05:00
github-actions[bot]
46528ab039
Merge staging-next into staging 2021-12-19 06:01:51 +00:00
github-actions[bot]
2e447628d8
Merge master into staging-next 2021-12-19 06:01:16 +00:00
Bobby Rong
6432efa3a7
Merge pull request #151198 from nthorne/conan-1.43.1
conan: 1.40.0 -> 1.43.1
2021-12-19 12:55:12 +08:00
Dmitry Kalinkin
0cf94e8de4
Merge branch 'staging-next' into staging 2021-12-18 10:19:31 -05:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
Anderson Torres
a860b94c20
Merge pull request #150486 from AndersonTorres/new-meson
Meson: 0.57.1 -> 0.60.2
2021-12-18 12:10:04 -03:00
Dmitry Kalinkin
e1aaaa90fe
llvmPackages.libcxx: unset _LIBCPP_USE_AVAILABILITY_APPLE 2021-12-18 10:09:25 -05:00
Niklas Thörne
a8a7e5af8d conan: 1.40.0 -> 1.43.1 2021-12-18 15:42:33 +01:00
panicgh
f8d75f3257
waf: 2.0.22 -> 2.0.23 (#151083) 2021-12-17 16:26:49 -05:00
Yves-Stan Le Cornec
cd842a9e42 bazel_4: remove duplicated python paths from the nix-support/depends file. 2021-12-17 08:47:00 +01:00
Alyssa Ross
e07182012b
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/pint/default.nix
2021-12-17 05:50:06 +00:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Profpatsch
924725cc9a bazel: add README file to point to the maintainers team. 2021-12-16 17:47:34 +01:00
Profpatsch
5238c41fa0 team-list: add bazel team
(refactor)

We are going to set up a maintenance team for bazel & tools.
2021-12-16 17:47:34 +01:00
Yves-Stan Le Cornec
ee62812f01 bazel_4: add default tools to buildInputs (to be accessible from repository rules)
Previously the customBash wrapper added the default tools to the PATH of commands from repository rules (which are run in the same environment as Bazel).
2021-12-16 10:25:31 +01:00
github-actions[bot]
2d77c6ead6
Merge master into staging-next 2021-12-16 00:01:38 +00:00
github-actions[bot]
3e2d1c1e65
Merge staging-next into staging 2021-12-15 18:01:52 +00:00