Commit Graph

293915 Commits

Author SHA1 Message Date
Niklas Hambüchen d76b42c680 CONTRIBUTING.md: Move to repo root, where it is more visible.
We found that many users found it difficult to locate this document.

Github supports it in the root, see:
https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors

(cherry picked from commit 3c29ced243cc032806f680ae67845b9b3a879183)

This fixes the links on the nixos.org website, the stable branch
docs point to master on github, so both master and the release branch
need to have the file in the same location.

fixes https://github.com/NixOS/nixos-homepage/issues/736
2021-08-11 09:42:10 +03:00
Martin Weinelt 2d6ab6c6b9
Merge pull request #133390 from NixOS/backport-133388-to-release-21.05 2021-08-10 17:01:02 +02:00
Vladimír Čunát 5cd415124f nixos/tests: unbreak the tested job
I expect it suffices that the channel only blocks on one firefox ESR
test - the one for the default ESR.  I didn't want to have the
information about the default in two places, so either of the tests will
be evaluated twice (but to the same *.drv I hope).

(cherry picked from commit c0097aa84adb19a9e5d947487c118505faf98bc0)
2021-08-10 14:34:09 +00:00
Martin Weinelt ca4d6bc0e1
Merge pull request #133367 from NixOS/backport-133216-to-release-21.05
[Backport release-21.05] gpsd: 3.22 -> 3.23
2021-08-10 15:04:03 +02:00
R. RyanTM bb5548940e gpsd: 3.22 -> 3.23
Clean up unnecessary dependencies, update license. Add todo to generate
asciidoctor documentation.

