Commit Graph

2027 Commits

Author SHA1 Message Date
Sandro
7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
Alyssa Ross
5fa10aa313 cloud-hypervisor: 0.8.0 -> 0.14.1 2021-04-04 22:08:50 +00:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Jonathan Rudenberg
6dce2c059f libnvidia-container: 1.3.1 -> 1.3.3 2021-04-02 13:00:46 -04:00
Pascal Bach
700511ed3c
Merge pull request #117372 from r-ryantm/auto-update/docker-compose
docker-compose: 1.28.5 -> 1.28.6
2021-03-31 22:31:18 +02:00
zowoq
5490b3b224 runc: add phase hooks 2021-03-31 21:06:23 +10:00
zowoq
974ee55b16 podman: add phase hooks 2021-03-31 21:06:23 +10:00
zowoq
e579194d15 cri-o: add phase hooks 2021-03-31 21:06:23 +10:00
zowoq
d4c3f5f929 conmon: add phase hooks 2021-03-31 21:06:23 +10:00
zowoq
083c46aabe podman: 3.0.1 -> 3.1.0
https://github.com/containers/podman/releases/tag/v3.1.0
2021-03-31 16:44:38 +10:00
Alyssa Ross
8e71416e5d qemu: set localstatedir
Otherwise qemu-qa, qemu-pr-helper, and virtiofsd, try to write to
$out/var at runtime.

Fixes: https://github.com/NixOS/nixpkgs/issues/113909
Fixes: https://github.com/NixOS/nixpkgs/pull/112886
2021-03-29 17:19:06 +00:00
Frederik Rietdijk
43675726a7 seabios: use python3 2021-03-25 10:16:52 +01:00
R. RyanTM
276739da7a docker-compose: 1.28.5 -> 1.28.6 2021-03-23 16:01:26 +00:00
zowoq
5a251359a8 catatonit: add passthru.tests and teams.podman 2021-03-22 15:35:05 +10:00
Andrey Golovizin
be38dc44f3 catatonit: init at 0.1.5
Signed-off-by: Andrey Golovizin <ag@sologoc.com>
2021-03-21 20:57:27 +01:00
Sandro Jäckel
0246a1d337
docker-compose: don't require backports_ssl_match_hostname on >= 3.8 2021-03-17 22:55:12 +01:00
Ryan Mulligan
3b4d6238c9
Merge pull request #116197 from r-ryantm/auto-update/singularity
singularity: 3.7.1 -> 3.7.2
2021-03-14 15:13:26 -07:00
Lancelot SIX
44c21068ae spike: fix build 2021-03-14 00:58:50 -05:00
R. RyanTM
5f41ef7d78 singularity: 3.7.1 -> 3.7.2 2021-03-13 13:50:35 +00:00
R. RyanTM
a624b04b3f docker-compose: 1.28.3 -> 1.28.5 2021-03-10 09:33:46 +00:00
zowoq
2c0bc880a3 conmon: 2.0.26 -> 2.0.27
https://github.com/containers/conmon/releases/tag/v2.0.27
2021-03-09 07:43:54 +10:00
Lassulus
bf7df30785
Merge pull request #112482 from r-ryantm/auto-update/charliecloud
charliecloud: 0.21 -> 0.22
2021-03-07 18:26:40 +01:00
Jörg Thalheim
c3b9c62eba
Merge pull request #112881 from alyssais/qemu-stack
qemu: re-enable stack protection
2021-03-07 11:40:24 +00:00
zowoq
f2ed6d87a4 containerd: 1.4.3 -> 1.4.4
https://github.com/containerd/containerd/releases/tag/v1.4.4
2021-03-07 06:33:26 +10:00
Jörg Thalheim
4a87776b9a
Merge pull request #115080 from r-ryantm/auto-update/cntr
cntr: 1.5.0 -> 1.5.1
2021-03-05 07:49:07 +00:00
Ozan Sener
78f322f2d0 dockerTools: fix build on Darwin
Fixes #110665

