summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* k3s: add tokenFile option•••To avoid having secrets in the nix store. (cherry picked from commit 11a38f62f0bfcb655e339498897b0d25ac37fa97) origin/backport-125205-to-release-21.05Jörg Thalheim2021-07-151-4/+19
* nixos/k3s: add to environment.systemPackages for adminstration•••(cherry picked from commit 852739337bd5ab4c57fd1eab9e62e76ac2f1a7cc) Jörg Thalheim2021-07-151-0/+2
* Merge pull request #130255 from NixOS/backport-130253-to-release-21.05•••[Backport release-21.05] signal-desktop: 5.8.0 -> 5.9.0Michael Weiss2021-07-151-2/+2
|\
| * signal-desktop: 5.8.0 -> 5.9.0•••(cherry picked from commit 1a81de7c7231343983b983c4787b926919eaf169) Michael Weiss2021-07-151-2/+2
* | Merge pull request #126586 from vs49688/vgmstream•••[21.05] vgmstream: init at r1050-3448-g77cc431bRobert Hensing2021-07-152-0/+35
|\ \ | |/ |/|
| * vgmstream: init at r1050-3738-g7cfa1f29 (#125492)•••(cherry picked from commit 19ff8bd9435336715fc5f046119106fd404861c5) Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Zane van Iperen2021-06-112-0/+35
* | Merge pull request #130177 from unclechu/backport-add-json2yaml-to-toplevel-t...•••Backport “add json2yaml to top-level” to release-21.05Robert Hensing2021-07-151-0/+2
|\ \
| * | Add “json2yaml” to top-level•••(cherry picked from commit a863d6d8b18dde419bbc99b0a1b794c18172fdfb) Viacheslav Lotsmanov2021-07-141-0/+2
* | | Merge pull request #130215 from NixOS/backport-130165-to-release-21.05•••[Backport release-21.05] thunderbird, thunderbird-bin: 78.11.0 -> 78.12.0 [High security fixes]Robert Hensing2021-07-152-267/+267
|\ \ \
| * | | thunderbird: 78.11.0 -> 78.12.0•••(cherry picked from commit db3297a081c0af1c2f1203ad927654184fe133b0) taku02021-07-141-2/+2
| * | | thunderbird-bin: 78.11.0 -> 78.12.0•••(cherry picked from commit 9cff3c556f06c8c71d585230623d0b0071774e95) taku02021-07-141-265/+265
| |/ /
* | | Merge pull request #130186 from mweinelt/21.05/firefoxMartin Weinelt2021-07-145-23/+206
|\ \ \ | |/ / |/| |
| * | firefox: use nss_latest for firefox >= 90Martin Weinelt2021-07-141-2/+3
| * | firefox: 89.0.2 -> 90.0•••make gtk3Support non-optional, because it hasn't been for a long time also make gtk2 conditional on firefox older than 90, because we can get rid of it with firefox 90, but it's still needed by the current ESR release (cherry picked from commit b332794adf841262958424c623c442cc8fab92e8) ajs1242021-07-143-21/+17
| * | nss_latest: init at 3.67•••Required for the latest and greatest firefox release Martin Weinelt2021-07-142-0/+186
|/ /
* | vscodium: 1.58.0 -> 1.58.1•••(cherry picked from commit de51394821f6da571554d9470fb1e3c2b7460f20) upkeep-bot2021-07-141-5/+5
* | Merge pull request #130137 from NixOS/backport-129570-to-release-21.05•••[Backport release-21.05] matrix-synapse: 1.37.1 -> 1.38.0Maximilian Bosch2021-07-141-2/+2
|\ \
| * | matrix-synapse: 1.37.1 -> 1.38.0•••(cherry picked from commit 8b055178de78f9812b5625cf603ba0342194d40c) Sumner Evans2021-07-131-2/+2
|/ /
* | Merge pull request #130108 from NixOS/backport-130086-to-release-21.05•••[Backport release-21.05] icingaweb2: 2.8.2 -> 2.8.3ajs1242021-07-131-2/+2
|\ \
| * | icingaweb2: 2.8.2 -> 2.8.3•••(cherry picked from commit df3aa47c5af15512500aee0cd2872bf7bad72ac9) R. RyanTM2021-07-131-2/+2
|/ /
* | nixos/gitlab: improve psql assertion message•••(cherry picked from commit c5a0551dc49b287d12d043298f9b7a4c8c355885) Yureka2021-07-131-1/+1
* | gitlab: 14.0.2 -> 14.0.5•••https://about.gitlab.com/releases/2021/07/06/gitlab-14-0-3-released/ https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/ https://about.gitlab.com/releases/2021/07/08/gitlab-14-0-5-released/ (cherry picked from commit 6510a136119d9c24ba67e4133ab1d561f72a46f6) Yureka2021-07-134-9/+9
* | gitlab: 14.0.1 -> 14.0.2•••https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/ (cherry picked from commit a023b6c4722663e8e481daf2e593eb917d8daec0) Yureka2021-07-136-26/+26
* | nixos/tests/gitlab: use postgresql 13•••Since 21.05 still defaults to 11, we need to set this (as does every user). Yureka2021-07-131-0/+2
* | nixos/gitlab: require at least postgresql 12•••(cherry picked from commit 2297eb35e5b92f657b85dfe4ee535e2323e360c1) Yureka2021-07-131-1/+5
* | gitlab: 13.12.4 -> 14.0.1•••https://about.gitlab.com/releases/2021/06/22/gitlab-14-0-released/ https://about.gitlab.com/releases/2021/06/24/gitlab-14-0-1-released/ (cherry picked from commit facd0c68cc139aabff157f0a5f8deba621ed2ba8) Yureka2021-07-1311-537/+706
* | apostrophe: fix HTML export by referencing fira fonts from store•••pandoc can embed fonts and stylesheets on export which apostrophe uses — however it has hardcoded paths for the fonts which only work in the flatpak version, so we need to substitute them. (cherry picked from commit 4e1acab880f0c27741810754c237dfd50e9be5f8) sternenseemann2021-07-131-1/+7
* | Merge pull request #130050 from Ma27/backport-nextcloud•••[21.05] nextcloud: version updatesRobin Gloster2021-07-134-12/+17
|\ \
| * | nextcloud22: init at 22.0.0•••Simplified, non-breaking version of e05f4101c16f08058a14ac4335886567e1ffe987. Maximilian Bosch2021-07-124-5/+10
| * | nextcloud19: 19.0.6 -> 19.0.13•••This basically has two reasons: * I forgot to remove v19 here and I don't want to break this now. Going up to the most recent patch-level is the least we can do. * With a changed version, the `permittedInsecurePackages`-setting in people's deployments has to change, so people will actually notice the EOL of v19. Maximilian Bosch2021-07-121-2/+2
| * | nextcloud19: make it clear that it's EOL•••I actually wanted to remove it before 21.05, but unfortunately I forgot about this. This is a less drastic way of getting rid of v19 in contrast to the actual breaking change in master[1]. [1] b922990a8eb4dbee8f9e7428572d2230a86c2a55 Maximilian Bosch2021-07-121-1/+1
| * | nextcloud20: 20.0.7 -> 20.0.11•••ChangeLog: https://nextcloud.com/changelog/#20-0-11 (cherry picked from commit d45672d059cbcc106c3d3d52e4a185859b6c6635) Maximilian Bosch2021-07-121-2/+2
| * | nextcloud: 21.0.2 -> 21.0.3•••(cherry picked from commit 765c1b314412b5073818c8b981117325da46a865) Benno Bielmeier2021-07-121-2/+2
|/ /
* | vscodium: 1.57.1 -> 1.58.0•••(cherry picked from commit 2201e7d8ce73625b65b481feeea7b62cac7f970b) upkeep-bot2021-07-131-5/+5
* | vscodium: 1.57.0 -> 1.57.1•••(cherry picked from commit 955df64c44eee780c71fd4da5bcabda553c94f7a) upkeep-bot2021-07-131-5/+5
* | vscodium: 1.56.2 -> 1.57.0•••(cherry picked from commit 39fd960ee100ffc63d53c40d65d081a3c18af3fe) upkeep-bot2021-07-131-5/+5
* | Merge pull request #130000 from Ma27/backport-wlroots•••[21.05] wlroots: 0.14.0 -> 0.14.1Linus Heckemann2021-07-121-2/+2
|\ \
| * | wlroots: 0.14.0 -> 0.14.1•••(cherry picked from commit 7632ba310eb4fcb249abbaf67c4094afafd17c18) Michael Weiss2021-07-121-2/+2
|/ /
* | blender: 2.93.0 -> 2.93.1•••(cherry picked from commit 520c2971d1da6936c706138bdbe6b339f888d1c7) Dmitry Kalinkin2021-07-111-2/+2
* | Merge pull request #129778 from NixOS/staging-next-21.05Martin Weinelt2021-07-1112-19/+157
|\ \
| * \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-111-1/+1
| |\ \
| * \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-101-2/+2
| |\ \ \
| * \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-101-5/+3
| |\ \ \ \
| * \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-101-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-107-14/+49
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge release-21.05 into staging-next-21.05github-actions[bot]2021-07-096-20/+20
| |\ \ \ \ \ \ \
| * | | | | | | | cacert: Add Haskell x509-system compatibility•••This allows cacert to be used with Haskell-based fetchers like you would with regular OpenSSL-based fetchers: buildInputs = [ cacert ]; (cherry picked from commit 5d57104d848ef0e997fd436c220801165a669862) Robert Hensing2021-07-091-1/+5
| * | | | | | | | Merge #129505: openexr: 2.5.3 -> 2.5.7 (into staging-21.05)Vladimír Čunát2021-07-091-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | openexr: 2.5.3 -> 2.5.7•••Fixes CVE-2021-3598 (cherry picked from commit 094ecab1a1b7245b268248f641e88239abf65f37) Linus Heckemann2021-07-071-4/+4
| * | | | | | | | | Merge staging-next-21.05 into staging-21.05github-actions[bot]2021-07-092-18/+28
| |\ \ \ \ \ \ \ \ \