Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e79d1e83f91b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63284ecf6fbe
Choose a head ref
  • 14 commits
  • 15 files changed
  • 11 contributors

Commits on Mar 15, 2020

  1. virtualbox: 6.0.14 -> 6.1.4 

    Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see #74260, build
would fail for linux-5.5.5 to 5.5.9).

(cherry picked from commit 3132c237b181244f3c5d128e5195f538ddffb38e)
    @winterdeaf
    winterdeaf committed Mar 15, 2020
    Copy the full SHA
    006b4b1 View commit details

Commits on Apr 21, 2020

  1. nixos/tools: adapt for renamed console options

    Milan Pässler committed Apr 21, 2020
    Copy the full SHA
    1866b4b View commit details

  2. virtualboxExtpack: synchronize version with virtualbox 

    (cherry picked from commit b3323dbd07ab86a64bf4d32a13323ff564dde8f7)
    @B4dM4n @winterdeaf
    B4dM4n authored and winterdeaf committed Apr 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: FD56C4EF292AFBF0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e1c5a0a View commit details

  3. Merge pull request #85644 from petabyteboy/feature/generate-config-2003 

    [20.03] nixos/tools: adapt for renamed console options
    @worldofpeace
    worldofpeace authored Apr 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: FD56C4EF292AFBF0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4a549b8 View commit details

  4. mautrix-whatsapp: 2020-04-12 -> 2020-04-21 

    (cherry picked from commit c844633)
    @Ma27
    Ma27 committed Apr 21, 2020
    Copy the full SHA
    00d5d64 View commit details

  5. mongodb_3_4: fix license 

    As noted in #83433, the 3.4 branch of `mongodb` is still licensed under
AGPL[1].

[1] https://github.com/mongodb/mongo/blob/r3.4.24/README

(cherry picked from commit 25b9bca)
    @Ma27
    Ma27 committed Apr 21, 2020
    Copy the full SHA
    b76b6c6 View commit details

  6. citrix_workspace: add 2004 

    (cherry picked from commit b061642)
    @obadz @Ma27
    obadz authored and Ma27 committed Apr 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    083662c View commit details

  7. Merge pull request #82693 from m-scr/vbox-6.1.4-20.03 

    [20.03] virtualbox: 6.0.14 -> 6.1.4
    @flokli
    flokli authored Apr 21, 2020
    Copy the full SHA
    ea83ab5 View commit details

  8. nixos/phpfpm: fix erroneous pools example 

    (cherry picked from commit 8880957)
    @tomcur @flokli
    tomcur authored and flokli committed Apr 21, 2020
    Copy the full SHA
    cbb2d62 View commit details

  9. android-studio: add ps to closure 

    When killing processes, android-studio uses `ps` to figure out which
subprocesses to kill. Without `ps` in the closure, this fails and the
process is never killed.

(cherry picked from commit c296bf7)
Reason: Fixes a bug, see #85719.
    @nioncode @primeos
    nioncode authored and primeos committed Apr 21, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ee1172 View commit details

  10. Update link in /etc/os-release (#85723) 

    (cherry picked from commit 6a7e056)
    @davidak
    davidak committed Apr 21, 2020
    Copy the full SHA
    dc73011 View commit details

  11. Merge pull request #85726 from davidak/os-release 

    Backport: Update link in /etc/os-release
    @worldofpeace
    worldofpeace authored Apr 21, 2020
    Copy the full SHA
    9e523c4 View commit details

Commits on Apr 22, 2020

  1. ninja: fix 404'ing patch 

    Kyndig on IRC noticed that building `ninja` from source would fail due
to a patch 404'ing (because the repo appears to no longer exist). Fetch
from upstream instead.
    @cole-h
    cole-h committed Apr 22, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    91d4e9a View commit details

  2. Merge pull request #85742 from cole-h/fix-ninja-patch 

    [20.03] ninja: fix 404'ing patch
    @worldofpeace
    worldofpeace authored Apr 22, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63284ec View commit details
Loading