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: 6716867eb3e7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 322f0bd565a7
Choose a head ref
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Aug 30, 2020

  1. Revert "Merge pull request #96152 from JJJollyjim/colour-test-machine… 

    …s-staging"

This reverts commit 1bff6fe, reversing
changes made to 2995fa4.

There’s presumably nothing wrong with this PR, except that it
conflicts with reverting #96254 which broke several tests (#96699).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Aug 30, 2020
    Copy the full SHA
    a0a421b View commit details
    Browse the repository at this point in the history

  2. Revert "Merge pull request #96254 from Mic92/logging" 

    This reverts commit 4fc7085, reversing
changes made to 0e54f3a.

Fixes #96699.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Aug 30, 2020
    Copy the full SHA
    59b6664 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #96703 from andersk/revert-test-logging 

    Revert “nixos/test-driver: use pythons logging module” (#96254)
    @worldofpeace
    worldofpeace committed Aug 30, 2020
    Copy the full SHA
    5c67236 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. vscode-extensions: editorconfig fixes

    @zowoq
    zowoq authored and Jon committed Aug 31, 2020
    Copy the full SHA
    322f0bd View commit details
    Browse the repository at this point in the history