294901 Commits

Author SHA1 Message Date
github-actions[bot]
a0da4b7b0c
Merge release-21.05 into staging-next-21.05 2021-09-27 00:02:34 +00:00
Robert Scott
7baaef39fe
Merge pull request #139575 from NixOS/backport-124297-to-release-21.05
[Backport release-21.05] lief: 0.11.4 -> 0.11.5
2021-09-27 00:00:01 +01:00
Martin Weinelt
ac914045db
Merge pull request #137022 from Flakebi/salt-backport 2021-09-27 00:26:34 +02:00
R. RyanTM
0352b72f3c lief: 0.11.4 -> 0.11.5
(cherry picked from commit 9d396b5600b018f84e90e56c61dfaef1b149e330)
2021-09-26 21:54:38 +00:00
github-actions[bot]
f7ed81bce2
Merge release-21.05 into staging-next-21.05 2021-09-26 18:02:14 +00:00
Michael Weiss
8d943dfce6
Merge pull request #139539 from NixOS/backport-139415-to-release-21.05
[Backport release-21.05] ungoogled-chromium: 94.0.4606.54 -> 94.0.4606.61
2021-09-26 18:49:48 +02:00
Michael Weiss
d604d3ee9c ungoogled-chromium: 94.0.4606.54 -> 94.0.4606.61
(cherry picked from commit d66e4eea8550cc10d2f579b4e821639d44deae01)
2021-09-26 14:40:22 +00:00
Doron Behar
e7eebf5fc3
Merge pull request #139481 from hrhino/backport/128077 2021-09-26 12:39:30 +00:00
github-actions[bot]
80b9a8838b
Merge release-21.05 into staging-next-21.05 2021-09-26 12:02:23 +00:00
Fabián Heredia Montiel
fd8a7fd07d nvidia_x11: 470.57.02 → 470.63.01
(cherry picked from commit ff0dfaaee0975cc0deb118f51120e281eccc6497)

Required since the kernel upgrade on 21.05, compilation for the driver
fails on 5.14.

