292146 Commits

Author SHA1 Message Date
Robert Hensing
f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
Robert Hensing
03e08759f7 dnsname-cni: Use wrapper instead of patch for dnsmasq
The patch proved to be an incomplete solution while developing
nixosTests.podman-dnsname

(cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)
2021-06-02 10:20:11 +02:00
Robert Hensing
29ee113277 podman: Add iproute2, fixing docker network rm
(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
2021-06-02 10:20:11 +02:00
Robert Hensing
833b005e37 nixos/podman-network-socket-ghostunnel: init
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
Robert Hensing
ffde2bb4a1 nixos/podman: Add generic networkSocket interface
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
Robert Hensing
0c5e6d0bea nixos/podman: Add dockerSocket.enable
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
Robert Hensing
db05ed8b0d nixos/podman: Change podman socket to new podman group
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
zowoq
f63aff597b nixos/podman: install cni config from package
(cherry picked from commit 30ae7e4ba983de461c7b71d02274d184ab55244d)
2021-06-02 10:20:10 +02:00
zowoq
17ba99dd68 podman: install cni config
(cherry picked from commit fd59022ee9eb8d08b65df563c65e4218a68fca3c)
2021-06-02 10:20:10 +02:00
Nick Cao
0919b5c419 podman: add systemd to rpath
(cherry picked from commit ada45ac3aee664265759611d09443d549250bd70)
2021-06-02 10:20:10 +02:00
Mark Vainomaa
d33aa3d0d3 dnsname-cni: init at 1.1.1
(cherry picked from commit 5826e9020636c8ba3bc311294ce78b6466fd2b24)
2021-06-02 10:20:10 +02:00
Mark Vainomaa
73f566b2ad maintainers: add mikroskeem
(cherry picked from commit f830b000fc8aafd14bf3151178919378584e87c9)
2021-06-02 10:20:10 +02:00
zowoq
32c5e04919 docker: add clientOnly / docker-client
Currently the docker client is only available on non-linux platforms as `docker`,
this makes the client available on linux and other platforms as `docker-client`.

(cherry picked from commit 7233acd515546107e5902a8fef6832f4f319390c)
2021-06-02 09:14:21 +02:00
Martin Weinelt
bb8a5e5484
Merge pull request #125305 from NixOS/backport-125300-to-release-21.05
[Backport release-21.05] botamusique: unstable-2021-05-19 -> unstable-2021-06-01
2021-06-02 02:28:57 +02:00
Martin Weinelt
4a2d2ac6f1 botamusique: unstable-2021-05-19 -> unstable-2021-06-01
(cherry picked from commit dbb7e6bc8a6d35f8da7e74e5c47dce18a51955af)
2021-06-02 00:00:06 +00:00
Robert Scott
1c1eefa5e6
Merge pull request #125219 from NixOS/backport-125178-to-release-21.05
[Backport release-21.05] deno: 1.10.2 -> 1.10.3
2021-06-02 00:17:53 +01:00
Robert Scott
adfdebe96c
Merge pull request #125277 from NixOS/backport-125148-to-release-21.05
[Backport release-21.05] stagit: 0.9.5 → 0.9.6
2021-06-01 22:37:25 +01:00
Robert Scott
5237039cc1
Merge pull request #125230 from NixOS/backport-124603-to-release-21.05
[Backport release-21.05] php.buildPecl: Add checkPhase
2021-06-01 21:00:19 +01:00
Nikolay Korotkiy
1e15757384 stagit: 0.9.5 → 0.9.6
(cherry picked from commit dd068ab0e09ffb311d1ab43a25f390497bd26810)
2021-06-01 19:16:34 +00:00
Michele Guerini Rocco
3e45cf0eec
Merge pull request #125269 from NixOS/backport-125245-to-release-21.05
[Backport release-21.05] warzone2100: fix build
2021-06-01 21:02:38 +02:00
Robert Scott
7c1d76fbeb
Merge pull request #125126 from NixOS/backport-125111-to-release-21.05
[Backport release-21.05] lua5_4: 5.4.2 -> 5.4.3
2021-06-01 19:44:38 +01:00
Robert Scott
0c988f04d7
Merge pull request #125249 from NixOS/backport-124995-to-release-21.05
[Backport release-21.05] ijq: 0.2.3 → 0.3.4
2021-06-01 19:38:40 +01:00
Robert Scott
6f38e99a9e
Merge pull request #125248 from NixOS/backport-124986-to-release-21.05
[Backport release-21.05] libccd: fix pkgconfig file paths
2021-06-01 19:32:36 +01:00
rnhmjoj
047b146b74 warzone2100: fix build
I'm not sure how the build broke[1] or how it worked before, but
the problem is zip is being used in place of p7zip, which obviously
fail as the flags have different meanings.

[1]: https://hydra.nixos.org/build/143354937

(cherry picked from commit 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2)
2021-06-01 18:19:01 +00:00
Robert Scott
dbfaab83a8
Merge pull request #125247 from NixOS/backport-124996-to-release-21.05
[Backport release-21.05] schismtracker: 20200412 -> 20210525
2021-06-01 18:13:16 +01:00
Jan Tojnar
cd3aba49e9 ijq: 0.2.3 → 0.3.4
https://github.com/gpanders/ijq/compare/v0.2.3...v0.3.4
(cherry picked from commit 691a876749de1029f150b3ff7e23cf92403510a4)
2021-06-01 16:06:36 +00:00
Ben Wolsieffer
8c6a3a60e5 libccd: fix pkgconfig file paths
libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have
submitted the fix upstream, but don't have much hope of getting it merged
because there have been no updates since 2018.

(cherry picked from commit 3d2092ab58fe83e89a3162728e9d4b733295b561)
2021-06-01 16:06:26 +00:00
Pavol Rusnak
0121624e3b schismtracker: 20200412 -> 20210525
(cherry picked from commit 20b1b6e68ba4db1b39ac49280c0d83e811a5c19a)
2021-06-01 16:06:24 +00:00
Fabian Affolter
e2e4a34717
Merge pull request #125229 from NixOS/backport-125225-to-release-21.05
[Backport release-21.05] changelog: fix typo
2021-06-01 17:30:36 +02:00
Robert Scott
71de7777c2
Merge pull request #125164 from NixOS/backport-125160-to-release-21.05
[Backport release-21.05] delve: disable source fortify at runtime
2021-06-01 16:15:30 +01:00
Marco Sirabella
89e61ccf69 php.buildPecl: Add checkPhase
Also update phpPackages' to use NO_INTERACTION

(cherry picked from commit 3a66432f2616484c880b6daea2393bf1e9425a33)
2021-06-01 14:38:16 +00:00
Sandro
d790395393 changelog: fix typo
(cherry picked from commit 8217ea50000728c55fe8b21454ca2572743d8302)
2021-06-01 14:36:54 +00:00
Robert Scott
37b13b3d08
Merge pull request #125226 from NixOS/backport-124892-to-release-21.05
[Backport release-21.05] yara: 4.0.5 -> 4.1.1
2021-06-01 15:34:44 +01:00
Vladimír Čunát
9660a9f481
Merge #125185: zstd: patch test flakiness on i686 2021-06-01 16:09:50 +02:00
Shea Levy
cf0f4ade63
Merge branch 'discord-backport' into release-21.05 2021-06-01 10:04:41 -04:00
Robert Scott
abc7f8ee12 yara: add enableStatic mode
useful because tests can be enabled in this mode

(cherry picked from commit 8cda1cc59e7cd01ce2ff18bc78f6b7a0e7faed19)
2021-06-01 14:02:39 +00:00
Robert Scott
529b6eee47 yara: 4.0.5 -> 4.1.1
(cherry picked from commit 2d7f554229393ddb0441dd31e37db7ad7b48dab0)
2021-06-01 14:02:39 +00:00
Sandro
79b7348294
Merge pull request #124818 from NixOS/backport-124200-to-release-21.05 2021-06-01 15:41:32 +02:00
R. RyanTM
0462a6da7a deno: 1.10.2 -> 1.10.3
(cherry picked from commit c89224c2d351fa860fe7703aba498b6f64e28f41)
2021-06-01 13:06:32 +00:00
Kerstin Humm
705afa0294 haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm
(cherry picked from commit b401b432099d174dadd26a4c00f5afb62d7c2e01)
2021-06-01 13:36:02 +02:00
Kerstin Humm
a87958a49d haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version
(cherry picked from commit 8f33bb975daf526d916035413b67fcc939f09c5c)
2021-06-01 13:35:40 +02:00
Jonathan Ringer
a1d551b23b
discord: fix runtime linking
(cherry picked from commit c5bed409b29dfbf467a71fab9679cf189ccfa428)
2021-06-01 07:34:28 -04:00
wearemnr
803502aaae
discord: 0.0.14 -> 0.0.15
(cherry picked from commit 501e54080dfc82c41011d371677a7390eab61586)
2021-06-01 07:34:18 -04:00
Jörg Thalheim
3182caa035
Merge pull request #125173 from NixOS/backport-125158-to-release-21.05
[Backport release-21.05] radare2: 5.2.1 -> 5.3.0
2021-06-01 13:13:11 +02:00
Vladimír Čunát
cb58ba1c55
zstd: patch test flakiness on i686
https://hydra.nixos.org/build/143933617/nixlog/246/tail
The last attempt I see on 21.05 has failed:
https://hydra.nixos.org/build/144447049#tabs-buildsteps
2021-06-01 11:22:50 +02:00
Sandro
4eb41db7d8
Merge pull request #124595 from mohe2015/backport-124347-21.05 2021-06-01 10:01:00 +02:00
Jörg Thalheim
9d541e4a1e
Merge pull request #125175 from NixOS/backport-125174-to-release-21.05
[Backport release-21.05] nginx: fix link to discussion explaining why "with" is not used
2021-06-01 09:38:28 +02:00
Vincent Bernat
4718cb50f5 nginx: fix link to discussion explaining why "with" is not used
This is because we are in a huge "rec" that takes precedence for
symbols in its scope, despite the more nested "with".

(cherry picked from commit 7ee8945a120da5b10fa0eac9fc59b92531ac8552)
2021-06-01 07:30:28 +00:00
Jörg Thalheim
25ffebcb62 radare2: 5.2.1 -> 5.3.0
(cherry picked from commit bfaa9f175bdfd9a5106021ae1906a35f429e283f)
2021-06-01 07:17:08 +00:00
Jörg Thalheim
739359e2c6
Merge pull request #125055 from NixOS/backport-124544-to-release-21.05
[Backport release-21.05] vmTools: update current lts versions of ubuntu/debian
2021-06-01 08:14:50 +02:00