Commit Graph

294908 Commits

Author SHA1 Message Date
github-actions[bot] 4bca328a88
Merge staging-next-21.05 into staging-21.05 2021-09-25 00:03:24 +00:00
github-actions[bot] 0332c24d29
Merge release-21.05 into staging-next-21.05 2021-09-25 00:02:43 +00:00
Michael Weiss 02b76b0515
Merge pull request #139358 from primeos/ungoogled-chromium-backport
[21.05] ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54
2021-09-25 00:50:41 +02:00
Michael Weiss 0f19ca835b
ungoogled-chromium: name -> pname
A partial backport of e4e631ebb81 to keep the diff minimal.
2021-09-25 00:14:35 +02:00
Michael Weiss c20993fbc9
ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54
(cherry picked from commit afaf8d094b98f8099cf29d789d33b122af6ad1ca)
2021-09-25 00:12:59 +02:00
Michael Weiss 143a7453f0
chromiumBeta: 94.0.4606.54 -> 95.0.4638.17
(cherry picked from commit b9468515932d827651838700969fc6b415590af0)
2021-09-25 00:10:01 +02:00
Daniel Fullmer 398d614203 zerotierone: 1.6.5 -> 1.6.6
(cherry picked from commit 62207eec010d76e69b1ba75eb7f72af0c223a9c8)
2021-09-24 21:27:26 +02:00
github-actions[bot] 72e691ca4b
Merge staging-next-21.05 into staging-21.05 2021-09-24 18:02:54 +00:00
github-actions[bot] 77473f9d35
Merge release-21.05 into staging-next-21.05 2021-09-24 18:02:19 +00:00
Kim Lindberger b897a166cb
Merge pull request #139203 from NixOS/backport-138852-to-release-21.05
[Backport release-21.05] nixos/discourse: add discourse.admin.skipCreate option
2021-09-24 14:30:17 +02:00
github-actions[bot] feab58fc4f
Merge staging-next-21.05 into staging-21.05 2021-09-24 12:02:51 +00:00
github-actions[bot] 8090103df5
Merge release-21.05 into staging-next-21.05 2021-09-24 12:02:14 +00:00
Michael Weiss 43003625e9
Merge pull request #139220 from primeos/chromium-backport
[21.05] chromium: 93.0.4577.82 -> 94.0.4606.54
2021-09-24 12:20:21 +02:00
Ryan Burns de3cec2c60
Merge pull request #139161 from NixOS/backport-138952-to-staging-21.05
[Backport staging-21.05] ffmpeg: patch CVE-2021-38171 and CVE-2021-38291
2021-09-23 21:05:44 -07:00
Michael Weiss 2347b9a7db
chromium: 93.0.4577.82 -> 94.0.4606.54
https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_21.html

This update includes 19 security fixes.

CVEs:
CVE-2021-37956 CVE-2021-37957 CVE-2021-37958 CVE-2021-37959
CVE-2021-37960 CVE-2021-37961 CVE-2021-37962 CVE-2021-37963
CVE-2021-37964 CVE-2021-37965 CVE-2021-37966 CVE-2021-37967
CVE-2021-37968 CVE-2021-37969 CVE-2021-37970 CVE-2021-37971
CVE-2021-37972

(cherry picked from commit 8d8b451f725b63edec06b033ff2bdaa2f0885b4e)
2021-09-23 21:48:17 +02:00
Michael Weiss a45d7e5e19
chromiumDev: 95.0.4638.10 -> 95.0.4638.17
(cherry picked from commit 56d99a735113e48d2ea51084804c5a59c5603a5f)
2021-09-23 21:48:15 +02:00
Michael Weiss 86f857ec11
chromiumBeta: 94.0.4606.50 -> 94.0.4606.54
(cherry picked from commit 7af2448b6cc227ea85f6076e5b8ee0f517c66d42)
2021-09-23 21:48:14 +02:00
github-actions[bot] 94d0274f26
Merge staging-next-21.05 into staging-21.05 2021-09-23 18:02:56 +00:00
github-actions[bot] 0542387d10
Merge release-21.05 into staging-next-21.05 2021-09-23 18:02:20 +00:00
Kerstin Humm 056a3c1fae imagemagick: 7.1.0-6 -> 7.1.0-8
(cherry picked from commit 279bff87fe97e998e959b7121b48bb0642ff053f)
2021-09-23 19:37:29 +02:00
Ryan Mulligan 3061914340 nixos/discourse: add discourse.admin.skipCreate option
(cherry picked from commit 6a9003f31682e57a2a630f5cfdefa2969a64b1b1)
2021-09-23 17:14:07 +00:00
adisbladis 1afcc8f843
Merge pull request #139190 from adisbladis/2105-poetry2nix-1_20_0
poetry2nix: 1.16.1 -> 1.20.0 (21.05)
2021-09-23 11:43:53 -05:00
adisbladis f285202340
poetry2nix: 1.16.1 -> 1.20.0 2021-09-23 11:18:17 -05:00
Bernardo Meurer d28990704d
Merge pull request #139098 from taku0/thunderbird-bin-91.1.1_release-21.05
[21.05]  thunderbird, thunderbird-bin: 91.1.0 -> 91.1.1
2021-09-23 16:13:25 +00:00
TredwellGit 67d593a330 ffmpeg: patch CVE-2021-38171 and CVE-2021-38291
https://nvd.nist.gov/vuln/detail/CVE-2021-38171
https://nvd.nist.gov/vuln/detail/CVE-2021-38291
(cherry picked from commit b1f41c918452b0b6a8d7afb14a04063ff56556df)
2021-09-23 13:31:50 +00:00
github-actions[bot] 4df0e9f666
Merge staging-next-21.05 into staging-21.05 2021-09-23 12:03:36 +00:00
github-actions[bot] b500417d25
Merge release-21.05 into staging-next-21.05 2021-09-23 12:03:00 +00:00
Moritz Hedtke d22c3a6bc1 discord: 0.0.15 → 0.0.16
(cherry picked from commit a22f2688941dd02a69cc422ba349e80030cd474f)
2021-09-22 23:22:11 -07:00
github-actions[bot] 461b839beb
Merge staging-next-21.05 into staging-21.05 2021-09-23 06:02:58 +00:00
github-actions[bot] 2aa54c26ef
Merge release-21.05 into staging-next-21.05 2021-09-23 06:02:28 +00:00
taku0 5a690eb641 thunderbird: 91.1.0 -> 91.1.1
no-buildconfig-90.patch is applied by firefox/common.nix.

