public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
* master:
  Revert "vinagre: disable format hardening"
  nix: point at curl 7.59.0 (#41452)
  vinagre: disable format hardening
  linux: Add 4.17
  gnome3.vinagre: fix build
  linux-copperhead: 4.16.12.a -> 4.16.13.a
  julia: add some version info to passthru, will be used by julia2nix
  gdal: Fix darwin build
  opendkim: fix libbsd dependency
  avoid redundant rm calls
  perlPackages.CPANPLUS: add cpanp dependency
  plotutils: fix parallel building
  nixos/gitea: Respect gitea-dump enable option. (#41437)
  kubernetes: corrected spelling mistake in docs (#41439)
  python.pkgs.trustme: fix python2 build
  revert 4a86f8c9ab and properly remove the temporary ssh host keys file/directory.
This commit is contained in:
Orivej Desh
2018-06-04 22:43:03 +00:00
parent 957810e04f 8414fa2d6b
commit d1ebf508f5
16 changed files with 2779 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/trustme/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }:
{ lib, buildPythonPackage, fetchPypi, isPy3k, cryptography, futures, pytest, pyopenssl, service-identity }:
buildPythonPackage rec {
pname = "trustme";
@@ -15,6 +15,8 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
cryptography
] ++ lib.optionals (!isPy3k) [
futures
];
meta = {