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: 7b828532b9b4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6b89e87a234c
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 25, 2019

  1. jsondiff: 1.1.2 -> 1.2.0

    @kalbasit
    kalbasit committed Jul 25, 2019
    Copy the full SHA
    c555bc3 View commit details
    Browse the repository at this point in the history

  2. jsondiff: patch setup.py to prevent creating bin/jsondiff 

    pythonPackages.jsonpatch also creates bin/jsondiff, and packages
depending on both are not usable.
    @kalbasit
    kalbasit committed Jul 25, 2019
    Copy the full SHA
    d99c6cc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #65316 from kalbasit/nixpkgs_fix-moto-collision 

    moto: fix colliding dependencies
    @kalbasit
    kalbasit committed Jul 25, 2019
    Copy the full SHA
    6b89e87 View commit details
    Browse the repository at this point in the history