JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,061 Commits 2 Branches 0 Tags 12 GiB
5e367ecef9
Commit Graph

1957 Commits

Author SHA1 Message Date
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