Introduced by #109420
2021-03-04 16:17:48 +01:00
R. RyanTM
fb570e3c66 cntr: 1.5.0 -> 1.5.1 2021-03-04 13:49:05 +00:00
Sandro Jäckel
0f78e1772f
aqemu: mark broken 2021-03-03 16:23:55 +01:00
Sandro Jäckel
238ce01f85
qtemu: remove unused input 2021-03-03 16:23:54 +01:00
Sandro Jäckel
993fb95e78
qemu: remove not require enableParallelBuild 2021-03-03 16:23:53 +01:00
zowoq
71a28ca2c1 crun: 0.17 -> 0.18
https://github.com/containers/crun/releases/tag/0.18
2021-03-03 18:08:13 +10:00
R. RyanTM
45ec1b13c5 cntr: 1.4.1 -> 1.5.0 2021-03-02 20:20:38 +00:00
Sandro
c1d529dbb1
Merge pull request #114768 from SuperSandro2000/fix-collection19 2021-03-02 16:59:03 +01:00
Sandro
8958b4fdae
Merge pull request #114735 from andresilva/virtualbox-linux-511
virtualbox: fix build on linux 5.11
2021-03-02 13:50:58 +01:00
Sandro Jäckel
4ad340f37c
Revert "qemu: guard desktop file removal"
This reverts commit e74ae54da5.

rm -f ignores if the file exists or not.
2021-03-01 18:32:39 +01:00
jD91mZM2
3a6ba9ea5b
remove me as maintainer
I don't use these tools anymore, so it makes sense I shouldn't have an
opinion on PRs that change/update them. I know it's always unfortunate
losing a reviewer, but I'm not very active anymore anyway,
unfortunately. Apologies.

From now on, I'm trying not to add too many packages into nixpkgs, since
flakes are available. I guess when I first started using Nix I got
overexcited by how easy it was to contribute, so I added things for the
sake of adding things (not because I necessarily used them).
2021-03-01 12:32:20 +01:00
André Silva
4499318712
virtualbox: fix build on linux 5.11 2021-03-01 10:12:27 +00:00
Sandro Jäckel
1497f9151d
singularity: remove unused inputs 2021-03-01 10:46:57 +01:00
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Mario Rodas
bbfe875327
Merge pull request #114413 from r-ryantm/auto-update/cri-o
cri-o-unwrapped: 1.20.0 -> 1.20.1
2021-02-25 23:57:43 -05:00
R. RyanTM
da17b1acdf cri-o-unwrapped: 1.20.0 -> 1.20.1 2021-02-25 21:47:20 +00:00
Mario Rodas
d53a7eb7ac
Merge pull request #113526 from r-ryantm/auto-update/docker-compose
docker-compose: 1.28.2 -> 1.28.3
2021-02-23 20:30:46 -05:00
github-actions[bot]
abe7db36a4
Merge staging-next into staging 2021-02-20 00:36:40 +00:00
zowoq
0bff5a7843 containerd: move completion to installPhase
docker uses containerd 1.4 since b451286b1f
2021-02-20 08:07:44 +10:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
zowoq
92f9b27c12 podman: 3.0.0 -> 3.0.1
https://github.com/containers/podman/releases/tag/v3.0.1
2021-02-19 10:51:30 +10:00
R. RyanTM
0a7c4f6a32 docker-compose: 1.28.2 -> 1.28.3 2021-02-17 22:57:11 +00:00
Sandro Jäckel
b02c411492
virtualbox:
virtualbox: remove unused input
2021-02-17 23:12:25 +01:00
Bernardo Meurer
052f58b7fa
Merge pull request #113243 from baloo/baloo/ovmf/http-boot
OVMF: add support for http boot
2021-02-16 19:34:57 +00:00
Jörg Thalheim
3f2321e5c1
Merge pull request #112440 from bobrik/ivan/qemu-aarch64-darwin-prep 2021-02-16 06:49:16 +00:00
Arthur Gautier
a964b3cb6f OVMF: add support for http boot
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-02-16 00:46:00 +00:00
Florian Klink
c70a8c8d92
Merge pull request #113189 from nix-things-mobile/fix/qemu-repair
qemu: guard desktop file removal
2021-02-15 21:54:29 +01:00
daniel
e74ae54da5 qemu: guard desktop file removal
The qemu.desktop file should only be attempted to be removed if available.
2021-02-15 09:33:18 +01:00
WORLDofPEACE
971a85d2c1
Merge pull request #112954 from TredwellGit/qemu
qemu: set sysconfdir
2021-02-14 05:58:54 -05:00
adisbladis
4c9e23d6ad
Merge pull request #113049 from adisbladis/crun-criu-supported-platforms
crun: Only build with criu support on criu supported platforms
2021-02-13 23:29:04 +01:00
adisbladis
a3d0f7818a
crun: Only build with criu support on criu supported platforms 2021-02-13 23:07:53 +01:00
zowoq
369f20924a cri-o: prefer to build wrapper locally
Same as 9c98282609
2021-02-14 07:58:28 +10:00
zowoq
8c8d4f3398 podman: install systemd files
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:38 +10:00
adisbladis
9c98282609
podman: Prefer to build wrapper locally
This build is basically just creating 2 symlinks and a wrapper script.
Downloading it from a cache is not efficient.
2021-02-13 15:51:33 +01:00
adisbladis
a62f04d38e
podman: Fix sha256
For some reason the archive sha256 has changed..
2021-02-13 15:14:31 +01:00
adisbladis
304617494b
podman: Remove unconfigured runtime warnings
It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
2021-02-13 14:39:02 +01:00
TredwellGit
dd441204f6 qemu: set sysconfdir
Fixes https://github.com/NixOS/nixpkgs/issues/111675 and https://github.com/NixOS/nixpkgs/issues/110142.
2021-02-13 00:25:28 +00:00
Mario Rodas
c831e4e9e4 podman: 2.2.1 -> 3.0.0
https://github.com/containers/podman/releases/tag/v3.0.0
2021-02-11 04:20:00 +00:00
Sascha Grunert
c2ef7b1cbf
crun: add criu support
Adding the criu dependency allows using the feature, too:

