Merge branch 'master' into staging-next

... to resolve a trivial conflict in libpcap.
This commit is contained in:
Vladimír Čunát
2020-06-10 20:00:44 +02:00
55 changed files with 498 additions and 277 deletions

View File

@@ -9,13 +9,17 @@
buildPythonPackage rec {
pname = "nix-prefetch-github";
version = "2.3.2";
version = "2.4";
src = fetchPypi {
inherit pname version;
sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx";
sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E=";
};
# The tests for this package require nix and network access. That's
# why we cannot execute them inside the building process.
doCheck = false;
propagatedBuildInputs = [
attrs
click