(cherry picked from commit 65db4268d056afefac988705bae2f65651b1f7c2)
2021-08-10 12:18:35 +00:00
Vladimír Čunát b43522a1f5
Merge #132834: go security bumps (into release-21.05) 2021-08-10 14:04:13 +02:00
Vladimír Čunát 923725473a
Merge branch 'staging-next-21.05' into release-21.05
https://hydra.nixos.org/eval/1694658
2021-08-10 14:02:40 +02:00
Martin Weinelt 786e450930 nss_latest: 3.67 -> 3.68 2021-08-10 12:34:47 +02:00
Martin Weinelt 4012d5b533
firefox: use nspr_latest for 91 and later 2021-08-10 12:31:10 +02:00
Martin Weinelt fe2138efeb
nspr_latest: init at 4.32 2021-08-10 12:27:57 +02:00
Maciej Krüger 8808f27a6b
Merge pull request #133330 from NixOS/backport-132878-to-release-21.05
[Backport release-21.05] gitea: 1.14.5 -> 1.14.6
2021-08-10 10:47:43 +02:00
Maximilian Bosch 20f400d745 gitea: 1.14.5 -> 1.14.6
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.6
(cherry picked from commit b15a7c718e127d6046328c474244a40e70b9e317)
2021-08-10 08:24:23 +00:00
github-actions[bot] bf36f6b818
Merge staging-next-21.05 into staging-21.05 2021-08-10 06:03:32 +00:00
github-actions[bot] 3ecc0d7b58
Merge release-21.05 into staging-next-21.05 2021-08-10 06:02:28 +00:00
Martin Weinelt 855adf3d0a firefox-bin: 90.0.2 -> 91.0
(cherry picked from commit cae3d9fff46c6cc0de8bea56dee45d07b0d773f8)
2021-08-10 14:54:58 +09:00
Martin Weinelt 6c6d0f971f firefox-esr-91: init at 91.0esr
(cherry picked from commit d5f7fc95a9ec5798618d10fd04a3ef91aa08de76)
2021-08-10 14:54:58 +09:00
Martin Weinelt ae16816ff5 firefox: 90.0.2 -> 91.0
(cherry picked from commit e5c09425317c1df3457e23f1475f82949fdf6781)
2021-08-10 14:54:58 +09:00
Artturi 9eb3be2890
Merge pull request #131553 from fgaz/backport/21.05/warzone2100/4.1.1 2021-08-10 05:47:23 +03:00
github-actions[bot] af54073773
Merge staging-next-21.05 into staging-21.05 2021-08-09 18:02:45 +00:00
github-actions[bot] ab6e8b0faa
Merge release-21.05 into staging-next-21.05 2021-08-09 18:02:12 +00:00
Jonathan Ringer b09c989b82 nomad-autoscaler: init at 0.3.3
(cherry picked from commit b432c3ca0db8d14e2441d735b2ab51dd7fd55e8f)
2021-08-09 08:34:54 -07:00
Martin Weinelt 23d5366206
Merge pull request #129436 from NixOS/backport-121750-to-release-21.05
[Backport release-21.05] nixos/acme: Ensure certs are always protected
2021-08-09 16:15:37 +02:00
Martin Weinelt 51e3908199
Merge pull request #133173 from risicle/ris-tor-0.4.5.9-r21.05
[21.05] tor: 0.4.5.7 -> 0.4.5.9
2021-08-09 16:12:02 +02:00
Martin Weinelt 72288487d9
Merge pull request #133154 from risicle/ris-wolfssl-CVE-2021-37155-r21.05
[21.05] wolfssl: add patches for CVE-2021-37155
2021-08-09 16:09:19 +02:00
github-actions[bot] 840f8cc3b2
Merge staging-next-21.05 into staging-21.05 2021-08-09 12:03:20 +00:00
github-actions[bot] 7d8133e751
Merge release-21.05 into staging-next-21.05 2021-08-09 12:02:40 +00:00
Martin Weinelt fadca09121
Merge pull request #133213 from NixOS/backport-133200-to-release-21.05 2021-08-09 13:32:35 +02:00
upkeep-bot 5f177fef48 vscodium: 1.58.2 -> 1.59.0
(cherry picked from commit 4de2fe7518d594a681152c446f9e5bd064de99ea)
2021-08-09 17:05:47 +09:00
TredwellGit 295b867eb7 linux/hardened/patches/5.4: 5.4.134-hardened1 -> 5.4.139-hardened1
(cherry picked from commit cbb5ca89ca473f09d8c1abf274f48b19700de57c)
2021-08-09 02:52:56 +00:00
TredwellGit bb8734ccd6 linux/hardened/patches/5.10: 5.10.52-hardened1 -> 5.10.57-hardened1
(cherry picked from commit 7aae6061b6e9879590e4f4315be2b6bdb3b90c09)
2021-08-09 02:52:55 +00:00
TredwellGit b96d4ac43a linux/hardened/patches/4.19: 4.19.198-hardened1 -> 4.19.202-hardened1
(cherry picked from commit 0a41183454eeed7ce105a08ecd8e2ba438bf858d)
2021-08-09 02:52:55 +00:00
TredwellGit e3c440a92b linux/hardened/patches/4.14: 4.14.240-hardened1 -> 4.14.243-hardened1
(cherry picked from commit b84eecf9fc114625f43f9d6cad035d61ad2c439c)
2021-08-09 02:52:54 +00:00
TredwellGit d6ebcc1109 linux-rt_5_10: 5.10.52-rt47 -> 5.10.56-rt48
(cherry picked from commit 8425e47a7416facee6cb0b8dce122715c152ed5b)
2021-08-09 02:52:54 +00:00
TredwellGit e80cfad9f9 linux: 5.4.134 -> 5.4.139
(cherry picked from commit b570def284bedd5821a5d8faf4fc7110b0c8b809)
2021-08-09 02:52:53 +00:00
TredwellGit 86cdede3f8 linux: 5.13.8 -> 5.13.9
(cherry picked from commit d416101b659c8bd8fd3cb224bce5803a0e70e6e8)
2021-08-09 02:52:53 +00:00
TredwellGit e9d400d134 linux: 5.10.52 -> 5.10.57
(cherry picked from commit cde6046992f56b51de41275340560283c5ae6c7d)
2021-08-09 02:52:52 +00:00
TredwellGit 9f9dc1688f linux: 4.9.278 -> 4.9.279
(cherry picked from commit a5713826c48b70b04b6963cd621f4e64a267fab3)
2021-08-09 02:52:52 +00:00
TredwellGit 59bacd23a6 linux: 4.4.278 -> 4.4.279
(cherry picked from commit 1adb289851291353b4062c7d0fe10598de804668)
2021-08-09 02:52:51 +00:00
TredwellGit 000622e70a linux: 4.19.198 -> 4.19.202
(cherry picked from commit 553c6ef12af489a7bd60d5ca9260246aca20a1fe)
2021-08-09 02:52:51 +00:00
TredwellGit 6f1bdd343d linux: 4.14.240 -> 4.14.243
(cherry picked from commit 26ec7c39bb796dd5122dbe60288f81741e91bd0a)
2021-08-09 02:52:50 +00:00
github-actions[bot] be1b94ec70
Merge staging-next-21.05 into staging-21.05 2021-08-09 00:03:33 +00:00
github-actions[bot] 444dac9eaf
Merge release-21.05 into staging-next-21.05 2021-08-09 00:02:48 +00:00
Artturi 9d5f7324c2
Merge pull request #131554 from NixOS/backport-127875-to-release-21.05
[Backport release-21.05] binutils: apply R_ARM_COPY.patch only when cross-compiling to armv7l
2021-08-09 01:11:30 +03:00
Domen Kožar 8485c05212
Merge pull request #133116 from NixOS/pipewire-21.05-backport
Pipewire 21.05 backport: 0.3.30 -> 0.3.33
2021-08-08 23:15:18 +02:00
Ilan Joselevich 3ca9226b93 maintainers: add kranzes
(cherry picked from commit dff520a9e0fc8d60f3cc6543cb32d4bd66010f4d)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 22:08:56 +02:00
Ilan Joselevich 45ea565f6d pipewire: updated JSON configs
(cherry picked from commit a876500f5db7f7827c14d1d5b195186613c20a29)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 21:56:57 +02:00
Ilan Joselevich 1472b2446e pipewire: added kranzes (myself) as a maintainer
(cherry picked from commit 779472d9bcc518fdb01c01424b2a469dc39694ee)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-08-08 21:55:44 +02:00
github-actions[bot] 5bb3f62a52
Merge staging-next-21.05 into staging-21.05 2021-08-08 18:02:47 +00:00
github-actions[bot] 9c8a139d61
Merge release-21.05 into staging-next-21.05 2021-08-08 18:02:14 +00:00
Robert Scott 08252a1cc4 tor: 0.4.5.7 -> 0.4.5.9 2021-08-08 18:29:32 +01:00