Commit Graph

293929 Commits

Author SHA1 Message Date
Johannes Arnold 8404ac09e7 nixos/xserver: fix a display-manager race condition
(cherry picked from commit 358ab44a457aba9b227764742badbf1882028676)
2021-08-12 00:40:15 +00:00
Sandro 658f8be372
Merge pull request #133548 from angustrau/backport-maintainer 2021-08-11 23:52:18 +02:00
Angus Trau 27d72aa5fa maintainers: add angustrau 2021-08-12 07:21:13 +10:00
Aaron Andersen 8df67e7b59
Merge pull request #133506 from NixOS/backport-133499-to-release-21.05
[Backport release-21.05] apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0
2021-08-11 14:42:12 -04:00
Timothy DeHerrera 927ce1afc1
Merge pull request #133518 from NixOS/backport-133482-to-release-21.05
[Backport release-21.05] hydra-unstable: add missing perl deps
2021-08-11 09:46:16 -06:00
Timothy DeHerrera dca7265b6d
Merge pull request #133519 from NixOS/backport-132739-to-release-21.05
[Backport release-21.05] nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
2021-08-11 09:46:03 -06:00
happysalada e6591fd024 hydra-unstable: 2021-05-03 -> 2021-08-11
(cherry picked from commit 25722c43d12b2331676157ee5e9247f21c436000)
2021-08-11 15:35:11 +00:00
happysalada 1d182a795d nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e)
2021-08-11 15:35:11 +00:00
Maximilian Bosch 8e23fff674 perlPackages: update newly introduced libraries for catalyst-prometheus to latest versions
* CatalystPluginPrometheusTiny: 0.005 -> 0.006
* PrometheusTiny: 0.007 -> 0.008
* PrometheusTinyShared: 0.023 -> 0.024

Co-authored-by: Stig <stig@stig.io>
(cherry picked from commit 94a5b4ecf73c942a5fd9ab547182cbb2f4aa4843)
2021-08-11 15:35:06 +00:00
Maximilian Bosch 7742dc6e0e hydra-unstable: add missing perl deps
(cherry picked from commit 9c6dc5d264d8d9aa7b49ebc5664798a799d637ce)
2021-08-11 15:35:06 +00:00
Maximilian Bosch f251b6b264 perlPackages/CatalystPluginPrometheusTiny: init at 0.005
(cherry picked from commit c0bc42310bcb4ac798b889f073de9d61daf0187e)
2021-08-11 15:35:05 +00:00
sternenseemann f6551e1efa clojure: fix clj script
At some point the clj script stopped just calling clojure, but instead
$bin_dir/clojure. As a result we now need to additionally substitute
BINDIR in the clj script.
2021-08-11 15:43:58 +02:00
Aaron Andersen cc07aecb10 apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0
(cherry picked from commit 3f4692120b6b6285f147c6adb431ea39b9020dad)
2021-08-11 13:35:20 +00:00
Niklas Hambüchen 2da6605a52
Merge pull request #133468 from rski/release-21.05
CONTRIBUTING.md: Move to repo root, where it is more visible.
2021-08-11 14:01:51 +02:00
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