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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcaf2f6dbe53
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f45ee77acc3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 21, 2017

  1. python-dogpile-cache: do not depend on dogpile_core

    @orivej
    orivej committed Jun 21, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03a6297 View commit details

Commits on Jun 22, 2017

  1. Merge pull request #26751 from orivej/python-dogpile-cache 

    python-dogpile-cache: do not depend on dogpile_core
    @FRidh
    FRidh authored Jun 22, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8f45ee7 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkgs/development/python-modules/dogpile.cache/default.nix
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/dogpile.cache/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
, dogpile_core, pytest, pytestcov, mock, Mako
, pytest, pytestcov, mock, Mako
}:

buildPythonPackage rec {
@@ -18,7 +18,6 @@ buildPythonPackage rec {
rm tests/test_lock.py
'';

propagatedBuildInputs = [ dogpile_core ];
buildInputs = [ pytest pytestcov mock Mako ];

meta = with stdenv.lib; {