Vladimír Čunát
de3a57327f
nix(Stable): 2.3.14 -> 2.3.15
...
(cherry picked from commit 9bd0be76b2219e8984566340e26a0f85caeb89cd)
2021-07-30 13:17:54 +00:00
github-actions[bot]
f0f8138529
Merge staging-next-21.05 into staging-21.05
2021-07-30 12:02:51 +00:00
github-actions[bot]
eddb3c9d5c
Merge release-21.05 into staging-next-21.05
2021-07-30 12:02:20 +00:00
Jörg Thalheim
528a5c4420
Merge pull request #132028 from NixOS/backport-132011-to-release-21.05
...
[Backport release-21.05] nixos/bird: fix bird/bird6 description
2021-07-30 10:40:02 +01:00
Martin Weinelt
de1bca4cb8
Merge pull request #131588 from NixOS/staging-next-21.05
2021-07-30 10:54:17 +02:00
Frederik Rietdijk
c32a9d4158
python2 and python3: build unoptimized bytecode again
...
In 9d03ff52229f36ff4b4e9d0ee2db4a46b90512bb I made the CPython builds
reproducible. This required not generating default unoptimized bytecode.
I was under the impression the optimized bytecode would be used then,
but you need to opt-in on that. Not having the default bytecode resulted
in a significant performance hit. Therefore, bytecode is generated again
in this commit, and thereby the builds are no longer reproducible.
https://bugs.python.org/issue29708
(cherry picked from commit 23e348bfe2b161e761dd37e3be86a807f3cd6f94)
2021-07-30 09:33:04 +02:00
Wael Nasreddine
703e32094c
Merge pull request #131977 from NixOS/backport-129447-to-release-21.05
...
[Backport release-21.05] vault: fix build for darwin
2021-07-29 23:54:40 -07:00
Martin Weinelt
0c50198047
nixos/bird: fix bird/bird6 description
...
(cherry picked from commit d902365913fd65abc2d5d5298c2b9b0beda2f2ca)
2021-07-30 06:44:37 +00:00
github-actions[bot]
1ea742607e
Merge staging-next-21.05 into staging-21.05
2021-07-30 00:03:43 +00:00
github-actions[bot]
43cf3bc049
Merge release-21.05 into staging-next-21.05
2021-07-30 00:03:06 +00:00
adisbladis
15379213a4
Merge pull request #131990 from iceman-p/backport-131189-to-release-21.05
...
[21.05] go-ethereum: 1.10.5 -> 1.10.6
2021-07-29 16:36:49 -05:00
Sumner Evans
b784cafa84
matrix-synapse: 1.38.1 -> 1.39.0
...
(cherry picked from commit 2044dcf1bb36206027624f7531cfe45545e4f36c)
2021-07-29 15:12:04 -06:00
Mario Rodas
c74bb01278
Merge pull request #131985 from marsam/backport-nodejs-release-21.05
...
[21.05] nodejs: 12.22.2 -> 12.22.4, 14.17.2 -> 14.17.4
2021-07-29 14:28:43 -05:00
R. RyanTM
cd9a630d15
go-ethereum: 1.10.5 -> 1.10.6
...
Hard fork is scheduled for August 4th and version on release-21.05 will
fall out of consensus.
(cherry picked from commit e661c7b92bbae6aa68e7c96bb04b20cf1fb4ff1b)
2021-07-29 14:56:41 -04:00
Mario Rodas
5c93bb912e
nodejs-14_x: 14.17.3 -> 14.17.4
...
https://github.com/nodejs/node/releases/tag/v14.17.4
(cherry picked from commit c7a1fddc2fe23ff2238ab5e514c1d66f757b401e)
2021-07-29 13:24:00 -05:00
Mario Rodas
ce18ca3fa5
nodejs-12_x: 12.22.3 -> 12.22.4
...
https://github.com/nodejs/node/releases/tag/v12.22.4
(cherry picked from commit 91587443b60a2c6c50079afce83eeabb8d75be64)
2021-07-29 13:23:59 -05:00
Mario Rodas
f0546d1453
nodejs-14_x: 14.17.2 -> 14.17.3
...
https://github.com/nodejs/node/releases/tag/v14.17.3
(cherry picked from commit 3826b56c7e1f6dbf058954facbf7a227895d06de)
2021-07-29 13:23:29 -05:00
Mario Rodas
f4ebd64916
nodejs-12_x: 12.22.2 -> 12.22.3
...
https://github.com/nodejs/node/releases/tag/v12.22.3
(cherry picked from commit 7ad92430427f4cf54aec3d0510446e71c1b93e3f)
2021-07-29 13:23:29 -05:00
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