```
> ./result/bin/crun --version
crun version 0.17
commit: 0.17
spec: 1.0.0
+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +CRIU +YAJL
```

Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2021-02-11 13:58:58 +01:00
Alyssa Ross
8f0bd879da
qemu: re-enable stack protection
5e25995295 ("qemu: 2.6.1 -> 2.7.0") added this, because the QEMU
build failed without it.  That's no longer the case, so we can bring
back stack protection.
2021-02-09 21:26:43 +00:00
R. RyanTM
74c9af1c7c charliecloud: 0.21 -> 0.22 2021-02-09 07:52:17 +00:00
Ivan Babrou
251add14cf qemu: only apply autoPatchelfHook on linux
It fails on darwin due to missing `patchelf` and the missing ELFs:

```
/nix/store/...-auto-patchelf-hook/nix-support/setup-hook: line 220: -l: command not found
```
2021-02-08 13:48:16 -08:00
Ivan Babrou
d29e8f0e59 qemu: rename VERSION to QEMU_VERSION to avoid name clash
In libc++ starting with LLVM8 there's `<version>` include in `cstddef`:

The following things also align:

* QEMU has a file called `VERSION` in repo root
* QEMU prepends repo root to include path in build
* macOS has a case-insensetive filesystem

All of this combined means that `VERSION` file is included as a header.

Working around this be renaming `VERSION` -> `QEMU_VERSION` to resolve ambiguity.

The problem really only appears on `aarch64-darwin`, since on `x86_64-darwin`
there are no C++ files to compile. The workaround is harmless enough to apply.
2021-02-08 13:45:47 -08:00
Ivan Babrou
bb475b01d2 qemu: do not force x86_64 cpu on darwin
This change produces the following warning:

```
... configure: line 619: sysctl: command not found
```

It's benign and sysctl is only useful on MacOS X Leopard:

* https://github.com/qemu/qemu/blob/v5.2.0/configure#L615-L621

Leopard is 13 years old and is not supported by Nix.

The sysctl check is removed in qemu master branch already.

Plus aarch64-darwin is coming in #105026, so there's no reason to force x86_64.
2021-02-08 13:39:10 -08:00
Sandro
8a4a984fd5
Merge pull request #105439 from avdv/bazel_3.7.1 2021-02-04 20:15:45 +01:00
Sascha Grunert
c1b7380700
runc: 1.0.0-rc92 -> 1.0.0-rc93
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2021-02-04 10:29:07 +01:00
R. RyanTM
e87a8406c6 conmon: 2.0.25 -> 2.0.26 2021-02-04 04:40:30 +00:00
Claudio Bley
6d8c431eb0 bazel: 3.7.1 -> 3.7.2
* update sha256 for gvisor, tensorflow{,WithCuda}, bazel-watcher, bazel-remote
  and envoy
