Commit Graph
295003 Commits
Author SHA1 Message Date
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
github-actions[bot] 40bd2e2f24 Merge staging-next-21.05 into staging-21.05 2021-08-11 12:02:49 +00:00
github-actions[bot] d67e6cf39a Merge release-21.05 into staging-next-21.05 2021-08-11 12:02:14 +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
Emil Karlson 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
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
github-actions[bot] 87eac968ec Merge staging-next-21.05 into staging-21.05 2021-08-10 18:03:15 +00:00
github-actions[bot] 28cf122744 Merge release-21.05 into staging-next-21.05 2021-08-10 18:02:38 +00: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
TredwellGit 0701d20ed9 electron_12: 12.0.15 -> 12.0.16
https://github.com/electron/electron/releases/tag/v12.0.16
(cherry picked from commit 4f7a4bd0fe213f3f4baa6c1dafeb55b3f26e339f)
2021-08-10 13:45:34 +01:00
TredwellGit 821a567bf8 electron_11: 11.4.10 -> 11.4.11
https://github.com/electron/electron/releases/tag/v11.4.11
(cherry picked from commit 79744f0ea04aff8d206e9312da2e4a24fd83f3c3)
2021-08-10 13:44:52 +01: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
github-actions[bot] fb75bb0676 Merge staging-next-21.05 into staging-21.05 2021-08-10 12:06:39 +00:00
Vladimír Čunát b43522a1f5 Merge #132834: go security bumps (into release-21.05) 2021-08-10 14:04:13 +02:00
github-actions[bot] 167e69e157 Merge release-21.05 into staging-next-21.05 2021-08-10 12:03:42 +00: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
Martin Weinelt eb3091ac76 cpython: fix permissions on venv activation scripts
Previously these ended up without u+w permissions which meant they could
not be regenerated, which was hugely annoying when these venvs were for
example created and recreated in a nix-shell.

(cherry picked from commit 4fa69858d951409426c5b080fbdaf342fe790877)
2021-08-09 15:43:21 +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 d1a75c3c1d python310: 3.10.0b3 -> 3.10.0rc1
(cherry picked from commit ebc4dae8cb65706c5d91afe3dc39d1f6c0f17e5e)
2021-08-09 13:39:04 +02:00
Martin Weinelt 98163bd246 python37: 3.7.10 -> 3.7.11
(cherry picked from commit b322c5ecaab811090690b026e1db857de6523e64)
2021-08-09 13:38:38 +02:00
Martin Weinelt d7b9ef367f python36: 3.6.13 -> 3.6.14
(cherry picked from commit e1e245f203e2d1b568b730eb363026ea81fdfc1e)
2021-08-09 13:38:32 +02:00
Martin Weinelt de46e983af python39: 3.9.5 -> 3.9.6
(cherry picked from commit 360c50f11d675f0a19e2245e3ebfa1179ff28360)
2021-08-09 13:38:22 +02:00
Martin Weinelt 4c5903aabe python38: 3.8.10 -> 3.8.11
(cherry picked from commit 250f0514f2cfbf1c4f099870c329eb6ecc6a0115)
2021-08-09 13:37:00 +02:00
Martin Weinelt ec7dfbf84b python310: 3.10.0a5 -> 3.10.0b3
(cherry picked from commit bb696403b0334d1fd3dee195751f99f9e2b0270f)
2021-08-09 13:36:46 +02:00
Martin Weinelt d8fa6239c7 python39: 3.9.4 -> 3.9.5
(cherry picked from commit 7ca18ab93f802dead800d76e3913eda1a8bbc705)
2021-08-09 13:36:40 +02:00
Martin Weinelt 02e3a73813 python38: 3.8.9 -> 3.8.10
(cherry picked from commit 3898eb189762f5e83ed4b617c58711ceae29e9fa)
2021-08-09 13:36:35 +02:00
Martin Weinelt fadca09121 Merge pull request #133213 from NixOS/backport-133200-to-release-21.05 2021-08-09 13:32:35 +02:00