summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 389-base: Add CVE-2021-3514•••(cherry picked from commit fb7a3e1086debb3c47f0881724caccaa1a82642c) origin/backport-126193-to-release-21.05Janne Heß2021-06-081-0/+3
* Merge pull request #126194 from NixOS/backport-126163-to-release-21.05•••[Backport release-21.05] phpPackages.composer: 2.1.1 -> 2.1.2Kim Lindberger2021-06-081-2/+2
|\
| * phpPackages.composer: 2.1.1 -> 2.1.2•••https://github.com/composer/composer/releases/tag/2.1.2 (cherry picked from commit b30d8c49e83aab896aa7468aa9585f50f4877c63) Thomas Gerbet2021-06-081-2/+2
|/
* Merge pull request #126176 from NixOS/backport-126137-to-release-21.05•••[Backport release-21.05] nix-direnv: make flakes support optional and off by defaultJörg Thalheim2021-06-081-2/+12
|\
| * nix-direnv: make flakes support optional•••`nix-direnv` depends on `nixUnstable` for flakes support, but that causes it to print a warning unless your user is trusted or the `experimental-features` setting is enabled. Neither of these are desirable (note that setting `experimental-features` in nix.conf causes warnings on `nixStable`). Since flakes are experimental, this commit makes `nixStable` the default and optionally allows `nixUnstable` with a new flag `enableFlakes`, prioritising a good experience for users not using experimental features. (cherry picked from commit 03310df843a344215b45b2e8aef11ae9402a40e2) Luke Worth2021-06-081-2/+12
|/
* Merge pull request #126144 from NixOS/backport-126138-to-release-21.05•••[Backport release-21.05] steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0davidak2021-06-081-2/+2
|\
| * steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0•••(cherry picked from commit 2033f37fb284bd55159ea1650aa93a635caaffb3) Artturin2021-06-081-2/+2
|/
* Merge pull request #126120 from NixOS/backport-126115-to-release-21.05•••[Backport release-21.05] dino: 0.2.0 -> 0.2.1Martin Weinelt2021-06-071-11/+2
|\
| * dino: 0.2.0 -> 0.2.1•••Fixes https://nvd.nist.gov/vuln/detail/CVE-2021-33896. The current 9acb54df9254609f2fe4de83c9047d408412de28 patch landed in dino as 4592b72dfa324d8a4b9f8c25b359110889b2206c. Removing it from the patch list. (cherry picked from commit 70173c1519118a5ec79b8e7969b2f91c78e8c297) Félix Baylac-Jacqué2021-06-071-11/+2
* | Merge pull request #126123 from NixOS/backport-126102-to-release-21.05•••[Backport release-21.05] element: 1.7.29 -> 1.7.30Maximilian Bosch2021-06-074-804/+133
|\ \
| * | element: 1.7.29 -> 1.7.30•••https://github.com/vector-im/element-web/blob/v1.7.30/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.30/CHANGELOG.md (cherry picked from commit 445e3ce0e8c25017a058a1faa39fdd6648493731) TredwellGit2021-06-074-804/+133
| |/
* | Merge pull request #126117 from NixOS/backport-126073-to-release-21.05•••[Backport release-21.05] isync: 1.4.1 -> 1.4.2Michael Weiss2021-06-071-2/+2
|\ \ | |/ |/|
| * isync: 1.4.1 -> 1.4.2•••Fixes CVE-2021-3578: possible remote code execution https://sourceforge.net/p/isync/mailman/message/37297759/ (cherry picked from commit 254a89e7d54c51c6e8f82f449714b2cbadb54e75) Dominique Martinet2021-06-071-2/+2
|/
* Merge #125624: thunderbird*: 78.10.2 -> 78.11.0Vladimír Čunát2021-06-072-267/+267
|\
| * thunderbird-bin: 78.10.2 -> 78.11.0•••(cherry picked from commit 79f71ef9aab48926e8cd0708afa45b0d611808f0) taku02021-06-041-265/+265
| * thunderbird: 78.10.2 -> 78.11.0•••(cherry picked from commit 7267b80c71df31360bab7fcfacb644081a850bf4) taku02021-06-041-2/+2
* | Merge pull request #126030 from NixOS/backport-125922-to-release-21.05•••[Backport release-21.05] tor-browser-bundle-bin: 10.0.16 -> 10.0.17Luke Granger-Brown2021-06-071-3/+3
|\ \
| * | tor-browser-bundle-bin: 10.0.16 -> 10.0.17•••(cherry picked from commit 0fc1a3d0d89ce06992714c690449c45713af75a6) FliegendeWurst2021-06-071-3/+3
|/ /
* | ec2-amis: add release 21.05•••(cherry picked from commit b7d74194b49c3b3f85d52e85054283211bce6c11) AmineChikhaoui2021-06-061-1/+20
* | ocamlPackages.uri: 4.0.0 → 4.2.0•••(cherry picked from commit b69138f54157d0532988d074f12f7c4f2721dc9a) Ulrik Strid2021-06-061-2/+2
* | Merge pull request #125720 from NixOS/backport-121663-to-release-21.05•••[Backport release-21.05] lightworks: 14.0.0 -> 2021.2Luke Granger-Brown2021-06-062-9/+12
|\ \
| * | lightworks: fix audio playback•••(cherry picked from commit 201cc75bcb41cde2581a994c3162014d85cead82) Vojtěch Káně2021-06-061-1/+2
| * | lightworks: 2021.2 -> 2021.2.1•••(cherry picked from commit a9edf3b544aba334814ea830b8650a38e56b69c3) Vojtěch Káně2021-06-041-3/+4
| * | lightworks: add me as a maintainer•••(cherry picked from commit ccb691c7d156f26857159d324b788c0e3789322a) Vojtěch Káně2021-06-041-1/+1
| * | lightworks: 14.0.0 -> 2021.2•••(cherry picked from commit 2c3d045bc31e7baab833b1d4adb553263e75fe2e) Vojtěch Káně2021-06-042-8/+9
* | | Merge pull request #125933 from NixOS/backport-125100-to-release-21.05•••[Backport release-21.05] treesitter: include CXX headers compiling with clang DarwinMario Rodas2021-06-061-0/+3
|\ \ \
| * | | tree-sitter: explicitly incl CXX headers on Darwin•••clang needs to find headers + libraries for compiling with libc++. On Darwin we will include CXX headers when compiling C. This closes #124396 (cherry picked from commit 99b351b4bde2d9697b4e9abaa54458dcff1288d1) Carlos Hernandez2021-06-061-0/+3
* | | | Merge pull request #125806 from NixOS/backport-125266-to-release-21.05•••[Backport release-21.05] zabbix.agent2: create a symlink which is compatible with the zabbixAg…Aaron Andersen2021-06-061-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | zabbix.agent2: create a symlink which is compatible with the zabbixAgent module•••(cherry picked from commit 99e37419573318a1882ec5930c1dd6aec4512940) Aaron Andersen2021-06-051-0/+5
* | | | Merge pull request #125845 from NixOS/backport-125835-to-release-21.05•••[Backport release-21.05] evcxr: 0.9.0 -> 0.10.0Maximilian Bosch2021-06-061-3/+3
|\ \ \ \
| * | | | evcxr: 0.9.0 -> 0.10.0•••ChangeLog: https://github.com/google/evcxr/blob/v0.10.0/RELEASE_NOTES.md#version-0100 (cherry picked from commit 2d2c58970ad4b04011c23b02be42380e111e4d2e) Maximilian Bosch2021-06-051-3/+3
* | | | | Merge pull request #125915 from NixOS/backport-125861-to-release-21.05•••[Backport release-21.05] youtube-dl: 2021.05.16 -> 2021.06.06Maximilian Bosch2021-06-061-2/+2
|\ \ \ \ \
| * | | | | youtube-dl: 2021.05.16 -> 2021.06.06•••https://github.com/ytdl-org/youtube-dl/releases/tag/2021.06.06 (cherry picked from commit df82caf8df911674f65cf63f388b7820d410c334) zowoq2021-06-061-2/+2
* | | | | | Merge pull request #125917 from NixOS/backport-125288-to-release-21.05•••[Backport release-21.05] nixos/wireless: make wireless.interfaces mandatoryMichele Guerini Rocco2021-06-062-17/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | nixos/wireless: make wireless.interfaces mandatory•••This is the only way to solve issue #101963, for now. (cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9) rnhmjoj2021-06-062-17/+19
|/ / / / /
* | | | | Merge #125141: firefox-bin: 88.0.1 -> 89.0 (into release-21.05)Vladimír Čunát2021-06-061-389/+389
|\ \ \ \ \
| * | | | | firefox-bin: 88.0.1 -> 89.0•••(cherry picked from commit bb2070754cc5fab4a4c40ba4fc5915dd470c592c) origin/backport-125083-to-release-21.05taku02021-05-311-389/+389
* | | | | | Merge pull request #125821 from NixOS/backport-125699-to-release-21.05•••[Backport release-21.05] treewide: Fix mysql alias deprecation breakageKim Lindberger2021-06-0612-16/+16
|\ \ \ \ \ \
| * | | | | | treewide: Fix mysql alias deprecation breakage•••62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all places `pkgs.mysql` was used. Fix this by changing all occurrences to `pkgs.mariadb`. (cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d) talyz2021-06-0512-16/+16
* | | | | | | Merge pull request #125877 from NixOS/backport-125316-to-release-21.05Sandro2021-06-061-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update pkgs/development/libraries/sundials/default.nix•••(cherry picked from commit 248748e0408d1d9a8d43e4df0dc18bfe297c4887) Sandro2021-06-061-1/+1
| * | | | | | | sundials: fix download URL and hash•••The old URL doesn't seem to be available anymore (fails with 403 Forbidden error). The tarball in the new URL contains a few changes from the old one, so the hash has changed. Specifically, only the following files have changed: sundials-5.7.0/doc/arkode/ark_examples.pdf sundials-5.7.0/doc/arkode/ark_guide.pdf sundials-5.7.0/doc/cvode/cv_examples.pdf sundials-5.7.0/doc/cvode/cv_guide.pdf sundials-5.7.0/doc/cvodes/cvs_examples.pdf sundials-5.7.0/doc/cvodes/cvs_guide.pdf sundials-5.7.0/doc/ida/ida_examples.pdf sundials-5.7.0/doc/ida/ida_guide.pdf sundials-5.7.0/doc/idas/idas_examples.pdf sundials-5.7.0/doc/idas/idas_guide.pdf sundials-5.7.0/doc/kinsol/kin_examples.pdf sundials-5.7.0/doc/kinsol/kin_guide.pdf (cherry picked from commit 4ab604c4c436505c98eb11e4a5c0323a1a835279) Ricardo M. Correia2021-06-061-2/+2
* | | | | | | | Merge pull request #125878 from NixOS/backport-125310-to-release-21.05Sandro2021-06-061-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Update pkgs/development/libraries/box2d/default.nix•••(cherry picked from commit 8fc57b0632120aad0ca9bbd3165616f9db2d06bd) Sandro2021-06-061-1/+1
| * | | | | | | | box2d: fix hash•••The upstream tarball changed. Specifically, files now extract onto a box2d-2.3.1/ directory rather than Box2D-2.3.1/. The files themselves (and their contents) seem to remain the same. (cherry picked from commit a8b85f6d68d4fc96a0f8473aa38a3e773b82c4f0) Ricardo M. Correia2021-06-061-2/+2
|/ / / / / / / /
* | | | | | | | [Backport release-21.05] viber: use webarchive for a stable source (#125868)•••Co-authored-by: Artturin <Artturin@artturin.com>Sandro2021-06-061-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | viber: use webarchive for a stable source•••(cherry picked from commit 24ba97a40beb3bc913ab724c8e66b97a06d52db1) Artturin2021-06-051-1/+2
* | | | | | | | Merge pull request #125871 from NixOS/backport-125431-to-release-21.05Sandro2021-06-061-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | replace: fix URL and hash•••The old URL wasn't available anymore. There is a minor version change but it's only an unimportant change to the Makefile and some changes to the documentation. (cherry picked from commit 908569cf06beed517f5f0f3038ab044aae2e5d76) Ricardo M. Correia2021-06-051-4/+5
* | | | | | | | | Merge pull request #125849 from NixOS/backport-125779-to-release-21.05Sandro2021-06-062-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |