Domen Kožar
0f8f64b54e
Merge pull request #125475 from NixOS/backport-125372-to-release-21.05
...
[Backport release-21.05] nixos/tests/test-driver: add shell_interact
2021-06-03 13:11:46 +02:00
Patrick Hilhorst
9452c8fb4b
nixos/tests/test-driver: make it clear when shell is ready
...
Co-authored-by: Domen Kožar <domen@enlambda.com>
(cherry picked from commit fd739c4dee12fbe57199f73c44ec22db2355028e)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
5ed752dd35
nixos/tests/test-driver: mention drawback
...
(cherry picked from commit 287144273162acd869f514f7770a3daae4649d37)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
9046996543
nixos/tests/test-driver: document shell_interact
...
(cherry picked from commit 9469433e341f7337308468bb4b9ccfff84b2951b)
2021-06-03 09:49:17 +00:00
Patrick Hilhorst
e3e37d20ce
nixos/tests/test-driver: add shell_interact
...
(cherry picked from commit 5a589b5ba8941d734e9c3aebbf2be2f50d7c32a5)
2021-06-03 09:49:17 +00:00
Dmitry Kalinkin
2d1b9ef5e7
blender: fix darwin build
...
(cherry picked from commit dca87350f4e00539e52731628b98cbcc15c4319a)
2021-06-03 04:30:30 -04:00
Jonas Carpay
eab4608a67
blender: 2.92.0 -> 2.93.0
...
(cherry picked from commit ff60dfcc7f700a9f60c5ff3ebbcf61781c17671e)
2021-06-03 04:30:30 -04:00
github-actions[bot]
6feba09c53
redis: 6.2.3 -> 6.2.4 ( #125444 )
...
https://github.com/redis/redis/releases/tag/6.2.4
(cherry picked from commit 8d34fb204ce256c124b35968f6bf3ee940bb36fc)
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
2021-06-03 00:45:22 -04:00
Martin Weinelt
40203c4061
Merge pull request #125336 from NixOS/backport-125306-to-release-21.05
...
[Backport release-21.05] firefox-esr: 78.10.1esr -> 78.11.0esr
2021-06-03 05:12:51 +02:00
adisbladis
a1acedfd1d
Merge pull request #125406 from eduardosm/dr14_tmeter
...
[21.05] dr14_tmeter: use ffmpeg 4
2021-06-02 20:17:57 -05:00
Dennis Gosnell
e5e05cd00f
Merge pull request #125433 from sternenseemann/greenclip-fix
...
[21.05] haskellPackages.greenclip: unbreak
2021-06-03 09:30:14 +09:00
Milan
4691b50a4e
gitlab: 13.12.0 -> 13.12.2
...
https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/
Backport of #125271
(cherry picked from commit 2a1c29ef4bacac06f9b677931027bf053952618c)
2021-06-03 00:54:21 +02:00
sternenseemann
ca783d93bb
haskellPackages.greenclip: unmark as broken
...
libXScrnSaver is passed correctly now, so greenclip builds again.
2021-06-03 00:40:43 +02:00
sternenseemann
29a8095f13
hackage-packages.nix: Regenerate based on current config
...
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
Main point here is to apply the new cabal2nix-unstable generation with
a libNixName entry for libXScrnSaver, so greenclip builds again.
2021-06-03 00:35:41 +02:00
(cdep)illabout
7c53004026
haskellPackages.cabal2nix-unstable: update to latest version from github
...
(cherry picked from commit 259177f1097be0f8de5969242e98f8e026df8037)
2021-06-03 00:30:40 +02:00
Maximilian Bosch
f365fa7c5e
Merge pull request #125425 from NixOS/backport-124407-to-release-21.05
...
[Backport release-21.05] synapse: 1.34.0 -> 1.35.0
2021-06-03 00:22:45 +02:00
Michele Guerini Rocco
d0f1a29ed0
Merge pull request #125411 from NixOS/backport-125392-to-release-21.05
...
[Backport release-21.05] pdns-recursor: disable on i686-linux
2021-06-02 23:53:25 +02:00
Sumner Evans
3f68a16c3e
synapse: 1.34.0 -> 1.35.0
...
(cherry picked from commit c6a546e996d7dce5a688a6718ee7baeca694ddde)
2021-06-02 21:46:19 +00:00
rnhmjoj
98f321b5bb
pdns-recursor: disable on i686-linux
...
Support for 32-bit platforms with no 64-bit time_t has ended.
See https://mailman.powerdns.com/pipermail/pdns-users/2021-May/027220.html
(cherry picked from commit cbfd8831a1082f6bea819f92c8bfd6ec688c9fc4)
2021-06-02 18:52:06 +00:00
Eduardo Sánchez Muñoz
aedd9a2dc6
dr14_tmeter: use ffmpeg 4
...
migrate away from ffmpeg_3 (https://github.com/NixOS/nixpkgs/issues/120705 )
(cherry picked from commit 0b32978596d24542e6561a31b5f134ddcc6b811c)
2021-06-02 19:40:46 +02:00
Robert Hensing
297970378b
Merge pull request #125341 from hercules-ci/backport-podman-improvements
...
[Backport release-21.05] podman improvements
2021-06-02 18:23:15 +02:00
Robert Hensing
68e821b051
Merge pull request #125388 from NixOS/backport-125216-to-release-21.05
...
[Backport release-21.05] dockerTools: Fix passthru image tag
2021-06-02 17:19:19 +02:00
Robert Hensing
fc30ee8ce7
dockerTools: Fix passthru image tag
...
It should match the actual image tag.
This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde
https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901
(cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f)
2021-06-02 15:02:31 +00:00
Martin Weinelt
bdf95a994e
lasso: Fix signature verification in AuthnResponse messages
...
Fixes: CVE-2021-28091
2021-06-02 16:49:11 +02:00
Michele Guerini Rocco
5285a51c2e
Merge pull request #125368 from NixOS/backport-125289-to-release-21.05
...
[Backport release-21.05] qutebrowser: 2.2.2 -> 2.2.3
2021-06-02 14:54:51 +02:00
Vladimír Čunát
4b04e53f2a
Merge branch 'staging-21.05' into release-21.05
...
It's a bit older version of the branch, as it has binaries from
https://hydra.nixos.org/eval/1674261
2021-06-02 13:59:29 +02:00
Robert Schütz
5b6ba9f492
python3Packages.adblock: fix build on Darwin
...
(cherry picked from commit 9f9de0069cf323533375286468e44f134c117234)
2021-06-02 11:54:54 +00:00
Robert Schütz
22e2e017df
qutebrowser: 2.2.2 -> 2.2.3
...
https://github.com/qutebrowser/qutebrowser/releases/tag/v2.2.3
(cherry picked from commit 29043644b0119bd3c5e695fb90ea5e52b4656045)
2021-06-02 11:54:54 +00:00
Thomas Depierre
0894deca29
beam-packages: drop erlang R18 R19 R20 and cuter
...
(cherry picked from commit f55c3e2f21073be564fed477847ad5bd649c9fb9)
2021-06-02 19:23:26 +09:00
Michele Guerini Rocco
5bf359c593
Merge pull request #125343 from NixOS/backport-124891-to-release-21.05
...
[Backport release-21.05] antimony: add desktop item
2021-06-02 11:38:05 +02:00
Jörg Thalheim
5dfad380ad
containerd: fix checksum
2021-06-02 11:30:23 +02:00
Robert Hensing
eaba7870ff
Merge pull request #125338 from NixOS/backport-124494-to-release-21.05
...
[Backport release-21.05] dockerTools: Allow omitting all store paths
2021-06-02 10:22:59 +02:00
zowoq
0684f78698
nixos/podman-network-socket-ghostunnel: move condition to include socket
...
(cherry picked from commit 72f54c32a6114a69caec30170a29837c91434aff)
2021-06-02 10:20:11 +02:00
Robert Hensing
eeefa0a65d
podman: Add nixosTests.podman-dnsname to tests
...
(cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)
2021-06-02 10:20:11 +02:00
Robert Hensing
c758b69375
nixos/podman-dnsname: init
...
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
Robert Hensing
9e4729617b
nixos/podman: Add defaultNetwork.extraPlugins
...
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
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
cwyc
508f877ab9
antimony: add desktop item
...
(cherry picked from commit b80463f8d574bb4efff0392c94d63021c63916b9)
2021-06-02 08:18:16 +00:00
legendofmiracles
2d5507fcd1
matterbridge: 1.12.1 -> 1.12.2
...
(cherry picked from commit a08f23039cf98d5b8648e2c3d6b872b348bac9d9)
2021-06-02 08:18:02 +00:00