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: cbb2d6214f29
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 9e523c4d71e4
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 21, 2020

  1. 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
    Configuration menu
    Copy the full SHA
    9ee1172 View commit details
    Browse the repository at this point in the history

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

    (cherry picked from commit 6a7e056)
    @davidak
    davidak committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    dc73011 View commit details
    Browse the repository at this point in the history

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

    Backport: Update link in /etc/os-release
    @worldofpeace
    worldofpeace committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    9e523c4 View commit details
    Browse the repository at this point in the history