3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2204 commits

Author SHA1 Message Date
github-actions[bot] 1cef000dad
Merge master into staging-next 2021-09-04 12:01:03 +00:00
zowoq d431839ab4 lima: 0.6.1 -> 0.6.2
https://github.com/lima-vm/lima/releases/tag/v0.6.2
2021-09-04 16:14:53 +10:00
Alyssa Ross c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
zowoq a96144ce4f lima: 0.6.0 -> 0.6.1
https://github.com/lima-vm/lima/releases/tag/v0.6.1
2021-08-31 09:26:09 +10:00
zowoq 875901c0d5 podman: 3.3.0 -> 3.3.1
https://github.com/containers/podman/releases/tag/v3.3.1
2021-08-31 08:18:08 +10:00
github-actions[bot] 10ce8bb753
Merge master into staging-next 2021-08-27 00:01:31 +00:00
zowoq 69a333ab31 docker-proxy: remove invalid godeps = null 2021-08-27 06:43:33 +10:00
github-actions[bot] 8fb1ff7c31
Merge master into staging-next 2021-08-26 18:01:02 +00:00
Sandro Jäckel c2d20d0b59
docker-buildx: fix wrong source hash calculated by r-ryantm 2021-08-26 16:58:39 +02:00
Sandro b5446940ba
Merge pull request #135120 from r-ryantm/auto-update/docker-buildx
docker-buildx: 0.6.1 -> 0.6.2
2021-08-26 14:17:46 +02:00
github-actions[bot] b13b005f0e
Merge master into staging-next 2021-08-26 12:01:09 +00:00
zowoq 13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
zowoq 9362518892 crun: 0.21 -> 1.0
https://github.com/containers/crun/releases/tag/1.0
2021-08-26 17:47:31 +10:00
zowoq 6ad7483734 cri-o: 1.21.2 -> 1.22.0
https://github.com/cri-o/cri-o/releases/tag/v1.22.0
2021-08-26 17:47:16 +10:00
github-actions[bot] 572dfaae2c
Merge master into staging-next 2021-08-26 06:01:19 +00:00
zowoq e6494966dd treewide: buildFlagsArray -> ldflags 2021-08-26 15:43:28 +10:00
Vladimír Čunát 70e05c1003
Merge branch 'master' into staging-next 2021-08-25 19:42:15 +02:00
Michael Weiss f9dfb94bd2
vpcs: remove myself as maintainer
I've stopped using GNS3.
2021-08-24 22:02:56 +02:00
Michael Weiss f8737848af
Merge pull request #135576 from r-ryantm/auto-update/vpcs
vpcs: 0.8.1 -> 0.8.2
2021-08-24 22:00:01 +02:00
R. RyanTM 517b0b0d05 vpcs: 0.8.1 -> 0.8.2 2021-08-24 16:41:27 +00:00
zowoq d7f344b5b0 podman: add gvproxy to darwin wrapper 2021-08-24 06:59:20 +10:00
zowoq 99a3addb2b podman: 3.2.3 -> 3.3.0
https://github.com/containers/podman/releases/tag/v3.3.0
2021-08-24 06:59:20 +10:00
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Sascha Grunert be66efdf86 runc: 1.0.1 -> 1.0.2
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2021-08-23 18:39:06 +10:00
github-actions[bot] 42f8c46335
Merge staging-next into staging 2021-08-22 12:01:56 +00:00
zowoq e5096a5041 containerd: move version/revision into buildPhase 2021-08-22 18:32:40 +10:00
R. RyanTM 6745446b71 docker-buildx: 0.6.1 -> 0.6.2 2021-08-21 21:30:24 +00:00
github-actions[bot] cadf0193dd
Merge staging-next into staging 2021-08-18 18:01:40 +00:00
Ryan Mulligan 91cd7ca733
Merge pull request #134576 from r-ryantm/auto-update/singularity
singularity: 3.8.0 -> 3.8.1
2021-08-18 06:12:37 -07:00
R. RyanTM ffb8183623 singularity: 3.8.0 -> 3.8.1 2021-08-18 00:25:25 +00:00
github-actions[bot] 2341511023
Merge staging-next into staging 2021-08-18 00:01:59 +00:00
Artturi a072f2f02e
Merge pull request #133908 from r-ryantm/auto-update/x11docker 2021-08-17 22:49:55 +03:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Sandro 5829e325d1
Merge pull request #132717 from maxeaubrey/docker_20.10.8 2021-08-16 15:18:34 +02:00
R. RyanTM c3dcf58df2 x11docker: 6.6.2 -> 6.9.0 2021-08-14 08:20:53 +00:00
Jan Tojnar 807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Maxine Aubrey 078285c645
containerd_1_4: init at 1.4.9 2021-08-11 12:53:10 +02:00
Kid b43389f49d iasl: drop pacakge 2021-08-10 03:46:01 +00:00
Doron Behar 3d72b0b6b0
Merge pull request #114241 from sorki/tests/cntr 2021-08-09 05:40:37 +00:00
github-actions[bot] c47bdfa71a
Merge staging-next into staging 2021-08-08 06:01:51 +00:00
Sandro f01615c464
Merge pull request #132911 from r-ryantm/auto-update/docker-slim
docker-slim: 1.36.1 -> 1.36.2
2021-08-08 05:00:32 +02:00
github-actions[bot] 563f450e28
Merge staging-next into staging 2021-08-07 06:01:30 +00:00
AndersonTorres 5a32b487b5 bochs: move libtool to nativeBuildInputs 2021-08-06 22:01:46 -03:00
AndersonTorres 9633db5bb6 bochs: 2.6.11 -> 2.7 2021-08-06 22:01:24 -03:00
R. RyanTM 9cb3f3addf docker-slim: 1.36.1 -> 1.36.2 2021-08-06 16:00:19 +00:00
github-actions[bot] 151a3b4752
Merge staging-next into staging 2021-08-06 12:01:51 +00:00
Anderson Torres a0e731154d
bochs: 2.6.11 -> 2.7 (#132848)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-06 10:09:22 +02:00
Vladimír Čunát 8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
zowoq 75d9fd0e95 umoci: buildFlagsArray -> ldflags 2021-08-06 10:54:38 +10:00
Vo Anh Duy 23b31e6ef1 lima: 0.5.0 -> 0.6.0 2021-08-05 18:56:23 +10:00