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: cbb2d6214f29
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: 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

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ee1172 View commit details

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

    (cherry picked from commit 6a7e056)
    @davidak
    davidak committed Apr 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dc73011 View commit details

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

    Backport: Update link in /etc/os-release
    @worldofpeace
    worldofpeace authored Apr 21, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e523c4 View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −2 nixos/modules/misc/version.nix
  2. +2 −0 pkgs/applications/editors/android-studio/common.nix
4 changes: 2 additions & 2 deletions nixos/modules/misc/version.nix
View file
Original file line number Diff line number Diff line change
@@ -109,8 +109,8 @@ in
PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
LOGO="nix-snowflake"
HOME_URL="https://nixos.org/"
DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html"
SUPPORT_URL="https://nixos.org/nixos/support.html"
DOCUMENTATION_URL="https://nixos.org/learn.html"
SUPPORT_URL="https://nixos.org/community.html"
BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
'';

2 changes: 2 additions & 0 deletions pkgs/applications/editors/android-studio/common.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@
, nss
, pciutils
, pkgsi686Linux
, ps
, setxkbmap
, stdenv
, systemd
@@ -89,6 +90,7 @@ let
# Runtime stuff
git
ps
]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [