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: 04aca9ac24ad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 68df00b0ba61
Choose a head ref
  • 10 commits
  • 8 files changed
  • 5 contributors

Commits on Feb 22, 2020

  1. release-combined: readd keymap tests (again) 

    (cherry picked from commit a539bbf)
    @worldofpeace
    worldofpeace committed Feb 22, 2020
    Copy the full SHA
    59db815 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2020

  1. kodi: fix build 

    (cherry picked from commit 69668e9)
    @KamilaBorowska
    KamilaBorowska committed Feb 23, 2020
    Copy the full SHA
    aba8304 View commit details
    Browse the repository at this point in the history

  2. pythonPackages.seaborn: use v0.9.1 for python 2 

    required for poretools

(cherry picked from commit 7045c74cb2abb6285867a51438f5ef13851f7cf3)
    @maxxk
    maxxk authored and Jon committed Feb 23, 2020
    Copy the full SHA
    250a45e View commit details
    Browse the repository at this point in the history

  3. python27Packages.seaborn: remove FRidh from maintainers 

    (cherry picked from commit d6115b9235c49054638d7460dfe6eb7c2900f553)
    @maxxk
    maxxk authored and Jon committed Feb 23, 2020
    Copy the full SHA
    8a8a45f View commit details
    Browse the repository at this point in the history

  4. pythonPackages.ldaptor: fix build 

    (cherry picked from commit 50f3704)
    @maxxk
    maxxk authored and Jon committed Feb 23, 2020
    Copy the full SHA
    25d1554 View commit details
    Browse the repository at this point in the history

  5. runInLinuxVM: Ensure tools requiring /etc/passwd work 

    This includes, but is not limited to:

 * whoami
 * nix >= 2.3.1

See

 * NixOS/nixpkgs#71157
 * NixOS/nixops#1216
 * nix-community/nixops-libvirtd#5

(cherry picked from commit 687e219)
    @samueldr
    samueldr committed Feb 23, 2020
    Copy the full SHA
    b60560e View commit details
    Browse the repository at this point in the history

  6. nixos/nixos-container: ensure that the state-dir is cleaned up if a b… 

    …uild fails

(cherry picked from commit 93943ac)
    @Ma27
    Ma27 committed Feb 23, 2020
    Copy the full SHA
    3d9983b View commit details
    Browse the repository at this point in the history

  7. nixos/nixos-container: use custom path if specified by --nixos-path 

    (cherry picked from commit 31bbcc2)
    @Ma27
    Ma27 committed Feb 23, 2020
    Copy the full SHA
    73d246f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #80898 from xfix/kodi-fix-build-20.03 

    [20.03] kodi: fix build
    @worldofpeace
    worldofpeace committed Feb 23, 2020
    Copy the full SHA
    83d73a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. Merge pull request #80835 from worldofpeace/keymap-20.03 

    [20.03] release-combined: readd keymap tests (again)
    @worldofpeace
    worldofpeace committed Feb 24, 2020
    Copy the full SHA
    68df00b View commit details
    Browse the repository at this point in the history