294068 Commits

Author SHA1 Message Date
Izorkin
81ed9fd47b
ffmpeg_4: fix incorrect segment length in hls
(cherry picked from commit ae8dd3c149b4d49e683f1414d417801b80b283e2)
2021-08-19 13:19:20 +02:00
Vladimír Čunát
46c853dfc2
Merge #134714: gpgme: move flaky patch URL to local file
(cherry picked from commit 4c88dc6a7035089ab3a311bfd09a790ea3ff5d35)
2021-08-19 09:56:11 +02:00
github-actions[bot]
57607e810f
Merge staging-next-21.05 into staging-21.05 2021-08-19 06:02:49 +00:00
github-actions[bot]
119d0ca33a
Merge release-21.05 into staging-next-21.05 2021-08-19 06:02:14 +00:00
Wael Nasreddine
c7315b77ef
Merge pull request #134759 from NixOS/backport-124815-to-release-21.05
[Backport release-21.05] config.hardware.onlykey: update the udev rules for onlykey
2021-08-18 21:07:04 -07:00
Wael M. Nasreddine
dff77786cf config.hardware.onlykey: update the udev rules for onlykey
The udev rules were updated upstream without an explanation as you can
see in [this comment][commit].

[commit]: 0bcf928ada

(cherry picked from commit eab36fabf6168f8fdbb2b835ce3ab689b9902ab1)
2021-08-19 03:25:13 +00:00
Wael M. Nasreddine
6c50c69d97 config.hardware.onlykey: move the module into its own folder
(cherry picked from commit 1f9e0192603f335e2bf29e7bb2a67acd5c4cb3c9)
2021-08-19 03:25:13 +00:00
github-actions[bot]
dad73ee885
Merge staging-next-21.05 into staging-21.05 2021-08-19 00:03:51 +00:00
github-actions[bot]
2311e122d4
Merge release-21.05 into staging-next-21.05 2021-08-19 00:02:39 +00:00
Maximilian Bosch
7bbafa9a3c
Merge pull request #134299 from NixOS/backport-124942-to-release-21.05
[Backport release-21.05] gitui: 0.15.0 -> 0.16.0
2021-08-19 01:09:53 +02:00
github-actions[bot]
008f7e4f05
Merge staging-next-21.05 into staging-21.05 2021-08-18 12:03:03 +00:00
github-actions[bot]
8b74ece217
Merge release-21.05 into staging-next-21.05 2021-08-18 12:02:26 +00:00
Vladimír Čunát
7bbca9877c
Merge #134298: linux_5_12: remove (into release-21.05) 2021-08-18 09:26:59 +02:00
github-actions[bot]
739352cb60
Merge staging-next-21.05 into staging-21.05 2021-08-18 06:04:28 +00:00
github-actions[bot]
9b9c8e4fda
Merge release-21.05 into staging-next-21.05 2021-08-18 06:03:41 +00:00
Vladimír Čunát
4050fb937f
Merge #134354: gpgme: fix failing patch download
(cherry picked from commit 91b178c3f00c23eb8b47bb540262faf5646da75d)
2021-08-18 07:31:39 +02:00
github-actions[bot]
6772be8a5d
Merge staging-next-21.05 into staging-21.05 2021-08-18 00:03:17 +00:00
github-actions[bot]
4955c065ca
Merge release-21.05 into staging-next-21.05 2021-08-18 00:02:34 +00:00
Michael Raskin
97c5d0cbe7
Merge pull request #134504 from NixOS/backport-134493-to-release-21.05
[Backport release-21.05] monotone: fix key encryption
2021-08-17 18:44:23 +00:00
Michael Raskin
f037cc9ff4 monotone: fix key encryption
(cherry picked from commit 5dd7c7a079e0b0c9799c5275714de5699fb0ffc3)
2021-08-17 18:02:17 +00:00
github-actions[bot]
c1e5f0fe3c
Merge staging-next-21.05 into staging-21.05 2021-08-17 12:03:22 +00:00
github-actions[bot]
98c6091c14
Merge release-21.05 into staging-next-21.05 2021-08-17 12:02:47 +00:00
Jörg Thalheim
8c3b502c7c
Merge pull request #134406 from NixOS/backport-134340-to-release-21.05
[Backport release-21.05] nixos: fix release notes about linux_latest version
2021-08-17 08:28:55 +01:00
Jörg Thalheim
dad2c73c36
Merge pull request #134405 from NixOS/backport-134402-to-release-21.05
[Backport release-21.05] nixos-generators: 1.3.0 -> 1.4.0
2021-08-17 08:28:22 +01:00
Bjørn Forsman
991e12bfdb nixos: fix release notes about linux_latest version
It's version 5.13, not 5.12.

