31e10ca1aa
Merge release-21.05 into staging-next-21.05
2021-08-12 06:02:06 +00:00
e14fad1ad5
Merge pull request #133526 from NixOS/backport-133286-to-release-21.05
...
[Backport release-21.05] linux_zen: 5.13.7 -> 5.13.9
2021-08-12 04:59:04 +03:00
76f688cc39
Merge pull request #127360 from NixOS/backport-127335-to-release-21.05
2021-08-12 04:49:40 +03:00
1f9945566e
Merge pull request #133524 from NixOS/backport-133502-to-release-21.05
...
[Backport release-21.05] fwupd: 1.5.7 -> 1.5.12
2021-08-12 04:47:28 +03:00
b684f30fd3
Merge pull request #133477 from NixOS/backport-133462-to-release-21.05
...
[Backport release-21.05] sparse: add perl to buildInputs
2021-08-12 04:44:55 +03:00
b6f76e22d7
Merge pull request #133564 from NixOS/backport-133528-to-release-21.05
...
[Backport release-21.05] libspf2: Fix CVE-2021-20314
2021-08-12 04:43:14 +03:00
2fd6748972
libspf2: Fix CVE-2021-20314
...
There is no new release yet (see mailing list post on oss-security), so
I'm picking the commit that fixes the CVE.
There is another security flaw (without a CVE number) that is also
mentioned in the oss-security announcement but it is not explained which
commit patches the problem.
(cherry picked from commit 46b7a5be1ced0280951d1a5736b0316de92a53f2)
2021-08-12 00:43:36 +00:00
275de75c6b
Merge release-21.05 into staging-next-21.05
2021-08-12 00:02:45 +00:00
658f8be372
Merge pull request #133548 from angustrau/backport-maintainer
2021-08-11 23:52:18 +02:00
27d72aa5fa
maintainers: add angustrau
2021-08-12 07:21:13 +10:00
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
af7ef2e741
Merge release-21.05 into staging-next-21.05
2021-08-11 18:02:24 +00:00
9485d3ab3b
linux_zen: 5.13.7 -> 5.13.9
...
(cherry picked from commit a9bf9c44e516f1097cb3d13e62293bf14669560c)
2021-08-11 16:55:23 +00:00
2f24078a01
fwupd: 1.5.7 -> 1.5.12
...
- https://github.com/fwupd/fwupd/releases/tag/1.5.8
- https://github.com/fwupd/fwupd/releases/tag/1.5.9
- https://github.com/fwupd/fwupd/releases/tag/1.5.10
- https://github.com/fwupd/fwupd/releases/tag/1.5.11
- https://github.com/fwupd/fwupd/releases/tag/1.5.12
(cherry picked from commit 2f3e3c788e071ec3c8b3b7e743f07b453248803e)
2021-08-11 16:28:42 +00:00
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
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
e6591fd024
hydra-unstable: 2021-05-03 -> 2021-08-11
...
(cherry picked from commit 25722c43d12b2331676157ee5e9247f21c436000)
2021-08-11 15:35:11 +00:00
1d182a795d
nixUnstable: 2.4pre20210707_02dd6bb -> 2.4pre20210802_47e96bb
...
(cherry picked from commit f578589a2ba19a17f468dba84a7b2e14b91d3a6e)
2021-08-11 15:35:11 +00:00
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
7742dc6e0e
hydra-unstable: add missing perl deps
...
(cherry picked from commit 9c6dc5d264d8d9aa7b49ebc5664798a799d637ce)
2021-08-11 15:35:06 +00:00
f251b6b264
perlPackages/CatalystPluginPrometheusTiny: init at 0.005
...
(cherry picked from commit c0bc42310bcb4ac798b889f073de9d61daf0187e)
2021-08-11 15:35:05 +00:00
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
cc07aecb10
apacheHttpdPackages.mod_auth_mellon: 0.17.0 -> 0.18.0
...
(cherry picked from commit 3f4692120b6b6285f147c6adb431ea39b9020dad)
2021-08-11 13:35:20 +00:00
d67e6cf39a
Merge release-21.05 into staging-next-21.05
2021-08-11 12:02:14 +00:00
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
8ad9b064fd
sparse: add perl to buildInputs
...
cgcc command has shebang of /usr/bin/perl, which obviously does not
work for nixos, adding perl to buildInputs seems to make all the magic
happen, as per usual.
(cherry picked from commit e7836bc5a5a2a2257afd515e3e221c8ff5d67b97)
2021-08-11 08:13:43 +00:00
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
28cf122744
Merge release-21.05 into staging-next-21.05
2021-08-10 18:02:38 +00:00
2d6ab6c6b9
Merge pull request #133390 from NixOS/backport-133388-to-release-21.05
2021-08-10 17:01:02 +02:00
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
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
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
b43522a1f5
Merge #132834 : go security bumps (into release-21.05)
2021-08-10 14:04:13 +02:00
167e69e157
Merge release-21.05 into staging-next-21.05
2021-08-10 12:03:42 +00:00
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
786e450930
nss_latest: 3.67 -> 3.68
2021-08-10 12:34:47 +02:00
4012d5b533
firefox: use nspr_latest for 91 and later
2021-08-10 12:31:10 +02:00
fe2138efeb
nspr_latest: init at 4.32
2021-08-10 12:27:57 +02:00
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
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
bf36f6b818
Merge staging-next-21.05 into staging-21.05
2021-08-10 06:03:32 +00:00
3ecc0d7b58
Merge release-21.05 into staging-next-21.05
2021-08-10 06:02:28 +00:00
855adf3d0a
firefox-bin: 90.0.2 -> 91.0
...
(cherry picked from commit cae3d9fff46c6cc0de8bea56dee45d07b0d773f8)
2021-08-10 14:54:58 +09:00
6c6d0f971f
firefox-esr-91: init at 91.0esr
...
(cherry picked from commit d5f7fc95a9ec5798618d10fd04a3ef91aa08de76)
2021-08-10 14:54:58 +09:00
ae16816ff5
firefox: 90.0.2 -> 91.0
...
(cherry picked from commit e5c09425317c1df3457e23f1475f82949fdf6781)
2021-08-10 14:54:58 +09:00
9eb3be2890
Merge pull request #131553 from fgaz/backport/21.05/warzone2100/4.1.1
2021-08-10 05:47:23 +03:00
af54073773
Merge staging-next-21.05 into staging-21.05
2021-08-09 18:02:45 +00:00
ab6e8b0faa
Merge release-21.05 into staging-next-21.05
2021-08-09 18:02:12 +00:00
b09c989b82
nomad-autoscaler: init at 0.3.3
...
(cherry picked from commit b432c3ca0db8d14e2441d735b2ab51dd7fd55e8f)
2021-08-09 08:34:54 -07:00
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
github-actions[bot]
Artturi
Janne Heß
Sandro
Angus Trau
Aaron Andersen
Roman Volosatovs
Maxine Aubrey
Timothy DeHerrera
happysalada
Maximilian Bosch
sternenseemann
Niklas Hambüchen
Emil Karlson
Martin Weinelt
Vladimír Čunát
R. RyanTM
Martin Weinelt
Maciej Krüger
Jonathan Ringer