Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: b50d55871fb7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 274831839c4f
Choose a head ref
  • 8 commits
  • 11 files changed
  • 3 contributors

Commits on Jul 24, 2020

  1. element-desktop, element-web: init at 1.7.0

    (cherry picked from commit a705201)
    claudiiii authored and Ma27 committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    02188cb View commit details
    Browse the repository at this point in the history
  2. element-desktop, element-web: 1.7.0 -> 1.7.1

    (cherry picked from commit 7c11d00)
    claudiiii authored and Ma27 committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    33e2131 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2020

  1. riot-desktop: switch back to electron_8 for now

    It used to work with this version and `electron_9` isn't available on
    20.03.
    Ma27 committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    c7a15c1 View commit details
    Browse the repository at this point in the history
  2. nixos/matrix-synapse: update documentation

    (cherry picked from commit 2d468be)
    claudiiii authored and Ma27 committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    e75fdf0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    477c36e View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge pull request #93773 from Ma27/element-20.03

    [20.03] element-{web,desktop}: backport version bump & rename
    Ma27 committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    91c9062 View commit details
    Browse the repository at this point in the history
  2. nixUnstable: 2.4pre7805_984e5213 -> 2.4pre20200719_a79b6dd

    (cherry picked from commit 38880a5)
    edolstra committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    5e30b3a View commit details
    Browse the repository at this point in the history
  3. nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1

    Fixes errors like this for me:
    
    ```
    error: --- Error ------------------------------- nix-build
    Nix daemon out of memory
    (use '--show-trace' to show detailed location information)
    ```
    
    (cherry picked from commit 85819d4)
    Ma27 authored and edolstra committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    2748318 View commit details
    Browse the repository at this point in the history