(cherry picked from commit a37965f7c5d26938774677e97b9f6c9e35bce701)
2021-08-17 07:12:42 +00:00
lassulus
05e6f69901 nixos-generators: 1.3.0 -> 1.4.0
(cherry picked from commit e701bc3bfbc82e3e6bd3321c3999a085cb6fba1c)
2021-08-17 07:04:35 +00:00
github-actions[bot]
95dde93451
Merge staging-next-21.05 into staging-21.05 2021-08-17 06:03:01 +00:00
github-actions[bot]
c3f08e6146
Merge release-21.05 into staging-next-21.05 2021-08-17 06:02:28 +00:00
github-actions[bot]
8ac4e2037a
drawpile,drawpile-server-headless: 2.1.17 -> 2.1.19
(cherry picked from commit 5919a4254607dd6a08c964aaaf0a180c6cd6214d)
2021-08-16 21:54:13 -04:00
github-actions[bot]
1220237519
Merge staging-next-21.05 into staging-21.05 2021-08-17 00:03:42 +00:00
github-actions[bot]
444e630f23
Merge release-21.05 into staging-next-21.05 2021-08-17 00:02:41 +00:00
Michael Weiss
543d4ecac2
Merge pull request #134200 from primeos/security-backports-for-21.05
[21.05] glances: 3.1.7 -> 3.2.3
2021-08-16 22:36:55 +02:00
Robert Scott
6d41a79a0e
Merge pull request #134013 from NixOS/backport-131867-to-release-21.05
[Backport release-21.05] traefik: 2.4.8 -> 2.4.13
2021-08-16 20:40:19 +01:00
Robert Scott
c44b9fa44b
Merge pull request #134083 from NixOS/backport-134001-to-release-21.05
[Backport release-21.05] redmine: 4.2.1 -> 4.2.2
2021-08-16 20:39:41 +01:00
Maximilian Bosch
94c989365d
Merge pull request #134297 from NixOS/backport-134205-to-release-21.05
[Backport release-21.05] Kernels 2021-08-15
2021-08-16 20:48:48 +02:00
Robert Scott
9c7404d96f
Merge pull request #134004 from NixOS/backport-132689-to-staging-21.05
[Backport staging-21.05] libsndfile: 1.0.30 -> 1.0.31
2021-08-16 19:12:29 +01:00
github-actions[bot]
0d8777fc55
Merge staging-next-21.05 into staging-21.05 2021-08-16 18:02:59 +00:00
github-actions[bot]
62d737b061
Merge release-21.05 into staging-next-21.05 2021-08-16 18:02:26 +00:00
Bernardo Meurer
8f311b4f5e
Merge pull request #134291 from yu-re-ka/feature/21-05-thunderbird-91
[21.05] thunderbird-91: init at 91.0
2021-08-16 17:02:29 +00:00
Jörg Thalheim
e81def80a4
Merge pull request #134308 from NixOS/backport-121693-to-release-21.05
[Backport release-21.05] llvm_11: disable failing 'dependent-libraries.test' on armv7l
2021-08-16 15:47:23 +01:00
github-actions[bot]
62750a0b34
Merge staging-next-21.05 into staging-21.05 2021-08-16 12:04:20 +00:00
github-actions[bot]
0f0eda905a
Merge release-21.05 into staging-next-21.05 2021-08-16 12:03:37 +00:00
misuzu
49f3fda496 llvm_11: disable failing 'dependent-libraries.test' on armv7l
(cherry picked from commit 23ab12364036aebff032bdb4343312ebea0dbcaf)
2021-08-16 10:39:28 +00:00
Samuel Rivas
b3743e6325 haskellPackages.readline: fix Setup.hs to work with Cabal 3
See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion

(cherry picked from commit b950ecaf3a49662ba92e6c978aa472155eddd47f)
2021-08-16 12:12:46 +02:00
Antonio Yang
a54234df3a gitui: 0.15.0 -> 0.16.0
(cherry picked from commit a8daff8b1a95d7a00bd177d682454194713deb6b)
2021-08-16 09:19:12 +00:00
TredwellGit
aa1af91878 linux_5_12: remove
https://lwn.net/ml/linux-kernel/1626791065147152@kroah.com/
(cherry picked from commit 957f0485dab604c493d7683b8a57c0679b19e35f)
2021-08-16 09:12:57 +00:00
TredwellGit
b77e4da370 linux: 5.13.10 -> 5.13.11
(cherry picked from commit f2e78916b9b72d6e4bb00197f9e79abe1c7b2952)
2021-08-16 09:11:43 +00:00
TredwellGit
52d43e083d linux: 4.9.279 -> 4.9.280
(cherry picked from commit 9e9933a76be27acf86a9a0573f6d5bf794ae5cd8)
2021-08-16 09:11:43 +00:00
TredwellGit
68e1d642c9 linux: 4.4.280 -> 4.4.281
(cherry picked from commit 039764362bd23fee07ddce1a6b284e4348a08f41)
2021-08-16 09:11:42 +00:00
Maximilian Bosch
5d89a1188e
Merge pull request #133640 from NixOS/backport-133627-to-release-21.05
[Backport release-21.05] Kernels 2021-08-12
2021-08-16 11:07:50 +02:00