D124361.diff is incorporated into the upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1727113
2021-09-23 12:38:10 +09:00
taku0 22fb3ec5a0 thunderbird-bin: 91.1.0 -> 91.1.1 2021-09-23 12:34:53 +09:00
John Ericson 2091b11642
Merge pull request #139055 from obsidiansystems/dn-backport-21.05-add-ghcjs
[backport release-21.05] ghcjs 8.10.7: init
2021-09-22 22:24:56 -04:00
Divam af724c4240 Remove old ghcjs files
(cherry picked from commit 0918598005195303347d675a75f6ea8540ca806a)
2021-09-23 10:14:39 +09:00
Divam 9ec3ff57c7 ghcjs: init at 8.10.7
The src points to the obsidiansystems repo as it has the ghcjs ported from
8.10.5 to 8.10.7, and a bunch of other fixes (#812, #811, #809)

(cherry picked from commit ba25b274f4bb0240a8ffa71e41b55712930af3d8)
Modified the stm_2_5_0_1 -> stm_2_5_0_0
2021-09-23 10:14:39 +09:00
Divam 365f138754 haskellPackages.happy_1_19_12: init at 1.19.12
(generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh)

(cherry picked from commit be7c76ae6419a00c7f76429afb7ff4591dee60ad)
2021-09-23 09:59:36 +09:00
Divam 68580f0806 haskellPackages.ghcjs-base: 0.2.0.0 -> 0.2.0.3
(cherry picked from commit c8b255cf25574808d81cc2a3b6195cc9592956eb)
2021-09-23 09:58:16 +09:00
John Ericson 2350b8c328
Merge pull request #139037 from obsidiansystems/ghc-8_10_7-21.05
[backport release-21.05] ghc 8.10.7: init
2021-09-22 20:31:42 -04:00
Divam b1814ba4b1 ghc: add the Cabal ghcjs support patch
(cherry picked from commit feac31b1f05bf8be4681b461987f26a37a47c60f)
2021-09-23 00:13:41 +00:00
Alexandre Esteves 48048824c4 ghc8.10.7: fix mingw build
(cherry picked from commit eea8e3eacec12fe4e46d3ecb8e3cbbd03a10b2f0)
2021-09-23 00:13:41 +00:00
sternenseemann 65c3102d78 ghc: 8.10.6 -> 8.10.7
https://www.haskell.org/ghc/download_ghc_8_10_7.html

(cherry picked from commit 9eca744cc0484e417deb260076241efb0a6c159d)
2021-09-23 00:13:41 +00:00
sternenseemann 56a9ec15ff ghc 8.10.6: Init
Backport which adds, rather than updates, the GHC release.

----

The only big change is required for darwin since GHC 8.10.5 now
runs xattr in the install phase on darwin:

* 11e1dcde0d
* ec451cac39

Unfortunately, it uses the host /usr/bin/xattr by default which is
present in the build due to a lack of sandboxing on darwin. That xattr
version however still requires Python 2.7 whereas Python 3.8 is in PATH
in our build. We solve this by setting the XATTR environment variable.

We can't use python3Packages.xattr since GHC expects Apple's fork of
xattr which provides some extra flags to utilize.

Co-authored-by: Cheng Shao <cheng.shao@tweag.io>

(Adapted from cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631)
2021-09-23 00:13:41 +00:00
sternenseemann b83620af90 darwin.xattr: init at 61.60.1
(cherry picked from commit 283d622397539f196416657da9dc804a4ca89846)
2021-09-23 00:13:40 +00:00
github-actions[bot] 1955284241
Merge staging-next-21.05 into staging-21.05 2021-09-23 00:05:26 +00:00
github-actions[bot] 73118ee56b
Merge release-21.05 into staging-next-21.05 2021-09-23 00:03:46 +00:00
Robert Scott 5c8efd0034
Merge pull request #137369 from NixOS/backport-134007-to-release-21.05
[Backport release-21.05] fragments: init at 1.5
2021-09-22 21:32:21 +01:00
github-actions[bot] 44a5bf6583
Merge staging-next-21.05 into staging-21.05 2021-09-22 18:02:55 +00:00
github-actions[bot] 46a071899f
Merge release-21.05 into staging-next-21.05 2021-09-22 18:02:19 +00:00
Pavol Rusnak e42f91e090
Merge pull request #138930 from NixOS/backport-138927-to-release-21.05
[Backport release-21.05] electron_12: 12.1.1 -> 12.1.2
2021-09-22 14:10:52 +02:00
github-actions[bot] caef8694df
Merge staging-next-21.05 into staging-21.05 2021-09-22 12:03:23 +00:00