Martin Weinelt
3b8cf43350
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/imageio/default.nix
- pkgs/development/python-modules/pytest-order/default.nix
2023-03-15 02:01:15 +01:00
Weijia Wang
5ca9faa109
xen: cleanup
2023-03-15 00:54:37 +02:00
Weijia Wang
a8bad6bb36
xen_4_10: drop
2023-03-14 23:34:58 +02:00
Martin Weinelt
231c1145f2
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/rflink/default.nix
2023-03-14 22:33:40 +01:00
Weijia Wang
63c033e2a0
xen_4_15: fix build
2023-03-14 22:57:08 +02:00
Weijia Wang
a9926eb5ec
Merge branch 'master' into xen-4.15-pr
2023-03-14 20:15:47 +02:00
Martin Weinelt
bb14c4255b
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-13 17:14:19 +00:00
Mario Rodas
bebcd98610
Merge pull request #220639 from r-ryantm/auto-update/lima-bin
...
lima-bin: 0.14.2 -> 0.15.0
2023-03-13 07:35:13 -05:00
Vladimír Čunát
1dd94ad62f
Merge branch 'master' into staging-next
2023-03-12 09:06:28 +01:00
R. Ryantm
baa5974a37
open-vm-tools: 12.1.5 -> 12.2.0
2023-03-11 23:30:12 +00:00
Mario Rodas
0c667d491f
Merge pull request #220713 from r-ryantm/auto-update/nixpacks
...
nixpacks: 1.4.1 -> 1.5.0
2023-03-11 16:14:58 -05:00
R. Ryantm
dd8a903634
nixpacks: 1.4.1 -> 1.5.0
2023-03-11 18:40:51 +00:00
github-actions[bot]
feb117e32c
Merge master into staging-next
2023-03-11 18:01:19 +00:00
R. Ryantm
cb0472b232
lima-bin: 0.14.2 -> 0.15.0
2023-03-11 10:52:29 +00:00
R. Ryantm
0fa6ab1de5
colima: 0.5.3 -> 0.5.4
2023-03-11 10:32:13 +00:00
github-actions[bot]
9ffe17a0be
Merge master into staging-next
2023-03-11 00:02:37 +00:00
Sandro Jäckel
815d85d400
podman: remove unused code
2023-03-11 08:25:18 +10:00
github-actions[bot]
39f6788067
Merge master into staging-next
2023-03-09 12:01:27 +00:00
Sascha Grunert
16bddcfbaf
cri-o: 1.26.1 -> 1.26.2
...
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2023-03-09 18:28:06 +10:00
Martin Weinelt
4729f61158
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-08 15:04:13 +01:00
Sandro
bcbcda200f
Merge pull request #219797 from r-ryantm/auto-update/cloud-hypervisor
...
cloud-hypervisor: 29.0 -> 30.0
2023-03-08 11:17:17 +01:00
Martin Weinelt
8bd52cd37d
Merge pull request #220002 from yu-re-ka/lkl-aarch64
...
lkl: fix lkl-hijack on aarch64 with gcc10+
2023-03-07 16:21:07 +00:00
Yureka
5d6b2ea5fb
lkl: fix lkl-hijack on aarch64 with gcc10+
2023-03-07 16:50:02 +01:00
Martin Weinelt
e3f019bb71
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-07 15:05:00 +01:00
R. Ryantm
fd296e5d4d
colima: 0.5.2 -> 0.5.3
2023-03-07 09:06:11 +00:00
github-actions[bot]
fa94414f70
Merge master into staging-next
2023-03-07 00:02:41 +00:00
Felix Buehler
d10e69c86b
treewide: deprecate isNull
...
https://nixos.org/manual/nix/stable/language/builtins.html#builtins-isNull
2023-03-06 22:40:04 +01:00
Ilan Joselevich
9f8fd07c10
Merge pull request #219785 from aaronjheng/podman-ui
...
podman-tui: 0.7.0 -> 0.9.0
2023-03-06 22:01:25 +02:00
Martin Weinelt
bcf6c81a88
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-06 16:55:14 +00:00
Thibault Gagnaux
332073ba42
colima: add darwin tools to native build inputs
2023-03-06 10:00:12 +01:00
Thibault Gagnaux
d23c04cdbd
colima: build and test all packages
2023-03-06 09:42:37 +01:00
Thibault Gagnaux
cd20e3b85e
colima: patch sw_vers
on darwin
2023-03-06 09:13:58 +01:00
Martin Weinelt
b04848e5fe
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-06 08:21:14 +01:00
Aaron Jheng
915bc5fb1d
podman-tui: 0.7.0 -> 0.9.0
2023-03-06 07:11:22 +00:00
R. Ryantm
782f4c779a
cloud-hypervisor: 29.0 -> 30.0
2023-03-06 03:47:44 +00:00
Yureka
b2e0b360ab
lklWithFirewall: re-add CONFIG_NFT_COUNTER option ( #219699 )
2023-03-05 21:31:24 +01:00
Martin Weinelt
1bc7533e28
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-04 19:34:20 +00:00
figsoda
9c2b5671c1
Merge pull request #219525 from r-ryantm/auto-update/nixpacks
...
nixpacks: 1.4.0 -> 1.4.1
2023-03-04 13:21:14 -05:00
R. Ryantm
946be78ef3
nixpacks: 1.4.0 -> 1.4.1
2023-03-04 16:48:40 +00:00
Martin Weinelt
e93e71ce44
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-04 14:58:24 +01:00
K900
9692e965c6
virtualbox: 6.1.40 -> 7.0.6
...
- bump versions
- add new dependencies
- lrelease is an unconditional dependency now
- more Qt path hackery
- remove rdesktop-vrdp (removed upstream)
2023-03-04 13:39:50 +03:00
Frederik Rietdijk
8cf8d77121
Merge master into staging-next
2023-03-04 09:38:25 +01:00
K900
0ab7f2e54c
Merge pull request #219434 from yu-re-ka/lkl-5-15
...
lkl: downgrade to 5.15
2023-03-04 11:34:26 +03:00
K900
32bc50dc36
lkl: add raitobezarius to maintainers
...
(as requested on Matrix)
2023-03-04 11:05:10 +03:00
K900
dc01a82282
lkl: add note for future update attempts
2023-03-04 11:01:44 +03:00
Nick Cao
fe844e0670
Merge pull request #219409 from figsoda/pods
...
pods: 1.0.5 -> 1.0.6
2023-03-04 09:45:50 +08:00
Martin Weinelt
d0286ecd24
Merge remote-tracking branch 'origin/staging' into staging-next
2023-03-04 01:42:06 +00:00
Yureka
a84a25c3ae
lkl: downgrade to 5.15
2023-03-04 00:38:17 +01:00
Martin Weinelt
9ab46b47e8
docker-compose_1: Use SRI hash
...
To allow awsebcli to use its changeversion function to uniformly
overwrite the hash.
2023-03-03 23:59:29 +01:00
Weijia Wang
0a4935e144
Merge pull request #219065 from r-ryantm/auto-update/lima
...
lima: 0.14.2 -> 0.15.0
2023-03-03 23:29:04 +02:00
figsoda
d168fec9cf
pods: 1.0.5 -> 1.0.6
...
Diff: https://github.com/marhkb/pods/compare/v1.0.5...v1.0.6
Changelog: https://github.com/marhkb/pods/releases/tag/v1.0.6
2023-03-03 16:11:02 -05:00
Martin Weinelt
0580d85143
Merge remote-tracking branch 'origin/staging-next' into staging
2023-03-03 04:46:31 +01:00
K900
18f2ba9ce4
Merge pull request #207033 from j-brn/master
...
looking-glass-client/kvmfr: B5.0.1 -> B6
2023-03-02 17:11:43 +03:00
github-actions[bot]
6c8444842c
Merge staging-next into staging
2023-03-02 12:02:00 +00:00
Fabian Affolter
d6615f70d3
lima: add changelog to meta
2023-03-02 10:37:24 +01:00
Yureka
55da71c10e
nixos/nftables: add checkRuleset option ( #216531 )
...
* nixos/nftables: add checkRuleset option
* lkl: 2022-05-18 -> 2023-01-27
2023-03-02 10:28:01 +01:00
R. Ryantm
40c00753e7
lima: 0.14.2 -> 0.15.0
2023-03-01 22:10:33 +00:00
github-actions[bot]
5f2d948a2c
Merge staging-next into staging
2023-03-01 12:02:17 +00:00
zowoq
4a40c0ab8a
conmon: 2.1.6 -> 2.1.7
...
Diff: https://github.com/containers/conmon/compare/v2.1.6...v2.1.7
Changelog: https://github.com/containers/conmon/releases/tag/v2.1.7
2023-03-01 18:52:02 +10:00
github-actions[bot]
e3dc1573ff
Merge staging-next into staging
2023-03-01 06:01:52 +00:00
zowoq
d680957e11
containerd: 1.6.18 -> 1.6.19
...
Diff: https://github.com/containerd/containerd/compare/v1.6.18...v1.6.19
Changelog: https://github.com/containerd/containerd/releases/tag/v1.6.19
2023-03-01 15:13:34 +10:00
github-actions[bot]
445e4a4069
Merge staging-next into staging
2023-02-28 12:01:54 +00:00
zowoq
48642c634e
podman: remove wrapper
...
trying to get all of the podman functionality to work with the wrapper
is becoming more complicated with each release, it isn't sustainable
removing the wrapper does mean that using extraPackages will need to build from source
- remove unnecessary serviceConfig overrides
- set HELPER_BINARIES_DIR to libexec/podman
- use install.bin target on linux for podman/tmpfiles
- also installs quadlet/rootlessport in libexec
- symlink binaries from helpersBin into HELPER_BINARIES_DIR
- remove unnecessary rootlessport output
- remove unnecessary substituteInPlace
2023-02-28 18:08:29 +10:00
github-actions[bot]
387a5e220d
Merge staging-next into staging
2023-02-28 00:03:08 +00:00
Sascha Grunert
c62d5ef31f
crun: 1.8 -> 1.8.1
...
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
2023-02-27 13:13:17 +01:00
Jan Tojnar
9bb986284f
Merge branch 'staging-next' into staging
...
# Conflicts:
# pkgs/development/python-modules/mdp/default.nix
# pkgs/top-level/python-aliases.nix
2023-02-26 01:13:37 +01:00
zowoq
bf816a54cf
podman: 4.4.1 -> 4.4.2
...
Diff: https://github.com/containers/podman/compare/v4.4.1...v4.4.2
Changelog: https://github.com/containers/podman/blob/v4.4.2/RELEASE_NOTES.md
2023-02-25 09:49:42 +10:00
github-actions[bot]
3cdd771820
Merge staging-next into staging
2023-02-23 18:01:49 +00:00
Artturin
226e149145
treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
...
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
f9fdf2d402
treewide: move NIX_CFLAGS_COMPILE to the env attrset
...
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d
treewide: use toString on list NIX_CFLAGS_COMPILE
...
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
github-actions[bot]
8e4dd5face
Merge staging-next into staging
2023-02-20 06:02:09 +00:00
Anderson Torres
73da635cdf
Merge pull request #216843 from heyimnova/master
...
quickgui: init at 1.2.8
2023-02-19 22:00:45 -03:00
heyimnova
1d7e7869b9
quickgui: init at 1.2.8
2023-02-19 20:50:29 +00:00
github-actions[bot]
b3557e8e31
Merge staging-next into staging
2023-02-19 18:01:52 +00:00
Mario Rodas
65ffe1d56b
Merge pull request #217139 from r-ryantm/auto-update/nixpacks
...
nixpacks: 1.3.1 -> 1.4.0
2023-02-19 10:50:43 -05:00
Guillaume Girol
4c7a1272a2
Merge pull request #216428 from ShamrockLee/apptainer-suid-flag
...
apptainer: always specify either --with-suid or --without-suid build flag
2023-02-19 12:23:14 +00:00
R. Ryantm
4902c3e074
nixpacks: 1.3.1 -> 1.4.0
2023-02-19 12:19:11 +00:00
Yueh-Shun Li
6e9902c7f6
apptainer: always specify either --with-suid or --without-suid build flag
2023-02-19 07:55:10 +00:00
Artturi
cdcca1cdcd
Merge pull request #215715 from Artturin/removegirworkarounds2
2023-02-18 20:12:57 +02:00
Artturin
cadffcfe50
treewide: remove issue #56943 workarounds
...
checked with diffoscope+difflog and launching the programs
i have fixed that issue in my other gir PRs
2023-02-17 20:26:13 +02:00
zowoq
3e081095a4
Revert "podman: remove wrapper"
...
This reverts commit 02f9255044
.
broke rootlessport port forwarding
2023-02-17 20:26:02 +10:00
zowoq
812f10ce55
containerd: 1.6.17 -> 1.6.18
...
https://github.com/containerd/containerd/releases/tag/v1.6.18
2023-02-16 09:58:09 +10:00
R. Ryantm
418cc13dd1
docker-compose: 2.15.1 -> 2.16.0
2023-02-15 11:56:07 +00:00
zowoq
5ecc72cb5b
podman: add version test for all platforms
2023-02-14 19:22:24 +10:00
zowoq
02f9255044
podman: remove wrapper
...
trying to get all of the podman functionality to work with the wrapper
is becoming more complicated with each release, it isn't sustainable
removing the wrapper does mean that using extraPackages will need to build from source
- include pkgs.zfs by default in the wrapped podman used by the module so it is cached
- anyone using zfsUnstable will need to build from source
- remove unnecessary serviceConfig overrides
- set HELPER_BINARIES_DIR during build
- use install.bin target on linux for podman/tmpfiles
- also installs quadlet/rootlessport in libexec
- remove unnecessary rootlessport output
- remove unnecessary substituteInPlace
2023-02-14 19:22:24 +10:00
Sandro
cc443761cb
Merge pull request #214534 from dramforever/qemu-remove-cpu-flag
2023-02-13 16:54:13 +01:00
Justin Bedő
c862d574e2
Merge pull request #215690 from GaetanLepage/update-apptainer
...
apptainer: 1.1.3 -> 1.1.5
2023-02-12 22:40:55 +00:00
zowoq
e84f1438a1
containerd: 1.6.16 -> 1.6.17
...
https://github.com/containerd/containerd/releases/tag/v1.6.17
2023-02-11 07:15:39 +10:00
Gaetan Lepage
467eced7c5
apptainer: 1.1.3 -> 1.1.5
2023-02-10 16:36:22 +01:00
7c6f434c
9e3a418a2f
Merge pull request #214384 from Atemu/update/govirt
...
libgovirt: 0.3.8 -> 0.3.9, virt-viewer: touchups
2023-02-10 05:29:02 +00:00
dramforever
08e6d08ace
qemu: Remove --cpu= flag
...
'./configure --cpu=$(uname -m)' (essentially) breaks the case of riscv,
where the configure script expects '--cpu=riscv', but 'uname -m' gives
'riscv{32,64}'. This eventually leads to user-mode emulation being
disabled.
Since the configure script can auto-detect the parameter based on
compilers, remove this flag.
Originally added in #147692 , but apparently it's not needed and @NickCao
couldn't remember why it was added. See also mailing list discussion at
https://lore.kernel.org/qemu-devel/20230204112502.2558739-1-mjt@msgid.tls.msk.ru/T/
2023-02-10 00:02:36 +08:00
dramforever
f70071e41d
qemu: fix cross compilation, again
...
The python dependencies were fixed for cross in #147692 , but the changes
are reversed #190560 due to concerns of accidentally mixing python
versions. Compromise by using python3Packages.python.
2023-02-09 21:55:51 +08:00
zowoq
015188525a
podman: 4.4.0 -> 4.4.1
...
https://github.com/containers/podman/releases/tag/v4.4.1
2023-02-09 18:14:35 +10:00
Nick Cao
aa06096064
Merge pull request #213832 from GenericNerdyUsername/riscof
...
python3Packages.riscof: init 1.25.2
2023-02-09 08:31:26 +08:00
GenericNerdyUsername
6f2d5c582b
sail-riscv-*: init at 0.5
2023-02-08 22:30:39 +00:00
Yueh-Shun Li
d35f5c2695
apptainer-overriden-nixos,singularity-overriden-nixos: init
2023-02-08 18:04:05 +08:00
Yueh-Shun Li
71a89291ee
apptainer, singularity: enable non-FHS --fakeroot support
...
This patch provides input arguments `newuidmapPath` and `newgidmapPath`
for apptainer and singularity to specify the path to the SUID-ed executables
newuidmap and newgidmap where they are not available from the FHS PATH.
As NixOS places those suided executables in a non-FHS position
(/run/wrapper/bin), this patch provides
programs.singularity.enableFakeroot option and implement with the above
input parameters.
2023-02-08 18:04:05 +08:00
Yueh-Shun Li
50788d2fb0
apptainer, singularity: fix defaultPath and reflect upstream changes
...
Upstream changes:
singularity 3.8.7 (the legacy) -> apptainer 1.1.3 (the renamed) / singularity 3.10.4 (Sylabs's fork)
Build process:
* Share between different sources
* Fix the sed regexp to make defaultPath patch work
* allowGoReference is now true
* Provied input parameter removeCompat (default to false)
that removes the compatible "*singularity*" symbolic links
and related autocompletion files when projectName != "singularity"
* Change localstatedir to /var/lib
* Format with nixpkgs-fmt
* Fix the defaultPath patching
and use it instead of the `<executable> path` config directive
deprecated in Apptainer
* Provide dependencies for new functionalities such as
squashfuse (unprivileged squashfs mount)
* Provide an attribute `defaultPathInputs` to override
prefix of container runtime default PATH
NixOS module programs.singularity:
* Allow users to specify packages
* Place related directories to /var/lib
* Format with nixpkgs-fmt
singularity-tools:
* Allow users to specify packages
* Place related directories to /var/lib when building images in VM
2023-02-08 18:03:11 +08:00
Weijia Wang
f0d56a9a2a
Merge pull request #212980 from tricktron/f-colima-lima-bin
...
colima: use lima-bin on darwin for native macOS virtualization support
2023-02-07 07:24:12 +01:00