summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nixos/doc: fix mention of reading test logs•••(cherry picked from commit c772c572cfabba6a1c6b0f5a9a71bb59cd9b9916) origin/backport-154694-to-release-21.11Winter2022-02-202-4/+4
* Merge pull request #161041 from NixOS/backport-160929-to-release-21.11•••[Backport release-21.11] libreoffice: add `java.logging` to minimal JRE7c6f434c2022-02-201-1/+1
|\
| * libreoffice: add `java.logging` to minimal JRE•••This is e.g. required to properly use the Langtool-plugin[1] which otherwise fails like this: java.lang.NoClassDefFoundError: java/util/logging/Logger Fixes #160315 [1] https://extensions.libreoffice.org/en/extensions/show/languagetool (cherry picked from commit b308b06c22566a68308328b8c43509b72b1b9172) origin/backport-160929-to-release-21.11Maximilian Bosch2022-02-201-1/+1
|/
* Merge pull request #161028 from NixOS/backport-160424-to-release-21.11•••[Backport release-21.11] phoronix-test-suite: 10.8.1 -> 10.8.2davidak2022-02-201-2/+2
|\
| * phoronix-test-suite: 10.8.1 -> 10.8.2•••(cherry picked from commit a7c9fa3eab823271cbc5ece7771c48d8ccca4ceb) R. Ryantm2022-02-201-2/+2
|/
* Merge pull request #161004 from NixOS/backport-160944-to-release-21.11•••[Backport release-21.11] radare2: 5.6.0 -> 5.6.2Mario Rodas2022-02-201-2/+2
|\
| * radare2: 5.6.0 -> 5.6.2•••(cherry picked from commit 0560db5867293eaabcd1be0bf85e80aa66e26d56) arkivm2022-02-201-2/+2
|/
* Merge pull request #160903 from NixOS/backport-160209-to-release-21.11•••[Backport release-21.11] libhomfly: fix pnameBobby Rong2022-02-201-1/+1
|\
| * libhomfly: fix pname•••(cherry picked from commit 4ec82c7bab3c04d1963852b53b8352b9a56b8d3e) Mauricio Collares2022-02-191-1/+1
* | Merge pull request #149647 from NixOS/backport-149504-to-release-21.11•••[Backport release-21.11] brscan5: fix nixos testRenaud2022-02-191-0/+1
|\ \
| * | brscan5: fix nixos test•••import 're' so we can do regex stuff in this test (cherry picked from commit 7b1d8bd18273ba25564a52a2b144ddf41f226ec3) origin/backport-149504-to-release-21.11Matt Christ2021-12-081-0/+1
* | | Merge pull request #160873 from NixOS/backport-160729-to-release-21.11•••[Backport release-21.11] grafana-image-renderer: 3.3.0 -> 3.4.0Maximilian Bosch2022-02-194-4795/+4846
|\ \ \
| * | | grafana-image-renderer: fix build on 21.11•••We don't support `nativeBuildInputs` for `pkgConfig` here yet, so working around it. Maximilian Bosch2022-02-191-2/+1
| * | | grafana-image-renderer: 3.3.0 -> 3.4.0•••ChangeLog: https://github.com/grafana/grafana-image-renderer/releases/tag/v3.4.0 (cherry picked from commit 99a0019000fe21720b024b786a2e29f7a39611aa) Maximilian Bosch2022-02-194-4795/+4847
* | | | Merge pull request #150590 from Yarny0/tsm-client-2111•••[21.11] tsm-client: 8.1.8.0 -> 8.1.13.3 (security update)Renaud2022-02-191-19/+45
|\ \ \ \
| * | | | tsm-client: 8.1.13.2 -> 8.1.13.3•••Link to Security Bulletin: https://www.ibm.com/support/pages/node/6540692 (CVE-2021-44832) cherry-picked from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-2/+2
| * | | | tsm-client: 8.1.13.1 -> 8.1.13.2•••Link to Security Bulletin: https://www.ibm.com/support/pages/node/6537640 (CVE-2021-45105, CVE-2021-45046) cherry-picked from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-2/+2
| * | | | tsm-client: 8.1.13.0 -> 8.1.13.1•••Link to Security Bulletin: https://www.ibm.com/support/pages/node/6527080 (CVE-2021-44228) cherry-picked from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-2/+2
| * | | | tsm-client: use rpm source instead of deb/Ubuntu•••IBM publishes their IBM Spectrum Protect client for Linux in two flavors: * "Linux x86_64 client" * "Linux x86_64 Ubuntu client" Up to this commit, nixpkgs used the Ubuntu flavor to build its `tsm-client` derivation. However, the history of published archive files in * https://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/ * https://public.dhe.ibm.com/storage/tivoli-storage-management/patches/client/v8r1/Linux/ suggests that updates in the fourth level of the version numbers (e.g. 8.1.13.0 -> 8.1.13.1) do not get published as Ubuntu flavor. It order to be able to always use the latest release, this commit switches to the non-Ubuntu flavor. The non-Ubuntu archive contains rpm files, so this commit switches from `ar` to `rpmextract`. Instead of unpacking all deb files, the build recipe now unpacks all _but one_ rpm file: The file `TIVsm-WEBGUI.x86_64.rpm` apparently contains a plugin that is not included in the Ubuntu version (see note below). Comparing the old and the new derivation's output indicates that this choice minimizes the difference between the results: The output of the old (Ubuntu flavor) derivation contains: * `commons-codec-1.6.jar` * `share/` with changelog and copyright information for the packages `gskssl64` and `gskcrypt64` The output of the new (non-Ubuntu flavor) derivation contains: * `lib64`, symlink to `lib` * `commons-codec-1.14.jar` * `opt/tivoli/tsm/license/{api,baclient}/sm/` with license agreement files in many languages Besides these differences, the outputs' file names are equal. Note: I don't know what functionality `TIVsm-WEBGUI.x86_64.rpm` actually provides. Unpacking it with the other rpm files makes patchelf complain about missing X11 libraries, so in order to include it here, one would likely need to add those to `buildInputs`. However, as the old (Ubuntu flavor) `tsm-client` package did not contain this functionality and as I cannot test or use it in any way, I opted to not include it now. If we want to include this with a later commit, we should add another package build option (like `enableGui`) so that the default `tsm-client` package does not pull in X11 libraries and its closure size therefore stays small. cherry-picked/adapted from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-17/+29
| * | | | tsm-client: 8.1.8.0 -> 8.1.13.0•••tsm-client now links against openssl; patchelf complains without it. Links to IBM's "Authorized Program Analysis Report"s (something like release notes), to READMEs, and to Security Bulletins, for all updates between 8.1.8.0 and 8.1.13.0: * 8.1.9.x * APARs: https://www.ibm.com/support/pages/node/1077159 * READMEs: https://www.ibm.com/support/pages/node/1108473 * https://www.ibm.com/support/pages/node/1107261 (CVE-2018-2025) * https://www.ibm.com/support/pages/node/1107777 (CVE-2019-4406) * 8.1.10.x * APARs: https://www.ibm.com/support/pages/node/6223098 * READMEs: https://www.ibm.com/support/pages/node/6223388 * https://www.ibm.com/support/pages/node/6221448 (CVE-2020-4494, CVE-2020-4406) * https://www.ibm.com/support/pages/node/6245356 (CVE-2020-2654) * https://www.ibm.com/support/pages/node/6245366 (CVE-2015-4000) * 8.1.11.x * APARs: https://www.ibm.com/support/pages/node/6367203 * READMEs: https://www.ibm.com/support/pages/node/6367205 * https://www.ibm.com/support/pages/node/6371646 * https://www.ibm.com/support/pages/node/6371650 * https://www.ibm.com/support/pages/node/6371652 * 8.1.12.x * APARs: https://www.ibm.com/support/pages/node/6429561 * READMEs: https://www.ibm.com/support/pages/node/6443671 * https://www.ibm.com/support/pages/node/6445503 (CVE-2021-20532) * https://www.ibm.com/support/pages/node/6445497 (CVE-2021-29672, CVE-2021-20546) * https://www.ibm.com/support/pages/node/6445489 (CVE-2020-1971, CVE-2021-23840, CVE-2021-23841) * https://www.ibm.com/support/pages/node/6445483 (CVE-2020-27221, CVE-2020-14782) * 8.1.13.x * APARs: https://www.ibm.com/support/pages/node/6524936 * READMEs: https://www.ibm.com/support/pages/node/6524938 * https://www.ibm.com/support/pages/node/6524706 (CVE-2021-39048) * https://www.ibm.com/support/pages/node/6524712 (CVE-2021-3712, CVE-2021-3711) cherry-picked/adapted from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-3/+5
| * | | | tsm-client: update URL structure•••IBM has changed the URL structures of their support web pages. The commit at hand updates most URLs and in particular the package update instructions so they follow the new structure. It also calculates the source download URL from the version number, so package updates no longer have to update the URL in addition to the version string. cherry-picked from https://github.com/NixOS/nixpkgs/pull/138386 Yarny02022-01-151-10/+22
* | | | | Merge pull request #152876 from NixOS/backport-151628-to-release-21.11•••[Backport release-21.11] btop: 1.1.2 -> 1.1.3Renaud2022-02-191-2/+2
|\ \ \ \ \
| * | | | | btop: 1.1.2 -> 1.1.3•••(cherry picked from commit 9bd8d83f9377a97771f785b6d9600c10cd7074f4) origin/backport-151628-to-release-21.11R. Ryantm2021-12-311-2/+2
* | | | | | Merge pull request #160519 from NixOS/backport-160499-to-release-21.11•••[Backport release-21.11] discord: 0.0.16 -> 0.0.17Mario Rodas2022-02-191-2/+2
|\ \ \ \ \ \
| * | | | | | discord: 0.0.16 -> 0.0.17•••(cherry picked from commit e0c8e584ae000051db50c70cf6882e12e91b5e9f) Shea Levy2022-02-171-2/+2
* | | | | | | Merge pull request #160892 from NixOS/backport-160084-to-release-21.11Maciej Krüger2022-02-193-0/+82
|\ \ \ \ \ \ \
| * | | | | | | swaytools: init at 0.1.0•••(cherry picked from commit e93bb42cd7cbf0b5a296dac6a22fb9fb10108b53) Átila Saraiva2022-02-193-0/+82
* | | | | | | | Merge pull request #156260 from NixOS/backport-152014-to-release-21.11•••[Backport release-21.11] staticjinja: 4.1.1 -> 4.1.2, add minimal template testRenaud2022-02-194-4/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | staticjinja: add minimal template test•••(cherry picked from commit 937b599abef6af8bbd537297826e75cea37834d5) origin/backport-152014-to-release-21.11Francesco Gazzetta2022-01-234-2/+17
| * | | | | | | staticjinja: 4.1.1 -> 4.1.2•••(cherry picked from commit 6e453fe75c455f9a7dcfe6687baca490eaf993ba) Francesco Gazzetta2022-01-231-2/+2
* | | | | | | | Merge pull request #160558 from NixOS/backport-160405-to-release-21.11•••[Backport release-21.11] brave: 1.35.101 -> 1.35.103Bobby Rong2022-02-191-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | brave: 1.35.101 -> 1.35.103•••https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#135103 (cherry picked from commit e70f9e5121a09d131f2915efc1a2d3f7469cad60) TredwellGit2022-02-181-2/+2
* | | | | | | | Merge pull request #159870 from NixOS/backport-159687-to-release-21.11•••[Backport release-21.11] postfix: 3.6.4 -> 3.6.5lewo2022-02-191-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | postfix: 3.6.4 -> 3.6.5•••http://www.postfix.org/announcements/postfix-3.6.5.html (cherry picked from commit 31b5e1998dc2223832180f5e3906d5dfd2438b8d) origin/backport-159687-to-release-21.11Martin Weinelt2022-02-131-2/+2
* | | | | | | | Merge #160814: firefox*: 97.0 -> 97.0.1 (into release-21.11)Vladimír Čunát2022-02-192-395/+395
|\ \ \ \ \ \ \ \
| * | | | | | | | firefox-bin: 97.0 -> 97.0.1•••https://www.mozilla.org/en-US/firefox/97.0.1/releasenotes/ (cherry picked from commit 5fc0d7fd37988cd9c671ad403f59b6c9d03ba9f1) Martin Weinelt2022-02-191-393/+393
| * | | | | | | | firefox: 97.0 -> 97.0.1•••https://www.mozilla.org/en-US/firefox/97.0.1/releasenotes/ (cherry picked from commit 7e23a7fb8268f16e83ef60bbd2708e1d57fd49ef) Martin Weinelt2022-02-191-2/+2
* | | | | | | | | Merge pull request #160511 from pacien/gscan2pdf-fix-tarball-url•••[21.11] gscan2pdf: fix download URLBobby Rong2022-02-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gscan2pdf: fix download URL•••The former one returns a 404 not found error. (cherry picked from commit 015b5e052239bf6fec6a11da3a8671af980d1214) pacien2022-02-171-1/+1
* | | | | | | | | | Merge pull request #160785 from NixOS/backport-160093-to-release-21.11•••[Backport release-21.11] lens: 5.2.6 -> 5.3.4Artturi2022-02-191-5/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | lens: 5.2.6 -> 5.3.4•••Fixes: #158957. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit d44c641f64c00e39db6233029cf305ff64118326) Otavio Salvador2022-02-181-5/+6
* | | | | | | | | | Merge pull request #160570 from NixOS/backport-160528-to-release-21.11Martin Weinelt2022-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | webkitgtk: 2.34.5 -> 2.34.6•••https://webkitgtk.org/security/WSA-2022-0003.html Fixes: CVE-2022-22620 (cherry picked from commit cf6944227c5854f42bf12a83503ab847de3933f1) Martin Weinelt2022-02-181-2/+2
* | | | | | | | | | | Merge pull request #160749 from NixOS/backport-159261-to-release-21.11•••[Backport release-21.11] Linux kernels 2022-02-16Maximilian Bosch2022-02-198-17/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | linux-rt_5_10: 5.10.90-rt60 -> 5.10.78-rt55•••(cherry picked from commit 504c8298649579a8a5203204f676600e84f7eb18) TredwellGit2022-02-181-3/+3
| * | | | | | | | | | | linux: 5.4.178 -> 5.4.180•••(cherry picked from commit 3995fb76d05cbfdaad20ac4b3fb9ae13a832d8b6) TredwellGit2022-02-181-2/+2
| * | | | | | | | | | | linux: 5.16.8 -> 5.16.10•••(cherry picked from commit 1dda49a41b4eb57be791417af73c9c83f857e5f2) TredwellGit2022-02-181-2/+2
| * | | | | | | | | | | linux: 5.15.22 -> 5.15.24•••(cherry picked from commit 6d5687355dae9a2d6efa40912c81aada8844290c) TredwellGit2022-02-181-2/+2
| * | | | | | | | | | | linux: 5.10.99 -> 5.10.101•••(cherry picked from commit ce699eaba7bd1c54675269947c237c2f66b9f017) TredwellGit2022-02-181-2/+2
| * | | | | | | | | | | linux: 4.9.300 -> 4.9.302•••(cherry picked from commit 897193e107fbd5949bb3531270b3afa6620a9b70) TredwellGit2022-02-181-2/+2