2021-02-03 10:44:07 +01:00
Sandro
b881f100f6
Merge pull request #111625 from jbedo/singularity
singularity: 3.7.0 -> 3.7.1
2021-02-02 13:11:41 +01:00
Justin Bedo
efd372d82c
singularity: 3.7.0 -> 3.7.1 2021-02-02 14:05:34 +11:00
Andreas Rammhold
ad5f23870c
Merge pull request #110847 from andir/docker-overrides
docker: allow overriding package inputs per docker package
2021-02-01 00:55:22 +01:00
Claudio Bley
71cda4f111 bazel: 3.3.1 -> 3.7.1
* remove python-shebang patch since it was integrated upstream[1]

[1]: https://github.com/bazelbuild/bazel/pull/11535/files
2021-01-29 21:53:25 +01:00
Mario Rodas
75fbbeeaa9 docker-slim: 1.33.0 -> 1.34.0
https://github.com/docker-slim/docker-slim/releases/tag/1.34.0
2021-01-29 04:20:00 +00:00
R. RyanTM
0449f1e8f2 docker-compose: 1.28.0 -> 1.28.2 2021-01-28 00:45:55 +00:00
Andreas Rammhold
ed46383416 docker: allow overriding package inputs per docker package
Previously we could not override the input packages to docker at all as
that had been shadowed due to the usage of inherit in all-package.nix.

We are now mixing the "variable" variables for the build and the
dependency declarations for the package and using callPackage as if each
of the docker packages would be separate files that we evaluate.

This now enables overriding e.g. iptables for a single verison of
docker which previously was not feasible without importing the
default.nix again (and passing different arguments).

> pkgs.docker.override { iptables = pkgs.iptables-nftables-compat; }
2021-01-26 13:08:25 +01:00
Milan
b7871c3f2d
qemu: fix build when desktop file does not exist (#110721)
The qemu-user variants as used by binfmt emulation through
`(lib.systems.elaborate lib.systems.examples.aarch64-multiplatform).emulator pkgs`
does not install a .desktop file since qemu 5.2.0. This change allows
the build to continue if deletion of the desktop file fails.
2021-01-25 19:24:32 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Florian Klink
68b6d6ca8e
Merge pull request #110550 from bryanasdev000/package-virtualbox-6.1.18
virtualbox: 6.1.16 -> 6.1.18
2021-01-25 16:36:05 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
Sandro
cba0c7e756
Merge pull request #110543 from bobrik/ivan/buildx-path
docker: correct substitution path with buildx enabled
2021-01-23 20:32:55 +01:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Florian Klink
994e221f16
Merge pull request #106988 from drewrisinger/dr-pr-qemu-bump
qemu: 5.1.0 -> 5.2.0
2021-01-23 00:20:06 +01:00
Bryan A. S
72e688c973 virtualbox: 6.1.16 -> 6.1.18
Signed-off-by: Bryan A. S <bryanasdev000@gmail.com>
2021-01-22 19:36:45 -03:00
Maximilian Bosch
c6d4197e4f
Merge pull request #110283 from r-ryantm/auto-update/docker-compose
docker-compose: 1.27.4 -> 1.28.0
2021-01-22 23:25:29 +01:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
Ivan Babrou
aea19f284a docker: correct substitution path with buildx enabled
Starting with Docker 20.10, the client repo moved and the path changed.
2021-01-22 13:43:30 -08:00
John Ericson
d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
Sandro
0c096b67dc
Merge pull request #107302 from bobrik/ivan/docker-buildx 2021-01-22 12:50:25 +01:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
zowoq
722c5a8316 crun: 0.16 -> 0.17
https://github.com/containers/crun/releases/tag/0.17
2021-01-22 08:06:10 +10:00
Ivan Babrou
deb0d298a2 docker: add buildx support to docker client 2021-01-21 12:52:46 -08:00
Ivan Babrou
e431ff7e2e docker-buildx: init at 0.5.1
Installing docker-buildx enables buildx subcommand on the client:

* https://github.com/docker/buildx
2021-01-21 12:52:45 -08:00
zowoq
30ab92ea31 conmon: 2.0.24 -> 2.0.25
https://github.com/containers/conmon/releases/tag/v2.0.25
2021-01-21 18:35:16 +10:00
R. RyanTM
a17adff3e9 docker-compose: 1.27.4 -> 1.28.0 2021-01-21 07:50:25 +00:00