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: 438d87faf9ba
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d400d6f7ea39
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 11, 2019

  1. deluge: add missing setuptools dependency 

    Latest staging merge broke nixos/tests/deluge.nix showing an ImportError
for "pkg_resources": https://nix-cache.s3.amazonaws.com/log/h8qzkcjldal5j1925g0r04ncl5afjjnp-vm-test-run-deluge.drv
    @delroth
    delroth committed Sep 11, 2019
    Copy the full SHA
    5095638 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #68484 from delroth/deluge-setuptools 

    deluge: add missing setuptools dependency
    @worldofpeace
    worldofpeace committed Sep 11, 2019
    Copy the full SHA
    d400d6f View commit details
    Browse the repository at this point in the history