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: d685191d1d26
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0b93d2b9e345
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 19, 2017

  1. setuptools_scm: 1.11.1 -> 1.15.0 

    (cherry picked from commit f32fc9b)
    @domenkozar @FRidh
    domenkozar authored and FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    c11c1ac View commit details
    Browse the repository at this point in the history

  2. pythonPackages.pytest-django: unpin setuptools_scm 

    - unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name

(cherry picked from commit 645c218)
    @FRidh
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    a2e1c15 View commit details
    Browse the repository at this point in the history

  3. pythonPackages.django_guardian: fix eval 

    (cherry picked from commit 2e72372)
    @FRidh
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    b4edc0b View commit details
    Browse the repository at this point in the history

  4. pythonPackages.pytest-django: fix hash patch setuptools_scm 

    Do the files change over time..?

(cherry picked from commit 48deda9)
    @FRidh
    FRidh committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    0b93d2b View commit details
    Browse the repository at this point in the history