3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2184 commits

Author SHA1 Message Date
Jonathan Ringer c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Cole Helbling f1f0892955 terraform-providers.hydra: init at 0.1.0
https://determinate.systems/posts/terraform-provider-hydra/
2021-05-17 07:17:54 -04:00
Stéphan Kochen 28b48756d5 hetzner-kube: fix darwin build 2021-05-16 23:48:09 -07:00
github-actions[bot] 9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
github-actions[bot] b484cef365
Merge master into staging-next 2021-05-16 01:00:58 +00:00
Sandro 3b2051e66d
Merge pull request #122703 from r-ryantm/auto-update/argo
argo: 3.0.2 -> 3.0.3
2021-05-15 21:30:45 +02:00
github-actions[bot] 78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Ryan Mulligan 72948af15b
Merge pull request #122826 from r-ryantm/auto-update/kubernetes
kubernetes: 1.21.0 -> 1.21.1
2021-05-14 14:45:54 -07:00
zowoq 004f8cd986 Merge staging-next into staging 2021-05-14 16:32:43 +10:00
github-actions[bot] bf5d8bb531
Merge master into staging-next 2021-05-14 00:58:11 +00:00
Jan Tojnar ac6a4f7cf5
Merge branch 'staging-next' into staging 2021-05-14 01:40:09 +02:00
Sandro 78632afef9
Merge pull request #121690 from 06kellyjac/terragrunt
terragrunt: 0.29.1 -> 0.29.2
2021-05-13 22:23:36 +02:00
Sandro 2af564932d
Merge pull request #122876 from maxeaubrey/nomad_1.0.5 2021-05-13 22:21:19 +02:00
zowoq fe8e7c435a minikube: 1.19.0 -> 1.20.0
https://github.com/kubernetes/minikube/releases/tag/v1.20.0
2021-05-14 06:20:31 +10:00
Maxine Aubrey 04344581df
nomad_0_12: 0.12.10 -> 0.12.12 2021-05-13 20:50:39 +02:00
Maxine Aubrey afb0c71d7e
nomad_1_0: 1.0.4 -> 1.0.5 2021-05-13 20:39:41 +02:00
github-actions[bot] 39e3f7c2cc
Merge master into staging-next 2021-05-13 18:32:50 +00:00
Jonas Chevalier c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02:00
R. RyanTM a692d241cf kubernetes: 1.21.0 -> 1.21.1 2021-05-13 12:51:11 +00:00
github-actions[bot] b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Martin Weinelt a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
Sandro 82cbdfc88a
Merge pull request #122641 from 06kellyjac/octant 2021-05-12 18:04:57 +02:00
Robert Helgesson 85cc04df14
Merge pull request #122643 from rycee/terraform-azure-keycloak
Bump Azure Terraform provider and set Keycloak provider source
2021-05-12 16:26:24 +02:00
Jörg Thalheim e2d88e0ae3
Merge pull request #122514 from superherointj/package-k3s-v1.21.0+k3s1
k3s: 1.20.6+k3s1 -> 1.21.0+k3s1
2021-05-12 14:34:38 +01:00
R. RyanTM 64eadaded9 argo: 3.0.2 -> 3.0.3 2021-05-12 11:11:51 +00:00
github-actions[bot] e2cf474986
Merge staging-next into staging 2021-05-12 06:21:36 +00:00
github-actions[bot] d8fb37f470
Merge master into staging-next 2021-05-12 06:21:33 +00:00
Sandro d34e5f6425
Merge pull request #121770 from snoord/terraform-docs-v0.13.0
terraform-docs: 0.12.1 -> 0.13.0
2021-05-12 07:25:00 +02:00
Bryan A. S e956f890f2 popeye: 0.9.0 -> 0.9.2
Update, refactor and enable tests

Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-05-11 22:40:54 -03:00
John Ericson cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
06kellyjac ed012af8f8 octant-desktop: 0.19.0 -> 0.20.0 2021-05-11 22:23:34 +01:00
06kellyjac 273ab793b6 octant: 0.19.0 -> 0.20.0 2021-05-11 22:23:02 +01:00
Robert Helgesson 4c8edd64e8
terraform-providers: set keycloak provider source address 2021-05-11 23:22:03 +02:00
github-actions[bot] 37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
Robert Helgesson 9e8b1b0755
terraform-providers: bump Azure providers
Specifically,

- azuread: 0.10.0 -> 1.4.0

- azurerm: 2.13.0 -> 2.58.0

- azurestack: 0.9.0 -> 0.10.0
2021-05-11 19:44:42 +02:00
Sandro dce5def733
Merge pull request #122537 from r-ryantm/auto-update/kubeseal
kubeseal: 0.15.0 -> 0.16.0
2021-05-11 15:49:17 +02:00
Jonas Chevalier 9285be37b8
Merge pull request #122013 from DiegoLelis/kops
kops_1_19: init at 1.19.2
2021-05-11 15:38:19 +02:00
Anderson Torres 3423c5094f
Merge pull request #122341 from superherointj/package-linkerd-broken
linkerd: mark as broken
2021-05-11 10:27:28 -03:00
superherointj a10ede5a5a k3s: 1.20.6+k3s1 -> 1.21.0+k3s1 2021-05-11 06:36:41 -03:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
R. RyanTM 447bd26325 kubeseal: 0.15.0 -> 0.16.0 2021-05-11 06:03:36 +00:00
github-actions[bot] 49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
Joe DeVivo bf92d0ec37 nixos/ssm-agent: conf files written to /etc
ssm-agent expects files in /etc/amazon/ssm. The pkg substitutes a location in
the nix store for those default files, but if we ever want to adjust this
configuration on NixOS, we'd need the ability to modify that file.

This change to the nixos module writes copies of the default files from the nix
store to /etc/amazon/ssm. Future versions can add config, but right now this
would allow users to at least write out a text value to
environment.etc."amazon/ssm/amazon-ssm-agent.json".text to provide
their own config.
2021-05-10 13:16:41 -07:00
Joe DeVivo 27b4fd19ed ssm-agent: copy files required for agent startup 2021-05-10 13:16:41 -07:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
superherointj 3a453e0f08 linkerd: mark as broken
"linkerd" builds but does not output a working application.
2021-05-09 09:56:18 -03:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM cbd1cc10cd kubernetes: 1.20.5 -> 1.21.0 2021-05-08 18:52:52 -07:00
R. RyanTM 2d41db9d71 helmsman: 3.6.6 -> 3.6.7 2021-05-08 18:52:40 -07:00