summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Revert "python3Packages.tensorflow: 2.4.0 -> 2.4.1"Jonathan Ringer2021-06-16
* Revert "Updating relax-dependencies.patch"Jonathan Ringer2021-06-16
* Updating relax-dependencies.patchRoger Qiu2021-06-16
* python3Packages.tensorflow: 2.4.0 -> 2.4.1Rakesh Gupta2021-06-16
* Merge pull request #127130 from superherointj/package-linkerd-edge-21.6.2Sandro2021-06-17
|\
| * linkerd: 2020-05-01 -> edge-21.6.2superherointj2021-06-16
* | azure-storage-azcopy: 10.10.0 -> 10.11.0R. RyanTM2021-06-16
* | Merge pull request #127099 from drewrisinger/dr-pr-websocket-client-updateSandro2021-06-17
|\ \
| * | octoprint: pin websocket-client to 0.58.0Drew Risinger2021-06-16
| * | python3Packages.jellyfin-apiclient-python: add six dependencyDrew Risinger2021-06-16
| * | python3Packages.websocket-client: 0.58.0 -> 1.1.0Drew Risinger2021-06-16
* | | Merge pull request #127133 from jonringer/update-papplSandro2021-06-17
|\ \ \
| * | | pappl: 1.0.2 -> 1.0.3Jonathan Ringer2021-06-16
* | | | librime: 1.7.2 -> 1.7.3R. RyanTM2021-06-16
* | | | Merge pull request #124095 from NixOS/staging-nextJonathan Ringer2021-06-16
|\ \ \ \
| * \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-17
| |\ \ \ \
| * \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-16
| |\ \ \ \ \ \ \
| * | | | | | | | xorg: fix bad merge conflictJonathan Ringer2021-06-15
| * | | | | | | | Merge branch 'master' into staging-nextJonathan Ringer2021-06-15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2021-06-15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextMartin Weinelt2021-06-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python3Packages.authcaptureproxy: relax importlib-metadata dependencyMartin Weinelt2021-06-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-06-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2021-06-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \