Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Robert Schütz
0b1ec4bd68
Merge pull request #126940 from SuperSandro2000/websocket_client
...
pythonPackages: websocket_client -> websocket-client
2021-06-16 00:04:27 +02:00
Sandro Jäckel
7b4d273d3c
pythonPackages: websocket_client -> websocket-client
2021-06-15 22:03:10 +02:00
Sandro
72cbd9ea14
Merge pull request #126954 from sikmir/lagrange
...
lagrange: 1.5.0 → 1.5.2
2021-06-15 21:21:39 +02:00
Nikolay Korotkiy
7802cd18cd
lagrange: 1.5.0 → 1.5.2
2021-06-15 17:29:16 +03:00
Stig Palmquist
09b17967b3
convos: 6.11 -> 6.24
2021-06-15 15:00:06 +02:00
j-k
14a592b54b
terragrunt: 0.29.9 -> 0.30.3 ( #126857 )
2021-06-15 05:15:59 -07:00
Michael Weiss
04a1a91857
Merge pull request #126924 from primeos/chromium
...
chromium: 91.0.4472.101 -> 91.0.4472.106
2021-06-15 13:13:21 +02:00
Jonas Chevalier
58fbce466b
Merge pull request #126919 from zimbatm/terraform-cleanup
...
Terraform cleanup
2021-06-15 12:16:43 +02:00
Jonas Chevalier
01127a0527
terraform-providers.kafka: 0.2.12 -> 0.3.3 ( #126880 )
2021-06-15 12:12:13 +02:00
zimbatm
3919d73030
terraform: drop old versions
...
Now that terraform 1.0 is stable, only keep that version.
2021-06-15 12:07:48 +02:00
zimbatm
01b6046594
terraform: switch to 1.0
...
Default to the stable release
2021-06-15 12:05:17 +02:00
zimbatm
355aa90cfc
terraform: export mkTerraform
...
Make the Terraform constructor available for third-party users.
2021-06-15 12:01:06 +02:00
zimbatm
f33e2c5c2b
terraform_1_0_0: rename to terraform_1_0
...
Only use major_minor so we can bump minor versions.
2021-06-15 11:59:51 +02:00
Michael Weiss
8540133fb7
chromium: 91.0.4472.101 -> 91.0.4472.106
...
https://chromereleases.googleblog.com/2021/06/stable-channel-update-for-desktop_14.html
2021-06-15 11:59:05 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
zimbatm
319537cb02
terraform: fmt
2021-06-15 10:40:39 +02:00
Sandro
e0f9e2cc0e
Merge pull request #126523 from Princemachiavelli/package/electron-mail
2021-06-15 02:51:26 +02:00
R. RyanTM
feba2c9b39
helmfile: 0.139.7 -> 0.139.8
2021-06-14 16:23:49 -07:00
Sandro
0d81966c42
Merge pull request #126259 from liff/teams/rect-overlay-arg
...
teams: add an argument for enabling rect-overlay
2021-06-14 17:30:45 +02:00
Sandro
b55bc16798
Merge pull request #126742 from snoord/tanka-v0.16.0
...
tanka: 0.15.1 -> 0.16.0
2021-06-14 17:07:43 +02:00
Sandro
a657d607e0
Merge pull request #126809 from peterhoeg/u/onedrive
...
onedrive: 2.4.11 -> 2.4.12
2021-06-14 17:02:05 +02:00
Peter Hoeg
4489d3e844
onedrive: 2.4.11 -> 2.4.12
2021-06-14 22:28:07 +08:00
Sandro
686cc84aeb
Merge pull request #126784 from 06kellyjac/kube3d
...
kube3d: 4.4.4 -> 4.4.5
2021-06-14 14:28:40 +02:00
github-actions[bot]
dbed958bf2
Merge staging-next into staging
2021-06-14 12:04:44 +00:00
github-actions[bot]
f2ba460019
Merge master into staging-next
2021-06-14 12:04:41 +00:00
ilmari-lauhakangas
8bfd7bf370
filezilla: add wrapGAppsHook ( #126765 )
2021-06-14 13:48:56 +02:00
github-actions[bot]
9a860729b2
Merge staging-next into staging
2021-06-14 00:08:51 +00:00
github-actions[bot]
13f31f60bf
Merge master into staging-next
2021-06-14 00:08:48 +00:00
Maximilian Bosch
eb971d2e92
Merge pull request #126732 from mweinelt/weechat
...
weechat: 3.1 -> 3.2
2021-06-13 22:43:57 +02:00
06kellyjac
73953ec2ef
kube3d: 4.4.4 -> 4.4.5
2021-06-13 21:00:21 +01:00
John Ericson
3553c3bc79
Merge pull request #126727 from zhaofengli/riscv-mesa
...
mesa: Enable riscv64-linux
2021-06-13 10:24:15 -04:00
github-actions[bot]
5ac3d4e7b0
Merge master into staging-next
2021-06-13 12:06:09 +00:00
Samuel Noordhuis
7f934c2827
tanka: 0.15.1 -> 0.16.0
2021-06-13 20:15:47 +10:00
Michael Weiss
05b088f4d3
Merge pull request #126662 from primeos/ungoogled-chromium
...
ungoogled-chromium: 91.0.4472.77 -> 91.0.4472.101
2021-06-13 11:55:14 +02:00
Martin Weinelt
098665898d
weechat: 3.1 -> 3.2
...
https://github.com/weechat/weechat/releases/tag/v3.2
2021-06-13 10:17:48 +02:00
Yusuf Bera Ertan
181d764372
hyprspace: init at 0.1.2
2021-06-13 16:46:05 +09:00
Zhaofeng Li
1f007dd009
Use lib.meta.availableOn for optional Valgrind dependency
2021-06-12 23:17:13 -07:00
github-actions[bot]
ec4b7ebf86
Merge master into staging-next
2021-06-13 06:04:48 +00:00
adisbladis
270277c372
Merge pull request #126709 from adisbladis/firefox-beta_dev-90.0b6
...
firefox-(beta|devedition)-bin: 85.0b6 -> 90.0b6
2021-06-12 21:43:40 -05:00
github-actions[bot]
261638938e
Merge master into staging-next
2021-06-13 00:10:24 +00:00
adisbladis
fdca145086
firefox-devedition-bin: 85.0b6 -> 90.0b6
2021-06-12 17:25:14 -05:00
adisbladis
29aaf536bc
firefox-beta-bin: 85.0b6 -> 90.0b6
2021-06-12 17:25:07 -05:00
Sandro
78d866cd22
Merge pull request #126699 from mdevlamynck/fix-transgui-aarch64
...
transgui: fix transgui build on aarch64
2021-06-12 21:53:31 +02:00
Sandro
dea8072438
Merge pull request #125242 from cmars/kubebuilder
2021-06-12 21:35:34 +02:00
Jörg Thalheim
0012aa9c2d
Merge pull request #126682 from roberth/remove-empty-go-vendor-deps
...
Remove empty go vendor deps
2021-06-12 21:15:13 +02:00
Matthias Devlamynck
26744cb512
transgui: fix transgui build on aarch64
...
Support for aarch64 was recencly added in fpc.
This regenerate the Makefile to include aarch64 support as the one in
the repository was too old to include it.
2021-06-12 21:13:42 +02:00
github-actions[bot]
65a7d168af
Merge master into staging-next
2021-06-12 18:04:56 +00:00
Sandro
9b69650e6a
Merge pull request #126545 from alyssais/rsync
...
rsync: use availableOn to determine acl support
2021-06-12 19:12:25 +02:00