Commit Graph

293299 Commits

Author SHA1 Message Date
Martin Weinelt 2bc35baa85
Merge pull request #131290 from risicle/ris-libslirp-4.6.1-r21.05 2021-07-29 00:05:56 +02:00
Robert Scott 92760b1dce
Merge pull request #131512 from risicle/ris-varnish-CVE-2021-36740
[21.05] varnish: bump, add patches for CVE-2021-36740
2021-07-28 22:36:48 +01:00
Sandro 3aeb81fd62
Merge pull request #131792 from hax404/21.05-fix-openvswitch
[21.05] nixos/openvswitch: Only include ipsecTools if using ipsec
2021-07-28 21:28:39 +00:00
Eelco Dolstra 5092dae98d
Merge pull request #131837 from NixOS/backport-131831-to-release-21.05
[Backport release-21.05] nixos-rebuild: Set inherit_errexit
2021-07-28 22:53:44 +02:00
Franz Pletz a1943f4729
Merge pull request #131847 from NixOS/backport-131478-to-release-21.05
[Backport release-21.05] libgrss: add patch for CVE-2016-20011
2021-07-28 21:30:23 +02:00
Franz Pletz a3eb736f6c
Merge pull request #131850 from NixOS/backport-131819-to-release-21.05
[Backport release-21.05] linux: 5.13.5 -> 5.13.6
2021-07-28 20:36:09 +02:00
Florian Klink 5d432c2453 linux: 5.13.5 -> 5.13.6
(cherry picked from commit b167e087810dce6f0298f078b0ad621e4bdaaf7f)
2021-07-28 18:15:47 +00:00
Robert Scott e3ebd9cdb7 libgrss: add patch for CVE-2016-20011
(cherry picked from commit b50d7d0683d61bf00a101ce7b67c7b0f065d7ff6)
2021-07-28 17:49:18 +00:00
Charlotte Van Petegem 084d0a9dce
qutebrowser: 2.3.0 -> 2.3.1
(cherry picked from commit 0cdf7b5da94f37c13c6c2366bf84c8ac779b8212)
2021-07-28 19:25:29 +02:00
Franz Pletz be037c144d
Merge pull request #131805 from Atemu/backport/update/zen-kernels
[21.05] zen-kernels: update
2021-07-28 19:15:03 +02:00
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
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
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
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
Sander van der Burg 6992766507 ecwolf: init at 1.3.3
(cherry picked from commit de9913708c019a18adce74f6ecb143073fdbbec2)
2021-07-27 19:58: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
Sandro 1bd5157b2c
Merge pull request #130829 from NixOS/backport-130273-to-release-21.05 2021-07-27 11:37:02 +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
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
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 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
TredwellGit 2f7a5aa75a linux-rt_5_10: 5.10.47-rt46 -> 5.10.52-rt47
(cherry picked from commit ee688c5c0e5c5a08f292308f1c41be84604c7e43)
2021-07-26 15:47:29 +00:00
TredwellGit 92566fadc9 linux: 5.13.4 -> 5.13.5
(cherry picked from commit 286fa7b708fa932a6955b796628486c13f5fee24)
2021-07-26 15:47:28 +00:00
Sander van der Burg 6da1f11195 eduke32: 20200907 -> 20210722
(cherry picked from commit 94ac68c879f4b172ade9cd7fabca1b9ed85bcdd1)
2021-07-26 16:58:31 +02:00
R. RyanTM e1489da3b2 hydroxide: 0.2.18 -> 0.2.19
(cherry picked from commit 23e2cf23bcee0567e22a0f7dc0859f988cd7e500)
2021-07-26 12:58:24 +00:00
R. RyanTM bfd24c0bd8 feh: 3.7 -> 3.7.1
(cherry picked from commit 1493f098f819530d60f5d226dbf6a0308098833d)
2021-07-26 10:46:14 +00:00
Martin Weinelt c8569c32ba
Merge pull request #131546 from taku0/firefox-bin-90.0.2_release-21.05 2021-07-26 11:56:15 +02:00
Maximilian Bosch 91903ceb29
Merge pull request #131256 from NixOS/backport-131188-to-release-21.05
[Backport release-21.05] prometheus-openldap-exporter: 2.1 -> 2.1.4
2021-07-26 09:21:28 +02:00
Maximilian Bosch e6c441a5dc
Merge pull request #131524 from NixOS/backport-131217-to-release-21.05
[Backport release-21.05] element-{web,desktop}: 1.7.31 -> 1.7.33
2021-07-26 09:13:44 +02:00
Michael Weiss 4f6946867e
Merge pull request #131461 from primeos/chromium-backport
[21.05] chromium: 91.0.4472.164 -> 92.0.4515.107
2021-07-26 08:49:13 +02:00
taku0 caf1219646 firefox: 90.0.1 -> 90.0.2
(cherry picked from commit 82feb1120172e0615e1f6f4dc517a69e8c6c03f6)
2021-07-26 14:08:16 +09:00
taku0 1096ca11df firefox-bin: 90.0.1 -> 90.0.2
(cherry picked from commit b14e3171773c1791b50dc19fa6d68cc285b11741)
2021-07-26 14:08:16 +09:00