summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* python3Packages.libnacl: fix build on 32-bit platformsorigin/backport-152749-to-release-21.11Enno Richter2021-12-311-0/+10
| | | | (cherry picked from commit c71bc6a8055842dab906a6989449029f96d70fd0)
* Merge pull request #152825 from NixOS/backport-147984-to-release-21.11Ryan Burns2021-12-301-1/+3
|\ | | | | [Backport release-21.11] forge: fix build
| * forge: fix buildRyan Burns2021-12-301-1/+3
| | | | | | | | | | | | | | | | | | The build was failing due to mismatched libstdc++ between stdenv.cc and cudatoolkit.cc. This can be fixed by bumping the build-time cudatoolkit to 11, which is able to use the same cc as stdenv. (cherry picked from commit e263bdd82b3c91b0ad47412ac348a7dba3d0cb20)
* | Merge pull request #152755 from NixOS/backport-152705-to-release-21.117c6f434c2021-12-311-0/+1
|\ \ | |/ |/| [Backport release-21.11] glusterfs: fix version info
| * glusterfs: fix version infoBjørn Forsman2021-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A build script in glusterfs uses /bin/bash interpreter and fails to get the version from the VERSION file at build time: sh: build-aux/pkg-version: /bin/bash: bad interpreter: No such file or directory sh: build-aux/pkg-version: /bin/bash: bad interpreter: No such file or directory sh: build-aux/pkg-version: /bin/bash: bad interpreter: No such file or directory [...] The result is that `gluster --version` doesn't include a version number. Fixup the shebang to get the version info. (cherry picked from commit 7e399b70787556d03f7108e3957b8f1c90289d29)
* | Merge pull request #152746 from NixOS/backport-152409-to-release-21.117c6f434c2021-12-303-18/+39
|\ \ | | | | | | [Backport release-21.11] singular: backport patch to fix docbuilding with >= 64 cpus
| * | singular: backport patch to fix docbuilding with >= 64 cpusorigin/backport-152409-to-release-21.11Mauricio Collares2021-12-303-18/+39
| |/ | | | | | | (cherry picked from commit ec0c4a001f48aea7570bfe96592c418a83964707)
* | nixos/test-driver: add (functional) timeouts to more functionsCole Helbling2021-12-301-7/+7
| | | | | | | | | | | | | | A retry timeout doesn't really help if the thing it's retrying may block forever. (cherry picked from commit e62b8020f3d6597ffe4c5444fe824546af88e739)
* | nixos/test-driver: add timeout parameter to executeCole Helbling2021-12-301-1/+6
| | | | | | | | (cherry picked from commit 363d7f3ae857aeb863bc2e00fb487591b7d5db2b)
* | nixos/test-driver: give more functions nested labelsCole Helbling2021-12-301-32/+39
| | | | | | | | | | | | | | This will make it easier to trace through the test execution without having to scroll through the entire kernel output. (cherry picked from commit af765f3abd7193ec5256cea3d5e8b7692dc99931)
* | nixos/test-driver: more context when step finishesCole Helbling2021-12-301-1/+1
| | | | | | | | | | | | | | | | When displaying the amount of time some step took, with no other context, it becomes nigh impossible (especially in longer tests) to see when specific steps finished. (cherry picked from commit c6ee63259a744b204ef2283a931de9f4e246f238)
* | Merge pull request #152752 from NixOS/backport-152735-to-release-21.11Thiago Kenji Okada2021-12-301-2/+2
|\ \ | | | | | | [Backport release-21.11] babashka: 0.7.0 -> 0.7.3
| * | babashka: 0.7.0 -> 0.7.3Thiago Kenji Okada2021-12-301-2/+2
| |/ | | | | | | (cherry picked from commit 192cd3cd39a90c590d2a35ae787c6755e3367ea6)
* | Merge pull request #152643 from NixOS/backport-152614-to-release-21.11Jörg Thalheim2021-12-301-2/+2
|\ \ | |/ |/| [Backport release-21.11] unicorn: 2.0.0-rc4 -> 2.0.0-rc5
| * unicorn: 2.0.0-rc4 -> 2.0.0-rc5Robert Scott2021-12-301-2/+2
| | | | | | | | (cherry picked from commit bdb8ba829c4f2d725d7ba7a1a44dbecb7f0595ab)
* | gitlab: 14.5.2 -> 14.6.0Lara2021-12-309-118/+238
| | | | | | | | (cherry picked from commit 6e1978ee81dd35651e3410fa33c52e04a105433a)
* | Merge pull request #152633 from cleeyv/backport-chromiumMichael Weiss2021-12-301-0/+2
|\ \ | | | | | | [21.11] chromium: Install libvulkan.so.1 and vk_swiftshader_icd.json
| * | chromium: Install libvulkan.so.1Michael Weiss2021-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might be required for experimental Vulkan support, see: https://github.com/NixOS/nixpkgs/issues/150398 Note: Google Chrome distributes it as well. (cherry picked from commit 075338beb2928bc3845204c3f87ca30a586516b8) Reason: fixes nixos/jibri bug since upgrade to chromium 96 on Nov 15: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.jibri.x86_64-linux
| * | chromium: Install vk_swiftshader_icd.jsonMichael Weiss2021-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be required for Vulkan support via SwiftShader but I wasn't able to test/confirm it yet (according to strace Chromium never tried to load that file). The relevant flags for using Chromium with SwiftShader are documented at [0] and SwiftShader's ANGLE documentation [1] mentions the relevant files. See also [2], [3], and [4] for more details. [0]: https://source.chromium.org/chromium/chromium/src/+/master:docs/gpu/swiftshader.md;drc=046f987e020baba45ffb3061b3ee3d960d6ce981 [1]: https://github.com/google/swiftshader/blob/241349107851000f6a48c3d5769ed617785c8962/docs/ANGLE.md [2]: https://github.com/google/swiftshader/blob/241349107851000f6a48c3d5769ed617785c8962/README.md [3]: https://github.com/KhronosGroup/Vulkan-Loader/blob/ca9efe3f1ccd98a5fe05da71bf65087bcaa82f35/docs/LoaderInterfaceArchitecture.md [4]: https://bugs.archlinux.org/task/72652 (cherry picked from commit 66352e3ee4b02927a57b708c32b8314b9df0d948) Reason: related to libvulkan.so.1 fix for for nixos/jibri
* | | python3Packages.keystone-engine: fix build for non-x86 linuxRobert Scott2021-12-291-1/+3
| | | | | | | | | | | | (cherry picked from commit addd745ca30209951f49867c953c65d248cc10de)
* | | python3Packages.angr: fix build for non-x86 linuxRobert Scott2021-12-291-0/+3
| |/ |/| | | | | (cherry picked from commit 6a733a18fd45acc72a87ddcbd606ac8b6e0918cb)
* | python39Packages.frozendict: fix build on non-x86_64 systemsEnno Richter2021-12-291-0/+5
| | | | | | | | (cherry picked from commit 687b1233c24e3f3661a6ecaa74b9bbf08454f0df)
* | Merge pull request #152635 from NixOS/backport-152620-to-release-21.11Mario Rodas2021-12-291-2/+2
|\ \ | | | | | | [Backport release-21.11] yt-dlp: 2021.12.25 -> 2021.12.27
| * | yt-dlp: 2021.12.25 -> 2021.12.27Sandro Jäckel2021-12-291-2/+2
|/ / | | | | | | (cherry picked from commit 9919f32394055234564691e35ac0007659b4f86b)
* | Merge pull request #152603 from NixOS/backport-152599-to-release-21.11Bobby Rong2021-12-301-1/+1
|\ \ | | | | | | [Backport release-21.11] blockhash: update meta.homepage
| * | blockhash: update meta.homepageBen Siraphob2021-12-291-1/+1
|/ / | | | | | | (cherry picked from commit 42b3533fa8f3d1c77d2bb96ee459a3bbfe36bc2f)
* | Merge pull request #152593 from NixOS/backport-152591-to-release-21.11Ben Siraphob2021-12-2919-19/+19
|\ \ | | | | | | [Backport release-21.11] treewide: fix homepages with permanent redirect to https
| * | treewide: fix homepages with permanent redirect to httpsBen Siraphob2021-12-2919-19/+19
|/ / | | | | | | (cherry picked from commit 39a0a70d290c8059b13c78e5bb01e3bdef968737)
* | yoda: 1.9.3 -> 1.9.4Dmitry Kalinkin2021-12-291-2/+2
| | | | | | | | (cherry picked from commit 47081b2553840c4ba45a66b8948cd65ea6f18bd9)
* | Merge pull request #152564 from NixOS/backport-152473-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ | | | | | | [Backport release-21.11] ghidra: update homepage
| * | ghidra: update homepageJonathan Ringer2021-12-291-1/+1
| | | | | | | | | | | | (cherry picked from commit df1c411c2a5e91830c8b0f6317b5b705f52373da)
* | | Merge pull request #152563 from NixOS/backport-152464-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | | | | | | | | [Backport release-21.11] ammonite: fix homepage
| * | | ammonite: fix homepageJonathan Ringer2021-12-291-1/+1
| |/ / | | | | | | | | | (cherry picked from commit 57c1ae58486bcd9a7a53a995bded5716f0304bc7)
* | | Merge pull request #152562 from NixOS/backport-152479-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | | | | | | | | [Backport release-21.11] graphene: fix homepage
| * | | graphene: fix homepageJonathan Ringer2021-12-291-1/+1
| |/ / | | | | | | | | | (cherry picked from commit 4892198bc873e89e09ca63d93e7e464e8d5f3cf7)
* | | Merge pull request #152561 from NixOS/backport-152488-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | | | | | | | | [Backport release-21.11] klettres: update homepage
| * | | klettres: update homepageJonathan Ringer2021-12-291-1/+1
| |/ / | | | | | | | | | (cherry picked from commit 1b8c414047eb24d86d9b87b8d824732bb33a73df)
* | | Merge pull request #152560 from NixOS/backport-152483-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | | | | | | | | [Backport release-21.11] icestorm: update homepage
| * | | icestorm: update homepageJonathan Ringer2021-12-291-1/+1
| |/ / | | | | | | | | | (cherry picked from commit 7c517f25cef998df855729f2edf19e0d5171b29b)
* | | Merge pull request #152559 from NixOS/backport-152490-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | |/ / |/| | [Backport release-21.11] kturtle: update homepage
| * | kturtle: update homepageJonathan Ringer2021-12-291-1/+1
|/ / | | | | | | (cherry picked from commit 441a30ab24d87d9efa64a1fb6a4ef2eb96d2aa11)
* | Merge pull request #152553 from NixOS/backport-152551-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ | | | | | | [Backport release-21.11] gtksourceviewmm4: update homepage
| * | gtksourceviewmm4: update homepageBobby Rong2021-12-291-1/+1
|/ / | | | | | | | | | | previous homepage no longer exists (cherry picked from commit fe339e7bb3b454880129c1d276fc8bb76254ed73)
* | gtksourceviewmm: update homepagegithub-actions[bot]2021-12-291-1/+1
| | | | | | | | | | previous homepage no longer exists (cherry picked from commit 6aab02a1de1a67e61451325824391aa89e9480ae)
* | Merge pull request #152548 from NixOS/backport-152530-to-release-21.11Bobby Rong2021-12-291-3/+4
|\ \ | | | | | | [Backport release-21.11] inherd-quake: fix pname, set meta.mainProgram
| * | inherd-quake: update cargoSha256Bobby Rong2021-12-291-1/+1
| | | | | | | | | | | | (cherry picked from commit cdf40cdec5612376cc94665116620278337027fb)
| * | inherd-quake: fix pname, set meta.mainProgramBobby Rong2021-12-291-2/+3
| | | | | | | | | | | | (cherry picked from commit 487f0c6dbe38942cd44f54e0c2b6878f7dc675bf)
* | | Merge pull request #152549 from NixOS/backport-152486-to-release-21.11Bobby Rong2021-12-291-1/+1
|\ \ \ | |/ / |/| | [Backport release-21.11] kipi-plugins: update homepage
| * | kipi-plugins: update homepageJonathan Ringer2021-12-291-1/+1
|/ / | | | | | | (cherry picked from commit 73bcd3556e204d4757e894356e82af408d8b47b5)
* | Merge pull request #152545 from NixOS/backport-152478-to-release-21.11Bobby Rong2021-12-292-2/+2
|\ \ | | | | | | [Backport release-21.11] grantlee: update homepage