Commit Graph

293616 Commits

Author SHA1 Message Date
github-actions[bot] eb280e0cf6
Merge staging-next-21.05 into staging-21.05 2021-07-29 18:02:53 +00:00
github-actions[bot] f9b747d533
Merge release-21.05 into staging-next-21.05 2021-07-29 18:02:20 +00:00
Jason Felice 8cee48a0b2 vault, vault-bin: fix build for darwin
Closes #129443

(cherry picked from commit e0cda3708af3a38397f4f0f1c3d8a3fbad222c48)
2021-07-29 16:45:37 +00:00
Michael Weiss ca137ac841
Merge pull request #131941 from NixOS/backport-131932-to-release-21.05
[Backport release-21.05] signal-desktop: 5.10.0 -> 5.11.0
2021-07-29 18:41:07 +02:00
Maximilian Bosch 6bbafdcd4e
Merge pull request #131957 from NixOS/backport-131879-to-release-21.05
[Backport release-21.05] vagrant: 2.2.17 -> 2.2.18
2021-07-29 16:57:57 +02:00
Pavol Rusnak 0e9aa7d71c python3Packages.trezor: 0.12.2 -> 0.12.3
(cherry picked from commit f2821e16ace335fc99172540968e438360d26bc8)
2021-07-29 14:26:47 +00:00
Maximilian Bosch 4dd3d35102 vagrant: 2.2.17 -> 2.2.18
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.18/CHANGELOG.md#2218-july-27-2021
(cherry picked from commit 9f0ced4a68a23cdba01bdf9d33e54595a395ed73)
2021-07-29 14:00:18 +00:00
github-actions[bot] d228dbd8d8
Merge staging-next-21.05 into staging-21.05 2021-07-29 12:03:06 +00:00
github-actions[bot] 1785d7020c
Merge release-21.05 into staging-next-21.05 2021-07-29 12:02:32 +00:00
Michael Weiss d8b84d9618 signal-desktop: 5.10.0 -> 5.11.0
(cherry picked from commit ce6a51bd14f3585b5ad63b672019bc8d6cf47ae9)
2021-07-29 11:10:21 +00:00
Sandro e1fbb93088
Merge pull request #131536 from chuahou/update-flameshot
flameshot: 0.10.0 -> 0.10.1
(cherry picked from commit 8963fb9ff9dbde6422650fac475a3c653caba081)
2021-07-29 18:30:54 +08:00
Ryan Horiguchi ec25a3db05
flameshot: 0.9.0 -> 0.10.0
(cherry picked from commit 7937fefa7802e3f18d01f2c2867813200663cb06)
2021-07-29 18:26:20 +08:00
Vladimír Čunát f90d817036
linuxPackages_latest.perf: fix build
Broken by kernel updates; NixPkgs master fixed this in a128e443c,
but I decided to be more conservative.
2021-07-29 11:55:38 +02:00
Harrison Houghton 85924eaaa8 bpftools: fix
At some point the name of the doc-tool script changed and we stopped
patching up the shabang line. The new one is just scripts/bpf_doc.py.

(cherry picked from commit 8997f8cc709f6d1801a23de80a7954e48116d1b2)
2021-07-29 09:42:48 +00:00
Martin Weinelt 187fa36724 fetchmail: 6.4.16 -> 6.4.20
Fixes: CVE-2021-36386
(cherry picked from commit 975a9d2e4b14574ba1ec80c46acc6b4c471f3a70)
2021-07-29 07:21:14 +00:00
github-actions[bot] 5010d50240
Merge staging-next-21.05 into staging-21.05 2021-07-29 06:03:41 +00:00
github-actions[bot] 7b2fe6b372
Merge release-21.05 into staging-next-21.05 2021-07-29 06:03:06 +00:00
Anderson Torres 2262d7863a
Merge pull request #130816 from NixOS/backport-130783-to-release-21.05
[Backport release-21.05] palemoon: 29.2.1 -> 29.3.0
2021-07-29 00:15:35 -03:00
github-actions[bot] 4e6b00de06
Merge staging-next-21.05 into staging-21.05 2021-07-29 00:03:44 +00:00
github-actions[bot] e6c1d10f4b
Merge release-21.05 into staging-next-21.05 2021-07-29 00:03:09 +00:00
Martin Weinelt c72c4650de
Merge pull request #131899 from NixOS/backport-126687-to-release-21.05
[Backport release-21.05] exif: add patches for CVE-2021-27815
2021-07-29 00:41:17 +02:00
Robert Scott 33c7f751dc exif: add patches for CVE-2021-27815
(cherry picked from commit 764a102f35757e8916039f4ed3e88ba35d7a2195)
2021-07-28 22:13:23 +00:00
Martin Weinelt 2bc35baa85
Merge pull request #131290 from risicle/ris-libslirp-4.6.1-r21.05 2021-07-29 00:05:56 +02:00
Eelco Dolstra 3460fd6959 nix-fallback-paths.nix: Update to 2.3.15
(cherry picked from commit 512ee6db3997920c51b2a15c3510683aac934b31)
2021-07-28 21:52:32 +00: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
David Arnold f6754032ee nixos/installer: force root fs type
installer media can be used on top of existing host configs. In such
scenarions, root fs types will already be defined.

Before this change, this will inevitably lead to the following error:
```console
error: The option `fileSystems./.fsType' has conflicting definition values:
       - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4"
       - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs"
```

With this patch, the installers will override those values according to
their own local requirement.

Use `mkOverride 60` so that conscientious overriding specially targeted
at the installer, e.g. with `mkForce` is still straight forward.

(cherry picked from commit c219fdffad3fa76c43824bee34d5fb424ff95b87)
2021-07-28 20:27:51 +00: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
github-actions[bot] 13a8dfa5d5
Merge staging-next-21.05 into staging-21.05 2021-07-28 18:03:13 +00:00
github-actions[bot] 98530c2e9e
Merge release-21.05 into staging-next-21.05 2021-07-28 18:02:32 +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
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
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