Skip to content
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
base: 5be93a588335
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e4e1f0462f6c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 17, 2018

  1. Revert "python: docker: 2.7.0 -> 3.0.0" 

    `pythonPackages.docker` isn't compatible with `docker-compose` 1.18 and
causes severe breackage when running `docker-compose up --build`.

See docker/compose#5685 for further reference.

This reverts commit 2a8a058.
    @Ma27
    Ma27 committed Feb 17, 2018
    Copy the full SHA
    554e91e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. Merge pull request #35086 from Ma27/downgrade-python-docker-to-2.7 

    Revert "python: docker: 2.7.0 -> 3.0.0"
    @FRidh
    FRidh committed Feb 18, 2018
    Copy the full SHA
    e4e1f04 View commit details
    Browse the repository at this point in the history