See [this
comment][https://github.com/NixOS/nixpkgs/issues/132840#issuecomment-920847065]
for more details.
2021-09-26 08:53:04 +02:00
github-actions[bot]
6fbe5ba8d2
Merge release-21.05 into staging-next-21.05 2021-09-26 06:02:30 +00:00
Artturi
4ad195e3f4
Merge pull request #139495 from NixOS/backport-139485-to-release-21.05
[Backport release-21.05] libnatpmp: make files in $out/lib executable
2021-09-26 06:45:29 +03:00
Artturin
23ca79f291 libnatpmp: make files in $out/lib executable
Fixes https://github.com/NixOS/nixpkgs/issues/139197

(cherry picked from commit be3bc77e3175f055e634ca1375d7cbdb60facfad)
2021-09-26 02:02:22 +00:00
github-actions[bot]
bf21cf4da2
Merge release-21.05 into staging-next-21.05 2021-09-26 00:02:39 +00:00
Robert Scott
47b0bee8b4
Merge pull request #139440 from NixOS/backport-139401-to-release-21.05
[Backport release-21.05] perlPackages.ConvertASN1: 0.27 -> 0.33
2021-09-25 22:48:27 +01:00
Doron Behar
ce711cc113 imagej: 150 -> 153
(cherry picked from commit 796ae067c4b6348e900c1384ef3759dc90fef01c)
2021-09-25 17:33:55 -04:00
Doron Behar
d16a1e9975 imagej: Add desktop item and icon
(cherry picked from commit 0750062126633db814ead9298902e845102ab1ba)
2021-09-25 17:33:44 -04:00
Doron Behar
487300c6aa imagej: reformat expression
- Use 1 line per input argument.
- Don't use let ... in if not needed.
- Use ${version} in url string.
- Run hooks in explicit installPhase.

(cherry picked from commit e1d6051d81835079f0e37e1d5fc5f029f32df512)
2021-09-25 17:33:35 -04:00
github-actions[bot]
f91be95473
Merge release-21.05 into staging-next-21.05 2021-09-25 18:02:16 +00:00
Maciej Krüger
9f371831e2
Merge pull request #139446 from NixOS/backport-138623-to-release-21.05 2021-09-25 19:07:54 +02:00
figsoda
4df9f1a69b
Merge pull request #139417 from sersorrel/backport-playerctl-v2.4.1
[21.05] playerctl: 2.3.1 -> 2.4.1
2021-09-25 12:39:32 -04:00
Maximilian Bosch
9e29f211ba nixUnstable: 2.4pre20210908_3c56f62 -> 2.4pre20210922_bcd73eb
Changes: 3c56f62...bcd73eb

I figured that now with an actual 2.4 release around the corner[1] we
could bump it a bit more often considering that it seems to contain
mostly bugfixes, so that upstream receives a bit more feedback.

[1] https://discourse.nixos.org/t/tweag-nix-dev-update-17/15037

(cherry picked from commit 615d368aa000279f1c63d9c5521859181b5fbfe3)
2021-09-25 15:32:55 +00:00
maralorn
42142cc1bc
Merge pull request #139423 from NixOS/backport-139336-to-release-21.05
[Backport release-21.05] nix-output-monitor: 1.0.3.2 -> 1.0.3.3
2021-09-25 17:19:04 +02:00
figsoda
77f2a47595
Merge pull request #139405 from eduarrrd/backport
[21.05] psi-notify: init at 1.2.1
2021-09-25 10:26:26 -04:00
Thomas Gerbet
acf683f0b8 perlPackages.ConvertASN1: 0.27 -> 0.33
Fixes CVE-2013-7488.
https://metacpan.org/dist/Convert-ASN1/changes

(cherry picked from commit ccb5c2285b2f8110ae469ac23e2cad63f761ed95)
2021-09-25 13:49:01 +00:00
github-actions[bot]
957812c288
Merge release-21.05 into staging-next-21.05 2021-09-25 12:02:26 +00:00
Malte Brandy
17ee0b23fe nix-output-monitor: 1.0.3.2 -> 1.0.3.3
(cherry picked from commit f779a0ff03497e83dab5b04182c13cd2ef347274)
2021-09-25 11:50:22 +00:00
maralorn
23e9876f22
Merge pull request #139340 from NixOS/backport-138250-to-release-21.05
[Backport release-21.05] nix-output-monitor: 1.0.3.1 -> 1.0.3.2
2021-09-25 13:32:02 +02:00
R. RyanTM
f203c41098 playerctl: 2.3.1 -> 2.4.1
(cherry picked from commit b01290e0ecef1b2a57760fdd0facf0f0f48610ae)

Reason: fixes a crash with TrackList and Playlists interfaces [1]

[1]: https://github.com/altdesktop/playerctl/pull/215
2021-09-25 11:33:12 +01:00
Michael Weiss
2502b34166
Merge pull request #139329 from NixOS/backport-139318-to-release-21.05
[Backport release-21.05] chromium: 94.0.4606.54 -> 94.0.4606.61
2021-09-25 11:55:23 +02:00
Eduard Bachmakov
418a762043 psi-notify: init at 1.2.1
(cherry picked from commit 37ec684a5c010aa7cf51abaf29691ef2333d6625)
2021-09-25 11:32:27 +02: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]
77473f9d35
Merge release-21.05 into staging-next-21.05 2021-09-24 18:02:19 +00:00
Malte Brandy
a94c6e2dc4 nix-output-monitor: 1.0.3.1 -> 1.0.3.2
(cherry picked from commit a96fe065eee37d61972386b96d1573102b12b4a2)
2021-09-24 17:49:27 +00:00
Michael Weiss
df409303ab chromium: 94.0.4606.54 -> 94.0.4606.61
(cherry picked from commit 15bb3ac5a92552e1264bb457084eea72b263e179)
2021-09-24 14:01:33 +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]
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
Flakebi
e6e7e3df1b salt: 3003.2 -> 3003.3
(cherry picked from commit 4ad4ae68c427ef8458be34051b4e545eb752811c)
2021-09-24 09:59:34 +02:00
Flakebi
348d0b0626 salt: 3003.1 -> 3003.2
(cherry picked from commit da3e6504941a8162f08a9b1e99914d807deada71)
2021-09-24 09:59:27 +02:00
Flakebi
962a2f26a0 salt: 3003 -> 3003.1
Need to patch out the contextvars dependency (which is included in
python 3.7+).
The same patch is discussed in arch:
https://bugs.archlinux.org/task/71344

(cherry picked from commit c0b46c6b596dd25f32733ff01156d3d769640ab5)
2021-09-24 09:59:20 +02: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]
0542387d10
Merge release-21.05 into staging-next-21.05 2021-09-23 18:02:20 +00:00