Eelco Dolstra
8f5794cbda
nixos-rebuild: Set inherit_errexit
...
Without this, failure of nixBuild() and nixFlakeBuild() was ignored
(since bash doesn't inherit 'set -e' in subshells by default), so the
script would proceed with a bogus ./result link, e.g.
++ readlink -f /tmp/nixos-rebuild.NfHKxx/result
+ pathToConfig='/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
/tmp/nixos-rebuild.NfHKxx/result'
+ '[' test = switch -o test = boot ']'
+ copyToTarget '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
/tmp/nixos-rebuild.NfHKxx/result'
+ '[' '' = '' ']'
+ '[' test = switch -o test = boot -o test = test -o test = dry-activate ']'
+ targetHostCmd /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
+ '[' -z '' ']'
+ sudo -- /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
error: '/tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration' is not a recognised command
Try '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix --help' for more information.
+ echo 'warning: error(s) occurred while switching to the new configuration'
warning: error(s) occurred while switching to the new configuration
(cherry picked from commit 0ad27c8653daaf59cf0fb2e0b30561a8d86303fa)
2021-07-28 16:32:56 +00:00
github-actions[bot]
b999ed3d24
Merge staging-next-21.05 into staging-21.05
2021-07-28 12:03:15 +00:00
github-actions[bot]
02ded84748
Merge release-21.05 into staging-next-21.05
2021-07-28 12:02:37 +00:00
AndersonTorres
2a9cad505d
poppler: 21.05.0 -> 21.06.1
...
(cherry picked from commit 004970b1524ab59f791137e0954b43c2b65615bb)
2021-07-28 11:54:48 +00:00
AndersonTorres
3c21bbebb6
poppler_0_61: cosmetical rewrite 0.61.nix
...
(cherry picked from commit a4e85ae2b88d29224bad8be685e6b366845a5257)
2021-07-28 11:54:48 +00:00
AndersonTorres
a47fae9c6a
poppler_utils: cosmetical rewrite all-packages.nix
...
(cherry picked from commit 6943ac5dd761c1461438300743a153326caf3c97)
2021-07-28 11:54:47 +00:00
Atemu
cd82f6616f
linux_zen: 5.12.19 -> 5.13.5
...
(cherry picked from commit caa1c955c94564f9bdafc23f6315f88da1e0da46)
2021-07-28 13:50:45 +02:00
Atemu
55e768eefd
linux_lqx: 5.12.17 -> 5.12.19
...
(cherry picked from commit b15b762d871e1cc4fd08fbea11261de5d78fcd71)
2021-07-28 13:50:30 +02:00
Atemu
4820c77a40
linux_zen: 5.12.14 -> 5.12.19
...
(cherry picked from commit 349ff1b29e9995b36799c215b475bbb0ba351a45)
2021-07-28 13:50:30 +02:00
Atemu
3650339f63
linux_lqx: 5.12.14 -> 5.12.17
...
(cherry picked from commit 85f28b5c4f258b3376aade809903132ed1d11f2f)
2021-07-28 13:49:17 +02:00
Jörg Thalheim
ccd782596c
Merge pull request #131784 from NixOS/backport-131765-to-release-21.05
...
[Backport release-21.05] gpodder: fix gtk3 wrapping
2021-07-28 11:15:35 +01:00
Sander van der Burg
382039c05a
Merge pull request #131785 from NixOS/backport-131735-to-release-21.05
...
[Backport release-21.05] ecwolf: fix compilation on darwin
2021-07-28 10:23:12 +02:00
Sander van der Burg
099ec68772
ecwolf: fix compilation on darwin
...
(cherry picked from commit f65e1d8793c76766c45d04a507196dbff4a4e10f)
2021-07-28 07:48:59 +00:00
Jörg Thalheim
c4037352d1
Update pkgs/applications/audio/gpodder/default.nix
...
(cherry picked from commit 0f2685217c7402175988cbb2c525ab072da41904)
2021-07-28 07:14:03 +00:00
Jörg Thalheim
a16a4a91ab
gpodder: fix gtk3 wrapping
...
(cherry picked from commit 7355b2bc3d7cb11bd8764a99f31f098ef1849143)
2021-07-28 07:14:02 +00:00
github-actions[bot]
edbd80ae97
Merge staging-next-21.05 into staging-21.05
2021-07-28 06:03:54 +00:00
github-actions[bot]
cfef8879de
Merge release-21.05 into staging-next-21.05
2021-07-28 06:03:16 +00:00
ajs124
0562809586
Merge pull request #131698 from mweinelt/21.05/mysql
...
[21.05] mysql 8.0.22 -> 8.0.26
2021-07-28 02:24:17 +02:00
github-actions[bot]
dd8ba8e1d6
Merge staging-next-21.05 into staging-21.05
2021-07-28 00:03:16 +00:00
github-actions[bot]
cb0014146e
Merge release-21.05 into staging-next-21.05
2021-07-28 00:02:37 +00:00
Sander van der Burg
ed9f1dc5c0
Merge pull request #131727 from NixOS/backport-131593-to-release-21.05
...
[Backport release-21.05] ecwolf: init at 1.3.3
2021-07-27 23:14:13 +02:00
Jeremy Kolb
a8a7b26adb
kernel: enable MOUSE_PS2_VMMOUSE
...
Turns VMware guest mouse support on in the kernel. This is needed for running Wayland and non-root X in a VMWare guest. In a pre-Wayland world the `xf86-input-vmmouse` userspace driver would have handled this for us. This allows the mouse to properly work in a vmware guest (for example it can now leave the vmware window).
See: https://github.com/vmware/open-vm-tools/issues/528
(cherry picked from commit 1207e7581f7bb863d0789c980930464d92d221cb)
2021-07-27 20:36:15 +00:00
Sander van der Burg
6992766507
ecwolf: init at 1.3.3
...
(cherry picked from commit de9913708c019a18adce74f6ecb143073fdbbec2)
2021-07-27 19:58:15 +00:00
github-actions[bot]
7b42f47d0b
Merge staging-next-21.05 into staging-21.05
2021-07-27 18:02:51 +00:00
github-actions[bot]
39ddb4745d
Merge release-21.05 into staging-next-21.05
2021-07-27 18:02:15 +00:00
Michael Francis
6526d0e5c3
Only include ipsecTools if using ipsec
...
(cherry picked from commit adc368d2fc7dd74beb8486ff72880ed0212abb0d)
2021-07-27 19:46:56 +02:00
Martin Weinelt
e3e90d53a8
mysql80: 8.0.25 -> 8.0.26
...
(cherry picked from commit c3c2ca1ba0faeb486a9a5059d95f4de72e6c39b7)
2021-07-27 17:24:45 +02:00
Giulio De Pasquale
457eb2fdb3
mysql 8.0.22 -> 8.0.25
...
(cherry picked from commit f6d3da9061a54576436906e201fa336f1fdda716)
2021-07-27 17:24:31 +02:00
Luke Granger-Brown
39a99c37d2
Merge pull request #131689 from rb2k/21_05_hg_fix
...
[Backport release-21.05] mercurial: use working patch links
2021-07-27 16:14:12 +01:00
Luke Granger-Brown
5ea98b810c
mercurial: fix patch links again
...
The conclusion is that Phabricator does not, in fact, generate stable
patch links. In any case, these have landed, so we can just use the
patches from Mercurial's hgweb instance instead, which should be more
stable.
(cherry picked from commit 67444f8a393846b1431cfeb936e83a9f24725e2d)
2021-07-27 07:55:52 -07:00
Niklas Hambüchen
0a532d8b22
Merge pull request #128818 from NixOS/backport-128546-to-release-21.05
...
[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-07-27 16:18:00 +02:00
github-actions[bot]
d97a9acfd6
Merge staging-next-21.05 into staging-21.05
2021-07-27 12:03:08 +00:00
github-actions[bot]
5d113ea732
Merge release-21.05 into staging-next-21.05
2021-07-27 12:02:35 +00:00
Sandro
1bd5157b2c
Merge pull request #130829 from NixOS/backport-130273-to-release-21.05
2021-07-27 11:37:02 +00:00
github-actions[bot]
770db2f4e0
Merge staging-next-21.05 into staging-21.05
2021-07-27 06:03:10 +00:00
github-actions[bot]
0aa5191556
Merge release-21.05 into staging-next-21.05
2021-07-27 06:02:15 +00:00
Domen Kožar
82151321ee
Merge pull request #129773 from pca006132/backport
...
[21.05] rtw89: init at 2021-07-03
2021-07-27 06:51:03 +02:00
Aaron Andersen
d935d519dc
Merge pull request #131575 from NixOS/backport-131209-to-release-21.05
...
[Backport release-21.05] hydroxide: 0.2.18 -> 0.2.19
2021-07-26 21:32:22 -04:00
github-actions[bot]
0744732cab
Merge staging-next-21.05 into staging-21.05
2021-07-27 00:03:15 +00:00
github-actions[bot]
17caed6521
Merge release-21.05 into staging-next-21.05
2021-07-27 00:02:38 +00:00
Martin Weinelt
35eedec9c2
Merge pull request #131584 from NixOS/backport-131484-to-release-21.05
...
[Backport release-21.05] Kernels 2021-07-25
2021-07-27 00:26:37 +02:00
Robert Scott
8d894f90d4
varnish62, varnish63: add patch for CVE-2021-36740
2021-07-26 22:19:15 +01:00
Robert Scott
88e99266e6
varnish60: 6.0.7 -> 6.0.8
2021-07-26 22:19:15 +01:00
Alyssa Ross
93ab0e3fcd
apk-tools: 2.12.5 -> 2.12.6
...
Fixes: CVE-2021-36159
(cherry picked from commit 29475a58af1d46e48017416aba9ffbead9bf1a91)
2021-07-26 20:42:10 +00:00
github-actions[bot]
89c0dff795
Merge staging-next-21.05 into staging-21.05
2021-07-26 18:03:01 +00:00
github-actions[bot]
a5e3dc56f3
Merge release-21.05 into staging-next-21.05
2021-07-26 18:02:28 +00:00
Sander van der Burg
438263cb11
Merge pull request #131586 from svanderburg/backport-eduke32
...
[Backport release-21.05] eduke32: 20200907 -> 20210722
2021-07-26 19:53:01 +02:00
Martin Weinelt
d952d009b0
Merge pull request #131231 from NixOS/backport-130547-to-staging-21.05
...
[Backport staging-21.05] imagemagick: 7.1.0-2 -> 7.1.0-4
2021-07-26 18:36:14 +02:00
Martin Weinelt
066cc148f3
Merge pull request #131568 from NixOS/backport-131560-to-release-21.05
...
[Backport release-21.05] feh: 3.7 -> 3.7.1
2021-07-26 18:30:03 +02:00
TredwellGit
8b60c185fa
linux_latest-libre: 18165 -> 18191
...
(cherry picked from commit 2004b7b08dc1d96a5603d3138545865c036a6081)
2021-07-26 15:47:29 +00:00